diff options
212 files changed, 19556 insertions, 10774 deletions
diff --git a/.travis.yml b/.travis.yml index 44ea7b62d7..1f6eb15c27 100644 --- a/.travis.yml +++ b/.travis.yml @@ -16,6 +16,8 @@ env: - CCACHE_COMPRESS=1 - BASE_OUTDIR=$TRAVIS_BUILD_DIR/out - SDK_URL=https://bitcoincore.org/depends-sources/sdks + - PYTHON_DEBUG=1 + - WINEDEBUG=fixme-all cache: apt: true directories: diff --git a/.tx/config b/.tx/config index 472d27b46f..6c534f06e4 100644 --- a/.tx/config +++ b/.tx/config @@ -1,7 +1,7 @@ [main] host = https://www.transifex.com -[bitcoin.qt-translation-010x] +[bitcoin.qt-translation-011x] file_filter = src/qt/locale/bitcoin_<lang>.ts source_file = src/qt/locale/bitcoin_en.ts source_lang = en diff --git a/Makefile.am b/Makefile.am index c59648fd02..2cb933d5bb 100644 --- a/Makefile.am +++ b/Makefile.am @@ -59,8 +59,9 @@ $(BITCOIN_WIN_INSTALLER): all-recursive STRIPPROG="$(STRIP)" $(INSTALL_STRIP_PROGRAM) $(BITCOIND_BIN) $(top_builddir)/release STRIPPROG="$(STRIP)" $(INSTALL_STRIP_PROGRAM) $(BITCOIN_QT_BIN) $(top_builddir)/release STRIPPROG="$(STRIP)" $(INSTALL_STRIP_PROGRAM) $(BITCOIN_CLI_BIN) $(top_builddir)/release - @test -f $(MAKENSIS) && $(MAKENSIS) $(top_builddir)/share/setup.nsi || \ + @test -f $(MAKENSIS) && $(MAKENSIS) -V2 $(top_builddir)/share/setup.nsi || \ echo error: could not build $@ + @echo built $@ $(if $(findstring src/,$(MAKECMDGOALS)),$(MAKECMDGOALS), none): FORCE $(MAKE) -C src $(patsubst src/%,%,$@) diff --git a/build-aux/m4/bitcoin_qt.m4 b/build-aux/m4/bitcoin_qt.m4 index 2a72262653..570ccb8b6f 100644 --- a/build-aux/m4/bitcoin_qt.m4 +++ b/build-aux/m4/bitcoin_qt.m4 @@ -6,6 +6,7 @@ AC_DEFUN([BITCOIN_QT_FAIL],[ AC_MSG_WARN([$1; bitcoin-qt frontend will not be built]) fi bitcoin_enable_qt=no + bitcoin_enable_qt_test=no else AC_MSG_ERROR([$1]) fi diff --git a/configure.ac b/configure.ac index 2c918218bb..7c0a9f4a94 100644 --- a/configure.ac +++ b/configure.ac @@ -6,7 +6,7 @@ define(_CLIENT_VERSION_REVISION, 99) define(_CLIENT_VERSION_BUILD, 0) define(_CLIENT_VERSION_IS_RELEASE, false) define(_COPYRIGHT_YEAR, 2015) -AC_INIT([Bitcoin Core],[_CLIENT_VERSION_MAJOR._CLIENT_VERSION_MINOR._CLIENT_VERSION_REVISION],[info@bitcoin.org],[bitcoin]) +AC_INIT([Bitcoin Core],[_CLIENT_VERSION_MAJOR._CLIENT_VERSION_MINOR._CLIENT_VERSION_REVISION],[https://github.com/bitcoin/bitcoin/issues],[bitcoin]) AC_CONFIG_SRCDIR([src/main.cpp]) AC_CONFIG_HEADERS([src/config/bitcoin-config.h]) AC_CONFIG_AUX_DIR([build-aux]) diff --git a/doc/README_osx.txt b/doc/README_osx.txt index 6c0c21c190..e8af46e0e4 100644 --- a/doc/README_osx.txt +++ b/doc/README_osx.txt @@ -1,6 +1,6 @@ Deterministic OSX Dmg Notes. -Working OSX DMG's are created in Linux by combining a recent clang, +Working OSX DMGs are created in Linux by combining a recent clang, the Apple's binutils (ld, ar, etc), and DMG authoring tools. Apple uses clang extensively for development and has upstreamed the necessary @@ -58,7 +58,7 @@ libdmg-hfsplus project is used to compress it. There are several bugs in this tool and its maintainer has seemingly abandoned the project. It has been forked and is available (with fixes) here: https://github.com/theuni/libdmg-hfsplus . -The 'dmg' tool has the ability to create DMG's from scratch as well, but this +The 'dmg' tool has the ability to create DMGs from scratch as well, but this functionality is broken. Only the compression feature is currently used. Ideally, the creation could be fixed and genisoimage would no longer be necessary. diff --git a/doc/REST-interface.md b/doc/REST-interface.md index f14aed7287..11af040ad2 100644 --- a/doc/REST-interface.md +++ b/doc/REST-interface.md @@ -5,6 +5,8 @@ The REST API can be enabled with the `-rest` option. Supported API ------------- + +####Transactions `GET /rest/tx/TX-HASH.{bin|hex|json}` Given a transaction hash, @@ -12,6 +14,7 @@ Returns a transaction, in binary, hex-encoded binary or JSON formats. For full TX query capability, one must enable the transaction index via "txindex=1" command line / configuration option. +####Blocks `GET /rest/block/BLOCK-HASH.{bin|hex|json}` `GET /rest/block/notxdetails/BLOCK-HASH.{bin|hex|json}` @@ -22,6 +25,15 @@ The HTTP request and response are both handled entirely in-memory, thus making m With the /notxdetails/ option JSON response will only contain the transaction hash instead of the complete transaction details. The option only affects the JSON response. +####Blockheaders +`GET /rest/headers/<COUNT>/<BLOCK-HASH>.<bin|hex>` + +Given a block hash, +Returns <COUNT> amount of blockheaders in upward direction. + +JSON is not supported. + +####Chaininfos `GET /rest/chaininfo.json` Returns various state info regarding block chain processing. @@ -34,6 +46,13 @@ Only supports JSON as output format. * verificationprogress : (numeric) estimate of verification progress [0..1] * chainwork : (string) total amount of work in active chain, in hexadecimal +`GET /rest/getutxos` + +The getutxo command allows querying of the UTXO set given a set of of outpoints. +See BIP64 for input and output serialisation: +https://github.com/bitcoin/bips/blob/master/bip-0064.mediawiki + + Risks ------------- Running a webbrowser on the same node with a REST enabled bitcoind can be a risk. Accessing prepared XSS websites could read out tx/block data of your node by placing links like `<script src="http://127.0.0.1:8332/rest/tx/1234567890.json">` which might break the nodes privacy. diff --git a/doc/bips.md b/doc/bips.md index 579eadfff3..90e98ed419 100644 --- a/doc/bips.md +++ b/doc/bips.md @@ -11,7 +11,7 @@ BIPs that are implemented by Bitcoin Core (up-to-date up to **v0.10.0**): * [`BIP 31`](https://github.com/bitcoin/bips/blob/master/bip-0031.mediawiki): The 'pong' protocol message (and the protocol version bump to 60001) has been implemented since **v0.6.1** ([PR #1081](https://github.com/bitcoin/bitcoin/pull/1081)). * [`BIP 34`](https://github.com/bitcoin/bips/blob/master/bip-0034.mediawiki): The rule that requires blocks to contain their height (number) in the coinbase input, and the introduction of version 2 blocks has been implemented since **v0.7.0**. The rule took effect for version 2 blocks as of *block 224413* (March 5th 2013), and version 1 blocks are no longer allowed since *block 227931* (March 25th 2013) ([PR #1526](https://github.com/bitcoin/bitcoin/pull/1526)). * [`BIP 35`](https://github.com/bitcoin/bips/blob/master/bip-0035.mediawiki): The 'mempool' protocol message (and the protocol version bump to 60002) has been implemented since **v0.7.0** ([PR #1641](https://github.com/bitcoin/bitcoin/pull/1641)). -* [`BIP 37`](https://github.com/bitcoin/bips/blob/master/bip-0037.mediawiki): The bloom filtering for transaction relaying, partial merkle trees for blocks , and the protocol version bump to 70001 (enabling low-bandwidth SPV clients) has been implemented since **v0.8.0** ([PR #1795](https://github.com/bitcoin/bitcoin/pull/1795)). +* [`BIP 37`](https://github.com/bitcoin/bips/blob/master/bip-0037.mediawiki): The bloom filtering for transaction relaying, partial merkle trees for blocks, and the protocol version bump to 70001 (enabling low-bandwidth SPV clients) has been implemented since **v0.8.0** ([PR #1795](https://github.com/bitcoin/bitcoin/pull/1795)). * [`BIP 42`](https://github.com/bitcoin/bips/blob/master/bip-0042.mediawiki): The bug that would have caused the subsidy schedule to resume after block 13440000 was fixed in **v0.9.2** ([PR #3842](https://github.com/bitcoin/bitcoin/pull/3842)). * [`BIP 61`](https://github.com/bitcoin/bips/blob/master/bip-0061.mediawiki): The 'reject' protocol message (and the protocol version bump to 70002) was added in **v0.9.0** ([PR #3185](https://github.com/bitcoin/bitcoin/pull/3185)). * [`BIP 66`](https://github.com/bitcoin/bips/blob/master/bip-0066.mediawiki): The strict DER rules and associated version 3 blocks have been implemented since **v0.10.0** ([PR #5713](https://github.com/bitcoin/bitcoin/pull/5713)). diff --git a/doc/build-osx.md b/doc/build-osx.md index d6e93cb23d..913e72519f 100644 --- a/doc/build-osx.md +++ b/doc/build-osx.md @@ -1,6 +1,6 @@ Mac OS X Build Instructions and Notes ==================================== -This guide will show you how to build bitcoind(headless client) for OSX. +This guide will show you how to build bitcoind (headless client) for OSX. Notes ----- diff --git a/doc/build-unix.md b/doc/build-unix.md index 0984f689a8..f70bf7f1fe 100644 --- a/doc/build-unix.md +++ b/doc/build-unix.md @@ -195,12 +195,12 @@ Hardening enables the following features: * Position Independent Executable Build position independent code to take advantage of Address Space Layout Randomization - offered by some kernels. An attacker who is able to cause execution of code at an arbitrary - memory location is thwarted if he or she doesn't know where anything useful is located. + offered by some kernels. Attackers who can cause execution of code at an arbitrary memory + location are thwarted if they don't know where anything useful is located. The stack and heap are randomly located by default but this allows the code section to be randomly located as well. - On an Amd64 processor where a library was not compiled with -fPIC, this will cause an error + On an AMD64 processor where a library was not compiled with -fPIC, this will cause an error such as: "relocation R_X86_64_32 against `......' can not be used when making a shared object;" To test that you have built PIE executable, install scanelf, part of paxutils, and use: diff --git a/doc/developer-notes.md b/doc/developer-notes.md index eaeb90da1d..8f7db31d59 100644 --- a/doc/developer-notes.md +++ b/doc/developer-notes.md @@ -53,7 +53,7 @@ bool function(int arg1, const char *arg2) ``` A complete list of `@xxx` commands can be found at http://www.stack.nl/~dimitri/doxygen/manual/commands.html. As Doxygen recognizes the comments by the delimiters (`/**` and `*/` in this case), you don't -*need* to provide any commands for a comment to be valid, just a description text is fine. +*need* to provide any commands for a comment to be valid; just a description text is fine. To describe a class use the same construct above the class definition: ```c++ @@ -175,7 +175,7 @@ Threads Pull Request Terminology ------------------------ -Concept ACK - Agree with the idea and overall direction, but haven't reviewed the code changes or tested them. +Concept ACK - Agree with the idea and overall direction, but have neither reviewed nor tested the code changes. utACK (untested ACK) - Reviewed and agree with the code changes but haven't actually tested them. @@ -183,4 +183,4 @@ Tested ACK - Reviewed the code changes and have verified the functionality or bu ACK - A loose ACK can be confusing. It's best to avoid them unless it's a documentation/comment only change in which case there is nothing to test/verify; therefore the tested/untested distinction is not there. -NACK - Disagree with the code changes/concept. Should be accompanied by an explanation. +NACK - Disagree with the code changes/concept. Should be accompanied by an explanation. diff --git a/doc/dnsseed-policy.md b/doc/dnsseed-policy.md index f15ff44e5d..506e171153 100644 --- a/doc/dnsseed-policy.md +++ b/doc/dnsseed-policy.md @@ -10,15 +10,14 @@ Other implementations of Bitcoin software may also use the same seeds and may be more exposed. In light of this exposure, this document establishes some basic expectations for operating dnsseeds. -0. A DNS seed operating organization or person is expected -to follow good host security practices and maintain control of -their serving infrastructure and not sell or transfer control of their -DNS seed. Any hosting services contracted by the operator are -equally expected to uphold these expectations. +0. A DNS seed operating organization or person is expected to follow good +host security practices, maintain control of applicable infrastructure, +and not sell or transfer control of the DNS seed. Any hosting services +contracted by the operator are equally expected to uphold these expectations. 1. The DNS seed results must consist exclusively of fairly selected and functioning Bitcoin nodes from the public network to the best of the -operators understanding and capability. +operator's understanding and capability. 2. For the avoidance of doubt, the results may be randomized but must not single-out any group of hosts to receive different results unless due to an @@ -28,7 +27,7 @@ urgent technical necessity and disclosed. 4. Any logging of DNS queries should be only that which is necessary for the operation of the service or urgent health of the Bitcoin -network and must not be retained longer than necessary or disclosed +network and must not be retained longer than necessary nor disclosed to any third party. 5. Information gathered as a result of the operators node-spidering diff --git a/doc/gitian-building.md b/doc/gitian-building.md index d285fffdbb..1fa5b5f989 100644 --- a/doc/gitian-building.md +++ b/doc/gitian-building.md @@ -87,7 +87,7 @@ After creating the VM, we need to configure it.  -- Click `Advanced`, then `Port Forwarding`. We want to set up a port through where we can reach the VM to get files in and out. +- Click `Advanced`, then `Port Forwarding`. We want to set up a port through which we can reach the VM to get files in and out. - Create a new rule by clicking the plus icon.  @@ -111,7 +111,7 @@ Installing Debian This section will explain how to install Debian on the newly created VM. -- Choose the non-graphical installer. We do not need the graphical environment, it will only increase installation time and disk usage. +- Choose the non-graphical installer. We do not need the graphical environment; it will only increase installation time and disk usage.  @@ -144,7 +144,7 @@ and proceed, just press `Enter`. To select a different button, press `Tab`.  -- The installer will set up the clock using a time server, this process should be automatic +- The installer will set up the clock using a time server; this process should be automatic - Set up the clock: choose a time zone (depends on the locale settings that you picked earlier; specifics don't matter)  @@ -371,7 +371,7 @@ COMMIT=2014_03_windows_unicode_path Signing externally ------------------- -If you want to do the PGP signing on another device that's also possible; just define `SIGNER` as mentioned +If you want to do the PGP signing on another device, that's also possible; just define `SIGNER` as mentioned and follow the steps in the build process as normal. gpg: skipped "laanwj": secret key not available @@ -393,4 +393,4 @@ Uploading signatures After building and signing you can push your signatures (both the `.assert` and `.assert.sig` files) to the [bitcoin/gitian.sigs](https://github.com/bitcoin/gitian.sigs/) repository, or if that's not possible create a pull -request. You can also mail the files to me (laanwj@gmail.com) and I'll commit them. +request. You can also mail the files to Wladimir (laanwj@gmail.com) and he will commit them. diff --git a/doc/init.md b/doc/init.md index 871bdc8123..1f206a6c02 100644 --- a/doc/init.md +++ b/doc/init.md @@ -63,7 +63,7 @@ can then be controlled by group membership. 4a) systemd -Installing this .service file consists on just copying it to +Installing this .service file consists of just copying it to /usr/lib/systemd/system directory, followed by the command "systemctl daemon-reload" in order to update running systemd configuration. diff --git a/doc/release-process.md b/doc/release-process.md index 5dad9bf5de..cdcee0ec36 100644 --- a/doc/release-process.md +++ b/doc/release-process.md @@ -164,4 +164,4 @@ Note: check that SHA256SUMS itself doesn't end up in SHA256SUMS, which is a spur - Add release notes for the new version to the directory `doc/release-notes` in git master -- Celebrate +- Celebrate diff --git a/doc/translation_process.md b/doc/translation_process.md index eed467706e..3653e53021 100644 --- a/doc/translation_process.md +++ b/doc/translation_process.md @@ -32,7 +32,7 @@ QToolBar *toolbar = addToolBar(tr("Tabs toolbar")); ### Creating a pull-request For general PRs, you shouldn’t include any updates to the translation source files. They will be updated periodically, primarily around pre-releases, allowing time for any new phrases to be translated before public releases. This is also important in avoiding translation related merge conflicts. -When an updated source file is merged into the Github repo, Transifex will automatically detect it (although it can take several hours). Once processed, the new strings will show up as "Remaining" in the Transifex web interface and are ready for translators. +When an updated source file is merged into the Github repo, Transifex will automatically detect it (although it can take several hours). Once processed, the new strings will show up as "Remaining" in the Transifex web interface and are ready for translators. To create the pull-request, use the following commands: ``` @@ -108,4 +108,4 @@ To create a new language template, you will need to edit the languages manifest ### Questions and general assistance The Bitcoin-Core translation maintainers include *tcatm, seone, Diapolo, wumpus and luke-jr*.You can find them, and others, in the Freenode IRC chatroom - `irc.freenode.net #bitcoin-dev`. -If you are a translator, you should also subscribe to the mailing list, https://groups.google.com/forum/#!forum/bitcoin-translators. Announcements will be posted during application pre-releases to notify translators to check for updates.
\ No newline at end of file +If you are a translator, you should also subscribe to the mailing list, https://groups.google.com/forum/#!forum/bitcoin-translators. Announcements will be posted during application pre-releases to notify translators to check for updates. diff --git a/qa/pull-tester/rpc-tests.sh b/qa/pull-tester/rpc-tests.sh index 053e8b8a7f..ecde45059b 100755 --- a/qa/pull-tester/rpc-tests.sh +++ b/qa/pull-tester/rpc-tests.sh @@ -22,12 +22,18 @@ testScripts=( 'txn_doublespend.py' 'txn_doublespend.py --mineblock' 'getchaintips.py' + 'rawtransactions.py' 'rest.py' 'mempool_spendcoinbase.py' 'mempool_coinbase_spends.py' 'httpbasics.py' 'zapwallettxes.py' 'proxy_test.py' + 'merkle_blocks.py' + 'signrawtransactions.py' + 'maxblocksinflight.py' + 'invalidblockrequest.py' + 'rawtransactions.py' # 'forknotify.py' ); if [ "x${ENABLE_BITCOIND}${ENABLE_UTILS}${ENABLE_WALLET}" = "x111" ]; then diff --git a/qa/rpc-tests/README.md b/qa/rpc-tests/README.md index 02170d13ec..d9fbb109e8 100644 --- a/qa/rpc-tests/README.md +++ b/qa/rpc-tests/README.md @@ -28,7 +28,7 @@ Notes A 200-block -regtest blockchain and wallets for four nodes is created the first time a regression test is run and is stored in the cache/ directory. Each node has 25 mature -blocks (25*50=1250 BTC) in their wallet. +blocks (25*50=1250 BTC) in its wallet. After the first run, the cache/ blockchain and wallets are copied into a temporary directory and used as the initial diff --git a/qa/rpc-tests/bignum.py b/qa/rpc-tests/bignum.py new file mode 100644 index 0000000000..b0c58ccd47 --- /dev/null +++ b/qa/rpc-tests/bignum.py @@ -0,0 +1,102 @@ +# +# +# bignum.py +# +# This file is copied from python-bitcoinlib. +# +# Distributed under the MIT/X11 software license, see the accompanying +# file COPYING or http://www.opensource.org/licenses/mit-license.php. +# + +"""Bignum routines""" + +from __future__ import absolute_import, division, print_function, unicode_literals + +import struct + + +# generic big endian MPI format + +def bn_bytes(v, have_ext=False): + ext = 0 + if have_ext: + ext = 1 + return ((v.bit_length()+7)//8) + ext + +def bn2bin(v): + s = bytearray() + i = bn_bytes(v) + while i > 0: + s.append((v >> ((i-1) * 8)) & 0xff) + i -= 1 + return s + +def bin2bn(s): + l = 0 + for ch in s: + l = (l << 8) | ch + return l + +def bn2mpi(v): + have_ext = False + if v.bit_length() > 0: + have_ext = (v.bit_length() & 0x07) == 0 + + neg = False + if v < 0: + neg = True + v = -v + + s = struct.pack(b">I", bn_bytes(v, have_ext)) + ext = bytearray() + if have_ext: + ext.append(0) + v_bin = bn2bin(v) + if neg: + if have_ext: + ext[0] |= 0x80 + else: + v_bin[0] |= 0x80 + return s + ext + v_bin + +def mpi2bn(s): + if len(s) < 4: + return None + s_size = bytes(s[:4]) + v_len = struct.unpack(b">I", s_size)[0] + if len(s) != (v_len + 4): + return None + if v_len == 0: + return 0 + + v_str = bytearray(s[4:]) + neg = False + i = v_str[0] + if i & 0x80: + neg = True + i &= ~0x80 + v_str[0] = i + + v = bin2bn(v_str) + + if neg: + return -v + return v + +# bitcoin-specific little endian format, with implicit size +def mpi2vch(s): + r = s[4:] # strip size + r = r[::-1] # reverse string, converting BE->LE + return r + +def bn2vch(v): + return bytes(mpi2vch(bn2mpi(v))) + +def vch2mpi(s): + r = struct.pack(b">I", len(s)) # size + r += s[::-1] # reverse string, converting LE->BE + return r + +def vch2bn(s): + return mpi2bn(vch2mpi(s)) + diff --git a/qa/rpc-tests/bipdersig-p2p.py b/qa/rpc-tests/bipdersig-p2p.py new file mode 100755 index 0000000000..ff0c878898 --- /dev/null +++ b/qa/rpc-tests/bipdersig-p2p.py @@ -0,0 +1,183 @@ +#!/usr/bin/env python2 +# +# Distributed under the MIT/X11 software license, see the accompanying +# file COPYING or http://www.opensource.org/licenses/mit-license.php. +# + +from test_framework import ComparisonTestFramework +from util import * +from mininode import CTransaction, NetworkThread +from blocktools import create_coinbase, create_block +from binascii import hexlify, unhexlify +import cStringIO +from comptool import TestInstance, TestManager +from script import CScript +import time + +# A canonical signature consists of: +# <30> <total len> <02> <len R> <R> <02> <len S> <S> <hashtype> +def unDERify(tx): + ''' + Make the signature in vin 0 of a tx non-DER-compliant, + by adding padding after the S-value. + ''' + scriptSig = CScript(tx.vin[0].scriptSig) + newscript = [] + for i in scriptSig: + if (len(newscript) == 0): + newscript.append(i[0:-1] + '\0' + i[-1]) + else: + newscript.append(i) + tx.vin[0].scriptSig = CScript(newscript) + +''' +This test is meant to exercise BIP66 (DER SIG). +Connect to a single node. +Mine 2 (version 2) blocks (save the coinbases for later). +Generate 98 more version 2 blocks, verify the node accepts. +Mine 749 version 3 blocks, verify the node accepts. +Check that the new DERSIG rules are not enforced on the 750th version 3 block. +Check that the new DERSIG rules are enforced on the 751st version 3 block. +Mine 199 new version blocks. +Mine 1 old-version block. +Mine 1 new version block. +Mine 1 old version block, see that the node rejects. +''' + +class BIP66Test(ComparisonTestFramework): + + def __init__(self): + self.num_nodes = 1 + + def setup_network(self): + # Must set the blockversion for this test + self.nodes = start_nodes(1, self.options.tmpdir, + extra_args=[['-debug', '-whitelist=127.0.0.1', '-blockversion=2']], + binary=[self.options.testbinary]) + + def run_test(self): + test = TestManager(self, self.options.tmpdir) + test.add_all_connections(self.nodes) + NetworkThread().start() # Start up network handling in another thread + test.run() + + def create_transaction(self, node, coinbase, to_address, amount): + from_txid = node.getblock(coinbase)['tx'][0] + inputs = [{ "txid" : from_txid, "vout" : 0}] + outputs = { to_address : amount } + rawtx = node.createrawtransaction(inputs, outputs) + signresult = node.signrawtransaction(rawtx) + tx = CTransaction() + f = cStringIO.StringIO(unhexlify(signresult['hex'])) + tx.deserialize(f) + return tx + + def get_tests(self): + + self.coinbase_blocks = self.nodes[0].generate(2) + self.tip = int ("0x" + self.nodes[0].getbestblockhash() + "L", 0) + self.nodeaddress = self.nodes[0].getnewaddress() + self.last_block_time = time.time() + + ''' 98 more version 2 blocks ''' + test_blocks = [] + for i in xrange(98): + block = create_block(self.tip, create_coinbase(2), self.last_block_time + 1) + block.nVersion = 2 + block.rehash() + block.solve() + test_blocks.append([block, True]) + self.last_block_time += 1 + self.tip = block.sha256 + yield TestInstance(test_blocks, sync_every_block=False) + + ''' Mine 749 version 3 blocks ''' + test_blocks = [] + for i in xrange(749): + block = create_block(self.tip, create_coinbase(2), self.last_block_time + 1) + block.nVersion = 3 + block.rehash() + block.solve() + test_blocks.append([block, True]) + self.last_block_time += 1 + self.tip = block.sha256 + yield TestInstance(test_blocks, sync_every_block=False) + + ''' + Check that the new DERSIG rules are not enforced in the 750th + version 3 block. + ''' + spendtx = self.create_transaction(self.nodes[0], + self.coinbase_blocks[0], self.nodeaddress, 1.0) + unDERify(spendtx) + spendtx.rehash() + + block = create_block(self.tip, create_coinbase(2), self.last_block_time + 1) + block.nVersion = 3 + block.vtx.append(spendtx) + block.hashMerkleRoot = block.calc_merkle_root() + block.rehash() + block.solve() + + self.last_block_time += 1 + self.tip = block.sha256 + yield TestInstance([[block, True]]) + + ''' + Check that the new DERSIG rules are enforced in the 751st version 3 + block. + ''' + spendtx = self.create_transaction(self.nodes[0], + self.coinbase_blocks[1], self.nodeaddress, 1.0) + unDERify(spendtx) + spendtx.rehash() + + block = create_block(self.tip, create_coinbase(1), self.last_block_time + 1) + block.nVersion = 3 + block.vtx.append(spendtx) + block.hashMerkleRoot = block.calc_merkle_root() + block.rehash() + block.solve() + self.last_block_time += 1 + yield TestInstance([[block, False]]) + + ''' Mine 199 new version blocks on last valid tip ''' + test_blocks = [] + for i in xrange(199): + block = create_block(self.tip, create_coinbase(1), self.last_block_time + 1) + block.nVersion = 3 + block.rehash() + block.solve() + test_blocks.append([block, True]) + self.last_block_time += 1 + self.tip = block.sha256 + yield TestInstance(test_blocks, sync_every_block=False) + + ''' Mine 1 old version block ''' + block = create_block(self.tip, create_coinbase(1), self.last_block_time + 1) + block.nVersion = 2 + block.rehash() + block.solve() + self.last_block_time += 1 + self.tip = block.sha256 + yield TestInstance([[block, True]]) + + ''' Mine 1 new version block ''' + block = create_block(self.tip, create_coinbase(1), self.last_block_time + 1) + block.nVersion = 3 + block.rehash() + block.solve() + self.last_block_time += 1 + self.tip = block.sha256 + yield TestInstance([[block, True]]) + + ''' Mine 1 old version block, should be invalid ''' + block = create_block(self.tip, create_coinbase(1), self.last_block_time + 1) + block.nVersion = 2 + block.rehash() + block.solve() + self.last_block_time += 1 + yield TestInstance([[block, False]]) + +if __name__ == '__main__': + BIP66Test().main() diff --git a/qa/rpc-tests/blockstore.py b/qa/rpc-tests/blockstore.py new file mode 100644 index 0000000000..c57b6df81b --- /dev/null +++ b/qa/rpc-tests/blockstore.py @@ -0,0 +1,127 @@ +# BlockStore: a helper class that keeps a map of blocks and implements +# helper functions for responding to getheaders and getdata, +# and for constructing a getheaders message +# + +from mininode import * +import dbm + +class BlockStore(object): + def __init__(self, datadir): + self.blockDB = dbm.open(datadir + "/blocks", 'c') + self.currentBlock = 0L + + def close(self): + self.blockDB.close() + + def get(self, blockhash): + serialized_block = None + try: + serialized_block = self.blockDB[repr(blockhash)] + except KeyError: + return None + f = cStringIO.StringIO(serialized_block) + ret = CBlock() + ret.deserialize(f) + ret.calc_sha256() + return ret + + # Note: this pulls full blocks out of the database just to retrieve + # the headers -- perhaps we could keep a separate data structure + # to avoid this overhead. + def headers_for(self, locator, hash_stop, current_tip=None): + if current_tip is None: + current_tip = self.currentBlock + current_block = self.get(current_tip) + if current_block is None: + return None + + response = msg_headers() + headersList = [ CBlockHeader(current_block) ] + maxheaders = 2000 + while (headersList[0].sha256 not in locator.vHave): + prevBlockHash = headersList[0].hashPrevBlock + prevBlock = self.get(prevBlockHash) + if prevBlock is not None: + headersList.insert(0, CBlockHeader(prevBlock)) + else: + break + headersList = headersList[:maxheaders] # truncate if we have too many + hashList = [x.sha256 for x in headersList] + index = len(headersList) + if (hash_stop in hashList): + index = hashList.index(hash_stop)+1 + response.headers = headersList[:index] + return response + + def add_block(self, block): + block.calc_sha256() + try: + self.blockDB[repr(block.sha256)] = bytes(block.serialize()) + except TypeError as e: + print "Unexpected error: ", sys.exc_info()[0], e.args + self.currentBlock = block.sha256 + + def get_blocks(self, inv): + responses = [] + for i in inv: + if (i.type == 2): # MSG_BLOCK + block = self.get(i.hash) + if block is not None: + responses.append(msg_block(block)) + return responses + + def get_locator(self, current_tip=None): + if current_tip is None: + current_tip = self.currentBlock + r = [] + counter = 0 + step = 1 + lastBlock = self.get(current_tip) + while lastBlock is not None: + r.append(lastBlock.hashPrevBlock) + for i in range(step): + lastBlock = self.get(lastBlock.hashPrevBlock) + if lastBlock is None: + break + counter += 1 + if counter > 10: + step *= 2 + locator = CBlockLocator() + locator.vHave = r + return locator + +class TxStore(object): + def __init__(self, datadir): + self.txDB = dbm.open(datadir + "/transactions", 'c') + + def close(self): + self.txDB.close() + + def get(self, txhash): + serialized_tx = None + try: + serialized_tx = self.txDB[repr(txhash)] + except KeyError: + return None + f = cStringIO.StringIO(serialized_tx) + ret = CTransaction() + ret.deserialize(f) + ret.calc_sha256() + return ret + + def add_transaction(self, tx): + tx.calc_sha256() + try: + self.txDB[repr(tx.sha256)] = bytes(tx.serialize()) + except TypeError as e: + print "Unexpected error: ", sys.exc_info()[0], e.args + + def get_transactions(self, inv): + responses = [] + for i in inv: + if (i.type == 1): # MSG_TX + tx = self.get(i.hash) + if tx is not None: + responses.append(msg_tx(tx)) + return responses diff --git a/qa/rpc-tests/blocktools.py b/qa/rpc-tests/blocktools.py new file mode 100644 index 0000000000..f397fe7cd6 --- /dev/null +++ b/qa/rpc-tests/blocktools.py @@ -0,0 +1,65 @@ +# blocktools.py - utilities for manipulating blocks and transactions +# +# Distributed under the MIT/X11 software license, see the accompanying +# file COPYING or http://www.opensource.org/licenses/mit-license.php. +# + +from mininode import * +from script import CScript, CScriptOp + +# Create a block (with regtest difficulty) +def create_block(hashprev, coinbase, nTime=None): + block = CBlock() + if nTime is None: + import time + block.nTime = int(time.time()+600) + else: + block.nTime = nTime + block.hashPrevBlock = hashprev + block.nBits = 0x207fffff # Will break after a difficulty adjustment... + block.vtx.append(coinbase) + block.hashMerkleRoot = block.calc_merkle_root() + block.calc_sha256() + return block + +def serialize_script_num(value): + r = bytearray(0) + if value == 0: + return r + neg = value < 0 + absvalue = -value if neg else value + while (absvalue): + r.append(chr(absvalue & 0xff)) + absvalue >>= 8 + if r[-1] & 0x80: + r.append(0x80 if neg else 0) + elif neg: + r[-1] |= 0x80 + return r + +counter=1 +# Create an anyone-can-spend coinbase transaction, assuming no miner fees +def create_coinbase(heightAdjust = 0): + global counter + coinbase = CTransaction() + coinbase.vin.append(CTxIn(COutPoint(0, 0xffffffff), + ser_string(serialize_script_num(counter+heightAdjust)), 0xffffffff)) + counter += 1 + coinbaseoutput = CTxOut() + coinbaseoutput.nValue = 50*100000000 + halvings = int((counter+heightAdjust)/150) # regtest + coinbaseoutput.nValue >>= halvings + coinbaseoutput.scriptPubKey = "" + coinbase.vout = [ coinbaseoutput ] + coinbase.calc_sha256() + return coinbase + +# Create a transaction with an anyone-can-spend output, that spends the +# nth output of prevtx. +def create_transaction(prevtx, n, sig, value): + tx = CTransaction() + assert(n < len(prevtx.vout)) + tx.vin.append(CTxIn(COutPoint(prevtx.sha256, n), sig, 0xffffffff)) + tx.vout.append(CTxOut(value, "")) + tx.calc_sha256() + return tx diff --git a/qa/rpc-tests/comptool.py b/qa/rpc-tests/comptool.py new file mode 100755 index 0000000000..23a979250c --- /dev/null +++ b/qa/rpc-tests/comptool.py @@ -0,0 +1,341 @@ +#!/usr/bin/env python2 +# +# Distributed under the MIT/X11 software license, see the accompanying +# file COPYING or http://www.opensource.org/licenses/mit-license.php. +# + +from mininode import * +from blockstore import BlockStore, TxStore +from util import p2p_port + +''' +This is a tool for comparing two or more bitcoinds to each other +using a script provided. + +To use, create a class that implements get_tests(), and pass it in +as the test generator to TestManager. get_tests() should be a python +generator that returns TestInstance objects. See below for definition. +''' + +# TestNode behaves as follows: +# Configure with a BlockStore and TxStore +# on_inv: log the message but don't request +# on_headers: log the chain tip +# on_pong: update ping response map (for synchronization) +# on_getheaders: provide headers via BlockStore +# on_getdata: provide blocks via BlockStore + +global mininode_lock + +class TestNode(NodeConnCB): + + def __init__(self, block_store, tx_store): + NodeConnCB.__init__(self) + self.create_callback_map() + self.conn = None + self.bestblockhash = None + self.block_store = block_store + self.block_request_map = {} + self.tx_store = tx_store + self.tx_request_map = {} + + # When the pingmap is non-empty we're waiting for + # a response + self.pingMap = {} + self.lastInv = [] + + def add_connection(self, conn): + self.conn = conn + + def on_headers(self, conn, message): + if len(message.headers) > 0: + best_header = message.headers[-1] + best_header.calc_sha256() + self.bestblockhash = best_header.sha256 + + def on_getheaders(self, conn, message): + response = self.block_store.headers_for(message.locator, message.hashstop) + if response is not None: + conn.send_message(response) + + def on_getdata(self, conn, message): + [conn.send_message(r) for r in self.block_store.get_blocks(message.inv)] + [conn.send_message(r) for r in self.tx_store.get_transactions(message.inv)] + + for i in message.inv: + if i.type == 1: + self.tx_request_map[i.hash] = True + elif i.type == 2: + self.block_request_map[i.hash] = True + + def on_inv(self, conn, message): + self.lastInv = [x.hash for x in message.inv] + + def on_pong(self, conn, message): + try: + del self.pingMap[message.nonce] + except KeyError: + raise AssertionError("Got pong for unknown ping [%s]" % repr(message)) + + def send_inv(self, obj): + mtype = 2 if isinstance(obj, CBlock) else 1 + self.conn.send_message(msg_inv([CInv(mtype, obj.sha256)])) + + def send_getheaders(self): + # We ask for headers from their last tip. + m = msg_getheaders() + m.locator = self.block_store.get_locator(self.bestblockhash) + self.conn.send_message(m) + + # This assumes BIP31 + def send_ping(self, nonce): + self.pingMap[nonce] = True + self.conn.send_message(msg_ping(nonce)) + + def received_ping_response(self, nonce): + return nonce not in self.pingMap + + def send_mempool(self): + self.lastInv = [] + self.conn.send_message(msg_mempool()) + +# TestInstance: +# +# Instances of these are generated by the test generator, and fed into the +# comptool. +# +# "blocks_and_transactions" should be an array of [obj, True/False/None]: +# - obj is either a CBlock or a CTransaction, and +# - the second value indicates whether the object should be accepted +# into the blockchain or mempool (for tests where we expect a certain +# answer), or "None" if we don't expect a certain answer and are just +# comparing the behavior of the nodes being tested. +# sync_every_block: if True, then each block will be inv'ed, synced, and +# nodes will be tested based on the outcome for the block. If False, +# then inv's accumulate until all blocks are processed (or max inv size +# is reached) and then sent out in one inv message. Then the final block +# will be synced across all connections, and the outcome of the final +# block will be tested. +# sync_every_tx: analagous to behavior for sync_every_block, except if outcome +# on the final tx is None, then contents of entire mempool are compared +# across all connections. (If outcome of final tx is specified as true +# or false, then only the last tx is tested against outcome.) + +class TestInstance(object): + def __init__(self, objects=[], sync_every_block=True, sync_every_tx=False): + self.blocks_and_transactions = objects + self.sync_every_block = sync_every_block + self.sync_every_tx = sync_every_tx + +class TestManager(object): + + def __init__(self, testgen, datadir): + self.test_generator = testgen + self.connections = [] + self.block_store = BlockStore(datadir) + self.tx_store = TxStore(datadir) + self.ping_counter = 1 + + def add_all_connections(self, nodes): + for i in range(len(nodes)): + # Create a p2p connection to each node + self.connections.append(NodeConn('127.0.0.1', p2p_port(i), + nodes[i], TestNode(self.block_store, self.tx_store))) + # Make sure the TestNode (callback class) has a reference to its + # associated NodeConn + self.connections[-1].cb.add_connection(self.connections[-1]) + + def wait_for_verack(self): + sleep_time = 0.05 + max_tries = 10 / sleep_time # Wait at most 10 seconds + while max_tries > 0: + done = True + with mininode_lock: + for c in self.connections: + if c.cb.verack_received is False: + done = False + break + if done: + break + time.sleep(sleep_time) + + def wait_for_pings(self, counter): + received_pongs = False + while received_pongs is not True: + time.sleep(0.05) + received_pongs = True + with mininode_lock: + for c in self.connections: + if c.cb.received_ping_response(counter) is not True: + received_pongs = False + break + + # sync_blocks: Wait for all connections to request the blockhash given + # then send get_headers to find out the tip of each node, and synchronize + # the response by using a ping (and waiting for pong with same nonce). + def sync_blocks(self, blockhash, num_blocks): + # Wait for nodes to request block (50ms sleep * 20 tries * num_blocks) + max_tries = 20*num_blocks + while max_tries > 0: + with mininode_lock: + results = [ blockhash in c.cb.block_request_map and + c.cb.block_request_map[blockhash] for c in self.connections ] + if False not in results: + break + time.sleep(0.05) + max_tries -= 1 + + # --> error if not requested + if max_tries == 0: + # print [ c.cb.block_request_map for c in self.connections ] + raise AssertionError("Not all nodes requested block") + # --> Answer request (we did this inline!) + + # Send getheaders message + [ c.cb.send_getheaders() for c in self.connections ] + + # Send ping and wait for response -- synchronization hack + [ c.cb.send_ping(self.ping_counter) for c in self.connections ] + self.wait_for_pings(self.ping_counter) + self.ping_counter += 1 + + # Analogous to sync_block (see above) + def sync_transaction(self, txhash, num_events): + # Wait for nodes to request transaction (50ms sleep * 20 tries * num_events) + max_tries = 20*num_events + while max_tries > 0: + with mininode_lock: + results = [ txhash in c.cb.tx_request_map and + c.cb.tx_request_map[txhash] for c in self.connections ] + if False not in results: + break + time.sleep(0.05) + max_tries -= 1 + + # --> error if not requested + if max_tries == 0: + # print [ c.cb.tx_request_map for c in self.connections ] + raise AssertionError("Not all nodes requested transaction") + # --> Answer request (we did this inline!) + + # Get the mempool + [ c.cb.send_mempool() for c in self.connections ] + + # Send ping and wait for response -- synchronization hack + [ c.cb.send_ping(self.ping_counter) for c in self.connections ] + self.wait_for_pings(self.ping_counter) + self.ping_counter += 1 + + # Sort inv responses from each node + with mininode_lock: + [ c.cb.lastInv.sort() for c in self.connections ] + + # Verify that the tip of each connection all agree with each other, and + # with the expected outcome (if given) + def check_results(self, blockhash, outcome): + with mininode_lock: + for c in self.connections: + if outcome is None: + if c.cb.bestblockhash != self.connections[0].cb.bestblockhash: + return False + elif ((c.cb.bestblockhash == blockhash) != outcome): + # print c.cb.bestblockhash, blockhash, outcome + return False + return True + + # Either check that the mempools all agree with each other, or that + # txhash's presence in the mempool matches the outcome specified. + # This is somewhat of a strange comparison, in that we're either comparing + # a particular tx to an outcome, or the entire mempools altogether; + # perhaps it would be useful to add the ability to check explicitly that + # a particular tx's existence in the mempool is the same across all nodes. + def check_mempool(self, txhash, outcome): + with mininode_lock: + for c in self.connections: + if outcome is None: + # Make sure the mempools agree with each other + if c.cb.lastInv != self.connections[0].cb.lastInv: + # print c.rpc.getrawmempool() + return False + elif ((txhash in c.cb.lastInv) != outcome): + # print c.rpc.getrawmempool(), c.cb.lastInv + return False + return True + + def run(self): + # Wait until verack is received + self.wait_for_verack() + + test_number = 1 + for test_instance in self.test_generator.get_tests(): + # We use these variables to keep track of the last block + # and last transaction in the tests, which are used + # if we're not syncing on every block or every tx. + [ block, block_outcome ] = [ None, None ] + [ tx, tx_outcome ] = [ None, None ] + invqueue = [] + + for b_or_t, outcome in test_instance.blocks_and_transactions: + # Determine if we're dealing with a block or tx + if isinstance(b_or_t, CBlock): # Block test runner + block = b_or_t + block_outcome = outcome + # Add to shared block_store, set as current block + with mininode_lock: + self.block_store.add_block(block) + for c in self.connections: + c.cb.block_request_map[block.sha256] = False + # Either send inv's to each node and sync, or add + # to invqueue for later inv'ing. + if (test_instance.sync_every_block): + [ c.cb.send_inv(block) for c in self.connections ] + self.sync_blocks(block.sha256, 1) + if (not self.check_results(block.sha256, outcome)): + raise AssertionError("Test failed at test %d" % test_number) + else: + invqueue.append(CInv(2, block.sha256)) + else: # Tx test runner + assert(isinstance(b_or_t, CTransaction)) + tx = b_or_t + tx_outcome = outcome + # Add to shared tx store and clear map entry + with mininode_lock: + self.tx_store.add_transaction(tx) + for c in self.connections: + c.cb.tx_request_map[tx.sha256] = False + # Again, either inv to all nodes or save for later + if (test_instance.sync_every_tx): + [ c.cb.send_inv(tx) for c in self.connections ] + self.sync_transaction(tx.sha256, 1) + if (not self.check_mempool(tx.sha256, outcome)): + raise AssertionError("Test failed at test %d" % test_number) + else: + invqueue.append(CInv(1, tx.sha256)) + # Ensure we're not overflowing the inv queue + if len(invqueue) == MAX_INV_SZ: + [ c.send_message(msg_inv(invqueue)) for c in self.connections ] + invqueue = [] + + # Do final sync if we weren't syncing on every block or every tx. + if (not test_instance.sync_every_block and block is not None): + if len(invqueue) > 0: + [ c.send_message(msg_inv(invqueue)) for c in self.connections ] + invqueue = [] + self.sync_blocks(block.sha256, + len(test_instance.blocks_and_transactions)) + if (not self.check_results(block.sha256, block_outcome)): + raise AssertionError("Block test failed at test %d" % test_number) + if (not test_instance.sync_every_tx and tx is not None): + if len(invqueue) > 0: + [ c.send_message(msg_inv(invqueue)) for c in self.connections ] + invqueue = [] + self.sync_transaction(tx.sha256, len(test_instance.blocks_and_transactions)) + if (not self.check_mempool(tx.sha256, tx_outcome)): + raise AssertionError("Mempool test failed at test %d" % test_number) + + print "Test %d: PASS" % test_number, [ c.rpc.getblockcount() for c in self.connections ] + test_number += 1 + + self.block_store.close() + self.tx_store.close() + [ c.disconnect_node() for c in self.connections ] diff --git a/qa/rpc-tests/conflictedbalance.sh b/qa/rpc-tests/conflictedbalance.sh index 3b6c8dc318..7e44097374 100755 --- a/qa/rpc-tests/conflictedbalance.sh +++ b/qa/rpc-tests/conflictedbalance.sh @@ -49,7 +49,7 @@ B2ARGS="-datadir=$D2 -debug=mempool" $BITCOIND $B2ARGS & B2PID=$! -# Wait until all four nodes are at the same block number +# Wait until both nodes are at the same block number function WaitBlocks { while : do diff --git a/qa/rpc-tests/invalidblockrequest.py b/qa/rpc-tests/invalidblockrequest.py new file mode 100755 index 0000000000..8b685ed9b2 --- /dev/null +++ b/qa/rpc-tests/invalidblockrequest.py @@ -0,0 +1,115 @@ +#!/usr/bin/env python2 +# +# Distributed under the MIT/X11 software license, see the accompanying +# file COPYING or http://www.opensource.org/licenses/mit-license.php. +# + +from test_framework import ComparisonTestFramework +from util import * +from comptool import TestManager, TestInstance +from mininode import * +from blocktools import * +import logging +import copy +import time + + +''' +In this test we connect to one node over p2p, and test block requests: +1) Valid blocks should be requested and become chain tip. +2) Invalid block with duplicated transaction should be re-requested. +3) Invalid block with bad coinbase value should be rejected and not +re-requested. +''' + +# Use the ComparisonTestFramework with 1 node: only use --testbinary. +class InvalidBlockRequestTest(ComparisonTestFramework): + + ''' Can either run this test as 1 node with expected answers, or two and compare them. + Change the "outcome" variable from each TestInstance object to only do the comparison. ''' + def __init__(self): + self.num_nodes = 1 + + def run_test(self): + test = TestManager(self, self.options.tmpdir) + test.add_all_connections(self.nodes) + self.tip = None + self.block_time = None + NetworkThread().start() # Start up network handling in another thread + test.run() + + def get_tests(self): + if self.tip is None: + self.tip = int ("0x" + self.nodes[0].getbestblockhash() + "L", 0) + self.block_time = int(time.time())+1 + + ''' + Create a new block with an anyone-can-spend coinbase + ''' + block = create_block(self.tip, create_coinbase(), self.block_time) + self.block_time += 1 + block.solve() + # Save the coinbase for later + self.block1 = block + self.tip = block.sha256 + yield TestInstance([[block, True]]) + + ''' + Now we need that block to mature so we can spend the coinbase. + ''' + test = TestInstance(sync_every_block=False) + for i in xrange(100): + block = create_block(self.tip, create_coinbase(), self.block_time) + block.solve() + self.tip = block.sha256 + self.block_time += 1 + test.blocks_and_transactions.append([block, True]) + yield test + + ''' + Now we use merkle-root malleability to generate an invalid block with + same blockheader. + Manufacture a block with 3 transactions (coinbase, spend of prior + coinbase, spend of that spend). Duplicate the 3rd transaction to + leave merkle root and blockheader unchanged but invalidate the block. + ''' + block2 = create_block(self.tip, create_coinbase(), self.block_time) + self.block_time += 1 + + # chr(81) is OP_TRUE + tx1 = create_transaction(self.block1.vtx[0], 0, chr(81), 50*100000000) + tx2 = create_transaction(tx1, 0, chr(81), 50*100000000) + + block2.vtx.extend([tx1, tx2]) + block2.hashMerkleRoot = block2.calc_merkle_root() + block2.rehash() + block2.solve() + orig_hash = block2.sha256 + block2_orig = copy.deepcopy(block2) + + # Mutate block 2 + block2.vtx.append(tx2) + assert_equal(block2.hashMerkleRoot, block2.calc_merkle_root()) + assert_equal(orig_hash, block2.rehash()) + assert(block2_orig.vtx != block2.vtx) + + self.tip = block2.sha256 + yield TestInstance([[block2, False], [block2_orig, True]]) + + ''' + Make sure that a totally screwed up block is not valid. + ''' + block3 = create_block(self.tip, create_coinbase(), self.block_time) + self.block_time += 1 + block3.vtx[0].vout[0].nValue = 100*100000000 # Too high! + block3.vtx[0].sha256=None + block3.vtx[0].calc_sha256() + block3.hashMerkleRoot = block3.calc_merkle_root() + block3.rehash() + block3.solve() + + yield TestInstance([[block3, False]]) + + +if __name__ == '__main__': + InvalidBlockRequestTest().main() diff --git a/qa/rpc-tests/maxblocksinflight.py b/qa/rpc-tests/maxblocksinflight.py new file mode 100755 index 0000000000..87c80cd97e --- /dev/null +++ b/qa/rpc-tests/maxblocksinflight.py @@ -0,0 +1,101 @@ +#!/usr/bin/env python2 +# +# Distributed under the MIT/X11 software license, see the accompanying +# file COPYING or http://www.opensource.org/licenses/mit-license.php. +# + +from mininode import * +from test_framework import BitcoinTestFramework +from util import * +import logging + +''' +In this test we connect to one node over p2p, send it numerous inv's, and +compare the resulting number of getdata requests to a max allowed value. We +test for exceeding 128 blocks in flight, which was the limit an 0.9 client will +reach. [0.10 clients shouldn't request more than 16 from a single peer.] +''' +MAX_REQUESTS = 128 + +class TestManager(NodeConnCB): + # set up NodeConnCB callbacks, overriding base class + def on_getdata(self, conn, message): + self.log.debug("got getdata %s" % repr(message)) + # Log the requests + for inv in message.inv: + if inv.hash not in self.blockReqCounts: + self.blockReqCounts[inv.hash] = 0 + self.blockReqCounts[inv.hash] += 1 + + def on_close(self, conn): + if not self.disconnectOkay: + raise EarlyDisconnectError(0) + + def __init__(self): + NodeConnCB.__init__(self) + self.log = logging.getLogger("BlockRelayTest") + self.create_callback_map() + + def add_new_connection(self, connection): + self.connection = connection + self.blockReqCounts = {} + self.disconnectOkay = False + + def run(self): + try: + fail = False + self.connection.rpc.generate(1) # Leave IBD + + numBlocksToGenerate = [ 8, 16, 128, 1024 ] + for count in range(len(numBlocksToGenerate)): + current_invs = [] + for i in range(numBlocksToGenerate[count]): + current_invs.append(CInv(2, random.randrange(0, 1<<256))) + if len(current_invs) >= 50000: + self.connection.send_message(msg_inv(current_invs)) + current_invs = [] + if len(current_invs) > 0: + self.connection.send_message(msg_inv(current_invs)) + + # Wait and see how many blocks were requested + time.sleep(2) + + total_requests = 0 + with mininode_lock: + for key in self.blockReqCounts: + total_requests += self.blockReqCounts[key] + if self.blockReqCounts[key] > 1: + raise AssertionError("Error, test failed: block %064x requested more than once" % key) + if total_requests > MAX_REQUESTS: + raise AssertionError("Error, too many blocks (%d) requested" % total_requests) + print "Round %d: success (total requests: %d)" % (count, total_requests) + except AssertionError as e: + print "TEST FAILED: ", e.args + + self.disconnectOkay = True + self.connection.disconnect_node() + + +class MaxBlocksInFlightTest(BitcoinTestFramework): + def add_options(self, parser): + parser.add_option("--testbinary", dest="testbinary", + default=os.getenv("BITCOIND", "bitcoind"), + help="Binary to test max block requests behavior") + + def setup_chain(self): + print "Initializing test directory "+self.options.tmpdir + initialize_chain_clean(self.options.tmpdir, 1) + + def setup_network(self): + self.nodes = start_nodes(1, self.options.tmpdir, + extra_args=[['-debug', '-whitelist=127.0.0.1']], + binary=[self.options.testbinary]) + + def run_test(self): + test = TestManager() + test.add_new_connection(NodeConn('127.0.0.1', p2p_port(0), self.nodes[0], test)) + NetworkThread().start() # Start up network handling in another thread + test.run() + +if __name__ == '__main__': + MaxBlocksInFlightTest().main() diff --git a/qa/rpc-tests/merkle_blocks.py b/qa/rpc-tests/merkle_blocks.py new file mode 100755 index 0000000000..a143d21a21 --- /dev/null +++ b/qa/rpc-tests/merkle_blocks.py @@ -0,0 +1,90 @@ +#!/usr/bin/env python2 +# Copyright (c) 2014 The Bitcoin Core developers +# Distributed under the MIT software license, see the accompanying +# file COPYING or http://www.opensource.org/licenses/mit-license.php. + +# +# Test merkleblock fetch/validation +# + +from test_framework import BitcoinTestFramework +from bitcoinrpc.authproxy import AuthServiceProxy, JSONRPCException +from util import * +import os +import shutil + +class MerkleBlockTest(BitcoinTestFramework): + + def setup_chain(self): + print("Initializing test directory "+self.options.tmpdir) + initialize_chain_clean(self.options.tmpdir, 4) + + def setup_network(self): + self.nodes = [] + # Nodes 0/1 are "wallet" nodes + self.nodes.append(start_node(0, self.options.tmpdir, ["-debug"])) + self.nodes.append(start_node(1, self.options.tmpdir, ["-debug"])) + # Nodes 2/3 are used for testing + self.nodes.append(start_node(2, self.options.tmpdir, ["-debug"])) + self.nodes.append(start_node(3, self.options.tmpdir, ["-debug", "-txindex"])) + connect_nodes(self.nodes[0], 1) + connect_nodes(self.nodes[0], 2) + connect_nodes(self.nodes[0], 3) + + self.is_network_split = False + self.sync_all() + + def run_test(self): + print "Mining blocks..." + self.nodes[0].generate(105) + self.sync_all() + + chain_height = self.nodes[1].getblockcount() + assert_equal(chain_height, 105) + assert_equal(self.nodes[1].getbalance(), 0) + assert_equal(self.nodes[2].getbalance(), 0) + + node0utxos = self.nodes[0].listunspent(1) + tx1 = self.nodes[0].createrawtransaction([node0utxos.pop()], {self.nodes[1].getnewaddress(): 50}) + txid1 = self.nodes[0].sendrawtransaction(self.nodes[0].signrawtransaction(tx1)["hex"]) + tx2 = self.nodes[0].createrawtransaction([node0utxos.pop()], {self.nodes[1].getnewaddress(): 50}) + txid2 = self.nodes[0].sendrawtransaction(self.nodes[0].signrawtransaction(tx2)["hex"]) + assert_raises(JSONRPCException, self.nodes[0].gettxoutproof, [txid1]) + + self.nodes[0].generate(1) + blockhash = self.nodes[0].getblockhash(chain_height + 1) + self.sync_all() + + txlist = [] + blocktxn = self.nodes[0].getblock(blockhash, True)["tx"] + txlist.append(blocktxn[1]) + txlist.append(blocktxn[2]) + + assert_equal(self.nodes[2].verifytxoutproof(self.nodes[2].gettxoutproof([txid1])), [txid1]) + assert_equal(self.nodes[2].verifytxoutproof(self.nodes[2].gettxoutproof([txid1, txid2])), txlist) + assert_equal(self.nodes[2].verifytxoutproof(self.nodes[2].gettxoutproof([txid1, txid2], blockhash)), txlist) + + txin_spent = self.nodes[1].listunspent(1).pop() + tx3 = self.nodes[1].createrawtransaction([txin_spent], {self.nodes[0].getnewaddress(): 50}) + self.nodes[0].sendrawtransaction(self.nodes[1].signrawtransaction(tx3)["hex"]) + self.nodes[0].generate(1) + self.sync_all() + + txid_spent = txin_spent["txid"] + txid_unspent = txid1 if txin_spent["txid"] != txid1 else txid2 + + # We cant find the block from a fully-spent tx + assert_raises(JSONRPCException, self.nodes[2].gettxoutproof, [txid_spent]) + # ...but we can if we specify the block + assert_equal(self.nodes[2].verifytxoutproof(self.nodes[2].gettxoutproof([txid_spent], blockhash)), [txid_spent]) + # ...or if the first tx is not fully-spent + assert_equal(self.nodes[2].verifytxoutproof(self.nodes[2].gettxoutproof([txid_unspent])), [txid_unspent]) + try: + assert_equal(self.nodes[2].verifytxoutproof(self.nodes[2].gettxoutproof([txid1, txid2])), txlist) + except JSONRPCException: + assert_equal(self.nodes[2].verifytxoutproof(self.nodes[2].gettxoutproof([txid2, txid1])), txlist) + # ...or if we have a -txindex + assert_equal(self.nodes[2].verifytxoutproof(self.nodes[3].gettxoutproof([txid_spent])), [txid_spent]) + +if __name__ == '__main__': + MerkleBlockTest().main() diff --git a/qa/rpc-tests/mininode.py b/qa/rpc-tests/mininode.py new file mode 100755 index 0000000000..b7d78e74fa --- /dev/null +++ b/qa/rpc-tests/mininode.py @@ -0,0 +1,1256 @@ +# mininode.py - Bitcoin P2P network half-a-node +# +# Distributed under the MIT/X11 software license, see the accompanying +# file COPYING or http://www.opensource.org/licenses/mit-license.php. +# +# This python code was modified from ArtForz' public domain half-a-node, as +# found in the mini-node branch of http://github.com/jgarzik/pynode. +# +# NodeConn: an object which manages p2p connectivity to a bitcoin node +# NodeConnCB: a base class that describes the interface for receiving +# callbacks with network messages from a NodeConn +# CBlock, CTransaction, CBlockHeader, CTxIn, CTxOut, etc....: +# data structures that should map to corresponding structures in +# bitcoin/primitives +# msg_block, msg_tx, msg_headers, etc.: +# data structures that represent network messages +# ser_*, deser_*: functions that handle serialization/deserialization + + +import struct +import socket +import asyncore +import binascii +import time +import sys +import random +import cStringIO +import hashlib +from threading import RLock +from threading import Thread +import logging +import copy + +BIP0031_VERSION = 60000 +MY_VERSION = 60001 # past bip-31 for ping/pong +MY_SUBVERSION = "/python-mininode-tester:0.0.1/" + +MAX_INV_SZ = 50000 + +# Keep our own socket map for asyncore, so that we can track disconnects +# ourselves (to workaround an issue with closing an asyncore socket when +# using select) +mininode_socket_map = dict() + +# One lock for synchronizing all data access between the networking thread (see +# NetworkThread below) and the thread running the test logic. For simplicity, +# NodeConn acquires this lock whenever delivering a message to to a NodeConnCB, +# and whenever adding anything to the send buffer (in send_message()). This +# lock should be acquired in the thread running the test logic to synchronize +# access to any data shared with the NodeConnCB or NodeConn. +mininode_lock = RLock() + +# Serialization/deserialization tools +def sha256(s): + return hashlib.new('sha256', s).digest() + + +def hash256(s): + return sha256(sha256(s)) + + +def deser_string(f): + nit = struct.unpack("<B", f.read(1))[0] + if nit == 253: + nit = struct.unpack("<H", f.read(2))[0] + elif nit == 254: + nit = struct.unpack("<I", f.read(4))[0] + elif nit == 255: + nit = struct.unpack("<Q", f.read(8))[0] + return f.read(nit) + + +def ser_string(s): + if len(s) < 253: + return chr(len(s)) + s + elif len(s) < 0x10000: + return chr(253) + struct.pack("<H", len(s)) + s + elif len(s) < 0x100000000L: + return chr(254) + struct.pack("<I", len(s)) + s + return chr(255) + struct.pack("<Q", len(s)) + s + + +def deser_uint256(f): + r = 0L + for i in xrange(8): + t = struct.unpack("<I", f.read(4))[0] + r += t << (i * 32) + return r + + +def ser_uint256(u): + rs = "" + for i in xrange(8): + rs += struct.pack("<I", u & 0xFFFFFFFFL) + u >>= 32 + return rs + + +def uint256_from_str(s): + r = 0L + t = struct.unpack("<IIIIIIII", s[:32]) + for i in xrange(8): + r += t[i] << (i * 32) + return r + + +def uint256_from_compact(c): + nbytes = (c >> 24) & 0xFF + v = (c & 0xFFFFFFL) << (8 * (nbytes - 3)) + return v + + +def deser_vector(f, c): + nit = struct.unpack("<B", f.read(1))[0] + if nit == 253: + nit = struct.unpack("<H", f.read(2))[0] + elif nit == 254: + nit = struct.unpack("<I", f.read(4))[0] + elif nit == 255: + nit = struct.unpack("<Q", f.read(8))[0] + r = [] + for i in xrange(nit): + t = c() + t.deserialize(f) + r.append(t) + return r + + +def ser_vector(l): + r = "" + if len(l) < 253: + r = chr(len(l)) + elif len(l) < 0x10000: + r = chr(253) + struct.pack("<H", len(l)) + elif len(l) < 0x100000000L: + r = chr(254) + struct.pack("<I", len(l)) + else: + r = chr(255) + struct.pack("<Q", len(l)) + for i in l: + r += i.serialize() + return r + + +def deser_uint256_vector(f): + nit = struct.unpack("<B", f.read(1))[0] + if nit == 253: + nit = struct.unpack("<H", f.read(2))[0] + elif nit == 254: + nit = struct.unpack("<I", f.read(4))[0] + elif nit == 255: + nit = struct.unpack("<Q", f.read(8))[0] + r = [] + for i in xrange(nit): + t = deser_uint256(f) + r.append(t) + return r + + +def ser_uint256_vector(l): + r = "" + if len(l) < 253: + r = chr(len(l)) + elif len(l) < 0x10000: + r = chr(253) + struct.pack("<H", len(l)) + elif len(l) < 0x100000000L: + r = chr(254) + struct.pack("<I", len(l)) + else: + r = chr(255) + struct.pack("<Q", len(l)) + for i in l: + r += ser_uint256(i) + return r + + +def deser_string_vector(f): + nit = struct.unpack("<B", f.read(1))[0] + if nit == 253: + nit = struct.unpack("<H", f.read(2))[0] + elif nit == 254: + nit = struct.unpack("<I", f.read(4))[0] + elif nit == 255: + nit = struct.unpack("<Q", f.read(8))[0] + r = [] + for i in xrange(nit): + t = deser_string(f) + r.append(t) + return r + + +def ser_string_vector(l): + r = "" + if len(l) < 253: + r = chr(len(l)) + elif len(l) < 0x10000: + r = chr(253) + struct.pack("<H", len(l)) + elif len(l) < 0x100000000L: + r = chr(254) + struct.pack("<I", len(l)) + else: + r = chr(255) + struct.pack("<Q", len(l)) + for sv in l: + r += ser_string(sv) + return r + + +def deser_int_vector(f): + nit = struct.unpack("<B", f.read(1))[0] + if nit == 253: + nit = struct.unpack("<H", f.read(2))[0] + elif nit == 254: + nit = struct.unpack("<I", f.read(4))[0] + elif nit == 255: + nit = struct.unpack("<Q", f.read(8))[0] + r = [] + for i in xrange(nit): + t = struct.unpack("<i", f.read(4))[0] + r.append(t) + return r + + +def ser_int_vector(l): + r = "" + if len(l) < 253: + r = chr(len(l)) + elif len(l) < 0x10000: + r = chr(253) + struct.pack("<H", len(l)) + elif len(l) < 0x100000000L: + r = chr(254) + struct.pack("<I", len(l)) + else: + r = chr(255) + struct.pack("<Q", len(l)) + for i in l: + r += struct.pack("<i", i) + return r + + +# Objects that map to bitcoind objects, which can be serialized/deserialized + +class CAddress(object): + def __init__(self): + self.nServices = 1 + self.pchReserved = "\x00" * 10 + "\xff" * 2 + self.ip = "0.0.0.0" + self.port = 0 + + def deserialize(self, f): + self.nServices = struct.unpack("<Q", f.read(8))[0] + self.pchReserved = f.read(12) + self.ip = socket.inet_ntoa(f.read(4)) + self.port = struct.unpack(">H", f.read(2))[0] + + def serialize(self): + r = "" + r += struct.pack("<Q", self.nServices) + r += self.pchReserved + r += socket.inet_aton(self.ip) + r += struct.pack(">H", self.port) + return r + + def __repr__(self): + return "CAddress(nServices=%i ip=%s port=%i)" % (self.nServices, + self.ip, self.port) + + +class CInv(object): + typemap = { + 0: "Error", + 1: "TX", + 2: "Block"} + + def __init__(self, t=0, h=0L): + self.type = t + self.hash = h + + def deserialize(self, f): + self.type = struct.unpack("<i", f.read(4))[0] + self.hash = deser_uint256(f) + + def serialize(self): + r = "" + r += struct.pack("<i", self.type) + r += ser_uint256(self.hash) + return r + + def __repr__(self): + return "CInv(type=%s hash=%064x)" \ + % (self.typemap[self.type], self.hash) + + +class CBlockLocator(object): + def __init__(self): + self.nVersion = MY_VERSION + self.vHave = [] + + def deserialize(self, f): + self.nVersion = struct.unpack("<i", f.read(4))[0] + self.vHave = deser_uint256_vector(f) + + def serialize(self): + r = "" + r += struct.pack("<i", self.nVersion) + r += ser_uint256_vector(self.vHave) + return r + + def __repr__(self): + return "CBlockLocator(nVersion=%i vHave=%s)" \ + % (self.nVersion, repr(self.vHave)) + + +class COutPoint(object): + def __init__(self, hash=0, n=0): + self.hash = hash + self.n = n + + def deserialize(self, f): + self.hash = deser_uint256(f) + self.n = struct.unpack("<I", f.read(4))[0] + + def serialize(self): + r = "" + r += ser_uint256(self.hash) + r += struct.pack("<I", self.n) + return r + + def __repr__(self): + return "COutPoint(hash=%064x n=%i)" % (self.hash, self.n) + + +class CTxIn(object): + def __init__(self, outpoint=None, scriptSig="", nSequence=0): + if outpoint is None: + self.prevout = COutPoint() + else: + self.prevout = outpoint + self.scriptSig = scriptSig + self.nSequence = nSequence + + def deserialize(self, f): + self.prevout = COutPoint() + self.prevout.deserialize(f) + self.scriptSig = deser_string(f) + self.nSequence = struct.unpack("<I", f.read(4))[0] + + def serialize(self): + r = "" + r += self.prevout.serialize() + r += ser_string(self.scriptSig) + r += struct.pack("<I", self.nSequence) + return r + + def __repr__(self): + return "CTxIn(prevout=%s scriptSig=%s nSequence=%i)" \ + % (repr(self.prevout), binascii.hexlify(self.scriptSig), + self.nSequence) + + +class CTxOut(object): + def __init__(self, nValue=0, scriptPubKey=""): + self.nValue = nValue + self.scriptPubKey = scriptPubKey + + def deserialize(self, f): + self.nValue = struct.unpack("<q", f.read(8))[0] + self.scriptPubKey = deser_string(f) + + def serialize(self): + r = "" + r += struct.pack("<q", self.nValue) + r += ser_string(self.scriptPubKey) + return r + + def __repr__(self): + return "CTxOut(nValue=%i.%08i scriptPubKey=%s)" \ + % (self.nValue // 100000000, self.nValue % 100000000, + binascii.hexlify(self.scriptPubKey)) + + +class CTransaction(object): + def __init__(self, tx=None): + if tx is None: + self.nVersion = 1 + self.vin = [] + self.vout = [] + self.nLockTime = 0 + self.sha256 = None + self.hash = None + else: + self.nVersion = tx.nVersion + self.vin = copy.deepcopy(tx.vin) + self.vout = copy.deepcopy(tx.vout) + self.nLockTime = tx.nLockTime + self.sha256 = None + self.hash = None + + def deserialize(self, f): + self.nVersion = struct.unpack("<i", f.read(4))[0] + self.vin = deser_vector(f, CTxIn) + self.vout = deser_vector(f, CTxOut) + self.nLockTime = struct.unpack("<I", f.read(4))[0] + self.sha256 = None + self.hash = None + + def serialize(self): + r = "" + r += struct.pack("<i", self.nVersion) + r += ser_vector(self.vin) + r += ser_vector(self.vout) + r += struct.pack("<I", self.nLockTime) + return r + + def rehash(self): + self.sha256 = None + self.calc_sha256() + + def calc_sha256(self): + if self.sha256 is None: + self.sha256 = uint256_from_str(hash256(self.serialize())) + self.hash = hash256(self.serialize())[::-1].encode('hex_codec') + + def is_valid(self): + self.calc_sha256() + for tout in self.vout: + if tout.nValue < 0 or tout.nValue > 21000000L * 100000000L: + return False + return True + + def __repr__(self): + return "CTransaction(nVersion=%i vin=%s vout=%s nLockTime=%i)" \ + % (self.nVersion, repr(self.vin), repr(self.vout), self.nLockTime) + + +class CBlockHeader(object): + def __init__(self, header=None): + if header is None: + self.set_null() + else: + self.nVersion = header.nVersion + self.hashPrevBlock = header.hashPrevBlock + self.hashMerkleRoot = header.hashMerkleRoot + self.nTime = header.nTime + self.nBits = header.nBits + self.nNonce = header.nNonce + self.sha256 = header.sha256 + self.hash = header.hash + self.calc_sha256() + + def set_null(self): + self.nVersion = 1 + self.hashPrevBlock = 0 + self.hashMerkleRoot = 0 + self.nTime = 0 + self.nBits = 0 + self.nNonce = 0 + self.sha256 = None + self.hash = None + + def deserialize(self, f): + self.nVersion = struct.unpack("<i", f.read(4))[0] + self.hashPrevBlock = deser_uint256(f) + self.hashMerkleRoot = deser_uint256(f) + self.nTime = struct.unpack("<I", f.read(4))[0] + self.nBits = struct.unpack("<I", f.read(4))[0] + self.nNonce = struct.unpack("<I", f.read(4))[0] + self.sha256 = None + self.hash = None + + def serialize(self): + r = "" + r += struct.pack("<i", self.nVersion) + r += ser_uint256(self.hashPrevBlock) + r += ser_uint256(self.hashMerkleRoot) + r += struct.pack("<I", self.nTime) + r += struct.pack("<I", self.nBits) + r += struct.pack("<I", self.nNonce) + return r + + def calc_sha256(self): + if self.sha256 is None: + r = "" + r += struct.pack("<i", self.nVersion) + r += ser_uint256(self.hashPrevBlock) + r += ser_uint256(self.hashMerkleRoot) + r += struct.pack("<I", self.nTime) + r += struct.pack("<I", self.nBits) + r += struct.pack("<I", self.nNonce) + self.sha256 = uint256_from_str(hash256(r)) + self.hash = hash256(r)[::-1].encode('hex_codec') + + def rehash(self): + self.sha256 = None + self.calc_sha256() + return self.sha256 + + def __repr__(self): + return "CBlockHeader(nVersion=%i hashPrevBlock=%064x hashMerkleRoot=%064x nTime=%s nBits=%08x nNonce=%08x)" \ + % (self.nVersion, self.hashPrevBlock, self.hashMerkleRoot, + time.ctime(self.nTime), self.nBits, self.nNonce) + + +class CBlock(CBlockHeader): + def __init__(self, header=None): + super(CBlock, self).__init__(header) + self.vtx = [] + + def deserialize(self, f): + super(CBlock, self).deserialize(f) + self.vtx = deser_vector(f, CTransaction) + + def serialize(self): + r = "" + r += super(CBlock, self).serialize() + r += ser_vector(self.vtx) + return r + + def calc_merkle_root(self): + hashes = [] + for tx in self.vtx: + tx.calc_sha256() + hashes.append(ser_uint256(tx.sha256)) + while len(hashes) > 1: + newhashes = [] + for i in xrange(0, len(hashes), 2): + i2 = min(i+1, len(hashes)-1) + newhashes.append(hash256(hashes[i] + hashes[i2])) + hashes = newhashes + return uint256_from_str(hashes[0]) + + def is_valid(self): + self.calc_sha256() + target = uint256_from_compact(self.nBits) + if self.sha256 > target: + return False + for tx in self.vtx: + if not tx.is_valid(): + return False + if self.calc_merkle_root() != self.hashMerkleRoot: + return False + return True + + def solve(self): + self.calc_sha256() + target = uint256_from_compact(self.nBits) + while self.sha256 > target: + self.nNonce += 1 + self.rehash() + + def __repr__(self): + return "CBlock(nVersion=%i hashPrevBlock=%064x hashMerkleRoot=%064x nTime=%s nBits=%08x nNonce=%08x vtx=%s)" \ + % (self.nVersion, self.hashPrevBlock, self.hashMerkleRoot, + time.ctime(self.nTime), self.nBits, self.nNonce, repr(self.vtx)) + + +class CUnsignedAlert(object): + def __init__(self): + self.nVersion = 1 + self.nRelayUntil = 0 + self.nExpiration = 0 + self.nID = 0 + self.nCancel = 0 + self.setCancel = [] + self.nMinVer = 0 + self.nMaxVer = 0 + self.setSubVer = [] + self.nPriority = 0 + self.strComment = "" + self.strStatusBar = "" + self.strReserved = "" + + def deserialize(self, f): + self.nVersion = struct.unpack("<i", f.read(4))[0] + self.nRelayUntil = struct.unpack("<q", f.read(8))[0] + self.nExpiration = struct.unpack("<q", f.read(8))[0] + self.nID = struct.unpack("<i", f.read(4))[0] + self.nCancel = struct.unpack("<i", f.read(4))[0] + self.setCancel = deser_int_vector(f) + self.nMinVer = struct.unpack("<i", f.read(4))[0] + self.nMaxVer = struct.unpack("<i", f.read(4))[0] + self.setSubVer = deser_string_vector(f) + self.nPriority = struct.unpack("<i", f.read(4))[0] + self.strComment = deser_string(f) + self.strStatusBar = deser_string(f) + self.strReserved = deser_string(f) + + def serialize(self): + r = "" + r += struct.pack("<i", self.nVersion) + r += struct.pack("<q", self.nRelayUntil) + r += struct.pack("<q", self.nExpiration) + r += struct.pack("<i", self.nID) + r += struct.pack("<i", self.nCancel) + r += ser_int_vector(self.setCancel) + r += struct.pack("<i", self.nMinVer) + r += struct.pack("<i", self.nMaxVer) + r += ser_string_vector(self.setSubVer) + r += struct.pack("<i", self.nPriority) + r += ser_string(self.strComment) + r += ser_string(self.strStatusBar) + r += ser_string(self.strReserved) + return r + + def __repr__(self): + return "CUnsignedAlert(nVersion %d, nRelayUntil %d, nExpiration %d, nID %d, nCancel %d, nMinVer %d, nMaxVer %d, nPriority %d, strComment %s, strStatusBar %s, strReserved %s)" \ + % (self.nVersion, self.nRelayUntil, self.nExpiration, self.nID, + self.nCancel, self.nMinVer, self.nMaxVer, self.nPriority, + self.strComment, self.strStatusBar, self.strReserved) + + +class CAlert(object): + def __init__(self): + self.vchMsg = "" + self.vchSig = "" + + def deserialize(self, f): + self.vchMsg = deser_string(f) + self.vchSig = deser_string(f) + + def serialize(self): + r = "" + r += ser_string(self.vchMsg) + r += ser_string(self.vchSig) + return r + + def __repr__(self): + return "CAlert(vchMsg.sz %d, vchSig.sz %d)" \ + % (len(self.vchMsg), len(self.vchSig)) + + +# Objects that correspond to messages on the wire +class msg_version(object): + command = "version" + + def __init__(self): + self.nVersion = MY_VERSION + self.nServices = 1 + self.nTime = time.time() + self.addrTo = CAddress() + self.addrFrom = CAddress() + self.nNonce = random.getrandbits(64) + self.strSubVer = MY_SUBVERSION + self.nStartingHeight = -1 + + def deserialize(self, f): + self.nVersion = struct.unpack("<i", f.read(4))[0] + if self.nVersion == 10300: + self.nVersion = 300 + self.nServices = struct.unpack("<Q", f.read(8))[0] + self.nTime = struct.unpack("<q", f.read(8))[0] + self.addrTo = CAddress() + self.addrTo.deserialize(f) + if self.nVersion >= 106: + self.addrFrom = CAddress() + self.addrFrom.deserialize(f) + self.nNonce = struct.unpack("<Q", f.read(8))[0] + self.strSubVer = deser_string(f) + if self.nVersion >= 209: + self.nStartingHeight = struct.unpack("<i", f.read(4))[0] + else: + self.nStartingHeight = None + else: + self.addrFrom = None + self.nNonce = None + self.strSubVer = None + self.nStartingHeight = None + + def serialize(self): + r = "" + r += struct.pack("<i", self.nVersion) + r += struct.pack("<Q", self.nServices) + r += struct.pack("<q", self.nTime) + r += self.addrTo.serialize() + r += self.addrFrom.serialize() + r += struct.pack("<Q", self.nNonce) + r += ser_string(self.strSubVer) + r += struct.pack("<i", self.nStartingHeight) + return r + + def __repr__(self): + return 'msg_version(nVersion=%i nServices=%i nTime=%s addrTo=%s addrFrom=%s nNonce=0x%016X strSubVer=%s nStartingHeight=%i)' \ + % (self.nVersion, self.nServices, time.ctime(self.nTime), + repr(self.addrTo), repr(self.addrFrom), self.nNonce, + self.strSubVer, self.nStartingHeight) + + +class msg_verack(object): + command = "verack" + + def __init__(self): + pass + + def deserialize(self, f): + pass + + def serialize(self): + return "" + + def __repr__(self): + return "msg_verack()" + + +class msg_addr(object): + command = "addr" + + def __init__(self): + self.addrs = [] + + def deserialize(self, f): + self.addrs = deser_vector(f, CAddress) + + def serialize(self): + return ser_vector(self.addrs) + + def __repr__(self): + return "msg_addr(addrs=%s)" % (repr(self.addrs)) + + +class msg_alert(object): + command = "alert" + + def __init__(self): + self.alert = CAlert() + + def deserialize(self, f): + self.alert = CAlert() + self.alert.deserialize(f) + + def serialize(self): + r = "" + r += self.alert.serialize() + return r + + def __repr__(self): + return "msg_alert(alert=%s)" % (repr(self.alert), ) + + +class msg_inv(object): + command = "inv" + + def __init__(self, inv=None): + if inv is None: + self.inv = [] + else: + self.inv = inv + + def deserialize(self, f): + self.inv = deser_vector(f, CInv) + + def serialize(self): + return ser_vector(self.inv) + + def __repr__(self): + return "msg_inv(inv=%s)" % (repr(self.inv)) + + +class msg_getdata(object): + command = "getdata" + + def __init__(self): + self.inv = [] + + def deserialize(self, f): + self.inv = deser_vector(f, CInv) + + def serialize(self): + return ser_vector(self.inv) + + def __repr__(self): + return "msg_getdata(inv=%s)" % (repr(self.inv)) + + +class msg_getblocks(object): + command = "getblocks" + + def __init__(self): + self.locator = CBlockLocator() + self.hashstop = 0L + + def deserialize(self, f): + self.locator = CBlockLocator() + self.locator.deserialize(f) + self.hashstop = deser_uint256(f) + + def serialize(self): + r = "" + r += self.locator.serialize() + r += ser_uint256(self.hashstop) + return r + + def __repr__(self): + return "msg_getblocks(locator=%s hashstop=%064x)" \ + % (repr(self.locator), self.hashstop) + + +class msg_tx(object): + command = "tx" + + def __init__(self, tx=CTransaction()): + self.tx = tx + + def deserialize(self, f): + self.tx.deserialize(f) + + def serialize(self): + return self.tx.serialize() + + def __repr__(self): + return "msg_tx(tx=%s)" % (repr(self.tx)) + + +class msg_block(object): + command = "block" + + def __init__(self, block=None): + if block is None: + self.block = CBlock() + else: + self.block = block + + def deserialize(self, f): + self.block.deserialize(f) + + def serialize(self): + return self.block.serialize() + + def __repr__(self): + return "msg_block(block=%s)" % (repr(self.block)) + + +class msg_getaddr(object): + command = "getaddr" + + def __init__(self): + pass + + def deserialize(self, f): + pass + + def serialize(self): + return "" + + def __repr__(self): + return "msg_getaddr()" + + +class msg_ping_prebip31(object): + command = "ping" + + def __init__(self): + pass + + def deserialize(self, f): + pass + + def serialize(self): + return "" + + def __repr__(self): + return "msg_ping() (pre-bip31)" + + +class msg_ping(object): + command = "ping" + + def __init__(self, nonce=0L): + self.nonce = nonce + + def deserialize(self, f): + self.nonce = struct.unpack("<Q", f.read(8))[0] + + def serialize(self): + r = "" + r += struct.pack("<Q", self.nonce) + return r + + def __repr__(self): + return "msg_ping(nonce=%08x)" % self.nonce + + +class msg_pong(object): + command = "pong" + + def __init__(self, nonce=0L): + self.nonce = nonce + + def deserialize(self, f): + self.nonce = struct.unpack("<Q", f.read(8))[0] + + def serialize(self): + r = "" + r += struct.pack("<Q", self.nonce) + return r + + def __repr__(self): + return "msg_pong(nonce=%08x)" % self.nonce + + +class msg_mempool(object): + command = "mempool" + + def __init__(self): + pass + + def deserialize(self, f): + pass + + def serialize(self): + return "" + + def __repr__(self): + return "msg_mempool()" + + +# getheaders message has +# number of entries +# vector of hashes +# hash_stop (hash of last desired block header, 0 to get as many as possible) +class msg_getheaders(object): + command = "getheaders" + + def __init__(self): + self.locator = CBlockLocator() + self.hashstop = 0L + + def deserialize(self, f): + self.locator = CBlockLocator() + self.locator.deserialize(f) + self.hashstop = deser_uint256(f) + + def serialize(self): + r = "" + r += self.locator.serialize() + r += ser_uint256(self.hashstop) + return r + + def __repr__(self): + return "msg_getheaders(locator=%s, stop=%064x)" \ + % (repr(self.locator), self.hashstop) + + +# headers message has +# <count> <vector of block headers> +class msg_headers(object): + command = "headers" + + def __init__(self): + self.headers = [] + + def deserialize(self, f): + # comment in bitcoind indicates these should be deserialized as blocks + blocks = deser_vector(f, CBlock) + for x in blocks: + self.headers.append(CBlockHeader(x)) + + def serialize(self): + blocks = [CBlock(x) for x in self.headers] + return ser_vector(blocks) + + def __repr__(self): + return "msg_headers(headers=%s)" % repr(self.headers) + + +class msg_reject(object): + command = "reject" + + def __init__(self): + self.message = "" + self.code = "" + self.reason = "" + self.data = 0L + + def deserialize(self, f): + self.message = deser_string(f) + self.code = struct.unpack("<B", f.read(1))[0] + self.reason = deser_string(f) + if (self.message == "block" or self.message == "tx"): + self.data = deser_uint256(f) + + def serialize(self): + r = ser_string(self.message) + r += struct.pack("<B", self.code) + r += ser_string(self.reason) + if (self.message == "block" or self.message == "tx"): + r += ser_uint256(self.data) + return r + + def __repr__(self): + return "msg_reject: %s %d %s [%064x]" \ + % (self.message, self.code, self.reason, self.data) + + +# This is what a callback should look like for NodeConn +# Reimplement the on_* functions to provide handling for events +class NodeConnCB(object): + def __init__(self): + self.verack_received = False + + # Derived classes should call this function once to set the message map + # which associates the derived classes' functions to incoming messages + def create_callback_map(self): + self.cbmap = { + "version": self.on_version, + "verack": self.on_verack, + "addr": self.on_addr, + "alert": self.on_alert, + "inv": self.on_inv, + "getdata": self.on_getdata, + "getblocks": self.on_getblocks, + "tx": self.on_tx, + "block": self.on_block, + "getaddr": self.on_getaddr, + "ping": self.on_ping, + "pong": self.on_pong, + "headers": self.on_headers, + "getheaders": self.on_getheaders, + "reject": self.on_reject, + "mempool": self.on_mempool + } + + def deliver(self, conn, message): + with mininode_lock: + try: + self.cbmap[message.command](conn, message) + except: + print "ERROR delivering %s (%s)" % (repr(message), + sys.exc_info()[0]) + + def on_version(self, conn, message): + if message.nVersion >= 209: + conn.send_message(msg_verack()) + conn.ver_send = min(MY_VERSION, message.nVersion) + if message.nVersion < 209: + conn.ver_recv = conn.ver_send + + def on_verack(self, conn, message): + conn.ver_recv = conn.ver_send + self.verack_received = True + + def on_inv(self, conn, message): + want = msg_getdata() + for i in message.inv: + if i.type != 0: + want.inv.append(i) + if len(want.inv): + conn.send_message(want) + + def on_addr(self, conn, message): pass + def on_alert(self, conn, message): pass + def on_getdata(self, conn, message): pass + def on_getblocks(self, conn, message): pass + def on_tx(self, conn, message): pass + def on_block(self, conn, message): pass + def on_getaddr(self, conn, message): pass + def on_headers(self, conn, message): pass + def on_getheaders(self, conn, message): pass + def on_ping(self, conn, message): + if conn.ver_send > BIP0031_VERSION: + conn.send_message(msg_pong(message.nonce)) + def on_reject(self, conn, message): pass + def on_close(self, conn): pass + def on_mempool(self, conn): pass + def on_pong(self, conn, message): pass + + +# The actual NodeConn class +# This class provides an interface for a p2p connection to a specified node +class NodeConn(asyncore.dispatcher): + messagemap = { + "version": msg_version, + "verack": msg_verack, + "addr": msg_addr, + "alert": msg_alert, + "inv": msg_inv, + "getdata": msg_getdata, + "getblocks": msg_getblocks, + "tx": msg_tx, + "block": msg_block, + "getaddr": msg_getaddr, + "ping": msg_ping, + "pong": msg_pong, + "headers": msg_headers, + "getheaders": msg_getheaders, + "reject": msg_reject, + "mempool": msg_mempool + } + MAGIC_BYTES = { + "mainnet": "\xf9\xbe\xb4\xd9", # mainnet + "testnet3": "\x0b\x11\x09\x07", # testnet3 + "regtest": "\xfa\xbf\xb5\xda" # regtest + } + + def __init__(self, dstaddr, dstport, rpc, callback, net="regtest"): + asyncore.dispatcher.__init__(self, map=mininode_socket_map) + self.log = logging.getLogger("NodeConn(%s:%d)" % (dstaddr, dstport)) + self.dstaddr = dstaddr + self.dstport = dstport + self.create_socket(socket.AF_INET, socket.SOCK_STREAM) + self.sendbuf = "" + self.recvbuf = "" + self.ver_send = 209 + self.ver_recv = 209 + self.last_sent = 0 + self.state = "connecting" + self.network = net + self.cb = callback + self.disconnect = False + + # stuff version msg into sendbuf + vt = msg_version() + vt.addrTo.ip = self.dstaddr + vt.addrTo.port = self.dstport + vt.addrFrom.ip = "0.0.0.0" + vt.addrFrom.port = 0 + self.send_message(vt, True) + print 'MiniNode: Connecting to Bitcoin Node IP # ' + dstaddr + ':' \ + + str(dstport) + + try: + self.connect((dstaddr, dstport)) + except: + self.handle_close() + self.rpc = rpc + + def show_debug_msg(self, msg): + self.log.debug(msg) + + def handle_connect(self): + self.show_debug_msg("MiniNode: Connected & Listening: \n") + self.state = "connected" + + def handle_close(self): + self.show_debug_msg("MiniNode: Closing Connection to %s:%d... " + % (self.dstaddr, self.dstport)) + self.state = "closed" + self.recvbuf = "" + self.sendbuf = "" + try: + self.close() + except: + pass + self.cb.on_close(self) + + def handle_read(self): + try: + t = self.recv(8192) + if len(t) > 0: + self.recvbuf += t + self.got_data() + except: + pass + + def readable(self): + return True + + def writable(self): + with mininode_lock: + length = len(self.sendbuf) + return (length > 0) + + def handle_write(self): + with mininode_lock: + try: + sent = self.send(self.sendbuf) + except: + self.handle_close() + return + self.sendbuf = self.sendbuf[sent:] + + def got_data(self): + while True: + if len(self.recvbuf) < 4: + return + if self.recvbuf[:4] != self.MAGIC_BYTES[self.network]: + raise ValueError("got garbage %s" % repr(self.recvbuf)) + if self.ver_recv < 209: + if len(self.recvbuf) < 4 + 12 + 4: + return + command = self.recvbuf[4:4+12].split("\x00", 1)[0] + msglen = struct.unpack("<i", self.recvbuf[4+12:4+12+4])[0] + checksum = None + if len(self.recvbuf) < 4 + 12 + 4 + msglen: + return + msg = self.recvbuf[4+12+4:4+12+4+msglen] + self.recvbuf = self.recvbuf[4+12+4+msglen:] + else: + if len(self.recvbuf) < 4 + 12 + 4 + 4: + return + command = self.recvbuf[4:4+12].split("\x00", 1)[0] + msglen = struct.unpack("<i", self.recvbuf[4+12:4+12+4])[0] + checksum = self.recvbuf[4+12+4:4+12+4+4] + if len(self.recvbuf) < 4 + 12 + 4 + 4 + msglen: + return + msg = self.recvbuf[4+12+4+4:4+12+4+4+msglen] + th = sha256(msg) + h = sha256(th) + if checksum != h[:4]: + raise ValueError("got bad checksum " + repr(self.recvbuf)) + self.recvbuf = self.recvbuf[4+12+4+4+msglen:] + if command in self.messagemap: + f = cStringIO.StringIO(msg) + t = self.messagemap[command]() + t.deserialize(f) + self.got_message(t) + else: + self.show_debug_msg("Unknown command: '" + command + "' " + + repr(msg)) + + def send_message(self, message, pushbuf=False): + if self.state != "connected" and not pushbuf: + return + self.show_debug_msg("Send %s" % repr(message)) + command = message.command + data = message.serialize() + tmsg = self.MAGIC_BYTES[self.network] + tmsg += command + tmsg += "\x00" * (12 - len(command)) + tmsg += struct.pack("<I", len(data)) + if self.ver_send >= 209: + th = sha256(data) + h = sha256(th) + tmsg += h[:4] + tmsg += data + with mininode_lock: + self.sendbuf += tmsg + self.last_sent = time.time() + + def got_message(self, message): + if message.command == "version": + if message.nVersion <= BIP0031_VERSION: + self.messagemap['ping'] = msg_ping_prebip31 + if self.last_sent + 30 * 60 < time.time(): + self.send_message(self.messagemap['ping']()) + self.show_debug_msg("Recv %s" % repr(message)) + self.cb.deliver(self, message) + + def disconnect_node(self): + self.disconnect = True + + +class NetworkThread(Thread): + def run(self): + while mininode_socket_map: + # We check for whether to disconnect outside of the asyncore + # loop to workaround the behavior of asyncore when using + # select + disconnected = [] + for fd, obj in mininode_socket_map.items(): + if obj.disconnect: + disconnected.append(obj) + [ obj.handle_close() for obj in disconnected ] + asyncore.loop(0.1, use_poll=True, map=mininode_socket_map, count=1) + + +# An exception we can raise if we detect a potential disconnect +# (p2p or rpc) before the test is complete +class EarlyDisconnectError(Exception): + def __init__(self, value): + self.value = value + + def __str__(self): + return repr(self.value) diff --git a/qa/rpc-tests/pruning.py b/qa/rpc-tests/pruning.py new file mode 100755 index 0000000000..f26cbee1e2 --- /dev/null +++ b/qa/rpc-tests/pruning.py @@ -0,0 +1,356 @@ +#!/usr/bin/env python2 +# Copyright (c) 2014 The Bitcoin Core developers +# Distributed under the MIT software license, see the accompanying +# file COPYING or http://www.opensource.org/licenses/mit-license.php. + +# +# Test pruning code +# ******** +# WARNING: +# This test uses 4GB of disk space and takes in excess of 30 mins to run +# ******** + +from test_framework import BitcoinTestFramework +from bitcoinrpc.authproxy import AuthServiceProxy, JSONRPCException +from util import * +import os.path + +def calc_usage(blockdir): + return sum(os.path.getsize(blockdir+f) for f in os.listdir(blockdir) if os.path.isfile(blockdir+f))/(1024*1024) + +class PruneTest(BitcoinTestFramework): + + def __init__(self): + self.utxo = [] + self.address = ["",""] + + # Some pre-processing to create a bunch of OP_RETURN txouts to insert into transactions we create + # So we have big transactions and full blocks to fill up our block files + + # create one script_pubkey + script_pubkey = "6a4d0200" #OP_RETURN OP_PUSH2 512 bytes + for i in xrange (512): + script_pubkey = script_pubkey + "01" + # concatenate 128 txouts of above script_pubkey which we'll insert before the txout for change + self.txouts = "81" + for k in xrange(128): + # add txout value + self.txouts = self.txouts + "0000000000000000" + # add length of script_pubkey + self.txouts = self.txouts + "fd0402" + # add script_pubkey + self.txouts = self.txouts + script_pubkey + + + def setup_chain(self): + print("Initializing test directory "+self.options.tmpdir) + initialize_chain_clean(self.options.tmpdir, 3) + + def setup_network(self): + self.nodes = [] + self.is_network_split = False + + # Create nodes 0 and 1 to mine + self.nodes.append(start_node(0, self.options.tmpdir, ["-debug","-maxreceivebuffer=20000","-blockmaxsize=999000", "-checkblocks=5"], timewait=300)) + self.nodes.append(start_node(1, self.options.tmpdir, ["-debug","-maxreceivebuffer=20000","-blockmaxsize=999000", "-checkblocks=5"], timewait=300)) + + # Create node 2 to test pruning + self.nodes.append(start_node(2, self.options.tmpdir, ["-debug","-maxreceivebuffer=20000","-prune=550"], timewait=300)) + self.prunedir = self.options.tmpdir+"/node2/regtest/blocks/" + + self.address[0] = self.nodes[0].getnewaddress() + self.address[1] = self.nodes[1].getnewaddress() + + connect_nodes(self.nodes[0], 1) + connect_nodes(self.nodes[1], 2) + connect_nodes(self.nodes[2], 0) + sync_blocks(self.nodes[0:3]) + + def create_big_chain(self): + # Start by creating some coinbases we can spend later + self.nodes[1].generate(200) + sync_blocks(self.nodes[0:2]) + self.nodes[0].generate(150) + # Then mine enough full blocks to create more than 550MB of data + for i in xrange(645): + self.mine_full_block(self.nodes[0], self.address[0]) + + sync_blocks(self.nodes[0:3]) + + def test_height_min(self): + if not os.path.isfile(self.prunedir+"blk00000.dat"): + raise AssertionError("blk00000.dat is missing, pruning too early") + print "Success" + print "Though we're already using more than 550MB, current usage:", calc_usage(self.prunedir) + print "Mining 25 more blocks should cause the first block file to be pruned" + # Pruning doesn't run until we're allocating another chunk, 20 full blocks past the height cutoff will ensure this + for i in xrange(25): + self.mine_full_block(self.nodes[0],self.address[0]) + + waitstart = time.time() + while os.path.isfile(self.prunedir+"blk00000.dat"): + time.sleep(0.1) + if time.time() - waitstart > 10: + raise AssertionError("blk00000.dat not pruned when it should be") + + print "Success" + usage = calc_usage(self.prunedir) + print "Usage should be below target:", usage + if (usage > 550): + raise AssertionError("Pruning target not being met") + + def create_chain_with_staleblocks(self): + # Create stale blocks in manageable sized chunks + print "Mine 24 (stale) blocks on Node 1, followed by 25 (main chain) block reorg from Node 0, for 12 rounds" + + for j in xrange(12): + # Disconnect node 0 so it can mine a longer reorg chain without knowing about node 1's soon-to-be-stale chain + # Node 2 stays connected, so it hears about the stale blocks and then reorg's when node0 reconnects + # Stopping node 0 also clears its mempool, so it doesn't have node1's transactions to accidentally mine + stop_node(self.nodes[0],0) + self.nodes[0]=start_node(0, self.options.tmpdir, ["-debug","-maxreceivebuffer=20000","-blockmaxsize=999000", "-checkblocks=5"], timewait=300) + # Mine 24 blocks in node 1 + self.utxo = self.nodes[1].listunspent() + for i in xrange(24): + if j == 0: + self.mine_full_block(self.nodes[1],self.address[1]) + else: + self.nodes[1].generate(1) #tx's already in mempool from previous disconnects + + # Reorg back with 25 block chain from node 0 + self.utxo = self.nodes[0].listunspent() + for i in xrange(25): + self.mine_full_block(self.nodes[0],self.address[0]) + + # Create connections in the order so both nodes can see the reorg at the same time + connect_nodes(self.nodes[1], 0) + connect_nodes(self.nodes[2], 0) + sync_blocks(self.nodes[0:3]) + + print "Usage can be over target because of high stale rate:", calc_usage(self.prunedir) + + def reorg_test(self): + # Node 1 will mine a 300 block chain starting 287 blocks back from Node 0 and Node 2's tip + # This will cause Node 2 to do a reorg requiring 288 blocks of undo data to the reorg_test chain + # Reboot node 1 to clear its mempool (hopefully make the invalidate faster) + # Lower the block max size so we don't keep mining all our big mempool transactions (from disconnected blocks) + stop_node(self.nodes[1],1) + self.nodes[1]=start_node(1, self.options.tmpdir, ["-debug","-maxreceivebuffer=20000","-blockmaxsize=5000", "-checkblocks=5", "-disablesafemode"], timewait=300) + + height = self.nodes[1].getblockcount() + print "Current block height:", height + + invalidheight = height-287 + badhash = self.nodes[1].getblockhash(invalidheight) + print "Invalidating block at height:",invalidheight,badhash + self.nodes[1].invalidateblock(badhash) + + # We've now switched to our previously mined-24 block fork on node 1, but thats not what we want + # So invalidate that fork as well, until we're on the same chain as node 0/2 (but at an ancestor 288 blocks ago) + mainchainhash = self.nodes[0].getblockhash(invalidheight - 1) + curhash = self.nodes[1].getblockhash(invalidheight - 1) + while curhash != mainchainhash: + self.nodes[1].invalidateblock(curhash) + curhash = self.nodes[1].getblockhash(invalidheight - 1) + + assert(self.nodes[1].getblockcount() == invalidheight - 1) + print "New best height", self.nodes[1].getblockcount() + + # Reboot node1 to clear those giant tx's from mempool + stop_node(self.nodes[1],1) + self.nodes[1]=start_node(1, self.options.tmpdir, ["-debug","-maxreceivebuffer=20000","-blockmaxsize=5000", "-checkblocks=5", "-disablesafemode"], timewait=300) + + print "Generating new longer chain of 300 more blocks" + self.nodes[1].generate(300) + + print "Reconnect nodes" + connect_nodes(self.nodes[0], 1) + connect_nodes(self.nodes[2], 1) + sync_blocks(self.nodes[0:3]) + + print "Verify height on node 2:",self.nodes[2].getblockcount() + print "Usage possibly still high bc of stale blocks in block files:", calc_usage(self.prunedir) + + print "Mine 220 more blocks so we have requisite history (some blocks will be big and cause pruning of previous chain)" + self.nodes[0].generate(220) #node 0 has many large tx's in its mempool from the disconnects + sync_blocks(self.nodes[0:3]) + + usage = calc_usage(self.prunedir) + print "Usage should be below target:", usage + if (usage > 550): + raise AssertionError("Pruning target not being met") + + return invalidheight,badhash + + def reorg_back(self): + # Verify that a block on the old main chain fork has been pruned away + try: + self.nodes[2].getblock(self.forkhash) + raise AssertionError("Old block wasn't pruned so can't test redownload") + except JSONRPCException as e: + print "Will need to redownload block",self.forkheight + + # Verify that we have enough history to reorg back to the fork point + # Although this is more than 288 blocks, because this chain was written more recently + # and only its other 299 small and 220 large block are in the block files after it, + # its expected to still be retained + self.nodes[2].getblock(self.nodes[2].getblockhash(self.forkheight)) + + first_reorg_height = self.nodes[2].getblockcount() + curchainhash = self.nodes[2].getblockhash(self.mainchainheight) + self.nodes[2].invalidateblock(curchainhash) + goalbestheight = self.mainchainheight + goalbesthash = self.mainchainhash2 + + # As of 0.10 the current block download logic is not able to reorg to the original chain created in + # create_chain_with_stale_blocks because it doesn't know of any peer thats on that chain from which to + # redownload its missing blocks. + # Invalidate the reorg_test chain in node 0 as well, it can successfully switch to the original chain + # because it has all the block data. + # However it must mine enough blocks to have a more work chain than the reorg_test chain in order + # to trigger node 2's block download logic. + # At this point node 2 is within 288 blocks of the fork point so it will preserve its ability to reorg + if self.nodes[2].getblockcount() < self.mainchainheight: + blocks_to_mine = first_reorg_height + 1 - self.mainchainheight + print "Rewind node 0 to prev main chain to mine longer chain to trigger redownload. Blocks needed:", blocks_to_mine + self.nodes[0].invalidateblock(curchainhash) + assert(self.nodes[0].getblockcount() == self.mainchainheight) + assert(self.nodes[0].getbestblockhash() == self.mainchainhash2) + goalbesthash = self.nodes[0].generate(blocks_to_mine)[-1] + goalbestheight = first_reorg_height + 1 + + print "Verify node 2 reorged back to the main chain, some blocks of which it had to redownload" + waitstart = time.time() + while self.nodes[2].getblockcount() < goalbestheight: + time.sleep(0.1) + if time.time() - waitstart > 300: + raise AssertionError("Node 2 didn't reorg to proper height") + assert(self.nodes[2].getbestblockhash() == goalbesthash) + # Verify we can now have the data for a block previously pruned + assert(self.nodes[2].getblock(self.forkhash)["height"] == self.forkheight) + + def mine_full_block(self, node, address): + # Want to create a full block + # We'll generate a 66k transaction below, and 14 of them is close to the 1MB block limit + for j in xrange(14): + if len(self.utxo) < 14: + self.utxo = node.listunspent() + inputs=[] + outputs = {} + t = self.utxo.pop() + inputs.append({ "txid" : t["txid"], "vout" : t["vout"]}) + remchange = t["amount"] - Decimal("0.001000") + outputs[address]=remchange + # Create a basic transaction that will send change back to ourself after account for a fee + # And then insert the 128 generated transaction outs in the middle rawtx[92] is where the # + # of txouts is stored and is the only thing we overwrite from the original transaction + rawtx = node.createrawtransaction(inputs, outputs) + newtx = rawtx[0:92] + newtx = newtx + self.txouts + newtx = newtx + rawtx[94:] + # Appears to be ever so slightly faster to sign with SIGHASH_NONE + signresult = node.signrawtransaction(newtx,None,None,"NONE") + txid = node.sendrawtransaction(signresult["hex"], True) + # Mine a full sized block which will be these transactions we just created + node.generate(1) + + + def run_test(self): + print "Warning! This test requires 4GB of disk space and takes over 30 mins" + print "Mining a big blockchain of 995 blocks" + self.create_big_chain() + # Chain diagram key: + # * blocks on main chain + # +,&,$,@ blocks on other forks + # X invalidated block + # N1 Node 1 + # + # Start by mining a simple chain that all nodes have + # N0=N1=N2 **...*(995) + + print "Check that we haven't started pruning yet because we're below PruneAfterHeight" + self.test_height_min() + # Extend this chain past the PruneAfterHeight + # N0=N1=N2 **...*(1020) + + print "Check that we'll exceed disk space target if we have a very high stale block rate" + self.create_chain_with_staleblocks() + # Disconnect N0 + # And mine a 24 block chain on N1 and a separate 25 block chain on N0 + # N1=N2 **...*+...+(1044) + # N0 **...**...**(1045) + # + # reconnect nodes causing reorg on N1 and N2 + # N1=N2 **...*(1020) *...**(1045) + # \ + # +...+(1044) + # + # repeat this process until you have 12 stale forks hanging off the + # main chain on N1 and N2 + # N0 *************************...***************************(1320) + # + # N1=N2 **...*(1020) *...**(1045) *.. ..**(1295) *...**(1320) + # \ \ \ + # +...+(1044) &.. $...$(1319) + + # Save some current chain state for later use + self.mainchainheight = self.nodes[2].getblockcount() #1320 + self.mainchainhash2 = self.nodes[2].getblockhash(self.mainchainheight) + + print "Check that we can survive a 288 block reorg still" + (self.forkheight,self.forkhash) = self.reorg_test() #(1033, ) + # Now create a 288 block reorg by mining a longer chain on N1 + # First disconnect N1 + # Then invalidate 1033 on main chain and 1032 on fork so height is 1032 on main chain + # N1 **...*(1020) **...**(1032)X.. + # \ + # ++...+(1031)X.. + # + # Now mine 300 more blocks on N1 + # N1 **...*(1020) **...**(1032) @@...@(1332) + # \ \ + # \ X... + # \ \ + # ++...+(1031)X.. .. + # + # Reconnect nodes and mine 220 more blocks on N1 + # N1 **...*(1020) **...**(1032) @@...@@@(1552) + # \ \ + # \ X... + # \ \ + # ++...+(1031)X.. .. + # + # N2 **...*(1020) **...**(1032) @@...@@@(1552) + # \ \ + # \ *...**(1320) + # \ \ + # ++...++(1044) .. + # + # N0 ********************(1032) @@...@@@(1552) + # \ + # *...**(1320) + + print "Test that we can rerequest a block we previously pruned if needed for a reorg" + self.reorg_back() + # Verify that N2 still has block 1033 on current chain (@), but not on main chain (*) + # Invalidate 1033 on current chain (@) on N2 and we should be able to reorg to + # original main chain (*), but will require redownload of some blocks + # In order to have a peer we think we can download from, must also perform this invalidation + # on N0 and mine a new longest chain to trigger. + # Final result: + # N0 ********************(1032) **...****(1553) + # \ + # X@...@@@(1552) + # + # N2 **...*(1020) **...**(1032) **...****(1553) + # \ \ + # \ X@...@@@(1552) + # \ + # +.. + # + # N1 doesn't change because 1033 on main chain (*) is invalid + + print "Done" + +if __name__ == '__main__': + PruneTest().main() diff --git a/qa/rpc-tests/rawtransactions.py b/qa/rpc-tests/rawtransactions.py new file mode 100755 index 0000000000..3d80c97d74 --- /dev/null +++ b/qa/rpc-tests/rawtransactions.py @@ -0,0 +1,144 @@ +#!/usr/bin/env python2 +# Copyright (c) 2014 The Bitcoin Core developers +# Distributed under the MIT software license, see the accompanying +# file COPYING or http://www.opensource.org/licenses/mit-license.php. + +# +# Test re-org scenarios with a mempool that contains transactions +# that spend (directly or indirectly) coinbase transactions. +# + +from test_framework import BitcoinTestFramework +from util import * +from pprint import pprint +from time import sleep + +# Create one-input, one-output, no-fee transaction: +class RawTransactionsTest(BitcoinTestFramework): + + def setup_chain(self): + print("Initializing test directory "+self.options.tmpdir) + initialize_chain_clean(self.options.tmpdir, 3) + + def setup_network(self, split=False): + self.nodes = start_nodes(3, self.options.tmpdir) + + #connect to a local machine for debugging + #url = "http://bitcoinrpc:DP6DvqZtqXarpeNWyN3LZTFchCCyCUuHwNF7E8pX99x1@%s:%d" % ('127.0.0.1', 18332) + #proxy = AuthServiceProxy(url) + #proxy.url = url # store URL on proxy for info + #self.nodes.append(proxy) + + connect_nodes_bi(self.nodes,0,1) + connect_nodes_bi(self.nodes,1,2) + connect_nodes_bi(self.nodes,0,2) + + self.is_network_split=False + self.sync_all() + + def run_test(self): + + #prepare some coins for multiple *rawtransaction commands + self.nodes[2].generate(1) + self.nodes[0].generate(101) + self.sync_all() + self.nodes[0].sendtoaddress(self.nodes[2].getnewaddress(),1.5); + self.nodes[0].sendtoaddress(self.nodes[2].getnewaddress(),1.0); + self.nodes[0].sendtoaddress(self.nodes[2].getnewaddress(),5.0); + self.sync_all() + self.nodes[0].generate(5) + self.sync_all() + + ######################################### + # sendrawtransaction with missing input # + ######################################### + inputs = [ {'txid' : "1d1d4e24ed99057e84c3f80fd8fbec79ed9e1acee37da269356ecea000000000", 'vout' : 1}] #won't exists + outputs = { self.nodes[0].getnewaddress() : 4.998 } + rawtx = self.nodes[2].createrawtransaction(inputs, outputs) + rawtx = self.nodes[2].signrawtransaction(rawtx) + + errorString = "" + try: + rawtx = self.nodes[2].sendrawtransaction(rawtx['hex']) + except JSONRPCException,e: + errorString = e.error['message'] + + assert_equal("Missing inputs" in errorString, True); + + ######################### + # RAW TX MULTISIG TESTS # + ######################### + # 2of2 test + addr1 = self.nodes[2].getnewaddress() + addr2 = self.nodes[2].getnewaddress() + + addr1Obj = self.nodes[2].validateaddress(addr1) + addr2Obj = self.nodes[2].validateaddress(addr2) + + mSigObj = self.nodes[2].addmultisigaddress(2, [addr1Obj['pubkey'], addr2Obj['pubkey']]) + mSigObjValid = self.nodes[2].validateaddress(mSigObj) + + #use balance deltas instead of absolute values + bal = self.nodes[2].getbalance() + + # send 1.2 BTC to msig adr + txId = self.nodes[0].sendtoaddress(mSigObj, 1.2); + self.sync_all() + self.nodes[0].generate(1) + self.sync_all() + assert_equal(self.nodes[2].getbalance(), bal+Decimal('1.20000000')) #node2 has both keys of the 2of2 ms addr., tx should affect the balance + + + + + # 2of3 test from different nodes + bal = self.nodes[2].getbalance() + addr1 = self.nodes[1].getnewaddress() + addr2 = self.nodes[2].getnewaddress() + addr3 = self.nodes[2].getnewaddress() + + addr1Obj = self.nodes[1].validateaddress(addr1) + addr2Obj = self.nodes[2].validateaddress(addr2) + addr3Obj = self.nodes[2].validateaddress(addr3) + + mSigObj = self.nodes[2].addmultisigaddress(2, [addr1Obj['pubkey'], addr2Obj['pubkey'], addr3Obj['pubkey']]) + mSigObjValid = self.nodes[2].validateaddress(mSigObj) + + txId = self.nodes[0].sendtoaddress(mSigObj, 2.2); + decTx = self.nodes[0].gettransaction(txId) + rawTx = self.nodes[0].decoderawtransaction(decTx['hex']) + sPK = rawTx['vout'][0]['scriptPubKey']['hex'] + self.sync_all() + self.nodes[0].generate(1) + self.sync_all() + + #THIS IS A INCOMPLETE FEATURE + #NODE2 HAS TWO OF THREE KEY AND THE FUNDS SHOULD BE SPENDABLE AND COUNT AT BALANCE CALCULATION + assert_equal(self.nodes[2].getbalance(), bal) #for now, assume the funds of a 2of3 multisig tx are not marked as spendable + + txDetails = self.nodes[0].gettransaction(txId, True) + rawTx = self.nodes[0].decoderawtransaction(txDetails['hex']) + vout = False + for outpoint in rawTx['vout']: + if outpoint['value'] == Decimal('2.20000000'): + vout = outpoint + break; + + bal = self.nodes[0].getbalance() + inputs = [{ "txid" : txId, "vout" : vout['n'], "scriptPubKey" : vout['scriptPubKey']['hex']}] + outputs = { self.nodes[0].getnewaddress() : 2.19 } + rawTx = self.nodes[2].createrawtransaction(inputs, outputs) + rawTxPartialSigned = self.nodes[1].signrawtransaction(rawTx, inputs) + assert_equal(rawTxPartialSigned['complete'], False) #node1 only has one key, can't comp. sign the tx + + rawTxSigned = self.nodes[2].signrawtransaction(rawTx, inputs) + assert_equal(rawTxSigned['complete'], True) #node2 can sign the tx compl., own two of three keys + self.nodes[2].sendrawtransaction(rawTxSigned['hex']) + rawTx = self.nodes[0].decoderawtransaction(rawTxSigned['hex']) + self.sync_all() + self.nodes[0].generate(1) + self.sync_all() + assert_equal(self.nodes[0].getbalance(), bal+Decimal('50.00000000')+Decimal('2.19000000')) #block reward + tx + +if __name__ == '__main__': + RawTransactionsTest().main() diff --git a/qa/rpc-tests/rest.py b/qa/rpc-tests/rest.py index 9b7008531c..9f0d049fe9 100755 --- a/qa/rpc-tests/rest.py +++ b/qa/rpc-tests/rest.py @@ -9,7 +9,10 @@ from test_framework import BitcoinTestFramework from util import * +from struct import * +import binascii import json +import StringIO try: import http.client as httplib @@ -20,45 +23,210 @@ try: except ImportError: import urlparse -def http_get_call(host, port, path, response_object = 0): +def deser_uint256(f): + r = 0 + for i in range(8): + t = unpack(b"<I", f.read(4))[0] + r += t << (i * 32) + return r + +#allows simple http get calls with a request body +def http_get_call(host, port, path, requestdata = '', response_object = 0): conn = httplib.HTTPConnection(host, port) - conn.request('GET', path) + conn.request('GET', path, requestdata) if response_object: return conn.getresponse() return conn.getresponse().read() - class RESTTest (BitcoinTestFramework): FORMAT_SEPARATOR = "." + def setup_chain(self): + print("Initializing test directory "+self.options.tmpdir) + initialize_chain_clean(self.options.tmpdir, 3) + + def setup_network(self, split=False): + self.nodes = start_nodes(3, self.options.tmpdir) + connect_nodes_bi(self.nodes,0,1) + connect_nodes_bi(self.nodes,1,2) + connect_nodes_bi(self.nodes,0,2) + self.is_network_split=False + self.sync_all() + def run_test(self): url = urlparse.urlparse(self.nodes[0].url) + print "Mining blocks..." + + self.nodes[0].generate(1) + self.sync_all() + self.nodes[2].generate(100) + self.sync_all() + + assert_equal(self.nodes[0].getbalance(), 50) + + txid = self.nodes[0].sendtoaddress(self.nodes[1].getnewaddress(), 0.1) + self.sync_all() + self.nodes[2].generate(1) + self.sync_all() + bb_hash = self.nodes[0].getbestblockhash() + + assert_equal(self.nodes[1].getbalance(), Decimal("0.1")) #balance now should be 0.1 on node 1 + + # load the latest 0.1 tx over the REST API + json_string = http_get_call(url.hostname, url.port, '/rest/tx/'+txid+self.FORMAT_SEPARATOR+"json") + json_obj = json.loads(json_string) + vintx = json_obj['vin'][0]['txid'] # get the vin to later check for utxo (should be spent by then) + # get n of 0.1 outpoint + n = 0 + for vout in json_obj['vout']: + if vout['value'] == 0.1: + n = vout['n'] + + + ###################################### + # GETUTXOS: query a unspent outpoint # + ###################################### + json_request = '{"checkmempool":true,"outpoints":[{"txid":"'+txid+'","n":'+str(n)+'}]}' + json_string = http_get_call(url.hostname, url.port, '/rest/getutxos'+self.FORMAT_SEPARATOR+'json', json_request) + json_obj = json.loads(json_string) + + #check chainTip response + assert_equal(json_obj['chaintipHash'], bb_hash) + + #make sure there is one utxo + assert_equal(len(json_obj['utxos']), 1) + assert_equal(json_obj['utxos'][0]['value'], 0.1) + + + ################################################ + # GETUTXOS: now query a already spent outpoint # + ################################################ + json_request = '{"checkmempool":true,"outpoints":[{"txid":"'+vintx+'","n":0}]}' + json_string = http_get_call(url.hostname, url.port, '/rest/getutxos'+self.FORMAT_SEPARATOR+'json', json_request) + json_obj = json.loads(json_string) + + #check chainTip response + assert_equal(json_obj['chaintipHash'], bb_hash) + + #make sure there is no utox in the response because this oupoint has been spent + assert_equal(len(json_obj['utxos']), 0) + + #check bitmap + assert_equal(json_obj['bitmap'], "0") + + + ################################################## + # GETUTXOS: now check both with the same request # + ################################################## + json_request = '{"checkmempool":true,"outpoints":[{"txid":"'+txid+'","n":'+str(n)+'},{"txid":"'+vintx+'","n":0}]}' + json_string = http_get_call(url.hostname, url.port, '/rest/getutxos'+self.FORMAT_SEPARATOR+'json', json_request) + json_obj = json.loads(json_string) + assert_equal(len(json_obj['utxos']), 1) + assert_equal(json_obj['bitmap'], "10") + + #test binary response bb_hash = self.nodes[0].getbestblockhash() + binaryRequest = b'\x01\x02' + binaryRequest += binascii.unhexlify(txid) + binaryRequest += pack("i", n); + binaryRequest += binascii.unhexlify(vintx); + binaryRequest += pack("i", 0); + + bin_response = http_get_call(url.hostname, url.port, '/rest/getutxos'+self.FORMAT_SEPARATOR+'bin', binaryRequest) + + output = StringIO.StringIO() + output.write(bin_response) + output.seek(0) + chainHeight = unpack("i", output.read(4))[0] + hashFromBinResponse = hex(deser_uint256(output))[2:].zfill(65).rstrip("L") + + assert_equal(bb_hash, hashFromBinResponse) #check if getutxo's chaintip during calculation was fine + assert_equal(chainHeight, 102) #chain height must be 102 + + + ############################ + # GETUTXOS: mempool checks # + ############################ + + # do a tx and don't sync + txid = self.nodes[0].sendtoaddress(self.nodes[1].getnewaddress(), 0.1) + json_string = http_get_call(url.hostname, url.port, '/rest/tx/'+txid+self.FORMAT_SEPARATOR+"json") + json_obj = json.loads(json_string) + vintx = json_obj['vin'][0]['txid'] # get the vin to later check for utxo (should be spent by then) + # get n of 0.1 outpoint + n = 0 + for vout in json_obj['vout']: + if vout['value'] == 0.1: + n = vout['n'] + + json_request = '{"checkmempool":false,"outpoints":[{"txid":"'+txid+'","n":'+str(n)+'}]}' + json_string = http_get_call(url.hostname, url.port, '/rest/getutxos'+self.FORMAT_SEPARATOR+'json', json_request) + json_obj = json.loads(json_string) + assert_equal(len(json_obj['utxos']), 0) #there should be a outpoint because it has just added to the mempool + + json_request = '{"checkmempool":true,"outpoints":[{"txid":"'+txid+'","n":'+str(n)+'}]}' + json_string = http_get_call(url.hostname, url.port, '/rest/getutxos'+self.FORMAT_SEPARATOR+'json', json_request) + json_obj = json.loads(json_string) + assert_equal(len(json_obj['utxos']), 1) #there should be a outpoint because it has just added to the mempool + + #do some invalid requests + json_request = '{"checkmempool' + response = http_get_call(url.hostname, url.port, '/rest/getutxos'+self.FORMAT_SEPARATOR+'json', json_request, True) + assert_equal(response.status, 500) #must be a 500 because we send a invalid json request + + json_request = '{"checkmempool' + response = http_get_call(url.hostname, url.port, '/rest/getutxos'+self.FORMAT_SEPARATOR+'bin', json_request, True) + assert_equal(response.status, 500) #must be a 500 because we send a invalid bin request + + #test limits + json_request = '{"checkmempool":true,"outpoints":[' + for x in range(0, 200): + json_request += '{"txid":"'+txid+'","n":'+str(n)+'},' + json_request = json_request.rstrip(",") + json_request+="]}"; + response = http_get_call(url.hostname, url.port, '/rest/getutxos'+self.FORMAT_SEPARATOR+'json', json_request, True) + assert_equal(response.status, 500) #must be a 500 because we exceeding the limits + + json_request = '{"checkmempool":true,"outpoints":[' + for x in range(0, 90): + json_request += '{"txid":"'+txid+'","n":'+str(n)+'},' + json_request = json_request.rstrip(",") + json_request+="]}"; + response = http_get_call(url.hostname, url.port, '/rest/getutxos'+self.FORMAT_SEPARATOR+'json', json_request, True) + assert_equal(response.status, 200) #must be a 500 because we exceeding the limits + + self.nodes[0].generate(1) #generate block to not affect upcomming tests + self.sync_all() + + ################ + # /rest/block/ # + ################ + # check binary format - response = http_get_call(url.hostname, url.port, '/rest/block/'+bb_hash+self.FORMAT_SEPARATOR+"bin", True) + response = http_get_call(url.hostname, url.port, '/rest/block/'+bb_hash+self.FORMAT_SEPARATOR+"bin", "", True) assert_equal(response.status, 200) assert_greater_than(int(response.getheader('content-length')), 80) response_str = response.read() # compare with block header - response_header = http_get_call(url.hostname, url.port, '/rest/headers/1/'+bb_hash+self.FORMAT_SEPARATOR+"bin", True) + response_header = http_get_call(url.hostname, url.port, '/rest/headers/1/'+bb_hash+self.FORMAT_SEPARATOR+"bin", "", True) assert_equal(response_header.status, 200) assert_equal(int(response_header.getheader('content-length')), 80) response_header_str = response_header.read() assert_equal(response_str[0:80], response_header_str) # check block hex format - response_hex = http_get_call(url.hostname, url.port, '/rest/block/'+bb_hash+self.FORMAT_SEPARATOR+"hex", True) + response_hex = http_get_call(url.hostname, url.port, '/rest/block/'+bb_hash+self.FORMAT_SEPARATOR+"hex", "", True) assert_equal(response_hex.status, 200) assert_greater_than(int(response_hex.getheader('content-length')), 160) response_hex_str = response_hex.read() assert_equal(response_str.encode("hex")[0:160], response_hex_str[0:160]) # compare with hex block header - response_header_hex = http_get_call(url.hostname, url.port, '/rest/headers/1/'+bb_hash+self.FORMAT_SEPARATOR+"hex", True) + response_header_hex = http_get_call(url.hostname, url.port, '/rest/headers/1/'+bb_hash+self.FORMAT_SEPARATOR+"hex", "", True) assert_equal(response_header_hex.status, 200) assert_greater_than(int(response_header_hex.getheader('content-length')), 160) response_header_hex_str = response_header_hex.read() @@ -77,9 +245,11 @@ class RESTTest (BitcoinTestFramework): assert_equal(json_obj['txid'], tx_hash) # check hex format response - hex_string = http_get_call(url.hostname, url.port, '/rest/tx/'+tx_hash+self.FORMAT_SEPARATOR+"hex", True) + hex_string = http_get_call(url.hostname, url.port, '/rest/tx/'+tx_hash+self.FORMAT_SEPARATOR+"hex", "", True) assert_equal(hex_string.status, 200) assert_greater_than(int(response.getheader('content-length')), 10) + + # check block tx details # let's make 3 tx and mine them on node 1 diff --git a/qa/rpc-tests/script.py b/qa/rpc-tests/script.py new file mode 100644 index 0000000000..03695b8635 --- /dev/null +++ b/qa/rpc-tests/script.py @@ -0,0 +1,896 @@ +# +# script.py +# +# This file is modified from python-bitcoinlib. +# +# Distributed under the MIT/X11 software license, see the accompanying +# file COPYING or http://www.opensource.org/licenses/mit-license.php. +# + +"""Scripts + +Functionality to build scripts, as well as SignatureHash(). +""" + +from __future__ import absolute_import, division, print_function, unicode_literals + +from mininode import CTransaction, CTxOut, hash256 + +import sys +bchr = chr +bord = ord +if sys.version > '3': + long = int + bchr = lambda x: bytes([x]) + bord = lambda x: x + +import copy +import struct + +import bignum + +MAX_SCRIPT_SIZE = 10000 +MAX_SCRIPT_ELEMENT_SIZE = 520 +MAX_SCRIPT_OPCODES = 201 + +OPCODE_NAMES = {} + +_opcode_instances = [] +class CScriptOp(int): + """A single script opcode""" + __slots__ = [] + + @staticmethod + def encode_op_pushdata(d): + """Encode a PUSHDATA op, returning bytes""" + if len(d) < 0x4c: + return b'' + bchr(len(d)) + d # OP_PUSHDATA + elif len(d) <= 0xff: + return b'\x4c' + bchr(len(d)) + d # OP_PUSHDATA1 + elif len(d) <= 0xffff: + return b'\x4d' + struct.pack(b'<H', len(d)) + d # OP_PUSHDATA2 + elif len(d) <= 0xffffffff: + return b'\x4e' + struct.pack(b'<I', len(d)) + d # OP_PUSHDATA4 + else: + raise ValueError("Data too long to encode in a PUSHDATA op") + + @staticmethod + def encode_op_n(n): + """Encode a small integer op, returning an opcode""" + if not (0 <= n <= 16): + raise ValueError('Integer must be in range 0 <= n <= 16, got %d' % n) + + if n == 0: + return OP_0 + else: + return CScriptOp(OP_1 + n-1) + + def decode_op_n(self): + """Decode a small integer opcode, returning an integer""" + if self == OP_0: + return 0 + + if not (self == OP_0 or OP_1 <= self <= OP_16): + raise ValueError('op %r is not an OP_N' % self) + + return int(self - OP_1+1) + + def is_small_int(self): + """Return true if the op pushes a small integer to the stack""" + if 0x51 <= self <= 0x60 or self == 0: + return True + else: + return False + + def __str__(self): + return repr(self) + + def __repr__(self): + if self in OPCODE_NAMES: + return OPCODE_NAMES[self] + else: + return 'CScriptOp(0x%x)' % self + + def __new__(cls, n): + try: + return _opcode_instances[n] + except IndexError: + assert len(_opcode_instances) == n + _opcode_instances.append(super(CScriptOp, cls).__new__(cls, n)) + return _opcode_instances[n] + +# Populate opcode instance table +for n in range(0xff+1): + CScriptOp(n) + + +# push value +OP_0 = CScriptOp(0x00) +OP_FALSE = OP_0 +OP_PUSHDATA1 = CScriptOp(0x4c) +OP_PUSHDATA2 = CScriptOp(0x4d) +OP_PUSHDATA4 = CScriptOp(0x4e) +OP_1NEGATE = CScriptOp(0x4f) +OP_RESERVED = CScriptOp(0x50) +OP_1 = CScriptOp(0x51) +OP_TRUE=OP_1 +OP_2 = CScriptOp(0x52) +OP_3 = CScriptOp(0x53) +OP_4 = CScriptOp(0x54) +OP_5 = CScriptOp(0x55) +OP_6 = CScriptOp(0x56) +OP_7 = CScriptOp(0x57) +OP_8 = CScriptOp(0x58) +OP_9 = CScriptOp(0x59) +OP_10 = CScriptOp(0x5a) +OP_11 = CScriptOp(0x5b) +OP_12 = CScriptOp(0x5c) +OP_13 = CScriptOp(0x5d) +OP_14 = CScriptOp(0x5e) +OP_15 = CScriptOp(0x5f) +OP_16 = CScriptOp(0x60) + +# control +OP_NOP = CScriptOp(0x61) +OP_VER = CScriptOp(0x62) +OP_IF = CScriptOp(0x63) +OP_NOTIF = CScriptOp(0x64) +OP_VERIF = CScriptOp(0x65) +OP_VERNOTIF = CScriptOp(0x66) +OP_ELSE = CScriptOp(0x67) +OP_ENDIF = CScriptOp(0x68) +OP_VERIFY = CScriptOp(0x69) +OP_RETURN = CScriptOp(0x6a) + +# stack ops +OP_TOALTSTACK = CScriptOp(0x6b) +OP_FROMALTSTACK = CScriptOp(0x6c) +OP_2DROP = CScriptOp(0x6d) +OP_2DUP = CScriptOp(0x6e) +OP_3DUP = CScriptOp(0x6f) +OP_2OVER = CScriptOp(0x70) +OP_2ROT = CScriptOp(0x71) +OP_2SWAP = CScriptOp(0x72) +OP_IFDUP = CScriptOp(0x73) +OP_DEPTH = CScriptOp(0x74) +OP_DROP = CScriptOp(0x75) +OP_DUP = CScriptOp(0x76) +OP_NIP = CScriptOp(0x77) +OP_OVER = CScriptOp(0x78) +OP_PICK = CScriptOp(0x79) +OP_ROLL = CScriptOp(0x7a) +OP_ROT = CScriptOp(0x7b) +OP_SWAP = CScriptOp(0x7c) +OP_TUCK = CScriptOp(0x7d) + +# splice ops +OP_CAT = CScriptOp(0x7e) +OP_SUBSTR = CScriptOp(0x7f) +OP_LEFT = CScriptOp(0x80) +OP_RIGHT = CScriptOp(0x81) +OP_SIZE = CScriptOp(0x82) + +# bit logic +OP_INVERT = CScriptOp(0x83) +OP_AND = CScriptOp(0x84) +OP_OR = CScriptOp(0x85) +OP_XOR = CScriptOp(0x86) +OP_EQUAL = CScriptOp(0x87) +OP_EQUALVERIFY = CScriptOp(0x88) +OP_RESERVED1 = CScriptOp(0x89) +OP_RESERVED2 = CScriptOp(0x8a) + +# numeric +OP_1ADD = CScriptOp(0x8b) +OP_1SUB = CScriptOp(0x8c) +OP_2MUL = CScriptOp(0x8d) +OP_2DIV = CScriptOp(0x8e) +OP_NEGATE = CScriptOp(0x8f) +OP_ABS = CScriptOp(0x90) +OP_NOT = CScriptOp(0x91) +OP_0NOTEQUAL = CScriptOp(0x92) + +OP_ADD = CScriptOp(0x93) +OP_SUB = CScriptOp(0x94) +OP_MUL = CScriptOp(0x95) +OP_DIV = CScriptOp(0x96) +OP_MOD = CScriptOp(0x97) +OP_LSHIFT = CScriptOp(0x98) +OP_RSHIFT = CScriptOp(0x99) + +OP_BOOLAND = CScriptOp(0x9a) +OP_BOOLOR = CScriptOp(0x9b) +OP_NUMEQUAL = CScriptOp(0x9c) +OP_NUMEQUALVERIFY = CScriptOp(0x9d) +OP_NUMNOTEQUAL = CScriptOp(0x9e) +OP_LESSTHAN = CScriptOp(0x9f) +OP_GREATERTHAN = CScriptOp(0xa0) +OP_LESSTHANOREQUAL = CScriptOp(0xa1) +OP_GREATERTHANOREQUAL = CScriptOp(0xa2) +OP_MIN = CScriptOp(0xa3) +OP_MAX = CScriptOp(0xa4) + +OP_WITHIN = CScriptOp(0xa5) + +# crypto +OP_RIPEMD160 = CScriptOp(0xa6) +OP_SHA1 = CScriptOp(0xa7) +OP_SHA256 = CScriptOp(0xa8) +OP_HASH160 = CScriptOp(0xa9) +OP_HASH256 = CScriptOp(0xaa) +OP_CODESEPARATOR = CScriptOp(0xab) +OP_CHECKSIG = CScriptOp(0xac) +OP_CHECKSIGVERIFY = CScriptOp(0xad) +OP_CHECKMULTISIG = CScriptOp(0xae) +OP_CHECKMULTISIGVERIFY = CScriptOp(0xaf) + +# expansion +OP_NOP1 = CScriptOp(0xb0) +OP_NOP2 = CScriptOp(0xb1) +OP_NOP3 = CScriptOp(0xb2) +OP_NOP4 = CScriptOp(0xb3) +OP_NOP5 = CScriptOp(0xb4) +OP_NOP6 = CScriptOp(0xb5) +OP_NOP7 = CScriptOp(0xb6) +OP_NOP8 = CScriptOp(0xb7) +OP_NOP9 = CScriptOp(0xb8) +OP_NOP10 = CScriptOp(0xb9) + +# template matching params +OP_SMALLINTEGER = CScriptOp(0xfa) +OP_PUBKEYS = CScriptOp(0xfb) +OP_PUBKEYHASH = CScriptOp(0xfd) +OP_PUBKEY = CScriptOp(0xfe) + +OP_INVALIDOPCODE = CScriptOp(0xff) + +VALID_OPCODES = { + OP_1NEGATE, + OP_RESERVED, + OP_1, + OP_2, + OP_3, + OP_4, + OP_5, + OP_6, + OP_7, + OP_8, + OP_9, + OP_10, + OP_11, + OP_12, + OP_13, + OP_14, + OP_15, + OP_16, + + OP_NOP, + OP_VER, + OP_IF, + OP_NOTIF, + OP_VERIF, + OP_VERNOTIF, + OP_ELSE, + OP_ENDIF, + OP_VERIFY, + OP_RETURN, + + OP_TOALTSTACK, + OP_FROMALTSTACK, + OP_2DROP, + OP_2DUP, + OP_3DUP, + OP_2OVER, + OP_2ROT, + OP_2SWAP, + OP_IFDUP, + OP_DEPTH, + OP_DROP, + OP_DUP, + OP_NIP, + OP_OVER, + OP_PICK, + OP_ROLL, + OP_ROT, + OP_SWAP, + OP_TUCK, + + OP_CAT, + OP_SUBSTR, + OP_LEFT, + OP_RIGHT, + OP_SIZE, + + OP_INVERT, + OP_AND, + OP_OR, + OP_XOR, + OP_EQUAL, + OP_EQUALVERIFY, + OP_RESERVED1, + OP_RESERVED2, + + OP_1ADD, + OP_1SUB, + OP_2MUL, + OP_2DIV, + OP_NEGATE, + OP_ABS, + OP_NOT, + OP_0NOTEQUAL, + + OP_ADD, + OP_SUB, + OP_MUL, + OP_DIV, + OP_MOD, + OP_LSHIFT, + OP_RSHIFT, + + OP_BOOLAND, + OP_BOOLOR, + OP_NUMEQUAL, + OP_NUMEQUALVERIFY, + OP_NUMNOTEQUAL, + OP_LESSTHAN, + OP_GREATERTHAN, + OP_LESSTHANOREQUAL, + OP_GREATERTHANOREQUAL, + OP_MIN, + OP_MAX, + + OP_WITHIN, + + OP_RIPEMD160, + OP_SHA1, + OP_SHA256, + OP_HASH160, + OP_HASH256, + OP_CODESEPARATOR, + OP_CHECKSIG, + OP_CHECKSIGVERIFY, + OP_CHECKMULTISIG, + OP_CHECKMULTISIGVERIFY, + + OP_NOP1, + OP_NOP2, + OP_NOP3, + OP_NOP4, + OP_NOP5, + OP_NOP6, + OP_NOP7, + OP_NOP8, + OP_NOP9, + OP_NOP10, + + OP_SMALLINTEGER, + OP_PUBKEYS, + OP_PUBKEYHASH, + OP_PUBKEY, +} + +OPCODE_NAMES.update({ + OP_0 : 'OP_0', + OP_PUSHDATA1 : 'OP_PUSHDATA1', + OP_PUSHDATA2 : 'OP_PUSHDATA2', + OP_PUSHDATA4 : 'OP_PUSHDATA4', + OP_1NEGATE : 'OP_1NEGATE', + OP_RESERVED : 'OP_RESERVED', + OP_1 : 'OP_1', + OP_2 : 'OP_2', + OP_3 : 'OP_3', + OP_4 : 'OP_4', + OP_5 : 'OP_5', + OP_6 : 'OP_6', + OP_7 : 'OP_7', + OP_8 : 'OP_8', + OP_9 : 'OP_9', + OP_10 : 'OP_10', + OP_11 : 'OP_11', + OP_12 : 'OP_12', + OP_13 : 'OP_13', + OP_14 : 'OP_14', + OP_15 : 'OP_15', + OP_16 : 'OP_16', + OP_NOP : 'OP_NOP', + OP_VER : 'OP_VER', + OP_IF : 'OP_IF', + OP_NOTIF : 'OP_NOTIF', + OP_VERIF : 'OP_VERIF', + OP_VERNOTIF : 'OP_VERNOTIF', + OP_ELSE : 'OP_ELSE', + OP_ENDIF : 'OP_ENDIF', + OP_VERIFY : 'OP_VERIFY', + OP_RETURN : 'OP_RETURN', + OP_TOALTSTACK : 'OP_TOALTSTACK', + OP_FROMALTSTACK : 'OP_FROMALTSTACK', + OP_2DROP : 'OP_2DROP', + OP_2DUP : 'OP_2DUP', + OP_3DUP : 'OP_3DUP', + OP_2OVER : 'OP_2OVER', + OP_2ROT : 'OP_2ROT', + OP_2SWAP : 'OP_2SWAP', + OP_IFDUP : 'OP_IFDUP', + OP_DEPTH : 'OP_DEPTH', + OP_DROP : 'OP_DROP', + OP_DUP : 'OP_DUP', + OP_NIP : 'OP_NIP', + OP_OVER : 'OP_OVER', + OP_PICK : 'OP_PICK', + OP_ROLL : 'OP_ROLL', + OP_ROT : 'OP_ROT', + OP_SWAP : 'OP_SWAP', + OP_TUCK : 'OP_TUCK', + OP_CAT : 'OP_CAT', + OP_SUBSTR : 'OP_SUBSTR', + OP_LEFT : 'OP_LEFT', + OP_RIGHT : 'OP_RIGHT', + OP_SIZE : 'OP_SIZE', + OP_INVERT : 'OP_INVERT', + OP_AND : 'OP_AND', + OP_OR : 'OP_OR', + OP_XOR : 'OP_XOR', + OP_EQUAL : 'OP_EQUAL', + OP_EQUALVERIFY : 'OP_EQUALVERIFY', + OP_RESERVED1 : 'OP_RESERVED1', + OP_RESERVED2 : 'OP_RESERVED2', + OP_1ADD : 'OP_1ADD', + OP_1SUB : 'OP_1SUB', + OP_2MUL : 'OP_2MUL', + OP_2DIV : 'OP_2DIV', + OP_NEGATE : 'OP_NEGATE', + OP_ABS : 'OP_ABS', + OP_NOT : 'OP_NOT', + OP_0NOTEQUAL : 'OP_0NOTEQUAL', + OP_ADD : 'OP_ADD', + OP_SUB : 'OP_SUB', + OP_MUL : 'OP_MUL', + OP_DIV : 'OP_DIV', + OP_MOD : 'OP_MOD', + OP_LSHIFT : 'OP_LSHIFT', + OP_RSHIFT : 'OP_RSHIFT', + OP_BOOLAND : 'OP_BOOLAND', + OP_BOOLOR : 'OP_BOOLOR', + OP_NUMEQUAL : 'OP_NUMEQUAL', + OP_NUMEQUALVERIFY : 'OP_NUMEQUALVERIFY', + OP_NUMNOTEQUAL : 'OP_NUMNOTEQUAL', + OP_LESSTHAN : 'OP_LESSTHAN', + OP_GREATERTHAN : 'OP_GREATERTHAN', + OP_LESSTHANOREQUAL : 'OP_LESSTHANOREQUAL', + OP_GREATERTHANOREQUAL : 'OP_GREATERTHANOREQUAL', + OP_MIN : 'OP_MIN', + OP_MAX : 'OP_MAX', + OP_WITHIN : 'OP_WITHIN', + OP_RIPEMD160 : 'OP_RIPEMD160', + OP_SHA1 : 'OP_SHA1', + OP_SHA256 : 'OP_SHA256', + OP_HASH160 : 'OP_HASH160', + OP_HASH256 : 'OP_HASH256', + OP_CODESEPARATOR : 'OP_CODESEPARATOR', + OP_CHECKSIG : 'OP_CHECKSIG', + OP_CHECKSIGVERIFY : 'OP_CHECKSIGVERIFY', + OP_CHECKMULTISIG : 'OP_CHECKMULTISIG', + OP_CHECKMULTISIGVERIFY : 'OP_CHECKMULTISIGVERIFY', + OP_NOP1 : 'OP_NOP1', + OP_NOP2 : 'OP_NOP2', + OP_NOP3 : 'OP_NOP3', + OP_NOP4 : 'OP_NOP4', + OP_NOP5 : 'OP_NOP5', + OP_NOP6 : 'OP_NOP6', + OP_NOP7 : 'OP_NOP7', + OP_NOP8 : 'OP_NOP8', + OP_NOP9 : 'OP_NOP9', + OP_NOP10 : 'OP_NOP10', + OP_SMALLINTEGER : 'OP_SMALLINTEGER', + OP_PUBKEYS : 'OP_PUBKEYS', + OP_PUBKEYHASH : 'OP_PUBKEYHASH', + OP_PUBKEY : 'OP_PUBKEY', + OP_INVALIDOPCODE : 'OP_INVALIDOPCODE', +}) + +OPCODES_BY_NAME = { + 'OP_0' : OP_0, + 'OP_PUSHDATA1' : OP_PUSHDATA1, + 'OP_PUSHDATA2' : OP_PUSHDATA2, + 'OP_PUSHDATA4' : OP_PUSHDATA4, + 'OP_1NEGATE' : OP_1NEGATE, + 'OP_RESERVED' : OP_RESERVED, + 'OP_1' : OP_1, + 'OP_2' : OP_2, + 'OP_3' : OP_3, + 'OP_4' : OP_4, + 'OP_5' : OP_5, + 'OP_6' : OP_6, + 'OP_7' : OP_7, + 'OP_8' : OP_8, + 'OP_9' : OP_9, + 'OP_10' : OP_10, + 'OP_11' : OP_11, + 'OP_12' : OP_12, + 'OP_13' : OP_13, + 'OP_14' : OP_14, + 'OP_15' : OP_15, + 'OP_16' : OP_16, + 'OP_NOP' : OP_NOP, + 'OP_VER' : OP_VER, + 'OP_IF' : OP_IF, + 'OP_NOTIF' : OP_NOTIF, + 'OP_VERIF' : OP_VERIF, + 'OP_VERNOTIF' : OP_VERNOTIF, + 'OP_ELSE' : OP_ELSE, + 'OP_ENDIF' : OP_ENDIF, + 'OP_VERIFY' : OP_VERIFY, + 'OP_RETURN' : OP_RETURN, + 'OP_TOALTSTACK' : OP_TOALTSTACK, + 'OP_FROMALTSTACK' : OP_FROMALTSTACK, + 'OP_2DROP' : OP_2DROP, + 'OP_2DUP' : OP_2DUP, + 'OP_3DUP' : OP_3DUP, + 'OP_2OVER' : OP_2OVER, + 'OP_2ROT' : OP_2ROT, + 'OP_2SWAP' : OP_2SWAP, + 'OP_IFDUP' : OP_IFDUP, + 'OP_DEPTH' : OP_DEPTH, + 'OP_DROP' : OP_DROP, + 'OP_DUP' : OP_DUP, + 'OP_NIP' : OP_NIP, + 'OP_OVER' : OP_OVER, + 'OP_PICK' : OP_PICK, + 'OP_ROLL' : OP_ROLL, + 'OP_ROT' : OP_ROT, + 'OP_SWAP' : OP_SWAP, + 'OP_TUCK' : OP_TUCK, + 'OP_CAT' : OP_CAT, + 'OP_SUBSTR' : OP_SUBSTR, + 'OP_LEFT' : OP_LEFT, + 'OP_RIGHT' : OP_RIGHT, + 'OP_SIZE' : OP_SIZE, + 'OP_INVERT' : OP_INVERT, + 'OP_AND' : OP_AND, + 'OP_OR' : OP_OR, + 'OP_XOR' : OP_XOR, + 'OP_EQUAL' : OP_EQUAL, + 'OP_EQUALVERIFY' : OP_EQUALVERIFY, + 'OP_RESERVED1' : OP_RESERVED1, + 'OP_RESERVED2' : OP_RESERVED2, + 'OP_1ADD' : OP_1ADD, + 'OP_1SUB' : OP_1SUB, + 'OP_2MUL' : OP_2MUL, + 'OP_2DIV' : OP_2DIV, + 'OP_NEGATE' : OP_NEGATE, + 'OP_ABS' : OP_ABS, + 'OP_NOT' : OP_NOT, + 'OP_0NOTEQUAL' : OP_0NOTEQUAL, + 'OP_ADD' : OP_ADD, + 'OP_SUB' : OP_SUB, + 'OP_MUL' : OP_MUL, + 'OP_DIV' : OP_DIV, + 'OP_MOD' : OP_MOD, + 'OP_LSHIFT' : OP_LSHIFT, + 'OP_RSHIFT' : OP_RSHIFT, + 'OP_BOOLAND' : OP_BOOLAND, + 'OP_BOOLOR' : OP_BOOLOR, + 'OP_NUMEQUAL' : OP_NUMEQUAL, + 'OP_NUMEQUALVERIFY' : OP_NUMEQUALVERIFY, + 'OP_NUMNOTEQUAL' : OP_NUMNOTEQUAL, + 'OP_LESSTHAN' : OP_LESSTHAN, + 'OP_GREATERTHAN' : OP_GREATERTHAN, + 'OP_LESSTHANOREQUAL' : OP_LESSTHANOREQUAL, + 'OP_GREATERTHANOREQUAL' : OP_GREATERTHANOREQUAL, + 'OP_MIN' : OP_MIN, + 'OP_MAX' : OP_MAX, + 'OP_WITHIN' : OP_WITHIN, + 'OP_RIPEMD160' : OP_RIPEMD160, + 'OP_SHA1' : OP_SHA1, + 'OP_SHA256' : OP_SHA256, + 'OP_HASH160' : OP_HASH160, + 'OP_HASH256' : OP_HASH256, + 'OP_CODESEPARATOR' : OP_CODESEPARATOR, + 'OP_CHECKSIG' : OP_CHECKSIG, + 'OP_CHECKSIGVERIFY' : OP_CHECKSIGVERIFY, + 'OP_CHECKMULTISIG' : OP_CHECKMULTISIG, + 'OP_CHECKMULTISIGVERIFY' : OP_CHECKMULTISIGVERIFY, + 'OP_NOP1' : OP_NOP1, + 'OP_NOP2' : OP_NOP2, + 'OP_NOP3' : OP_NOP3, + 'OP_NOP4' : OP_NOP4, + 'OP_NOP5' : OP_NOP5, + 'OP_NOP6' : OP_NOP6, + 'OP_NOP7' : OP_NOP7, + 'OP_NOP8' : OP_NOP8, + 'OP_NOP9' : OP_NOP9, + 'OP_NOP10' : OP_NOP10, + 'OP_SMALLINTEGER' : OP_SMALLINTEGER, + 'OP_PUBKEYS' : OP_PUBKEYS, + 'OP_PUBKEYHASH' : OP_PUBKEYHASH, + 'OP_PUBKEY' : OP_PUBKEY, +} + +class CScriptInvalidError(Exception): + """Base class for CScript exceptions""" + pass + +class CScriptTruncatedPushDataError(CScriptInvalidError): + """Invalid pushdata due to truncation""" + def __init__(self, msg, data): + self.data = data + super(CScriptTruncatedPushDataError, self).__init__(msg) + +# This is used, eg, for blockchain heights in coinbase scripts (bip34) +class CScriptNum(object): + def __init__(self, d=0): + self.value = d + + @staticmethod + def encode(obj): + r = bytearray(0) + if obj.value == 0: + return bytes(r) + neg = obj.value < 0 + absvalue = -obj.value if neg else obj.value + while (absvalue): + r.append(chr(absvalue & 0xff)) + absvalue >>= 8 + if r[-1] & 0x80: + r.append(0x80 if neg else 0) + elif neg: + r[-1] |= 0x80 + return bytes(bchr(len(r)) + r) + + +class CScript(bytes): + """Serialized script + + A bytes subclass, so you can use this directly whenever bytes are accepted. + Note that this means that indexing does *not* work - you'll get an index by + byte rather than opcode. This format was chosen for efficiency so that the + general case would not require creating a lot of little CScriptOP objects. + + iter(script) however does iterate by opcode. + """ + @classmethod + def __coerce_instance(cls, other): + # Coerce other into bytes + if isinstance(other, CScriptOp): + other = bchr(other) + elif isinstance(other, CScriptNum): + if (other.value == 0): + other = bchr(CScriptOp(OP_0)) + else: + other = CScriptNum.encode(other) + elif isinstance(other, (int, long)): + if 0 <= other <= 16: + other = bytes(bchr(CScriptOp.encode_op_n(other))) + elif other == -1: + other = bytes(bchr(OP_1NEGATE)) + else: + other = CScriptOp.encode_op_pushdata(bignum.bn2vch(other)) + elif isinstance(other, (bytes, bytearray)): + other = CScriptOp.encode_op_pushdata(other) + return other + + def __add__(self, other): + # Do the coercion outside of the try block so that errors in it are + # noticed. + other = self.__coerce_instance(other) + + try: + # bytes.__add__ always returns bytes instances unfortunately + return CScript(super(CScript, self).__add__(other)) + except TypeError: + raise TypeError('Can not add a %r instance to a CScript' % other.__class__) + + def join(self, iterable): + # join makes no sense for a CScript() + raise NotImplementedError + + def __new__(cls, value=b''): + if isinstance(value, bytes) or isinstance(value, bytearray): + return super(CScript, cls).__new__(cls, value) + else: + def coerce_iterable(iterable): + for instance in iterable: + yield cls.__coerce_instance(instance) + # Annoyingly on both python2 and python3 bytes.join() always + # returns a bytes instance even when subclassed. + return super(CScript, cls).__new__(cls, b''.join(coerce_iterable(value))) + + def raw_iter(self): + """Raw iteration + + Yields tuples of (opcode, data, sop_idx) so that the different possible + PUSHDATA encodings can be accurately distinguished, as well as + determining the exact opcode byte indexes. (sop_idx) + """ + i = 0 + while i < len(self): + sop_idx = i + opcode = bord(self[i]) + i += 1 + + if opcode > OP_PUSHDATA4: + yield (opcode, None, sop_idx) + else: + datasize = None + pushdata_type = None + if opcode < OP_PUSHDATA1: + pushdata_type = 'PUSHDATA(%d)' % opcode + datasize = opcode + + elif opcode == OP_PUSHDATA1: + pushdata_type = 'PUSHDATA1' + if i >= len(self): + raise CScriptInvalidError('PUSHDATA1: missing data length') + datasize = bord(self[i]) + i += 1 + + elif opcode == OP_PUSHDATA2: + pushdata_type = 'PUSHDATA2' + if i + 1 >= len(self): + raise CScriptInvalidError('PUSHDATA2: missing data length') + datasize = bord(self[i]) + (bord(self[i+1]) << 8) + i += 2 + + elif opcode == OP_PUSHDATA4: + pushdata_type = 'PUSHDATA4' + if i + 3 >= len(self): + raise CScriptInvalidError('PUSHDATA4: missing data length') + datasize = bord(self[i]) + (bord(self[i+1]) << 8) + (bord(self[i+2]) << 16) + (bord(self[i+3]) << 24) + i += 4 + + else: + assert False # shouldn't happen + + + data = bytes(self[i:i+datasize]) + + # Check for truncation + if len(data) < datasize: + raise CScriptTruncatedPushDataError('%s: truncated data' % pushdata_type, data) + + i += datasize + + yield (opcode, data, sop_idx) + + def __iter__(self): + """'Cooked' iteration + + Returns either a CScriptOP instance, an integer, or bytes, as + appropriate. + + See raw_iter() if you need to distinguish the different possible + PUSHDATA encodings. + """ + for (opcode, data, sop_idx) in self.raw_iter(): + if data is not None: + yield data + else: + opcode = CScriptOp(opcode) + + if opcode.is_small_int(): + yield opcode.decode_op_n() + else: + yield CScriptOp(opcode) + + def __repr__(self): + # For Python3 compatibility add b before strings so testcases don't + # need to change + def _repr(o): + if isinstance(o, bytes): + return "x('%s')" % binascii.hexlify(o).decode('utf8') + else: + return repr(o) + + ops = [] + i = iter(self) + while True: + op = None + try: + op = _repr(next(i)) + except CScriptTruncatedPushDataError as err: + op = '%s...<ERROR: %s>' % (_repr(err.data), err) + break + except CScriptInvalidError as err: + op = '<ERROR: %s>' % err + break + except StopIteration: + break + finally: + if op is not None: + ops.append(op) + + return "CScript([%s])" % ', '.join(ops) + + def GetSigOpCount(self, fAccurate): + """Get the SigOp count. + + fAccurate - Accurately count CHECKMULTISIG, see BIP16 for details. + + Note that this is consensus-critical. + """ + n = 0 + lastOpcode = OP_INVALIDOPCODE + for (opcode, data, sop_idx) in self.raw_iter(): + if opcode in (OP_CHECKSIG, OP_CHECKSIGVERIFY): + n += 1 + elif opcode in (OP_CHECKMULTISIG, OP_CHECKMULTISIGVERIFY): + if fAccurate and (OP_1 <= lastOpcode <= OP_16): + n += opcode.decode_op_n() + else: + n += 20 + lastOpcode = opcode + return n + + +SIGHASH_ALL = 1 +SIGHASH_NONE = 2 +SIGHASH_SINGLE = 3 +SIGHASH_ANYONECANPAY = 0x80 + +def FindAndDelete(script, sig): + """Consensus critical, see FindAndDelete() in Satoshi codebase""" + r = b'' + last_sop_idx = sop_idx = 0 + skip = True + for (opcode, data, sop_idx) in script.raw_iter(): + if not skip: + r += script[last_sop_idx:sop_idx] + last_sop_idx = sop_idx + if script[sop_idx:sop_idx + len(sig)] == sig: + skip = True + else: + skip = False + if not skip: + r += script[last_sop_idx:] + return CScript(r) + + +def SignatureHash(script, txTo, inIdx, hashtype): + """Consensus-correct SignatureHash + + Returns (hash, err) to precisely match the consensus-critical behavior of + the SIGHASH_SINGLE bug. (inIdx is *not* checked for validity) + """ + HASH_ONE = b'\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00' + + if inIdx >= len(txTo.vin): + return (HASH_ONE, "inIdx %d out of range (%d)" % (inIdx, len(txTo.vin))) + txtmp = CTransaction(txTo) + + for txin in txtmp.vin: + txin.scriptSig = b'' + txtmp.vin[inIdx].scriptSig = FindAndDelete(script, CScript([OP_CODESEPARATOR])) + + if (hashtype & 0x1f) == SIGHASH_NONE: + txtmp.vout = [] + + for i in range(len(txtmp.vin)): + if i != inIdx: + txtmp.vin[i].nSequence = 0 + + elif (hashtype & 0x1f) == SIGHASH_SINGLE: + outIdx = inIdx + if outIdx >= len(txtmp.vout): + return (HASH_ONE, "outIdx %d out of range (%d)" % (outIdx, len(txtmp.vout))) + + tmp = txtmp.vout[outIdx] + txtmp.vout = [] + for i in range(outIdx): + txtmp.vout.append(CTxOut()) + txtmp.vout.append(tmp) + + for i in range(len(txtmp.vin)): + if i != inIdx: + txtmp.vin[i].nSequence = 0 + + if hashtype & SIGHASH_ANYONECANPAY: + tmp = txtmp.vin[inIdx] + txtmp.vin = [] + txtmp.vin.append(tmp) + + s = txtmp.serialize() + s += struct.pack(b"<I", hashtype) + + hash = hash256(s) + + return (hash, None) diff --git a/qa/rpc-tests/script_test.py b/qa/rpc-tests/script_test.py new file mode 100755 index 0000000000..1ba3a478a8 --- /dev/null +++ b/qa/rpc-tests/script_test.py @@ -0,0 +1,253 @@ +#!/usr/bin/env python2 +# +# Distributed under the MIT/X11 software license, see the accompanying +# file COPYING or http://www.opensource.org/licenses/mit-license.php. +# + +''' +Test notes: +This test uses the script_valid and script_invalid tests from the unittest +framework to do end-to-end testing where we compare that two nodes agree on +whether blocks containing a given test script are valid. + +We generally ignore the script flags associated with each test (since we lack +the precision to test each script using those flags in this framework), but +for tests with SCRIPT_VERIFY_P2SH, we can use a block time after the BIP16 +switchover date to try to test with that flag enabled (and for tests without +that flag, we use a block time before the switchover date). + +NOTE: This test is very slow and may take more than 40 minutes to run. +''' + +from test_framework import ComparisonTestFramework +from util import * +from comptool import TestInstance, TestManager +from mininode import * +from blocktools import * +from script import * +import logging +import copy +import json + +script_valid_file = "../../src/test/data/script_valid.json" +script_invalid_file = "../../src/test/data/script_invalid.json" + +# Pass in a set of json files to open. +class ScriptTestFile(object): + + def __init__(self, files): + self.files = files + self.index = -1 + self.data = [] + + def load_files(self): + for f in self.files: + self.data.extend(json.loads(open(f).read())) + + # Skip over records that are not long enough to be tests + def get_records(self): + while (self.index < len(self.data)): + if len(self.data[self.index]) >= 3: + yield self.data[self.index] + self.index += 1 + + +# Helper for parsing the flags specified in the .json files +SCRIPT_VERIFY_NONE = 0 +SCRIPT_VERIFY_P2SH = 1 +SCRIPT_VERIFY_STRICTENC = 1 << 1 +SCRIPT_VERIFY_DERSIG = 1 << 2 +SCRIPT_VERIFY_LOW_S = 1 << 3 +SCRIPT_VERIFY_NULLDUMMY = 1 << 4 +SCRIPT_VERIFY_SIGPUSHONLY = 1 << 5 +SCRIPT_VERIFY_MINIMALDATA = 1 << 6 +SCRIPT_VERIFY_DISCOURAGE_UPGRADABLE_NOPS = 1 << 7 +SCRIPT_VERIFY_CLEANSTACK = 1 << 8 + +flag_map = { + "": SCRIPT_VERIFY_NONE, + "NONE": SCRIPT_VERIFY_NONE, + "P2SH": SCRIPT_VERIFY_P2SH, + "STRICTENC": SCRIPT_VERIFY_STRICTENC, + "DERSIG": SCRIPT_VERIFY_DERSIG, + "LOW_S": SCRIPT_VERIFY_LOW_S, + "NULLDUMMY": SCRIPT_VERIFY_NULLDUMMY, + "SIGPUSHONLY": SCRIPT_VERIFY_SIGPUSHONLY, + "MINIMALDATA": SCRIPT_VERIFY_MINIMALDATA, + "DISCOURAGE_UPGRADABLE_NOPS": SCRIPT_VERIFY_DISCOURAGE_UPGRADABLE_NOPS, + "CLEANSTACK": SCRIPT_VERIFY_CLEANSTACK, +} + +def ParseScriptFlags(flag_string): + flags = 0 + for x in flag_string.split(","): + if x in flag_map: + flags |= flag_map[x] + else: + print "Error: unrecognized script flag: ", x + return flags + +''' +Given a string that is a scriptsig or scriptpubkey from the .json files above, +convert it to a CScript() +''' +# Replicates behavior from core_read.cpp +def ParseScript(json_script): + script = json_script.split(" ") + parsed_script = CScript() + for x in script: + if len(x) == 0: + # Empty string, ignore. + pass + elif x.isdigit() or (len(x) >= 1 and x[0] == "-" and x[1:].isdigit()): + # Number + n = int(x, 0) + if (n == -1) or (n >= 1 and n <= 16): + parsed_script = CScript(bytes(parsed_script) + bytes(CScript([n]))) + else: + parsed_script += CScriptNum(int(x, 0)) + elif x.startswith("0x"): + # Raw hex data, inserted NOT pushed onto stack: + for i in xrange(2, len(x), 2): + parsed_script = CScript(bytes(parsed_script) + bytes(chr(int(x[i:i+2],16)))) + elif x.startswith("'") and x.endswith("'") and len(x) >= 2: + # Single-quoted string, pushed as data. + parsed_script += CScript([x[1:-1]]) + else: + # opcode, e.g. OP_ADD or ADD: + tryopname = "OP_" + x + if tryopname in OPCODES_BY_NAME: + parsed_script += CScriptOp(OPCODES_BY_NAME["OP_" + x]) + else: + print "ParseScript: error parsing '%s'" % x + return "" + return parsed_script + +class TestBuilder(object): + def create_credit_tx(self, scriptPubKey): + # self.tx1 is a coinbase transaction, modeled after the one created by script_tests.cpp + # This allows us to reuse signatures created in the unit test framework. + self.tx1 = create_coinbase() # this has a bip34 scriptsig, + self.tx1.vin[0].scriptSig = CScript([0, 0]) # but this matches the unit tests + self.tx1.vout[0].nValue = 0 + self.tx1.vout[0].scriptPubKey = scriptPubKey + self.tx1.rehash() + def create_spend_tx(self, scriptSig): + self.tx2 = create_transaction(self.tx1, 0, CScript(), 0) + self.tx2.vin[0].scriptSig = scriptSig + self.tx2.vout[0].scriptPubKey = CScript() + self.tx2.rehash() + def rehash(self): + self.tx1.rehash() + self.tx2.rehash() + +# This test uses the (default) two nodes provided by ComparisonTestFramework, +# specified on the command line with --testbinary and --refbinary. +# See comptool.py +class ScriptTest(ComparisonTestFramework): + + def run_test(self): + # Set up the comparison tool TestManager + test = TestManager(self, self.options.tmpdir) + test.add_all_connections(self.nodes) + + # Load scripts + self.scripts = ScriptTestFile([script_valid_file, script_invalid_file]) + self.scripts.load_files() + + # Some variables we re-use between test instances (to build blocks) + self.tip = None + self.block_time = None + + NetworkThread().start() # Start up network handling in another thread + test.run() + + def generate_test_instance(self, pubkeystring, scriptsigstring): + scriptpubkey = ParseScript(pubkeystring) + scriptsig = ParseScript(scriptsigstring) + + test = TestInstance(sync_every_block=False) + test_build = TestBuilder() + test_build.create_credit_tx(scriptpubkey) + test_build.create_spend_tx(scriptsig) + test_build.rehash() + + block = create_block(self.tip, test_build.tx1, self.block_time) + self.block_time += 1 + block.solve() + self.tip = block.sha256 + test.blocks_and_transactions = [[block, True]] + + for i in xrange(100): + block = create_block(self.tip, create_coinbase(), self.block_time) + self.block_time += 1 + block.solve() + self.tip = block.sha256 + test.blocks_and_transactions.append([block, True]) + + block = create_block(self.tip, create_coinbase(), self.block_time) + self.block_time += 1 + block.vtx.append(test_build.tx2) + block.hashMerkleRoot = block.calc_merkle_root() + block.rehash() + block.solve() + test.blocks_and_transactions.append([block, None]) + return test + + # This generates the tests for TestManager. + def get_tests(self): + self.tip = int ("0x" + self.nodes[0].getbestblockhash() + "L", 0) + self.block_time = 1333230000 # before the BIP16 switchover + + ''' + Create a new block with an anyone-can-spend coinbase + ''' + block = create_block(self.tip, create_coinbase(), self.block_time) + self.block_time += 1 + block.solve() + self.tip = block.sha256 + yield TestInstance(objects=[[block, True]]) + + ''' + Build out to 100 blocks total, maturing the coinbase. + ''' + test = TestInstance(objects=[], sync_every_block=False, sync_every_tx=False) + for i in xrange(100): + b = create_block(self.tip, create_coinbase(), self.block_time) + b.solve() + test.blocks_and_transactions.append([b, True]) + self.tip = b.sha256 + self.block_time += 1 + yield test + + ''' Iterate through script tests. ''' + counter = 0 + for script_test in self.scripts.get_records(): + ''' Reset the blockchain to genesis block + 100 blocks. ''' + if self.nodes[0].getblockcount() > 101: + self.nodes[0].invalidateblock(self.nodes[0].getblockhash(102)) + self.nodes[1].invalidateblock(self.nodes[1].getblockhash(102)) + + self.tip = int ("0x" + self.nodes[0].getbestblockhash() + "L", 0) + + [scriptsig, scriptpubkey, flags] = script_test[0:3] + flags = ParseScriptFlags(flags) + + # We can use block time to determine whether the nodes should be + # enforcing BIP16. + # + # We intentionally let the block time grow by 1 each time. + # This forces the block hashes to differ between tests, so that + # a call to invalidateblock doesn't interfere with a later test. + if (flags & SCRIPT_VERIFY_P2SH): + self.block_time = 1333238400 + counter # Advance to enforcing BIP16 + else: + self.block_time = 1333230000 + counter # Before the BIP16 switchover + + print "Script test: [%s]" % script_test + + yield self.generate_test_instance(scriptpubkey, scriptsig) + counter += 1 + +if __name__ == '__main__': + ScriptTest().main() diff --git a/qa/rpc-tests/signrawtransactions.py b/qa/rpc-tests/signrawtransactions.py new file mode 100755 index 0000000000..943634bd19 --- /dev/null +++ b/qa/rpc-tests/signrawtransactions.py @@ -0,0 +1,109 @@ +#!/usr/bin/env python2 +# Copyright (c) 2015 The Bitcoin Core developers +# Distributed under the MIT software license, see the accompanying +# file COPYING or http://www.opensource.org/licenses/mit-license.php. + +from test_framework import BitcoinTestFramework +from util import * + + +class SignRawTransactionsTest(BitcoinTestFramework): + """Tests transaction signing via RPC command "signrawtransaction".""" + + def setup_chain(self): + print('Initializing test directory ' + self.options.tmpdir) + initialize_chain_clean(self.options.tmpdir, 1) + + def setup_network(self, split=False): + self.nodes = start_nodes(1, self.options.tmpdir) + self.is_network_split = False + + def successful_signing_test(self): + """Creates and signs a valid raw transaction with one input. + + Expected results: + + 1) The transaction has a complete set of signatures + 2) No script verification error occurred""" + privKeys = ['cUeKHd5orzT3mz8P9pxyREHfsWtVfgsfDjiZZBcjUBAaGk1BTj7N'] + + inputs = [ + # Valid pay-to-pubkey script + {'txid': '9b907ef1e3c26fc71fe4a4b3580bc75264112f95050014157059c736f0202e71', 'vout': 0, + 'scriptPubKey': '76a91460baa0f494b38ce3c940dea67f3804dc52d1fb9488ac'} + ] + + outputs = {'mpLQjfK79b7CCV4VMJWEWAj5Mpx8Up5zxB': 0.1} + + rawTx = self.nodes[0].createrawtransaction(inputs, outputs) + rawTxSigned = self.nodes[0].signrawtransaction(rawTx, inputs, privKeys) + + # 1) The transaction has a complete set of signatures + assert 'complete' in rawTxSigned + assert_equal(rawTxSigned['complete'], True) + + # 2) No script verification error occurred + assert 'errors' not in rawTxSigned + + def script_verification_error_test(self): + """Creates and signs a raw transaction with valid (vin 0), invalid (vin 1) and one missing (vin 2) input script. + + Expected results: + + 3) The transaction has no complete set of signatures + 4) Two script verification errors occurred + 5) Script verification errors have certain properties ("txid", "vout", "scriptSig", "sequence", "error") + 6) The verification errors refer to the invalid (vin 1) and missing input (vin 2)""" + privKeys = ['cUeKHd5orzT3mz8P9pxyREHfsWtVfgsfDjiZZBcjUBAaGk1BTj7N'] + + inputs = [ + # Valid pay-to-pubkey script + {'txid': '9b907ef1e3c26fc71fe4a4b3580bc75264112f95050014157059c736f0202e71', 'vout': 0}, + # Invalid script + {'txid': '5b8673686910442c644b1f4993d8f7753c7c8fcb5c87ee40d56eaeef25204547', 'vout': 7}, + # Missing scriptPubKey + {'txid': '9b907ef1e3c26fc71fe4a4b3580bc75264112f95050014157059c736f0202e71', 'vout': 1}, + ] + + scripts = [ + # Valid pay-to-pubkey script + {'txid': '9b907ef1e3c26fc71fe4a4b3580bc75264112f95050014157059c736f0202e71', 'vout': 0, + 'scriptPubKey': '76a91460baa0f494b38ce3c940dea67f3804dc52d1fb9488ac'}, + # Invalid script + {'txid': '5b8673686910442c644b1f4993d8f7753c7c8fcb5c87ee40d56eaeef25204547', 'vout': 7, + 'scriptPubKey': 'badbadbadbad'} + ] + + outputs = {'mpLQjfK79b7CCV4VMJWEWAj5Mpx8Up5zxB': 0.1} + + rawTx = self.nodes[0].createrawtransaction(inputs, outputs) + rawTxSigned = self.nodes[0].signrawtransaction(rawTx, scripts, privKeys) + + # 3) The transaction has no complete set of signatures + assert 'complete' in rawTxSigned + assert_equal(rawTxSigned['complete'], False) + + # 4) Two script verification errors occurred + assert 'errors' in rawTxSigned + assert_equal(len(rawTxSigned['errors']), 2) + + # 5) Script verification errors have certain properties + assert 'txid' in rawTxSigned['errors'][0] + assert 'vout' in rawTxSigned['errors'][0] + assert 'scriptSig' in rawTxSigned['errors'][0] + assert 'sequence' in rawTxSigned['errors'][0] + assert 'error' in rawTxSigned['errors'][0] + + # 6) The verification errors refer to the invalid (vin 1) and missing input (vin 2) + assert_equal(rawTxSigned['errors'][0]['txid'], inputs[1]['txid']) + assert_equal(rawTxSigned['errors'][0]['vout'], inputs[1]['vout']) + assert_equal(rawTxSigned['errors'][1]['txid'], inputs[2]['txid']) + assert_equal(rawTxSigned['errors'][1]['vout'], inputs[2]['vout']) + + def run_test(self): + self.successful_signing_test() + self.script_verification_error_test() + + +if __name__ == '__main__': + SignRawTransactionsTest().main() diff --git a/qa/rpc-tests/test_framework.py b/qa/rpc-tests/test_framework.py index 4c8a11b821..15a357a340 100755 --- a/qa/rpc-tests/test_framework.py +++ b/qa/rpc-tests/test_framework.py @@ -89,8 +89,10 @@ class BitcoinTestFramework(object): 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("--noshutdown", dest="noshutdown", default=False, action="store_true", + help="Don't stop bitcoinds after the test execution") parser.add_option("--srcdir", dest="srcdir", default="../../src", - help="Source directory containing bitcoind/bitcoin-cli (default: %default%)") + 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") parser.add_option("--tracerpc", dest="trace_rpc", default=False, action="store_true", @@ -128,10 +130,15 @@ class BitcoinTestFramework(object): print("Unexpected exception caught during testing: "+str(e)) traceback.print_tb(sys.exc_info()[2]) - if not self.options.nocleanup: - print("Cleaning up") + if not self.options.noshutdown: + print("Stopping nodes") stop_nodes(self.nodes) wait_bitcoinds() + else: + print("Note: bitcoinds were not stopped and may still be running") + + if not self.options.nocleanup and not self.options.noshutdown: + print("Cleaning up") shutil.rmtree(self.options.tmpdir) if success: @@ -140,3 +147,34 @@ class BitcoinTestFramework(object): else: print("Failed") sys.exit(1) + + +# Test framework for doing p2p comparison testing, which sets up some bitcoind +# binaries: +# 1 binary: test binary +# 2 binaries: 1 test binary, 1 ref binary +# n>2 binaries: 1 test binary, n-1 ref binaries + +class ComparisonTestFramework(BitcoinTestFramework): + + # Can override the num_nodes variable to indicate how many nodes to run. + def __init__(self): + self.num_nodes = 2 + + def add_options(self, parser): + parser.add_option("--testbinary", dest="testbinary", + default=os.getenv("BITCOIND", "bitcoind"), + help="bitcoind binary to test") + parser.add_option("--refbinary", dest="refbinary", + default=os.getenv("BITCOIND", "bitcoind"), + help="bitcoind binary to use for reference nodes (if any)") + + def setup_chain(self): + print "Initializing test directory "+self.options.tmpdir + initialize_chain_clean(self.options.tmpdir, self.num_nodes) + + def setup_network(self): + self.nodes = start_nodes(self.num_nodes, self.options.tmpdir, + extra_args=[['-debug', '-whitelist=127.0.0.1']] * self.num_nodes, + binary=[self.options.testbinary] + + [self.options.refbinary]*(self.num_nodes-1)) diff --git a/qa/rpc-tests/util.py b/qa/rpc-tests/util.py index ee6d3ca014..997bbcc373 100644 --- a/qa/rpc-tests/util.py +++ b/qa/rpc-tests/util.py @@ -88,8 +88,12 @@ def initialize_chain(test_dir): if i > 0: args.append("-connect=127.0.0.1:"+str(p2p_port(0))) bitcoind_processes[i] = subprocess.Popen(args) + if os.getenv("PYTHON_DEBUG", ""): + print "initialize_chain: bitcoind started, calling bitcoin-cli -rpcwait getblockcount" subprocess.check_call([ os.getenv("BITCOINCLI", "bitcoin-cli"), "-datadir="+datadir, "-rpcwait", "getblockcount"], stdout=devnull) + if os.getenv("PYTHON_DEBUG", ""): + print "initialize_chain: bitcoin-cli -rpcwait getblockcount completed" devnull.close() rpcs = [] for i in range(4): @@ -158,30 +162,40 @@ def _rpchost_to_args(rpchost): rv += ['-rpcport=' + rpcport] return rv -def start_node(i, dirname, extra_args=None, rpchost=None): +def start_node(i, dirname, extra_args=None, rpchost=None, timewait=None, binary=None): """ Start a bitcoind and return RPC connection to it """ datadir = os.path.join(dirname, "node"+str(i)) - args = [ os.getenv("BITCOIND", "bitcoind"), "-datadir="+datadir, "-keypool=1", "-discover=0", "-rest" ] + if binary is None: + binary = os.getenv("BITCOIND", "bitcoind") + args = [ binary, "-datadir="+datadir, "-keypool=1", "-discover=0", "-rest" ] if extra_args is not None: args.extend(extra_args) bitcoind_processes[i] = subprocess.Popen(args) devnull = open("/dev/null", "w+") + if os.getenv("PYTHON_DEBUG", ""): + print "start_node: bitcoind started, calling bitcoin-cli -rpcwait getblockcount" subprocess.check_call([ os.getenv("BITCOINCLI", "bitcoin-cli"), "-datadir="+datadir] + _rpchost_to_args(rpchost) + ["-rpcwait", "getblockcount"], stdout=devnull) + if os.getenv("PYTHON_DEBUG", ""): + print "start_node: calling bitcoin-cli -rpcwait getblockcount returned" devnull.close() url = "http://rt:rt@%s:%d" % (rpchost or '127.0.0.1', rpc_port(i)) - proxy = AuthServiceProxy(url) + if timewait is not None: + proxy = AuthServiceProxy(url, timeout=timewait) + else: + proxy = AuthServiceProxy(url) proxy.url = url # store URL on proxy for info return proxy -def start_nodes(num_nodes, dirname, extra_args=None, rpchost=None): +def start_nodes(num_nodes, dirname, extra_args=None, rpchost=None, binary=None): """ Start multiple bitcoinds, return RPC connections to them """ if extra_args is None: extra_args = [ None for i in range(num_nodes) ] - return [ start_node(i, dirname, extra_args[i], rpchost) for i in range(num_nodes) ] + if binary is None: binary = [ None for i in range(num_nodes) ] + return [ start_node(i, dirname, extra_args[i], rpchost, binary=binary[i]) for i in range(num_nodes) ] def log_filename(dirname, n_node, logname): return os.path.join(dirname, "node"+str(n_node), "regtest", logname) @@ -269,7 +283,7 @@ def send_zeropri_transaction(from_node, to_node, amount, fee): Create&broadcast a zero-priority transaction. Returns (txid, hex-encoded-txdata) Ensures transaction is zero-priority by first creating a send-to-self, - then using it's output + then using its output """ # Create a send-to-self with confirmed inputs: diff --git a/qa/rpc-tests/wallet.py b/qa/rpc-tests/wallet.py index 5f3178c606..b8965b3662 100755 --- a/qa/rpc-tests/wallet.py +++ b/qa/rpc-tests/wallet.py @@ -62,7 +62,7 @@ class WalletTest (BitcoinTestFramework): walletinfo = self.nodes[0].getwalletinfo() assert_equal(walletinfo['immature_balance'], 0) - # Have node0 mine a block, thus they will collect their own fee. + # Have node0 mine a block, thus it will collect its own fee. self.nodes[0].generate(1) self.sync_all() @@ -151,6 +151,33 @@ class WalletTest (BitcoinTestFramework): assert(txid1 in self.nodes[3].getrawmempool()) + #check if we can list zero value tx as available coins + #1. create rawtx + #2. hex-changed one output to 0.0 + #3. sign and send + #4. check if recipient (node0) can list the zero value tx + usp = self.nodes[1].listunspent() + inputs = [{"txid":usp[0]['txid'], "vout":usp[0]['vout']}] + outputs = {self.nodes[1].getnewaddress(): 49.998, self.nodes[0].getnewaddress(): 11.11} + + rawTx = self.nodes[1].createrawtransaction(inputs, outputs).replace("c0833842", "00000000") #replace 11.11 with 0.0 (int32) + decRawTx = self.nodes[1].decoderawtransaction(rawTx) + signedRawTx = self.nodes[1].signrawtransaction(rawTx) + decRawTx = self.nodes[1].decoderawtransaction(signedRawTx['hex']) + zeroValueTxid= decRawTx['txid'] + sendResp = self.nodes[1].sendrawtransaction(signedRawTx['hex']) + + self.sync_all() + self.nodes[1].generate(1) #mine a block + self.sync_all() + + unspentTxs = self.nodes[0].listunspent() #zero value tx must be in listunspents output + found = False + for uTx in unspentTxs: + if uTx['txid'] == zeroValueTxid: + found = True + assert_equal(uTx['amount'], Decimal('0.00000000')); + assert(found) #do some -walletbroadcast tests stop_nodes(self.nodes) diff --git a/share/genbuild.sh b/share/genbuild.sh index ffa89ca6e4..a15cb34e47 100755 --- a/share/genbuild.sh +++ b/share/genbuild.sh @@ -22,7 +22,7 @@ if [ -e "$(which git 2>/dev/null)" -a "$(git rev-parse --is-inside-work-tree 2>/ # if latest commit is tagged and not dirty, then override using the tag name RAWDESC=$(git describe --abbrev=0 2>/dev/null) - if [ "$(git rev-parse HEAD)" = "$(git rev-list -1 $RAWDESC)" ]; then + if [ "$(git rev-parse HEAD)" = "$(git rev-list -1 $RAWDESC 2>/dev/null)" ]; then git diff-index --quiet HEAD -- && DESC=$RAWDESC fi diff --git a/src/Makefile.am b/src/Makefile.am index 9d9934618e..fc8050a4a2 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -87,6 +87,7 @@ BITCOIN_CORE_H = \ coins.h \ compat.h \ compressor.h \ + consensus/consensus.h \ consensus/params.h \ core_io.h \ wallet/db.h \ diff --git a/src/Makefile.test.include b/src/Makefile.test.include index 6c14859d3c..65112f6f5d 100644 --- a/src/Makefile.test.include +++ b/src/Makefile.test.include @@ -39,6 +39,7 @@ BITCOIN_TESTS =\ test/base32_tests.cpp \ test/base58_tests.cpp \ test/base64_tests.cpp \ + test/bip32_tests.cpp \ test/bloom_tests.cpp \ test/checkblock_tests.cpp \ test/Checkpoints_tests.cpp \ diff --git a/src/addrman.cpp b/src/addrman.cpp index 094c913e9c..c41ee3f9fc 100644 --- a/src/addrman.cpp +++ b/src/addrman.cpp @@ -331,10 +331,10 @@ void CAddrMan::Attempt_(const CService& addr, int64_t nTime) info.nAttempts++; } -CAddress CAddrMan::Select_() +CAddrInfo CAddrMan::Select_() { if (size() == 0) - return CAddress(); + return CAddrInfo(); // Use a 50% chance for choosing between tried and new table entries. if (nTried > 0 && (nNew == 0 || GetRandInt(2) == 0)) { diff --git a/src/addrman.h b/src/addrman.h index 8116d0b763..b72dda49d1 100644 --- a/src/addrman.h +++ b/src/addrman.h @@ -17,11 +17,15 @@ #include <stdint.h> #include <vector> -/** - * Extended statistics about a CAddress +/** + * Extended statistics about a CAddress */ class CAddrInfo : public CAddress { +public: + //! last try whatsoever by us (memory only) + int64_t nLastTry; + private: //! where knowledge about this address first came from CNetAddr source; @@ -29,9 +33,6 @@ private: //! last successful connection by us int64_t nLastSuccess; - //! last try whatsoever by us: - // int64_t CAddress::nLastTry - //! connection attempts since last successful attempt int nAttempts; @@ -104,14 +105,14 @@ public: /** Stochastic address manager * * Design goals: - * * Keep the address tables in-memory, and asynchronously dump the entire to able in peers.dat. + * * Keep the address tables in-memory, and asynchronously dump the entire table to peers.dat. * * Make sure no (localized) attacker can fill the entire table with his nodes/addresses. * * To that end: * * Addresses are organized into buckets. * * Address that have not yet been tried go into 1024 "new" buckets. * * Based on the address range (/16 for IPv4) of source of the information, 64 buckets are selected at random - * * The actual bucket is chosen from one of these, based on the range the address itself is located. + * * The actual bucket is chosen from one of these, based on the range in which the address itself is located. * * One single address can occur in up to 8 different buckets, to increase selection chances for addresses that * are seen frequently. The chance for increasing this multiplicity decreases exponentially. * * When adding a new address to a full bucket, a randomly chosen entry (with a bias favoring less recently seen @@ -231,7 +232,7 @@ protected: //! Select an address to connect to. //! nUnkBias determines how much to favor new addresses over tried ones (min=0, max=100) - CAddress Select_(); + CAddrInfo Select_(); #ifdef DEBUG_ADDRMAN //! Perform consistency check. Returns an error code or zero. @@ -533,9 +534,9 @@ public: * Choose an address to connect to. * nUnkBias determines how much "new" entries are favored over "tried" ones (0-100). */ - CAddress Select() + CAddrInfo Select() { - CAddress addrRet; + CAddrInfo addrRet; { LOCK(cs); Check(); diff --git a/src/base58.h b/src/base58.h index 8de90046a9..787979c827 100644 --- a/src/base58.h +++ b/src/base58.h @@ -6,10 +6,10 @@ /** * Why base-58 instead of standard base-64 encoding? * - Don't want 0OIl characters that look the same in some fonts and - * could be used to create visually identical looking account numbers. - * - A string with non-alphanumeric characters is not as easily accepted as an account number. + * could be used to create visually identical looking data. + * - A string with non-alphanumeric characters is not as easily accepted as input. * - E-mail usually won't line-break if there's no punctuation to break at. - * - Double-clicking selects the whole number as one word if it's all alphanumeric. + * - Double-clicking selects the whole string as one word if it's all alphanumeric. */ #ifndef BITCOIN_BASE58_H #define BITCOIN_BASE58_H diff --git a/src/bitcoin-cli.cpp b/src/bitcoin-cli.cpp index 2fa8de6fd8..1269d7a119 100644 --- a/src/bitcoin-cli.cpp +++ b/src/bitcoin-cli.cpp @@ -12,8 +12,6 @@ #include <boost/filesystem/operations.hpp> -#define _(x) std::string(x) /* Keep the _() around in case gettext or such will be used later to translate non-UI */ - using namespace std; using namespace json_spirit; diff --git a/src/bitcoin-tx.cpp b/src/bitcoin-tx.cpp index 78f5c2c4b6..c82d4f93a8 100644 --- a/src/bitcoin-tx.cpp +++ b/src/bitcoin-tx.cpp @@ -4,18 +4,17 @@ #include "base58.h" #include "clientversion.h" -#include "primitives/block.h" // for MAX_BLOCK_SIZE -#include "primitives/transaction.h" -#include "core_io.h" #include "coins.h" +#include "consensus/consensus.h" +#include "core_io.h" #include "keystore.h" +#include "primitives/transaction.h" #include "script/script.h" #include "script/sign.h" -#include "ui_interface.h" // for _(...) #include "univalue/univalue.h" #include "util.h" -#include "utilstrencodings.h" #include "utilmoneystr.h" +#include "utilstrencodings.h" #include <stdio.h> @@ -26,7 +25,6 @@ using namespace std; static bool fCreateBlank; static map<string,UniValue> registers; -CClientUIInterface uiInterface; static bool AppInitRawTx(int argc, char* argv[]) { @@ -444,9 +442,18 @@ static void MutateTxSign(CMutableTransaction& tx, const string& flagStr) tx = mergedTx; } +class Secp256k1Init +{ +public: + Secp256k1Init() { ECC_Start(); } + ~Secp256k1Init() { ECC_Stop(); } +}; + static void MutateTx(CMutableTransaction& tx, const string& command, const string& commandVal) { + boost::scoped_ptr<Secp256k1Init> ecc; + if (command == "nversion") MutateTxVersion(tx, commandVal); else if (command == "locktime") @@ -464,8 +471,10 @@ static void MutateTx(CMutableTransaction& tx, const string& command, else if (command == "outscript") MutateTxAddOutScript(tx, commandVal); - else if (command == "sign") + else if (command == "sign") { + if (!ecc) { ecc.reset(new Secp256k1Init()); } MutateTxSign(tx, commandVal); + } else if (command == "load") RegisterLoad(commandVal); diff --git a/src/bitcoind.cpp b/src/bitcoind.cpp index 2172f4a21b..eeca8655c9 100644 --- a/src/bitcoind.cpp +++ b/src/bitcoind.cpp @@ -8,7 +8,6 @@ #include "init.h" #include "main.h" #include "noui.h" -#include "ui_interface.h" #include "util.h" #include <boost/algorithm/string/predicate.hpp> diff --git a/src/bloom.cpp b/src/bloom.cpp index e60576f4b4..36cba491c4 100644 --- a/src/bloom.cpp +++ b/src/bloom.cpp @@ -21,22 +21,33 @@ using namespace std; CBloomFilter::CBloomFilter(unsigned int nElements, double nFPRate, unsigned int nTweakIn, unsigned char nFlagsIn) : -/** - * The ideal size for a bloom filter with a given number of elements and false positive rate is: - * - nElements * log(fp rate) / ln(2)^2 - * We ignore filter parameters which will create a bloom filter larger than the protocol limits - */ -vData(min((unsigned int)(-1 / LN2SQUARED * nElements * log(nFPRate)), MAX_BLOOM_FILTER_SIZE * 8) / 8), -/** - * The ideal number of hash functions is filter size * ln(2) / number of elements - * Again, we ignore filter parameters which will create a bloom filter with more hash functions than the protocol limits - * See https://en.wikipedia.org/wiki/Bloom_filter for an explanation of these formulas - */ -isFull(false), -isEmpty(false), -nHashFuncs(min((unsigned int)(vData.size() * 8 / nElements * LN2), MAX_HASH_FUNCS)), -nTweak(nTweakIn), -nFlags(nFlagsIn) + /** + * The ideal size for a bloom filter with a given number of elements and false positive rate is: + * - nElements * log(fp rate) / ln(2)^2 + * We ignore filter parameters which will create a bloom filter larger than the protocol limits + */ + vData(min((unsigned int)(-1 / LN2SQUARED * nElements * log(nFPRate)), MAX_BLOOM_FILTER_SIZE * 8) / 8), + /** + * The ideal number of hash functions is filter size * ln(2) / number of elements + * Again, we ignore filter parameters which will create a bloom filter with more hash functions than the protocol limits + * See https://en.wikipedia.org/wiki/Bloom_filter for an explanation of these formulas + */ + isFull(false), + isEmpty(false), + nHashFuncs(min((unsigned int)(vData.size() * 8 / nElements * LN2), MAX_HASH_FUNCS)), + nTweak(nTweakIn), + nFlags(nFlagsIn) +{ +} + +// Private constructor used by CRollingBloomFilter +CBloomFilter::CBloomFilter(unsigned int nElements, double nFPRate, unsigned int nTweakIn) : + vData((unsigned int)(-1 / LN2SQUARED * nElements * log(nFPRate)) / 8), + isFull(false), + isEmpty(true), + nHashFuncs((unsigned int)(vData.size() * 8 / nElements * LN2)), + nTweak(nTweakIn), + nFlags(BLOOM_UPDATE_NONE) { } @@ -197,3 +208,43 @@ void CBloomFilter::UpdateEmptyFull() isFull = full; isEmpty = empty; } + +CRollingBloomFilter::CRollingBloomFilter(unsigned int nElements, double fpRate, unsigned int nTweak) : + b1(nElements * 2, fpRate, nTweak), b2(nElements * 2, fpRate, nTweak) +{ + // Implemented using two bloom filters of 2 * nElements each. + // We fill them up, and clear them, staggered, every nElements + // inserted, so at least one always contains the last nElements + // inserted. + nBloomSize = nElements * 2; + nInsertions = 0; +} + +void CRollingBloomFilter::insert(const std::vector<unsigned char>& vKey) +{ + if (nInsertions == 0) { + b1.clear(); + } else if (nInsertions == nBloomSize / 2) { + b2.clear(); + } + b1.insert(vKey); + b2.insert(vKey); + if (++nInsertions == nBloomSize) { + nInsertions = 0; + } +} + +bool CRollingBloomFilter::contains(const std::vector<unsigned char>& vKey) const +{ + if (nInsertions < nBloomSize / 2) { + return b2.contains(vKey); + } + return b1.contains(vKey); +} + +void CRollingBloomFilter::clear() +{ + b1.clear(); + b2.clear(); + nInsertions = 0; +} diff --git a/src/bloom.h b/src/bloom.h index 191ffa19b3..bb17f59c86 100644 --- a/src/bloom.h +++ b/src/bloom.h @@ -32,14 +32,14 @@ enum bloomflags /** * BloomFilter is a probabilistic filter which SPV clients provide - * so that we can filter the transactions we sends them. + * so that we can filter the transactions we send them. * * This allows for significantly more efficient transaction and block downloads. * - * Because bloom filters are probabilistic, an SPV node can increase the false- - * positive rate, making us send them transactions which aren't actually theirs, + * Because bloom filters are probabilistic, a SPV node can increase the false- + * positive rate, making us send it transactions which aren't actually its, * allowing clients to trade more bandwidth for more privacy by obfuscating which - * keys are owned by them. + * keys are controlled by them. */ class CBloomFilter { @@ -53,6 +53,10 @@ private: unsigned int Hash(unsigned int nHashNum, const std::vector<unsigned char>& vDataToHash) const; + // Private constructor for CRollingBloomFilter, no restrictions on size + CBloomFilter(unsigned int nElements, double nFPRate, unsigned int nTweak); + friend class CRollingBloomFilter; + public: /** * Creates a new bloom filter which will provide the given fp rate when filled with the given number of elements @@ -97,4 +101,28 @@ public: void UpdateEmptyFull(); }; +/** + * RollingBloomFilter is a probabilistic "keep track of most recently inserted" set. + * Construct it with the number of items to keep track of, and a false-positive rate. + * + * contains(item) will always return true if item was one of the last N things + * insert()'ed ... but may also return true for items that were not inserted. + */ +class CRollingBloomFilter +{ +public: + CRollingBloomFilter(unsigned int nElements, double nFPRate, unsigned int nTweak); + + void insert(const std::vector<unsigned char>& vKey); + bool contains(const std::vector<unsigned char>& vKey) const; + + void clear(); + +private: + unsigned int nBloomSize; + unsigned int nInsertions; + CBloomFilter b1, b2; +}; + + #endif // BITCOIN_BLOOM_H diff --git a/src/chain.h b/src/chain.h index 02f53cd2f2..01be2d6e5c 100644 --- a/src/chain.h +++ b/src/chain.h @@ -74,7 +74,7 @@ enum BlockStatus { */ BLOCK_VALID_TRANSACTIONS = 3, - //! Outputs do not overspend inputs, no double spends, coinbase output ok, immature coinbase spends, BIP30. + //! Outputs do not overspend inputs, no double spends, coinbase output ok, no immature coinbase spends, BIP30. //! Implies all parents are also at least CHAIN. BLOCK_VALID_CHAIN = 4, diff --git a/src/chainparams.cpp b/src/chainparams.cpp index 2d4fde2476..556d0aed4d 100644 --- a/src/chainparams.cpp +++ b/src/chainparams.cpp @@ -5,7 +5,6 @@ #include "chainparams.h" -#include "random.h" #include "util.h" #include "utilstrencodings.h" @@ -15,35 +14,11 @@ using namespace std; -struct SeedSpec6 { - uint8_t addr[16]; - uint16_t port; -}; - #include "chainparamsseeds.h" /** * Main network */ - -//! Convert the pnSeeds6 array into usable address objects. -static void convertSeed6(std::vector<CAddress> &vSeedsOut, const SeedSpec6 *data, unsigned int count) -{ - // It'll only connect to one or two seed nodes because once it connects, - // it'll get a pile of addresses with newer timestamps. - // Seed nodes are given a random 'last seen time' of between one and two - // weeks ago. - const int64_t nOneWeek = 7*24*60*60; - for (unsigned int i = 0; i < count; i++) - { - struct in6_addr ip; - memcpy(&ip, data[i].addr, sizeof(ip)); - CAddress addr(CService(ip, data[i].port)); - addr.nTime = GetTime() - GetRand(nOneWeek) - nOneWeek; - vSeedsOut.push_back(addr); - } -} - /** * What makes a good checkpoint block? * + Is surrounded by blocks with reasonable timestamps @@ -51,51 +26,6 @@ static void convertSeed6(std::vector<CAddress> &vSeedsOut, const SeedSpec6 *data * timestamp before) * + Contains no strange transactions */ -static Checkpoints::MapCheckpoints mapCheckpoints = - boost::assign::map_list_of - ( 11111, uint256S("0x0000000069e244f73d78e8fd29ba2fd2ed618bd6fa2ee92559f542fdb26e7c1d")) - ( 33333, uint256S("0x000000002dd5588a74784eaa7ab0507a18ad16a236e7b1ce69f00d7ddfb5d0a6")) - ( 74000, uint256S("0x0000000000573993a3c9e41ce34471c079dcf5f52a0e824a81e7f953b8661a20")) - (105000, uint256S("0x00000000000291ce28027faea320c8d2b054b2e0fe44a773f3eefb151d6bdc97")) - (134444, uint256S("0x00000000000005b12ffd4cd315cd34ffd4a594f430ac814c91184a0d42d2b0fe")) - (168000, uint256S("0x000000000000099e61ea72015e79632f216fe6cb33d7899acb35b75c8303b763")) - (193000, uint256S("0x000000000000059f452a5f7340de6682a977387c17010ff6e6c3bd83ca8b1317")) - (210000, uint256S("0x000000000000048b95347e83192f69cf0366076336c639f9b7228e9ba171342e")) - (216116, uint256S("0x00000000000001b4f4b433e81ee46494af945cf96014816a4e2370f11b23df4e")) - (225430, uint256S("0x00000000000001c108384350f74090433e7fcf79a606b8e797f065b130575932")) - (250000, uint256S("0x000000000000003887df1f29024b06fc2200b55f8af8f35453d7be294df2d214")) - (279000, uint256S("0x0000000000000001ae8c72a0b0c301f67e3afca10e819efa9041e458e9bd7e40")) - (295000, uint256S("0x00000000000000004d9b4ef50f0f9d686fd69db2e03af35a100370c64632a983")) - ; -static const Checkpoints::CCheckpointData data = { - &mapCheckpoints, - 1397080064, // * UNIX timestamp of last checkpoint block - 36544669, // * total number of transactions between genesis and last checkpoint - // (the tx=... number in the SetBestChain debug.log lines) - 60000.0 // * estimated number of transactions per day after checkpoint - }; - -static Checkpoints::MapCheckpoints mapCheckpointsTestnet = - boost::assign::map_list_of - ( 546, uint256S("000000002a936ca763904c3c35fce2f3556c559c0214345d31b1bcebf76acb70")) - ; -static const Checkpoints::CCheckpointData dataTestnet = { - &mapCheckpointsTestnet, - 1337966069, - 1488, - 300 - }; - -static Checkpoints::MapCheckpoints mapCheckpointsRegtest = - boost::assign::map_list_of - ( 0, uint256S("0f9188f13cb7b2c71f2a335e3a4fc328bf5beb436012afca590b1a11466e2206")) - ; -static const Checkpoints::CCheckpointData dataRegtest = { - &mapCheckpointsRegtest, - 0, - 0, - 0 - }; class CMainParams : public CChainParams { public: @@ -112,7 +42,7 @@ public: /** * The message start string is designed to be unlikely to occur in normal data. * The characters are rarely used upper ASCII, not valid as UTF-8, and produce - * a large 4-byte int at any alignment. + * a large 32-bit integer with any alignment. */ pchMessageStart[0] = 0xf9; pchMessageStart[1] = 0xbe; @@ -121,11 +51,13 @@ public: vAlertPubKey = ParseHex("04fc9702847840aaf195de8442ebecedf5b095cdbb9bc716bda9110971b28a49e0ead8564ff0db22209e0374782c093bb899692d524e9d6a6956e7c5ecbcd68284"); nDefaultPort = 8333; nMinerThreads = 0; + nPruneAfterHeight = 100000; /** - * Build the genesis block. Note that the output of the genesis coinbase cannot - * be spent as it did not originally exist in the database. - * + * Build the genesis block. Note that the output of its generation + * transaction cannot be spent since it did not originally exist in the + * database. + * * CBlock(hash=000000000019d6, ver=1, hashPrevBlock=00000000000000, hashMerkleRoot=4a5e1e, nTime=1231006505, nBits=1d00ffff, nNonce=2083236893, vtx=1) * CTransaction(hash=4a5e1e, ver=1, vin.size=1, vout.size=1, nLockTime=0) * CTxIn(COutPoint(000000, -1), coinbase 04ffff001d0104455468652054696d65732030332f4a616e2f32303039204368616e63656c6c6f72206f6e206272696e6b206f66207365636f6e64206261696c6f757420666f722062616e6b73) @@ -156,6 +88,7 @@ public: vSeeds.push_back(CDNSSeedData("dashjr.org", "dnsseed.bitcoin.dashjr.org")); // Luke Dashjr vSeeds.push_back(CDNSSeedData("bitcoinstats.com", "seed.bitcoinstats.com")); // Addy Yeow vSeeds.push_back(CDNSSeedData("xf2.org", "bitseed.xf2.org")); // Jeff Garzik + vSeeds.push_back(CDNSSeedData("bitcoin.jonasschnelli.ch", "seed.bitcoin.jonasschnelli.ch")); // Jonas Schnelli base58Prefixes[PUBKEY_ADDRESS] = std::vector<unsigned char>(1,0); base58Prefixes[SCRIPT_ADDRESS] = std::vector<unsigned char>(1,5); @@ -163,7 +96,7 @@ public: base58Prefixes[EXT_PUBLIC_KEY] = boost::assign::list_of(0x04)(0x88)(0xB2)(0x1E).convert_to_container<std::vector<unsigned char> >(); base58Prefixes[EXT_SECRET_KEY] = boost::assign::list_of(0x04)(0x88)(0xAD)(0xE4).convert_to_container<std::vector<unsigned char> >(); - convertSeed6(vFixedSeeds, pnSeed6_main, ARRAYLEN(pnSeed6_main)); + vFixedSeeds = std::vector<SeedSpec6>(pnSeed6_main, pnSeed6_main + ARRAYLEN(pnSeed6_main)); fRequireRPCPassword = true; fMiningRequiresPeers = true; @@ -171,11 +104,27 @@ public: fRequireStandard = true; fMineBlocksOnDemand = false; fTestnetToBeDeprecatedFieldRPC = false; - } - const Checkpoints::CCheckpointData& Checkpoints() const - { - return data; + checkpointData = (Checkpoints::CCheckpointData) { + boost::assign::map_list_of + ( 11111, uint256S("0x0000000069e244f73d78e8fd29ba2fd2ed618bd6fa2ee92559f542fdb26e7c1d")) + ( 33333, uint256S("0x000000002dd5588a74784eaa7ab0507a18ad16a236e7b1ce69f00d7ddfb5d0a6")) + ( 74000, uint256S("0x0000000000573993a3c9e41ce34471c079dcf5f52a0e824a81e7f953b8661a20")) + (105000, uint256S("0x00000000000291ce28027faea320c8d2b054b2e0fe44a773f3eefb151d6bdc97")) + (134444, uint256S("0x00000000000005b12ffd4cd315cd34ffd4a594f430ac814c91184a0d42d2b0fe")) + (168000, uint256S("0x000000000000099e61ea72015e79632f216fe6cb33d7899acb35b75c8303b763")) + (193000, uint256S("0x000000000000059f452a5f7340de6682a977387c17010ff6e6c3bd83ca8b1317")) + (210000, uint256S("0x000000000000048b95347e83192f69cf0366076336c639f9b7228e9ba171342e")) + (216116, uint256S("0x00000000000001b4f4b433e81ee46494af945cf96014816a4e2370f11b23df4e")) + (225430, uint256S("0x00000000000001c108384350f74090433e7fcf79a606b8e797f065b130575932")) + (250000, uint256S("0x000000000000003887df1f29024b06fc2200b55f8af8f35453d7be294df2d214")) + (279000, uint256S("0x0000000000000001ae8c72a0b0c301f67e3afca10e819efa9041e458e9bd7e40")) + (295000, uint256S("0x00000000000000004d9b4ef50f0f9d686fd69db2e03af35a100370c64632a983")), + 1397080064, // * UNIX timestamp of last checkpoint block + 36544669, // * total number of transactions between genesis and last checkpoint + // (the tx=... number in the SetBestChain debug.log lines) + 60000.0 // * estimated number of transactions per day after checkpoint + }; } }; static CMainParams mainParams; @@ -198,6 +147,7 @@ public: vAlertPubKey = ParseHex("04302390343f91cc401d56d68b123028bf52e5fca1939df127f63c6467cdf9c8e2c14b61104cf817d0b780da337893ecc4aaff1309e536162dabbdb45200ca2b0a"); nDefaultPort = 18333; nMinerThreads = 0; + nPruneAfterHeight = 1000; //! Modify the testnet genesis block so the timestamp is valid for a later start. genesis.nTime = 1296688602; @@ -218,7 +168,7 @@ public: base58Prefixes[EXT_PUBLIC_KEY] = boost::assign::list_of(0x04)(0x35)(0x87)(0xCF).convert_to_container<std::vector<unsigned char> >(); base58Prefixes[EXT_SECRET_KEY] = boost::assign::list_of(0x04)(0x35)(0x83)(0x94).convert_to_container<std::vector<unsigned char> >(); - convertSeed6(vFixedSeeds, pnSeed6_test, ARRAYLEN(pnSeed6_test)); + vFixedSeeds = std::vector<SeedSpec6>(pnSeed6_test, pnSeed6_test + ARRAYLEN(pnSeed6_test)); fRequireRPCPassword = true; fMiningRequiresPeers = true; @@ -226,10 +176,15 @@ public: fRequireStandard = false; fMineBlocksOnDemand = false; fTestnetToBeDeprecatedFieldRPC = true; - } - const Checkpoints::CCheckpointData& Checkpoints() const - { - return dataTestnet; + + checkpointData = (Checkpoints::CCheckpointData) { + boost::assign::map_list_of + ( 546, uint256S("000000002a936ca763904c3c35fce2f3556c559c0214345d31b1bcebf76acb70")), + 1337966069, + 1488, + 300 + }; + } }; static CTestNetParams testNetParams; @@ -257,6 +212,7 @@ public: consensus.hashGenesisBlock = genesis.GetHash(); nDefaultPort = 18444; assert(consensus.hashGenesisBlock == uint256S("0x0f9188f13cb7b2c71f2a335e3a4fc328bf5beb436012afca590b1a11466e2206")); + nPruneAfterHeight = 1000; vFixedSeeds.clear(); //! Regtest mode doesn't have any fixed seeds. vSeeds.clear(); //! Regtest mode doesn't have any DNS seeds. @@ -267,10 +223,14 @@ public: fRequireStandard = false; fMineBlocksOnDemand = true; fTestnetToBeDeprecatedFieldRPC = false; - } - const Checkpoints::CCheckpointData& Checkpoints() const - { - return dataRegtest; + + checkpointData = (Checkpoints::CCheckpointData){ + boost::assign::map_list_of + ( 0, uint256S("0f9188f13cb7b2c71f2a335e3a4fc328bf5beb436012afca590b1a11466e2206")), + 0, + 0, + 0 + }; } }; static CRegTestParams regTestParams; diff --git a/src/chainparams.h b/src/chainparams.h index 0692094478..bb95b3aa4a 100644 --- a/src/chainparams.h +++ b/src/chainparams.h @@ -19,6 +19,12 @@ struct CDNSSeedData { CDNSSeedData(const std::string &strName, const std::string &strHost) : name(strName), host(strHost) {} }; +struct SeedSpec6 { + uint8_t addr[16]; + uint16_t port; +}; + + /** * CChainParams defines various tweakable parameters of a given instance of the * Bitcoin system. There are three: the main network on which people trade goods @@ -56,8 +62,9 @@ public: bool MiningRequiresPeers() const { return fMiningRequiresPeers; } /** Default value for -checkmempool and -checkblockindex argument */ bool DefaultConsistencyChecks() const { return fDefaultConsistencyChecks; } - /** Make standard checks */ + /** Policy: Filter transactions that do not match well-defined patterns */ bool RequireStandard() const { return fRequireStandard; } + int64_t PruneAfterHeight() const { return nPruneAfterHeight; } /** Make miner stop after a block is found. In RPC, don't return until nGenProcLimit blocks are generated */ bool MineBlocksOnDemand() const { return fMineBlocksOnDemand; } /** In the future use NetworkIDString() for RPC fields */ @@ -66,8 +73,8 @@ public: std::string NetworkIDString() const { return strNetworkID; } const std::vector<CDNSSeedData>& DNSSeeds() const { return vSeeds; } const std::vector<unsigned char>& Base58Prefix(Base58Type type) const { return base58Prefixes[type]; } - const std::vector<CAddress>& FixedSeeds() const { return vFixedSeeds; } - virtual const Checkpoints::CCheckpointData& Checkpoints() const = 0; + const std::vector<SeedSpec6>& FixedSeeds() const { return vFixedSeeds; } + const Checkpoints::CCheckpointData& Checkpoints() const { return checkpointData; } protected: CChainParams() {} @@ -77,22 +84,24 @@ protected: std::vector<unsigned char> vAlertPubKey; int nDefaultPort; int nMinerThreads; + uint64_t nPruneAfterHeight; std::vector<CDNSSeedData> vSeeds; std::vector<unsigned char> base58Prefixes[MAX_BASE58_TYPES]; std::string strNetworkID; CBlock genesis; - std::vector<CAddress> vFixedSeeds; + std::vector<SeedSpec6> vFixedSeeds; bool fRequireRPCPassword; bool fMiningRequiresPeers; bool fDefaultConsistencyChecks; bool fRequireStandard; bool fMineBlocksOnDemand; bool fTestnetToBeDeprecatedFieldRPC; + Checkpoints::CCheckpointData checkpointData; }; /** - * Return the currently selected parameters. This won't change after app startup - * outside of the unit tests. + * Return the currently selected parameters. This won't change after app + * startup, except for unit tests. */ const CChainParams &Params(); diff --git a/src/chainparamsbase.h b/src/chainparamsbase.h index 421a3a06ff..4369d0aef7 100644 --- a/src/chainparamsbase.h +++ b/src/chainparamsbase.h @@ -34,8 +34,8 @@ protected: }; /** - * Return the currently selected parameters. This won't change after app startup - * outside of the unit tests. + * Return the currently selected parameters. This won't change after app + * startup, except for unit tests. */ const CBaseChainParams& BaseParams(); diff --git a/src/checkpoints.cpp b/src/checkpoints.cpp index 71579bb309..2024486139 100644 --- a/src/checkpoints.cpp +++ b/src/checkpoints.cpp @@ -15,22 +15,18 @@ namespace Checkpoints { /** - * How many times we expect transactions after the last checkpoint to - * be slower. This number is a compromise, as it can't be accurate for - * every system. When reindexing from a fast disk with a slow CPU, it + * How many times slower we expect checking transactions after the last + * checkpoint to be (from checking signatures, which is skipped up to the + * last checkpoint). This number is a compromise, as it can't be accurate + * for every system. When reindexing from a fast disk with a slow CPU, it * can be up to 20, while when downloading from a slow network with a * fast multicore CPU, it won't be much higher than 1. */ static const double SIGCHECK_VERIFICATION_FACTOR = 5.0; - bool fEnabled = true; - - bool CheckBlock(int nHeight, const uint256& hash) + bool CheckBlock(const CCheckpointData& data, int nHeight, const uint256& hash) { - if (!fEnabled) - return true; - - const MapCheckpoints& checkpoints = *Params().Checkpoints().mapCheckpoints; + const MapCheckpoints& checkpoints = data.mapCheckpoints; MapCheckpoints::const_iterator i = checkpoints.find(nHeight); if (i == checkpoints.end()) return true; @@ -38,7 +34,7 @@ namespace Checkpoints { } //! Guess how far we are in the verification process at the given block index - double GuessVerificationProgress(CBlockIndex *pindex, bool fSigchecks) { + double GuessVerificationProgress(const CCheckpointData& data, CBlockIndex *pindex, bool fSigchecks) { if (pindex==NULL) return 0.0; @@ -50,8 +46,6 @@ namespace Checkpoints { // Work is defined as: 1.0 per transaction before the last checkpoint, and // fSigcheckVerificationFactor per transaction after. - const CCheckpointData &data = Params().Checkpoints(); - if (pindex->nChainTx <= data.nTransactionsLastCheckpoint) { double nCheapBefore = pindex->nChainTx; double nCheapAfter = data.nTransactionsLastCheckpoint - pindex->nChainTx; @@ -69,22 +63,19 @@ namespace Checkpoints { return fWorkBefore / (fWorkBefore + fWorkAfter); } - int GetTotalBlocksEstimate() + int GetTotalBlocksEstimate(const CCheckpointData& data) { - if (!fEnabled) - return 0; + const MapCheckpoints& checkpoints = data.mapCheckpoints; - const MapCheckpoints& checkpoints = *Params().Checkpoints().mapCheckpoints; + if (checkpoints.empty()) + return 0; return checkpoints.rbegin()->first; } - CBlockIndex* GetLastCheckpoint() + CBlockIndex* GetLastCheckpoint(const CCheckpointData& data) { - if (!fEnabled) - return NULL; - - const MapCheckpoints& checkpoints = *Params().Checkpoints().mapCheckpoints; + const MapCheckpoints& checkpoints = data.mapCheckpoints; BOOST_REVERSE_FOREACH(const MapCheckpoints::value_type& i, checkpoints) { diff --git a/src/checkpoints.h b/src/checkpoints.h index 29dc5f83a9..a720f096c0 100644 --- a/src/checkpoints.h +++ b/src/checkpoints.h @@ -11,7 +11,7 @@ class CBlockIndex; -/** +/** * Block-chain checkpoints are compiled-in sanity checks. * They are updated every release or three. */ @@ -20,24 +20,22 @@ namespace Checkpoints typedef std::map<int, uint256> MapCheckpoints; struct CCheckpointData { - const MapCheckpoints *mapCheckpoints; + MapCheckpoints mapCheckpoints; int64_t nTimeLastCheckpoint; int64_t nTransactionsLastCheckpoint; double fTransactionsPerDay; }; //! Returns true if block passes checkpoint checks -bool CheckBlock(int nHeight, const uint256& hash); +bool CheckBlock(const CCheckpointData& data, int nHeight, const uint256& hash); //! Return conservative estimate of total number of blocks, 0 if unknown -int GetTotalBlocksEstimate(); +int GetTotalBlocksEstimate(const CCheckpointData& data); //! Returns last CBlockIndex* in mapBlockIndex that is a checkpoint -CBlockIndex* GetLastCheckpoint(); +CBlockIndex* GetLastCheckpoint(const CCheckpointData& data); -double GuessVerificationProgress(CBlockIndex* pindex, bool fSigchecks = true); - -extern bool fEnabled; +double GuessVerificationProgress(const CCheckpointData& data, CBlockIndex* pindex, bool fSigchecks = true); } //namespace Checkpoints diff --git a/src/checkqueue.h b/src/checkqueue.h index 6f6b97e3a7..20ba25bb41 100644 --- a/src/checkqueue.h +++ b/src/checkqueue.h @@ -54,7 +54,7 @@ private: /** * Number of verifications that haven't completed yet. - * This includes elements that are not anymore in queue, but still in + * This includes elements that are no longer queued, but still in the * worker's own batches. */ unsigned int nTodo; @@ -81,7 +81,7 @@ private: fAllOk &= fOk; nTodo -= nNow; if (nTodo == 0 && !fMaster) - // We processed the last element; inform the master he or she can exit and return the result + // We processed the last element; inform the master it can exit and return the result condMaster.notify_one(); } else { // first iteration @@ -136,7 +136,7 @@ public: Loop(); } - //! Wait until execution finishes, and return whether all evaluations where successful. + //! Wait until execution finishes, and return whether all evaluations were successful. bool Wait() { return Loop(true); diff --git a/src/consensus/consensus.h b/src/consensus/consensus.h new file mode 100644 index 0000000000..9c5b7d4ffb --- /dev/null +++ b/src/consensus/consensus.h @@ -0,0 +1,18 @@ +// Copyright (c) 2009-2010 Satoshi Nakamoto +// Copyright (c) 2009-2014 The Bitcoin Core developers +// Distributed under the MIT software license, see the accompanying +// file COPYING or http://www.opensource.org/licenses/mit-license.php. + +#ifndef BITCOIN_CONSENSUS_CONSENSUS_H +#define BITCOIN_CONSENSUS_CONSENSUS_H + +/** The maximum allowed size for a serialized block, in bytes (network rule) */ +static const unsigned int MAX_BLOCK_SIZE = 1000000; +/** The maximum allowed number of signature check operations in a block (network rule) */ +static const unsigned int MAX_BLOCK_SIGOPS = MAX_BLOCK_SIZE/50; +/** Coinbase transaction outputs can only be spent after this number of new blocks (network rule) */ +static const int COINBASE_MATURITY = 100; +/** Threshold for nLockTime: below this value it is interpreted as block number, otherwise as UNIX timestamp. */ +static const unsigned int LOCKTIME_THRESHOLD = 500000000; // Tue Nov 5 00:53:20 1985 UTC + +#endif // BITCOIN_CONSENSUS_CONSENSUS_H diff --git a/src/hash.cpp b/src/hash.cpp index 20d5d21777..9711293e38 100644 --- a/src/hash.cpp +++ b/src/hash.cpp @@ -5,6 +5,7 @@ #include "hash.h" #include "crypto/common.h" #include "crypto/hmac_sha512.h" +#include "pubkey.h" inline uint32_t ROTL32(uint32_t x, int8_t r) @@ -71,15 +72,12 @@ unsigned int MurmurHash3(unsigned int nHashSeed, const std::vector<unsigned char return h1; } -void BIP32Hash(const unsigned char chainCode[32], unsigned int nChild, unsigned char header, const unsigned char data[32], unsigned char output[64]) +void BIP32Hash(const ChainCode &chainCode, unsigned int nChild, unsigned char header, const unsigned char data[32], unsigned char output[64]) { unsigned char num[4]; num[0] = (nChild >> 24) & 0xFF; num[1] = (nChild >> 16) & 0xFF; num[2] = (nChild >> 8) & 0xFF; num[3] = (nChild >> 0) & 0xFF; - CHMAC_SHA512(chainCode, 32).Write(&header, 1) - .Write(data, 32) - .Write(num, 4) - .Finalize(output); + CHMAC_SHA512(chainCode.begin(), chainCode.size()).Write(&header, 1).Write(data, 32).Write(num, 4).Finalize(output); } diff --git a/src/hash.h b/src/hash.h index e56b784a61..0771555623 100644 --- a/src/hash.h +++ b/src/hash.h @@ -14,6 +14,8 @@ #include <vector> +typedef uint256 ChainCode; + /** A hasher class for Bitcoin's 256-bit hash (double SHA-256). */ class CHash256 { private: @@ -159,6 +161,6 @@ uint256 SerializeHash(const T& obj, int nType=SER_GETHASH, int nVersion=PROTOCOL unsigned int MurmurHash3(unsigned int nHashSeed, const std::vector<unsigned char>& vDataToHash); -void BIP32Hash(const unsigned char chainCode[32], unsigned int nChild, unsigned char header, const unsigned char data[32], unsigned char output[64]); +void BIP32Hash(const ChainCode &chainCode, unsigned int nChild, unsigned char header, const unsigned char data[32], unsigned char output[64]); #endif // BITCOIN_HASH_H diff --git a/src/init.cpp b/src/init.cpp index 665aebe1c5..47cbda32f5 100644 --- a/src/init.cpp +++ b/src/init.cpp @@ -52,7 +52,7 @@ bool fFeeEstimatesInitialized = false; #ifdef WIN32 // Win32 LevelDB doesn't use filedescriptors, and the ones used for -// accessing block files, don't count towards to fd_set size limit +// accessing block files don't count towards the fd_set size limit // anyway. #define MIN_CORE_FILEDESCRIPTORS 0 #else @@ -68,7 +68,7 @@ enum BindFlags { }; static const char* FEE_ESTIMATES_FILENAME="fee_estimates.dat"; -CClientUIInterface uiInterface; +CClientUIInterface uiInterface; // Declared but not defined in ui_interface.h ////////////////////////////////////////////////////////////////////////////// // @@ -194,6 +194,7 @@ void Shutdown() delete pwalletMain; pwalletMain = NULL; #endif + ECC_Stop(); LogPrintf("%s: done\n", __func__); } @@ -275,7 +276,10 @@ std::string HelpMessage(HelpMessageMode mode) #ifndef WIN32 strUsage += HelpMessageOpt("-pid=<file>", strprintf(_("Specify pid file (default: %s)"), "bitcoind.pid")); #endif - strUsage += HelpMessageOpt("-reindex", _("Rebuild block chain index from current blk000??.dat files") + " " + _("on startup")); + strUsage += HelpMessageOpt("-prune=<n>", strprintf(_("Reduce storage requirements by pruning (deleting) old blocks. This mode disables wallet support and is incompatible with -txindex. " + "Warning: Reverting this setting requires re-downloading the entire blockchain. " + "(default: 0 = disable pruning blocks, >%u = target size in MiB to use for block files)"), MIN_DISK_SPACE_FOR_BLOCK_FILES / 1024 / 1024)); + strUsage += HelpMessageOpt("-reindex", _("Rebuild block chain index from current blk000??.dat files on startup")); #if !defined(WIN32) strUsage += HelpMessageOpt("-sysperms", _("Create new files with system default permissions, instead of umask 077 (only effective with disabled wallet functionality)")); #endif @@ -329,7 +333,7 @@ std::string HelpMessage(HelpMessageMode mode) strUsage += HelpMessageOpt("-sendfreetransactions", strprintf(_("Send transactions as zero-fee transactions if possible (default: %u)"), 0)); strUsage += HelpMessageOpt("-spendzeroconfchange", strprintf(_("Spend unconfirmed change when sending transactions (default: %u)"), 1)); strUsage += HelpMessageOpt("-txconfirmtarget=<n>", strprintf(_("If paytxfee is not set, include enough fee so transactions begin confirmation on average within n blocks (default: %u)"), 1)); - strUsage += HelpMessageOpt("-maxtxfee=<amt>", strprintf(_("Maximum total fees to use in a single wallet transaction, setting too low may abort large transactions (default: %s)"), + strUsage += HelpMessageOpt("-maxtxfee=<amt>", strprintf(_("Maximum total fees to use in a single wallet transaction; setting this too low may abort large transactions (default: %s)"), FormatMoney(maxTxFee))); strUsage += HelpMessageOpt("-upgradewallet", _("Upgrade wallet to latest format") + " " + _("on startup")); strUsage += HelpMessageOpt("-wallet=<file>", _("Specify wallet file (within data directory)") + " " + strprintf(_("(default: %s)"), "wallet.dat")); @@ -352,7 +356,7 @@ std::string HelpMessage(HelpMessageMode mode) strUsage += HelpMessageOpt("-flushwallet", strprintf(_("Run a thread to flush wallet periodically (default: %u)"), 1)); strUsage += HelpMessageOpt("-stopafterblockimport", strprintf(_("Stop running after importing blocks from disk (default: %u)"), 0)); } - string debugCategories = "addrman, alert, bench, coindb, db, lock, rand, rpc, selectcoins, mempool, net, proxy"; // Don't translate these and qt below + string debugCategories = "addrman, alert, bench, coindb, db, lock, rand, rpc, selectcoins, mempool, net, proxy, prune"; // Don't translate these and qt below if (mode == HMM_BITCOIN_QT) debugCategories += ", qt"; strUsage += HelpMessageOpt("-debug=<category>", strprintf(_("Output debugging information (default: %u, supplying <category> is optional)"), 0) + ". " + @@ -458,10 +462,33 @@ struct CImportingNow } }; + +// If we're using -prune with -reindex, then delete block files that will be ignored by the +// reindex. Since reindexing works by starting at block file 0 and looping until a blockfile +// is missing, and since pruning works by deleting the oldest block file first, just check +// for block file 0, and if it doesn't exist, delete all the block files in the +// directory (since they won't be read by the reindex but will take up disk space). +void DeleteAllBlockFiles() +{ + if (boost::filesystem::exists(GetBlockPosFilename(CDiskBlockPos(0, 0), "blk"))) + return; + + LogPrintf("Removing all blk?????.dat and rev?????.dat files for -reindex with -prune\n"); + boost::filesystem::path blocksdir = GetDataDir() / "blocks"; + for (boost::filesystem::directory_iterator it(blocksdir); it != boost::filesystem::directory_iterator(); it++) { + if (is_regular_file(*it)) { + if ((it->path().filename().string().length() == 12) && + (it->path().filename().string().substr(8,4) == ".dat") && + ((it->path().filename().string().substr(0,3) == "blk") || + (it->path().filename().string().substr(0,3) == "rev"))) + boost::filesystem::remove(it->path()); + } + } +} + void ThreadImport(std::vector<boost::filesystem::path> vImportFiles) { RenameThread("bitcoin-loadblk"); - // -reindex if (fReindex) { CImportingNow imp; @@ -674,6 +701,21 @@ bool AppInit2(boost::thread_group& threadGroup) if (nFD - MIN_CORE_FILEDESCRIPTORS < nMaxConnections) nMaxConnections = nFD - MIN_CORE_FILEDESCRIPTORS; + // if using block pruning, then disable txindex + // also disable the wallet (for now, until SPV support is implemented in wallet) + if (GetArg("-prune", 0)) { + if (GetBoolArg("-txindex", false)) + return InitError(_("Prune mode is incompatible with -txindex.")); +#ifdef ENABLE_WALLET + if (!GetBoolArg("-disablewallet", false)) { + if (SoftSetBoolArg("-disablewallet", true)) + LogPrintf("%s : parameter interaction: -prune -> setting -disablewallet=1\n", __func__); + else + return InitError(_("Can't run with a wallet in prune mode.")); + } +#endif + } + // ********************************************************* Step 3: parameter-to-internal-flags fDebug = !mapMultiArgs["-debug"].empty(); @@ -698,7 +740,7 @@ bool AppInit2(boost::thread_group& threadGroup) // Checkmempool and checkblockindex default to true in regtest mode mempool.setSanityCheck(GetBoolArg("-checkmempool", chainparams.DefaultConsistencyChecks())); fCheckBlockIndex = GetBoolArg("-checkblockindex", chainparams.DefaultConsistencyChecks()); - Checkpoints::fEnabled = GetBoolArg("-checkpoints", true); + fCheckpointsEnabled = GetBoolArg("-checkpoints", true); // -par=0 means autodetect, but nScriptCheckThreads==0 means no concurrency nScriptCheckThreads = GetArg("-par", DEFAULT_SCRIPTCHECK_THREADS); @@ -710,6 +752,21 @@ bool AppInit2(boost::thread_group& threadGroup) nScriptCheckThreads = MAX_SCRIPTCHECK_THREADS; fServer = GetBoolArg("-server", false); + + // block pruning; get the amount of disk space (in MB) to allot for block & undo files + int64_t nSignedPruneTarget = GetArg("-prune", 0) * 1024 * 1024; + if (nSignedPruneTarget < 0) { + return InitError(_("Prune cannot be configured with a negative value.")); + } + nPruneTarget = (uint64_t) nSignedPruneTarget; + if (nPruneTarget) { + if (nPruneTarget < MIN_DISK_SPACE_FOR_BLOCK_FILES) { + return InitError(strprintf(_("Prune configured below the minimum of %d MB. Please use a higher number."), MIN_DISK_SPACE_FOR_BLOCK_FILES / 1024 / 1024)); + } + LogPrintf("Prune configured to target %uMiB on disk for block and undo files.\n", nPruneTarget / 1024 / 1024); + fPruneMode = true; + } + #ifdef ENABLE_WALLET bool fDisableWallet = GetBoolArg("-disablewallet", false); #endif @@ -788,6 +845,9 @@ bool AppInit2(boost::thread_group& threadGroup) // ********************************************************* Step 4: application initialization: dir lock, daemonize, pidfile, debug log + // Initialize elliptic curve code + ECC_Start(); + // Sanity check if (!InitSanityCheck()) return InitError(_("Initialization sanity check failed. Bitcoin Core is shutting down.")); @@ -1030,8 +1090,12 @@ bool AppInit2(boost::thread_group& threadGroup) pcoinscatcher = new CCoinsViewErrorCatcher(pcoinsdbview); pcoinsTip = new CCoinsViewCache(pcoinscatcher); - if (fReindex) + if (fReindex) { pblocktree->WriteReindexing(true); + //If we're reindexing in prune mode, wipe away all our block and undo data files + if (fPruneMode) + DeleteAllBlockFiles(); + } if (!LoadBlockIndex()) { strLoadError = _("Error loading block database"); @@ -1055,7 +1119,18 @@ bool AppInit2(boost::thread_group& threadGroup) break; } + // Check for changed -prune state. What we are concerned about is a user who has pruned blocks + // in the past, but is now trying to run unpruned. + if (fHavePruned && !fPruneMode) { + strLoadError = _("You need to rebuild the database using -reindex to go back to unpruned mode. This will redownload the entire blockchain"); + break; + } + uiInterface.InitMessage(_("Verifying blocks...")); + if (fHavePruned && GetArg("-checkblocks", 288) > MIN_BLOCKS_TO_KEEP) { + LogPrintf("Prune: pruned datadir may not have more than %d blocks; -checkblocks=%d may fail\n", + MIN_BLOCKS_TO_KEEP, GetArg("-checkblocks", 288)); + } if (!CVerifyDB().VerifyDB(pcoinsdbview, GetArg("-checklevel", 3), GetArg("-checkblocks", 288))) { strLoadError = _("Corrupted block database detected"); @@ -1106,6 +1181,15 @@ bool AppInit2(boost::thread_group& threadGroup) mempool.ReadFeeEstimates(est_filein); fFeeEstimatesInitialized = true; + // if prune mode, unset NODE_NETWORK and prune block files + if (fPruneMode) { + LogPrintf("Unsetting NODE_NETWORK on prune mode\n"); + nLocalServices &= ~NODE_NETWORK; + if (!fReindex) { + PruneAndFlush(); + } + } + // ********************************************************* Step 8: load wallet #ifdef ENABLE_WALLET if (fDisableWallet) { @@ -1251,6 +1335,7 @@ bool AppInit2(boost::thread_group& threadGroup) if (mapArgs.count("-blocknotify")) uiInterface.NotifyBlockTip.connect(BlockNotifyCallback); + uiInterface.InitMessage(_("Activating best chain...")); // scan for better chains in the block chain database, that are not yet connected in the active best chain CValidationState state; if (!ActivateBestChain(state)) diff --git a/src/key.cpp b/src/key.cpp index e146e47d0d..b772dff333 100644 --- a/src/key.cpp +++ b/src/key.cpp @@ -14,21 +14,7 @@ #include <secp256k1.h> #include "ecwrapper.h" -//! anonymous namespace -namespace { - -class CSecp256k1Init { -public: - CSecp256k1Init() { - secp256k1_start(SECP256K1_START_SIGN); - } - ~CSecp256k1Init() { - secp256k1_stop(); - } -}; -static CSecp256k1Init instance_of_csecp256k1; - -} // anon namespace +static secp256k1_context_t* secp256k1_context = NULL; bool CKey::Check(const unsigned char *vch) { return eccrypto::Check(vch); @@ -44,7 +30,7 @@ void CKey::MakeNewKey(bool fCompressedIn) { } bool CKey::SetPrivKey(const CPrivKey &privkey, bool fCompressedIn) { - if (!secp256k1_ec_privkey_import((unsigned char*)begin(), &privkey[0], privkey.size())) + if (!secp256k1_ec_privkey_import(secp256k1_context, (unsigned char*)begin(), &privkey[0], privkey.size())) return false; fCompressed = fCompressedIn; fValid = true; @@ -57,7 +43,7 @@ CPrivKey CKey::GetPrivKey() const { int privkeylen, ret; privkey.resize(279); privkeylen = 279; - ret = secp256k1_ec_privkey_export(begin(), (unsigned char*)&privkey[0], &privkeylen, fCompressed); + ret = secp256k1_ec_privkey_export(secp256k1_context, begin(), (unsigned char*)&privkey[0], &privkeylen, fCompressed); assert(ret); privkey.resize(privkeylen); return privkey; @@ -67,7 +53,7 @@ CPubKey CKey::GetPubKey() const { assert(fValid); CPubKey result; int clen = 65; - int ret = secp256k1_ec_pubkey_create((unsigned char*)result.begin(), &clen, begin(), fCompressed); + int ret = secp256k1_ec_pubkey_create(secp256k1_context, (unsigned char*)result.begin(), &clen, begin(), fCompressed); assert((int)result.size() == clen); assert(ret); assert(result.IsValid()); @@ -81,7 +67,7 @@ bool CKey::Sign(const uint256 &hash, std::vector<unsigned char>& vchSig, uint32_ int nSigLen = 72; unsigned char extra_entropy[32] = {0}; WriteLE32(extra_entropy, test_case); - int ret = secp256k1_ecdsa_sign(hash.begin(), (unsigned char*)&vchSig[0], &nSigLen, begin(), secp256k1_nonce_function_rfc6979, test_case ? extra_entropy : NULL); + int ret = secp256k1_ecdsa_sign(secp256k1_context, hash.begin(), (unsigned char*)&vchSig[0], &nSigLen, begin(), secp256k1_nonce_function_rfc6979, test_case ? extra_entropy : NULL); assert(ret); vchSig.resize(nSigLen); return true; @@ -106,7 +92,7 @@ bool CKey::SignCompact(const uint256 &hash, std::vector<unsigned char>& vchSig) return false; vchSig.resize(65); int rec = -1; - int ret = secp256k1_ecdsa_sign_compact(hash.begin(), &vchSig[1], begin(), secp256k1_nonce_function_rfc6979, NULL, &rec); + int ret = secp256k1_ecdsa_sign_compact(secp256k1_context, hash.begin(), &vchSig[1], begin(), secp256k1_nonce_function_rfc6979, NULL, &rec); assert(ret); assert(rec != -1); vchSig[0] = 27 + rec + (fCompressed ? 4 : 0); @@ -114,7 +100,7 @@ bool CKey::SignCompact(const uint256 &hash, std::vector<unsigned char>& vchSig) } bool CKey::Load(CPrivKey &privkey, CPubKey &vchPubKey, bool fSkipCheck=false) { - if (!secp256k1_ec_privkey_import((unsigned char*)begin(), &privkey[0], privkey.size())) + if (!secp256k1_ec_privkey_import(secp256k1_context, (unsigned char*)begin(), &privkey[0], privkey.size())) return false; fCompressed = vchPubKey.IsCompressed(); fValid = true; @@ -125,7 +111,7 @@ bool CKey::Load(CPrivKey &privkey, CPubKey &vchPubKey, bool fSkipCheck=false) { return VerifyPubKey(vchPubKey); } -bool CKey::Derive(CKey& keyChild, unsigned char ccChild[32], unsigned int nChild, const unsigned char cc[32]) const { +bool CKey::Derive(CKey& keyChild, ChainCode &ccChild, unsigned int nChild, const ChainCode& cc) const { assert(IsValid()); assert(IsCompressed()); unsigned char out[64]; @@ -138,9 +124,9 @@ bool CKey::Derive(CKey& keyChild, unsigned char ccChild[32], unsigned int nChild assert(begin() + 32 == end()); BIP32Hash(cc, nChild, 0, begin(), out); } - memcpy(ccChild, out+32, 32); + memcpy(ccChild.begin(), out+32, 32); memcpy((unsigned char*)keyChild.begin(), begin(), 32); - bool ret = secp256k1_ec_privkey_tweak_add((unsigned char*)keyChild.begin(), out); + bool ret = secp256k1_ec_privkey_tweak_add(secp256k1_context, (unsigned char*)keyChild.begin(), out); UnlockObject(out); keyChild.fCompressed = true; keyChild.fValid = ret; @@ -152,7 +138,7 @@ bool CExtKey::Derive(CExtKey &out, unsigned int nChild) const { CKeyID id = key.GetPubKey().GetID(); memcpy(&out.vchFingerprint[0], &id, 4); out.nChild = nChild; - return key.Derive(out.key, out.vchChainCode, nChild, vchChainCode); + return key.Derive(out.key, out.chaincode, nChild, chaincode); } void CExtKey::SetMaster(const unsigned char *seed, unsigned int nSeedLen) { @@ -161,7 +147,7 @@ void CExtKey::SetMaster(const unsigned char *seed, unsigned int nSeedLen) { LockObject(out); CHMAC_SHA512(hashkey, sizeof(hashkey)).Write(seed, nSeedLen).Finalize(out); key.Set(&out[0], &out[32], true); - memcpy(vchChainCode, &out[32], 32); + memcpy(chaincode.begin(), &out[32], 32); UnlockObject(out); nDepth = 0; nChild = 0; @@ -174,7 +160,7 @@ CExtPubKey CExtKey::Neuter() const { memcpy(&ret.vchFingerprint[0], &vchFingerprint[0], 4); ret.nChild = nChild; ret.pubkey = key.GetPubKey(); - memcpy(&ret.vchChainCode[0], &vchChainCode[0], 32); + ret.chaincode = chaincode; return ret; } @@ -183,7 +169,7 @@ void CExtKey::Encode(unsigned char code[74]) const { memcpy(code+1, vchFingerprint, 4); code[5] = (nChild >> 24) & 0xFF; code[6] = (nChild >> 16) & 0xFF; code[7] = (nChild >> 8) & 0xFF; code[8] = (nChild >> 0) & 0xFF; - memcpy(code+9, vchChainCode, 32); + memcpy(code+9, chaincode.begin(), 32); code[41] = 0; assert(key.size() == 32); memcpy(code+42, key.begin(), 32); @@ -193,7 +179,7 @@ void CExtKey::Decode(const unsigned char code[74]) { nDepth = code[0]; memcpy(vchFingerprint, code+1, 4); nChild = (code[5] << 24) | (code[6] << 16) | (code[7] << 8) | code[8]; - memcpy(vchChainCode, code+9, 32); + memcpy(chaincode.begin(), code+9, 32); key.Set(code+42, code+74, true); } @@ -206,3 +192,32 @@ bool ECC_InitSanityCheck() { CPubKey pubkey = key.GetPubKey(); return key.VerifyPubKey(pubkey); } + + +void ECC_Start() { + assert(secp256k1_context == NULL); + + secp256k1_context_t *ctx = secp256k1_context_create(SECP256K1_CONTEXT_SIGN); + assert(ctx != NULL); + + { + // Pass in a random blinding seed to the secp256k1 context. + unsigned char seed[32]; + LockObject(seed); + GetRandBytes(seed, 32); + bool ret = secp256k1_context_randomize(ctx, seed); + assert(ret); + UnlockObject(seed); + } + + secp256k1_context = ctx; +} + +void ECC_Stop() { + secp256k1_context_t *ctx = secp256k1_context; + secp256k1_context = NULL; + + if (ctx) { + secp256k1_context_destroy(ctx); + } +} @@ -6,6 +6,7 @@ #ifndef BITCOIN_KEY_H #define BITCOIN_KEY_H +#include "pubkey.h" #include "serialize.h" #include "support/allocators/secure.h" #include "uint256.h" @@ -13,9 +14,6 @@ #include <stdexcept> #include <vector> -class CPubKey; - -struct CExtPubKey; /** * secp256k1: @@ -138,7 +136,7 @@ public: bool SignCompact(const uint256& hash, std::vector<unsigned char>& vchSig) const; //! Derive BIP32 child key. - bool Derive(CKey& keyChild, unsigned char ccChild[32], unsigned int nChild, const unsigned char cc[32]) const; + bool Derive(CKey& keyChild, ChainCode &ccChild, unsigned int nChild, const ChainCode& cc) const; /** * Verify thoroughly whether a private key and a public key match. @@ -157,13 +155,13 @@ struct CExtKey { unsigned char nDepth; unsigned char vchFingerprint[4]; unsigned int nChild; - unsigned char vchChainCode[32]; + ChainCode chaincode; CKey key; friend bool operator==(const CExtKey& a, const CExtKey& b) { return a.nDepth == b.nDepth && memcmp(&a.vchFingerprint[0], &b.vchFingerprint[0], 4) == 0 && a.nChild == b.nChild && - memcmp(&a.vchChainCode[0], &b.vchChainCode[0], 32) == 0 && a.key == b.key; + a.chaincode == b.chaincode && a.key == b.key; } void Encode(unsigned char code[74]) const; @@ -173,7 +171,13 @@ struct CExtKey { void SetMaster(const unsigned char* seed, unsigned int nSeedLen); }; -/** Check that required EC support is available at runtime */ +/** Initialize the elliptic curve support. May not be called twice without calling ECC_Stop first. */ +void ECC_Start(void); + +/** Deinitialize the elliptic curve support. No-op if ECC_Start wasn't called first. */ +void ECC_Stop(void); + +/** Check that required EC support is available at runtime. */ bool ECC_InitSanityCheck(void); #endif // BITCOIN_KEY_H diff --git a/src/main.cpp b/src/main.cpp index 45e6e4d25d..79ee4e55ec 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -52,9 +52,13 @@ int nScriptCheckThreads = 0; bool fImporting = false; bool fReindex = false; bool fTxIndex = false; +bool fHavePruned = false; +bool fPruneMode = false; bool fIsBareMultisigStd = true; bool fCheckBlockIndex = false; +bool fCheckpointsEnabled = true; unsigned int nCoinCacheSize = 5000; +uint64_t nPruneTarget = 0; /** Fees smaller than this (in satoshi) are considered zero fee (for relaying and mining) */ CFeeRate minRelayTxFee = CFeeRate(1000); @@ -110,17 +114,25 @@ namespace { /** * The set of all CBlockIndex entries with BLOCK_VALID_TRANSACTIONS (for itself and all ancestors) and - * as good as our current tip or better. Entries may be failed, though. + * as good as our current tip or better. Entries may be failed, though, and pruning nodes may be + * missing the data for the block. */ set<CBlockIndex*, CBlockIndexWorkComparator> setBlockIndexCandidates; /** Number of nodes with fSyncStarted. */ int nSyncStarted = 0; - /** All pairs A->B, where A (or one if its ancestors) misses transactions, but B has transactions. */ + /** All pairs A->B, where A (or one if its ancestors) misses transactions, but B has transactions. + * Pruned nodes may have entries where B is missing data. + */ multimap<CBlockIndex*, CBlockIndex*> mapBlocksUnlinked; CCriticalSection cs_LastBlockFile; std::vector<CBlockFileInfo> vinfoBlockFile; int nLastBlockFile = 0; + /** Global flag to indicate we should check to see if there are + * block/undo files that should be deleted. Set on startup + * or if we allocate more file space when we're in prune mode + */ + bool fCheckForPruning = false; /** * Every received block is assigned a unique and increasing identifier, so we @@ -131,8 +143,9 @@ namespace { uint32_t nBlockSequenceId = 1; /** - * Sources of received blocks, to be able to send them reject messages or ban - * them, if processing happens afterwards. Protected by cs_main. + * Sources of received blocks, saved to be able to send them reject + * messages or ban them when processing happens afterwards. Protected by + * cs_main. */ map<uint256, NodeId> mapBlockSource; @@ -378,7 +391,7 @@ void FindNextBlocksToDownload(NodeId nodeid, unsigned int count, std::vector<CBl } // If the peer reorganized, our previous pindexLastCommonBlock may not be an ancestor - // of their current tip anymore. Go back enough to fix that. + // of its current tip anymore. Go back enough to fix that. state->pindexLastCommonBlock = LastCommonAncestor(state->pindexLastCommonBlock, state->pindexBestKnownBlock); if (state->pindexLastCommonBlock == state->pindexBestKnownBlock) return; @@ -930,7 +943,7 @@ bool AcceptToMemoryPool(CTxMemPool& pool, CValidationState &state, const CTransa // do all inputs exist? // Note that this does not check for the presence of actual outputs (see the next check for that), - // only helps filling in pfMissingInputs (to determine missing vs spent). + // and only helps with filling in pfMissingInputs (to determine missing vs spent). BOOST_FOREACH(const CTxIn txin, tx.vin) { if (!view.HaveCoins(txin.prevout.hash)) { if (pfMissingInputs) @@ -1193,8 +1206,11 @@ CAmount GetBlockValue(int nHeight, const CAmount& nFees) bool IsInitialBlockDownload() { + const CChainParams& chainParams = Params(); LOCK(cs_main); - if (fImporting || fReindex || chainActive.Height() < Checkpoints::GetTotalBlocksEstimate()) + if (fImporting || fReindex) + return true; + if (fCheckpointsEnabled && chainActive.Height() < Checkpoints::GetTotalBlocksEstimate(chainParams.Checkpoints())) return true; static bool lockIBDState = false; if (lockIBDState) @@ -1266,8 +1282,8 @@ void CheckForkWarningConditionsOnNewFork(CBlockIndex* pindexNewForkTip) pfork = pfork->pprev; } - // We define a condition which we should warn the user about as a fork of at least 7 blocks - // who's tip is within 72 blocks (+/- 12 hours if no one mines it) of ours + // We define a condition where we should warn the user about as a fork of at least 7 blocks + // with a tip within 72 blocks (+/- 12 hours if no one mines it) of ours // We use 7 blocks rather arbitrarily as it represents just under 10% of sustained network // hash rate operating on the fork. // or a chain that is entirely longer than ours and invalid (note that this should be detected by both) @@ -1698,7 +1714,7 @@ bool ConnectBlock(const CBlock& block, CValidationState& state, CBlockIndex* pin return true; } - bool fScriptChecks = pindex->nHeight >= Checkpoints::GetTotalBlocksEstimate(); + bool fScriptChecks = (!fCheckpointsEnabled || pindex->nHeight >= Checkpoints::GetTotalBlocksEstimate(chainparams.Checkpoints())); // Do not allow blocks that contain transactions which 'overwrite' older transactions, // unless those are already completely spent. @@ -1708,9 +1724,9 @@ bool ConnectBlock(const CBlock& block, CValidationState& state, CBlockIndex* pin // See BIP30 and http://r6.ca/blog/20120206T005236Z.html for more information. // This logic is not necessary for memory pool transactions, as AcceptToMemoryPool // already refuses previously-known transaction ids entirely. - // This rule was originally applied all blocks whose timestamp was after March 15, 2012, 0:00 UTC. + // This rule was originally applied to all blocks with a timestamp after March 15, 2012, 0:00 UTC. // Now that the whole chain is irreversibly beyond that time it is applied to all blocks except the - // two in the chain that violate it. This prevents exploiting the issue against nodes in their + // two in the chain that violate it. This prevents exploiting the issue against nodes during their // initial block download. bool fEnforceBIP30 = (!pindex->phashBlock) || // Enforce on CreateNewBlock invocations which don't have a hash. !((pindex->nHeight==91842 && pindex->GetBlockHash() == uint256S("0x00000000000a4d0a398161ffc163c503763b1f4360639393e0e4c8e300e0caec")) || @@ -1849,6 +1865,7 @@ bool ConnectBlock(const CBlock& block, CValidationState& state, CBlockIndex* pin } enum FlushStateMode { + FLUSH_STATE_NONE, FLUSH_STATE_IF_NEEDED, FLUSH_STATE_PERIODIC, FLUSH_STATE_ALWAYS @@ -1856,16 +1873,30 @@ enum FlushStateMode { /** * Update the on-disk chain state. - * The caches and indexes are flushed if either they're too large, forceWrite is set, or - * fast is not set and it's been a while since the last write. + * The caches and indexes are flushed depending on the mode we're called with + * if they're too large, if it's been a while since the last write, + * or always and in all cases if we're in prune mode and are deleting files. */ bool static FlushStateToDisk(CValidationState &state, FlushStateMode mode) { - LOCK(cs_main); + LOCK2(cs_main, cs_LastBlockFile); static int64_t nLastWrite = 0; + std::set<int> setFilesToPrune; + bool fFlushForPrune = false; try { + if (fPruneMode && fCheckForPruning) { + FindFilesToPrune(setFilesToPrune); + if (!setFilesToPrune.empty()) { + fFlushForPrune = true; + if (!fHavePruned) { + pblocktree->WriteFlag("prunedblockfiles", true); + fHavePruned = true; + } + } + } if ((mode == FLUSH_STATE_ALWAYS) || ((mode == FLUSH_STATE_PERIODIC || mode == FLUSH_STATE_IF_NEEDED) && pcoinsTip->GetCacheSize() > nCoinCacheSize) || - (mode == FLUSH_STATE_PERIODIC && GetTimeMicros() > nLastWrite + DATABASE_WRITE_INTERVAL * 1000000)) { + (mode == FLUSH_STATE_PERIODIC && GetTimeMicros() > nLastWrite + DATABASE_WRITE_INTERVAL * 1000000) || + fFlushForPrune) { // Typical CCoins structures on disk are around 100 bytes in size. // Pushing a new one to the database can cause it to be written // twice (once in the log, and once in the tables). This is already @@ -1893,9 +1924,16 @@ bool static FlushStateToDisk(CValidationState &state, FlushStateMode mode) { return state.Abort("Files to write to block index database"); } } - // Finally flush the chainstate (which may refer to block index entries). + // Flush the chainstate (which may refer to block index entries). if (!pcoinsTip->Flush()) return state.Abort("Failed to write to coin database"); + + // Finally remove any pruned files + if (fFlushForPrune) { + UnlinkPrunedFiles(setFilesToPrune); + fCheckForPruning = false; + } + // Update best block in wallet (so we can detect restored wallets). if (mode != FLUSH_STATE_IF_NEEDED) { GetMainSignals().SetBestChain(chainActive.GetLocator()); @@ -1913,8 +1951,15 @@ void FlushStateToDisk() { FlushStateToDisk(state, FLUSH_STATE_ALWAYS); } +void PruneAndFlush() { + CValidationState state; + fCheckForPruning = true; + FlushStateToDisk(state, FLUSH_STATE_NONE); +} + /** Update chainActive and related internal data structures. */ void static UpdateTip(CBlockIndex *pindexNew) { + const CChainParams& chainParams = Params(); chainActive.SetTip(pindexNew); // New best block @@ -1924,7 +1969,7 @@ void static UpdateTip(CBlockIndex *pindexNew) { LogPrintf("%s: new best=%s height=%d log2_work=%.8g tx=%lu date=%s progress=%f cache=%u\n", __func__, chainActive.Tip()->GetBlockHash().ToString(), chainActive.Height(), log(chainActive.Tip()->nChainWork.getdouble())/log(2.0), (unsigned long)chainActive.Tip()->nChainTx, DateTimeStrFormat("%Y-%m-%d %H:%M:%S", chainActive.Tip()->GetBlockTime()), - Checkpoints::GuessVerificationProgress(chainActive.Tip()), (unsigned int)pcoinsTip->GetCacheSize()); + Checkpoints::GuessVerificationProgress(chainParams.Checkpoints(), chainActive.Tip()), (unsigned int)pcoinsTip->GetCacheSize()); cvBlockChange.notify_all(); @@ -1945,7 +1990,7 @@ void static UpdateTip(CBlockIndex *pindexNew) { if (nUpgraded > 100/2) { // strMiscWarning is read by GetWarnings(), called by Qt and the JSON-RPC code to warn the user: - strMiscWarning = _("Warning: This version is obsolete, upgrade required!"); + strMiscWarning = _("Warning: This version is obsolete; upgrade required!"); CAlert::Notify(strMiscWarning, true); fWarned = true; } @@ -2083,15 +2128,29 @@ static CBlockIndex* FindMostWorkChain() { CBlockIndex *pindexTest = pindexNew; bool fInvalidAncestor = false; while (pindexTest && !chainActive.Contains(pindexTest)) { - assert(pindexTest->nStatus & BLOCK_HAVE_DATA); assert(pindexTest->nChainTx || pindexTest->nHeight == 0); - if (pindexTest->nStatus & BLOCK_FAILED_MASK) { - // Candidate has an invalid ancestor, remove entire chain from the set. - if (pindexBestInvalid == NULL || pindexNew->nChainWork > pindexBestInvalid->nChainWork) + + // Pruned nodes may have entries in setBlockIndexCandidates for + // which block files have been deleted. Remove those as candidates + // for the most work chain if we come across them; we can't switch + // to a chain unless we have all the non-active-chain parent blocks. + bool fFailedChain = pindexTest->nStatus & BLOCK_FAILED_MASK; + bool fMissingData = !(pindexTest->nStatus & BLOCK_HAVE_DATA); + if (fFailedChain || fMissingData) { + // Candidate chain is not usable (either invalid or missing data) + if (fFailedChain && (pindexBestInvalid == NULL || pindexNew->nChainWork > pindexBestInvalid->nChainWork)) pindexBestInvalid = pindexNew; CBlockIndex *pindexFailed = pindexNew; + // Remove the entire chain from the set. while (pindexTest != pindexFailed) { - pindexFailed->nStatus |= BLOCK_FAILED_CHILD; + if (fFailedChain) { + pindexFailed->nStatus |= BLOCK_FAILED_CHILD; + } else if (fMissingData) { + // If we're missing data, then add back to mapBlocksUnlinked, + // so that if the block arrives in the future we can try adding + // to setBlockIndexCandidates again. + mapBlocksUnlinked.insert(std::make_pair(pindexFailed->pprev, pindexFailed)); + } setBlockIndexCandidates.erase(pindexFailed); pindexFailed = pindexFailed->pprev; } @@ -2194,6 +2253,7 @@ static bool ActivateBestChainStep(CValidationState &state, CBlockIndex *pindexMo bool ActivateBestChain(CValidationState &state, CBlock *pblock) { CBlockIndex *pindexNewTip = NULL; CBlockIndex *pindexMostWork = NULL; + const CChainParams& chainParams = Params(); do { boost::this_thread::interruption_point(); @@ -2218,8 +2278,12 @@ bool ActivateBestChain(CValidationState &state, CBlock *pblock) { if (!fInitialDownload) { uint256 hashNewTip = pindexNewTip->GetBlockHash(); // Relay inventory, but don't relay old inventory during initial block download. - int nBlockEstimate = Checkpoints::GetTotalBlocksEstimate(); - { + int nBlockEstimate = 0; + if (fCheckpointsEnabled) + nBlockEstimate = Checkpoints::GetTotalBlocksEstimate(chainParams.Checkpoints()); + // Don't relay blocks if pruning -- could cause a peer to try to download, resulting + // in a stalled download if the block file is pruned before the request. + if (nLocalServices & NODE_NETWORK) { LOCK(cs_vNodes); BOOST_FOREACH(CNode* pnode, vNodes) if (chainActive.Height() > (pnode->nStartingHeight != -1 ? pnode->nStartingHeight - 2000 : nBlockEstimate)) @@ -2260,7 +2324,7 @@ bool InvalidateBlock(CValidationState& state, CBlockIndex *pindex) { } // The resulting new best tip may not be in setBlockIndexCandidates anymore, so - // add them again. + // add it again. BlockMap::iterator it = mapBlockIndex.begin(); while (it != mapBlockIndex.end()) { if (it->second->IsValid(BLOCK_VALID_TRANSACTIONS) && it->second->nChainTx && !setBlockIndexCandidates.value_comp()(it->second, chainActive.Tip())) { @@ -2419,6 +2483,8 @@ bool FindBlockPos(CValidationState &state, CDiskBlockPos &pos, unsigned int nAdd unsigned int nOldChunks = (pos.nPos + BLOCKFILE_CHUNK_SIZE - 1) / BLOCKFILE_CHUNK_SIZE; unsigned int nNewChunks = (vinfoBlockFile[nFile].nSize + BLOCKFILE_CHUNK_SIZE - 1) / BLOCKFILE_CHUNK_SIZE; if (nNewChunks > nOldChunks) { + if (fPruneMode) + fCheckForPruning = true; if (CheckDiskSpace(nNewChunks * BLOCKFILE_CHUNK_SIZE - pos.nPos)) { FILE *file = OpenBlockFile(pos); if (file) { @@ -2450,6 +2516,8 @@ bool FindUndoPos(CValidationState &state, int nFile, CDiskBlockPos &pos, unsigne unsigned int nOldChunks = (pos.nPos + UNDOFILE_CHUNK_SIZE - 1) / UNDOFILE_CHUNK_SIZE; unsigned int nNewChunks = (nNewSize + UNDOFILE_CHUNK_SIZE - 1) / UNDOFILE_CHUNK_SIZE; if (nNewChunks > nOldChunks) { + if (fPruneMode) + fCheckForPruning = true; if (CheckDiskSpace(nNewChunks * UNDOFILE_CHUNK_SIZE - pos.nPos)) { FILE *file = OpenUndoFile(pos); if (file) { @@ -2542,7 +2610,8 @@ bool CheckBlock(const CBlock& block, CValidationState& state, bool fCheckPOW, bo bool ContextualCheckBlockHeader(const CBlockHeader& block, CValidationState& state, CBlockIndex * const pindexPrev) { - const Consensus::Params& consensusParams = Params().GetConsensus(); + const CChainParams& chainParams = Params(); + const Consensus::Params& consensusParams = chainParams.GetConsensus(); uint256 hash = block.GetHash(); if (hash == consensusParams.hashGenesisBlock) return true; @@ -2552,7 +2621,7 @@ bool ContextualCheckBlockHeader(const CBlockHeader& block, CValidationState& sta int nHeight = pindexPrev->nHeight+1; // Check proof of work - if (block.nBits != GetNextWorkRequired(pindexPrev, &block, Params().GetConsensus())) + if (block.nBits != GetNextWorkRequired(pindexPrev, &block, consensusParams)) return state.DoS(100, error("%s: incorrect proof of work", __func__), REJECT_INVALID, "bad-diffbits"); @@ -2561,25 +2630,28 @@ bool ContextualCheckBlockHeader(const CBlockHeader& block, CValidationState& sta return state.Invalid(error("%s: block's timestamp is too early", __func__), REJECT_INVALID, "time-too-old"); - // Check that the block chain matches the known block chain up to a checkpoint - if (!Checkpoints::CheckBlock(nHeight, hash)) - return state.DoS(100, error("%s: rejected by checkpoint lock-in at %d", __func__, nHeight), - REJECT_CHECKPOINT, "checkpoint mismatch"); + if(fCheckpointsEnabled) + { + // Check that the block chain matches the known block chain up to a checkpoint + if (!Checkpoints::CheckBlock(chainParams.Checkpoints(), nHeight, hash)) + return state.DoS(100, error("%s: rejected by checkpoint lock-in at %d", __func__, nHeight), + REJECT_CHECKPOINT, "checkpoint mismatch"); - // Don't accept any forks from the main chain prior to last checkpoint - CBlockIndex* pcheckpoint = Checkpoints::GetLastCheckpoint(); - if (pcheckpoint && nHeight < pcheckpoint->nHeight) - return state.DoS(100, error("%s: forked chain older than last checkpoint (height %d)", __func__, nHeight)); + // Don't accept any forks from the main chain prior to last checkpoint + CBlockIndex* pcheckpoint = Checkpoints::GetLastCheckpoint(chainParams.Checkpoints()); + if (pcheckpoint && nHeight < pcheckpoint->nHeight) + return state.DoS(100, error("%s: forked chain older than last checkpoint (height %d)", __func__, nHeight)); + } // Reject block.nVersion=1 blocks when 95% (75% on testnet) of the network has upgraded: - if (block.nVersion < 2 && IsSuperMajority(2, pindexPrev, Params().RejectBlockOutdatedMajority())) + if (block.nVersion < 2 && IsSuperMajority(2, pindexPrev, consensusParams.nMajorityRejectBlockOutdated)) { return state.Invalid(error("%s: rejected nVersion=1 block", __func__), REJECT_OBSOLETE, "bad-version"); } // Reject block.nVersion=2 blocks when 95% (75% on testnet) of the network has upgraded: - if (block.nVersion < 3 && IsSuperMajority(3, pindexPrev, Params().RejectBlockOutdatedMajority())) + if (block.nVersion < 3 && IsSuperMajority(3, pindexPrev, consensusParams.nMajorityRejectBlockOutdated)) { return state.Invalid(error("%s : rejected nVersion=2 block", __func__), REJECT_OBSOLETE, "bad-version"); @@ -2665,7 +2737,10 @@ bool AcceptBlock(CBlock& block, CValidationState& state, CBlockIndex** ppindex, if (!AcceptBlockHeader(block, state, &pindex)) return false; - if (pindex->nStatus & BLOCK_HAVE_DATA) { + // If we're pruning, ensure that we don't allow a peer to dump a copy + // of old blocks. But we might need blocks that are not on the main chain + // to handle a reorg, even if we've processed once. + if (pindex->nStatus & BLOCK_HAVE_DATA || chainActive.Contains(pindex)) { // TODO: deal better with duplicate blocks. // return state.DoS(20, error("AcceptBlock(): already have block %d %s", pindex->nHeight, pindex->GetBlockHash().ToString()), REJECT_DUPLICATE, "duplicate"); return true; @@ -2698,6 +2773,9 @@ bool AcceptBlock(CBlock& block, CValidationState& state, CBlockIndex** ppindex, return state.Abort(std::string("System error: ") + e.what()); } + if (fCheckForPruning) + FlushStateToDisk(state, FLUSH_STATE_NONE); // we just allocated more disk space for block files + return true; } @@ -2785,6 +2863,112 @@ bool AbortNode(const std::string &strMessage, const std::string &userMessage) { return false; } + +/** + * BLOCK PRUNING CODE + */ + +/* Calculate the amount of disk space the block & undo files currently use */ +uint64_t CalculateCurrentUsage() +{ + uint64_t retval = 0; + BOOST_FOREACH(const CBlockFileInfo &file, vinfoBlockFile) { + retval += file.nSize + file.nUndoSize; + } + return retval; +} + +/* Prune a block file (modify associated database entries)*/ +void PruneOneBlockFile(const int fileNumber) +{ + for (BlockMap::iterator it = mapBlockIndex.begin(); it != mapBlockIndex.end(); ++it) { + CBlockIndex* pindex = it->second; + if (pindex->nFile == fileNumber) { + pindex->nStatus &= ~BLOCK_HAVE_DATA; + pindex->nStatus &= ~BLOCK_HAVE_UNDO; + pindex->nFile = 0; + pindex->nDataPos = 0; + pindex->nUndoPos = 0; + setDirtyBlockIndex.insert(pindex); + + // Prune from mapBlocksUnlinked -- any block we prune would have + // to be downloaded again in order to consider its chain, at which + // point it would be considered as a candidate for + // mapBlocksUnlinked or setBlockIndexCandidates. + std::pair<std::multimap<CBlockIndex*, CBlockIndex*>::iterator, std::multimap<CBlockIndex*, CBlockIndex*>::iterator> range = mapBlocksUnlinked.equal_range(pindex->pprev); + while (range.first != range.second) { + std::multimap<CBlockIndex *, CBlockIndex *>::iterator it = range.first; + range.first++; + if (it->second == pindex) { + mapBlocksUnlinked.erase(it); + } + } + } + } + + vinfoBlockFile[fileNumber].SetNull(); + setDirtyFileInfo.insert(fileNumber); +} + + +void UnlinkPrunedFiles(std::set<int>& setFilesToPrune) +{ + for (set<int>::iterator it = setFilesToPrune.begin(); it != setFilesToPrune.end(); ++it) { + CDiskBlockPos pos(*it, 0); + boost::filesystem::remove(GetBlockPosFilename(pos, "blk")); + boost::filesystem::remove(GetBlockPosFilename(pos, "rev")); + LogPrintf("Prune: %s deleted blk/rev (%05u)\n", __func__, *it); + } +} + +/* Calculate the block/rev files that should be deleted to remain under target*/ +void FindFilesToPrune(std::set<int>& setFilesToPrune) +{ + LOCK2(cs_main, cs_LastBlockFile); + if (chainActive.Tip() == NULL || nPruneTarget == 0) { + return; + } + if (chainActive.Tip()->nHeight <= Params().PruneAfterHeight()) { + return; + } + + unsigned int nLastBlockWeMustKeep = chainActive.Tip()->nHeight - MIN_BLOCKS_TO_KEEP; + uint64_t nCurrentUsage = CalculateCurrentUsage(); + // We don't check to prune until after we've allocated new space for files + // So we should leave a buffer under our target to account for another allocation + // before the next pruning. + uint64_t nBuffer = BLOCKFILE_CHUNK_SIZE + UNDOFILE_CHUNK_SIZE; + uint64_t nBytesToPrune; + int count=0; + + if (nCurrentUsage + nBuffer >= nPruneTarget) { + for (int fileNumber = 0; fileNumber < nLastBlockFile; fileNumber++) { + nBytesToPrune = vinfoBlockFile[fileNumber].nSize + vinfoBlockFile[fileNumber].nUndoSize; + + if (vinfoBlockFile[fileNumber].nSize == 0) + continue; + + if (nCurrentUsage + nBuffer < nPruneTarget) // are we below our target? + break; + + // don't prune files that could have a block within MIN_BLOCKS_TO_KEEP of the main chain's tip + if (vinfoBlockFile[fileNumber].nHeightLast > nLastBlockWeMustKeep) + break; + + PruneOneBlockFile(fileNumber); + // Queue up the files for removal + setFilesToPrune.insert(fileNumber); + nCurrentUsage -= nBytesToPrune; + count++; + } + } + + LogPrint("prune", "Prune: target=%dMiB actual=%dMiB diff=%dMiB min_must_keep=%d removed %d blk/rev pairs\n", + nPruneTarget/1024/1024, nCurrentUsage/1024/1024, + ((int64_t)nPruneTarget - (int64_t)nCurrentUsage)/1024/1024, + nLastBlockWeMustKeep, count); +} + bool CheckDiskSpace(uint64_t nAdditionalBytes) { uint64_t nFreeBytesAvailable = boost::filesystem::space(GetDataDir()).available; @@ -2854,6 +3038,7 @@ CBlockIndex * InsertBlockIndex(uint256 hash) bool static LoadBlockIndexDB() { + const CChainParams& chainparams = Params(); if (!pblocktree->LoadBlockIndexGuts()) return false; @@ -2872,7 +3057,9 @@ bool static LoadBlockIndexDB() { CBlockIndex* pindex = item.second; pindex->nChainWork = (pindex->pprev ? pindex->pprev->nChainWork : 0) + GetBlockProof(*pindex); - if (pindex->nStatus & BLOCK_HAVE_DATA) { + // We can link the chain of blocks for which we've received transactions at some point. + // Pruned nodes may have deleted the block. + if (pindex->nTx > 0) { if (pindex->pprev) { if (pindex->pprev->nChainTx) { pindex->nChainTx = pindex->pprev->nChainTx + pindex->nTx; @@ -2929,6 +3116,11 @@ bool static LoadBlockIndexDB() } } + // Check whether we have ever pruned block & undo files + pblocktree->ReadFlag("prunedblockfiles", fHavePruned); + if (fHavePruned) + LogPrintf("LoadBlockIndexDB(): Block files have previously been pruned\n"); + // Check whether we need to continue reindexing bool fReindexing = false; pblocktree->ReadReindexing(fReindexing); @@ -2949,7 +3141,7 @@ bool static LoadBlockIndexDB() LogPrintf("%s: hashBestChain=%s height=%d date=%s progress=%f\n", __func__, chainActive.Tip()->GetBlockHash().ToString(), chainActive.Height(), DateTimeStrFormat("%Y-%m-%d %H:%M:%S", chainActive.Tip()->GetBlockTime()), - Checkpoints::GuessVerificationProgress(chainActive.Tip())); + Checkpoints::GuessVerificationProgress(chainparams.Checkpoints(), chainActive.Tip())); return true; } @@ -3069,6 +3261,7 @@ void UnloadBlockIndex() delete entry.second; } mapBlockIndex.clear(); + fHavePruned = false; } bool LoadBlockIndex() @@ -3260,6 +3453,7 @@ void static CheckBlockIndex() int nHeight = 0; CBlockIndex* pindexFirstInvalid = NULL; // Oldest ancestor of pindex which is invalid. CBlockIndex* pindexFirstMissing = NULL; // Oldest ancestor of pindex which does not have BLOCK_HAVE_DATA. + CBlockIndex* pindexFirstNeverProcessed = NULL; // Oldest ancestor of pindex for which nTx == 0. CBlockIndex* pindexFirstNotTreeValid = NULL; // Oldest ancestor of pindex which does not have BLOCK_VALID_TREE (regardless of being valid or not). CBlockIndex* pindexFirstNotTransactionsValid = NULL; // Oldest ancestor of pindex which does not have BLOCK_VALID_TRANSACTIONS (regardless of being valid or not). CBlockIndex* pindexFirstNotChainValid = NULL; // Oldest ancestor of pindex which does not have BLOCK_VALID_CHAIN (regardless of being valid or not). @@ -3268,6 +3462,7 @@ void static CheckBlockIndex() nNodes++; if (pindexFirstInvalid == NULL && pindex->nStatus & BLOCK_FAILED_VALID) pindexFirstInvalid = pindex; if (pindexFirstMissing == NULL && !(pindex->nStatus & BLOCK_HAVE_DATA)) pindexFirstMissing = pindex; + if (pindexFirstNeverProcessed == NULL && pindex->nTx == 0) pindexFirstNeverProcessed = pindex; if (pindex->pprev != NULL && pindexFirstNotTreeValid == NULL && (pindex->nStatus & BLOCK_VALID_MASK) < BLOCK_VALID_TREE) pindexFirstNotTreeValid = pindex; if (pindex->pprev != NULL && pindexFirstNotTransactionsValid == NULL && (pindex->nStatus & BLOCK_VALID_MASK) < BLOCK_VALID_TRANSACTIONS) pindexFirstNotTransactionsValid = pindex; if (pindex->pprev != NULL && pindexFirstNotChainValid == NULL && (pindex->nStatus & BLOCK_VALID_MASK) < BLOCK_VALID_CHAIN) pindexFirstNotChainValid = pindex; @@ -3279,12 +3474,21 @@ void static CheckBlockIndex() assert(pindex->GetBlockHash() == consensusParams.hashGenesisBlock); // Genesis block's hash must match. assert(pindex == chainActive.Genesis()); // The current active chain's genesis block must be this block. } - // HAVE_DATA is equivalent to VALID_TRANSACTIONS and equivalent to nTx > 0 (we stored the number of transactions in the block) - assert(!(pindex->nStatus & BLOCK_HAVE_DATA) == (pindex->nTx == 0)); - assert(((pindex->nStatus & BLOCK_VALID_MASK) >= BLOCK_VALID_TRANSACTIONS) == (pindex->nTx > 0)); if (pindex->nChainTx == 0) assert(pindex->nSequenceId == 0); // nSequenceId can't be set for blocks that aren't linked - // All parents having data is equivalent to all parents being VALID_TRANSACTIONS, which is equivalent to nChainTx being set. - assert((pindexFirstMissing != NULL) == (pindex->nChainTx == 0)); // nChainTx == 0 is used to signal that all parent block's transaction data is available. + // VALID_TRANSACTIONS is equivalent to nTx > 0 for all nodes (whether or not pruning has occurred). + // HAVE_DATA is only equivalent to nTx > 0 (or VALID_TRANSACTIONS) if no pruning has occurred. + if (!fHavePruned) { + // If we've never pruned, then HAVE_DATA should be equivalent to nTx > 0 + assert(!(pindex->nStatus & BLOCK_HAVE_DATA) == (pindex->nTx == 0)); + assert(pindexFirstMissing == pindexFirstNeverProcessed); + } else { + // If we have pruned, then we can only say that HAVE_DATA implies nTx > 0 + if (pindex->nStatus & BLOCK_HAVE_DATA) assert(pindex->nTx > 0); + } + if (pindex->nStatus & BLOCK_HAVE_UNDO) assert(pindex->nStatus & BLOCK_HAVE_DATA); + assert(((pindex->nStatus & BLOCK_VALID_MASK) >= BLOCK_VALID_TRANSACTIONS) == (pindex->nTx > 0)); // This is pruning-independent. + // All parents having had data (at some point) is equivalent to all parents being VALID_TRANSACTIONS, which is equivalent to nChainTx being set. + assert((pindexFirstNeverProcessed != NULL) == (pindex->nChainTx == 0)); // nChainTx != 0 is used to signal that all parent blocks have been processed (but may have been pruned). assert((pindexFirstNotTransactionsValid != NULL) == (pindex->nChainTx == 0)); assert(pindex->nHeight == nHeight); // nHeight must be consistent. assert(pindex->pprev == NULL || pindex->nChainWork >= pindex->pprev->nChainWork); // For every block except the genesis block, the chainwork must be larger than the parent's. @@ -3297,11 +3501,20 @@ void static CheckBlockIndex() // Checks for not-invalid blocks. assert((pindex->nStatus & BLOCK_FAILED_MASK) == 0); // The failed mask cannot be set for blocks without invalid parents. } - if (!CBlockIndexWorkComparator()(pindex, chainActive.Tip()) && pindexFirstMissing == NULL) { - if (pindexFirstInvalid == NULL) { // If this block sorts at least as good as the current tip and is valid, it must be in setBlockIndexCandidates. - assert(setBlockIndexCandidates.count(pindex)); + if (!CBlockIndexWorkComparator()(pindex, chainActive.Tip()) && pindexFirstNeverProcessed == NULL) { + if (pindexFirstInvalid == NULL) { + // If this block sorts at least as good as the current tip and + // is valid and we have all data for its parents, it must be in + // setBlockIndexCandidates. chainActive.Tip() must also be there + // even if some data has been pruned. + if (pindexFirstMissing == NULL || pindex == chainActive.Tip()) { + assert(setBlockIndexCandidates.count(pindex)); + } + // If some parent is missing, then it could be that this block was in + // setBlockIndexCandidates but had to be removed because of the missing data. + // In this case it must be in mapBlocksUnlinked -- see test below. } - } else { // If this block sorts worse than the current tip, it cannot be in setBlockIndexCandidates. + } else { // If this block sorts worse than the current tip or some ancestor's block has never been seen, it cannot be in setBlockIndexCandidates. assert(setBlockIndexCandidates.count(pindex) == 0); } // Check whether this block is in mapBlocksUnlinked. @@ -3315,12 +3528,28 @@ void static CheckBlockIndex() } rangeUnlinked.first++; } - if (pindex->pprev && pindex->nStatus & BLOCK_HAVE_DATA && pindexFirstMissing != NULL) { - if (pindexFirstInvalid == NULL) { // If this block has block data available, some parent doesn't, and has no invalid parents, it must be in mapBlocksUnlinked. - assert(foundInUnlinked); + if (pindex->pprev && (pindex->nStatus & BLOCK_HAVE_DATA) && pindexFirstNeverProcessed != NULL && pindexFirstInvalid == NULL) { + // If this block has block data available, some parent was never received, and has no invalid parents, it must be in mapBlocksUnlinked. + assert(foundInUnlinked); + } + if (!(pindex->nStatus & BLOCK_HAVE_DATA)) assert(!foundInUnlinked); // Can't be in mapBlocksUnlinked if we don't HAVE_DATA + if (pindexFirstMissing == NULL) assert(!foundInUnlinked); // We aren't missing data for any parent -- cannot be in mapBlocksUnlinked. + if (pindex->pprev && (pindex->nStatus & BLOCK_HAVE_DATA) && pindexFirstNeverProcessed == NULL && pindexFirstMissing != NULL) { + // We HAVE_DATA for this block, have received data for all parents at some point, but we're currently missing data for some parent. + assert(fHavePruned); // We must have pruned. + // This block may have entered mapBlocksUnlinked if: + // - it has a descendant that at some point had more work than the + // tip, and + // - we tried switching to that descendant but were missing + // data for some intermediate block between chainActive and the + // tip. + // So if this block is itself better than chainActive.Tip() and it wasn't in + // setBlockIndexCandidates, then it must be in mapBlocksUnlinked. + if (!CBlockIndexWorkComparator()(pindex, chainActive.Tip()) && setBlockIndexCandidates.count(pindex) == 0) { + if (pindexFirstInvalid == NULL) { + assert(foundInUnlinked); + } } - } else { // If this block does not have block data available, or all parents do, it cannot be in mapBlocksUnlinked. - assert(!foundInUnlinked); } // assert(pindex->GetBlockHash() == pindex->GetBlockHeader().GetHash()); // Perhaps too slow // End: actual consistency checks. @@ -3340,6 +3569,7 @@ void static CheckBlockIndex() // If pindex was the first with a certain property, unset the corresponding variable. if (pindex == pindexFirstInvalid) pindexFirstInvalid = NULL; if (pindex == pindexFirstMissing) pindexFirstMissing = NULL; + if (pindex == pindexFirstNeverProcessed) pindexFirstNeverProcessed = NULL; if (pindex == pindexFirstNotTreeValid) pindexFirstNotTreeValid = NULL; if (pindex == pindexFirstNotTransactionsValid) pindexFirstNotTransactionsValid = NULL; if (pindex == pindexFirstNotChainValid) pindexFirstNotChainValid = NULL; @@ -3459,7 +3689,6 @@ bool static AlreadyHave(const CInv& inv) return true; } - void static ProcessGetData(CNode* pfrom) { std::deque<CInv>::iterator it = pfrom->vRecvGetData.begin(); @@ -3487,17 +3716,21 @@ void static ProcessGetData(CNode* pfrom) if (chainActive.Contains(mi->second)) { send = true; } else { + static const int nOneMonth = 30 * 24 * 60 * 60; // To prevent fingerprinting attacks, only send blocks outside of the active - // chain if they are valid, and no more than a month older than the best header - // chain we know about. + // chain if they are valid, and no more than a month older (both in time, and in + // best equivalent proof of work) than the best header chain we know about. send = mi->second->IsValid(BLOCK_VALID_SCRIPTS) && (pindexBestHeader != NULL) && - (mi->second->GetBlockTime() > pindexBestHeader->GetBlockTime() - 30 * 24 * 60 * 60); + (pindexBestHeader->GetBlockTime() - mi->second->GetBlockTime() < nOneMonth) && + (GetBlockProofEquivalentTime(*pindexBestHeader, *mi->second, *pindexBestHeader, Params().GetConsensus()) < nOneMonth); if (!send) { LogPrintf("%s: ignoring request from peer=%i for old block that isn't in the main chain\n", __func__, pfrom->GetId()); } } } - if (send) + // Pruned nodes may have deleted the block, so check whether + // it's available before trying to send. + if (send && (mi->second->nStatus & BLOCK_HAVE_DATA)) { // Send block from disk CBlock block; @@ -3514,7 +3747,7 @@ void static ProcessGetData(CNode* pfrom) pfrom->PushMessage("merkleblock", merkleBlock); // CMerkleBlock just contains hashes, so also push any transactions in the block the client did not see // This avoids hurting performance by pointlessly requiring a round-trip - // Note that there is currently no way for a node to request any single transactions we didnt send here - + // Note that there is currently no way for a node to request any single transactions we didn't send here - // they must either disconnect and retry or request the full block. // Thus, the protocol spec specified allows for us to provide duplicate txn here, // however we MUST always provide at least what the remote peer needs @@ -3527,7 +3760,7 @@ void static ProcessGetData(CNode* pfrom) // no response } - // Trigger them to send a getblocks request for the next batch of inventory + // Trigger the peer node to send a getblocks request for the next batch of inventory if (inv.hash == pfrom->hashContinue) { // Bypass PushInventory, this must send even if redundant, @@ -3776,7 +4009,7 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv, { LOCK(cs_vNodes); // Use deterministic randomness to send to the same nodes for 24 hours - // at a time so the setAddrKnowns of the chosen nodes prevent repeats + // at a time so the addrKnowns of the chosen nodes prevent repeats static uint256 hashSalt; if (hashSalt.IsNull()) hashSalt = GetRandHash(); @@ -3841,7 +4074,7 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv, if (inv.type == MSG_BLOCK) { UpdateBlockAvailability(pfrom->GetId(), inv.hash); if (!fAlreadyHave && !fImporting && !fReindex && !mapBlocksInFlight.count(inv.hash)) { - // First request the headers preceeding the announced block. In the normal fully-synced + // First request the headers preceding the announced block. In the normal fully-synced // case where a new block is announced that succeeds the current tip (no reorganization), // there are no such headers. // Secondly, and only when we are close to being synced, we request the announced block directly, @@ -3923,8 +4156,8 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv, pfrom->PushInventory(CInv(MSG_BLOCK, pindex->GetBlockHash())); if (--nLimit <= 0) { - // When this block is requested, we'll send an inv that'll make them - // getblocks the next batch of inventory. + // When this block is requested, we'll send an inv that'll + // trigger the peer to getblocks the next batch of inventory. LogPrint("net", " getblocks stopping at limit %d %s\n", pindex->nHeight, pindex->GetBlockHash().ToString()); pfrom->hashContinue = pindex->GetBlockHash(); break; @@ -4161,9 +4394,9 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv, // This asymmetric behavior for inbound and outbound connections was introduced // to prevent a fingerprinting attack: an attacker can send specific fake addresses - // to users' AddrMan and later request them by sending getaddr messages. - // Making users (which are behind NAT and can only make outgoing connections) ignore - // getaddr message mitigates the attack. + // to users' AddrMan and later request them by sending getaddr messages. + // Making nodes which are behind NAT and can only make outgoing connections ignore + // the getaddr message mitigates the attack. else if ((strCommand == "getaddr") && (pfrom->fInbound)) { pfrom->vAddrToSend.clear(); @@ -4248,7 +4481,7 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv, // Nonce mismatches are normal when pings are overlapping sProblem = "Nonce mismatch"; if (nonce == 0) { - // This is most likely a bug in another implementation somewhere, cancel this ping + // This is most likely a bug in another implementation somewhere; cancel this ping bPingFinished = true; sProblem = "Nonce zero"; } @@ -4257,7 +4490,7 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv, sProblem = "Unsolicited pong without ping"; } } else { - // This is most likely a bug in another implementation somewhere, cancel this ping + // This is most likely a bug in another implementation somewhere; cancel this ping bPingFinished = true; sProblem = "Short payload"; } @@ -4516,7 +4749,7 @@ bool SendMessages(CNode* pto, bool fSendTrickle) { const Consensus::Params& consensusParams = Params().GetConsensus(); { - // Don't send anything until we get their version message + // Don't send anything until we get its version message if (pto->nVersion == 0) return true; @@ -4560,9 +4793,9 @@ bool SendMessages(CNode* pto, bool fSendTrickle) LOCK(cs_vNodes); BOOST_FOREACH(CNode* pnode, vNodes) { - // Periodically clear setAddrKnown to allow refresh broadcasts + // Periodically clear addrKnown to allow refresh broadcasts if (nLastRebroadcast) - pnode->setAddrKnown.clear(); + pnode->addrKnown.clear(); // Rebroadcast our address AdvertizeLocal(pnode); @@ -4580,9 +4813,9 @@ bool SendMessages(CNode* pto, bool fSendTrickle) vAddr.reserve(pto->vAddrToSend.size()); BOOST_FOREACH(const CAddress& addr, pto->vAddrToSend) { - // returns true if wasn't already contained in the set - if (pto->setAddrKnown.insert(addr).second) + if (!pto->addrKnown.contains(addr.GetKey())) { + pto->addrKnown.insert(addr.GetKey()); vAddr.push_back(addr); // receiver rejects addr messages larger than 1000 if (vAddr.size() >= 1000) @@ -4621,9 +4854,9 @@ bool SendMessages(CNode* pto, bool fSendTrickle) if (pindexBestHeader == NULL) pindexBestHeader = chainActive.Tip(); bool fFetch = state.fPreferredDownload || (nPreferredDownload == 0 && !pto->fClient && !pto->fOneShot); // Download if this is a nice peer, or we have no nice peers and this one might do. - if (!state.fSyncStarted && !pto->fClient && fFetch && !fImporting && !fReindex) { + if (!state.fSyncStarted && !pto->fClient && !fImporting && !fReindex) { // Only actively request headers from a single peer, unless we're close to today. - if (nSyncStarted == 0 || pindexBestHeader->GetBlockTime() > GetAdjustedTime() - 24 * 60 * 60) { + if ((nSyncStarted == 0 && fFetch) || pindexBestHeader->GetBlockTime() > GetAdjustedTime() - 24 * 60 * 60) { state.fSyncStarted = true; nSyncStarted++; CBlockIndex *pindexStart = pindexBestHeader->pprev ? pindexBestHeader->pprev : pindexBestHeader; @@ -4700,7 +4933,7 @@ bool SendMessages(CNode* pto, bool fSendTrickle) // In case there is a block that has been in flight from this peer for (2 + 0.5 * N) times the block interval // (with N the number of validated blocks that were in flight at the time it was requested), disconnect due to // timeout. We compensate for in-flight blocks to prevent killing off peers due to our own downstream link - // being saturated. We only count validated in-flight blocks so peers can't advertize nonexisting block hashes + // being saturated. We only count validated in-flight blocks so peers can't advertise non-existing block hashes // to unreasonably increase our timeout. if (!pto->fDisconnect && state.vBlocksInFlight.size() > 0 && state.vBlocksInFlight.front().nTime < nNow - 500000 * consensusParams.nPowTargetSpacing * (4 + state.vBlocksInFlight.front().nValidatedQueuedBefore)) { LogPrintf("Timeout downloading block %s from peer=%d, disconnecting\n", state.vBlocksInFlight.front().hash.ToString(), pto->id); @@ -4711,7 +4944,7 @@ bool SendMessages(CNode* pto, bool fSendTrickle) // Message: getdata (blocks) // vector<CInv> vGetData; - if (!pto->fDisconnect && !pto->fClient && fFetch && state.nBlocksInFlight < MAX_BLOCKS_IN_TRANSIT_PER_PEER) { + if (!pto->fDisconnect && !pto->fClient && (fFetch || !IsInitialBlockDownload()) && state.nBlocksInFlight < MAX_BLOCKS_IN_TRANSIT_PER_PEER) { vector<CBlockIndex*> vToDownload; NodeId staller = -1; FindNextBlocksToDownload(pto->GetId(), MAX_BLOCKS_IN_TRANSIT_PER_PEER - state.nBlocksInFlight, vToDownload, staller); diff --git a/src/main.h b/src/main.h index bb6fd6f204..90b809e85e 100644 --- a/src/main.h +++ b/src/main.h @@ -14,9 +14,10 @@ #include "chain.h" #include "chainparams.h" #include "coins.h" +#include "consensus/consensus.h" +#include "net.h" #include "primitives/block.h" #include "primitives/transaction.h" -#include "net.h" #include "script/script.h" #include "script/sigcache.h" #include "script/standard.h" @@ -53,8 +54,6 @@ static const unsigned int DEFAULT_BLOCK_MIN_SIZE = 0; static const unsigned int DEFAULT_BLOCK_PRIORITY_SIZE = 50000; /** The maximum size for transactions we're willing to relay/mine */ static const unsigned int MAX_STANDARD_TX_SIZE = 100000; -/** The maximum allowed number of signature check operations in a block (network rule) */ -static const unsigned int MAX_BLOCK_SIGOPS = MAX_BLOCK_SIZE/50; /** Maximum number of signature check operations in an IsStandard() P2SH script */ static const unsigned int MAX_P2SH_SIGOPS = 15; /** The maximum number of sigops we're willing to relay/mine in a single tx */ @@ -67,10 +66,6 @@ static const unsigned int MAX_BLOCKFILE_SIZE = 0x8000000; // 128 MiB static const unsigned int BLOCKFILE_CHUNK_SIZE = 0x1000000; // 16 MiB /** The pre-allocation chunk size for rev?????.dat files (since 0.8) */ static const unsigned int UNDOFILE_CHUNK_SIZE = 0x100000; // 1 MiB -/** Coinbase transaction outputs can only be spent after this number of new blocks (network rule) */ -static const int COINBASE_MATURITY = 100; -/** Threshold for nLockTime: below this value it is interpreted as block number, otherwise as UNIX timestamp. */ -static const unsigned int LOCKTIME_THRESHOLD = 500000000; // Tue Nov 5 00:53:20 1985 UTC /** Maximum number of script-checking threads allowed */ static const int MAX_SCRIPTCHECK_THREADS = 16; /** -par default (number of script-checking threads, 0 = auto) */ @@ -80,7 +75,7 @@ static const int MAX_BLOCKS_IN_TRANSIT_PER_PEER = 16; /** Timeout in seconds during which a peer must stall block download progress before being disconnected. */ static const unsigned int BLOCK_STALLING_TIMEOUT = 2; /** Number of headers sent in one getheaders result. We rely on the assumption that if a peer sends - * less than this number, we reached their tip. Changing this value is a protocol upgrade. */ + * less than this number, we reached its tip. Changing this value is a protocol upgrade. */ static const unsigned int MAX_HEADERS_RESULTS = 2000; /** Size of the "block download window": how far ahead of our current height do we fetch? * Larger windows tolerate larger download speed differences between peer, but increase the potential @@ -123,6 +118,7 @@ extern int nScriptCheckThreads; extern bool fTxIndex; extern bool fIsBareMultisigStd; extern bool fCheckBlockIndex; +extern bool fCheckpointsEnabled; extern unsigned int nCoinCacheSize; extern CFeeRate minRelayTxFee; @@ -132,6 +128,26 @@ extern CBlockIndex *pindexBestHeader; /** Minimum disk space required - used in CheckDiskSpace() */ static const uint64_t nMinDiskSpace = 52428800; +/** Pruning-related variables and constants */ +/** True if any block files have ever been pruned. */ +extern bool fHavePruned; +/** True if we're running in -prune mode. */ +extern bool fPruneMode; +/** Number of MiB of block files that we're trying to stay below. */ +extern uint64_t nPruneTarget; +/** Block files containing a block-height within MIN_BLOCKS_TO_KEEP of chainActive.Tip() will not be pruned. */ +static const signed int MIN_BLOCKS_TO_KEEP = 288; + +// Require that user allocate at least 550MB for block & undo files (blk???.dat and rev???.dat) +// At 1MB per block, 288 blocks = 288MB. +// Add 15% for Undo data = 331MB +// Add 20% for Orphan block rate = 397MB +// We want the low water mark after pruning to be at least 397 MB and since we prune in +// full block file chunks, we need the high water mark which triggers the prune to be +// one 128MB block file + added 15% undo data = 147MB greater for a total of 545MB +// Setting the target to > than 550MB will make it likely we can respect the target. +static const signed int MIN_DISK_SPACE_FOR_BLOCK_FILES = 550 * 1024 * 1024; + /** Register with a network node to receive its signals */ void RegisterNodeSignals(CNodeSignals& nodeSignals); /** Unregister a network node */ @@ -186,6 +202,28 @@ bool GetTransaction(const uint256 &hash, CTransaction &tx, uint256 &hashBlock, b bool ActivateBestChain(CValidationState &state, CBlock *pblock = NULL); CAmount GetBlockValue(int nHeight, const CAmount& nFees); +/** + * Prune block and undo files (blk???.dat and undo???.dat) so that the disk space used is less than a user-defined target. + * The user sets the target (in MB) on the command line or in config file. This will be run on startup and whenever new + * space is allocated in a block or undo file, staying below the target. Changing back to unpruned requires a reindex + * (which in this case means the blockchain must be re-downloaded.) + * + * Pruning functions are called from FlushStateToDisk when the global fCheckForPruning flag has been set. + * Block and undo files are deleted in lock-step (when blk00003.dat is deleted, so is rev00003.dat.) + * Pruning cannot take place until the longest chain is at least a certain length (100000 on mainnet, 1000 on testnet, 10 on regtest). + * Pruning will never delete a block within a defined distance (currently 288) from the active chain's tip. + * The block index is updated by unsetting HAVE_DATA and HAVE_UNDO for any blocks that were stored in the deleted files. + * A db flag records the fact that at least some block files have been pruned. + * + * @param[out] setFilesToPrune The set of file indices that can be unlinked will be returned + */ +void FindFilesToPrune(std::set<int>& setFilesToPrune); + +/** + * Actually unlink the specified files + */ +void UnlinkPrunedFiles(std::set<int>& setFilesToPrune); + /** Create a new block index entry for a given block hash */ CBlockIndex * InsertBlockIndex(uint256 hash); /** Abort with a message */ @@ -196,7 +234,8 @@ bool GetNodeStateStats(NodeId nodeid, CNodeStateStats &stats); void Misbehaving(NodeId nodeid, int howmuch); /** Flush all state, indexes and buffers to disk. */ void FlushStateToDisk(); - +/** Prune block files and flush state to disk. */ +void PruneAndFlush(); /** (try to) add transaction to memory pool **/ bool AcceptToMemoryPool(CTxMemPool& pool, CValidationState &state, const CTransaction &tx, bool fLimitFree, diff --git a/src/merkleblock.cpp b/src/merkleblock.cpp index b51b002b95..4d90fd8cd7 100644 --- a/src/merkleblock.cpp +++ b/src/merkleblock.cpp @@ -6,7 +6,7 @@ #include "merkleblock.h" #include "hash.h" -#include "primitives/block.h" // for MAX_BLOCK_SIZE +#include "consensus/consensus.h" #include "utilstrencodings.h" using namespace std; @@ -37,6 +37,29 @@ CMerkleBlock::CMerkleBlock(const CBlock& block, CBloomFilter& filter) txn = CPartialMerkleTree(vHashes, vMatch); } +CMerkleBlock::CMerkleBlock(const CBlock& block, const std::set<uint256>& txids) +{ + header = block.GetBlockHeader(); + + vector<bool> vMatch; + vector<uint256> vHashes; + + vMatch.reserve(block.vtx.size()); + vHashes.reserve(block.vtx.size()); + + for (unsigned int i = 0; i < block.vtx.size(); i++) + { + const uint256& hash = block.vtx[i].GetHash(); + if (txids.count(hash)) + vMatch.push_back(true); + else + vMatch.push_back(false); + vHashes.push_back(hash); + } + + txn = CPartialMerkleTree(vHashes, vMatch); +} + uint256 CPartialMerkleTree::CalcHash(int height, unsigned int pos, const std::vector<uint256> &vTxid) { if (height == 0) { // hash at height 0 is the txids themself @@ -96,8 +119,8 @@ uint256 CPartialMerkleTree::TraverseAndExtract(int height, unsigned int pos, uns if (pos*2+1 < CalcTreeWidth(height-1)) { right = TraverseAndExtract(height-1, pos*2+1, nBitsUsed, nHashUsed, vMatch); if (right == left) { - // If the left and right branch should never be identical as the transaction - // hashes covered by them must be unique. + // The left and right branches should never be identical, as the transaction + // hashes covered by them must each be unique. fBad = true; } } else { diff --git a/src/merkleblock.h b/src/merkleblock.h index 52c914967f..904c22abc2 100644 --- a/src/merkleblock.h +++ b/src/merkleblock.h @@ -104,7 +104,7 @@ public: } } - /** Construct a partial merkle tree from a list of transaction id's, and a mask that selects a subset of them */ + /** Construct a partial merkle tree from a list of transaction ids, and a mask that selects a subset of them */ CPartialMerkleTree(const std::vector<uint256> &vTxid, const std::vector<bool> &vMatch); CPartialMerkleTree(); @@ -139,6 +139,11 @@ public: */ CMerkleBlock(const CBlock& block, CBloomFilter& filter); + // Create from a CBlock, matching the txids in the set + CMerkleBlock(const CBlock& block, const std::set<uint256>& txids); + + CMerkleBlock() {} + ADD_SERIALIZE_METHODS; template <typename Stream, typename Operation> diff --git a/src/miner.cpp b/src/miner.cpp index 3abd2d68e4..4bceb7d7b4 100644 --- a/src/miner.cpp +++ b/src/miner.cpp @@ -7,6 +7,7 @@ #include "amount.h" #include "chainparams.h" +#include "consensus/consensus.h" #include "hash.h" #include "main.h" #include "net.h" @@ -452,8 +453,16 @@ void static BitcoinMiner(CWallet *pwallet) if (chainparams.MiningRequiresPeers()) { // Busy-wait for the network to come online so we don't waste time mining // on an obsolete chain. In regtest mode we expect to fly solo. - while (vNodes.empty()) + do { + bool fvNodesEmpty; + { + LOCK(cs_vNodes); + fvNodesEmpty = vNodes.empty(); + } + if (!fvNodesEmpty && !IsInitialBlockDownload()) + break; MilliSleep(1000); + } while (true); } // @@ -532,6 +541,11 @@ void static BitcoinMiner(CWallet *pwallet) LogPrintf("BitcoinMiner terminated\n"); throw; } + catch (const std::runtime_error &e) + { + LogPrintf("BitcoinMiner runtime error: %s\n", e.what()); + return; + } } void GenerateBitcoins(bool fGenerate, CWallet* pwallet, int nThreads) diff --git a/src/mruset.h b/src/mruset.h index 1969f419cb..398aa173bf 100644 --- a/src/mruset.h +++ b/src/mruset.h @@ -1,12 +1,12 @@ -// Copyright (c) 2012 The Bitcoin Core developers +// Copyright (c) 2012-2015 The Bitcoin Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. #ifndef BITCOIN_MRUSET_H #define BITCOIN_MRUSET_H -#include <deque> #include <set> +#include <vector> #include <utility> /** STL-like set container that only keeps the most recent N elements. */ @@ -22,11 +22,13 @@ public: protected: std::set<T> set; - std::deque<T> queue; - size_type nMaxSize; + std::vector<iterator> order; + size_type first_used; + size_type first_unused; + const size_type nMaxSize; public: - mruset(size_type nMaxSizeIn = 0) { nMaxSize = nMaxSizeIn; } + mruset(size_type nMaxSizeIn = 1) : nMaxSize(nMaxSizeIn) { clear(); } iterator begin() const { return set.begin(); } iterator end() const { return set.end(); } size_type size() const { return set.size(); } @@ -36,7 +38,9 @@ public: void clear() { set.clear(); - queue.clear(); + order.assign(nMaxSize, set.end()); + first_used = 0; + first_unused = 0; } bool inline friend operator==(const mruset<T>& a, const mruset<T>& b) { return a.set == b.set; } bool inline friend operator==(const mruset<T>& a, const std::set<T>& b) { return a.set == b; } @@ -45,25 +49,17 @@ public: { std::pair<iterator, bool> ret = set.insert(x); if (ret.second) { - if (nMaxSize && queue.size() == nMaxSize) { - set.erase(queue.front()); - queue.pop_front(); + if (set.size() == nMaxSize + 1) { + set.erase(order[first_used]); + order[first_used] = set.end(); + if (++first_used == nMaxSize) first_used = 0; } - queue.push_back(x); + order[first_unused] = ret.first; + if (++first_unused == nMaxSize) first_unused = 0; } return ret; } size_type max_size() const { return nMaxSize; } - size_type max_size(size_type s) - { - if (s) - while (queue.size() > s) { - set.erase(queue.front()); - queue.pop_front(); - } - nMaxSize = s; - return nMaxSize; - } }; #endif // BITCOIN_MRUSET_H diff --git a/src/net.cpp b/src/net.cpp index 48e6367f20..2de04fc574 100644 --- a/src/net.cpp +++ b/src/net.cpp @@ -100,6 +100,7 @@ NodeId nLastNodeId = 0; CCriticalSection cs_nLastNodeId; static CSemaphore *semOutbound = NULL; +boost::condition_variable messageHandlerCondition; // Signals for message handling static CNodeSignals g_signals; @@ -141,6 +142,27 @@ bool GetLocal(CService& addr, const CNetAddr *paddrPeer) return nBestScore >= 0; } +//! Convert the pnSeeds6 array into usable address objects. +static std::vector<CAddress> convertSeed6(const std::vector<SeedSpec6> &vSeedsIn) +{ + // It'll only connect to one or two seed nodes because once it connects, + // it'll get a pile of addresses with newer timestamps. + // Seed nodes are given a random 'last seen time' of between one and two + // weeks ago. + const int64_t nOneWeek = 7*24*60*60; + std::vector<CAddress> vSeedsOut; + vSeedsOut.reserve(vSeedsIn.size()); + for (std::vector<SeedSpec6>::const_iterator i(vSeedsIn.begin()); i != vSeedsIn.end(); ++i) + { + struct in6_addr ip; + memcpy(&ip, i->addr, sizeof(ip)); + CAddress addr(CService(ip, i->port)); + addr.nTime = GetTime() - GetRand(nOneWeek) - nOneWeek; + vSeedsOut.push_back(addr); + } + return vSeedsOut; +} + // get best local address for a particular peer as a CAddress // Otherwise, return the unroutable 0.0.0.0 but filled in with // the normal parameters, since the IP may be changed to a useful @@ -532,8 +554,10 @@ bool CNode::ReceiveMsgBytes(const char *pch, unsigned int nBytes) pch += handled; nBytes -= handled; - if (msg.complete()) + if (msg.complete()) { msg.nTime = GetTimeMicros(); + messageHandlerCondition.notify_one(); + } } return true; @@ -1192,7 +1216,7 @@ void ThreadOpenConnections() static bool done = false; if (!done) { LogPrintf("Adding fixed seed nodes as DNS doesn't seem to be available.\n"); - addrman.Add(Params().FixedSeeds(), CNetAddr("127.0.0.1")); + addrman.Add(convertSeed6(Params().FixedSeeds()), CNetAddr("127.0.0.1")); done = true; } } @@ -1221,7 +1245,7 @@ void ThreadOpenConnections() int nTries = 0; while (true) { - CAddress addr = addrman.Select(); + CAddrInfo addr = addrman.Select(); // if we selected an invalid address, restart if (!addr.IsValid() || setConnected.count(addr.GetGroup()) || IsLocal(addr)) @@ -1358,6 +1382,9 @@ bool OpenNetworkConnection(const CAddress& addrConnect, CSemaphoreGrant *grantOu void ThreadMessageHandler() { + boost::mutex condition_mutex; + boost::unique_lock<boost::mutex> lock(condition_mutex); + SetThreadPriority(THREAD_PRIORITY_BELOW_NORMAL); while (true) { @@ -1417,7 +1444,7 @@ void ThreadMessageHandler() } if (fSleep) - MilliSleep(100); + messageHandlerCondition.timed_wait(lock, boost::posix_time::microsec_clock::universal_time() + boost::posix_time::milliseconds(100)); } } @@ -1878,7 +1905,10 @@ bool CAddrDB::Read(CAddrMan& addr) unsigned int ReceiveFloodSize() { return 1000*GetArg("-maxreceivebuffer", 5*1000); } unsigned int SendBufferSize() { return 1000*GetArg("-maxsendbuffer", 1*1000); } -CNode::CNode(SOCKET hSocketIn, CAddress addrIn, std::string addrNameIn, bool fInboundIn) : ssSend(SER_NETWORK, INIT_PROTO_VERSION), setAddrKnown(5000) +CNode::CNode(SOCKET hSocketIn, CAddress addrIn, std::string addrNameIn, bool fInboundIn) : + ssSend(SER_NETWORK, INIT_PROTO_VERSION), + addrKnown(5000, 0.001, insecure_rand()), + setInventoryKnown(SendBufferSize() / 1000) { nServices = 0; hSocket = hSocketIn; @@ -1907,7 +1937,6 @@ CNode::CNode(SOCKET hSocketIn, CAddress addrIn, std::string addrNameIn, bool fIn nStartingHeight = -1; fGetAddr = false; fRelayTxes = false; - setInventoryKnown.max_size(SendBufferSize() / 1000); pfilter = new CBloomFilter(); nPingNonceSent = 0; nPingUsecStart = 0; @@ -271,8 +271,8 @@ public: bool fDisconnect; // We use fRelayTxes for two purposes - // a) it allows us to not relay tx invs before receiving the peer's version message - // b) the peer may tell us in their version message that we should not relay tx invs - // until they have initialized their bloom filter. + // b) the peer may tell us in its version message that we should not relay tx invs + // until it has initialized its bloom filter. bool fRelayTxes; CSemaphoreGrant grantOutbound; CCriticalSection cs_filter; @@ -300,7 +300,7 @@ public: // flood relay std::vector<CAddress> vAddrToSend; - mruset<CAddress> setAddrKnown; + CRollingBloomFilter addrKnown; bool fGetAddr; std::set<uint256> setKnown; @@ -380,7 +380,7 @@ public: void AddAddressKnown(const CAddress& addr) { - setAddrKnown.insert(addr); + addrKnown.insert(addr.GetKey()); } void PushAddress(const CAddress& addr) @@ -388,7 +388,7 @@ public: // Known checking here is only to save space from duplicates. // SendMessages will filter it again for knowns that were added // after addresses were pushed. - if (addr.IsValid() && !setAddrKnown.count(addr)) { + if (addr.IsValid() && !addrKnown.contains(addr.GetKey())) { if (vAddrToSend.size() >= MAX_ADDR_TO_SEND) { vAddrToSend[insecure_rand() % vAddrToSend.size()] = addr; } else { diff --git a/src/netbase.cpp b/src/netbase.cpp index 1837cfa9c3..2015d0271a 100644 --- a/src/netbase.cpp +++ b/src/netbase.cpp @@ -293,7 +293,7 @@ struct ProxyCredentials }; /** Connect using SOCKS5 (as described in RFC1928) */ -bool static Socks5(string strDest, int port, const ProxyCredentials *auth, SOCKET& hSocket) +static bool Socks5(const std::string& strDest, int port, const ProxyCredentials *auth, SOCKET& hSocket) { LogPrintf("SOCKS5 connecting %s\n", strDest); if (strDest.size() > 255) { @@ -558,7 +558,7 @@ bool IsProxy(const CNetAddr &addr) { return false; } -static bool ConnectThroughProxy(const proxyType &proxy, const std::string strDest, int port, SOCKET& hSocketRet, int nTimeout, bool *outProxyConnectionFailed) +static bool ConnectThroughProxy(const proxyType &proxy, const std::string& strDest, int port, SOCKET& hSocketRet, int nTimeout, bool *outProxyConnectionFailed) { SOCKET hSocket = INVALID_SOCKET; // first connect to proxy server diff --git a/src/pow.cpp b/src/pow.cpp index fc6ed4f3d1..bb53ad204b 100644 --- a/src/pow.cpp +++ b/src/pow.cpp @@ -114,3 +114,20 @@ arith_uint256 GetBlockProof(const CBlockIndex& block) // or ~bnTarget / (nTarget+1) + 1. return (~bnTarget / (bnTarget + 1)) + 1; } + +int64_t GetBlockProofEquivalentTime(const CBlockIndex& to, const CBlockIndex& from, const CBlockIndex& tip, const Consensus::Params& params) +{ + arith_uint256 r; + int sign = 1; + if (to.nChainWork > from.nChainWork) { + r = to.nChainWork - from.nChainWork; + } else { + r = from.nChainWork - to.nChainWork; + sign = -1; + } + r = r * arith_uint256(params.nPowTargetSpacing) / GetBlockProof(tip); + if (r.bits() > 63) { + return sign * std::numeric_limits<int64_t>::max(); + } + return sign * r.GetLow64(); +} @@ -22,4 +22,7 @@ unsigned int CalculateNextWorkRequired(const CBlockIndex* pindexLast, int64_t nF bool CheckProofOfWork(uint256 hash, unsigned int nBits, const Consensus::Params&); arith_uint256 GetBlockProof(const CBlockIndex& block); +/** Return the time it would take to redo the work difference between from and to, assuming the current hashrate corresponds to the difficulty at tip, in seconds. */ +int64_t GetBlockProofEquivalentTime(const CBlockIndex& to, const CBlockIndex& from, const CBlockIndex& tip, const Consensus::Params&); + #endif // BITCOIN_POW_H diff --git a/src/primitives/block.h b/src/primitives/block.h index c7ed6f723a..59f46deb1c 100644 --- a/src/primitives/block.h +++ b/src/primitives/block.h @@ -10,9 +10,6 @@ #include "serialize.h" #include "uint256.h" -/** The maximum allowed size for a serialized block, in bytes (network rule) */ -static const unsigned int MAX_BLOCK_SIZE = 1000000; - /** Nodes collect new transactions into a block, hash them into a hash tree, * and scan through nonce values to make the block's hash satisfy proof-of-work * requirements. When they solve the proof-of-work, they broadcast the block diff --git a/src/protocol.cpp b/src/protocol.cpp index 568580a595..dd855aa33a 100644 --- a/src/protocol.cpp +++ b/src/protocol.cpp @@ -89,7 +89,6 @@ void CAddress::Init() { nServices = NODE_NETWORK; nTime = 100000000; - nLastTry = 0; } CInv::CInv() diff --git a/src/protocol.h b/src/protocol.h index fd23eae1fc..b5e65032a2 100644 --- a/src/protocol.h +++ b/src/protocol.h @@ -116,9 +116,6 @@ public: // disk and network only unsigned int nTime; - - // memory only - int64_t nLastTry; }; /** inv message data */ diff --git a/src/pubkey.cpp b/src/pubkey.cpp index a4c046bff5..bdab137600 100644 --- a/src/pubkey.cpp +++ b/src/pubkey.cpp @@ -54,13 +54,13 @@ bool CPubKey::Decompress() { return true; } -bool CPubKey::Derive(CPubKey& pubkeyChild, unsigned char ccChild[32], unsigned int nChild, const unsigned char cc[32]) const { +bool CPubKey::Derive(CPubKey& pubkeyChild, ChainCode &ccChild, unsigned int nChild, const ChainCode& cc) const { assert(IsValid()); assert((nChild >> 31) == 0); assert(begin() + 33 == end()); unsigned char out[64]; BIP32Hash(cc, nChild, *begin(), begin()+1, out); - memcpy(ccChild, out+32, 32); + memcpy(ccChild.begin(), out+32, 32); CECKey key; bool ret = key.SetPubKey(begin(), size()); ret &= key.TweakPublic(out); @@ -75,7 +75,7 @@ void CExtPubKey::Encode(unsigned char code[74]) const { memcpy(code+1, vchFingerprint, 4); code[5] = (nChild >> 24) & 0xFF; code[6] = (nChild >> 16) & 0xFF; code[7] = (nChild >> 8) & 0xFF; code[8] = (nChild >> 0) & 0xFF; - memcpy(code+9, vchChainCode, 32); + memcpy(code+9, chaincode.begin(), 32); assert(pubkey.size() == 33); memcpy(code+41, pubkey.begin(), 33); } @@ -84,7 +84,7 @@ void CExtPubKey::Decode(const unsigned char code[74]) { nDepth = code[0]; memcpy(vchFingerprint, code+1, 4); nChild = (code[5] << 24) | (code[6] << 16) | (code[7] << 8) | code[8]; - memcpy(vchChainCode, code+9, 32); + memcpy(chaincode.begin(), code+9, 32); pubkey.Set(code+41, code+74); } @@ -93,5 +93,5 @@ bool CExtPubKey::Derive(CExtPubKey &out, unsigned int nChild) const { CKeyID id = pubkey.GetID(); memcpy(&out.vchFingerprint[0], &id, 4); out.nChild = nChild; - return pubkey.Derive(out.pubkey, out.vchChainCode, nChild, vchChainCode); + return pubkey.Derive(out.pubkey, out.chaincode, nChild, chaincode); } diff --git a/src/pubkey.h b/src/pubkey.h index b0768d4f47..cce9c826e5 100644 --- a/src/pubkey.h +++ b/src/pubkey.h @@ -31,6 +31,8 @@ public: CKeyID(const uint160& in) : uint160(in) {} }; +typedef uint256 ChainCode; + /** An encapsulated public key. */ class CPubKey { @@ -182,20 +184,20 @@ public: bool Decompress(); //! Derive BIP32 child pubkey. - bool Derive(CPubKey& pubkeyChild, unsigned char ccChild[32], unsigned int nChild, const unsigned char cc[32]) const; + bool Derive(CPubKey& pubkeyChild, ChainCode &ccChild, unsigned int nChild, const ChainCode& cc) const; }; struct CExtPubKey { unsigned char nDepth; unsigned char vchFingerprint[4]; unsigned int nChild; - unsigned char vchChainCode[32]; + ChainCode chaincode; CPubKey pubkey; - friend bool operator==(const CExtPubKey& a, const CExtPubKey& b) + friend bool operator==(const CExtPubKey &a, const CExtPubKey &b) { return a.nDepth == b.nDepth && memcmp(&a.vchFingerprint[0], &b.vchFingerprint[0], 4) == 0 && a.nChild == b.nChild && - memcmp(&a.vchChainCode[0], &b.vchChainCode[0], 32) == 0 && a.pubkey == b.pubkey; + a.chaincode == b.chaincode && a.pubkey == b.pubkey; } void Encode(unsigned char code[74]) const; diff --git a/src/qt/askpassphrasedialog.cpp b/src/qt/askpassphrasedialog.cpp index 229139e65c..441814ff07 100644 --- a/src/qt/askpassphrasedialog.cpp +++ b/src/qt/askpassphrasedialog.cpp @@ -62,7 +62,7 @@ AskPassphraseDialog::AskPassphraseDialog(Mode mode, QWidget *parent) : break; case ChangePass: // Ask old passphrase + new passphrase x2 setWindowTitle(tr("Change passphrase")); - ui->warningLabel->setText(tr("Enter the old and new passphrase to the wallet.")); + ui->warningLabel->setText(tr("Enter the old passphrase and new passphrase to the wallet.")); break; } textChanged(); diff --git a/src/qt/bitcoin.cpp b/src/qt/bitcoin.cpp index 069601ab67..018169cfdc 100644 --- a/src/qt/bitcoin.cpp +++ b/src/qt/bitcoin.cpp @@ -532,7 +532,7 @@ int main(int argc, char *argv[]) // Now that QSettings are accessible, initialize translations QTranslator qtTranslatorBase, qtTranslator, translatorBase, translator; initTranslations(qtTranslatorBase, qtTranslator, translatorBase, translator); - uiInterface.Translate.connect(Translate); + translationInterface.Translate.connect(Translate); // Show help message immediately after parsing command-line options (for "-lang") and setting locale, // but before showing splash screen. diff --git a/src/qt/bitcoingui.cpp b/src/qt/bitcoingui.cpp index 670d54c7e3..70bf894599 100644 --- a/src/qt/bitcoingui.cpp +++ b/src/qt/bitcoingui.cpp @@ -684,7 +684,7 @@ void BitcoinGUI::setNumBlocks(int count, const QDateTime& blockDate) QDateTime currentDate = QDateTime::currentDateTime(); qint64 secs = blockDate.secsTo(currentDate); - tooltip = tr("Processed %n blocks of transaction history.", "", count); + tooltip = tr("Processed %n block(s) of transaction history.", "", count); // Set icon state: spinning if catching up, tick otherwise if(secs < 90*60) diff --git a/src/qt/bitcoinstrings.cpp b/src/qt/bitcoinstrings.cpp index 548529865a..d14343717a 100644 --- a/src/qt/bitcoinstrings.cpp +++ b/src/qt/bitcoinstrings.cpp @@ -10,18 +10,6 @@ #endif static const char UNUSED *bitcoin_strings[] = { QT_TRANSLATE_NOOP("bitcoin-core", "" -"%s, you must set a rpcpassword in the configuration file:\n" -"%s\n" -"It is recommended you use the following random password:\n" -"rpcuser=bitcoinrpc\n" -"rpcpassword=%s\n" -"(you do not need to remember this password)\n" -"The username and password MUST NOT be the same.\n" -"If the file does not exist, create it with owner-readable-only file " -"permissions.\n" -"It is also recommended to set alertnotify so you are notified of problems;\n" -"for example: alertnotify=echo %%s | mail -s \"Bitcoin Alert\" admin@foo.com\n"), -QT_TRANSLATE_NOOP("bitcoin-core", "" "(1 = keep tx meta data e.g. account owner and payment request information, 2 " "= drop tx meta data)"), QT_TRANSLATE_NOOP("bitcoin-core", "" @@ -46,7 +34,7 @@ QT_TRANSLATE_NOOP("bitcoin-core", "" "running."), QT_TRANSLATE_NOOP("bitcoin-core", "" "Continuously rate-limit free transactions to <n>*1000 bytes per minute " -"(default:%u)"), +"(default: %u)"), QT_TRANSLATE_NOOP("bitcoin-core", "" "Create new files with system default permissions, instead of umask 077 (only " "effective with disabled wallet functionality)"), @@ -54,6 +42,9 @@ QT_TRANSLATE_NOOP("bitcoin-core", "" "Delete all wallet transactions and only recover those parts of the " "blockchain through -rescan on startup"), QT_TRANSLATE_NOOP("bitcoin-core", "" +"Discover own IP addresses (default: 1 when listening and no -externalip or -" +"proxy)"), +QT_TRANSLATE_NOOP("bitcoin-core", "" "Distributed under the MIT software license, see the accompanying file " "COPYING or <http://www.opensource.org/licenses/mit-license.php>."), QT_TRANSLATE_NOOP("bitcoin-core", "" @@ -62,13 +53,6 @@ QT_TRANSLATE_NOOP("bitcoin-core", "" QT_TRANSLATE_NOOP("bitcoin-core", "" "Error: Listening for incoming connections failed (listen returned error %s)"), QT_TRANSLATE_NOOP("bitcoin-core", "" -"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."), -QT_TRANSLATE_NOOP("bitcoin-core", "" -"Error: This transaction requires a transaction fee of at least %s because of " -"its amount, complexity, or use of recently received funds!"), -QT_TRANSLATE_NOOP("bitcoin-core", "" "Error: Unsupported argument -socks found. Setting SOCKS version isn't " "possible anymore, only SOCKS5 proxies are supported."), QT_TRANSLATE_NOOP("bitcoin-core", "" @@ -92,12 +76,15 @@ QT_TRANSLATE_NOOP("bitcoin-core", "" QT_TRANSLATE_NOOP("bitcoin-core", "" "How thorough the block verification of -checkblocks is (0-4, default: %u)"), QT_TRANSLATE_NOOP("bitcoin-core", "" -"If paytxfee is not set, include enough fee so transactions are confirmed on " -"average within n blocks (default: %u)"), +"If paytxfee is not set, include enough fee so transactions begin " +"confirmation on average within n blocks (default: %u)"), QT_TRANSLATE_NOOP("bitcoin-core", "" "In this mode -genproclimit controls how many blocks are generated " "immediately."), QT_TRANSLATE_NOOP("bitcoin-core", "" +"Invalid amount for -maxtxfee=<amount>: '%s' (must be at least the minrelay " +"fee of %s to prevent stuck transactions)"), +QT_TRANSLATE_NOOP("bitcoin-core", "" "Log transaction priority and fee per kB when mining blocks (default: %u)"), QT_TRANSLATE_NOOP("bitcoin-core", "" "Maintain a full transaction index, used by the getrawtransaction rpc call " @@ -106,13 +93,29 @@ QT_TRANSLATE_NOOP("bitcoin-core", "" "Maximum size of data in data carrier transactions we relay and mine " "(default: %u)"), QT_TRANSLATE_NOOP("bitcoin-core", "" +"Maximum total fees to use in a single wallet transaction; setting this too " +"low may abort large transactions (default: %s)"), +QT_TRANSLATE_NOOP("bitcoin-core", "" "Number of seconds to keep misbehaving peers from reconnecting (default: %u)"), QT_TRANSLATE_NOOP("bitcoin-core", "" "Output debugging information (default: %u, supplying <category> is optional)"), QT_TRANSLATE_NOOP("bitcoin-core", "" +"Prune configured below the minimum of %d MB. Please use a higher number."), +QT_TRANSLATE_NOOP("bitcoin-core", "" "Query for peer addresses via DNS lookup, if low on addresses (default: 1 " "unless -connect)"), QT_TRANSLATE_NOOP("bitcoin-core", "" +"Randomize credentials for every proxy connection. This enables Tor stream " +"isolation (default: %u)"), +QT_TRANSLATE_NOOP("bitcoin-core", "" +"Reduce storage requirements by pruning (deleting) old blocks. This mode " +"disables wallet support and is incompatible with -txindex. Warning: " +"Reverting this setting requires re-downloading the entire blockchain. " +"(default: 0 = disable pruning blocks, >%u = target size in MiB to use for " +"block files)"), +QT_TRANSLATE_NOOP("bitcoin-core", "" +"Require high priority for relaying free or low-fee transactions (default: %u)"), +QT_TRANSLATE_NOOP("bitcoin-core", "" "Set maximum size of high-priority/low-fee transactions in bytes (default: %d)"), QT_TRANSLATE_NOOP("bitcoin-core", "" "Set the number of script verification threads (%u to %d, 0 = auto, <0 = " @@ -121,6 +124,8 @@ QT_TRANSLATE_NOOP("bitcoin-core", "" "Set the number of threads for coin generation if enabled (-1 = all cores, " "default: %d)"), QT_TRANSLATE_NOOP("bitcoin-core", "" +"The transaction amount is too small to send after the fee has been deducted"), +QT_TRANSLATE_NOOP("bitcoin-core", "" "This is a pre-release test build - use at your own risk - do not use for " "mining or merchant applications"), QT_TRANSLATE_NOOP("bitcoin-core", "" @@ -128,12 +133,28 @@ QT_TRANSLATE_NOOP("bitcoin-core", "" "the OpenSSL Toolkit <https://www.openssl.org/> and cryptographic software " "written by Eric Young and UPnP software written by Thomas Bernard."), QT_TRANSLATE_NOOP("bitcoin-core", "" +"To use bitcoind, or the -server option to bitcoin-qt, you must set an " +"rpcpassword in the configuration file:\n" +"%s\n" +"It is recommended you use the following random password:\n" +"rpcuser=bitcoinrpc\n" +"rpcpassword=%s\n" +"(you do not need to remember this password)\n" +"The username and password MUST NOT be the same.\n" +"If the file does not exist, create it with owner-readable-only file " +"permissions.\n" +"It is also recommended to set alertnotify so you are notified of problems;\n" +"for example: alertnotify=echo %%s | mail -s \"Bitcoin Alert\" admin@foo.com\n"), +QT_TRANSLATE_NOOP("bitcoin-core", "" "Unable to bind to %s on this computer. Bitcoin Core is probably already " "running."), QT_TRANSLATE_NOOP("bitcoin-core", "" "Use separate SOCKS5 proxy to reach peers via Tor hidden services (default: " "%s)"), QT_TRANSLATE_NOOP("bitcoin-core", "" +"Warning: -maxtxfee is set very high! Fees this large could be paid on a " +"single transaction."), +QT_TRANSLATE_NOOP("bitcoin-core", "" "Warning: -paytxfee is set very high! This is the transaction fee you will " "pay if you send a transaction."), QT_TRANSLATE_NOOP("bitcoin-core", "" @@ -158,22 +179,31 @@ QT_TRANSLATE_NOOP("bitcoin-core", "" QT_TRANSLATE_NOOP("bitcoin-core", "" "Whitelisted peers cannot be DoS banned and their transactions are always " "relayed, even if they are already in the mempool, useful e.g. for a gateway"), +QT_TRANSLATE_NOOP("bitcoin-core", "" +"You need to rebuild the database using -reindex to go back to unpruned " +"mode. This will redownload the entire blockchain"), QT_TRANSLATE_NOOP("bitcoin-core", "(default: %s)"), +QT_TRANSLATE_NOOP("bitcoin-core", "(default: %u)"), QT_TRANSLATE_NOOP("bitcoin-core", "(default: 1)"), QT_TRANSLATE_NOOP("bitcoin-core", "<category> can be:"), QT_TRANSLATE_NOOP("bitcoin-core", "Accept command line and JSON-RPC commands"), QT_TRANSLATE_NOOP("bitcoin-core", "Accept connections from outside (default: 1 if no -proxy or -connect)"), +QT_TRANSLATE_NOOP("bitcoin-core", "Accept public REST requests (default: %u)"), QT_TRANSLATE_NOOP("bitcoin-core", "Acceptable ciphers (default: %s)"), +QT_TRANSLATE_NOOP("bitcoin-core", "Activating best chain..."), QT_TRANSLATE_NOOP("bitcoin-core", "Add a node to connect to and attempt to keep the connection open"), QT_TRANSLATE_NOOP("bitcoin-core", "Allow DNS lookups for -addnode, -seednode and -connect"), +QT_TRANSLATE_NOOP("bitcoin-core", "Allow self signed root certificates (default: 0)"), QT_TRANSLATE_NOOP("bitcoin-core", "Always query for peer addresses via DNS lookup (default: %u)"), QT_TRANSLATE_NOOP("bitcoin-core", "Attempt to recover private keys from a corrupt wallet.dat"), QT_TRANSLATE_NOOP("bitcoin-core", "Block creation options:"), +QT_TRANSLATE_NOOP("bitcoin-core", "Can't run with a wallet in prune mode."), QT_TRANSLATE_NOOP("bitcoin-core", "Cannot downgrade wallet"), QT_TRANSLATE_NOOP("bitcoin-core", "Cannot resolve -bind address: '%s'"), QT_TRANSLATE_NOOP("bitcoin-core", "Cannot resolve -externalip address: '%s'"), QT_TRANSLATE_NOOP("bitcoin-core", "Cannot resolve -whitebind address: '%s'"), QT_TRANSLATE_NOOP("bitcoin-core", "Cannot write default address"), +QT_TRANSLATE_NOOP("bitcoin-core", "Choose data directory on startup (default: 0)"), QT_TRANSLATE_NOOP("bitcoin-core", "Connect only to the specified node(s)"), QT_TRANSLATE_NOOP("bitcoin-core", "Connect through SOCKS5 proxy"), QT_TRANSLATE_NOOP("bitcoin-core", "Connect to a node to retrieve peer addresses, and disconnect"), @@ -183,7 +213,6 @@ QT_TRANSLATE_NOOP("bitcoin-core", "Corrupted block database detected"), QT_TRANSLATE_NOOP("bitcoin-core", "Could not parse -rpcbind value %s as network address"), QT_TRANSLATE_NOOP("bitcoin-core", "Debugging/Testing options:"), QT_TRANSLATE_NOOP("bitcoin-core", "Disable safemode, override a real safe mode event (default: %u)"), -QT_TRANSLATE_NOOP("bitcoin-core", "Discover own IP address (default: 1 when listening and no -externalip)"), QT_TRANSLATE_NOOP("bitcoin-core", "Do not load the wallet and disable wallet RPC calls"), QT_TRANSLATE_NOOP("bitcoin-core", "Do you want to rebuild the block database now?"), QT_TRANSLATE_NOOP("bitcoin-core", "Done loading"), @@ -194,11 +223,11 @@ QT_TRANSLATE_NOOP("bitcoin-core", "Error loading wallet.dat"), QT_TRANSLATE_NOOP("bitcoin-core", "Error loading wallet.dat: Wallet corrupted"), QT_TRANSLATE_NOOP("bitcoin-core", "Error loading wallet.dat: Wallet requires newer version of Bitcoin Core"), QT_TRANSLATE_NOOP("bitcoin-core", "Error opening block database"), +QT_TRANSLATE_NOOP("bitcoin-core", "Error reading from database, shutting down."), QT_TRANSLATE_NOOP("bitcoin-core", "Error"), QT_TRANSLATE_NOOP("bitcoin-core", "Error: A fatal internal error occured, see debug.log for details"), QT_TRANSLATE_NOOP("bitcoin-core", "Error: Disk space is low!"), QT_TRANSLATE_NOOP("bitcoin-core", "Error: Unsupported argument -tor found, use -onion."), -QT_TRANSLATE_NOOP("bitcoin-core", "Error: Wallet locked, unable to create transaction!"), QT_TRANSLATE_NOOP("bitcoin-core", "Failed to listen on any port. Use -listen=0 if you want this."), QT_TRANSLATE_NOOP("bitcoin-core", "Fee (in BTC/kB) to add to transactions you send (default: %s)"), QT_TRANSLATE_NOOP("bitcoin-core", "Force safe mode (default: %u)"), @@ -214,13 +243,12 @@ QT_TRANSLATE_NOOP("bitcoin-core", "Initialization sanity check failed. Bitcoin C QT_TRANSLATE_NOOP("bitcoin-core", "Insufficient funds"), QT_TRANSLATE_NOOP("bitcoin-core", "Invalid -onion address: '%s'"), QT_TRANSLATE_NOOP("bitcoin-core", "Invalid -proxy address: '%s'"), +QT_TRANSLATE_NOOP("bitcoin-core", "Invalid amount for -maxtxfee=<amount>: '%s'"), QT_TRANSLATE_NOOP("bitcoin-core", "Invalid amount for -minrelaytxfee=<amount>: '%s'"), QT_TRANSLATE_NOOP("bitcoin-core", "Invalid amount for -mintxfee=<amount>: '%s'"), QT_TRANSLATE_NOOP("bitcoin-core", "Invalid amount for -paytxfee=<amount>: '%s' (must be at least %s)"), QT_TRANSLATE_NOOP("bitcoin-core", "Invalid amount for -paytxfee=<amount>: '%s'"), -QT_TRANSLATE_NOOP("bitcoin-core", "Invalid amount"), QT_TRANSLATE_NOOP("bitcoin-core", "Invalid netmask specified in -whitelist: '%s'"), -QT_TRANSLATE_NOOP("bitcoin-core", "Keep at most <n> unconnectable blocks in memory (default: %u)"), QT_TRANSLATE_NOOP("bitcoin-core", "Keep at most <n> unconnectable transactions in memory (default: %u)"), QT_TRANSLATE_NOOP("bitcoin-core", "Limit size of signature cache to <n> entries (default: %u)"), QT_TRANSLATE_NOOP("bitcoin-core", "Listen for JSON-RPC connections on <port> (default: %u or testnet: %u)"), @@ -229,6 +257,7 @@ QT_TRANSLATE_NOOP("bitcoin-core", "Loading addresses..."), QT_TRANSLATE_NOOP("bitcoin-core", "Loading block index..."), QT_TRANSLATE_NOOP("bitcoin-core", "Loading wallet..."), QT_TRANSLATE_NOOP("bitcoin-core", "Maintain at most <n> connections to peers (default: %u)"), +QT_TRANSLATE_NOOP("bitcoin-core", "Make the wallet broadcast transactions"), QT_TRANSLATE_NOOP("bitcoin-core", "Maximum per-connection receive buffer, <n>*1000 bytes (default: %u)"), QT_TRANSLATE_NOOP("bitcoin-core", "Maximum per-connection send buffer, <n>*1000 bytes (default: %u)"), QT_TRANSLATE_NOOP("bitcoin-core", "Need to specify a port with -whitebind: '%s'"), @@ -239,13 +268,13 @@ QT_TRANSLATE_NOOP("bitcoin-core", "Only connect to nodes in network <net> (ipv4, QT_TRANSLATE_NOOP("bitcoin-core", "Options:"), QT_TRANSLATE_NOOP("bitcoin-core", "Password for JSON-RPC connections"), QT_TRANSLATE_NOOP("bitcoin-core", "Prepend debug output with timestamp (default: %u)"), -QT_TRANSLATE_NOOP("bitcoin-core", "Print block on startup, if found in block index"), -QT_TRANSLATE_NOOP("bitcoin-core", "Print block tree on startup (default: %u)"), +QT_TRANSLATE_NOOP("bitcoin-core", "Prune cannot be configured with a negative value."), +QT_TRANSLATE_NOOP("bitcoin-core", "Prune mode is incompatible with -txindex."), QT_TRANSLATE_NOOP("bitcoin-core", "RPC SSL options: (see the Bitcoin Wiki for SSL setup instructions)"), QT_TRANSLATE_NOOP("bitcoin-core", "RPC server options:"), +QT_TRANSLATE_NOOP("bitcoin-core", "RPC support for HTTP persistent connections (default: %d)"), QT_TRANSLATE_NOOP("bitcoin-core", "Randomly drop 1 of every <n> network messages"), QT_TRANSLATE_NOOP("bitcoin-core", "Randomly fuzz 1 of every <n> network messages"), -QT_TRANSLATE_NOOP("bitcoin-core", "Rebuild block chain index from current blk000??.dat files"), QT_TRANSLATE_NOOP("bitcoin-core", "Relay and mine data carrier transactions (default: %u)"), QT_TRANSLATE_NOOP("bitcoin-core", "Relay non-P2SH multisig (default: %u)"), QT_TRANSLATE_NOOP("bitcoin-core", "Rescan the block chain for missing wallet transactions"), @@ -256,13 +285,16 @@ QT_TRANSLATE_NOOP("bitcoin-core", "Send trace/debug info to console instead of d QT_TRANSLATE_NOOP("bitcoin-core", "Send transactions as zero-fee transactions if possible (default: %u)"), QT_TRANSLATE_NOOP("bitcoin-core", "Server certificate file (default: %s)"), QT_TRANSLATE_NOOP("bitcoin-core", "Server private key (default: %s)"), +QT_TRANSLATE_NOOP("bitcoin-core", "Set SSL root certificates for payment request (default: -system-)"), QT_TRANSLATE_NOOP("bitcoin-core", "Set database cache size in megabytes (%d to %d, default: %d)"), QT_TRANSLATE_NOOP("bitcoin-core", "Set key pool size to <n> (default: %u)"), +QT_TRANSLATE_NOOP("bitcoin-core", "Set language, for example \"de_DE\" (default: system locale)"), QT_TRANSLATE_NOOP("bitcoin-core", "Set maximum block size in bytes (default: %d)"), QT_TRANSLATE_NOOP("bitcoin-core", "Set minimum block size in bytes (default: %u)"), QT_TRANSLATE_NOOP("bitcoin-core", "Set the number of threads to service RPC calls (default: %d)"), QT_TRANSLATE_NOOP("bitcoin-core", "Sets the DB_PRIVATE flag in the wallet db environment (default: %u)"), QT_TRANSLATE_NOOP("bitcoin-core", "Show all debugging options (usage: --help -help-debug)"), +QT_TRANSLATE_NOOP("bitcoin-core", "Show splash screen on startup (default: 1)"), QT_TRANSLATE_NOOP("bitcoin-core", "Shrink debug.log file on client startup (default: 1 when no -debug)"), QT_TRANSLATE_NOOP("bitcoin-core", "Signing transaction failed"), QT_TRANSLATE_NOOP("bitcoin-core", "Specify configuration file (default: %s)"), @@ -272,15 +304,18 @@ QT_TRANSLATE_NOOP("bitcoin-core", "Specify pid file (default: %s)"), QT_TRANSLATE_NOOP("bitcoin-core", "Specify wallet file (within data directory)"), QT_TRANSLATE_NOOP("bitcoin-core", "Specify your own public address"), QT_TRANSLATE_NOOP("bitcoin-core", "Spend unconfirmed change when sending transactions (default: %u)"), +QT_TRANSLATE_NOOP("bitcoin-core", "Start minimized"), QT_TRANSLATE_NOOP("bitcoin-core", "Stop running after importing blocks from disk (default: %u)"), +QT_TRANSLATE_NOOP("bitcoin-core", "The transaction amount is too small to pay the fee"), QT_TRANSLATE_NOOP("bitcoin-core", "This help message"), QT_TRANSLATE_NOOP("bitcoin-core", "This is experimental software."), QT_TRANSLATE_NOOP("bitcoin-core", "This is intended for regression testing tools and app development."), QT_TRANSLATE_NOOP("bitcoin-core", "Threshold for disconnecting misbehaving peers (default: %u)"), -QT_TRANSLATE_NOOP("bitcoin-core", "To use the %s option"), QT_TRANSLATE_NOOP("bitcoin-core", "Transaction amount too small"), QT_TRANSLATE_NOOP("bitcoin-core", "Transaction amounts must be positive"), +QT_TRANSLATE_NOOP("bitcoin-core", "Transaction too large for fee policy"), QT_TRANSLATE_NOOP("bitcoin-core", "Transaction too large"), +QT_TRANSLATE_NOOP("bitcoin-core", "UI Options:"), QT_TRANSLATE_NOOP("bitcoin-core", "Unable to bind to %s on this computer (bind returned error %s)"), QT_TRANSLATE_NOOP("bitcoin-core", "Unknown network specified in -onlynet: '%s'"), QT_TRANSLATE_NOOP("bitcoin-core", "Upgrade wallet to latest format"), @@ -295,7 +330,7 @@ QT_TRANSLATE_NOOP("bitcoin-core", "Wallet %s resides outside data directory %s") QT_TRANSLATE_NOOP("bitcoin-core", "Wallet needed to be rewritten: restart Bitcoin Core to complete"), QT_TRANSLATE_NOOP("bitcoin-core", "Wallet options:"), QT_TRANSLATE_NOOP("bitcoin-core", "Warning"), -QT_TRANSLATE_NOOP("bitcoin-core", "Warning: This version is obsolete, upgrade required!"), +QT_TRANSLATE_NOOP("bitcoin-core", "Warning: This version is obsolete; upgrade required!"), QT_TRANSLATE_NOOP("bitcoin-core", "Warning: Unsupported argument -benchmark ignored, use -debug=bench."), QT_TRANSLATE_NOOP("bitcoin-core", "Warning: Unsupported argument -debugnet ignored, use -debug=net."), QT_TRANSLATE_NOOP("bitcoin-core", "You need to rebuild the database using -reindex to change -txindex"), diff --git a/src/qt/clientmodel.cpp b/src/qt/clientmodel.cpp index dc32f81571..8e29cdeb06 100644 --- a/src/qt/clientmodel.cpp +++ b/src/qt/clientmodel.cpp @@ -89,7 +89,7 @@ QDateTime ClientModel::getLastBlockDate() const double ClientModel::getVerificationProgress() const { LOCK(cs_main); - return Checkpoints::GuessVerificationProgress(chainActive.Tip()); + return Checkpoints::GuessVerificationProgress(Params().Checkpoints(), chainActive.Tip()); } void ClientModel::updateTimer() diff --git a/src/qt/coincontroldialog.cpp b/src/qt/coincontroldialog.cpp index 0a60632bfa..7531fbddcb 100644 --- a/src/qt/coincontroldialog.cpp +++ b/src/qt/coincontroldialog.cpp @@ -129,11 +129,11 @@ CoinControlDialog::CoinControlDialog(QWidget *parent) : ui->treeWidget->setColumnWidth(COLUMN_DATE, 110); ui->treeWidget->setColumnWidth(COLUMN_CONFIRMATIONS, 100); ui->treeWidget->setColumnWidth(COLUMN_PRIORITY, 100); - ui->treeWidget->setColumnHidden(COLUMN_TXHASH, true); // store transacton hash in this column, but dont show it - ui->treeWidget->setColumnHidden(COLUMN_VOUT_INDEX, true); // store vout index in this column, but dont show it - ui->treeWidget->setColumnHidden(COLUMN_AMOUNT_INT64, true); // store amount int64 in this column, but dont show it - ui->treeWidget->setColumnHidden(COLUMN_PRIORITY_INT64, true); // store priority int64 in this column, but dont show it - ui->treeWidget->setColumnHidden(COLUMN_DATE_INT64, true); // store date int64 in this column, but dont show it + ui->treeWidget->setColumnHidden(COLUMN_TXHASH, true); // store transacton hash in this column, but don't show it + ui->treeWidget->setColumnHidden(COLUMN_VOUT_INDEX, true); // store vout index in this column, but don't show it + ui->treeWidget->setColumnHidden(COLUMN_AMOUNT_INT64, true); // store amount int64 in this column, but don't show it + ui->treeWidget->setColumnHidden(COLUMN_PRIORITY_INT64, true); // store priority int64 in this column, but don't show it + ui->treeWidget->setColumnHidden(COLUMN_DATE_INT64, true); // store date int64 in this column, but don't show it // default view is sorted by amount desc sortView(COLUMN_AMOUNT_INT64, Qt::DescendingOrder); @@ -408,8 +408,8 @@ void CoinControlDialog::viewItemChanged(QTreeWidgetItem* item, int column) } // todo: this is a temporary qt5 fix: when clicking a parent node in tree mode, the parent node - // including all childs are partially selected. But the parent node should be fully selected - // as well as the childs. Childs should never be partially selected in the first place. + // including all children are partially selected. But the parent node should be fully selected + // as well as the children. Children should never be partially selected in the first place. // Please remove this ugly fix, once the bug is solved upstream. #if QT_VERSION >= 0x050000 else if (column == COLUMN_CHECKBOX && item->childCount() > 0) @@ -635,15 +635,15 @@ void CoinControlDialog::updateLabels(WalletModel *model, QDialog* dialog) l7->setStyleSheet((fDust) ? "color:red;" : ""); // Dust = "yes" // tool tips - QString toolTip1 = tr("This label turns red, if the transaction size is greater than 1000 bytes.") + "<br /><br />"; + QString toolTip1 = tr("This label turns red if the transaction size is greater than 1000 bytes.") + "<br /><br />"; toolTip1 += tr("This means a fee of at least %1 per kB is required.").arg(BitcoinUnits::formatWithUnit(nDisplayUnit, CWallet::minTxFee.GetFeePerK())) + "<br /><br />"; toolTip1 += tr("Can vary +/- 1 byte per input."); QString toolTip2 = tr("Transactions with higher priority are more likely to get included into a block.") + "<br /><br />"; - toolTip2 += tr("This label turns red, if the priority is smaller than \"medium\".") + "<br /><br />"; + toolTip2 += tr("This label turns red if the priority is smaller than \"medium\".") + "<br /><br />"; toolTip2 += tr("This means a fee of at least %1 per kB is required.").arg(BitcoinUnits::formatWithUnit(nDisplayUnit, CWallet::minTxFee.GetFeePerK())); - QString toolTip3 = tr("This label turns red, if any recipient receives an amount smaller than %1.").arg(BitcoinUnits::formatWithUnit(nDisplayUnit, ::minRelayTxFee.GetFee(546))); + QString toolTip3 = tr("This label turns red if any recipient receives an amount smaller than %1.").arg(BitcoinUnits::formatWithUnit(nDisplayUnit, ::minRelayTxFee.GetFee(546))); // how many satoshis the estimated fee can vary per byte we guess wrong double dFeeVary; diff --git a/src/qt/locale/bitcoin_ach.ts b/src/qt/locale/bitcoin_ach.ts index ddb9fb85ce..835ddb8eaa 100644 --- a/src/qt/locale/bitcoin_ach.ts +++ b/src/qt/locale/bitcoin_ach.ts @@ -1,4 +1,4 @@ -<TS language="ach" version="2.0"> +<TS language="ach" version="2.1"> <context> <name>AddressBookPage</name> </context> diff --git a/src/qt/locale/bitcoin_af_ZA.ts b/src/qt/locale/bitcoin_af_ZA.ts index c369c3c68f..5ef7d3fd37 100644 --- a/src/qt/locale/bitcoin_af_ZA.ts +++ b/src/qt/locale/bitcoin_af_ZA.ts @@ -1,11 +1,7 @@ -<TS language="af_ZA" version="2.0"> +<TS language="af_ZA" version="2.1"> <context> <name>AddressBookPage</name> <message> - <source>Double-click to edit address or label</source> - <translation>Dubbel-klik om die adres of etiket te wysig</translation> - </message> - <message> <source>Create a new address</source> <translation>Skep 'n nuwe adres</translation> </message> @@ -72,10 +68,6 @@ <translation>Verander wagwoord</translation> </message> <message> - <source>Enter the old and new passphrase to the wallet.</source> - <translation>Tik asseblief die ou en nuwe wagwoord vir die beursie in.</translation> - </message> - <message> <source>Confirm wallet encryption</source> <translation>Bevestig beursie enkripsie.</translation> </message> @@ -489,8 +481,8 @@ <translation>Tipe</translation> </message> <message> - <source>Address</source> - <translation>Adres</translation> + <source>Label</source> + <translation>Etiket</translation> </message> <message> <source>Received with</source> @@ -659,10 +651,6 @@ <translation>Laai adresse...</translation> </message> <message> - <source>Invalid amount</source> - <translation>Ongeldige bedrag</translation> - </message> - <message> <source>Insufficient funds</source> <translation>Onvoldoende fondse</translation> </message> diff --git a/src/qt/locale/bitcoin_ar.ts b/src/qt/locale/bitcoin_ar.ts index 101f51f8dc..a2e4c376b8 100644 --- a/src/qt/locale/bitcoin_ar.ts +++ b/src/qt/locale/bitcoin_ar.ts @@ -1,9 +1,9 @@ -<TS language="ar" version="2.0"> +<TS language="ar" version="2.1"> <context> <name>AddressBookPage</name> <message> - <source>Double-click to edit address or label</source> - <translation>أنقر بالماوس مرتين لتعديل العنوان او الوصف</translation> + <source>Right-click to edit address or label</source> + <translation>انقر بالزر الايمن لتعديل العنوان</translation> </message> <message> <source>Create a new address</source> @@ -152,10 +152,6 @@ <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> @@ -184,10 +180,6 @@ <translation>أدخل عبارة مرور جديدة إلى المحفظة. الرجاء استخدام عبارة مرور تتكون من10 حروف عشوائية على الاقل, أو أكثر من 7 كلمات</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> @@ -295,12 +287,16 @@ <translation>عميل bitcion core</translation> </message> <message> - <source>Send coins to a Bitcoin address</source> - <translation>ارسل عملات الى عنوان بيتكوين</translation> + <source>Importing blocks from disk...</source> + <translation>استيراد كتل من القرص ...</translation> </message> <message> - <source>Modify configuration options for Bitcoin</source> - <translation>تعديل إعدادات bitcoin</translation> + <source>Reindexing blocks on disk...</source> + <translation>إعادة الفهرسة الكتل على القرص ...</translation> + </message> + <message> + <source>Send coins to a Bitcoin address</source> + <translation>ارسل عملات الى عنوان بيتكوين</translation> </message> <message> <source>Backup wallet to another location</source> @@ -344,7 +340,7 @@ </message> <message> <source>Encrypt the private keys that belong to your wallet</source> - <translation>تشفير المفتاح الخاص لمحفظتك</translation> + <translation>تشفير المفتاح الخاص بمحفظتك</translation> </message> <message> <source>&File</source> @@ -370,18 +366,6 @@ <source>&About Bitcoin Core</source> <translation>حول bitcoin core</translation> </message> - <message numerus="yes"> - <source>%n hour(s)</source> - <translation><numerusform>%n ساعة</numerusform><numerusform>%n ساعة</numerusform><numerusform>%n ساعة</numerusform><numerusform>%n ساعات</numerusform><numerusform>%n ساعات</numerusform><numerusform>%n ساعات</numerusform></translation> - </message> - <message numerus="yes"> - <source>%n day(s)</source> - <translation><numerusform>%n يوم</numerusform><numerusform>%n يوم</numerusform><numerusform>%n يوم</numerusform><numerusform>%n أيام</numerusform><numerusform>%n أيام</numerusform><numerusform>%n ايام</numerusform></translation> - </message> - <message numerus="yes"> - <source>%n week(s)</source> - <translation><numerusform>%n اسبوع</numerusform><numerusform>%n اسبوع</numerusform><numerusform>%n اسبوع</numerusform><numerusform>%n اسابيع</numerusform><numerusform>%n اسابيع</numerusform><numerusform>%n اسابيع</numerusform></translation> - </message> <message> <source>Error</source> <translation>خطأ</translation> @@ -430,11 +414,11 @@ <name>CoinControlDialog</name> <message> <source>Quantity:</source> - <translation>الكمية:</translation> + <translation>الكمية :</translation> </message> <message> <source>Amount:</source> - <translation>القيمة</translation> + <translation>القيمة :</translation> </message> <message> <source>Priority:</source> @@ -474,7 +458,7 @@ </message> <message> <source>Copy address</source> - <translation> انسخ العنوان</translation> + <translation> انسخ عنوان</translation> </message> <message> <source>Copy label</source> @@ -482,15 +466,15 @@ </message> <message> <source>Copy amount</source> - <translation>نسخ القيمة</translation> + <translation>نسخ الكمية</translation> </message> <message> <source>Copy transaction ID</source> - <translation>نسخ رقم المعاملة</translation> + <translation>نسخ رقم العملية</translation> </message> <message> <source>Copy quantity</source> - <translation>نسخ الكمية</translation> + <translation>نسخ الكمية </translation> </message> <message> <source>Copy fee</source> @@ -506,7 +490,7 @@ </message> <message> <source>Copy change</source> - <translation>نسخ التغييرات</translation> + <translation>نسخ التعديل</translation> </message> <message> <source>highest</source> @@ -633,10 +617,6 @@ <source>Usage:</source> <translation>المستخدم</translation> </message> - <message> - <source>UI options</source> - <translation>خيارات UI</translation> - </message> </context> <context> <name>Intro</name> @@ -803,10 +783,6 @@ <translation>المبلغ</translation> </message> <message> - <source>UNKNOWN</source> - <translation>غير معروف</translation> - </message> - <message> <source>N/A</source> <translation>غير معروف</translation> </message> @@ -941,7 +917,7 @@ </message> <message> <source>&Label:</source> - <translation>&الوصف:</translation> + <translation>&وصف :</translation> </message> <message> <source>&Message:</source> @@ -977,7 +953,7 @@ </message> <message> <source>Copy amount</source> - <translation>نسخ القيمة</translation> + <translation>نسخ الكمية</translation> </message> </context> <context> @@ -1020,7 +996,7 @@ </message> <message> <source>Message</source> - <translation>رسالة</translation> + <translation>رسالة </translation> </message> </context> <context> @@ -1035,7 +1011,7 @@ </message> <message> <source>Message</source> - <translation>رسالة</translation> + <translation>رسالة </translation> </message> <message> <source>Amount</source> @@ -1126,7 +1102,7 @@ </message> <message> <source>Copy amount</source> - <translation>نسخ القيمة</translation> + <translation>نسخ الكمية</translation> </message> <message> <source>Copy fee</source> @@ -1185,7 +1161,7 @@ </message> <message> <source>Paste address from clipboard</source> - <translation>الصق العنوان من لوحة المفاتيح</translation> + <translation>انسخ العنوان من لوحة المفاتيح</translation> </message> <message> <source>Alt+P</source> @@ -1429,10 +1405,6 @@ <translation>النوع</translation> </message> <message> - <source>Address</source> - <translation>عنوان</translation> - </message> - <message> <source>This block was not received by any other nodes and will probably not be accepted!</source> <translation>لم يتم تلقى هذه الكتلة (Block) من قبل أي العقد الأخرى وربما لن تكون مقبولة!</translation> </message> @@ -1445,6 +1417,10 @@ <translation>غير متصل</translation> </message> <message> + <source>Label</source> + <translation>وصف</translation> + </message> + <message> <source>Received with</source> <translation>استقبل مع</translation> </message> @@ -1481,10 +1457,6 @@ <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> @@ -1675,10 +1647,6 @@ <translation>تحذير: مساحة القرص منخفضة</translation> </message> <message> - <source>Error: Wallet locked, unable to create transaction!</source> - <translation>تحذير: المحفظة مغلقة , لا تستطيع تنفيذ المعاملة</translation> - </message> - <message> <source>Failed to listen on any port. Use -listen=0 if you want this.</source> <translation>فشل في الاستماع على أي منفذ. استخدام الاستماع = 0 إذا كنت تريد هذا.</translation> </message> @@ -1719,10 +1687,6 @@ <translation>تحذير</translation> </message> <message> - <source>Warning: This version is obsolete, upgrade required!</source> - <translation>تحذير : هذا الاصدار قديم , يتطلب التحديث</translation> - </message> - <message> <source>Upgrade wallet to latest format</source> <translation>تحديث المحفظة للنسخة الاخيرة</translation> </message> @@ -1747,10 +1711,6 @@ <translation>عنوان البروكسي غير صحيح : '%s'</translation> </message> <message> - <source>Invalid amount</source> - <translation>قيمة غير صحيحة</translation> - </message> - <message> <source>Insufficient funds</source> <translation>اموال غير كافية</translation> </message> @@ -1771,10 +1731,6 @@ <translation>انتهاء التحميل</translation> </message> <message> - <source>To use the %s option</source> - <translation>لاستخدام %s الخيار</translation> - </message> - <message> <source>Error</source> <translation>خطأ</translation> </message> diff --git a/src/qt/locale/bitcoin_be_BY.ts b/src/qt/locale/bitcoin_be_BY.ts index e63628396c..a94f3c6f7d 100644 --- a/src/qt/locale/bitcoin_be_BY.ts +++ b/src/qt/locale/bitcoin_be_BY.ts @@ -1,11 +1,7 @@ -<TS language="be_BY" version="2.0"> +<TS language="be_BY" version="2.1"> <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> @@ -132,10 +128,6 @@ <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> @@ -156,10 +148,6 @@ <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>Bitcoin зачыняецца дзеля завяршэння працэсса шыфравання. Памятайце, што шыфраванне гаманца цалкам абараняе вашыя сродкі ад скрадання шкоднымі праграмамі якія могуць пранікнуць у ваш камп'ютар.</translation> - </message> - <message> <source>Wallet encryption failed</source> <translation>Шыфраванне гаманца няўдалае</translation> </message> @@ -177,7 +165,7 @@ </message> <message> <source>The passphrase entered for the wallet decryption was incorrect.</source> - <translation>Уведзена пароль дзеля расшыфравання гаманца памылковы</translation> + <translation>Уведзены пароль для расшыфравання гаманца памылковы</translation> </message> <message> <source>Wallet decryption failed</source> @@ -294,10 +282,6 @@ <source>&Help</source> <translation>Дапамога</translation> </message> - <message numerus="yes"> - <source>%n active connection(s) to Bitcoin network</source> - <translation><numerusform>%n актыўнае злучэнне з Bitcoin-сецівам</numerusform><numerusform>%n актыўных злучэнняў з Bitcoin-сецівам</numerusform></translation> - </message> <message> <source>Error</source> <translation>Памылка</translation> @@ -319,18 +303,6 @@ <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> @@ -689,10 +661,6 @@ Address: %4 <translation>Тып</translation> </message> <message> - <source>Address</source> - <translation>Адрас</translation> - </message> - <message> <source>Confirmed (%1 confirmations)</source> <translation>Пацверджана (%1 пацверджанняў)</translation> </message> @@ -705,6 +673,10 @@ Address: %4 <translation>Згенеравана, але не прынята</translation> </message> <message> + <source>Label</source> + <translation>Пазнака</translation> + </message> + <message> <source>Received with</source> <translation>Прынята з</translation> </message> @@ -741,10 +713,6 @@ Address: %4 <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> @@ -955,10 +923,6 @@ Address: %4 <translation>Памылка загрузкі wallet.dat</translation> </message> <message> - <source>Invalid amount</source> - <translation>Памылковая колькасць</translation> - </message> - <message> <source>Insufficient funds</source> <translation>Недастаткова сродкаў</translation> </message> diff --git a/src/qt/locale/bitcoin_bg.ts b/src/qt/locale/bitcoin_bg.ts index 3095aa1172..5d2995802e 100644 --- a/src/qt/locale/bitcoin_bg.ts +++ b/src/qt/locale/bitcoin_bg.ts @@ -1,21 +1,33 @@ -<TS language="bg" version="2.0"> +<TS language="bg" version="2.1"> <context> <name>AddressBookPage</name> <message> - <source>Double-click to edit address or label</source> - <translation>Двоен клик за редакция на адрес или име</translation> + <source>Right-click to edit address or label</source> + <translation>Десен клик за промяна на адреса или името</translation> </message> <message> <source>Create a new address</source> <translation>Създаване на нов адрес</translation> </message> <message> + <source>&New</source> + <translation>Нов</translation> + </message> + <message> <source>Copy the currently selected address to the system clipboard</source> - <translation>Копиране на избрания адрес</translation> + <translation>Копиране на избрания адрес към клипборда</translation> + </message> + <message> + <source>&Copy</source> + <translation>Копирай</translation> + </message> + <message> + <source>C&lose</source> + <translation>Затвори</translation> </message> <message> <source>&Copy Address</source> - <translation>&Копирай</translation> + <translation>&Копирай адрес</translation> </message> <message> <source>Delete the currently selected address from the list</source> @@ -26,10 +38,26 @@ <translation>Запишете данните от текущия раздел във файл</translation> </message> <message> + <source>&Export</source> + <translation>Изнеси</translation> + </message> + <message> <source>&Delete</source> <translation>&Изтриване</translation> </message> <message> + <source>Choose the address to send coins to</source> + <translation>Изберете адрес, на който да се изпращат монети</translation> + </message> + <message> + <source>Choose the address to receive coins with</source> + <translation>Изберете адрес, на който ще получавате монети</translation> + </message> + <message> + <source>C&hoose</source> + <translation>Избери</translation> + </message> + <message> <source>Sending addresses</source> <translation>Адреси за изпращане</translation> </message> @@ -38,6 +66,14 @@ <translation>Адреси за получаване</translation> </message> <message> + <source>These are your Bitcoin addresses for sending payments. Always check the amount and the receiving address before sending coins.</source> + <translation>Това са адресите на получателите на плащания. Винаги проверявайте размера на сумата и адреса на получателя, преди да изпратите монети.</translation> + </message> + <message> + <source>These are your Bitcoin addresses for receiving payments. It is recommended to use a new receiving address for each transaction.</source> + <translation>Това са Вашите Биткойн адреси,благодарение на които ще получавате плащания.Препоръчително е да използвате нови адреси за получаване на всяка транзакция.</translation> + </message> + <message> <source>Copy &Label</source> <translation>Копирай &име</translation> </message> @@ -57,7 +93,11 @@ <source>Exporting Failed</source> <translation>Грешка при изнасянето</translation> </message> - </context> + <message> + <source>There was an error trying to save the address list to %1. Please try again.</source> + <translation>Възникна грешка при опита за запазване на списъка с адреси в %1.Моля опитайте отново.</translation> + </message> +</context> <context> <name>AddressTableModel</name> <message> @@ -76,8 +116,12 @@ <context> <name>AskPassphraseDialog</name> <message> + <source>Passphrase Dialog</source> + <translation>Диалог за паролите</translation> + </message> + <message> <source>Enter passphrase</source> - <translation>Въведи парола</translation> + <translation>Въведете текущата парола</translation> </message> <message> <source>New passphrase</source> @@ -85,11 +129,11 @@ </message> <message> <source>Repeat new passphrase</source> - <translation>Още веднъж</translation> + <translation>Въведете новата парола повторно</translation> </message> <message> <source>Encrypt wallet</source> - <translation>Криптиране на портфейла</translation> + <translation>Шифриране на портфейла</translation> </message> <message> <source>This operation needs your wallet passphrase to unlock the wallet.</source> @@ -101,35 +145,31 @@ </message> <message> <source>This operation needs your wallet passphrase to decrypt the wallet.</source> - <translation>Тази операция изисква Вашата парола за декриптиране на портфейла.</translation> + <translation>Тази операция изисква Вашата парола за дешифриране на портфейла.</translation> </message> <message> <source>Decrypt wallet</source> - <translation>Декриптиране на портфейла</translation> + <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> + <translation>Потвърдете на шифрирането на портфейла</translation> </message> <message> <source>Warning: If you encrypt your wallet and lose your passphrase, you will <b>LOSE ALL OF YOUR BITCOINS</b>!</source> - <translation>ВНИМАНИЕ: Ако защитите вашият портфейл и изгубите ключовата дума, вие ще <b>ИЗГУБИТЕ ВСИЧКИТЕ СИ БИТКОЙНОВЕ</b>!</translation> + <translation>ВНИМАНИЕ: Ако шифрирате вашият портфейл и изгубите паролата си, <b>ЩЕ ИЗГУБИТЕ ВСИЧКИТЕ СИ БИТКОИНИ</b>!</translation> </message> <message> <source>Are you sure you wish to encrypt your wallet?</source> - <translation>Наистина ли искате да шифрирате портфейла?</translation> + <translation>Наистина ли желаете да шифрирате портфейла си?</translation> </message> <message> <source>IMPORTANT: Any previous backups you have made of your wallet file should be replaced with the newly generated, encrypted wallet file. For security reasons, previous backups of the unencrypted wallet file will become useless as soon as you start using the new, encrypted wallet.</source> - <translation>ВАЖНО: Всякакви стари бекъп версии, които сте направили на вашият портфейл трябва да бъдат заменени със ново-генерирания, криптиран портфейл файл. От съображения за сигурност, предишните бекъпи на некриптираните портфейли ще станат неизползваеми веднага щом започнете да използвате новият криптиран портфейл.</translation> + <translation>ВАЖНО: Всички стари запазвания, които сте направили на Вашият портфейл трябва да замените с запазване на новополучения, шифриран портфейл. От съображения за сигурност, предишните запазвания на нешифрирани портфейли ще станат неизползваеми веднага, щом започнете да използвате новият, шифриран портфейл.</translation> </message> <message> <source>Warning: The Caps Lock key is on!</source> @@ -137,19 +177,15 @@ </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> + <translation>Портфейлът е шифриран</translation> </message> <message> <source>Wallet encryption failed</source> - <translation>Криптирането беше неуспешно</translation> + <translation>Шифрирането беше неуспешно</translation> </message> <message> <source>Wallet encryption failed due to an internal error. Your wallet was not encrypted.</source> - <translation>Криптирането на портфейла беше неуспешно поради неизвестен проблем. Портфейлът не е криптиран.</translation> + <translation>Шифрирането на портфейла беше неуспешно, поради софтуерен проблем. Портфейлът не е шифриран.</translation> </message> <message> <source>The supplied passphrases do not match.</source> @@ -157,15 +193,15 @@ </message> <message> <source>Wallet unlock failed</source> - <translation>Отключването беше неуспешно</translation> + <translation>Неуспешно отключване на портфейла</translation> </message> <message> <source>The passphrase entered for the wallet decryption was incorrect.</source> - <translation>Паролата въведена за декриптиране на портфейла е грешна.</translation> + <translation>Паролата въведена за дешифриране на портфейла е грешна.</translation> </message> <message> <source>Wallet decryption failed</source> - <translation>Декриптирането беше неуспешно</translation> + <translation>Дешифрирането на портфейла беше неуспешно</translation> </message> <message> <source>Wallet passphrase was successfully changed.</source> @@ -187,16 +223,20 @@ <translation>&Баланс</translation> </message> <message> + <source>Node</source> + <translation>Сървър</translation> + </message> + <message> <source>Show general overview of wallet</source> <translation>Обобщена информация за портфейла</translation> </message> <message> <source>&Transactions</source> - <translation>&Трансакции</translation> + <translation>&Транзакции</translation> </message> <message> <source>Browse transaction history</source> - <translation>История на трансакциите</translation> + <translation>История на транзакциите</translation> </message> <message> <source>E&xit</source> @@ -220,7 +260,7 @@ </message> <message> <source>&Encrypt Wallet...</source> - <translation>&Криптиране на портфейла...</translation> + <translation>&Шифриране на портфейла...</translation> </message> <message> <source>&Backup Wallet...</source> @@ -231,14 +271,42 @@ <translation>&Смяна на паролата...</translation> </message> <message> + <source>&Sending addresses...</source> + <translation>&Изпращане на адресите...</translation> + </message> + <message> + <source>&Receiving addresses...</source> + <translation>&Получаване на адресите...</translation> + </message> + <message> + <source>Open &URI...</source> + <translation>Отвори &URI...</translation> + </message> + <message> + <source>Bitcoin Core client</source> + <translation>Bitcoin Core клиент</translation> + </message> + <message> <source>Send coins to a Bitcoin address</source> <translation>Изпращане към Биткоин адрес</translation> </message> <message> + <source>Backup wallet to another location</source> + <translation>Запазване на портфейла на друго място</translation> + </message> + <message> <source>Change the passphrase used for wallet encryption</source> <translation>Променя паролата за портфейла</translation> </message> <message> + <source>&Debug window</source> + <translation>&Прозорец за отстраняване на грешки</translation> + </message> + <message> + <source>Open debugging and diagnostic console</source> + <translation>Отворете конзолата за диагностика и отстраняване на грешки</translation> + </message> + <message> <source>&Verify message...</source> <translation>&Проверка на съобщение...</translation> </message> @@ -255,14 +323,34 @@ <translation>&Изпращане</translation> </message> <message> + <source>&Receive</source> + <translation>&Получаване</translation> + </message> + <message> + <source>Show information about Bitcoin Core</source> + <translation>Покажете информация за Биткойн ядрото</translation> + </message> + <message> <source>&Show / Hide</source> - <translation>&Покажи / Скрий</translation> + <translation>&Показване / Скриване</translation> </message> <message> <source>Show or hide the main Window</source> <translation>Показване и скриване на основния прозорец</translation> </message> <message> + <source>Encrypt the private keys that belong to your wallet</source> + <translation>Шифроване на личните ключове,които принадлежат на портфейла Ви.</translation> + </message> + <message> + <source>Sign messages with your Bitcoin addresses to prove you own them</source> + <translation>Пишете съобщения със своя Биткойн адрес за да докажете,че е ваш.</translation> + </message> + <message> + <source>Verify messages to ensure they were signed with specified Bitcoin addresses</source> + <translation>Потвърждаване на съобщения за да се знае,че са написани с дадените Биткойн адреси.</translation> + </message> + <message> <source>&File</source> <translation>&Файл</translation> </message> @@ -278,29 +366,49 @@ <source>Tabs toolbar</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> + <source>Bitcoin Core</source> + <translation>Биткойн ядро</translation> + </message> + <message> + <source>Request payments (generates QR codes and bitcoin: URIs)</source> + <translation>Изискване на плащания(генерира QR кодове и биткойн: URIs)</translation> + </message> + <message> + <source>&About Bitcoin Core</source> + <translation>&Относно Bitcoin Core</translation> + </message> + <message> + <source>Show the list of used sending addresses and labels</source> + <translation>Показване на списъка с използвани адреси и имена</translation> + </message> + <message> + <source>Show the list of used receiving addresses and labels</source> + <translation>Покажи списък с използваните адреси и имена.</translation> </message> - <message numerus="yes"> - <source>%n hour(s)</source> - <translation><numerusform>%n час</numerusform><numerusform>%n часа</numerusform></translation> + <message> + <source>&Command-line options</source> + <translation>&Налични команди</translation> </message> - <message numerus="yes"> - <source>%n day(s)</source> - <translation><numerusform>%n ден</numerusform><numerusform>%n дни</numerusform></translation> + <message> + <source>Show the Bitcoin Core help message to get a list with possible Bitcoin command-line options</source> + <translation>Покажи помощните съобщения на Биткойн за да видиш наличните и валидни команди</translation> </message> - <message numerus="yes"> - <source>%n week(s)</source> - <translation><numerusform>%n седмица</numerusform><numerusform>%n седмици</numerusform></translation> + <message> + <source>No block source available...</source> + <translation>Липсва източник на блоковете...</translation> </message> <message> <source>%1 and %2</source> <translation>%1 и %2</translation> </message> - <message numerus="yes"> - <source>%n year(s)</source> - <translation><numerusform>%n година</numerusform><numerusform>%n години</numerusform></translation> + <message> + <source>%1 behind</source> + <translation>%1 зад</translation> + </message> + <message> + <source>Transactions after this will not yet be visible.</source> + <translation>Транзакции след това няма все още да бъдат видими.</translation> </message> <message> <source>Error</source> @@ -312,7 +420,7 @@ </message> <message> <source>Information</source> - <translation>Данни</translation> + <translation>Информация</translation> </message> <message> <source>Up to date</source> @@ -324,11 +432,11 @@ </message> <message> <source>Sent transaction</source> - <translation>Изходяща трансакция</translation> + <translation>Изходяща транзакция</translation> </message> <message> <source>Incoming transaction</source> - <translation>Входяща трансакция</translation> + <translation>Входяща транзакция</translation> </message> <message> <source>Wallet is <b>encrypted</b> and currently <b>unlocked</b></source> @@ -341,10 +449,22 @@ </context> <context> <name>ClientModel</name> - </context> + <message> + <source>Network Alert</source> + <translation>Мрежови проблем</translation> + </message> +</context> <context> <name>CoinControlDialog</name> <message> + <source>Coin Selection</source> + <translation>Избор на монета</translation> + </message> + <message> + <source>Quantity:</source> + <translation>Количество:</translation> + </message> + <message> <source>Bytes:</source> <translation>Байтове:</translation> </message> @@ -361,10 +481,38 @@ <translation>Такса:</translation> </message> <message> + <source>After Fee:</source> + <translation>След прилагане на ДДС</translation> + </message> + <message> + <source>Change:</source> + <translation>Ресто</translation> + </message> + <message> + <source>(un)select all</source> + <translation>(Пре)махни всички</translation> + </message> + <message> + <source>Tree mode</source> + <translation>Дървовиден режим</translation> + </message> + <message> + <source>List mode</source> + <translation>Списъчен режим</translation> + </message> + <message> <source>Amount</source> <translation>Сума</translation> </message> <message> + <source>Received with label</source> + <translation>Получени с име</translation> + </message> + <message> + <source>Received with address</source> + <translation>Получени с адрес</translation> + </message> + <message> <source>Date</source> <translation>Дата</translation> </message> @@ -393,6 +541,86 @@ <translation>Копирай сума</translation> </message> <message> + <source>Copy transaction ID</source> + <translation>Копирай транзакция с ID</translation> + </message> + <message> + <source>Lock unspent</source> + <translation>Заключване на неизхарченото</translation> + </message> + <message> + <source>Unlock unspent</source> + <translation>Отключване на неизхарченото</translation> + </message> + <message> + <source>Copy quantity</source> + <translation>Копиране на количеството</translation> + </message> + <message> + <source>Copy fee</source> + <translation>Копиране на данък добавена стойност</translation> + </message> + <message> + <source>Copy after fee</source> + <translation>Копиране след прилагане на данък добавена стойност</translation> + </message> + <message> + <source>Copy bytes</source> + <translation>Копиране на байтовете</translation> + </message> + <message> + <source>Copy priority</source> + <translation>Копиране на приоритет</translation> + </message> + <message> + <source>Copy change</source> + <translation>Копирай рестото</translation> + </message> + <message> + <source>highest</source> + <translation>Най-висок</translation> + </message> + <message> + <source>higher</source> + <translation>По-висок</translation> + </message> + <message> + <source>high</source> + <translation>Висок</translation> + </message> + <message> + <source>medium-high</source> + <translation>Средно-висок</translation> + </message> + <message> + <source>medium</source> + <translation>Среден</translation> + </message> + <message> + <source>low-medium</source> + <translation>Ниско-среден</translation> + </message> + <message> + <source>low</source> + <translation>Нисък</translation> + </message> + <message> + <source>lower</source> + <translation>По-нисък</translation> + </message> + <message> + <source>lowest</source> + <translation>Най-нисък</translation> + </message> + <message> + <source>(%1 locked)</source> + <translation>(%1 заключен)</translation> + </message> + <message> + <source>none</source> + <translation>нищо</translation> + </message> + <message> <source>yes</source> <translation>да</translation> </message> @@ -401,10 +629,22 @@ <translation>не</translation> </message> <message> + <source>Can vary +/- 1 byte per input.</source> + <translation>Може да варира с +-1 байт</translation> + </message> + <message> <source>(no label)</source> <translation>(без име)</translation> </message> - </context> + <message> + <source>change from %1 (%2)</source> + <translation>ресто от %1 (%2)</translation> + </message> + <message> + <source>(change)</source> + <translation>(промени)</translation> + </message> +</context> <context> <name>EditAddressDialog</name> <message> @@ -429,11 +669,11 @@ </message> <message> <source>Edit receiving address</source> - <translation>Редактиране на входящ адрес</translation> + <translation>Редактиране на адрес за получаване</translation> </message> <message> <source>Edit sending address</source> - <translation>Редактиране на изходящ адрес</translation> + <translation>Редактиране на адрес за изпращане</translation> </message> <message> <source>The entered address "%1" is already in the address book.</source> @@ -463,25 +703,49 @@ <translation>име</translation> </message> <message> + <source>Directory already exists. Add %1 if you intend to create a new directory here.</source> + <translation>Директорията вече съществува.Добавете %1 ако желаете да добавите нова директория тук.</translation> + </message> + <message> <source>Path already exists, and is not a directory.</source> <translation>Пътят вече съществува и не е папка.</translation> </message> - </context> + <message> + <source>Cannot create data directory here.</source> + <translation>Не може да се създаде директория тук.</translation> + </message> +</context> <context> <name>HelpMessageDialog</name> <message> + <source>Bitcoin Core</source> + <translation>Биткойн ядро</translation> + </message> + <message> <source>version</source> <translation>версия</translation> </message> <message> + <source>(%1-bit)</source> + <translation>(%1-битов)</translation> + </message> + <message> + <source>About Bitcoin Core</source> + <translation>Относно Bitcoin Core</translation> + </message> + <message> + <source>Command-line options</source> + <translation>Списък с команди</translation> + </message> + <message> <source>Usage:</source> <translation>Използване:</translation> </message> <message> - <source>UI options</source> - <translation>UI Опции</translation> + <source>command-line options</source> + <translation>Списък с налични команди</translation> </message> - </context> +</context> <context> <name>Intro</name> <message> @@ -489,12 +753,36 @@ <translation>Добре дошли</translation> </message> <message> + <source>Welcome to Bitcoin Core.</source> + <translation>Добре дошли в Биткойн ядрото.</translation> + </message> + <message> + <source>As this is the first time the program is launched, you can choose where Bitcoin Core will store its data.</source> + <translation>Тъй като това е първото стартиране на програмата можете да изберете къде Биткон ядрото да запази данните си.</translation> + </message> + <message> + <source>Use the default data directory</source> + <translation>Използване на директория по подразбиране</translation> + </message> + <message> + <source>Use a custom data directory:</source> + <translation>Използване на директория ръчно</translation> + </message> + <message> + <source>Bitcoin Core</source> + <translation>Биткойн ядро</translation> + </message> + <message> <source>Error</source> <translation>Грешка</translation> </message> </context> <context> <name>OpenURIDialog</name> + <message> + <source>Open URI</source> + <translation>Отваряне на URI</translation> + </message> </context> <context> <name>OptionsDialog</name> @@ -507,14 +795,42 @@ <translation>&Основни</translation> </message> <message> - <source>&Start Bitcoin on system login</source> - <translation>&Пускане на Биткоин при вход в системата</translation> + <source>Size of &database cache</source> + <translation>Размер на кеша в &базата данни</translation> + </message> + <message> + <source>MB</source> + <translation>Мегабайта</translation> + </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>Reset all client options to default.</source> + <translation>Възстановете всички настройки по подразбиране.</translation> + </message> + <message> + <source>&Reset Options</source> + <translation>&Нулирай настройките</translation> </message> <message> <source>&Network</source> <translation>&Мрежа</translation> </message> <message> + <source>W&allet</source> + <translation>По&ртфейл</translation> + </message> + <message> + <source>Expert</source> + <translation>Експерт</translation> + </message> + <message> + <source>&Spend unconfirmed change</source> + <translation>&Похарчете непотвърденото ресто</translation> + </message> + <message> <source>Automatically open the Bitcoin client port on the router. This only works when your router supports UPnP and it is enabled.</source> <translation>Автоматично отваряне на входящия Bitcoin порт. Работи само с рутери поддържащи UPnP.</translation> </message> @@ -523,6 +839,14 @@ <translation>Отваряне на входящия порт чрез &UPnP</translation> </message> <message> + <source>Connect to the Bitcoin network through a SOCKS5 proxy.</source> + <translation>Свързване с Биткойн мрежата чрез SOCKS5 прокси.</translation> + </message> + <message> + <source>&Connect through SOCKS5 proxy (default proxy):</source> + <translation>&Свързване чрез SOCKS5 прокси (прокси по подразбиране):</translation> + </message> + <message> <source>Proxy &IP:</source> <translation>Прокси & АйПи:</translation> </message> @@ -547,10 +871,6 @@ <translation>&Минимизиране в системния трей</translation> </message> <message> - <source>Minimize instead of exit the application when the window is closed. When this option is enabled, the application will be closed only after selecting Quit in the menu.</source> - <translation>При затваряне на прозореца приложението остава минимизирано. Ако изберете тази опция, приложението може да се затвори само чрез Изход в менюто.</translation> - </message> - <message> <source>M&inimize on close</source> <translation>М&инимизиране при затваряне</translation> </message> @@ -563,12 +883,8 @@ <translation>Език:</translation> </message> <message> - <source>The user interface language can be set here. This setting will take effect after restarting Bitcoin.</source> - <translation>Промяната на езика ще влезе в сила след рестартиране на Биткоин.</translation> - </message> - <message> <source>&Unit to show amounts in:</source> - <translation>Мерни единици:</translation> + <translation>Мерна единица за показваните суми:</translation> </message> <message> <source>Choose the default subdivision unit to show in the interface and when sending coins.</source> @@ -587,25 +903,57 @@ <translation>подразбиране</translation> </message> <message> + <source>none</source> + <translation>нищо</translation> + </message> + <message> + <source>Confirm options reset</source> + <translation>Потвърдете отмяната на настройките.</translation> + </message> + <message> + <source>Client restart required to activate changes.</source> + <translation>Изисква се рестартиране на клиента за активиране на извършените промени.</translation> + </message> + <message> + <source>This change would require a client restart.</source> + <translation>Тази промяна изисква рестартиране на клиента Ви.</translation> + </message> + <message> <source>The supplied proxy address is invalid.</source> - <translation>Прокси адресът е невалиден.</translation> + <translation>Текущият прокси адрес е невалиден.</translation> </message> </context> <context> <name>OverviewPage</name> <message> <source>Form</source> - <translation>Форма</translation> + <translation>Формуляр</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>Текущата информация на екрана може да не е актуална. Вашият портфейл ще се синхронизира автоматично с мрежата на Биткоин, щом поне една връзката с нея се установи; този процес все още не е приключил.</translation> </message> <message> <source>Available:</source> <translation>Налично:</translation> </message> <message> + <source>Your current spendable balance</source> + <translation>Вашата текуща сметка за изразходване</translation> + </message> + <message> <source>Pending:</source> <translation>Изчакващо:</translation> </message> <message> + <source>Immature:</source> + <translation>Неразвит:</translation> + </message> + <message> + <source>Balances</source> + <translation>Баланс</translation> + </message> + <message> <source>Total:</source> <translation>Общо:</translation> </message> @@ -614,6 +962,14 @@ <translation>Текущият ви общ баланс</translation> </message> <message> + <source>Spendable:</source> + <translation>За харчене:</translation> + </message> + <message> + <source>Recent transactions</source> + <translation>Скорошни транзакции</translation> + </message> + <message> <source>out of sync</source> <translation>несинхронизиран</translation> </message> @@ -621,13 +977,41 @@ <context> <name>PaymentServer</name> <message> + <source>Requested payment amount of %1 is too small (considered dust).</source> + <translation>Заявената сума за плащане: %1 е твърде малка (счита се за отпадък)</translation> + </message> + <message> + <source>Refund from %1</source> + <translation>Възстановяване на сума от %1</translation> + </message> + <message> + <source>Error communicating with %1: %2</source> + <translation>Грешка при комуникацията с %1: %2</translation> + </message> + <message> + <source>Bad response from server %1</source> + <translation>Възникна проблем при свързването със сървър %1</translation> + </message> + <message> <source>Payment acknowledged</source> - <translation>Плащането е приета</translation> + <translation>Плащането е прието</translation> </message> - </context> + <message> + <source>Network request error</source> + <translation>Грешка в мрежата по време на заявката</translation> + </message> +</context> <context> <name>PeerTableModel</name> - </context> + <message> + <source>User Agent</source> + <translation>Клиент на потребителя</translation> + </message> + <message> + <source>Ping Time</source> + <translation>Време за отговор</translation> + </message> +</context> <context> <name>QObject</name> <message> @@ -635,13 +1019,49 @@ <translation>Сума</translation> </message> <message> + <source>%1 h</source> + <translation>%1 час</translation> + </message> + <message> + <source>%1 m</source> + <translation>%1 минута</translation> + </message> + <message> + <source>%1 s</source> + <translation>%1 секунда</translation> + </message> + <message> + <source>None</source> + <translation>Неналичен</translation> + </message> + <message> <source>N/A</source> - <translation>N/A</translation> + <translation>Несъществуващ</translation> </message> - </context> + <message> + <source>%1 ms</source> + <translation>%1 милисекунда</translation> + </message> +</context> <context> <name>QRImageWidget</name> - </context> + <message> + <source>&Save Image...</source> + <translation>&Запиши изображение...</translation> + </message> + <message> + <source>&Copy Image</source> + <translation>&Копирай изображение</translation> + </message> + <message> + <source>Save QR Code</source> + <translation>Запази QR Код</translation> + </message> + <message> + <source>PNG Image (*.png)</source> + <translation>PNG Изображение (*.png)</translation> + </message> +</context> <context> <name>RPCConsole</name> <message> @@ -650,7 +1070,7 @@ </message> <message> <source>N/A</source> - <translation>N/A</translation> + <translation>Несъществуващ</translation> </message> <message> <source>Client version</source> @@ -661,10 +1081,26 @@ <translation>Данни</translation> </message> <message> + <source>Debug window</source> + <translation>Прозорец с грешки</translation> + </message> + <message> + <source>General</source> + <translation>Основни</translation> + </message> + <message> <source>Using OpenSSL version</source> <translation>Използване на OpenSSL версия</translation> </message> <message> + <source>Using BerkeleyDB version</source> + <translation>Използване на база данни BerkeleyDB </translation> + </message> + <message> + <source>Startup time</source> + <translation>Време за стартиране</translation> + </message> + <message> <source>Network</source> <translation>Мрежа</translation> </message> @@ -681,16 +1117,80 @@ <translation>Текущ брой блокове</translation> </message> <message> + <source>Received</source> + <translation>Получени</translation> + </message> + <message> + <source>Sent</source> + <translation>Изпратени</translation> + </message> + <message> + <source>&Peers</source> + <translation>&Пиъри</translation> + </message> + <message> + <source>Select a peer to view detailed information.</source> + <translation>Избери пиър за детайлна информация.</translation> + </message> + <message> + <source>Direction</source> + <translation>Посока</translation> + </message> + <message> + <source>Version</source> + <translation>Версия</translation> + </message> + <message> + <source>User Agent</source> + <translation>Клиент на потребителя</translation> + </message> + <message> + <source>Services</source> + <translation>Услуги</translation> + </message> + <message> + <source>Ping Time</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>&Мрежов Трафик</translation> + </message> + <message> + <source>&Clear</source> + <translation>&Изчисти</translation> + </message> + <message> <source>Totals</source> <translation>Общо:</translation> </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>Отворете Биткой дебъг лог файла от настоящата Data папка. Може да отнеме няколко секунди при по - големи лог файлове.</translation> + <source>In:</source> + <translation>Входящи:</translation> + </message> + <message> + <source>Out:</source> + <translation>Изходящи</translation> + </message> + <message> + <source>Build date</source> + <translation>Дата на създаване</translation> + </message> + <message> + <source>Debug log file</source> + <translation>Лог файл,съдържащ грешките</translation> </message> <message> <source>Clear console</source> @@ -700,18 +1200,66 @@ <source>Use up and down arrows to navigate history, and <b>Ctrl-L</b> to clear screen.</source> <translation>Използвайте стрелки надолу и нагореза разглеждане на историятаот команди и <b>Ctrl-L</b> за изчистване на конзолата.</translation> </message> + <message> + <source>Type <b>help</b> for an overview of available commands.</source> + <translation>Въведeте </b>помощ</b> за да видите наличните команди.</translation> + </message> + <message> + <source>%1 B</source> + <translation>%1 Байт</translation> + </message> + <message> + <source>%1 KB</source> + <translation>%1 Килобайт</translation> + </message> + <message> + <source>%1 MB</source> + <translation>%1 Мегабайт</translation> + </message> + <message> + <source>%1 GB</source> + <translation>%1 Гигабайт</translation> + </message> </context> <context> <name>ReceiveCoinsDialog</name> <message> + <source>&Amount:</source> + <translation>&Сума</translation> + </message> + <message> <source>&Label:</source> <translation>&Име:</translation> </message> <message> + <source>&Message:</source> + <translation>&Съобщение:</translation> + </message> + <message> + <source>Use this form to request payments. All fields are <b>optional</b>.</source> + <translation>Използвате този формуляр за заявяване на плащания. Всички полета са <b>незадължителни</b>.</translation> + </message> + <message> + <source>An optional amount to request. Leave this empty or zero to not request a specific amount.</source> + <translation>Незадължително заявяване на сума. Оставете полето празно или нулево, за да не заявите конкретна сума.</translation> + </message> + <message> + <source>Clear all fields of the form.</source> + <translation>Изчисти всички полета от формуляра.</translation> + </message> + <message> <source>Clear</source> <translation>Изчистване</translation> </message> <message> + <source>Requested payments history</source> + <translation>Изискана история на плащанията</translation> + </message> + <message> + <source>&Request payment</source> + <translation>&Изискване на плащане</translation> + </message> + <message> <source>Show</source> <translation>Показване</translation> </message> @@ -735,6 +1283,26 @@ <context> <name>ReceiveRequestDialog</name> <message> + <source>QR Code</source> + <translation>QR код</translation> + </message> + <message> + <source>Copy &URI</source> + <translation>Копиране на &URI</translation> + </message> + <message> + <source>Copy &Address</source> + <translation>&Копирай адрес</translation> + </message> + <message> + <source>&Save Image...</source> + <translation>&Запиши изображение...</translation> + </message> + <message> + <source>Request payment to %1</source> + <translation>Изискване на плащане от %1</translation> + </message> + <message> <source>Payment information</source> <translation>Данни за плащането</translation> </message> @@ -781,7 +1349,15 @@ <source>(no label)</source> <translation>(без име)</translation> </message> - </context> + <message> + <source>(no message)</source> + <translation>(без съобщение)</translation> + </message> + <message> + <source>(no amount)</source> + <translation>(липсва сума)</translation> + </message> +</context> <context> <name>SendCoinsDialog</name> <message> @@ -789,6 +1365,22 @@ <translation>Изпращане</translation> </message> <message> + <source>Coin Control Features</source> + <translation>Настройки за контрол на монетите</translation> + </message> + <message> + <source>automatically selected</source> + <translation>астоматично избран</translation> + </message> + <message> + <source>Insufficient funds!</source> + <translation>Нямате достатъчно налични пари!</translation> + </message> + <message> + <source>Quantity:</source> + <translation>Количество:</translation> + </message> + <message> <source>Bytes:</source> <translation>Байтове:</translation> </message> @@ -805,6 +1397,34 @@ <translation>Такса:</translation> </message> <message> + <source>After Fee:</source> + <translation>След прилагане на ДДС</translation> + </message> + <message> + <source>Change:</source> + <translation>Ресто</translation> + </message> + <message> + <source>If this is activated, but the change address is empty or invalid, change will be sent to a newly generated address.</source> + <translation>Ако тази опция е активирана,но адресът на промяна е празен или невалиден,промяната ще бъде изпратена на новосъздаден адрес.</translation> + </message> + <message> + <source>per kilobyte</source> + <translation>за килобайт</translation> + </message> + <message> + <source>total at least</source> + <translation>Крайна сума поне</translation> + </message> + <message> + <source>Recommended:</source> + <translation>Препоръчителна:</translation> + </message> + <message> + <source>Confirmation time:</source> + <translation>Време за потвърждение:</translation> + </message> + <message> <source>Send to multiple recipients at once</source> <translation>Изпращане към повече от един получател</translation> </message> @@ -813,6 +1433,10 @@ <translation>Добави &получател</translation> </message> <message> + <source>Clear all fields of the form.</source> + <translation>Изчисти всички полета от формуляра.</translation> + </message> + <message> <source>Clear &All</source> <translation>&Изчисти</translation> </message> @@ -833,16 +1457,40 @@ <translation>Потвърждаване</translation> </message> <message> + <source>Copy quantity</source> + <translation>Копиране на количеството</translation> + </message> + <message> <source>Copy amount</source> <translation>Копирай сума</translation> </message> <message> - <source>or</source> - <translation>или</translation> + <source>Copy fee</source> + <translation>Копиране на данък добавена стойност</translation> + </message> + <message> + <source>Copy after fee</source> + <translation>Копиране след прилагане на данък добавена стойност</translation> </message> <message> - <source>The recipient address is not valid, please recheck.</source> - <translation>Невалиден адрес на получателя.</translation> + <source>Copy bytes</source> + <translation>Копиране на байтовете</translation> + </message> + <message> + <source>Copy priority</source> + <translation>Копиране на приоритет</translation> + </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 amount to pay must be larger than 0.</source> @@ -853,20 +1501,36 @@ <translation>Сумата надвишава текущия баланс</translation> </message> <message> + <source>The total exceeds your balance when the %1 transaction fee is included.</source> + <translation>Сумата при добавяне на данък добавена стойност по %1 транзакцията надвишава сумата по вашата сметка.</translation> + </message> + <message> <source>Transaction creation failed!</source> - <translation>Грешка при създаването на трансакция!</translation> + <translation>Грешка при създаването на транзакция!</translation> + </message> + <message> + <source>Pay only the minimum fee of %1</source> + <translation>Платете минималната такса от %1</translation> + </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>Внимание:Неизвестен адрес за промяна</translation> + </message> + <message> <source>Are you sure you want to send?</source> <translation>Наистина ли искате да изпратите?</translation> </message> <message> <source>added as transaction fee</source> - <translation>добавено като такса за трансакция</translation> + <translation>добавено като такса за транзакция</translation> </message> </context> <context> @@ -888,6 +1552,10 @@ <translation>&Име:</translation> </message> <message> + <source>Choose previously used address</source> + <translation>Изберете използван преди адрес</translation> + </message> + <message> <source>This is a normal payment.</source> <translation>Това е нормално плащане.</translation> </message> @@ -918,7 +1586,15 @@ </context> <context> <name>ShutdownWindow</name> - </context> + <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> @@ -930,8 +1606,8 @@ <translation>&Подпиши</translation> </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>Можете да подпишете съобщение като доказателство, че притежавате определен адрес. Бъдете внимателни и не подписвайте съобщения, които биха разкрили лична информация без вашето съгласие.</translation> + <source>Choose previously used address</source> + <translation>Изберете използван преди адрес</translation> </message> <message> <source>Alt+A</source> @@ -978,6 +1654,10 @@ <translation>Проверете съобщение, за да сте сигурни че е подписано с определен Биткоин адрес</translation> </message> <message> + <source>Verify &Message</source> + <translation>Потвърди &съобщението</translation> + </message> + <message> <source>Click "Sign Message" to generate signature</source> <translation>Натиснете "Подписване на съобщение" за да създадете подпис</translation> </message> @@ -990,16 +1670,20 @@ <translation>Моля проверете адреса и опитайте отново.</translation> </message> <message> + <source>The entered address does not refer to a key.</source> + <translation>Въведеният адрес не може да се съпостави с валиден ключ.</translation> + </message> + <message> <source>Wallet unlock was cancelled.</source> <translation>Отключването на портфейла беше отменено.</translation> </message> <message> <source>Private key for the entered address is not available.</source> - <translation>Не е наличен частният ключ за въведеният адрес.</translation> + <translation>Не е наличен частен ключ за въведеният адрес.</translation> </message> <message> <source>Message signing failed.</source> - <translation>Подписването на съобщение бе неуспешно.</translation> + <translation>Подписването на съобщение беше неуспешно.</translation> </message> <message> <source>Message signed.</source> @@ -1029,13 +1713,25 @@ <context> <name>SplashScreen</name> <message> + <source>Bitcoin Core</source> + <translation>Биткойн ядро</translation> + </message> + <message> + <source>The Bitcoin Core developers</source> + <translation>Разработчици на Bitcoin Core</translation> + </message> + <message> <source>[testnet]</source> <translation>[testnet]</translation> </message> </context> <context> <name>TrafficGraphWidget</name> - </context> + <message> + <source>KB/s</source> + <translation>Килобайта в секунда</translation> + </message> +</context> <context> <name>TransactionDesc</name> <message> @@ -1043,6 +1739,10 @@ <translation>Подлежи на промяна до %1</translation> </message> <message> + <source>conflicted</source> + <translation>припокриващ се</translation> + </message> + <message> <source>%1/offline</source> <translation>%1/офлайн</translation> </message> @@ -1104,7 +1804,7 @@ </message> <message> <source>Net amount</source> - <translation>Сума нето</translation> + <translation>Нетна сума</translation> </message> <message> <source>Message</source> @@ -1123,8 +1823,12 @@ <translation>Търговец</translation> </message> <message> + <source>Debug information</source> + <translation>Информация за грешките</translation> + </message> + <message> <source>Transaction</source> - <translation>Трансакция</translation> + <translation>Транзакция</translation> </message> <message> <source>Amount</source> @@ -1151,11 +1855,11 @@ <name>TransactionDescDialog</name> <message> <source>Transaction details</source> - <translation>Трансакция</translation> + <translation>Транзакция</translation> </message> <message> <source>This pane shows a detailed description of the transaction</source> - <translation>Описание на трансакцията</translation> + <translation>Описание на транзакцията</translation> </message> </context> <context> @@ -1169,10 +1873,6 @@ <translation>Тип</translation> </message> <message> - <source>Address</source> - <translation>Адрес</translation> - </message> - <message> <source>Open until %1</source> <translation>Подлежи на промяна до %1</translation> </message> @@ -1189,6 +1889,14 @@ <translation>Генерирана, но отхвърлена от мрежата</translation> </message> <message> + <source>Offline</source> + <translation>Извън линия</translation> + </message> + <message> + <source>Label</source> + <translation>Име</translation> + </message> + <message> <source>Unconfirmed</source> <translation>Непотвърдено</translation> </message> @@ -1202,7 +1910,7 @@ </message> <message> <source>Received with</source> - <translation>Получени с</translation> + <translation>Получени</translation> </message> <message> <source>Received from</source> @@ -1226,19 +1934,15 @@ </message> <message> <source>Transaction status. Hover over this field to show number of confirmations.</source> - <translation>Състояние на трансакцията. Задръжте върху това поле за брой потвърждения.</translation> + <translation>Състояние на транзакцията. Задръжте върху това поле за брой потвърждения.</translation> </message> <message> <source>Date and time that the transaction was received.</source> - <translation>Дата и час на получаване.</translation> + <translation>Дата и час на получаване на транзакцията.</translation> </message> <message> <source>Type of transaction.</source> - <translation>Вид трансакция.</translation> - </message> - <message> - <source>Destination address of transaction.</source> - <translation>Получател на трансакцията.</translation> + <translation>Вид транзакция.</translation> </message> <message> <source>Amount removed from or added to balance.</source> @@ -1316,16 +2020,20 @@ <translation>Копирай сума</translation> </message> <message> + <source>Copy transaction ID</source> + <translation>Копирай транзакция с ID</translation> + </message> + <message> <source>Edit label</source> <translation>Редактирай име</translation> </message> <message> <source>Show transaction details</source> - <translation>Подробности за трансакцията</translation> + <translation>Подробности за транзакцията</translation> </message> <message> <source>Export Transaction History</source> - <translation>Изнасяне историята на трансакциите</translation> + <translation>Изнасяне историята на транзакциите</translation> </message> <message> <source>Exporting Failed</source> @@ -1336,6 +2044,10 @@ <translation>Изнасянето е успешна</translation> </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 файл (*.csv)</translation> </message> @@ -1392,6 +2104,10 @@ <context> <name>WalletView</name> <message> + <source>&Export</source> + <translation>Изнеси</translation> + </message> + <message> <source>Export the data in the current tab to a file</source> <translation>Запишете данните от текущия раздел във файл</translation> </message> @@ -1399,7 +2115,27 @@ <source>Backup Wallet</source> <translation>Запазване на портфейла</translation> </message> - </context> + <message> + <source>Wallet Data (*.dat)</source> + <translation>Информация за портфейла (*.dat)</translation> + </message> + <message> + <source>Backup Failed</source> + <translation>Неуспешно запазване на портфейла</translation> + </message> + <message> + <source>There was an error trying to save the wallet data to %1.</source> + <translation>Възникна грешка при запазването на информацията за портфейла в %1.</translation> + </message> + <message> + <source>The wallet data was successfully saved to %1.</source> + <translation>Информацията за портфейла беше успешно запазена в %1.</translation> + </message> + <message> + <source>Backup Successful</source> + <translation>Успешно запазване на портфейла</translation> + </message> +</context> <context> <name>bitcoin-core</name> <message> @@ -1411,12 +2147,24 @@ <translation>Определете директория за данните</translation> </message> <message> + <source>Connect to a node to retrieve peer addresses, and disconnect</source> + <translation>Свържете се към сървър за да можете да извлечете адресите на пиърите след което се разкачете.</translation> + </message> + <message> + <source>Specify your own public address</source> + <translation>Въведете Ваш публичен адрес</translation> + </message> + <message> <source>Use the test network</source> <translation>Използвайте тестовата мрежа</translation> </message> <message> + <source>Accept connections from outside (default: 1 if no -proxy or -connect)</source> + <translation>Приемайте връзки отвън.(по подразбиране:1 в противен случай -proxy или -connect)</translation> + </message> + <message> <source>Warning: -paytxfee is set very high! This is the transaction fee you will pay if you send a transaction.</source> - <translation>Внимание: -paytxfee има голяма стойност! Това е таксата за транзакциите, която ще платите ако направите транзакция.</translation> + <translation>Внимание: -paytxfee е с мното голяма зададена стойност! Това е транзакционната такса, която ще платите ако направите транзакция.</translation> </message> <message> <source>(default: 1)</source> @@ -1451,24 +2199,56 @@ <translation>Настройки на портфейла:</translation> </message> <message> + <source>Choose data directory on startup (default: 0)</source> + <translation>Изберете директория при стартиране на програмата.( настройка по подразбиране:0)</translation> + </message> + <message> + <source>Connect through SOCKS5 proxy</source> + <translation>Свързване чрез SOCKS5 прокси</translation> + </message> + <message> + <source>Copyright (C) 2009-%i The Bitcoin Core Developers</source> + <translation>Всички права запазени (C) 2009-%i Доставчиците на Биткойн</translation> + </message> + <message> <source>Information</source> - <translation>Данни</translation> + <translation>Информация</translation> + </message> + <message> + <source>Invalid amount for -minrelaytxfee=<amount>: '%s'</source> + <translation>Невалидна сума за -minrelaytxfee=<amount>: '%s'</translation> + </message> + <message> + <source>Invalid amount for -mintxfee=<amount>: '%s'</source> + <translation>Невалидна сума за -mintxfee=<amount>: '%s'</translation> </message> <message> <source>Send trace/debug info to console instead of debug.log file</source> <translation>Изпрати локализиращата или дебъг информацията към конзолата, вместо файлът debug.log</translation> </message> <message> + <source>Set language, for example "de_DE" (default: system locale)</source> + <translation>Задаване на език,например "de_DE" (по подразбиране: system locale)</translation> + </message> + <message> + <source>Start minimized</source> + <translation>Стартирай минимизирано</translation> + </message> + <message> + <source>This is experimental software.</source> + <translation>Това е експериментален софтуер.</translation> + </message> + <message> <source>Transaction amount too small</source> - <translation>Сумата на трансакцията е твърде малка</translation> + <translation>Сумата на транзакцията е твърде малка</translation> </message> <message> <source>Transaction amounts must be positive</source> - <translation>Сумите на трансакциите трябва да са положителни</translation> + <translation>Сумите на транзакциите трябва да са положителни</translation> </message> <message> <source>Transaction too large</source> - <translation>Трансакцията е твърде голяма</translation> + <translation>Транзакцията е твърде голяма</translation> </message> <message> <source>Username for JSON-RPC connections</source> @@ -1479,8 +2259,8 @@ <translation>Предупреждение</translation> </message> <message> - <source>Warning: This version is obsolete, upgrade required!</source> - <translation>Внимание: Използвате остаряла версия, необходимо е обновление!</translation> + <source>on startup</source> + <translation>по време на стартирането</translation> </message> <message> <source>Password for JSON-RPC connections</source> @@ -1492,7 +2272,7 @@ </message> <message> <source>Rescan the block chain for missing wallet transactions</source> - <translation>Повторно сканиране на блок-връзка за липсващи портфейлни трансакции</translation> + <translation>Повторно сканиране на блок-връзка за липсващи портфейлни транзакции</translation> </message> <message> <source>Use OpenSSL (https) for JSON-RPC connections</source> @@ -1504,7 +2284,7 @@ </message> <message> <source>Loading addresses...</source> - <translation>Зареждане на адресите...</translation> + <translation>Зареждане на адреси...</translation> </message> <message> <source>Error loading wallet.dat: Wallet corrupted</source> @@ -1519,6 +2299,14 @@ <translation>Невалиден -proxy address: '%s'</translation> </message> <message> + <source>Specify configuration file (default: %s)</source> + <translation>Назовете конфигурационен файл(по подразбиране %s)</translation> + </message> + <message> + <source>Invalid amount for -paytxfee=<amount>: '%s'</source> + <translation>Невалидна сума за -paytxfee=<amount>: '%s'</translation> + </message> + <message> <source>Insufficient funds</source> <translation>Недостатъчно средства</translation> </message> diff --git a/src/qt/locale/bitcoin_bs.ts b/src/qt/locale/bitcoin_bs.ts index 86526022fe..fc5e6d270e 100644 --- a/src/qt/locale/bitcoin_bs.ts +++ b/src/qt/locale/bitcoin_bs.ts @@ -1,4 +1,4 @@ -<TS language="bs" version="2.0"> +<TS language="bs" version="2.1"> <context> <name>AddressBookPage</name> </context> diff --git a/src/qt/locale/bitcoin_ca.ts b/src/qt/locale/bitcoin_ca.ts index 8f06ac3aa7..37d1dfc9eb 100644 --- a/src/qt/locale/bitcoin_ca.ts +++ b/src/qt/locale/bitcoin_ca.ts @@ -1,9 +1,9 @@ -<TS language="ca" version="2.0"> +<TS language="ca" version="2.1"> <context> <name>AddressBookPage</name> <message> - <source>Double-click to edit address or label</source> - <translation>Feu doble clic per editar l'adreça o l'etiqueta</translation> + <source>Right-click to edit address or label</source> + <translation>Feu clic dret per a editar l'adreça o l'etiqueta</translation> </message> <message> <source>Create a new address</source> @@ -156,10 +156,6 @@ <translation>Canvia la contrasenya</translation> </message> <message> - <source>Enter the old and new passphrase to the wallet.</source> - <translation>Introduïu tant la contrasenya antiga com la nova del moneder.</translation> - </message> - <message> <source>Confirm wallet encryption</source> <translation>Confirma l'encriptació del moneder</translation> </message> @@ -188,10 +184,6 @@ <translation>Introduïu la contrasenya nova al moneder.<br/>Utilitzeu una contrasenya de <b>deu o més caràcters aleatoris</b>, o <b>vuit o més paraules</b>.</translation> </message> <message> - <source>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>Bitcoin es tancarà ara per acabar el procés d'encriptació. Recordeu que encriptar el moneder no protegeix completament els bitcoins de ser robats per programari maliciós instal·lat a l'ordinador.</translation> - </message> - <message> <source>Wallet encryption failed</source> <translation>L'encriptació del moneder ha fallat</translation> </message> @@ -311,10 +303,6 @@ <translation>Envia monedes a una adreça Bitcoin</translation> </message> <message> - <source>Modify configuration options for Bitcoin</source> - <translation>Modifica les opcions de configuració per bitcoin</translation> - </message> - <message> <source>Backup wallet to another location</source> <translation>Realitza una còpia de seguretat del moneder a una altra ubicació</translation> </message> @@ -491,14 +479,6 @@ <translation>Transacció entrant</translation> </message> <message> - <source>Date: %1 -Amount: %2 -Type: %3 -Address: %4 -</source> - <translation>Data: %1\nImport: %2\n Tipus: %3\n Adreça: %4\n</translation> - </message> - <message> <source>Wallet is <b>encrypted</b> and currently <b>unlocked</b></source> <translation>El moneder està <b>encriptat</b> i actualment <b>desbloquejat</b></translation> </message> @@ -517,6 +497,10 @@ Address: %4 <context> <name>CoinControlDialog</name> <message> + <source>Coin Selection</source> + <translation>Selecció de moneda</translation> + </message> + <message> <source>Quantity:</source> <translation>Quantitat:</translation> </message> @@ -534,7 +518,7 @@ Address: %4 </message> <message> <source>Fee:</source> - <translation>Quota:</translation> + <translation>Comissió</translation> </message> <message> <source>Dust:</source> @@ -542,7 +526,7 @@ Address: %4 </message> <message> <source>After Fee:</source> - <translation>Quota posterior:</translation> + <translation>Comissió posterior:</translation> </message> <message> <source>Change:</source> @@ -562,7 +546,15 @@ Address: %4 </message> <message> <source>Amount</source> - <translation>Quantitat</translation> + <translation>Import</translation> + </message> + <message> + <source>Received with label</source> + <translation>Rebut amb l'etiqueta</translation> + </message> + <message> + <source>Received with address</source> + <translation>Rebut amb l'adreça</translation> </message> <message> <source>Date</source> @@ -689,12 +681,8 @@ Address: %4 <translation>no</translation> </message> <message> - <source>This label turns red, if the transaction size is greater than 1000 bytes.</source> - <translation>Aquesta etiqueta es posa de color vermell si la mida de la transacció és més gran de 1000 bytes.</translation> - </message> - <message> <source>This means a fee of at least %1 per kB is required.</source> - <translation>Això comporta una comissi d'almenys %1 per kB.</translation> + <translation>Això comporta una comissió d'almenys %1 per kB.</translation> </message> <message> <source>Can vary +/- 1 byte per input.</source> @@ -705,14 +693,6 @@ Address: %4 <translation>Les transaccions amb una major prioritat són més propenses a ser incloses en un bloc.</translation> </message> <message> - <source>This label turns red, if the priority is smaller than "medium".</source> - <translation>Aquesta etiqueta es torna vermella si la prioritat és menor que «mitjana».</translation> - </message> - <message> - <source>This label turns red, if any recipient receives an amount smaller than %1.</source> - <translation>Aquesta etiqueta es torna vermella si qualsevol destinatari rep un import inferior a %1.</translation> - </message> - <message> <source>(no label)</source> <translation>(sense etiqueta)</translation> </message> @@ -729,7 +709,7 @@ Address: %4 <name>EditAddressDialog</name> <message> <source>Edit Address</source> - <translation>Editar Adreça</translation> + <translation>Edita l'adreça</translation> </message> <message> <source>&Label</source> @@ -833,30 +813,6 @@ Address: %4 <source>command-line options</source> <translation>Opcions de la línia d'ordres</translation> </message> - <message> - <source>UI options</source> - <translation>Opcions de IU</translation> - </message> - <message> - <source>Set language, for example "de_DE" (default: system locale)</source> - <translation>Defineix un idioma, per exemple "de_DE" (per defecte: preferències locals de sistema)</translation> - </message> - <message> - <source>Start minimized</source> - <translation>Inicia minimitzat</translation> - </message> - <message> - <source>Set SSL root certificates for payment request (default: -system-)</source> - <translation>Defineix certificats arrel SSL per a la sol·licitud de pagament (per defecte: -sistema-)</translation> - </message> - <message> - <source>Show splash screen on startup (default: 1)</source> - <translation>Mostra la finestra de benvinguda a l'inici (per defecte: 1)</translation> - </message> - <message> - <source>Choose data directory on startup (default: 0)</source> - <translation>Tria el directori de dades a l'inici (per defecte: 0)</translation> - </message> </context> <context> <name>Intro</name> @@ -896,7 +852,15 @@ Address: %4 <source>Error</source> <translation>Error</translation> </message> - </context> + <message numerus="yes"> + <source>%n GB of free space available</source> + <translation><numerusform>%n GB d'espai lliure disponible</numerusform><numerusform>%n GB d'espai lliure disponible</numerusform></translation> + </message> + <message numerus="yes"> + <source>(of %n GB needed)</source> + <translation><numerusform>(de %n GB necessari)</numerusform><numerusform>(de %n GB necessaris)</numerusform></translation> + </message> +</context> <context> <name>OpenURIDialog</name> <message> @@ -931,14 +895,6 @@ Address: %4 <translation>&Principal</translation> </message> <message> - <source>Automatically start Bitcoin after logging in to the system.</source> - <translation>Inicia automàticament el Bitcoin després de l'inici de sessió del sistema.</translation> - </message> - <message> - <source>&Start Bitcoin on system login</source> - <translation>&Inicia el Bitcoin a l'inici de sessió del sistema.</translation> - </message> - <message> <source>Size of &database cache</source> <translation>Mida de la memòria cau de la base de &dades</translation> </message> @@ -1019,6 +975,14 @@ Address: %4 <translation>Port obert amb &UPnP</translation> </message> <message> + <source>Connect to the Bitcoin network through a SOCKS5 proxy.</source> + <translation>Connecta a la xarxa Bitcoin a través d'un proxy SOCKS5.</translation> + </message> + <message> + <source>&Connect through SOCKS5 proxy (default proxy):</source> + <translation>&Connecta a través d'un proxy SOCKS5 (proxy per defecte):</translation> + </message> + <message> <source>Proxy &IP:</source> <translation>&IP del proxy:</translation> </message> @@ -1043,10 +1007,6 @@ Address: %4 <translation>&Minimitza a la barra d'aplicacions en comptes de la barra de tasques</translation> </message> <message> - <source>Minimize instead of exit the application when the window is closed. When this option is enabled, the application will be closed only after selecting Quit in the menu.</source> - <translation>Minimitza en comptes de sortir de la aplicació al tancar la finestra. Quan aquesta opció està activa, la aplicació només es tancarà al seleccionar Sortir al menú.</translation> - </message> - <message> <source>M&inimize on close</source> <translation>M&inimitza en tancar</translation> </message> @@ -1059,10 +1019,6 @@ Address: %4 <translation>&Llengua de la interfície d'usuari:</translation> </message> <message> - <source>The user interface language can be set here. This setting will take effect after restarting Bitcoin.</source> - <translation>Aquí podeu definir la llengua de l'aplicació. Aquesta configuració tindrà efecte una vegada es reiniciï Bitcoin.</translation> - </message> - <message> <source>&Unit to show amounts in:</source> <translation>&Unitats per mostrar els imports en:</translation> </message> @@ -1099,10 +1055,6 @@ Address: %4 <translation>Cal reiniciar el client per activar els canvis.</translation> </message> <message> - <source>Client will be shutdown, do you want to proceed?</source> - <translation>S'aturarà el client, voleu procedir?</translation> - </message> - <message> <source>This change would require a client restart.</source> <translation>Amb aquest canvi cal un reinici del client.</translation> </message> @@ -1150,6 +1102,10 @@ Address: %4 <translation>Balanç minat que encara no ha madurat</translation> </message> <message> + <source>Balances</source> + <translation>Balances</translation> + </message> + <message> <source>Total:</source> <translation>Total:</translation> </message> @@ -1162,6 +1118,14 @@ Address: %4 <translation>El vostre balanç actual en adreces de només lectura</translation> </message> <message> + <source>Spendable:</source> + <translation>Que es pot gastar:</translation> + </message> + <message> + <source>Recent transactions</source> + <translation>Transaccions recents</translation> + </message> + <message> <source>Unconfirmed transactions to watch-only addresses</source> <translation>Transaccions sense confirmar a adreces de només lectura</translation> </message> @@ -1197,10 +1161,6 @@ Address: %4 <translation>La xarxa de la sol·licitud de pagament no coincideix amb la xarxa del client.</translation> </message> <message> - <source>Payment request has expired.</source> - <translation>La sol·licitud de pagament ha caducat.</translation> - </message> - <message> <source>Payment request is not initialized.</source> <translation>La sol·licitud de pagament no està inicialitzada.</translation> </message> @@ -1241,6 +1201,14 @@ Address: %4 <translation>Reemborsament de %1</translation> </message> <message> + <source>Payment request %1 is too large (%2 bytes, allowed %3 bytes).</source> + <translation>La sol·licitud de pagament %1 és massa gran (%2 bytes, permès %3 bytes).</translation> + </message> + <message> + <source>Payment request DoS protection</source> + <translation>Protecció de DoS per a la sol·licitud de pagament</translation> + </message> + <message> <source>Error communicating with %1: %2</source> <translation>Error en comunicar amb %1: %2</translation> </message> @@ -1268,10 +1236,6 @@ Address: %4 <translation>Agent d'usuari</translation> </message> <message> - <source>Address/Hostname</source> - <translation>Adreça / nom de l'ordinador</translation> - </message> - <message> <source>Ping Time</source> <translation>Temps de ping</translation> </message> @@ -1280,7 +1244,7 @@ Address: %4 <name>QObject</name> <message> <source>Amount</source> - <translation>Quantitat</translation> + <translation>Import</translation> </message> <message> <source>Enter a Bitcoin address (e.g. %1)</source> @@ -1303,14 +1267,6 @@ Address: %4 <translation>%1 s</translation> </message> <message> - <source>NETWORK</source> - <translation>XARXA</translation> - </message> - <message> - <source>UNKNOWN</source> - <translation>DESCONEGUT</translation> - </message> - <message> <source>None</source> <translation>Cap</translation> </message> @@ -1509,18 +1465,10 @@ Address: %4 <translation>Fitxer de registre de depuració</translation> </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>Obre el fitxer de registre de depuració de Bitcoin del directori de dades actual. Això pot trigar uns quants segons per a fitxers de registre grans.</translation> - </message> - <message> <source>Clear console</source> <translation>Neteja la consola</translation> </message> <message> - <source>Welcome to the Bitcoin RPC console.</source> - <translation>Us donem la benvinguda a la consola RPC de Bitcoin</translation> - </message> - <message> <source>Use up and down arrows to navigate history, and <b>Ctrl-L</b> to clear screen.</source> <translation>Utilitza les fletxes d'amunt i avall per navegar per l'historial, i <b>Ctrl-L<\b> per netejar la pantalla.</translation> </message> @@ -1782,7 +1730,7 @@ Address: %4 </message> <message> <source>After Fee:</source> - <translation>Quota posterior:</translation> + <translation>Comissió posterior:</translation> </message> <message> <source>Change:</source> @@ -1797,6 +1745,70 @@ Address: %4 <translation>Personalitza l'adreça de canvi</translation> </message> <message> + <source>Transaction Fee:</source> + <translation>Comissió de transacció</translation> + </message> + <message> + <source>Choose...</source> + <translation>Tria...</translation> + </message> + <message> + <source>collapse fee-settings</source> + <translation>redueix els paràmetres de comissió</translation> + </message> + <message> + <source>per kilobyte</source> + <translation>per kilobyte</translation> + </message> + <message> + <source>If the custom fee is set to 1000 satoshis and the transaction is only 250 bytes, then "per kilobyte" only pays 250 satoshis in fee, while "total at least" pays 1000 satoshis. For transactions bigger than a kilobyte both pay by kilobyte.</source> + <translation>Si la comissió personalitzada es defineix a 1000 satoshis i la transacció és de només 250 bytes, llavors «per kilobyte» només es paguen 250 satoshis en una comissió, mentre que amb la de «total com a mínim» es pagarien 1000 satoshis. Per a transaccions superiors al kilobyte, en tots dos casos es paga per kilobyte.</translation> + </message> + <message> + <source>total at least</source> + <translation>total com a mínim</translation> + </message> + <message> + <source>Paying only the minimum fee is just fine as long as there is less transaction volume than space in the blocks. But be aware that this can end up in a never confirming transaction once there is more demand for bitcoin transactions than the network can process.</source> + <translation>No hi ha cap problema en pagar només la comissió mínima sempre que hi hagi menys volum de transacció que espai en els blocs. Però tingueu present que això pot acabar en una transacció que mai es confirmi una vegada hi hagi més demanda de transaccions de bitcoins que la xarxa pugui processar.</translation> + </message> + <message> + <source>(read the tooltip)</source> + <translation>(llegiu l'indicador de funció)</translation> + </message> + <message> + <source>Recommended:</source> + <translation>Recomanada:</translation> + </message> + <message> + <source>Custom:</source> + <translation>Personalitzada:</translation> + </message> + <message> + <source>(Smart fee not initialized yet. This usually takes a few blocks...)</source> + <translation>(No s'ha inicialitzat encara la comissió intel·ligent. Normalment pren uns pocs blocs...)</translation> + </message> + <message> + <source>Confirmation time:</source> + <translation>Temps de confirmació:</translation> + </message> + <message> + <source>normal</source> + <translation>normal</translation> + </message> + <message> + <source>fast</source> + <translation>ràpid</translation> + </message> + <message> + <source>Send as zero-fee transaction if possible</source> + <translation>Envia com a transacció de comissió zero si és possible</translation> + </message> + <message> + <source>(confirmation may take longer)</source> + <translation>(la confirmació pot trigar més temps)</translation> + </message> + <message> <source>Send to multiple recipients at once</source> <translation>Envia a múltiples destinataris al mateix temps</translation> </message> @@ -1846,7 +1858,7 @@ Address: %4 </message> <message> <source>Copy fee</source> - <translation>Copia la comissi</translation> + <translation>Copia la comissió</translation> </message> <message> <source>Copy after fee</source> @@ -1873,10 +1885,6 @@ Address: %4 <translation>o</translation> </message> <message> - <source>The recipient address is not valid, please recheck.</source> - <translation>L'adreça de destinatari no és vàlida, si us plau comprovi-la.</translation> - </message> - <message> <source>The amount to pay must be larger than 0.</source> <translation>L'import a pagar ha de ser major que 0.</translation> </message> @@ -1886,11 +1894,7 @@ Address: %4 </message> <message> <source>The total exceeds your balance when the %1 transaction fee is included.</source> - <translation>El total excedeix el teu balanç quan s'afegeix la comisió a la transacció %1.</translation> - </message> - <message> - <source>Duplicate address found, can only send to each address once per send operation.</source> - <translation>S'ha trobat una adreça duplicada, tan sols es pot enviar a cada adreça un cop per ordre de enviament.</translation> + <translation>El total excedeix el teu balanç quan s'afegeix la comissió a la transacció %1.</translation> </message> <message> <source>Transaction creation failed!</source> @@ -1901,6 +1905,10 @@ Address: %4 <translation>S'ha rebutjat la transacció! Això pot passar si alguna de les monedes del vostre moneder ja s'han gastat; per exemple, si heu fet servir una còpia de seguretat del fitxer wallet.dat i s'haguessin gastat monedes de la còpia però sense marcar-les-hi com a gastades.</translation> </message> <message> + <source>Pay only the minimum fee of %1</source> + <translation>Paga només la comissió mínima de %1</translation> + </message> + <message> <source>Warning: Invalid Bitcoin address</source> <translation>Avís: adreça Bitcoin no vàlida</translation> </message> @@ -1976,10 +1984,6 @@ Address: %4 <translation>Missatge:</translation> </message> <message> - <source>This is a verified payment request.</source> - <translation>Aquesta és una sol·licitud de pagament verificada.</translation> - </message> - <message> <source>Enter a label for this address to add it to the list of used addresses</source> <translation>Introduïu una etiqueta per a aquesta adreça per afegir-la a la llista d'adreces utilitzades</translation> </message> @@ -1988,10 +1992,6 @@ Address: %4 <translation>Un missatge que s'ha adjuntat al bitcoin: URI que s'emmagatzemarà amb la transacció per a la vostra referència. Nota: el missatge no s'enviarà a través de la xarxa Bitcoin.</translation> </message> <message> - <source>This is an unverified payment request.</source> - <translation>Aquesta és una sol·licitud de pagament no verificada.</translation> - </message> - <message> <source>Pay To:</source> <translation>Paga a:</translation> </message> @@ -2022,10 +2022,6 @@ Address: %4 <translation>&Signa el missatge</translation> </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>Podeu signar missatges amb la vostra adreça per provar que són vostres. Aneu amb compte no signar qualsevol cosa, ja que els atacs de pesca electrònica (phishing) poden provar de confondre-us perquè els signeu amb la vostra identitat. Només signeu als documents completament detallats amb què hi esteu d'acord.</translation> - </message> - <message> <source>The Bitcoin address to sign the message with</source> <translation>L'adreça Bitcoin amb què signar el missatge</translation> </message> @@ -2078,10 +2074,6 @@ Address: %4 <translation>&Verifica el missatge</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>Introdueixi l'adreça signant, missatge (assegura't que copies salts de línia, espais, tabuladors, etc excactament tot el text) i la signatura a sota per verificar el missatge. Per evitar ser enganyat per un atac home-entre-mig, vés amb compte de no llegir més en la signatura del que hi ha al missatge signat mateix.</translation> - </message> - <message> <source>The Bitcoin address the message was signed with</source> <translation>L'adreça Bitcoin amb què va ser signat el missatge</translation> </message> @@ -2300,7 +2292,7 @@ Address: %4 </message> <message> <source>Amount</source> - <translation>Quantitat</translation> + <translation>Import</translation> </message> <message> <source>true</source> @@ -2345,10 +2337,6 @@ Address: %4 <translation>Tipus</translation> </message> <message> - <source>Address</source> - <translation>Adreça</translation> - </message> - <message> <source>Immature (%1 confirmations, will be available after %2)</source> <translation>Immadur (%1 confirmacions, serà disponible després de %2)</translation> </message> @@ -2377,6 +2365,10 @@ Address: %4 <translation>Fora de línia</translation> </message> <message> + <source>Label</source> + <translation>Etiqueta</translation> + </message> + <message> <source>Unconfirmed</source> <translation>Sense confirmar</translation> </message> @@ -2429,8 +2421,8 @@ Address: %4 <translation>Tipus de transacció.</translation> </message> <message> - <source>Destination address of transaction.</source> - <translation>Adreça del destinatari de la transacció.</translation> + <source>Whether or not a watch-only address is involved in this transaction.</source> + <translation>Si està implicada o no una adreça només de lectura en la transacció.</translation> </message> <message> <source>Amount removed from or added to balance.</source> @@ -2524,6 +2516,10 @@ Address: %4 <translation>Exporta l'historial de transacció</translation> </message> <message> + <source>Watch-only</source> + <translation>Només de lectura</translation> + </message> + <message> <source>Exporting Failed</source> <translation>L'exportació ha fallat</translation> </message> @@ -2667,29 +2663,6 @@ Address: %4 <translation>Accepta connexions de fora (per defecte: 1 si no -proxy o -connect)</translation> </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>%s, heu de establir una contrasenya RPC al fitxer de configuració: %s -Es recomana que useu la següent contrasenya aleatòria: -rpcuser=bitcoinrpc -rpcpassword=%s -(no necesiteu recordar aquesta contrasenya) -El nom d'usuari i la contrasenya NO HAN de ser els mateixos. -Si el fitxer no existeix, crea'l amb els permisos de fitxer de només lectura per al propietari. -També es recomana establir la notificació d'alertes i així sereu notificat de les incidències; -per exemple: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo.com -</translation> - </message> - <message> <source>Bind to given address and always listen on it. Use [host]:port notation for IPv6</source> <translation>Vincula a una adreça específica i sempre escolta-hi. Utilitza la notació [host]:port per IPv6</translation> </message> @@ -2698,16 +2671,12 @@ per exemple: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo.com <translation>Elimina totes les transaccions del moneder i només recupera aquelles de la cadena de blocs a través de -rescan a l'inici</translation> </message> <message> - <source>Enter regression test mode, which uses a special chain in which blocks can be solved instantly.</source> - <translation>Entra en el mode de proves de regressió, que utilitza una cadena especial en què els blocs poden resoldre's al moment.</translation> + <source>Distributed under the MIT software license, see the accompanying file COPYING or <http://www.opensource.org/licenses/mit-license.php>.</source> + <translation>Distribuït sota llicència de programari MIT. Vegeu el fitxer acompanyant COPYING o <http://www.opensource.org/licenses/mit-license.php>.</translation> </message> <message> - <source>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>Error: La transacció ha estat rebutjada. Això pot passar si alguna de les monedes del teu moneder ja s'han gastat, com si haguesis usat una copia de l'arxiu wallet.dat i s'haguessin gastat monedes de la copia però sense marcar com gastades en aquest.</translation> - </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>Error: Aquesta transacció requereix una comissió d'almenys %s degut al seu import, complexitat o per l'ús de fons recentment rebuts!</translation> + <source>Enter regression test mode, which uses a special chain in which blocks can be solved instantly.</source> + <translation>Entra en el mode de proves de regressió, que utilitza una cadena especial en què els blocs poden resoldre's al moment.</translation> </message> <message> <source>Execute command when a wallet transaction changes (%s in cmd is replaced by TxID)</source> @@ -2750,6 +2719,10 @@ per exemple: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo.com <translation>Avís: el fitxer wallet.dat és corrupte, dades rescatades! L'arxiu wallet.dat original ha estat desat com wallet.{estampa_temporal}.bak al directori %s; si el teu balanç o transaccions son incorrectes hauries de restaurar-lo de un backup.</translation> </message> <message> + <source>Whitelist peers connecting from the given netmask or IP address. Can be specified multiple times.</source> + <translation>Afegeix a la llista blanca els iguals que es connecten de la màscara de xarxa o adreça IP donada. Es pot especificar moltes vegades.</translation> + </message> + <message> <source>(default: 1)</source> <translation>(per defecte: 1)</translation> </message> @@ -2782,10 +2755,6 @@ per exemple: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo.com <translation>Opcions de depuració/proves:</translation> </message> <message> - <source>Discover own IP address (default: 1 when listening and no -externalip)</source> - <translation>Descobreix la pròpia adreça IP (per defecte: 1 quan escoltant i no -externalip)</translation> - </message> - <message> <source>Do not load the wallet and disable wallet RPC calls</source> <translation>No carreguis el moneder i inhabilita les crides RPC del moneder</translation> </message> @@ -2810,12 +2779,12 @@ per exemple: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo.com <translation>Error en obrir la base de dades de blocs</translation> </message> <message> - <source>Error: Disk space is low!</source> - <translation>Error: Espai al disc baix!</translation> + <source>Error: A fatal internal error occured, see debug.log for details</source> + <translation>Error: s'ha produït un error intern fatal. Consulteu debug.log per a més detalls</translation> </message> <message> - <source>Error: Wallet locked, unable to create transaction!</source> - <translation>Error: El moneder està bloquejat, no és possible crear la transacció!</translation> + <source>Error: Disk space is low!</source> + <translation>Error: Espai al disc baix!</translation> </message> <message> <source>Failed to listen on any port. Use -listen=0 if you want this.</source> @@ -2842,8 +2811,8 @@ per exemple: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo.com <translation>No hi ha suficient descriptors de fitxers disponibles.</translation> </message> <message> - <source>Rebuild block chain index from current blk000??.dat files</source> - <translation>Reconstrueix l'índex de la cadena de blocs dels fitxers actuals blk000??.dat</translation> + <source>Only connect to nodes in network <net> (ipv4, ipv6 or onion)</source> + <translation>Només connecta als nodes de la xarxa <net> (ipv4, ipv6 o onion)</translation> </message> <message> <source>Set database cache size in megabytes (%d to %d, default: %d)</source> @@ -2862,6 +2831,10 @@ per exemple: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo.com <translation>Això es així per a eines de proves de regressió per al desenvolupament d'aplicacions.</translation> </message> <message> + <source>Use UPnP to map the listening port (default: %u)</source> + <translation>Utilitza UPnP per a mapejar el port d'escolta (per defecte: %u)</translation> + </message> + <message> <source>Verifying blocks...</source> <translation>S'estan verificant els blocs...</translation> </message> @@ -2926,6 +2899,18 @@ per exemple: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo.com <translation>Comissions (en BTC/Kb) inferiors a això es consideren de comissió zero per a la creació de la transacció (per defecte: %s)</translation> </message> <message> + <source>If paytxfee is not set, include enough fee so transactions begin confirmation on average within n blocks (default: %u)</source> + <translation>Si no s'especifica una paytxfee (comissió de transacció de pagament), inclogueu suficient comissió per tal que les transaccions comencin a confirmar-se en una mitja de n blocs (per defecte: %u)</translation> + </message> + <message> + <source>Invalid amount for -maxtxfee=<amount>: '%s' (must be at least the minrelay fee of %s to prevent stuck transactions)</source> + <translation>Import no vàlid per a -maxtxfee=<amount>: '%s' (cal que sigui com a mínim la comissió de minrelay de %s per evitar que les comissions s'encallin)</translation> + </message> + <message> + <source>Maximum size of data in data carrier transactions we relay and mine (default: %u)</source> + <translation>Mida màxima de les dades en les transaccions de l'operador en què confiem i en les meves (per defecte: %u)</translation> + </message> + <message> <source>Query for peer addresses via DNS lookup, if low on addresses (default: 1 unless -connect)</source> <translation>Consulta a adreces d'iguals a través de DNS, si es troba baix en adreces (per defecte: 1 a menys que -connect)</translation> </message> @@ -2934,10 +2919,41 @@ per exemple: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo.com <translation>Defineix la mida màxima de transaccions d'alta prioritat / baixa comissió en bytes (per defecte: %d)</translation> </message> <message> + <source>Set the number of threads for coin generation if enabled (-1 = all cores, default: %d)</source> + <translation>Defineix el nombre de fils per a la generació de moneda si està habilitat (-1 = tots els nuclis, per defecte: %d)</translation> + </message> + <message> <source>This product includes software developed by the OpenSSL Project for use in the OpenSSL Toolkit <https://www.openssl.org/> and cryptographic software written by Eric Young and UPnP software written by Thomas Bernard.</source> <translation>Aquest producte inclou programari desenvolupat pel projecte OpenSSL per a ús a l'OpenSSL Toolkit <https://www.openssl.org/> i programari criptogràfic escrit per Eric Young i programari UPnP escrit per Thomas Bernard.</translation> </message> <message> + <source>To use bitcoind, or the -server option to bitcoin-qt, you must set an 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>Per utilitzar bitcoind, o l'opció de serviddor de bitcoin-qt, heu de definir una rpcpassword en el fitxer de configuració: +%s +Es recomana que utilitzeu la contrasenya aleatòria següent: +rpcuser=bitcoinrpc +rpcpassword=%s +(no cal que recordeu la contrasenya) +El nom d'usuari i la contrasenya NO han de ser els mateixos. +Si el fitxer no existeix, creeu-ne un amb permisos de lectura només per al seu propietari. +Es recomana definir alertnotify per tal de ser notificat de qualsevol problema; +per exemple: alertnotify=echo %%s | mail -s "Avís de Bitcoin" admin@foo.com</translation> + </message> + <message> + <source>Warning: -maxtxfee is set very high! Fees this large could be paid on a single transaction.</source> + <translation>Avís: s'ha especificat un -maxtxfee molt alt! Comissions tan grans podrien pagar-se en una única transacció.</translation> + </message> + <message> <source>Warning: Please check that your computer's date and time are correct! If your clock is wrong Bitcoin Core will not work properly.</source> <translation>Avís: comproveu que la data i hora del vostre ordinador siguin correctes! Si el vostre rellotge no és correcte, el Bitcoin Core no funcionarà correctament.</translation> </message> @@ -2946,10 +2962,18 @@ per exemple: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo.com <translation>Els iguals en la llista blanca no poden ser bandejats per DoS i es transmetran sempre llurs transaccions, fins i tot si ja són a la mempool. Això és útil, p. ex., per a una passarel·la</translation> </message> <message> + <source>Accept public REST requests (default: %u)</source> + <translation>Accepta sol·licituds REST públiques (per defecte: %u)</translation> + </message> + <message> <source>Cannot resolve -whitebind address: '%s'</source> <translation>No es pot resoldre l'adreça -whitebind: «%s»</translation> </message> <message> + <source>Choose data directory on startup (default: 0)</source> + <translation>Tria el directori de dades a l'inici (per defecte: 0)</translation> + </message> + <message> <source>Connect through SOCKS5 proxy</source> <translation>Connecta a través del proxy SOCKS5</translation> </message> @@ -2966,6 +2990,10 @@ per exemple: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo.com <translation>Error en carregar wallet.dat: el moneder requereix una versió més nova del Bitcoin core</translation> </message> <message> + <source>Error reading from database, shutting down.</source> + <translation>Error en llegir la base de dades, tancant.</translation> + </message> + <message> <source>Error: Unsupported argument -tor found, use -onion.</source> <translation>Error: s'ha trobat un argument -tor no acceptat. Feu servir -onion.</translation> </message> @@ -2982,6 +3010,10 @@ per exemple: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo.com <translation>Ha fallat la inicialització de la comprovació de validesa. El Bitcoin Core s'està aturant.</translation> </message> <message> + <source>Invalid amount for -maxtxfee=<amount>: '%s'</source> + <translation>Import no vàlid per a -maxtxfee=<amount>: '%s'</translation> + </message> + <message> <source>Invalid amount for -minrelaytxfee=<amount>: '%s'</source> <translation>Import no vàlid per a -minrelaytxfee=<amount>: «%s»</translation> </message> @@ -2998,8 +3030,8 @@ per exemple: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo.com <translation>S'ha especificat una màscara de xarxa no vàlida a -whitelist: «%s»</translation> </message> <message> - <source>Keep at most <n> unconnectable blocks in memory (default: %u)</source> - <translation>Manté com a màxim <n> blocs no connectables en memòria (per defecte: %u)</translation> + <source>Keep at most <n> unconnectable transactions in memory (default: %u)</source> + <translation>Manté com a màxim <n> transaccions no connectables en memòria (per defecte: %u)</translation> </message> <message> <source>Need to specify a port with -whitebind: '%s'</source> @@ -3010,10 +3042,6 @@ per exemple: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo.com <translation>Opcions de transmissió del node:</translation> </message> <message> - <source>Print block on startup, if found in block index</source> - <translation>Imprimeix el block a l'inici, si es troba l'índex de blocs</translation> - </message> - <message> <source>RPC SSL options: (see the Bitcoin Wiki for SSL setup instructions)</source> <translation>Opcions RPC SSL: (veieu el wiki del Bitcoin per a instruccions de configuració de l'SSL)</translation> </message> @@ -3022,6 +3050,10 @@ per exemple: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo.com <translation>Opcions del servidor RPC:</translation> </message> <message> + <source>RPC support for HTTP persistent connections (default: %d)</source> + <translation>Suport RPC per a connexions HTTP persistents (per defecte: %d)</translation> + </message> + <message> <source>Randomly drop 1 of every <n> network messages</source> <translation>Descarta a l'atzar 1 de cada <n> missatges de la xarxa</translation> </message> @@ -3034,10 +3066,26 @@ per exemple: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo.com <translation>Envia informació de traça/depuració a la consola en comptes del fitxer debug.log</translation> </message> <message> + <source>Send transactions as zero-fee transactions if possible (default: %u)</source> + <translation>Envia les transaccions com a transaccions de comissió zero sempre que sigui possible (per defecte: %u) </translation> + </message> + <message> + <source>Set SSL root certificates for payment request (default: -system-)</source> + <translation>Defineix certificats arrel SSL per a la sol·licitud de pagament (per defecte: -sistema-)</translation> + </message> + <message> + <source>Set language, for example "de_DE" (default: system locale)</source> + <translation>Defineix un idioma, per exemple «de_DE» (per defecte: preferències locals de sistema)</translation> + </message> + <message> <source>Show all debugging options (usage: --help -help-debug)</source> <translation>Mostra totes les opcions de depuració (ús: --help --help-debug)</translation> </message> <message> + <source>Show splash screen on startup (default: 1)</source> + <translation>Mostra la finestra de benvinguda a l'inici (per defecte: 1)</translation> + </message> + <message> <source>Shrink debug.log file on client startup (default: 1 when no -debug)</source> <translation>Redueix el fitxer debug.log durant l'inici del client (per defecte: 1 quan no -debug)</translation> </message> @@ -3046,6 +3094,10 @@ per exemple: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo.com <translation>Ha fallat la signatura de la transacció</translation> </message> <message> + <source>Start minimized</source> + <translation>Inicia minimitzat</translation> + </message> + <message> <source>This is experimental software.</source> <translation>Això és programari experimental.</translation> </message> @@ -3058,6 +3110,10 @@ per exemple: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo.com <translation>Els imports de les transaccions han de ser positius</translation> </message> <message> + <source>Transaction too large for fee policy</source> + <translation>Transacció massa gran per a la política de comissions</translation> + </message> + <message> <source>Transaction too large</source> <translation>La transacció és massa gran</translation> </message> @@ -3082,10 +3138,6 @@ per exemple: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo.com <translation>Avís</translation> </message> <message> - <source>Warning: This version is obsolete, upgrade required!</source> - <translation>Avís: aquesta versió està obsoleta. És necessari actualitzar-la!</translation> - </message> - <message> <source>Warning: Unsupported argument -benchmark ignored, use -debug=bench.</source> <translation>Avís: s'ha ignorat l'argument no acceptat de -benchmark. Feu servir -debug=bench.</translation> </message> @@ -3142,14 +3194,170 @@ per exemple: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo.com <translation>Error en carregar wallet.dat: Moneder corrupte</translation> </message> <message> + <source>(1 = keep tx meta data e.g. account owner and payment request information, 2 = drop tx meta data)</source> + <translation>(1 = manté les metadades de les tx, p. ex., propietari del compte i informació de sol·licitud del pagament, 2 = prescindeix de les metadades de les tx)</translation> + </message> + <message> + <source>Flush database activity from memory pool to disk log every <n> megabytes (default: %u)</source> + <translation>Buida l'activitat de la base de dades de la memòria disponible al registre del disc cada <n> megabytes (per defecte: %u)</translation> + </message> + <message> + <source>How thorough the block verification of -checkblocks is (0-4, default: %u)</source> + <translation>Com d'exhaustiva és la verificació de blocs del -checkblocks (0-4, per defecte: %u)</translation> + </message> + <message> + <source>Log transaction priority and fee per kB when mining blocks (default: %u)</source> + <translation>Enregistreu la prioritat de la transacció i la comissió per kB en minar blocs (per defecte: %u)</translation> + </message> + <message> + <source>Maintain a full transaction index, used by the getrawtransaction rpc call (default: %u)</source> + <translation>Manté un índex complet de transaccions, utilitzat per la crida rpc getrawtransaction (per defecte: %u)</translation> + </message> + <message> + <source>Number of seconds to keep misbehaving peers from reconnecting (default: %u)</source> + <translation>Nombre de segons necessaris perquè els iguals de comportament qüestionable puguin tornar a connectar-se (per defecte: %u)</translation> + </message> + <message> + <source>Output debugging information (default: %u, supplying <category> is optional)</source> + <translation>Informació de sortida de la depuració (per defecte: %u, proporcionar <category> és opcional)</translation> + </message> + <message> + <source>Use separate SOCKS5 proxy to reach peers via Tor hidden services (default: %s)</source> + <translation>Utilitza un proxy SOCKS4 apart per a arribar als iguals a través de serveis ocults de Tor (per defecte: %s)</translation> + </message> + <message> + <source>(default: %s)</source> + <translation>(per defecte: %s)</translation> + </message> + <message> + <source>Acceptable ciphers (default: %s)</source> + <translation>Xifrats acceptables (per defecte: %s)</translation> + </message> + <message> + <source>Always query for peer addresses via DNS lookup (default: %u)</source> + <translation>Demana sempre les adreces dels iguals a través de consultes DNS (per defecte: %u)</translation> + </message> + <message> + <source>Disable safemode, override a real safe mode event (default: %u)</source> + <translation>Inhabilita el mode segur, sobreescriu un esdeveniment de mode segur real (per defecte: %u) </translation> + </message> + <message> <source>Error loading wallet.dat</source> <translation>Error en carregar wallet.dat</translation> </message> <message> + <source>Force safe mode (default: %u)</source> + <translation>Força el mode segur (per defecte: %u)</translation> + </message> + <message> + <source>Generate coins (default: %u)</source> + <translation>Genera monedes (per defecte: %u)</translation> + </message> + <message> + <source>How many blocks to check at startup (default: %u, 0 = all)</source> + <translation>Quants blocs per comprovar a l'inici (per defecte: %u, 0 = tots)</translation> + </message> + <message> + <source>Include IP addresses in debug output (default: %u)</source> + <translation>Inclou l'adreça IP a la sortida de depuració (per defecte: %u)</translation> + </message> + <message> <source>Invalid -proxy address: '%s'</source> <translation>Adreça -proxy invalida: '%s'</translation> </message> <message> + <source>Limit size of signature cache to <n> entries (default: %u)</source> + <translation>Limita la mida de la cau de signatura a <n> entrades (per defecte: %u)</translation> + </message> + <message> + <source>Listen for JSON-RPC connections on <port> (default: %u or testnet: %u)</source> + <translation>Escolta les connexions JSON-RPC en <port> (per defecte: %u o testnet: %u)</translation> + </message> + <message> + <source>Listen for connections on <port> (default: %u or testnet: %u)</source> + <translation>Escolta les connexions en <port> (per defecte: %u o testnet: %u)</translation> + </message> + <message> + <source>Maintain at most <n> connections to peers (default: %u)</source> + <translation>Manté com a màxim <n> connexions a iguals (per defecte: %u)</translation> + </message> + <message> + <source>Maximum per-connection receive buffer, <n>*1000 bytes (default: %u)</source> + <translation>Memòria intermèdia màxima de recepció per connexió, <n>*1000 bytes (per defecte: %u)</translation> + </message> + <message> + <source>Maximum per-connection send buffer, <n>*1000 bytes (default: %u)</source> + <translation>Memòria intermèdia màxima d'enviament per connexió, <n>*1000 bytes (per defecte: %u)</translation> + </message> + <message> + <source>Only accept block chain matching built-in checkpoints (default: %u)</source> + <translation>Només accepta els punts de control integrats que coincideixen amb la cadena de blocs (per defecte: %u)</translation> + </message> + <message> + <source>Prepend debug output with timestamp (default: %u)</source> + <translation>Posa davant de la sortida de depuració una marca horària (per defecte: %u)</translation> + </message> + <message> + <source>Relay and mine data carrier transactions (default: %u)</source> + <translation>Retransmet i mina les transaccions de l'operador (per defecte: %u)</translation> + </message> + <message> + <source>Relay non-P2SH multisig (default: %u)</source> + <translation>Retransmet multisig no P2SH (per defecte: %u)</translation> + </message> + <message> + <source>Run a thread to flush wallet periodically (default: %u)</source> + <translation>Executa un fil per buidar el moneder periòdicament (per defecte: %u)</translation> + </message> + <message> + <source>Server certificate file (default: %s)</source> + <translation>Fitxer de certificat del servidor (per defecte: %s)</translation> + </message> + <message> + <source>Server private key (default: %s)</source> + <translation>Clau privada del servidor (per defecte: %s)</translation> + </message> + <message> + <source>Set key pool size to <n> (default: %u)</source> + <translation>Defineix la mida clau disponible a <n> (per defecte: %u)</translation> + </message> + <message> + <source>Set minimum block size in bytes (default: %u)</source> + <translation>Defineix la mida de bloc mínima en bytes (per defecte: %u)</translation> + </message> + <message> + <source>Set the number of threads to service RPC calls (default: %d)</source> + <translation>Defineix el nombre de fils a crides de servei RPC (per defecte: %d)</translation> + </message> + <message> + <source>Sets the DB_PRIVATE flag in the wallet db environment (default: %u)</source> + <translation>Defineix el senyalador DB_PRIVATE en l'entorn db del moneder (per defecte: %u)</translation> + </message> + <message> + <source>Specify configuration file (default: %s)</source> + <translation>Especifica el fitxer de configuració (per defecte: %s)</translation> + </message> + <message> + <source>Specify connection timeout in milliseconds (minimum: 1, default: %d)</source> + <translation>Especifica el temps d'espera de la connexió en milisegons (mínim: 1, per defecte: %d)</translation> + </message> + <message> + <source>Specify pid file (default: %s)</source> + <translation>Especifica el fitxer pid (per defecte: %s)</translation> + </message> + <message> + <source>Spend unconfirmed change when sending transactions (default: %u)</source> + <translation>Gasta el canvi no confirmat en enviar les transaccions (per defecte: %u)</translation> + </message> + <message> + <source>Stop running after importing blocks from disk (default: %u)</source> + <translation>Atura l'execució després d'importar blocs del disc (per defecte: %u)</translation> + </message> + <message> + <source>Threshold for disconnecting misbehaving peers (default: %u)</source> + <translation>Llindar per a desconnectar els iguals de comportament qüestionable (per defecte: %u)</translation> + </message> + <message> <source>Unknown network specified in -onlynet: '%s'</source> <translation>Xarxa desconeguda especificada a -onlynet: '%s'</translation> </message> @@ -3166,10 +3374,6 @@ per exemple: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo.com <translation>Import no vàlid per a -paytxfee=<amount>: «%s»</translation> </message> <message> - <source>Invalid amount</source> - <translation>Import no vàlid</translation> - </message> - <message> <source>Insufficient funds</source> <translation>Balanç insuficient</translation> </message> @@ -3202,10 +3406,6 @@ per exemple: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo.com <translation>Ha acabat la càrrega</translation> </message> <message> - <source>To use the %s option</source> - <translation>Utilitza l'opció %s</translation> - </message> - <message> <source>Error</source> <translation>Error</translation> </message> diff --git a/src/qt/locale/bitcoin_ca@valencia.ts b/src/qt/locale/bitcoin_ca@valencia.ts index d3bf33ebfb..0a52b1bc9a 100644 --- a/src/qt/locale/bitcoin_ca@valencia.ts +++ b/src/qt/locale/bitcoin_ca@valencia.ts @@ -1,11 +1,7 @@ -<TS language="ca@valencia" version="2.0"> +<TS language="ca@valencia" version="2.1"> <context> <name>AddressBookPage</name> <message> - <source>Double-click to edit address or label</source> - <translation>Feu doble clic per editar l'adreça o l'etiqueta</translation> - </message> - <message> <source>Create a new address</source> <translation>Crea una nova adreça</translation> </message> @@ -87,7 +83,7 @@ </message> <message> <source>Comma separated file (*.csv)</source> - <translation>Fitxer de separació amb comes (*.csv)</translation> + <translation>Fitxer separat per comes (*.csv)</translation> </message> <message> <source>Exporting Failed</source> @@ -156,10 +152,6 @@ <translation>Canvia la contrasenya</translation> </message> <message> - <source>Enter the old and new passphrase to the wallet.</source> - <translation>Introduïu tant la contrasenya antiga com la nova del moneder.</translation> - </message> - <message> <source>Confirm wallet encryption</source> <translation>Confirma l'encriptació del moneder</translation> </message> @@ -188,10 +180,6 @@ <translation>Introduïu la contrasenya nova al moneder.<br/>Utilitzeu una contrasenya de <b>deu o més caràcters aleatoris</b>, o <b>vuit o més paraules</b>.</translation> </message> <message> - <source>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>Bitcoin es tancarà ara per acabar el procés d'encriptació. Recordeu que encriptar el moneder no protegeix completament els bitcoins de ser robats per programari maliciós instal·lat a l'ordinador.</translation> - </message> - <message> <source>Wallet encryption failed</source> <translation>L'encriptació del moneder ha fallat</translation> </message> @@ -311,10 +299,6 @@ <translation>Envia monedes a una adreça Bitcoin</translation> </message> <message> - <source>Modify configuration options for Bitcoin</source> - <translation>Modifica les opcions de configuració per bitcoin</translation> - </message> - <message> <source>Backup wallet to another location</source> <translation>Realitza una còpia de seguretat del moneder a una altra ubicació</translation> </message> @@ -452,7 +436,7 @@ </message> <message> <source>Information</source> - <translation>Informació</translation> + <translation>&Informació</translation> </message> <message> <source>Up to date</source> @@ -471,14 +455,6 @@ <translation>Transacció entrant</translation> </message> <message> - <source>Date: %1 -Amount: %2 -Type: %3 -Address: %4 -</source> - <translation>Data: %1\nImport: %2\n Tipus: %3\n Adreça: %4\n</translation> - </message> - <message> <source>Wallet is <b>encrypted</b> and currently <b>unlocked</b></source> <translation>El moneder està <b>encriptat</b> i actualment <b>desbloquejat</b></translation> </message> @@ -514,7 +490,7 @@ Address: %4 </message> <message> <source>Fee:</source> - <translation>Quota:</translation> + <translation>Comissió:</translation> </message> <message> <source>Dust:</source> @@ -562,11 +538,11 @@ Address: %4 </message> <message> <source>Copy address</source> - <translation>Copiar adreça </translation> + <translation>Copia l'adreça</translation> </message> <message> <source>Copy label</source> - <translation>Copiar etiqueta</translation> + <translation>Copia l'etiqueta</translation> </message> <message> <source>Copy amount</source> @@ -590,7 +566,7 @@ Address: %4 </message> <message> <source>Copy fee</source> - <translation>Copia la comissió</translation> + <translation>Copia la comissi</translation> </message> <message> <source>Copy after fee</source> @@ -669,10 +645,6 @@ Address: %4 <translation>no</translation> </message> <message> - <source>This label turns red, if the transaction size is greater than 1000 bytes.</source> - <translation>Esta etiqueta es posa de color roig si la mida de la transacció és més gran de 1000 bytes.</translation> - </message> - <message> <source>This means a fee of at least %1 per kB is required.</source> <translation>Això comporta una comissi d'almenys %1 per kB.</translation> </message> @@ -685,14 +657,6 @@ Address: %4 <translation>Les transaccions amb una major prioritat són més propenses a ser incloses en un bloc.</translation> </message> <message> - <source>This label turns red, if the priority is smaller than "medium".</source> - <translation>Esta etiqueta es torna roja si la prioritat és menor que «mitjana».</translation> - </message> - <message> - <source>This label turns red, if any recipient receives an amount smaller than %1.</source> - <translation>Esta etiqueta es torna roja si qualsevol destinatari rep un import inferior a %1.</translation> - </message> - <message> <source>(no label)</source> <translation>(sense etiqueta)</translation> </message> @@ -813,30 +777,6 @@ Address: %4 <source>command-line options</source> <translation>Opcions de la línia d'ordes</translation> </message> - <message> - <source>UI options</source> - <translation>Opcions d'IU</translation> - </message> - <message> - <source>Set language, for example "de_DE" (default: system locale)</source> - <translation>Defineix un idioma, per exemple "de_DE" (per defecte: preferències locals de sistema)</translation> - </message> - <message> - <source>Start minimized</source> - <translation>Inicia minimitzat</translation> - </message> - <message> - <source>Set SSL root certificates for payment request (default: -system-)</source> - <translation>Defineix certificats arrel SSL per a la sol·licitud de pagament (per defecte: -sistema-)</translation> - </message> - <message> - <source>Show splash screen on startup (default: 1)</source> - <translation>Mostra la finestra de benvinguda a l'inici (per defecte: 1)</translation> - </message> - <message> - <source>Choose data directory on startup (default: 0)</source> - <translation>Tria el directori de dades a l'inici (per defecte: 0)</translation> - </message> </context> <context> <name>Intro</name> @@ -911,14 +851,6 @@ Address: %4 <translation>&Principal</translation> </message> <message> - <source>Automatically start Bitcoin after logging in to the system.</source> - <translation>Inicia automàticament el Bitcoin després de l'inici de sessió del sistema.</translation> - </message> - <message> - <source>&Start Bitcoin on system login</source> - <translation>&Inicia el Bitcoin a l'inici de sessió del sistema.</translation> - </message> - <message> <source>Size of &database cache</source> <translation>Mida de la memòria cau de la base de &dades</translation> </message> @@ -1023,10 +955,6 @@ Address: %4 <translation>&Minimitza a la barra d'aplicacions en comptes de la barra de tasques</translation> </message> <message> - <source>Minimize instead of exit the application when the window is closed. When this option is enabled, the application will be closed only after selecting Quit in the menu.</source> - <translation>Minimitza en comptes d'eixir de la aplicació al tancar la finestra. Quan esta opció està activa, la aplicació només es tancarà al seleccionar Eixir al menú.</translation> - </message> - <message> <source>M&inimize on close</source> <translation>M&inimitza en tancar</translation> </message> @@ -1039,10 +967,6 @@ Address: %4 <translation>&Llengua de la interfície d'usuari:</translation> </message> <message> - <source>The user interface language can be set here. This setting will take effect after restarting Bitcoin.</source> - <translation>Ací podeu definir la llengua de l'aplicació. Esta configuració tindrà efecte una vegada es reinicie Bitcoin.</translation> - </message> - <message> <source>&Unit to show amounts in:</source> <translation>&Unitats per mostrar els imports en:</translation> </message> @@ -1079,10 +1003,6 @@ Address: %4 <translation>Cal reiniciar el client per activar els canvis.</translation> </message> <message> - <source>Client will be shutdown, do you want to proceed?</source> - <translation>Es pararà el client, voleu procedir?</translation> - </message> - <message> <source>This change would require a client restart.</source> <translation>Amb este canvi cal un reinici del client.</translation> </message> @@ -1177,10 +1097,6 @@ Address: %4 <translation>La xarxa de la sol·licitud de pagament no coincideix amb la xarxa del client.</translation> </message> <message> - <source>Payment request has expired.</source> - <translation>La sol·licitud de pagament ha caducat.</translation> - </message> - <message> <source>Payment request is not initialized.</source> <translation>La sol·licitud de pagament no està inicialitzada.</translation> </message> @@ -1248,10 +1164,6 @@ Address: %4 <translation>Agent d'usuari</translation> </message> <message> - <source>Address/Hostname</source> - <translation>Adreça / nom de l'ordinador</translation> - </message> - <message> <source>Ping Time</source> <translation>Temps de ping</translation> </message> @@ -1283,14 +1195,6 @@ Address: %4 <translation>%1 s</translation> </message> <message> - <source>NETWORK</source> - <translation>XARXA</translation> - </message> - <message> - <source>UNKNOWN</source> - <translation>DESCONEGUT</translation> - </message> - <message> <source>None</source> <translation>Cap</translation> </message> @@ -1489,18 +1393,10 @@ Address: %4 <translation>Fitxer de registre de depuració</translation> </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>Obri el fitxer de registre de depuració de Bitcoin del directori de dades actual. Això pot trigar uns quants segons per a fitxers de registre grans.</translation> - </message> - <message> <source>Clear console</source> <translation>Neteja la consola</translation> </message> <message> - <source>Welcome to the Bitcoin RPC console.</source> - <translation>Vos donem la benvinguda a la consola RPC de Bitcoin</translation> - </message> - <message> <source>Use up and down arrows to navigate history, and <b>Ctrl-L</b> to clear screen.</source> <translation>Utilitza les fletxes d'amunt i avall per navegar per l'historial, i <b>Ctrl-L<\b> per netejar la pantalla.</translation> </message> @@ -1668,7 +1564,7 @@ Address: %4 </message> <message> <source>Amount</source> - <translation>Import</translation> + <translation>Quantitat</translation> </message> <message> <source>Label</source> @@ -1703,7 +1599,7 @@ Address: %4 </message> <message> <source>Amount</source> - <translation>Import</translation> + <translation>Quantitat</translation> </message> <message> <source>(no label)</source> @@ -1786,7 +1682,7 @@ Address: %4 </message> <message> <source>Clear all fields of the form.</source> - <translation>Netejar tots els camps del formulari.</translation> + <translation>Esborra tots els camps del formuari.</translation> </message> <message> <source>Dust:</source> @@ -1853,10 +1749,6 @@ Address: %4 <translation>o</translation> </message> <message> - <source>The recipient address is not valid, please recheck.</source> - <translation>L'adreça de destinatari no és vàlida, per favor comprovi-la.</translation> - </message> - <message> <source>The amount to pay must be larger than 0.</source> <translation>L'import a pagar ha de ser major que 0.</translation> </message> @@ -1869,10 +1761,6 @@ Address: %4 <translation>El total excedeix el teu balanç quan s'afig la comisió a la transacció %1.</translation> </message> <message> - <source>Duplicate address found, can only send to each address once per send operation.</source> - <translation>S'ha trobat una adreça duplicada, tan sols es pot enviar a cada adreça un cop per orde d'enviament.</translation> - </message> - <message> <source>Transaction creation failed!</source> <translation>Ha fallat la creació de la transacció!</translation> </message> @@ -1956,10 +1844,6 @@ Address: %4 <translation>Missatge:</translation> </message> <message> - <source>This is a verified payment request.</source> - <translation>Esta és una sol·licitud de pagament verificada.</translation> - </message> - <message> <source>Enter a label for this address to add it to the list of used addresses</source> <translation>Introduïu una etiqueta per a esta adreça per afegir-la a la llista d'adreces utilitzades</translation> </message> @@ -1968,10 +1852,6 @@ Address: %4 <translation>Un missatge que s'ha adjuntat al bitcoin: URI que s'emmagatzemarà amb la transacció per a la vostra referència. Nota: el missatge no s'enviarà a través de la xarxa Bitcoin.</translation> </message> <message> - <source>This is an unverified payment request.</source> - <translation>Esta és una sol·licitud de pagament no verificada.</translation> - </message> - <message> <source>Pay To:</source> <translation>Paga a:</translation> </message> @@ -2002,24 +1882,20 @@ Address: %4 <translation>&Signa el missatge</translation> </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>Podeu signar missatges amb la vostra adreça per provar que són vostres. Aneu amb compte no signar qualsevol cosa, ja que els atacs de pesca electrònica (phishing) poden provar de confondre-vos perquè els signeu amb la vostra identitat. Només signeu als documents completament detallats amb què hi esteu d'acord.</translation> - </message> - <message> <source>The Bitcoin address to sign the message with</source> <translation>L'adreça Bitcoin amb què signar el missatge</translation> </message> <message> <source>Choose previously used address</source> - <translation>Tria les adreces fetes servir amb anterioritat</translation> + <translation>Trieu una adreça feta servir anteriorment</translation> </message> <message> <source>Alt+A</source> - <translation>Alt+A</translation> + <translation>Alta+A</translation> </message> <message> <source>Paste address from clipboard</source> - <translation>Apega l'adreça del porta-retalls</translation> + <translation>Apegar adreça del porta-retalls</translation> </message> <message> <source>Alt+P</source> @@ -2058,10 +1934,6 @@ Address: %4 <translation>&Verifica el missatge</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>Introduïsca l'adreça signant, missatge (assegura't que copies salts de línia, espais, tabuladors, etc excactament tot el text) i la signatura a sota per verificar el missatge. Per evitar ser enganyat per un atac home-entre-mig, vés amb compte de no llegir més en la signatura del que hi ha al missatge signat mateix.</translation> - </message> - <message> <source>The Bitcoin address the message was signed with</source> <translation>L'adreça Bitcoin amb què va ser signat el missatge</translation> </message> @@ -2134,7 +2006,7 @@ Address: %4 <name>SplashScreen</name> <message> <source>Bitcoin Core</source> - <translation>Bitcoin Core</translation> + <translation>Nucli de Bitcoin</translation> </message> <message> <source>The Bitcoin Core developers</source> @@ -2313,10 +2185,6 @@ Address: %4 <translation>Tipus</translation> </message> <message> - <source>Address</source> - <translation>Adreça</translation> - </message> - <message> <source>Immature (%1 confirmations, will be available after %2)</source> <translation>Immadur (%1 confirmacions, serà disponible després de %2)</translation> </message> @@ -2341,6 +2209,10 @@ Address: %4 <translation>Fora de línia</translation> </message> <message> + <source>Label</source> + <translation>Etiqueta</translation> + </message> + <message> <source>Unconfirmed</source> <translation>Sense confirmar</translation> </message> @@ -2393,10 +2265,6 @@ Address: %4 <translation>Tipus de transacció.</translation> </message> <message> - <source>Destination address of transaction.</source> - <translation>Adreça del destinatari de la transacció.</translation> - </message> - <message> <source>Amount removed from or added to balance.</source> <translation>Import extret o afegit del balanç.</translation> </message> @@ -2465,7 +2333,7 @@ Address: %4 </message> <message> <source>Copy label</source> - <translation>Copiar etiqueta</translation> + <translation>Copia l'etiqueta</translation> </message> <message> <source>Copy amount</source> @@ -2631,29 +2499,6 @@ Address: %4 <translation>Accepta connexions de fora (per defecte: 1 si no -proxy o -connect)</translation> </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>%s, heu d'establir una contrasenya RPC al fitxer de configuració: %s -Es recomana que useu la següent contrasenya aleatòria: -rpcuser=bitcoinrpc -rpcpassword=%s -(no necesiteu recordar esta contrasenya) -El nom d'usuari i la contrasenya NO HAN de ser els mateixos. -Si el fitxer no existeix, crea'l amb els permisos de fitxer de només lectura per al propietari. -També es recomana establir la notificació d'alertes i així sereu notificat de les incidències; -per exemple: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo.com -</translation> - </message> - <message> <source>Bind to given address and always listen on it. Use [host]:port notation for IPv6</source> <translation>Vincula a una adreça específica i sempre escolta-hi. Utilitza la notació [host]:port per IPv6</translation> </message> @@ -2666,14 +2511,6 @@ per exemple: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo.com <translation>Entra en el mode de proves de regressió, que utilitza una cadena especial en què els blocs poden resoldre's al moment.</translation> </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>Error: La transacció ha estat rebutjada. Això pot passar si alguna de les monedes del teu moneder ja s'han gastat, com si haguesis usat una copia de l'arxiu wallet.dat i s'hagueren gastat monedes de la copia però sense marcar com gastades en este.</translation> - </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>Error: Esta transacció requereix una comissió d'almenys %s degut al seu import, complexitat o per l'ús de fons recentment rebuts!</translation> - </message> - <message> <source>Execute command when a wallet transaction changes (%s in cmd is replaced by TxID)</source> <translation>Executa una orde quan una transacció del moneder canvie (%s en cmd es canvia per TxID)</translation> </message> @@ -2746,10 +2583,6 @@ per exemple: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo.com <translation>Opcions de depuració/proves:</translation> </message> <message> - <source>Discover own IP address (default: 1 when listening and no -externalip)</source> - <translation>Descobreix la pròpia adreça IP (per defecte: 1 quan escoltant i no -externalip)</translation> - </message> - <message> <source>Do not load the wallet and disable wallet RPC calls</source> <translation>No carreguis el moneder i inhabilita les crides RPC del moneder</translation> </message> @@ -2778,10 +2611,6 @@ per exemple: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo.com <translation>Error: Espai al disc baix!</translation> </message> <message> - <source>Error: Wallet locked, unable to create transaction!</source> - <translation>Error: El moneder està bloquejat, no és possible crear la transacció!</translation> - </message> - <message> <source>Failed to listen on any port. Use -listen=0 if you want this.</source> <translation>Ha fallat escoltar a qualsevol port. Feu servir -listen=0 si voleu fer això.</translation> </message> @@ -2806,10 +2635,6 @@ per exemple: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo.com <translation>No hi ha suficient descriptors de fitxers disponibles.</translation> </message> <message> - <source>Rebuild block chain index from current blk000??.dat files</source> - <translation>Reconstrueix l'índex de la cadena de blocs dels fitxers actuals blk000??.dat</translation> - </message> - <message> <source>Set database cache size in megabytes (%d to %d, default: %d)</source> <translation>Defineix la mida de la memòria cau de la base de dades en megabytes (%d a %d, per defecte: %d)</translation> </message> @@ -2914,6 +2739,10 @@ per exemple: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo.com <translation>No es pot resoldre l'adreça -whitebind: «%s»</translation> </message> <message> + <source>Choose data directory on startup (default: 0)</source> + <translation>Tria el directori de dades a l'inici (per defecte: 0)</translation> + </message> + <message> <source>Connect through SOCKS5 proxy</source> <translation>Connecta a través del proxy SOCKS5</translation> </message> @@ -2962,10 +2791,6 @@ per exemple: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo.com <translation>S'ha especificat una màscara de xarxa no vàlida a -whitelist: «%s»</translation> </message> <message> - <source>Keep at most <n> unconnectable blocks in memory (default: %u)</source> - <translation>Manté com a màxim <n> blocs no connectables en memòria (per defecte: %u)</translation> - </message> - <message> <source>Need to specify a port with -whitebind: '%s'</source> <translation>Cal especificar un port amb -whitebind: «%s»</translation> </message> @@ -2974,10 +2799,6 @@ per exemple: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo.com <translation>Opcions de transmissió del node:</translation> </message> <message> - <source>Print block on startup, if found in block index</source> - <translation>Imprimeix el block a l'inici, si es troba l'índex de blocs</translation> - </message> - <message> <source>RPC SSL options: (see the Bitcoin Wiki for SSL setup instructions)</source> <translation>Opcions RPC SSL: (veieu el wiki del Bitcoin per a instruccions de configuració de l'SSL)</translation> </message> @@ -2998,10 +2819,22 @@ per exemple: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo.com <translation>Envia informació de traça/depuració a la consola en comptes del fitxer debug.log</translation> </message> <message> + <source>Set SSL root certificates for payment request (default: -system-)</source> + <translation>Defineix certificats arrel SSL per a la sol·licitud de pagament (per defecte: -sistema-)</translation> + </message> + <message> + <source>Set language, for example "de_DE" (default: system locale)</source> + <translation>Defineix un idioma, per exemple "de_DE" (per defecte: preferències locals de sistema)</translation> + </message> + <message> <source>Show all debugging options (usage: --help -help-debug)</source> <translation>Mostra totes les opcions de depuració (ús: --help --help-debug)</translation> </message> <message> + <source>Show splash screen on startup (default: 1)</source> + <translation>Mostra la finestra de benvinguda a l'inici (per defecte: 1)</translation> + </message> + <message> <source>Shrink debug.log file on client startup (default: 1 when no -debug)</source> <translation>Redueix el fitxer debug.log durant l'inici del client (per defecte: 1 quan no -debug)</translation> </message> @@ -3010,6 +2843,10 @@ per exemple: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo.com <translation>Ha fallat la signatura de la transacció</translation> </message> <message> + <source>Start minimized</source> + <translation>Inicia minimitzat</translation> + </message> + <message> <source>This is experimental software.</source> <translation>Això és programari experimental.</translation> </message> @@ -3046,10 +2883,6 @@ per exemple: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo.com <translation>Avís</translation> </message> <message> - <source>Warning: This version is obsolete, upgrade required!</source> - <translation>Avís: esta versió està obsoleta. És necessari actualitzar-la!</translation> - </message> - <message> <source>Warning: Unsupported argument -benchmark ignored, use -debug=bench.</source> <translation>Avís: s'ha ignorat l'argument no acceptat de -benchmark. Feu servir -debug=bench.</translation> </message> @@ -3130,10 +2963,6 @@ per exemple: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo.com <translation>Import no vàlid per a -paytxfee=<amount>: «%s»</translation> </message> <message> - <source>Invalid amount</source> - <translation>Import no vàlid</translation> - </message> - <message> <source>Insufficient funds</source> <translation>Balanç insuficient</translation> </message> @@ -3166,10 +2995,6 @@ per exemple: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo.com <translation>Ha acabat la càrrega</translation> </message> <message> - <source>To use the %s option</source> - <translation>Utilitza l'opció %s</translation> - </message> - <message> <source>Error</source> <translation>Error</translation> </message> diff --git a/src/qt/locale/bitcoin_ca_ES.ts b/src/qt/locale/bitcoin_ca_ES.ts index 60c6fa30f4..3baa6e00cd 100644 --- a/src/qt/locale/bitcoin_ca_ES.ts +++ b/src/qt/locale/bitcoin_ca_ES.ts @@ -1,9 +1,9 @@ -<TS language="ca_ES" version="2.0"> +<TS language="ca_ES" version="2.1"> <context> <name>AddressBookPage</name> <message> - <source>Double-click to edit address or label</source> - <translation>Feu doble clic per editar l'adreça o l'etiqueta</translation> + <source>Right-click to edit address or label</source> + <translation>Feu clic dret per a editar l'adreça o l'etiqueta</translation> </message> <message> <source>Create a new address</source> @@ -156,10 +156,6 @@ <translation>Canvia la contrasenya</translation> </message> <message> - <source>Enter the old and new passphrase to the wallet.</source> - <translation>Introduïu tant la contrasenya antiga com la nova del moneder.</translation> - </message> - <message> <source>Confirm wallet encryption</source> <translation>Confirma l'encriptació del moneder</translation> </message> @@ -188,10 +184,6 @@ <translation>Introduïu la contrasenya nova al moneder.<br/>Utilitzeu una contrasenya de <b>deu o més caràcters aleatoris</b>, o <b>vuit o més paraules</b>.</translation> </message> <message> - <source>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>Bitcoin es tancarà ara per acabar el procés d'encriptació. Recordeu que encriptar el moneder no protegeix completament els bitcoins de ser robats per programari maliciós instal·lat a l'ordinador.</translation> - </message> - <message> <source>Wallet encryption failed</source> <translation>L'encriptació del moneder ha fallat</translation> </message> @@ -311,10 +303,6 @@ <translation>Envia monedes a una adreça Bitcoin</translation> </message> <message> - <source>Modify configuration options for Bitcoin</source> - <translation>Modifica les opcions de configuració per bitcoin</translation> - </message> - <message> <source>Backup wallet to another location</source> <translation>Realitza una còpia de seguretat del moneder a una altra ubicació</translation> </message> @@ -491,14 +479,6 @@ <translation>Transacció entrant</translation> </message> <message> - <source>Date: %1 -Amount: %2 -Type: %3 -Address: %4 -</source> - <translation>Data: %1\nImport: %2\n Tipus: %3\n Adreça: %4\n</translation> - </message> - <message> <source>Wallet is <b>encrypted</b> and currently <b>unlocked</b></source> <translation>El moneder està <b>encriptat</b> i actualment <b>desbloquejat</b></translation> </message> @@ -517,6 +497,10 @@ Address: %4 <context> <name>CoinControlDialog</name> <message> + <source>Coin Selection</source> + <translation>Selecció de moneda</translation> + </message> + <message> <source>Quantity:</source> <translation>Quantitat:</translation> </message> @@ -534,7 +518,7 @@ Address: %4 </message> <message> <source>Fee:</source> - <translation>Quota:</translation> + <translation>Comissió</translation> </message> <message> <source>Dust:</source> @@ -542,7 +526,7 @@ Address: %4 </message> <message> <source>After Fee:</source> - <translation>Quota posterior:</translation> + <translation>Comissió posterior:</translation> </message> <message> <source>Change:</source> @@ -562,7 +546,15 @@ Address: %4 </message> <message> <source>Amount</source> - <translation>Quantitat</translation> + <translation>Import</translation> + </message> + <message> + <source>Received with label</source> + <translation>Rebut amb l'etiqueta</translation> + </message> + <message> + <source>Received with address</source> + <translation>Rebut amb l'adreça</translation> </message> <message> <source>Date</source> @@ -689,12 +681,8 @@ Address: %4 <translation>no</translation> </message> <message> - <source>This label turns red, if the transaction size is greater than 1000 bytes.</source> - <translation>Aquesta etiqueta es posa de color vermell si la mida de la transacció és més gran de 1000 bytes.</translation> - </message> - <message> <source>This means a fee of at least %1 per kB is required.</source> - <translation>Això comporta una comissi d'almenys %1 per kB.</translation> + <translation>Això comporta una comissió d'almenys %1 per kB.</translation> </message> <message> <source>Can vary +/- 1 byte per input.</source> @@ -705,14 +693,6 @@ Address: %4 <translation>Les transaccions amb una major prioritat són més propenses a ser incloses en un bloc.</translation> </message> <message> - <source>This label turns red, if the priority is smaller than "medium".</source> - <translation>Aquesta etiqueta es torna vermella si la prioritat és menor que «mitjana».</translation> - </message> - <message> - <source>This label turns red, if any recipient receives an amount smaller than %1.</source> - <translation>Aquesta etiqueta es torna vermella si qualsevol destinatari rep un import inferior a %1.</translation> - </message> - <message> <source>(no label)</source> <translation>(sense etiqueta)</translation> </message> @@ -729,7 +709,7 @@ Address: %4 <name>EditAddressDialog</name> <message> <source>Edit Address</source> - <translation>Editar Adreça</translation> + <translation>Edita l'adreça</translation> </message> <message> <source>&Label</source> @@ -833,30 +813,6 @@ Address: %4 <source>command-line options</source> <translation>Opcions de la línia d'ordres</translation> </message> - <message> - <source>UI options</source> - <translation>Opcions de IU</translation> - </message> - <message> - <source>Set language, for example "de_DE" (default: system locale)</source> - <translation>Defineix un idioma, per exemple "de_DE" (per defecte: preferències locals de sistema)</translation> - </message> - <message> - <source>Start minimized</source> - <translation>Inicia minimitzat</translation> - </message> - <message> - <source>Set SSL root certificates for payment request (default: -system-)</source> - <translation>Defineix certificats arrel SSL per a la sol·licitud de pagament (per defecte: -sistema-)</translation> - </message> - <message> - <source>Show splash screen on startup (default: 1)</source> - <translation>Mostra la finestra de benvinguda a l'inici (per defecte: 1)</translation> - </message> - <message> - <source>Choose data directory on startup (default: 0)</source> - <translation>Tria el directori de dades a l'inici (per defecte: 0)</translation> - </message> </context> <context> <name>Intro</name> @@ -896,7 +852,15 @@ Address: %4 <source>Error</source> <translation>Error</translation> </message> - </context> + <message numerus="yes"> + <source>%n GB of free space available</source> + <translation><numerusform>%n GB d'espai lliure disponible</numerusform><numerusform>%n GB d'espai lliure disponible</numerusform></translation> + </message> + <message numerus="yes"> + <source>(of %n GB needed)</source> + <translation><numerusform>(de %n GB necessari)</numerusform><numerusform>(de %n GB necessaris)</numerusform></translation> + </message> +</context> <context> <name>OpenURIDialog</name> <message> @@ -931,14 +895,6 @@ Address: %4 <translation>&Principal</translation> </message> <message> - <source>Automatically start Bitcoin after logging in to the system.</source> - <translation>Inicia automàticament el Bitcoin després de l'inici de sessió del sistema.</translation> - </message> - <message> - <source>&Start Bitcoin on system login</source> - <translation>&Inicia el Bitcoin a l'inici de sessió del sistema.</translation> - </message> - <message> <source>Size of &database cache</source> <translation>Mida de la memòria cau de la base de &dades</translation> </message> @@ -1019,6 +975,14 @@ Address: %4 <translation>Port obert amb &UPnP</translation> </message> <message> + <source>Connect to the Bitcoin network through a SOCKS5 proxy.</source> + <translation>Connecta a la xarxa Bitcoin a través d'un proxy SOCKS5.</translation> + </message> + <message> + <source>&Connect through SOCKS5 proxy (default proxy):</source> + <translation>&Connecta a través d'un proxy SOCKS5 (proxy per defecte):</translation> + </message> + <message> <source>Proxy &IP:</source> <translation>&IP del proxy:</translation> </message> @@ -1043,10 +1007,6 @@ Address: %4 <translation>&Minimitza a la barra d'aplicacions en comptes de la barra de tasques</translation> </message> <message> - <source>Minimize instead of exit the application when the window is closed. When this option is enabled, the application will be closed only after selecting Quit in the menu.</source> - <translation>Minimitza en comptes de sortir de la aplicació al tancar la finestra. Quan aquesta opció està activa, la aplicació només es tancarà al seleccionar Sortir al menú.</translation> - </message> - <message> <source>M&inimize on close</source> <translation>M&inimitza en tancar</translation> </message> @@ -1059,10 +1019,6 @@ Address: %4 <translation>&Llengua de la interfície d'usuari:</translation> </message> <message> - <source>The user interface language can be set here. This setting will take effect after restarting Bitcoin.</source> - <translation>Aquí podeu definir la llengua de l'aplicació. Aquesta configuració tindrà efecte una vegada es reiniciï Bitcoin.</translation> - </message> - <message> <source>&Unit to show amounts in:</source> <translation>&Unitats per mostrar els imports en:</translation> </message> @@ -1099,10 +1055,6 @@ Address: %4 <translation>Cal reiniciar el client per activar els canvis.</translation> </message> <message> - <source>Client will be shutdown, do you want to proceed?</source> - <translation>S'aturarà el client, voleu procedir?</translation> - </message> - <message> <source>This change would require a client restart.</source> <translation>Amb aquest canvi cal un reinici del client.</translation> </message> @@ -1150,6 +1102,10 @@ Address: %4 <translation>Balanç minat que encara no ha madurat</translation> </message> <message> + <source>Balances</source> + <translation>Balances</translation> + </message> + <message> <source>Total:</source> <translation>Total:</translation> </message> @@ -1162,6 +1118,14 @@ Address: %4 <translation>El vostre balanç actual en adreces de només lectura</translation> </message> <message> + <source>Spendable:</source> + <translation>Que es pot gastar:</translation> + </message> + <message> + <source>Recent transactions</source> + <translation>Transaccions recents</translation> + </message> + <message> <source>Unconfirmed transactions to watch-only addresses</source> <translation>Transaccions sense confirmar a adreces de només lectura</translation> </message> @@ -1197,10 +1161,6 @@ Address: %4 <translation>La xarxa de la sol·licitud de pagament no coincideix amb la xarxa del client.</translation> </message> <message> - <source>Payment request has expired.</source> - <translation>La sol·licitud de pagament ha caducat.</translation> - </message> - <message> <source>Payment request is not initialized.</source> <translation>La sol·licitud de pagament no està inicialitzada.</translation> </message> @@ -1241,6 +1201,14 @@ Address: %4 <translation>Reemborsament de %1</translation> </message> <message> + <source>Payment request %1 is too large (%2 bytes, allowed %3 bytes).</source> + <translation>La sol·licitud de pagament %1 és massa gran (%2 bytes, permès %3 bytes).</translation> + </message> + <message> + <source>Payment request DoS protection</source> + <translation>Protecció de DoS per a la sol·licitud de pagament</translation> + </message> + <message> <source>Error communicating with %1: %2</source> <translation>Error en comunicar amb %1: %2</translation> </message> @@ -1268,10 +1236,6 @@ Address: %4 <translation>Agent d'usuari</translation> </message> <message> - <source>Address/Hostname</source> - <translation>Adreça / nom de l'ordinador</translation> - </message> - <message> <source>Ping Time</source> <translation>Temps de ping</translation> </message> @@ -1280,7 +1244,7 @@ Address: %4 <name>QObject</name> <message> <source>Amount</source> - <translation>Quantitat</translation> + <translation>Import</translation> </message> <message> <source>Enter a Bitcoin address (e.g. %1)</source> @@ -1303,14 +1267,6 @@ Address: %4 <translation>%1 s</translation> </message> <message> - <source>NETWORK</source> - <translation>XARXA</translation> - </message> - <message> - <source>UNKNOWN</source> - <translation>DESCONEGUT</translation> - </message> - <message> <source>None</source> <translation>Cap</translation> </message> @@ -1509,18 +1465,10 @@ Address: %4 <translation>Fitxer de registre de depuració</translation> </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>Obre el fitxer de registre de depuració de Bitcoin del directori de dades actual. Això pot trigar uns quants segons per a fitxers de registre grans.</translation> - </message> - <message> <source>Clear console</source> <translation>Neteja la consola</translation> </message> <message> - <source>Welcome to the Bitcoin RPC console.</source> - <translation>Us donem la benvinguda a la consola RPC de Bitcoin</translation> - </message> - <message> <source>Use up and down arrows to navigate history, and <b>Ctrl-L</b> to clear screen.</source> <translation>Utilitza les fletxes d'amunt i avall per navegar per l'historial, i <b>Ctrl-L<\b> per netejar la pantalla.</translation> </message> @@ -1782,7 +1730,7 @@ Address: %4 </message> <message> <source>After Fee:</source> - <translation>Quota posterior:</translation> + <translation>Comissió posterior:</translation> </message> <message> <source>Change:</source> @@ -1797,6 +1745,70 @@ Address: %4 <translation>Personalitza l'adreça de canvi</translation> </message> <message> + <source>Transaction Fee:</source> + <translation>Comissió de transacció</translation> + </message> + <message> + <source>Choose...</source> + <translation>Tria...</translation> + </message> + <message> + <source>collapse fee-settings</source> + <translation>redueix els paràmetres de comissió</translation> + </message> + <message> + <source>per kilobyte</source> + <translation>per kilobyte</translation> + </message> + <message> + <source>If the custom fee is set to 1000 satoshis and the transaction is only 250 bytes, then "per kilobyte" only pays 250 satoshis in fee, while "total at least" pays 1000 satoshis. For transactions bigger than a kilobyte both pay by kilobyte.</source> + <translation>Si la comissió personalitzada es defineix a 1000 satoshis i la transacció és de només 250 bytes, llavors «per kilobyte» només es paguen 250 satoshis en una comissió, mentre que amb la de «total com a mínim» es pagarien 1000 satoshis. Per a transaccions superiors al kilobyte, en tots dos casos es paga per kilobyte.</translation> + </message> + <message> + <source>total at least</source> + <translation>total com a mínim</translation> + </message> + <message> + <source>Paying only the minimum fee is just fine as long as there is less transaction volume than space in the blocks. But be aware that this can end up in a never confirming transaction once there is more demand for bitcoin transactions than the network can process.</source> + <translation>No hi ha cap problema en pagar només la comissió mínima sempre que hi hagi menys volum de transacció que espai en els blocs. Però tingueu present que això pot acabar en una transacció que mai es confirmi una vegada hi hagi més demanda de transaccions de bitcoins que la xarxa pugui processar.</translation> + </message> + <message> + <source>(read the tooltip)</source> + <translation>(llegiu l'indicador de funció)</translation> + </message> + <message> + <source>Recommended:</source> + <translation>Recomanada:</translation> + </message> + <message> + <source>Custom:</source> + <translation>Personalitzada:</translation> + </message> + <message> + <source>(Smart fee not initialized yet. This usually takes a few blocks...)</source> + <translation>(No s'ha inicialitzat encara la comissió intel·ligent. Normalment pren uns pocs blocs...)</translation> + </message> + <message> + <source>Confirmation time:</source> + <translation>Temps de confirmació:</translation> + </message> + <message> + <source>normal</source> + <translation>normal</translation> + </message> + <message> + <source>fast</source> + <translation>ràpid</translation> + </message> + <message> + <source>Send as zero-fee transaction if possible</source> + <translation>Envia com a transacció de comissió zero si és possible</translation> + </message> + <message> + <source>(confirmation may take longer)</source> + <translation>(la confirmació pot trigar més temps)</translation> + </message> + <message> <source>Send to multiple recipients at once</source> <translation>Envia a múltiples destinataris al mateix temps</translation> </message> @@ -1846,7 +1858,7 @@ Address: %4 </message> <message> <source>Copy fee</source> - <translation>Copia la comissi</translation> + <translation>Copia la comissió</translation> </message> <message> <source>Copy after fee</source> @@ -1873,10 +1885,6 @@ Address: %4 <translation>o</translation> </message> <message> - <source>The recipient address is not valid, please recheck.</source> - <translation>L'adreça de destinatari no és vàlida, si us plau comprovi-la.</translation> - </message> - <message> <source>The amount to pay must be larger than 0.</source> <translation>L'import a pagar ha de ser major que 0.</translation> </message> @@ -1886,11 +1894,7 @@ Address: %4 </message> <message> <source>The total exceeds your balance when the %1 transaction fee is included.</source> - <translation>El total excedeix el teu balanç quan s'afegeix la comisió a la transacció %1.</translation> - </message> - <message> - <source>Duplicate address found, can only send to each address once per send operation.</source> - <translation>S'ha trobat una adreça duplicada, tan sols es pot enviar a cada adreça un cop per ordre de enviament.</translation> + <translation>El total excedeix el teu balanç quan s'afegeix la comissió a la transacció %1.</translation> </message> <message> <source>Transaction creation failed!</source> @@ -1901,6 +1905,10 @@ Address: %4 <translation>S'ha rebutjat la transacció! Això pot passar si alguna de les monedes del vostre moneder ja s'han gastat; per exemple, si heu fet servir una còpia de seguretat del fitxer wallet.dat i s'haguessin gastat monedes de la còpia però sense marcar-les-hi com a gastades.</translation> </message> <message> + <source>Pay only the minimum fee of %1</source> + <translation>Paga només la comissió mínima de %1</translation> + </message> + <message> <source>Warning: Invalid Bitcoin address</source> <translation>Avís: adreça Bitcoin no vàlida</translation> </message> @@ -1976,10 +1984,6 @@ Address: %4 <translation>Missatge:</translation> </message> <message> - <source>This is a verified payment request.</source> - <translation>Aquesta és una sol·licitud de pagament verificada.</translation> - </message> - <message> <source>Enter a label for this address to add it to the list of used addresses</source> <translation>Introduïu una etiqueta per a aquesta adreça per afegir-la a la llista d'adreces utilitzades</translation> </message> @@ -1988,10 +1992,6 @@ Address: %4 <translation>Un missatge que s'ha adjuntat al bitcoin: URI que s'emmagatzemarà amb la transacció per a la vostra referència. Nota: el missatge no s'enviarà a través de la xarxa Bitcoin.</translation> </message> <message> - <source>This is an unverified payment request.</source> - <translation>Aquesta és una sol·licitud de pagament no verificada.</translation> - </message> - <message> <source>Pay To:</source> <translation>Paga a:</translation> </message> @@ -2022,10 +2022,6 @@ Address: %4 <translation>&Signa el missatge</translation> </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>Podeu signar missatges amb la vostra adreça per provar que són vostres. Aneu amb compte no signar qualsevol cosa, ja que els atacs de pesca electrònica (phishing) poden provar de confondre-us perquè els signeu amb la vostra identitat. Només signeu als documents completament detallats amb què hi esteu d'acord.</translation> - </message> - <message> <source>The Bitcoin address to sign the message with</source> <translation>L'adreça Bitcoin amb què signar el missatge</translation> </message> @@ -2078,10 +2074,6 @@ Address: %4 <translation>&Verifica el missatge</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>Introdueixi l'adreça signant, missatge (assegura't que copies salts de línia, espais, tabuladors, etc excactament tot el text) i la signatura a sota per verificar el missatge. Per evitar ser enganyat per un atac home-entre-mig, vés amb compte de no llegir més en la signatura del que hi ha al missatge signat mateix.</translation> - </message> - <message> <source>The Bitcoin address the message was signed with</source> <translation>L'adreça Bitcoin amb què va ser signat el missatge</translation> </message> @@ -2300,7 +2292,7 @@ Address: %4 </message> <message> <source>Amount</source> - <translation>Quantitat</translation> + <translation>Import</translation> </message> <message> <source>true</source> @@ -2345,10 +2337,6 @@ Address: %4 <translation>Tipus</translation> </message> <message> - <source>Address</source> - <translation>Adreça</translation> - </message> - <message> <source>Immature (%1 confirmations, will be available after %2)</source> <translation>Immadur (%1 confirmacions, serà disponible després de %2)</translation> </message> @@ -2377,6 +2365,10 @@ Address: %4 <translation>Fora de línia</translation> </message> <message> + <source>Label</source> + <translation>Etiqueta</translation> + </message> + <message> <source>Unconfirmed</source> <translation>Sense confirmar</translation> </message> @@ -2429,8 +2421,8 @@ Address: %4 <translation>Tipus de transacció.</translation> </message> <message> - <source>Destination address of transaction.</source> - <translation>Adreça del destinatari de la transacció.</translation> + <source>Whether or not a watch-only address is involved in this transaction.</source> + <translation>Si està implicada o no una adreça només de lectura en la transacció.</translation> </message> <message> <source>Amount removed from or added to balance.</source> @@ -2524,6 +2516,10 @@ Address: %4 <translation>Exporta l'historial de transacció</translation> </message> <message> + <source>Watch-only</source> + <translation>Només de lectura</translation> + </message> + <message> <source>Exporting Failed</source> <translation>L'exportació ha fallat</translation> </message> @@ -2667,29 +2663,6 @@ Address: %4 <translation>Accepta connexions de fora (per defecte: 1 si no -proxy o -connect)</translation> </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>%s, heu de establir una contrasenya RPC al fitxer de configuració: %s -Es recomana que useu la següent contrasenya aleatòria: -rpcuser=bitcoinrpc -rpcpassword=%s -(no necesiteu recordar aquesta contrasenya) -El nom d'usuari i la contrasenya NO HAN de ser els mateixos. -Si el fitxer no existeix, crea'l amb els permisos de fitxer de només lectura per al propietari. -També es recomana establir la notificació d'alertes i així sereu notificat de les incidències; -per exemple: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo.com -</translation> - </message> - <message> <source>Bind to given address and always listen on it. Use [host]:port notation for IPv6</source> <translation>Vincula a una adreça específica i sempre escolta-hi. Utilitza la notació [host]:port per IPv6</translation> </message> @@ -2698,16 +2671,12 @@ per exemple: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo.com <translation>Elimina totes les transaccions del moneder i només recupera aquelles de la cadena de blocs a través de -rescan a l'inici</translation> </message> <message> - <source>Enter regression test mode, which uses a special chain in which blocks can be solved instantly.</source> - <translation>Entra en el mode de proves de regressió, que utilitza una cadena especial en què els blocs poden resoldre's al moment.</translation> + <source>Distributed under the MIT software license, see the accompanying file COPYING or <http://www.opensource.org/licenses/mit-license.php>.</source> + <translation>Distribuït sota llicència de programari MIT. Vegeu el fitxer acompanyant COPYING o <http://www.opensource.org/licenses/mit-license.php>.</translation> </message> <message> - <source>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>Error: La transacció ha estat rebutjada. Això pot passar si alguna de les monedes del teu moneder ja s'han gastat, com si haguesis usat una copia de l'arxiu wallet.dat i s'haguessin gastat monedes de la copia però sense marcar com gastades en aquest.</translation> - </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>Error: Aquesta transacció requereix una comissió d'almenys %s degut al seu import, complexitat o per l'ús de fons recentment rebuts!</translation> + <source>Enter regression test mode, which uses a special chain in which blocks can be solved instantly.</source> + <translation>Entra en el mode de proves de regressió, que utilitza una cadena especial en què els blocs poden resoldre's al moment.</translation> </message> <message> <source>Execute command when a wallet transaction changes (%s in cmd is replaced by TxID)</source> @@ -2750,6 +2719,10 @@ per exemple: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo.com <translation>Avís: el fitxer wallet.dat és corrupte, dades rescatades! L'arxiu wallet.dat original ha estat desat com wallet.{estampa_temporal}.bak al directori %s; si el teu balanç o transaccions son incorrectes hauries de restaurar-lo de un backup.</translation> </message> <message> + <source>Whitelist peers connecting from the given netmask or IP address. Can be specified multiple times.</source> + <translation>Afegeix a la llista blanca els iguals que es connecten de la màscara de xarxa o adreça IP donada. Es pot especificar moltes vegades.</translation> + </message> + <message> <source>(default: 1)</source> <translation>(per defecte: 1)</translation> </message> @@ -2782,10 +2755,6 @@ per exemple: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo.com <translation>Opcions de depuració/proves:</translation> </message> <message> - <source>Discover own IP address (default: 1 when listening and no -externalip)</source> - <translation>Descobreix la pròpia adreça IP (per defecte: 1 quan escoltant i no -externalip)</translation> - </message> - <message> <source>Do not load the wallet and disable wallet RPC calls</source> <translation>No carreguis el moneder i inhabilita les crides RPC del moneder</translation> </message> @@ -2810,12 +2779,12 @@ per exemple: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo.com <translation>Error en obrir la base de dades de blocs</translation> </message> <message> - <source>Error: Disk space is low!</source> - <translation>Error: Espai al disc baix!</translation> + <source>Error: A fatal internal error occured, see debug.log for details</source> + <translation>Error: s'ha produït un error intern fatal. Consulteu debug.log per a més detalls</translation> </message> <message> - <source>Error: Wallet locked, unable to create transaction!</source> - <translation>Error: El moneder està bloquejat, no és possible crear la transacció!</translation> + <source>Error: Disk space is low!</source> + <translation>Error: Espai al disc baix!</translation> </message> <message> <source>Failed to listen on any port. Use -listen=0 if you want this.</source> @@ -2842,8 +2811,8 @@ per exemple: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo.com <translation>No hi ha suficient descriptors de fitxers disponibles.</translation> </message> <message> - <source>Rebuild block chain index from current blk000??.dat files</source> - <translation>Reconstrueix l'índex de la cadena de blocs dels fitxers actuals blk000??.dat</translation> + <source>Only connect to nodes in network <net> (ipv4, ipv6 or onion)</source> + <translation>Només connecta als nodes de la xarxa <net> (ipv4, ipv6 o onion)</translation> </message> <message> <source>Set database cache size in megabytes (%d to %d, default: %d)</source> @@ -2862,6 +2831,10 @@ per exemple: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo.com <translation>Això es així per a eines de proves de regressió per al desenvolupament d'aplicacions.</translation> </message> <message> + <source>Use UPnP to map the listening port (default: %u)</source> + <translation>Utilitza UPnP per a mapejar el port d'escolta (per defecte: %u)</translation> + </message> + <message> <source>Verifying blocks...</source> <translation>S'estan verificant els blocs...</translation> </message> @@ -2926,6 +2899,18 @@ per exemple: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo.com <translation>Comissions (en BTC/Kb) inferiors a això es consideren de comissió zero per a la creació de la transacció (per defecte: %s)</translation> </message> <message> + <source>If paytxfee is not set, include enough fee so transactions begin confirmation on average within n blocks (default: %u)</source> + <translation>Si no s'especifica una paytxfee (comissió de transacció de pagament), inclogueu suficient comissió per tal que les transaccions comencin a confirmar-se en una mitja de n blocs (per defecte: %u)</translation> + </message> + <message> + <source>Invalid amount for -maxtxfee=<amount>: '%s' (must be at least the minrelay fee of %s to prevent stuck transactions)</source> + <translation>Import no vàlid per a -maxtxfee=<amount>: '%s' (cal que sigui com a mínim la comissió de minrelay de %s per evitar que les comissions s'encallin)</translation> + </message> + <message> + <source>Maximum size of data in data carrier transactions we relay and mine (default: %u)</source> + <translation>Mida màxima de les dades en les transaccions de l'operador en què confiem i en les meves (per defecte: %u)</translation> + </message> + <message> <source>Query for peer addresses via DNS lookup, if low on addresses (default: 1 unless -connect)</source> <translation>Consulta a adreces d'iguals a través de DNS, si es troba baix en adreces (per defecte: 1 a menys que -connect)</translation> </message> @@ -2934,10 +2919,41 @@ per exemple: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo.com <translation>Defineix la mida màxima de transaccions d'alta prioritat / baixa comissió en bytes (per defecte: %d)</translation> </message> <message> + <source>Set the number of threads for coin generation if enabled (-1 = all cores, default: %d)</source> + <translation>Defineix el nombre de fils per a la generació de moneda si està habilitat (-1 = tots els nuclis, per defecte: %d)</translation> + </message> + <message> <source>This product includes software developed by the OpenSSL Project for use in the OpenSSL Toolkit <https://www.openssl.org/> and cryptographic software written by Eric Young and UPnP software written by Thomas Bernard.</source> <translation>Aquest producte inclou programari desenvolupat pel projecte OpenSSL per a ús a l'OpenSSL Toolkit <https://www.openssl.org/> i programari criptogràfic escrit per Eric Young i programari UPnP escrit per Thomas Bernard.</translation> </message> <message> + <source>To use bitcoind, or the -server option to bitcoin-qt, you must set an 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>Per utilitzar bitcoind, o l'opció de serviddor de bitcoin-qt, heu de definir una rpcpassword en el fitxer de configuració: +%s +Es recomana que utilitzeu la contrasenya aleatòria següent: +rpcuser=bitcoinrpc +rpcpassword=%s +(no cal que recordeu la contrasenya) +El nom d'usuari i la contrasenya NO han de ser els mateixos. +Si el fitxer no existeix, creeu-ne un amb permisos de lectura només per al seu propietari. +Es recomana definir alertnotify per tal de ser notificat de qualsevol problema; +per exemple: alertnotify=echo %%s | mail -s "Avís de Bitcoin" admin@foo.com</translation> + </message> + <message> + <source>Warning: -maxtxfee is set very high! Fees this large could be paid on a single transaction.</source> + <translation>Avís: s'ha especificat un -maxtxfee molt alt! Comissions tan grans podrien pagar-se en una única transacció.</translation> + </message> + <message> <source>Warning: Please check that your computer's date and time are correct! If your clock is wrong Bitcoin Core will not work properly.</source> <translation>Avís: comproveu que la data i hora del vostre ordinador siguin correctes! Si el vostre rellotge no és correcte, el Bitcoin Core no funcionarà correctament.</translation> </message> @@ -2946,10 +2962,18 @@ per exemple: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo.com <translation>Els iguals en la llista blanca no poden ser bandejats per DoS i es transmetran sempre llurs transaccions, fins i tot si ja són a la mempool. Això és útil, p. ex., per a una passarel·la</translation> </message> <message> + <source>Accept public REST requests (default: %u)</source> + <translation>Accepta sol·licituds REST públiques (per defecte: %u)</translation> + </message> + <message> <source>Cannot resolve -whitebind address: '%s'</source> <translation>No es pot resoldre l'adreça -whitebind: «%s»</translation> </message> <message> + <source>Choose data directory on startup (default: 0)</source> + <translation>Tria el directori de dades a l'inici (per defecte: 0)</translation> + </message> + <message> <source>Connect through SOCKS5 proxy</source> <translation>Connecta a través del proxy SOCKS5</translation> </message> @@ -2966,6 +2990,10 @@ per exemple: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo.com <translation>Error en carregar wallet.dat: el moneder requereix una versió més nova del Bitcoin core</translation> </message> <message> + <source>Error reading from database, shutting down.</source> + <translation>Error en llegir la base de dades, tancant.</translation> + </message> + <message> <source>Error: Unsupported argument -tor found, use -onion.</source> <translation>Error: s'ha trobat un argument -tor no acceptat. Feu servir -onion.</translation> </message> @@ -2982,6 +3010,10 @@ per exemple: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo.com <translation>Ha fallat la inicialització de la comprovació de validesa. El Bitcoin Core s'està aturant.</translation> </message> <message> + <source>Invalid amount for -maxtxfee=<amount>: '%s'</source> + <translation>Import no vàlid per a -maxtxfee=<amount>: '%s'</translation> + </message> + <message> <source>Invalid amount for -minrelaytxfee=<amount>: '%s'</source> <translation>Import no vàlid per a -minrelaytxfee=<amount>: «%s»</translation> </message> @@ -2998,8 +3030,8 @@ per exemple: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo.com <translation>S'ha especificat una màscara de xarxa no vàlida a -whitelist: «%s»</translation> </message> <message> - <source>Keep at most <n> unconnectable blocks in memory (default: %u)</source> - <translation>Manté com a màxim <n> blocs no connectables en memòria (per defecte: %u)</translation> + <source>Keep at most <n> unconnectable transactions in memory (default: %u)</source> + <translation>Manté com a màxim <n> transaccions no connectables en memòria (per defecte: %u)</translation> </message> <message> <source>Need to specify a port with -whitebind: '%s'</source> @@ -3010,10 +3042,6 @@ per exemple: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo.com <translation>Opcions de transmissió del node:</translation> </message> <message> - <source>Print block on startup, if found in block index</source> - <translation>Imprimeix el block a l'inici, si es troba l'índex de blocs</translation> - </message> - <message> <source>RPC SSL options: (see the Bitcoin Wiki for SSL setup instructions)</source> <translation>Opcions RPC SSL: (veieu el wiki del Bitcoin per a instruccions de configuració de l'SSL)</translation> </message> @@ -3022,6 +3050,10 @@ per exemple: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo.com <translation>Opcions del servidor RPC:</translation> </message> <message> + <source>RPC support for HTTP persistent connections (default: %d)</source> + <translation>Suport RPC per a connexions HTTP persistents (per defecte: %d)</translation> + </message> + <message> <source>Randomly drop 1 of every <n> network messages</source> <translation>Descarta a l'atzar 1 de cada <n> missatges de la xarxa</translation> </message> @@ -3034,10 +3066,26 @@ per exemple: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo.com <translation>Envia informació de traça/depuració a la consola en comptes del fitxer debug.log</translation> </message> <message> + <source>Send transactions as zero-fee transactions if possible (default: %u)</source> + <translation>Envia les transaccions com a transaccions de comissió zero sempre que sigui possible (per defecte: %u) </translation> + </message> + <message> + <source>Set SSL root certificates for payment request (default: -system-)</source> + <translation>Defineix certificats arrel SSL per a la sol·licitud de pagament (per defecte: -sistema-)</translation> + </message> + <message> + <source>Set language, for example "de_DE" (default: system locale)</source> + <translation>Defineix un idioma, per exemple «de_DE» (per defecte: preferències locals de sistema)</translation> + </message> + <message> <source>Show all debugging options (usage: --help -help-debug)</source> <translation>Mostra totes les opcions de depuració (ús: --help --help-debug)</translation> </message> <message> + <source>Show splash screen on startup (default: 1)</source> + <translation>Mostra la finestra de benvinguda a l'inici (per defecte: 1)</translation> + </message> + <message> <source>Shrink debug.log file on client startup (default: 1 when no -debug)</source> <translation>Redueix el fitxer debug.log durant l'inici del client (per defecte: 1 quan no -debug)</translation> </message> @@ -3046,6 +3094,10 @@ per exemple: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo.com <translation>Ha fallat la signatura de la transacció</translation> </message> <message> + <source>Start minimized</source> + <translation>Inicia minimitzat</translation> + </message> + <message> <source>This is experimental software.</source> <translation>Això és programari experimental.</translation> </message> @@ -3058,6 +3110,10 @@ per exemple: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo.com <translation>Els imports de les transaccions han de ser positius</translation> </message> <message> + <source>Transaction too large for fee policy</source> + <translation>Transacció massa gran per a la política de comissions</translation> + </message> + <message> <source>Transaction too large</source> <translation>La transacció és massa gran</translation> </message> @@ -3082,10 +3138,6 @@ per exemple: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo.com <translation>Avís</translation> </message> <message> - <source>Warning: This version is obsolete, upgrade required!</source> - <translation>Avís: aquesta versió està obsoleta. És necessari actualitzar-la!</translation> - </message> - <message> <source>Warning: Unsupported argument -benchmark ignored, use -debug=bench.</source> <translation>Avís: s'ha ignorat l'argument no acceptat de -benchmark. Feu servir -debug=bench.</translation> </message> @@ -3142,14 +3194,170 @@ per exemple: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo.com <translation>Error en carregar wallet.dat: Moneder corrupte</translation> </message> <message> + <source>(1 = keep tx meta data e.g. account owner and payment request information, 2 = drop tx meta data)</source> + <translation>(1 = manté les metadades de les tx, p. ex., propietari del compte i informació de sol·licitud del pagament, 2 = prescindeix de les metadades de les tx)</translation> + </message> + <message> + <source>Flush database activity from memory pool to disk log every <n> megabytes (default: %u)</source> + <translation>Buida l'activitat de la base de dades de la memòria disponible al registre del disc cada <n> megabytes (per defecte: %u)</translation> + </message> + <message> + <source>How thorough the block verification of -checkblocks is (0-4, default: %u)</source> + <translation>Com d'exhaustiva és la verificació de blocs del -checkblocks (0-4, per defecte: %u)</translation> + </message> + <message> + <source>Log transaction priority and fee per kB when mining blocks (default: %u)</source> + <translation>Enregistreu la prioritat de la transacció i la comissió per kB en minar blocs (per defecte: %u)</translation> + </message> + <message> + <source>Maintain a full transaction index, used by the getrawtransaction rpc call (default: %u)</source> + <translation>Manté un índex complet de transaccions, utilitzat per la crida rpc getrawtransaction (per defecte: %u)</translation> + </message> + <message> + <source>Number of seconds to keep misbehaving peers from reconnecting (default: %u)</source> + <translation>Nombre de segons necessaris perquè els iguals de comportament qüestionable puguin tornar a connectar-se (per defecte: %u)</translation> + </message> + <message> + <source>Output debugging information (default: %u, supplying <category> is optional)</source> + <translation>Informació de sortida de la depuració (per defecte: %u, proporcionar <category> és opcional)</translation> + </message> + <message> + <source>Use separate SOCKS5 proxy to reach peers via Tor hidden services (default: %s)</source> + <translation>Utilitza un proxy SOCKS4 apart per a arribar als iguals a través de serveis ocults de Tor (per defecte: %s)</translation> + </message> + <message> + <source>(default: %s)</source> + <translation>(per defecte: %s)</translation> + </message> + <message> + <source>Acceptable ciphers (default: %s)</source> + <translation>Xifrats acceptables (per defecte: %s)</translation> + </message> + <message> + <source>Always query for peer addresses via DNS lookup (default: %u)</source> + <translation>Demana sempre les adreces dels iguals a través de consultes DNS (per defecte: %u)</translation> + </message> + <message> + <source>Disable safemode, override a real safe mode event (default: %u)</source> + <translation>Inhabilita el mode segur, sobreescriu un esdeveniment de mode segur real (per defecte: %u) </translation> + </message> + <message> <source>Error loading wallet.dat</source> <translation>Error en carregar wallet.dat</translation> </message> <message> + <source>Force safe mode (default: %u)</source> + <translation>Força el mode segur (per defecte: %u)</translation> + </message> + <message> + <source>Generate coins (default: %u)</source> + <translation>Genera monedes (per defecte: %u)</translation> + </message> + <message> + <source>How many blocks to check at startup (default: %u, 0 = all)</source> + <translation>Quants blocs per comprovar a l'inici (per defecte: %u, 0 = tots)</translation> + </message> + <message> + <source>Include IP addresses in debug output (default: %u)</source> + <translation>Inclou l'adreça IP a la sortida de depuració (per defecte: %u)</translation> + </message> + <message> <source>Invalid -proxy address: '%s'</source> <translation>Adreça -proxy invalida: '%s'</translation> </message> <message> + <source>Limit size of signature cache to <n> entries (default: %u)</source> + <translation>Limita la mida de la cau de signatura a <n> entrades (per defecte: %u)</translation> + </message> + <message> + <source>Listen for JSON-RPC connections on <port> (default: %u or testnet: %u)</source> + <translation>Escolta les connexions JSON-RPC en <port> (per defecte: %u o testnet: %u)</translation> + </message> + <message> + <source>Listen for connections on <port> (default: %u or testnet: %u)</source> + <translation>Escolta les connexions en <port> (per defecte: %u o testnet: %u)</translation> + </message> + <message> + <source>Maintain at most <n> connections to peers (default: %u)</source> + <translation>Manté com a màxim <n> connexions a iguals (per defecte: %u)</translation> + </message> + <message> + <source>Maximum per-connection receive buffer, <n>*1000 bytes (default: %u)</source> + <translation>Memòria intermèdia màxima de recepció per connexió, <n>*1000 bytes (per defecte: %u)</translation> + </message> + <message> + <source>Maximum per-connection send buffer, <n>*1000 bytes (default: %u)</source> + <translation>Memòria intermèdia màxima d'enviament per connexió, <n>*1000 bytes (per defecte: %u)</translation> + </message> + <message> + <source>Only accept block chain matching built-in checkpoints (default: %u)</source> + <translation>Només accepta els punts de control integrats que coincideixen amb la cadena de blocs (per defecte: %u)</translation> + </message> + <message> + <source>Prepend debug output with timestamp (default: %u)</source> + <translation>Posa davant de la sortida de depuració una marca horària (per defecte: %u)</translation> + </message> + <message> + <source>Relay and mine data carrier transactions (default: %u)</source> + <translation>Retransmet i mina les transaccions de l'operador (per defecte: %u)</translation> + </message> + <message> + <source>Relay non-P2SH multisig (default: %u)</source> + <translation>Retransmet multisig no P2SH (per defecte: %u)</translation> + </message> + <message> + <source>Run a thread to flush wallet periodically (default: %u)</source> + <translation>Executa un fil per buidar el moneder periòdicament (per defecte: %u)</translation> + </message> + <message> + <source>Server certificate file (default: %s)</source> + <translation>Fitxer de certificat del servidor (per defecte: %s)</translation> + </message> + <message> + <source>Server private key (default: %s)</source> + <translation>Clau privada del servidor (per defecte: %s)</translation> + </message> + <message> + <source>Set key pool size to <n> (default: %u)</source> + <translation>Defineix la mida clau disponible a <n> (per defecte: %u)</translation> + </message> + <message> + <source>Set minimum block size in bytes (default: %u)</source> + <translation>Defineix la mida de bloc mínima en bytes (per defecte: %u)</translation> + </message> + <message> + <source>Set the number of threads to service RPC calls (default: %d)</source> + <translation>Defineix el nombre de fils a crides de servei RPC (per defecte: %d)</translation> + </message> + <message> + <source>Sets the DB_PRIVATE flag in the wallet db environment (default: %u)</source> + <translation>Defineix el senyalador DB_PRIVATE en l'entorn db del moneder (per defecte: %u)</translation> + </message> + <message> + <source>Specify configuration file (default: %s)</source> + <translation>Especifica el fitxer de configuració (per defecte: %s)</translation> + </message> + <message> + <source>Specify connection timeout in milliseconds (minimum: 1, default: %d)</source> + <translation>Especifica el temps d'espera de la connexió en milisegons (mínim: 1, per defecte: %d)</translation> + </message> + <message> + <source>Specify pid file (default: %s)</source> + <translation>Especifica el fitxer pid (per defecte: %s)</translation> + </message> + <message> + <source>Spend unconfirmed change when sending transactions (default: %u)</source> + <translation>Gasta el canvi no confirmat en enviar les transaccions (per defecte: %u)</translation> + </message> + <message> + <source>Stop running after importing blocks from disk (default: %u)</source> + <translation>Atura l'execució després d'importar blocs del disc (per defecte: %u)</translation> + </message> + <message> + <source>Threshold for disconnecting misbehaving peers (default: %u)</source> + <translation>Llindar per a desconnectar els iguals de comportament qüestionable (per defecte: %u)</translation> + </message> + <message> <source>Unknown network specified in -onlynet: '%s'</source> <translation>Xarxa desconeguda especificada a -onlynet: '%s'</translation> </message> @@ -3166,10 +3374,6 @@ per exemple: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo.com <translation>Import no vàlid per a -paytxfee=<amount>: «%s»</translation> </message> <message> - <source>Invalid amount</source> - <translation>Import no vàlid</translation> - </message> - <message> <source>Insufficient funds</source> <translation>Balanç insuficient</translation> </message> @@ -3202,10 +3406,6 @@ per exemple: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo.com <translation>Ha acabat la càrrega</translation> </message> <message> - <source>To use the %s option</source> - <translation>Utilitza l'opció %s</translation> - </message> - <message> <source>Error</source> <translation>Error</translation> </message> diff --git a/src/qt/locale/bitcoin_cmn.ts b/src/qt/locale/bitcoin_cmn.ts index 09ff0acf02..3286f12698 100644 --- a/src/qt/locale/bitcoin_cmn.ts +++ b/src/qt/locale/bitcoin_cmn.ts @@ -1,4 +1,4 @@ -<TS language="cmn" version="2.0"> +<TS language="cmn" version="2.1"> <context> <name>AddressBookPage</name> </context> diff --git a/src/qt/locale/bitcoin_cs.ts b/src/qt/locale/bitcoin_cs.ts index bc2a2ef7b5..b4d9ca146d 100644 --- a/src/qt/locale/bitcoin_cs.ts +++ b/src/qt/locale/bitcoin_cs.ts @@ -1,9 +1,9 @@ -<TS language="cs" version="2.0"> +<TS language="cs" version="2.1"> <context> <name>AddressBookPage</name> <message> - <source>Double-click to edit address or label</source> - <translation>Dvojklikem myši začneš upravovat označení adresy</translation> + <source>Right-click to edit address or label</source> + <translation>Pravým tlačítkem myši začneš upravovat označení adresy</translation> </message> <message> <source>Create a new address</source> @@ -156,10 +156,6 @@ <translation>Změň heslo</translation> </message> <message> - <source>Enter the old and new passphrase to the wallet.</source> - <translation>Zadej staré a nové heslo k peněžence.</translation> - </message> - <message> <source>Confirm wallet encryption</source> <translation>Potvrď zašifrování peněženky</translation> </message> @@ -188,10 +184,6 @@ <translation>Zadej nové heslo k peněžence.<br/>Použij <b>alespoň deset náhodných znaků</b> nebo <b>alespoň osm slov</b>.</translation> </message> <message> - <source>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>Bitcoin se teď ukončí, aby dokončil zašifrování. Pamatuj však, že pouhé zašifrování peněženky úplně nezabraňuje krádeži tvých bitcoinů malwarem, kterým se může počítač nakazit.</translation> - </message> - <message> <source>Wallet encryption failed</source> <translation>Zašifrování peněženky selhalo</translation> </message> @@ -311,10 +303,6 @@ <translation>Pošli mince na Bitcoinovou adresu</translation> </message> <message> - <source>Modify configuration options for Bitcoin</source> - <translation>Uprav nastavení Bitcoinu</translation> - </message> - <message> <source>Backup wallet to another location</source> <translation>Zazálohuj peněženku na jiné místo</translation> </message> @@ -430,10 +418,26 @@ <source>No block source available...</source> <translation>Není dostupný žádný zdroj bloků...</translation> </message> + <message numerus="yes"> + <source>%n hour(s)</source> + <translation><numerusform>%n hodinu</numerusform><numerusform>%n hodiny</numerusform><numerusform>%n hodin</numerusform></translation> + </message> + <message numerus="yes"> + <source>%n day(s)</source> + <translation><numerusform>%n den</numerusform><numerusform>%n dny</numerusform><numerusform>%n dnů</numerusform></translation> + </message> + <message numerus="yes"> + <source>%n week(s)</source> + <translation><numerusform>%n týden</numerusform><numerusform>%n týdny</numerusform><numerusform>%n týdnů</numerusform></translation> + </message> <message> <source>%1 and %2</source> <translation>%1 a %2</translation> </message> + <message numerus="yes"> + <source>%n year(s)</source> + <translation><numerusform>%n rok</numerusform><numerusform>%n roky</numerusform><numerusform>%n roků</numerusform></translation> + </message> <message> <source>%1 behind</source> <translation>Stahuji ještě bloky transakcí za poslední %1</translation> @@ -475,18 +479,6 @@ <translation>Příchozí transakce</translation> </message> <message> - <source>Date: %1 -Amount: %2 -Type: %3 -Address: %4 -</source> - <translation>Datum: %1 -Částka: %2 -Typ: %3 -Adresa: %4 -</translation> - </message> - <message> <source>Wallet is <b>encrypted</b> and currently <b>unlocked</b></source> <translation>Peněženka je <b>zašifrovaná</b> a momentálně <b>odemčená</b></translation> </message> @@ -505,6 +497,10 @@ Adresa: %4 <context> <name>CoinControlDialog</name> <message> + <source>Coin Selection</source> + <translation>Výběr mincí</translation> + </message> + <message> <source>Quantity:</source> <translation>Počet:</translation> </message> @@ -553,6 +549,14 @@ Adresa: %4 <translation>Částka</translation> </message> <message> + <source>Received with label</source> + <translation>Příjem na označení</translation> + </message> + <message> + <source>Received with address</source> + <translation>Příjem na adrese</translation> + </message> + <message> <source>Date</source> <translation>Datum</translation> </message> @@ -677,10 +681,6 @@ Adresa: %4 <translation>ne</translation> </message> <message> - <source>This label turns red, if the transaction size is greater than 1000 bytes.</source> - <translation>Popisek zčervená, pokud je velikost transakce větší než 1000 bajtů.</translation> - </message> - <message> <source>This means a fee of at least %1 per kB is required.</source> <translation>To znamená, že je vyžadován poplatek alespoň %1 za kB.</translation> </message> @@ -693,14 +693,6 @@ Adresa: %4 <translation>Transakce s vyšší prioritou mají větší šanci na zařazení do bloku.</translation> </message> <message> - <source>This label turns red, if the priority is smaller than "medium".</source> - <translation>Popisek zčervená, pokud je priorita menší než „střední“.</translation> - </message> - <message> - <source>This label turns red, if any recipient receives an amount smaller than %1.</source> - <translation>Popisek zčervená, pokud má některý příjemce obdržet částku menší než %1.</translation> - </message> - <message> <source>(no label)</source> <translation>(bez označení)</translation> </message> @@ -821,30 +813,6 @@ Adresa: %4 <source>command-line options</source> <translation>možnosti příkazové řádky</translation> </message> - <message> - <source>UI options</source> - <translation>Možnosti UI</translation> - </message> - <message> - <source>Set language, for example "de_DE" (default: system locale)</source> - <translation>Nastavit jazyk, například "de_DE" (výchozí: systémové nastavení)</translation> - </message> - <message> - <source>Start minimized</source> - <translation>Nastartovat minimalizovaně</translation> - </message> - <message> - <source>Set SSL root certificates for payment request (default: -system-)</source> - <translation>Nastavit kořenové SSL certifikáty pro platební požadavky (výchozí: -system-)</translation> - </message> - <message> - <source>Show splash screen on startup (default: 1)</source> - <translation>Zobrazit startovací obrazovku (výchozí: 1)</translation> - </message> - <message> - <source>Choose data directory on startup (default: 0)</source> - <translation>Zvolit adresář pro data při startu (výchozí: 0)</translation> - </message> </context> <context> <name>Intro</name> @@ -884,7 +852,15 @@ Adresa: %4 <source>Error</source> <translation>Chyba</translation> </message> - </context> + <message numerus="yes"> + <source>%n GB of free space available</source> + <translation><numerusform>%n GB volného místa</numerusform><numerusform>%n GB volného místa</numerusform><numerusform>%n GB volného místa</numerusform></translation> + </message> + <message numerus="yes"> + <source>(of %n GB needed)</source> + <translation><numerusform>(z potřebného %n GB)</numerusform><numerusform>(z potřebných %n GB)</numerusform><numerusform>(z potřebných %n GB)</numerusform></translation> + </message> +</context> <context> <name>OpenURIDialog</name> <message> @@ -919,14 +895,6 @@ Adresa: %4 <translation>&Hlavní</translation> </message> <message> - <source>Automatically start Bitcoin after logging in to the system.</source> - <translation>Automaticky spustí Bitcoin po přihlášení do systému.</translation> - </message> - <message> - <source>&Start Bitcoin on system login</source> - <translation>S&pustit Bitcoin po přihlášení do systému</translation> - </message> - <message> <source>Size of &database cache</source> <translation>Velikost &databázové cache</translation> </message> @@ -1007,6 +975,14 @@ Adresa: %4 <translation>Namapovat port přes &UPnP</translation> </message> <message> + <source>Connect to the Bitcoin network through a SOCKS5 proxy.</source> + <translation>Připojí se do Bitcoinové sítě přes SOCKS5 proxy.</translation> + </message> + <message> + <source>&Connect through SOCKS5 proxy (default proxy):</source> + <translation>&Připojit přes SOCKS5 proxy (výchozí proxy):</translation> + </message> + <message> <source>Proxy &IP:</source> <translation>&IP adresa proxy:</translation> </message> @@ -1031,10 +1007,6 @@ Adresa: %4 <translation>&Minimalizovávat do ikony v panelu</translation> </message> <message> - <source>Minimize instead of exit the application when the window is closed. When this option is enabled, the application will be closed only after selecting Quit in the menu.</source> - <translation>Zavřením se aplikace minimalizuje. Pokud je tato volba zaškrtnuta, tak se aplikace ukončí pouze zvolením Konec v menu.</translation> - </message> - <message> <source>M&inimize on close</source> <translation>Za&vřením minimalizovat</translation> </message> @@ -1047,10 +1019,6 @@ Adresa: %4 <translation>&Jazyk uživatelského rozhraní:</translation> </message> <message> - <source>The user interface language can be set here. This setting will take effect after restarting Bitcoin.</source> - <translation>Tady lze nastavit jazyk uživatelského rozhraní. Nastavení se projeví až po restartování Bitcoinu.</translation> - </message> - <message> <source>&Unit to show amounts in:</source> <translation>J&ednotka pro částky:</translation> </message> @@ -1087,10 +1055,6 @@ Adresa: %4 <translation>K aktivaci změn je potřeba restartovat klienta.</translation> </message> <message> - <source>Client will be shutdown, do you want to proceed?</source> - <translation>Klient se vypne, chceš pokračovat?</translation> - </message> - <message> <source>This change would require a client restart.</source> <translation>Tahle změna bude chtít restartovat klienta.</translation> </message> @@ -1138,6 +1102,10 @@ Adresa: %4 <translation>Vytěžené mince, které ještě nejsou zralé</translation> </message> <message> + <source>Balances</source> + <translation>Stavy účtů</translation> + </message> + <message> <source>Total:</source> <translation>Celkem:</translation> </message> @@ -1150,6 +1118,14 @@ Adresa: %4 <translation>Aktuální stav účtu sledovaných adres</translation> </message> <message> + <source>Spendable:</source> + <translation>Běžné:</translation> + </message> + <message> + <source>Recent transactions</source> + <translation>Poslední transakce</translation> + </message> + <message> <source>Unconfirmed transactions to watch-only addresses</source> <translation>Nepotvrzené transakce sledovaných adres</translation> </message> @@ -1185,10 +1161,6 @@ Adresa: %4 <translation>Síť platebního požadavku neodpovídá síti klienta.</translation> </message> <message> - <source>Payment request has expired.</source> - <translation>Platební požadavek vypršel.</translation> - </message> - <message> <source>Payment request is not initialized.</source> <translation>Platební požadavek není zahájený.</translation> </message> @@ -1229,6 +1201,14 @@ Adresa: %4 <translation>Vrácení peněz od %1</translation> </message> <message> + <source>Payment request %1 is too large (%2 bytes, allowed %3 bytes).</source> + <translation>Platební požadavek %1 je moc velký (%2 bajtů, povoleno %3 bajtů).</translation> + </message> + <message> + <source>Payment request DoS protection</source> + <translation>DoS ochrana platebního požadavku</translation> + </message> + <message> <source>Error communicating with %1: %2</source> <translation>Chyba při komunikaci s %1: %2</translation> </message> @@ -1256,10 +1236,6 @@ Adresa: %4 <translation>Typ klienta</translation> </message> <message> - <source>Address/Hostname</source> - <translation>Adresa/Název hostitele</translation> - </message> - <message> <source>Ping Time</source> <translation>Odezva</translation> </message> @@ -1291,14 +1267,6 @@ Adresa: %4 <translation>%1 s</translation> </message> <message> - <source>NETWORK</source> - <translation>SÍŤ</translation> - </message> - <message> - <source>UNKNOWN</source> - <translation>NEZNÁMÁ</translation> - </message> - <message> <source>None</source> <translation>Žádné</translation> </message> @@ -1497,18 +1465,10 @@ Adresa: %4 <translation>Soubor s ladicími záznamy</translation> </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>Otevři soubor s ladicími záznamy Bitcoinu z aktuálního datového adresáře. U velkých logů to může pár vteřin zabrat.</translation> - </message> - <message> <source>Clear console</source> <translation>Vyčistit konzoli</translation> </message> <message> - <source>Welcome to the Bitcoin RPC console.</source> - <translation>Vítej v Bitcoinové RPC konzoli.</translation> - </message> - <message> <source>Use up and down arrows to navigate history, and <b>Ctrl-L</b> to clear screen.</source> <translation>V historii se pohybuješ šipkami nahoru a dolů a pomocí <b>Ctrl-L</b> čistíš obrazovku.</translation> </message> @@ -1785,6 +1745,70 @@ Adresa: %4 <translation>Vlastní adresa pro drobné</translation> </message> <message> + <source>Transaction Fee:</source> + <translation>Transakční poplatek:</translation> + </message> + <message> + <source>Choose...</source> + <translation>Zvol...</translation> + </message> + <message> + <source>collapse fee-settings</source> + <translation>sbal nastavení poplatků</translation> + </message> + <message> + <source>per kilobyte</source> + <translation>za kilobajt</translation> + </message> + <message> + <source>If the custom fee is set to 1000 satoshis and the transaction is only 250 bytes, then "per kilobyte" only pays 250 satoshis in fee, while "total at least" pays 1000 satoshis. For transactions bigger than a kilobyte both pay by kilobyte.</source> + <translation>Pokud je vlastní poplatek nastavený na 1000 satoshi a transakce má pouze 250 bajtů, tak „za kilobajt“ zaplatí poplatek jen 250 satoshi, zatímco „přinejmenším“ zaplatí 1000 satoshi. Pro transakce větší než kilobajt obě možnosti platí za kilobajt.</translation> + </message> + <message> + <source>total at least</source> + <translation>přinejmenším</translation> + </message> + <message> + <source>Paying only the minimum fee is just fine as long as there is less transaction volume than space in the blocks. But be aware that this can end up in a never confirming transaction once there is more demand for bitcoin transactions than the network can process.</source> + <translation>Platit jen minimální poplatek je v pořádku, pokud je zrovna méně transakcí než místa v blocích. Ale počítej s tím, že to také může skončit transakcí, která nikdy nebude potvrzena, pokud je větší poptávka po bitcoinových transakcích, než síť zvládne zpracovat.</translation> + </message> + <message> + <source>(read the tooltip)</source> + <translation>(viz bublina)</translation> + </message> + <message> + <source>Recommended:</source> + <translation>Doporučený:</translation> + </message> + <message> + <source>Custom:</source> + <translation>Vlastní:</translation> + </message> + <message> + <source>(Smart fee not initialized yet. This usually takes a few blocks...)</source> + <translation>(Inteligentní poplatek ještě není inicializovaný. Obvykle mu to tak pár bloků trvá...)</translation> + </message> + <message> + <source>Confirmation time:</source> + <translation>Rychlost potvrzení:</translation> + </message> + <message> + <source>normal</source> + <translation>normální</translation> + </message> + <message> + <source>fast</source> + <translation>rychlá</translation> + </message> + <message> + <source>Send as zero-fee transaction if possible</source> + <translation>Pošli transakci pokud možno bez poplatku</translation> + </message> + <message> + <source>(confirmation may take longer)</source> + <translation>(potvrzení může trvat déle)</translation> + </message> + <message> <source>Send to multiple recipients at once</source> <translation>Pošli více příjemcům naráz</translation> </message> @@ -1861,10 +1885,6 @@ Adresa: %4 <translation>nebo</translation> </message> <message> - <source>The recipient address is not valid, please recheck.</source> - <translation>Adresa příjemce je neplatná, překontroluj ji prosím.</translation> - </message> - <message> <source>The amount to pay must be larger than 0.</source> <translation>Odesílaná částka musí být větší než 0.</translation> </message> @@ -1877,10 +1897,6 @@ Adresa: %4 <translation>Celková částka při připočítání poplatku %1 překročí stav účtu.</translation> </message> <message> - <source>Duplicate address found, can only send to each address once per send operation.</source> - <translation>Zaznamenána duplikovaná adresa; každá adresa může být v odesílané platbě pouze jednou.</translation> - </message> - <message> <source>Transaction creation failed!</source> <translation>Vytvoření transakce selhalo!</translation> </message> @@ -1889,6 +1905,10 @@ Adresa: %4 <translation>Transakce byla odmítnuta! Tohle může nastat, pokud nějaké mince z tvé peněženky už jednou byly utraceny, například pokud používáš kopii souboru wallet.dat a mince byly utraceny v druhé kopii, ale nebyly označeny jako utracené v této.</translation> </message> <message> + <source>Pay only the minimum fee of %1</source> + <translation>Zaplatit pouze minimální poplatek %1</translation> + </message> + <message> <source>Warning: Invalid Bitcoin address</source> <translation>Upozornění: Neplatná Bitcoinová adresa</translation> </message> @@ -1964,10 +1984,6 @@ Adresa: %4 <translation>Zpráva:</translation> </message> <message> - <source>This is a verified payment request.</source> - <translation>Tohle je ověřený platební požadavek.</translation> - </message> - <message> <source>Enter a label for this address to add it to the list of used addresses</source> <translation>Zadej označení této adresy; obojí se ti pak uloží do adresáře</translation> </message> @@ -1976,10 +1992,6 @@ Adresa: %4 <translation>Zpráva, která byla připojena k bitcoin: URI a která se ti pro přehled uloží k transakci. Poznámka: Tahle zpráva se neposílá s platbou po Bitcoinové síti.</translation> </message> <message> - <source>This is an unverified payment request.</source> - <translation>Tohle je neověřený platební požadavek.</translation> - </message> - <message> <source>Pay To:</source> <translation>Komu:</translation> </message> @@ -2010,10 +2022,6 @@ Adresa: %4 <translation>&Podepiš zprávu</translation> </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>Podepsáním zprávy svými adresami můžeš prokázat, že je skutečně vlastníš. Buď opatrný a nepodepisuj nic vágního; například při phishingových útocích můžeš být lákán, abys něco takového podepsal. Podepisuj pouze zcela úplná a detailní prohlášení, se kterými souhlasíš.</translation> - </message> - <message> <source>The Bitcoin address to sign the message with</source> <translation>Bitcoinová adresa, kterou se zpráva podepíše</translation> </message> @@ -2066,10 +2074,6 @@ Adresa: %4 <translation>&Ověř zprávu</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>K ověření podpisu zprávy zadej podepisující adresu, zprávu (ověř si, že správně kopíruješ zalomení řádků, mezery, tabulátory apod.) a podpis. Dávej pozor na to, abys nezkopíroval do podpisu víc, než co je v samotné podepsané zprávě, abys nebyl napálen man-in-the-middle útokem.</translation> - </message> - <message> <source>The Bitcoin address the message was signed with</source> <translation>Bitcoinová adresa, kterou je zpráva podepsána</translation> </message> @@ -2216,7 +2220,7 @@ Adresa: %4 </message> <message> <source>watch-only</source> - <translation>sledovací</translation> + <translation>sledovaná</translation> </message> <message> <source>label</source> @@ -2226,6 +2230,10 @@ Adresa: %4 <source>Credit</source> <translation>Příjem</translation> </message> + <message numerus="yes"> + <source>matures in %n more block(s)</source> + <translation><numerusform>dozraje po %n bloku</numerusform><numerusform>dozraje po %n blocích</numerusform><numerusform>dozraje po %n blocích</numerusform></translation> + </message> <message> <source>not accepted</source> <translation>neakceptováno</translation> @@ -2329,10 +2337,6 @@ Adresa: %4 <translation>Typ</translation> </message> <message> - <source>Address</source> - <translation>Adresa</translation> - </message> - <message> <source>Immature (%1 confirmations, will be available after %2)</source> <translation>Nedozráno (%1 potvrzení, bude k dispozici za %2)</translation> </message> @@ -2361,6 +2365,10 @@ Adresa: %4 <translation>Offline</translation> </message> <message> + <source>Label</source> + <translation>Označení</translation> + </message> + <message> <source>Unconfirmed</source> <translation>Nepotvrzeno</translation> </message> @@ -2413,8 +2421,8 @@ Adresa: %4 <translation>Druh transakce.</translation> </message> <message> - <source>Destination address of transaction.</source> - <translation>Cílová adresa transakce.</translation> + <source>Whether or not a watch-only address is involved in this transaction.</source> + <translation>Zda tato transakce zahrnuje i některou sledovanou adresu.</translation> </message> <message> <source>Amount removed from or added to balance.</source> @@ -2508,6 +2516,10 @@ Adresa: %4 <translation>Exportuj transakční historii</translation> </message> <message> + <source>Watch-only</source> + <translation>Sledovaná</translation> + </message> + <message> <source>Exporting Failed</source> <translation>Exportování selhalo</translation> </message> @@ -2651,30 +2663,6 @@ Adresa: %4 <translation>Přijímat spojení zvenčí (výchozí: 1, pokud není zadáno -proxy nebo -connect)</translation> </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>%s, musíš nastavit rpcpassword v konfiguračním souboru: -%s -Je vhodné použít následující náhodné heslo: -rpcuser=bitcoinrpc -rpcpassword=%s -(není potřeba si ho pamatovat) -rpcuser a rpcpassword NESMÍ být stejné. -Pokud konfigurační soubor ještě neexistuje, vytvoř ho tak, aby ho mohl číst pouze vlastník. -Je také doporučeno si nastavit alertnotify, abys byl upozorněn na případné problémy; -například: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo.com -</translation> - </message> - <message> <source>Bind to given address and always listen on it. Use [host]:port notation for IPv6</source> <translation>Poslouchat na zadané adrese. Pro zápis IPv6 adresy použij notaci [adresa]:port</translation> </message> @@ -2683,16 +2671,12 @@ například: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo.com <translation>Smazat všechny transakce peněženky a při startu obnovit pouze relevantní části řetězce bloků pomocí -rescan</translation> </message> <message> - <source>Enter regression test mode, which uses a special chain in which blocks can be solved instantly.</source> - <translation>Přepnout do módu testování regresí, který používá speciální řetězec, ve kterém mohou být bloky okamžitě vyřešeny.</translation> - </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>Chyba: Transakce byla odmítnuta! Tohle může nastat, pokud nějaké mince z tvé peněženky už jednou byly utraceny, například pokud používáš kopii souboru wallet.dat a mince byly utraceny v druhé kopii, ale nebyly označeny jako utracené v této.</translation> + <source>Distributed under the MIT software license, see the accompanying file COPYING or <http://www.opensource.org/licenses/mit-license.php>.</source> + <translation>Šířen pod softwarovou licencí MIT, viz přiložený soubor COPYING nebo <http://www.opensource.org/licenses/mit-license.php>.</translation> </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>Chyba: Tahle transakce vyžaduje transakční poplatek nejméně %s kvůli velikosti zasílané částky, komplexnosti nebo použití nedávno přijatých mincí!</translation> + <source>Enter regression test mode, which uses a special chain in which blocks can be solved instantly.</source> + <translation>Přepnout do módu testování regresí, který používá speciální řetězec, ve kterém mohou být bloky okamžitě vyřešeny.</translation> </message> <message> <source>Execute command when a wallet transaction changes (%s in cmd is replaced by TxID)</source> @@ -2735,6 +2719,10 @@ například: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo.com <translation>Upozornění: soubor wallet.dat je poškozený, data jsou však zachráněna! Původní soubor wallet.dat je uložený jako wallet.{timestamp}.bak v %s. Pokud je stav tvého účtu nebo transakce nesprávné, zřejmě bys měl obnovit zálohu.</translation> </message> <message> + <source>Whitelist peers connecting from the given netmask or IP address. Can be specified multiple times.</source> + <translation>Umístit na bílou listinu protějšky připojující se z dané podsítě či IP adresy. Lze zadat i vícekrát.</translation> + </message> + <message> <source>(default: 1)</source> <translation>(výchozí: 1)</translation> </message> @@ -2767,10 +2755,6 @@ například: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo.com <translation>Možnosti ladění/testování:</translation> </message> <message> - <source>Discover own IP address (default: 1 when listening and no -externalip)</source> - <translation>Zjistit vlastní IP adresu (výchozí: 1, pokud naslouchá a není zadáno -externalip)</translation> - </message> - <message> <source>Do not load the wallet and disable wallet RPC calls</source> <translation>Nenačítat peněženku a vypnout její RPC volání</translation> </message> @@ -2795,12 +2779,12 @@ například: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo.com <translation>Chyba při otevírání databáze bloků</translation> </message> <message> - <source>Error: Disk space is low!</source> - <translation>Problém: Na disku je málo místa!</translation> + <source>Error: A fatal internal error occured, see debug.log for details</source> + <translation>Chyba: Stala se fatální vnitřní chyba. detaily viz v debug.log</translation> </message> <message> - <source>Error: Wallet locked, unable to create transaction!</source> - <translation>Chyba: Peněženka je zamčená, nemohu vytvořit transakci!</translation> + <source>Error: Disk space is low!</source> + <translation>Problém: Na disku je málo místa!</translation> </message> <message> <source>Failed to listen on any port. Use -listen=0 if you want this.</source> @@ -2827,8 +2811,8 @@ například: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo.com <translation>Je nedostatek deskriptorů souborů.</translation> </message> <message> - <source>Rebuild block chain index from current blk000??.dat files</source> - <translation>Znovu vytvořit index řetězce bloků z aktuálních blk000??.dat souborů</translation> + <source>Only connect to nodes in network <net> (ipv4, ipv6 or onion)</source> + <translation>Připojovat se pouze k uzlům v <net> síti (ipv4, ipv6 nebo onion)</translation> </message> <message> <source>Set database cache size in megabytes (%d to %d, default: %d)</source> @@ -2847,6 +2831,10 @@ například: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo.com <translation>Tohle je určeno pro nástroje na regresní testování a vyvíjení aplikací.</translation> </message> <message> + <source>Use UPnP to map the listening port (default: %u)</source> + <translation>Použít UPnP k namapování naslouchacího portu (výchozí: %u)</translation> + </message> + <message> <source>Verifying blocks...</source> <translation>Ověřuji bloky... </translation> </message> @@ -2915,6 +2903,14 @@ například: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo.com <translation>Poplatky (v BTC/Kb) menší než tato hodnota jsou považovány za nulové pro účely vytváření transakcí (výchozí: %s)</translation> </message> <message> + <source>If paytxfee is not set, include enough fee so transactions begin confirmation on average within n blocks (default: %u)</source> + <translation>Pokud paytxfee není nastaveno, platit dostatečný poplatek na to, aby byly transakce potvrzeny v průměru během n bloků (výchozí: %u)</translation> + </message> + <message> + <source>Maximum size of data in data carrier transactions we relay and mine (default: %u)</source> + <translation>Maximální velikost dat v transakcích nesoucích data, se kterou jsme ochotni je ještě přeposílat a těžit (výchozí: %u)</translation> + </message> + <message> <source>Query for peer addresses via DNS lookup, if low on addresses (default: 1 unless -connect)</source> <translation>Při nedostatku adres získat další protějšky z DNS (výchozí: 1, pokud není použito -connect)</translation> </message> @@ -2923,6 +2919,10 @@ například: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo.com <translation>Nastavit maximální velikost prioritních/nízkopoplatkových transakcí v bajtech (výchozí: %d)</translation> </message> <message> + <source>Set the number of threads for coin generation if enabled (-1 = all cores, default: %d)</source> + <translation>Nastavení počtu vláken pro těžení, je-li zapnuté (-1 = všechna jádra, výchozí: %d)</translation> + </message> + <message> <source>This product includes software developed by the OpenSSL Project for use in the OpenSSL Toolkit <https://www.openssl.org/> and cryptographic software written by Eric Young and UPnP software written by Thomas Bernard.</source> <translation>Tento produkt zahrnuje programy vyvinuté OpenSSL Projektem pro použití v OpenSSL Toolkitu <https://www.openssl.org/> a kryptografický program od Erika Younga a program UPnP od Thomase Bernarda.</translation> </message> @@ -2939,6 +2939,10 @@ například: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo.com <translation>Nemohu přeložit -whitebind adresu: '%s'</translation> </message> <message> + <source>Choose data directory on startup (default: 0)</source> + <translation>Zvolit adresář pro data při startu (výchozí: 0)</translation> + </message> + <message> <source>Connect through SOCKS5 proxy</source> <translation>Připojit se přes SOCKS5 proxy</translation> </message> @@ -2955,6 +2959,10 @@ například: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo.com <translation>Chyba při načítání wallet.dat: peněženka vyžaduje novější verzi Bitcoin Core</translation> </message> <message> + <source>Error reading from database, shutting down.</source> + <translation>Chyba při čtení z databáze, ukončuji se.</translation> + </message> + <message> <source>Error: Unsupported argument -tor found, use -onion.</source> <translation>Chyba: Argument -tor již není podporovaný, použij -onion.</translation> </message> @@ -2987,8 +2995,8 @@ například: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo.com <translation>Ve -whitelist byla zadána neplatná podsíť: '%s'</translation> </message> <message> - <source>Keep at most <n> unconnectable blocks in memory (default: %u)</source> - <translation>Držet v paměti nejvýše <n> nespojitelných bloků (výchozí: %u)</translation> + <source>Keep at most <n> unconnectable transactions in memory (default: %u)</source> + <translation>Držet v paměti nejvýše <n> nespojitelných transakcí (výchozí: %u)</translation> </message> <message> <source>Need to specify a port with -whitebind: '%s'</source> @@ -2999,10 +3007,6 @@ například: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo.com <translation>Možnosti přeposílání:</translation> </message> <message> - <source>Print block on startup, if found in block index</source> - <translation>Vypsat při startu blok,pokud se nachází v indexu bloků</translation> - </message> - <message> <source>RPC SSL options: (see the Bitcoin Wiki for SSL setup instructions)</source> <translation>Možnosti SSL pro RPC: (viz instrukce nastavení SSL na Bitcoin Wiki)</translation> </message> @@ -3023,10 +3027,26 @@ například: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo.com <translation>Posílat stopovací/ladicí informace do konzole místo do souboru debug.log</translation> </message> <message> + <source>Send transactions as zero-fee transactions if possible (default: %u)</source> + <translation>Posílat transakce pokud možno bez poplatků (výchozí: %u)</translation> + </message> + <message> + <source>Set SSL root certificates for payment request (default: -system-)</source> + <translation>Nastavit kořenové SSL certifikáty pro platební požadavky (výchozí: -system-)</translation> + </message> + <message> + <source>Set language, for example "de_DE" (default: system locale)</source> + <translation>Nastavit jazyk, například "de_DE" (výchozí: systémové nastavení)</translation> + </message> + <message> <source>Show all debugging options (usage: --help -help-debug)</source> <translation>Zobrazit všechny možnosti ladění (užití: --help -help-debug)</translation> </message> <message> + <source>Show splash screen on startup (default: 1)</source> + <translation>Zobrazit startovací obrazovku (výchozí: 1)</translation> + </message> + <message> <source>Shrink debug.log file on client startup (default: 1 when no -debug)</source> <translation>Při spuštění klienta zmenšit soubor debug.log (výchozí: 1, pokud není zadáno -debug)</translation> </message> @@ -3035,6 +3055,10 @@ například: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo.com <translation>Nepodařilo se podepsat transakci</translation> </message> <message> + <source>Start minimized</source> + <translation>Nastartovat minimalizovaně</translation> + </message> + <message> <source>This is experimental software.</source> <translation>Tohle je experimentální program.</translation> </message> @@ -3047,8 +3071,12 @@ například: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo.com <translation>Částky v transakci musí být kladné</translation> </message> <message> + <source>Transaction too large for fee policy</source> + <translation>Transakce je na poplatkovou politiku příliš velká</translation> + </message> + <message> <source>Transaction too large</source> - <translation>Transace je příliš velká</translation> + <translation>Transakce je příliš velká</translation> </message> <message> <source>Unable to bind to %s on this computer (bind returned error %s)</source> @@ -3071,10 +3099,6 @@ například: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo.com <translation>Upozornění</translation> </message> <message> - <source>Warning: This version is obsolete, upgrade required!</source> - <translation>Upozornění: tahle verze je zastaralá, měl bys ji aktualizovat!</translation> - </message> - <message> <source>Warning: Unsupported argument -benchmark ignored, use -debug=bench.</source> <translation>Upozornění: Nepodporovaný argument -benchmark se ignoruje, použij -debug=bench.</translation> </message> @@ -3131,14 +3155,166 @@ například: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo.com <translation>Chyba při načítání wallet.dat: peněženka je poškozená</translation> </message> <message> + <source>(1 = keep tx meta data e.g. account owner and payment request information, 2 = drop tx meta data)</source> + <translation>(1 = ukládat transakční metadata, např. majitele účtu a informace o platebním požadavku, 2 = mazat transakční metadata)</translation> + </message> + <message> + <source>Flush database activity from memory pool to disk log every <n> megabytes (default: %u)</source> + <translation>Promítnout databázovou aktivitu z paměťového prostoru do záznamu na disku každých <n> megabajtů (výchozí: %u)</translation> + </message> + <message> + <source>How thorough the block verification of -checkblocks is (0-4, default: %u)</source> + <translation>Jak moc důkladná má být verifikace bloků -checkblocks (0-4, výchozí: %u)</translation> + </message> + <message> + <source>Log transaction priority and fee per kB when mining blocks (default: %u)</source> + <translation>Zaznamenávat během těžení bloků prioritu transakce a poplatek za kB (výchozí: %u)</translation> + </message> + <message> + <source>Maintain a full transaction index, used by the getrawtransaction rpc call (default: %u)</source> + <translation>Spravovat úplný index transakcí, který je využíván rpc voláním getrawtransaction (výchozí: %u)</translation> + </message> + <message> + <source>Number of seconds to keep misbehaving peers from reconnecting (default: %u)</source> + <translation>Doba ve vteřinách, po kterou se nebudou moci zlobivé protějšky znovu připojit (výchozí: %u)</translation> + </message> + <message> + <source>Output debugging information (default: %u, supplying <category> is optional)</source> + <translation>Tisknout ladicí informace (výchozí: %u, zadání <category> je volitelné)</translation> + </message> + <message> + <source>Use separate SOCKS5 proxy to reach peers via Tor hidden services (default: %s)</source> + <translation>Použít samostatnou SOCKS5 proxy ke spojení s protějšky přes skryté služby v Toru (výchozí: %s)</translation> + </message> + <message> + <source>(default: %s)</source> + <translation>(výchozí: %s)</translation> + </message> + <message> + <source>Acceptable ciphers (default: %s)</source> + <translation>Akceptovatelné šifry (výchozí: %s)</translation> + </message> + <message> + <source>Always query for peer addresses via DNS lookup (default: %u)</source> + <translation>Vždy získávat adresy dalších protějšků přes DNS (výchozí: %u)</translation> + </message> + <message> + <source>Disable safemode, override a real safe mode event (default: %u)</source> + <translation>Vypnout bezpečný režim (safemode), překrýt skutečnou událost bezpečného režimu (výchozí: %u)</translation> + </message> + <message> <source>Error loading wallet.dat</source> <translation>Chyba při načítání wallet.dat</translation> </message> <message> + <source>Force safe mode (default: %u)</source> + <translation>Vynutit bezpečný mód (výchozí: %u)</translation> + </message> + <message> + <source>Generate coins (default: %u)</source> + <translation>Těžit (výchozí: %u)</translation> + </message> + <message> + <source>How many blocks to check at startup (default: %u, 0 = all)</source> + <translation>Kolik bloků při startu zkontrolovat (výchozí: %u, 0 = všechny)</translation> + </message> + <message> + <source>Include IP addresses in debug output (default: %u)</source> + <translation>Zaznamenávat do ladicích výstupů i IP adresy (výchozí: %u)</translation> + </message> + <message> <source>Invalid -proxy address: '%s'</source> <translation>Neplatná -proxy adresa: '%s'</translation> </message> <message> + <source>Limit size of signature cache to <n> entries (default: %u)</source> + <translation>Omezit velikost vyrovnávací paměti pro podpisy na <n> položek (výchozí: %u)</translation> + </message> + <message> + <source>Listen for JSON-RPC connections on <port> (default: %u or testnet: %u)</source> + <translation>Čekat na JSON-RPC spojení na <portu> (výchozí: %u nebo testnet: %u)</translation> + </message> + <message> + <source>Listen for connections on <port> (default: %u or testnet: %u)</source> + <translation>Čekat na spojení na <portu> (výchozí: %u nebo testnet: %u)</translation> + </message> + <message> + <source>Maintain at most <n> connections to peers (default: %u)</source> + <translation>Povolit nejvýše <n> protějšků (výchozí: %u)</translation> + </message> + <message> + <source>Maximum per-connection receive buffer, <n>*1000 bytes (default: %u)</source> + <translation>Maximální velikost přijímacího bufferu pro každé spojení, <n>*1000 bajtů (výchozí: %u)</translation> + </message> + <message> + <source>Maximum per-connection send buffer, <n>*1000 bytes (default: %u)</source> + <translation>Maximální velikost odesílacího bufferu pro každé spojení, <n>*1000 bajtů (výchozí: %u)</translation> + </message> + <message> + <source>Only accept block chain matching built-in checkpoints (default: %u)</source> + <translation>Uznávat pouze řetězec bloků, který odpovídá vnitřním kontrolním bodům (výchozí: %u)</translation> + </message> + <message> + <source>Prepend debug output with timestamp (default: %u)</source> + <translation>Připojit před ladicí výstup časové razítko (výchozí: %u)</translation> + </message> + <message> + <source>Relay and mine data carrier transactions (default: %u)</source> + <translation>Přeposílat a těžit transakce nesoucí data (výchozí: %u)</translation> + </message> + <message> + <source>Relay non-P2SH multisig (default: %u)</source> + <translation>Přeposílat ne-P2SH multisig (výchozí: %u)</translation> + </message> + <message> + <source>Run a thread to flush wallet periodically (default: %u)</source> + <translation>Spustit vlákno pročišťující periodicky peněženku (výchozí: %u)</translation> + </message> + <message> + <source>Server certificate file (default: %s)</source> + <translation>Soubor se serverovým certifikátem (výchozí: %s)</translation> + </message> + <message> + <source>Server private key (default: %s)</source> + <translation>Soubor se serverovým soukromým klíčem (výchozí: %s)</translation> + </message> + <message> + <source>Set key pool size to <n> (default: %u)</source> + <translation>Nastavit zásobník klíčů na velikost <n> (výchozí: %u)</translation> + </message> + <message> + <source>Set minimum block size in bytes (default: %u)</source> + <translation>Nastavit minimální velikost bloku v bajtech (výchozí: %u)</translation> + </message> + <message> + <source>Set the number of threads to service RPC calls (default: %d)</source> + <translation>Nastavení počtu vláken pro servisní RPC volání (výchozí: %d)</translation> + </message> + <message> + <source>Sets the DB_PRIVATE flag in the wallet db environment (default: %u)</source> + <translation>Nastavit příznak DB_PRIVATE v databázovém prostředí peněženky (výchozí: %u)</translation> + </message> + <message> + <source>Specify configuration file (default: %s)</source> + <translation>Konfigurační soubor (výchozí: %s)</translation> + </message> + <message> + <source>Specify connection timeout in milliseconds (minimum: 1, default: %d)</source> + <translation>Zadej časový limit spojení v milivteřinách (minimum: 1, výchozí: %d)</translation> + </message> + <message> + <source>Spend unconfirmed change when sending transactions (default: %u)</source> + <translation>Utrácet i ještě nepotvrzené drobné při posílání transakcí (výchozí: %u)</translation> + </message> + <message> + <source>Stop running after importing blocks from disk (default: %u)</source> + <translation>Ukončit se po importu bloků z disku (výchozí: %u)</translation> + </message> + <message> + <source>Threshold for disconnecting misbehaving peers (default: %u)</source> + <translation>Práh pro odpojování zlobivých protějšků (výchozí: %u)</translation> + </message> + <message> <source>Unknown network specified in -onlynet: '%s'</source> <translation>V -onlynet byla uvedena neznámá síť: '%s'</translation> </message> @@ -3155,10 +3331,6 @@ například: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo.com <translation>Neplatná částka pro -paytxfee=<částka>: '%s'</translation> </message> <message> - <source>Invalid amount</source> - <translation>Neplatná částka</translation> - </message> - <message> <source>Insufficient funds</source> <translation>Nedostatek prostředků</translation> </message> @@ -3191,10 +3363,6 @@ například: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo.com <translation>Načítání dokončeno</translation> </message> <message> - <source>To use the %s option</source> - <translation>K použití volby %s</translation> - </message> - <message> <source>Error</source> <translation>Chyba</translation> </message> diff --git a/src/qt/locale/bitcoin_cy.ts b/src/qt/locale/bitcoin_cy.ts index c68fc274f3..9867375fb2 100644 --- a/src/qt/locale/bitcoin_cy.ts +++ b/src/qt/locale/bitcoin_cy.ts @@ -1,11 +1,7 @@ -<TS language="cy" version="2.0"> +<TS language="cy" version="2.1"> <context> <name>AddressBookPage</name> <message> - <source>Double-click to edit address or label</source> - <translation>Clicio dwywaith i olygu cyfeiriad neu label</translation> - </message> - <message> <source>Create a new address</source> <translation>Creu cyfeiriad newydd</translation> </message> @@ -72,10 +68,6 @@ <translation>Newid cyfrinymadrodd</translation> </message> <message> - <source>Enter the old and new passphrase to the wallet.</source> - <translation>Teipiwch yr hen cyfrinymadrodd a chyfrinymadrodd newydd i mewn i'r waled.</translation> - </message> - <message> <source>Confirm wallet encryption</source> <translation>Cadarnau amgryptiad y waled</translation> </message> @@ -445,13 +437,13 @@ <translation>Math</translation> </message> <message> - <source>Address</source> - <translation>Cyfeiriad</translation> - </message> - <message> <source>Open until %1</source> <translation>Agor tan %1</translation> </message> + <message> + <source>Label</source> + <translation>Label</translation> + </message> </context> <context> <name>TransactionView</name> diff --git a/src/qt/locale/bitcoin_da.ts b/src/qt/locale/bitcoin_da.ts index f733591098..6979124615 100644 --- a/src/qt/locale/bitcoin_da.ts +++ b/src/qt/locale/bitcoin_da.ts @@ -1,9 +1,9 @@ -<TS language="da" version="2.0"> +<TS language="da" version="2.1"> <context> <name>AddressBookPage</name> <message> - <source>Double-click to edit address or label</source> - <translation>Dobbeltklik for at redigere adresse eller mærkat</translation> + <source>Right-click to edit address or label</source> + <translation>Højreklik for at redigere adresse eller mærke</translation> </message> <message> <source>Create a new address</source> @@ -156,10 +156,6 @@ <translation>Skift adgangskode</translation> </message> <message> - <source>Enter the old and new passphrase to the wallet.</source> - <translation>Indtast den gamle og den nye adgangskode til tegnebogen.</translation> - </message> - <message> <source>Confirm wallet encryption</source> <translation>Bekræft tegnebogskryptering</translation> </message> @@ -172,6 +168,10 @@ <translation>Er du sikker på, at du ønsker at kryptere din tegnebog?</translation> </message> <message> + <source>Bitcoin Core will close now to finish the encryption process. Remember that encrypting your wallet cannot fully protect your bitcoins from being stolen by malware infecting your computer.</source> + <translation>Bitcoin Core vil nu lukke for at færdiggøre krypteringsprocessen. Husk at kryptering af din tegnebog kan ikke beskytte dine bitcoin fuldt ud mod at blive stjålet af eventuel malware, der måtte have inficeret din computer.</translation> + </message> + <message> <source>IMPORTANT: Any previous backups you have made of your wallet file should be replaced with the newly generated, encrypted wallet file. For security reasons, previous backups of the unencrypted wallet file will become useless as soon as you start using the new, encrypted wallet.</source> <translation>VIGTIGT: Enhver tidligere sikkerhedskopi, som du har lavet af tegnebogsfilen, bør blive erstattet af den nyligt genererede, krypterede tegnebogsfil. Af sikkerhedsmæssige årsager vil tidligere sikkerhedskopier af den ikke-krypterede tegnebogsfil blive ubrugelige i det øjeblik, du starter med at anvende den nye, krypterede tegnebog.</translation> </message> @@ -188,8 +188,8 @@ <translation>Indtast det nye kodeord til tegnebogen.<br/>Brug venligst et kodeord på <b>ti eller flere tilfældige tegn</b> eller <b>otte eller flere ord</b>.</translation> </message> <message> - <source>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>Bitcoin vil nu lukke for at gennemføre krypteringsprocessen. Husk på, at kryptering af din tegnebog vil ikke beskytte dine bitcoins fuldt ud mod at blive stjålet af malware på din computer.</translation> + <source>Enter the old passphrase and new passphrase to the wallet.</source> + <translation>Indtast den gamle adgangskode og en ny adgangskode til tegnebogen.</translation> </message> <message> <source>Wallet encryption failed</source> @@ -311,10 +311,6 @@ <translation>Send bitcoins til en Bitcoin-adresse</translation> </message> <message> - <source>Modify configuration options for Bitcoin</source> - <translation>Redigér konfigurationsindstillinger for Bitcoin</translation> - </message> - <message> <source>Backup wallet to another location</source> <translation>Lav sikkerhedskopi af tegnebogen til et andet sted</translation> </message> @@ -403,6 +399,10 @@ <translation>&Om Bitcoin Core</translation> </message> <message> + <source>Modify configuration options for Bitcoin Core</source> + <translation>Ændr opsætning af Bitcoin Core</translation> + </message> + <message> <source>Show the list of used sending addresses and labels</source> <translation>Vis listen over brugte afsendelsesadresser og -mærkater</translation> </message> @@ -431,6 +431,10 @@ <translation>Ingen blokkilde tilgængelig …</translation> </message> <message numerus="yes"> + <source>Processed %n block(s) of transaction history.</source> + <translation><numerusform>Bearbejdede %n blok med transaktionshistorik.</numerusform><numerusform>Bearbejdede %n blokke med transaktionshistorik.</numerusform></translation> + </message> + <message numerus="yes"> <source>%n hour(s)</source> <translation><numerusform>%n time</numerusform><numerusform>%n timer</numerusform></translation> </message> @@ -478,35 +482,49 @@ <source>Up to date</source> <translation>Opdateret</translation> </message> - <message numerus="yes"> - <source>Processed %n blocks of transaction history.</source> - <translation><numerusform>%n blok af transaktionshistorikken er blevet behandlet.</numerusform><numerusform>%n blokke af transaktionshistorikken er blevet behandlet.</numerusform></translation> - </message> <message> <source>Catching up...</source> <translation>Indhenter …</translation> </message> <message> - <source>Sent transaction</source> - <translation>Afsendt transaktion</translation> + <source>Date: %1 +</source> + <translation>Dato: %1 +</translation> </message> <message> - <source>Incoming transaction</source> - <translation>Indgående transaktion</translation> + <source>Amount: %1 +</source> + <translation>Beløb: %1 +</translation> </message> <message> - <source>Date: %1 -Amount: %2 -Type: %3 -Address: %4 + <source>Type: %1 </source> - <translation>Dato: %1 -Beløb: %2 -Type: %3 -Adresse: %4 + <translation>Type: %1 </translation> </message> <message> + <source>Label: %1 +</source> + <translation>Mærkat: %1 +</translation> + </message> + <message> + <source>Address: %1 +</source> + <translation>Adresse: %1 +</translation> + </message> + <message> + <source>Sent transaction</source> + <translation>Afsendt transaktion</translation> + </message> + <message> + <source>Incoming transaction</source> + <translation>Indgående transaktion</translation> + </message> + <message> <source>Wallet is <b>encrypted</b> and currently <b>unlocked</b></source> <translation>Tegnebog er <b>krypteret</b> og i øjeblikket <b>ulåst</b></translation> </message> @@ -697,6 +715,18 @@ Adresse: %4 <translation>ingen</translation> </message> <message> + <source>This label turns red if the transaction size is greater than 1000 bytes.</source> + <translation>Denne mærkat bliver rød, hvis transaktionsstørrelsen er større end 1000 byte.</translation> + </message> + <message> + <source>This label turns red if the priority is smaller than "medium".</source> + <translation>Denne mærkat bliver rød, hvis prioriteten er mindre end "medium".</translation> + </message> + <message> + <source>This label turns red if any recipient receives an amount smaller than %1.</source> + <translation>Denne mærkat bliver rød, hvis en eller flere modtagere modtager et beløb, der er mindre end %1.</translation> + </message> + <message> <source>Can vary +/- %1 satoshi(s) per input.</source> <translation>Kan variere med +/- %1 satoshi per input.</translation> </message> @@ -709,10 +739,6 @@ Adresse: %4 <translation>nej</translation> </message> <message> - <source>This label turns red, if the transaction size is greater than 1000 bytes.</source> - <translation>Dette mærkat bliver rødt, hvis transaktionsstørrelsen er større end 1000 byte.</translation> - </message> - <message> <source>This means a fee of at least %1 per kB is required.</source> <translation>Dette betyder, at et gebyr på mindst %1 pr. kB er nødvendigt.</translation> </message> @@ -725,14 +751,6 @@ Adresse: %4 <translation>Transaktioner med højere prioritet har højere sansynlighed for at blive inkluderet i en blok.</translation> </message> <message> - <source>This label turns red, if the priority is smaller than "medium".</source> - <translation>Dette mærkat bliver rødt, hvis prioriteten er mindre end "medium".</translation> - </message> - <message> - <source>This label turns red, if any recipient receives an amount smaller than %1.</source> - <translation>Dette mærkat bliver rødt, hvis mindst én modtager et beløb mindre end %1.</translation> - </message> - <message> <source>(no label)</source> <translation>(ingen mærkat)</translation> </message> @@ -853,30 +871,6 @@ Adresse: %4 <source>command-line options</source> <translation>kommandolinjetilvalg</translation> </message> - <message> - <source>UI options</source> - <translation>Brugergrænsefladeindstillinger</translation> - </message> - <message> - <source>Set language, for example "de_DE" (default: system locale)</source> - <translation>Angiv sprog, fx "da_DK" (standard: systemlokalitet)</translation> - </message> - <message> - <source>Start minimized</source> - <translation>Start minimeret</translation> - </message> - <message> - <source>Set SSL root certificates for payment request (default: -system-)</source> - <translation>Sæt SSL-rodcertifikater for betalingsanmodning (standard: -system-)</translation> - </message> - <message> - <source>Show splash screen on startup (default: 1)</source> - <translation>Vis opstartsbillede ved opstart (standard: 1)</translation> - </message> - <message> - <source>Choose data directory on startup (default: 0)</source> - <translation>Vælg datamappe ved opstart (standard: 0)</translation> - </message> </context> <context> <name>Intro</name> @@ -955,14 +949,6 @@ Adresse: %4 <translation>&Generelt</translation> </message> <message> - <source>Automatically start Bitcoin after logging in to the system.</source> - <translation>Start Bitcoin automatisk, når der logges ind på systemet.</translation> - </message> - <message> - <source>&Start Bitcoin on system login</source> - <translation>&Start Bitcoin ved systemlogin</translation> - </message> - <message> <source>Size of &database cache</source> <translation>Størrelsen på &databasens cache</translation> </message> @@ -987,6 +973,14 @@ Adresse: %4 <translation>IP-adresse for proxyen (fx IPv4: 127.0.0.1 / IPv6: ::1)</translation> </message> <message> + <source>Minimize instead of exit the application when the window is closed. When this option is enabled, the application will be closed only after selecting Exit in the menu.</source> + <translation>Minimér i stedet for at lukke applikationen, når vinduet lukkes. Når denne indstilling er slået til, vil applikationen først blive lukket, når Afslut vælges i menuen.</translation> + </message> + <message> + <source>The user interface language can be set here. This setting will take effect after restarting Bitcoin Core.</source> + <translation>Sproget for brugerfladen kan vælges her. Denne indstilling vil træde i kraft efter genstart af Bitcoin Core.</translation> + </message> + <message> <source>Third party URLs (e.g. a block explorer) that appear in the transactions tab as context menu items. %s in the URL is replaced by transaction hash. Multiple URLs are separated by vertical bar |.</source> <translation>Tredjeparts-URL'er (fx et blokhåndteringsværktøj), der vises i transaktionsfanen som genvejsmenupunkter. %s i URL'en erstattes med transaktionens hash. Flere URL'er separeres med en lodret streg |.</translation> </message> @@ -1011,6 +1005,14 @@ Adresse: %4 <translation>&Netværk</translation> </message> <message> + <source>Automatically start Bitcoin Core after logging in to the system.</source> + <translation>Start Bitcoin Core automatisk efter der logges ind på systemet.</translation> + </message> + <message> + <source>&Start Bitcoin Core on system login</source> + <translation>&Start Bitcoin Core ved system-login</translation> + </message> + <message> <source>(0 = auto, <0 = leave that many cores free)</source> <translation>(0 = auto, <0 = efterlad så mange kerner fri)</translation> </message> @@ -1075,10 +1077,6 @@ Adresse: %4 <translation>&Minimér til statusfeltet i stedet for proceslinjen</translation> </message> <message> - <source>Minimize instead of exit the application when the window is closed. When this option is enabled, the application will be closed only after selecting Quit in the menu.</source> - <translation>Minimér i stedet for at afslutte programmet, når vinduet lukkes. Når denne indstilling er valgt, vil programmet kun blive lukket, når du har valgt Afslut i menuen.</translation> - </message> - <message> <source>M&inimize on close</source> <translation>M&inimér ved lukning</translation> </message> @@ -1091,10 +1089,6 @@ Adresse: %4 <translation>&Sprog for brugergrænseflade:</translation> </message> <message> - <source>The user interface language can be set here. This setting will take effect after restarting Bitcoin.</source> - <translation>Sproget for brugergrænsefladen kan angives her. Denne indstilling træder først i kraft, når Bitcoin genstartes.</translation> - </message> - <message> <source>&Unit to show amounts in:</source> <translation>&Enhed at vise beløb i:</translation> </message> @@ -1131,8 +1125,8 @@ Adresse: %4 <translation>Genstart af klienten er nødvendig for at aktivere ændringer.</translation> </message> <message> - <source>Client will be shutdown, do you want to proceed?</source> - <translation>Klienten vil blive lukket ned; vil du fortsætte?</translation> + <source>Client will be shut down. Do you want to proceed?</source> + <translation>Klienten vil lukke ned. Vil du fortsætte?</translation> </message> <message> <source>This change would require a client restart.</source> @@ -1241,10 +1235,6 @@ Adresse: %4 <translation>Netværk for betalingsanmodning stemmer ikke overens med klientens netværk.</translation> </message> <message> - <source>Payment request has expired.</source> - <translation>Betalingsanmodning er udløbet.</translation> - </message> - <message> <source>Payment request is not initialized.</source> <translation>Betalingsanmodning er ikke klargjort.</translation> </message> @@ -1277,14 +1267,30 @@ Adresse: %4 <translation>Fil for betalingsanmodning kan ikke læses! Dette kan skyldes en ugyldig fil for betalingsanmodning.</translation> </message> <message> + <source>Payment request expired.</source> + <translation>Betalingsanmodning er udløbet.</translation> + </message> + <message> <source>Unverified payment requests to custom payment scripts are unsupported.</source> <translation>Ikke-verificerede betalingsanmodninger for tilpassede betalings-scripts understøttes ikke.</translation> </message> <message> + <source>Invalid payment request.</source> + <translation>Ugyldig betalingsanmodning.</translation> + </message> + <message> <source>Refund from %1</source> <translation>Tilbagebetaling fra %1</translation> </message> <message> + <source>Payment request %1 is too large (%2 bytes, allowed %3 bytes).</source> + <translation>Betalingsanmodning %1 er for stor (%2 byte, %3 byte tilladt).</translation> + </message> + <message> + <source>Payment request DoS protection</source> + <translation>Beskyttelse mod DoS-angreb via betalingsanmodninger</translation> + </message> + <message> <source>Error communicating with %1: %2</source> <translation>Fejl under kommunikation med %1: %2</translation> </message> @@ -1312,8 +1318,8 @@ Adresse: %4 <translation>Brugeragent</translation> </message> <message> - <source>Address/Hostname</source> - <translation>Adresse/værtsnavn</translation> + <source>Node/Service</source> + <translation>Knude/tjeneste</translation> </message> <message> <source>Ping Time</source> @@ -1347,14 +1353,6 @@ Adresse: %4 <translation>%1 s</translation> </message> <message> - <source>NETWORK</source> - <translation>NETVÆRK</translation> - </message> - <message> - <source>UNKNOWN</source> - <translation>UKENDT</translation> - </message> - <message> <source>None</source> <translation>Ingen</translation> </message> @@ -1445,6 +1443,10 @@ Adresse: %4 <translation>Nuværende antal blokke</translation> </message> <message> + <source>Open the Bitcoin Core debug log file from the current data directory. This can take a few seconds for large log files.</source> + <translation>Åbn Bitcoin Cores fejlsøgningslogfil fra den aktuelle datamappe. Dette kan tage nogle få sekunder for store logfiler.</translation> + </message> + <message> <source>Received</source> <translation>Modtaget</translation> </message> @@ -1513,6 +1515,10 @@ Adresse: %4 <translation>Ping-tid</translation> </message> <message> + <source>Time Offset</source> + <translation>Tidsforskydning</translation> + </message> + <message> <source>Last block time</source> <translation>Tidsstempel for seneste blok</translation> </message> @@ -1553,16 +1559,12 @@ Adresse: %4 <translation>Fejlsøgningslogfil</translation> </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>Åbn Bitcoin-fejlsøgningslogfilen fra den nuværende datamappe. Dette kan tage nogle få sekunder for store logfiler.</translation> - </message> - <message> <source>Clear console</source> <translation>Ryd konsol</translation> </message> <message> - <source>Welcome to the Bitcoin RPC console.</source> - <translation>Velkommen til Bitcoin RPC-konsollen.</translation> + <source>Welcome to the Bitcoin Core RPC console.</source> + <translation>Velkommen til Bitcoin Cores RPC-konsol.</translation> </message> <message> <source>Use up and down arrows to navigate history, and <b>Ctrl-L</b> to clear screen.</source> @@ -1853,14 +1855,6 @@ Adresse: %4 <translation>sammenfold gebyropsætning</translation> </message> <message> - <source>Minimize</source> - <translation>Minimér</translation> - </message> - <message> - <source>If the custom fee is set to 1000 satoshis and the transaction is only 250 bytes, then "per kilobyte" only pays 250 satoshis in fee, while "at least" pays 1000 satoshis. For transactions bigger than a kilobyte both pay by kilobyte.</source> - <translation>Hvis det brugertilpassede gebyr er sat til 1000 satoshis, og transaktionen kun fylder 250 byte, betaler "pr. kilobyte" kun 250 satoshis i gebyr, mens "mindst" betaler 1000 satoshis. For transaktioner større end en kilobyte betaler begge pr. kilobyte.</translation> - </message> - <message> <source>per kilobyte</source> <translation>pr. kilobyte</translation> </message> @@ -1869,6 +1863,10 @@ Adresse: %4 <translation>Hvis det brugertilpassede gebyr er sat til 1000 satoshis, og transaktionen kun fylder 250 byte, betaler "pr. kilobyte" kun 250 satoshis i gebyr, mens "total mindst" betaler 1000 satoshis. For transaktioner større end en kilobyte betaler begge pr. kilobyte.</translation> </message> <message> + <source>Hide</source> + <translation>Skjul</translation> + </message> + <message> <source>total at least</source> <translation>total mindst</translation> </message> @@ -1989,10 +1987,6 @@ Adresse: %4 <translation>eller</translation> </message> <message> - <source>The recipient address is not valid, please recheck.</source> - <translation>Modtagerens adresse er ikke gyldig. Tjek venligst adressen igen.</translation> - </message> - <message> <source>The amount to pay must be larger than 0.</source> <translation>Beløbet til betaling skal være større end 0.</translation> </message> @@ -2005,10 +1999,6 @@ Adresse: %4 <translation>Totalen overstiger din saldo, når transaktionsgebyret på %1 er inkluderet.</translation> </message> <message> - <source>Duplicate address found, can only send to each address once per send operation.</source> - <translation>Duplikeret adresse fundet. Du kan kun sende til hver adresse én gang pr. afsendelse.</translation> - </message> - <message> <source>Transaction creation failed!</source> <translation>Oprettelse af transaktion mislykkedes!</translation> </message> @@ -2017,16 +2007,28 @@ Adresse: %4 <translation>Transaktionen blev afvist! Dette kan ske, hvis nogle af dine bitcoins i din tegnebog allerede er brugt, som hvis du brugte en kopi af wallet.dat og dine bitcoins er blevet brugt i kopien, men ikke er markeret som brugt her.</translation> </message> <message> - <source>A fee higher than %1 is considered an insanely high fee.</source> - <translation>Et gebyr højere end %1 anses som et vanvittigt højt gebyr.</translation> + <source>A fee higher than %1 is considered an absurdly high fee.</source> + <translation>Et gebyr højere end %1 opfattes som et absurd højt gebyr.</translation> + </message> + <message> + <source>Payment request expired.</source> + <translation>Betalingsanmodning er udløbet.</translation> + </message> + <message numerus="yes"> + <source>Estimated to begin confirmation within %n block(s).</source> + <translation><numerusform>Bekræftelse estimeres til at begynde inden for %n blok.</numerusform><numerusform>Bekræftelse estimeres til at begynde inden for %n blokke.</numerusform></translation> </message> <message> <source>Pay only the minimum fee of %1</source> <translation>Betal kun det minimale gebyr på %1</translation> </message> <message> - <source>Estimated to begin confirmation within %1 block(s).</source> - <translation>Bekræftelse vurderes at begynde inden for %1 blok(ke).</translation> + <source>The recipient address is not valid. Please recheck.</source> + <translation>Modtageradressen er ikke gyldig. Tjek venligst igen.</translation> + </message> + <message> + <source>Duplicate address found: addresses should only be used once each.</source> + <translation>Adressegenganger fundet. Adresser bør kun bruges én gang hver.</translation> </message> <message> <source>Warning: Invalid Bitcoin address</source> @@ -2100,12 +2102,24 @@ Adresse: %4 <translation>Fjern denne indgang</translation> </message> <message> + <source>The fee will be deducted from the amount being sent. The recipient will receive less bitcoins than you enter in the amount field. If multiple recipients are selected, the fee is split equally.</source> + <translation>Gebyret vil blive trukket fra det sendte beløb. Modtageren vil modtage færre bitcoin, end du indtaster i beløbfeltet. Hvis flere modtagere vælges, vil gebyret deles ligeligt.</translation> + </message> + <message> + <source>S&ubtract fee from amount</source> + <translation>&Træk gebyr fra beløb</translation> + </message> + <message> <source>Message:</source> <translation>Besked:</translation> </message> <message> - <source>This is a verified payment request.</source> - <translation>Dette er en verificeret betalingsanmodning.</translation> + <source>This is an unauthenticated payment request.</source> + <translation>Dette er en uautentificeret betalingsanmodning.</translation> + </message> + <message> + <source>This is an authenticated payment request.</source> + <translation>Dette er en autentificeret betalingsanmodning.</translation> </message> <message> <source>Enter a label for this address to add it to the list of used addresses</source> @@ -2116,10 +2130,6 @@ Adresse: %4 <translation>En besked, som blev føjet til "bitcon:"-URI'en, som vil gemmes med transaktionen til din reference. Bemærk: Denne besked vil ikke blive sendt over Bitcoin-netværket.</translation> </message> <message> - <source>This is an unverified payment request.</source> - <translation>Dette er en ikke-verificeret betalingsanmodning.</translation> - </message> - <message> <source>Pay To:</source> <translation>Betal til:</translation> </message> @@ -2150,8 +2160,8 @@ Adresse: %4 <translation>&Underskriv besked</translation> </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>Du kan underskrive beskeder med dine Bitcoin-adresser for at bevise, at de tilhører dig. Pas på ikke at underskrive noget vagt, da phisingangreb kan narre dig til at overdrage din identitet. Underskriv kun fuldt detaljerede udsagn, du er enig i.</translation> + <source>You can sign messages/agreements with your addresses to prove you can receive bitcoins sent to them. Be careful not to sign anything vague or random, as phishing attacks may try to trick you into signing your identity over to them. Only sign fully-detailed statements you agree to.</source> + <translation>Du kan signere beskeder/aftaler med dine adresser for at bevise, at du kan modtage bitcoin, der bliver sendt til adresserne. Vær forsigtig med ikke at signere noget vagt eller tilfældigt, da eventuelle phishing-angreb kan snyde dig til at overlade din identitet til dem. Signér kun fuldt ud detaljerede udsagn, som du er enig i.</translation> </message> <message> <source>The Bitcoin address to sign the message with</source> @@ -2206,8 +2216,8 @@ Adresse: %4 <translation>&Verificér besked</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>Indtast herunder den underskrivende adresse, beskeden (inkludér linjeskift, mellemrum mv. nøjagtigt, som de fremgår) og underskriften for at verificere beskeden. Vær forsigtig med ikke at lægge mere i underskriften end besked selv, så du undgår at blive narret af et man-in-the-middle-angreb.</translation> + <source>Enter the receiver's address, message (ensure you copy line breaks, spaces, tabs, etc. exactly) and signature below to verify the message. Be careful not to read more into the signature than what is in the signed message itself, to avoid being tricked by a man-in-the-middle attack. Note that this only proves the signing party receives with the address, it cannot prove sendership of any transaction!</source> + <translation>Indtast modtagerens adresse, besked (vær sikker på at kopiere linjeskift, mellemrum, tabuleringer, etc. præcist) og signatur herunder for at verificere beskeden. Vær forsigtig med ikke at læse noget ud fra signaturen, som ikke står i selve beskeden, for at undgå at blive snydt af et eventuelt man-in-the-middle-angreb. Bemærk, at dette kun beviser, at den signerende person kan modtage med adressen; det kan ikke bevise hvem der har sendt en given transaktion!</translation> </message> <message> <source>The Bitcoin address the message was signed with</source> @@ -2412,7 +2422,7 @@ Adresse: %4 </message> <message> <source>Generated coins must mature %1 blocks before they can be spent. When you generated this block, it was broadcast to the network to be added to the block chain. If it fails to get into the chain, its state will change to "not accepted" and it won't be spendable. This may occasionally happen if another node generates a block within a few seconds of yours.</source> - <translation>Minede bitcoins skal modne %1 blokke, før de kan bruges. Da du genererede denne blok, blev den udsendt til netværket for at blive føjet til blokkæden. Hvis det ikke lykkes at få den i kæden, vil dens tilstand ændres til "ikke accepteret", og den vil ikke kunne bruges. Dette kan ske nu og da, hvis en anden knude udvinder en blok inden for nogle få sekunder fra din.</translation> + <translation>Minede bitcoins skal modne %1 blokke, før de kan bruges. Da du genererede denne blok, blev den transmitteret til netværket for at blive føjet til blokkæden. Hvis det ikke lykkes at få den i kæden, vil dens tilstand ændres til "ikke accepteret", og den vil ikke kunne bruges. Dette kan ske nu og da, hvis en anden knude udvinder en blok inden for nogle få sekunder fra din.</translation> </message> <message> <source>Debug information</source> @@ -2473,10 +2483,6 @@ Adresse: %4 <translation>Type</translation> </message> <message> - <source>Address</source> - <translation>Adresse</translation> - </message> - <message> <source>Immature (%1 confirmations, will be available after %2)</source> <translation>Umoden (%1 bekræftelser; vil være tilgængelig efter %2)</translation> </message> @@ -2505,6 +2511,10 @@ Adresse: %4 <translation>Offline</translation> </message> <message> + <source>Label</source> + <translation>Mærkat</translation> + </message> + <message> <source>Unconfirmed</source> <translation>Ubekræftet</translation> </message> @@ -2561,8 +2571,8 @@ Adresse: %4 <translation>Afgør hvorvidt en kigge-adresse er involveret i denne transaktion.</translation> </message> <message> - <source>Destination address of transaction.</source> - <translation>Destinationsadresse for transaktion.</translation> + <source>User-defined intent/purpose of the transaction.</source> + <translation>Brugerdefineret hensigt/formål med transaktionen.</translation> </message> <message> <source>Amount removed from or added to balance.</source> @@ -2803,34 +2813,14 @@ Adresse: %4 <translation>Acceptér forbindelser udefra (standard: 1 hvis hverken -proxy eller -connect)</translation> </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>%s, du skal angive en RPC-adgangskode i konfigurationsfilen: -%s -Det anbefales, at du bruger nedenstående, tilfældige adgangskode: -rpcuser=bitcoinrpc -rpcpassword=%s -(du behøver ikke huske denne adgangskode) -Brugernavnet og adgangskode MÅ IKKE være det samme. -Hvis filen ikke eksisterer, opret den og giv ingen andre end ejeren læserettighed. -Det anbefales også at angive alertnotify, så du påmindes om problemer; -fx: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo.com -</translation> - </message> - <message> <source>Bind to given address and always listen on it. Use [host]:port notation for IPv6</source> <translation>Tildel til den givne adresse og lyt altid på den. Brug [vært]:port-notation for IPv6</translation> </message> <message> + <source>Continuously rate-limit free transactions to <n>*1000 bytes per minute (default: %u)</source> + <translation>Begræns hyppigheden af gratis transaktioner løbende til <n>*1000 byte pr. minut (standard: %u)</translation> + </message> + <message> <source>Delete all wallet transactions and only recover those parts of the blockchain through -rescan on startup</source> <translation>Slet alle transaktioner i tegnebogen og genskab kun disse dele af blokkæden gennem -rescan under opstart</translation> </message> @@ -2843,14 +2833,6 @@ fx: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo.com <translation>Start regressionstesttilstand, som bruger en speciel kæde, hvor blokke kan løses med det samme.</translation> </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>Fejl: Transaktionen blev afvist. Dette kan ske, hvis nogle af dine bitcoins i din tegnebog allerede er brugt, som hvis du brugte en kopi af wallet.dat og dine bitcoins er blevet brugt i kopien, men ikke er markeret som brugt her.</translation> - </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>Fejl: Denne transaktion kræver et transaktionsgebyr på minimum %s pga. dens beløb, kompleksitet eller anvendelse af nyligt modtagne bitcoins!</translation> - </message> - <message> <source>Execute command when a wallet transaction changes (%s in cmd is replaced by TxID)</source> <translation>Udfør kommando, når en transaktion i tegnebogen ændres (%s i kommandoen erstattes med TxID)</translation> </message> @@ -2859,6 +2841,14 @@ fx: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo.com <translation>I denne tilstand styrer -genproclimit hvor mange blokke, der genereres med det samme.</translation> </message> <message> + <source>Maximum total fees to use in a single wallet transaction; setting this too low may abort large transactions (default: %s)</source> + <translation>Maksimalt totalt gebyr der kan bruges i en enkelt tegnebogstransaktion. For lav en værdi kan afbryde store transaktioner (standard: %s)</translation> + </message> + <message> + <source>Reduce storage requirements by pruning (deleting) old blocks. This mode disables wallet support and is incompatible with -txindex. Warning: Reverting this setting requires re-downloading the entire blockchain. (default: 0 = disable pruning blocks, >%u = target size in MiB to use for block files)</source> + <translation>Reducér pladskravene ved at beskære (slette, "prune") gamle blokke. Denne tilstand slår understøttelse af tegnebogen fra og er ikke kompatibel med -txindex. Advarsel: Fortrydelse af denne indstilling kræver download af hele blokkæden igen. (standard: 0 = slå beskæring af blokke fra, >%u = målstørrelse i MiB der skal bruges til blokfiler)</translation> + </message> + <message> <source>Set the number of script verification threads (%u to %d, 0 = auto, <0 = leave that many cores free, default: %d)</source> <translation>Sæt antallet af scriptverificeringstråde (%u til %d, 0 = auto, <0 = efterlad det antal kernet fri, standard: %d)</translation> </message> @@ -2927,10 +2917,6 @@ fx: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo.com <translation>Tilvalg for fejlfinding/test:</translation> </message> <message> - <source>Discover own IP address (default: 1 when listening and no -externalip)</source> - <translation>Find egen IP-adresse (standard: 1 når lytter og ingen -externalip)</translation> - </message> - <message> <source>Do not load the wallet and disable wallet RPC calls</source> <translation>Indlæs ikke tegnebogen og slå tegnebogs-RPC-kald fra</translation> </message> @@ -2963,10 +2949,6 @@ fx: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo.com <translation>Fejl: Mangel på ledig diskplads!</translation> </message> <message> - <source>Error: Wallet locked, unable to create transaction!</source> - <translation>Fejl: Tegnebog låst, kan ikke oprette transaktion!</translation> - </message> - <message> <source>Failed to listen on any port. Use -listen=0 if you want this.</source> <translation>Lytning på enhver port mislykkedes. Brug -listen=0, hvis du ønsker dette.</translation> </message> @@ -2995,8 +2977,12 @@ fx: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo.com <translation>Tilslut kun til knuder i netværk <net> (IPv4, IPv6 eller Onion)</translation> </message> <message> - <source>Rebuild block chain index from current blk000??.dat files</source> - <translation>Genbyg blokkædeindeks fra nuværende blk000??.dat filer</translation> + <source>Prune cannot be configured with a negative value.</source> + <translation>Beskæring kan ikke opsættes med en negativ værdi.</translation> + </message> + <message> + <source>Prune mode is incompatible with -txindex.</source> + <translation>Beskæringstilstand er ikke kompatibel med -txindex.</translation> </message> <message> <source>Set database cache size in megabytes (%d to %d, default: %d)</source> @@ -3035,6 +3021,10 @@ fx: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo.com <translation>Tilvalg for tegnebog:</translation> </message> <message> + <source>Warning: This version is obsolete; upgrade required!</source> + <translation>Advarsel: Denne version er forældet; opgradering påkrævet!</translation> + </message> + <message> <source>You need to rebuild the database using -reindex to change -txindex</source> <translation>Du er nødt til at genopbygge databasen ved hjælp af -reindex for at ændre -txindex</translation> </message> @@ -3063,14 +3053,14 @@ fx: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo.com <translation>Kan ikke opnå en lås på datamappe %s. Bitcoin Core kører sansynligvis allerede.</translation> </message> <message> - <source>Continuously rate-limit free transactions to <n>*1000 bytes per minute (default:%u)</source> - <translation>Rate-begræns kontinuerligt gratis transaktioner til <n>*1000 byte i minuttet (standard: %u)</translation> - </message> - <message> <source>Create new files with system default permissions, instead of umask 077 (only effective with disabled wallet functionality)</source> <translation>Opret nye filer med systemstandard for rettigheder i stedet for umask 077 (kun virksomt med tegnebogsfunktionalitet slået fra)</translation> </message> <message> + <source>Discover own IP addresses (default: 1 when listening and no -externalip or -proxy)</source> + <translation>Opdag egne IP-adresser (standard: 1 under lytning og ingen -externalip eller -proxy)</translation> + </message> + <message> <source>Error: Listening for incoming connections failed (listen returned error %s)</source> <translation>Fejl: Lytning efter indkommende forbindelser mislykkedes (lytning resultarede i fejl %s)</translation> </message> @@ -3091,14 +3081,34 @@ fx: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo.com <translation>Gebyrer (i BTC/Kb) mindre end dette opfattes som nulgebyr for oprettelse af transaktion (standard: %s)</translation> </message> <message> + <source>If paytxfee is not set, include enough fee so transactions begin confirmation on average within n blocks (default: %u)</source> + <translation>Hvis paytxfee ikke er sat, inkluderes nok gebyr til at transaktioner begynder at blive bekræftet ingen for gennemsnitligt n blokke (standard: %u)</translation> + </message> + <message> + <source>Invalid amount for -maxtxfee=<amount>: '%s' (must be at least the minrelay fee of %s to prevent stuck transactions)</source> + <translation>Ugyldigt beløb for -maxtxfee=<beløb>: "%s" (skal være på mindst minrelay-gebyret på %s for at undgå hængende transaktioner)</translation> + </message> + <message> <source>Maximum size of data in data carrier transactions we relay and mine (default: %u)</source> <translation>Maksimal størrelse på data i transaktioner til dataoverførsel, som vi videresender og miner (standard: %u)</translation> </message> <message> + <source>Prune configured below the minimum of %d MB. Please use a higher number.</source> + <translation>Beskæring opsat under minimumsværdien %d MB. Brug venligst en højere værdi.</translation> + </message> + <message> <source>Query for peer addresses via DNS lookup, if low on addresses (default: 1 unless -connect)</source> <translation>Forespørgsel</translation> </message> <message> + <source>Randomize credentials for every proxy connection. This enables Tor stream isolation (default: %u)</source> + <translation>Brug tilfældige akkreditiver for hver proxy-forbindelse. Dette tillader strømisolation med Tor (standard: %u)</translation> + </message> + <message> + <source>Require high priority for relaying free or low-fee transactions (default: %u)</source> + <translation>Kræv høj prioritet for at videresende transaktioner uden eller med lavt gebyr (standard: %u)</translation> + </message> + <message> <source>Set maximum size of high-priority/low-fee transactions in bytes (default: %d)</source> <translation>Sæt maksimumstørrelse for højprioritet/lavgebyr-transaktioner i byte (standard: %d)</translation> </message> @@ -3107,10 +3117,42 @@ fx: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo.com <translation>Sæt antaller af tråde for coin-generering, hvis aktiveret (-1 = alle kerner, standard: %d)</translation> </message> <message> + <source>The transaction amount is too small to send after the fee has been deducted</source> + <translation>Transaktionsbeløbet er for lille til at sende, når gebyret er trukket fra</translation> + </message> + <message> <source>This product includes software developed by the OpenSSL Project for use in the OpenSSL Toolkit <https://www.openssl.org/> and cryptographic software written by Eric Young and UPnP software written by Thomas Bernard.</source> <translation>Dette produkt indeholder software, der er udviklet af OpenSSL-projektet for brug i OpenSSL-værktøjskassen <https://www.openssl.org/>, samt kryptografisk software, der er skrevet af Eric Young, samt UPnP-software, der er skrevet af Thomas Bernard.</translation> </message> <message> + <source>To use bitcoind, or the -server option to bitcoin-qt, you must set an 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>For at bruge bitcoind eller valgmuligheden -server i bitcoin-qt skal du oprette et rpcpassword i konfigurationsfilen: +%s +Det anbefales, at du bruger følgende tilfældige adgangskode: +rpcuser=bitcoinrpc +rpcpassword=%s +(du behøver ikke at huske adgangskoden) +Brugernavnet og adgangskoden MÅ IKKE være det samme. +Hvis filen ikke eksisterer, opret den da så kun ejeren har læserettigheder. +Det anbefales også at sætte alertnotify, så du får besked omkring problemer; +for eksempel: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo.com +</translation> + </message> + <message> + <source>Warning: -maxtxfee is set very high! Fees this large could be paid on a single transaction.</source> + <translation>Advarsel: -maxtxfee er sat meget højt! Så store gebyrer kan betales på en enkelt transaktion.</translation> + </message> + <message> <source>Warning: Please check that your computer's date and time are correct! If your clock is wrong Bitcoin Core will not work properly.</source> <translation>Advarsel: Undersøg venligst at din computers dato og klokkeslet er korrekt indstillet! Hvis der er fejl i disse vil Bitcoin Core ikke fungere korrekt.</translation> </message> @@ -3119,10 +3161,38 @@ fx: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo.com <translation>Andre knuder på hvidliste kan ikke DoS-bandlyses, og deres transaktioner videresendes altid, selv hvis de allerede er i mempool'en. Brugbart til fx et adgangspunkt</translation> </message> <message> + <source>You need to rebuild the database using -reindex to go back to unpruned mode. This will redownload the entire blockchain</source> + <translation>Du er nødt til at genbygge databasen ved hjælp af -reindex for at gå tilbage til ikke-beskåret tilstand. Dette vil downloade hele blokkæden igen</translation> + </message> + <message> + <source>(default: %u)</source> + <translation>(standard: %u)</translation> + </message> + <message> + <source>Accept public REST requests (default: %u)</source> + <translation>Acceptér offentlige REST-anmodninger (standard: %u)</translation> + </message> + <message> + <source>Activating best chain...</source> + <translation>Aktiverer bedste kæde …</translation> + </message> + <message> + <source>Allow self signed root certificates (default: 0)</source> + <translation>Tillad selvsignerede rodcertifikater (standard: 0)</translation> + </message> + <message> + <source>Can't run with a wallet in prune mode.</source> + <translation>Kan ikke køre med en tegnebog i beskåret tilstand.</translation> + </message> + <message> <source>Cannot resolve -whitebind address: '%s'</source> <translation>Kan ikke løse -whitebind adresse: "%s"</translation> </message> <message> + <source>Choose data directory on startup (default: 0)</source> + <translation>Vælg datamappe ved opstart (standard: 0)</translation> + </message> + <message> <source>Connect through SOCKS5 proxy</source> <translation>Forbind gennem SOCKS5-proxy</translation> </message> @@ -3139,6 +3209,10 @@ fx: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo.com <translation>Fejl ved indlæsning af wallet.dat: Tegnebog kræver en nyere version af Bitcoin Core</translation> </message> <message> + <source>Error reading from database, shutting down.</source> + <translation>Fejl under læsning fra database; lukker ned.</translation> + </message> + <message> <source>Error: Unsupported argument -tor found, use -onion.</source> <translation>Fejl: Ikke understøttet argument -tor fundet, brug -onion.</translation> </message> @@ -3155,6 +3229,10 @@ fx: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo.com <translation>Sundhedstjek under klargøring mislykkedes. Bitcoin Core lukker ned.</translation> </message> <message> + <source>Invalid amount for -maxtxfee=<amount>: '%s'</source> + <translation>Ugyldigt beløb for -maxtxfee=<beløb>: "%s"</translation> + </message> + <message> <source>Invalid amount for -minrelaytxfee=<amount>: '%s'</source> <translation>Ugyldigt beløb til -minrelaytxfee=<beløb>: "%s"</translation> </message> @@ -3171,10 +3249,6 @@ fx: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo.com <translation>Ugyldig netmaske angivet i -whitelist: "%s"</translation> </message> <message> - <source>Keep at most <n> unconnectable blocks in memory (default: %u)</source> - <translation>Behold højest <n> uforbindelige blokke i hukommelsen (standard: %u)</translation> - </message> - <message> <source>Keep at most <n> unconnectable transactions in memory (default: %u)</source> <translation>Behold højest <n> uforbindelige transaktioner i hukommelsen (standard: %u)</translation> </message> @@ -3187,10 +3261,6 @@ fx: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo.com <translation>Videresendelsesvalgmuligheder for knude:</translation> </message> <message> - <source>Print block on startup, if found in block index</source> - <translation>Udskriv blok under opstart, hvis den findes i blokindeks</translation> - </message> - <message> <source>RPC SSL options: (see the Bitcoin Wiki for SSL setup instructions)</source> <translation>Tilvalg for RPC SSL: (se Bitcoin Wiki for instruktioner i SSL-opstart)</translation> </message> @@ -3199,6 +3269,10 @@ fx: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo.com <translation>Tilvalg for RPC-server:</translation> </message> <message> + <source>RPC support for HTTP persistent connections (default: %d)</source> + <translation>RPC-understøttelse for HTTP-persistente forbindelser (standard: %d)</translation> + </message> + <message> <source>Randomly drop 1 of every <n> network messages</source> <translation>Drop tilfældigt 1 ud af hver <n> netværksbeskeder</translation> </message> @@ -3215,10 +3289,22 @@ fx: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo.com <translation>Send transaktioner som nul-gebyr-transaktioner hvis muligt (standard: %u)</translation> </message> <message> + <source>Set SSL root certificates for payment request (default: -system-)</source> + <translation>Sæt SSL-rodcertifikater for betalingsanmodning (standard: -system-)</translation> + </message> + <message> + <source>Set language, for example "de_DE" (default: system locale)</source> + <translation>Angiv sprog, fx "da_DK" (standard: systemlokalitet)</translation> + </message> + <message> <source>Show all debugging options (usage: --help -help-debug)</source> <translation>Vis alle tilvalg for fejlsøgning (brug: --help -help-debug)</translation> </message> <message> + <source>Show splash screen on startup (default: 1)</source> + <translation>Vis opstartsbillede ved opstart (standard: 1)</translation> + </message> + <message> <source>Shrink debug.log file on client startup (default: 1 when no -debug)</source> <translation>Formindsk debug.log filen ved klientopstart (standard: 1 hvis ikke -debug)</translation> </message> @@ -3227,6 +3313,14 @@ fx: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo.com <translation>Underskrift af transaktion mislykkedes</translation> </message> <message> + <source>Start minimized</source> + <translation>Start minimeret</translation> + </message> + <message> + <source>The transaction amount is too small to pay the fee</source> + <translation>Transaktionsbeløbet er for lille til at betale gebyret</translation> + </message> + <message> <source>This is experimental software.</source> <translation>Dette er eksperimentelt software.</translation> </message> @@ -3239,10 +3333,18 @@ fx: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo.com <translation>Transaktionsbeløb skal være positive</translation> </message> <message> + <source>Transaction too large for fee policy</source> + <translation>Transaktion for stor til gebyrretningslinjer</translation> + </message> + <message> <source>Transaction too large</source> <translation>Transaktionen er for stor</translation> </message> <message> + <source>UI Options:</source> + <translation>Indstillinger for brugerflade:</translation> + </message> + <message> <source>Unable to bind to %s on this computer (bind returned error %s)</source> <translation>Ikke i stand til at tildele til %s på denne computer (bind returnerede fejl %s)</translation> </message> @@ -3263,10 +3365,6 @@ fx: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo.com <translation>Advarsel</translation> </message> <message> - <source>Warning: This version is obsolete, upgrade required!</source> - <translation>Advarsel: Denne version er forældet, opgradering påkrævet!</translation> - </message> - <message> <source>Warning: Unsupported argument -benchmark ignored, use -debug=bench.</source> <translation>Advarsel: Ikke understøttet argument -benchmark ignoreret, brug -debug=bench.</translation> </message> @@ -3335,10 +3433,6 @@ fx: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo.com <translation>Hvor gennemarbejdet blokverificeringen for -checkblocks er (0-4; standard: %u)</translation> </message> <message> - <source>If paytxfee is not set, include enough fee so transactions are confirmed on average within n blocks (default: %u)</source> - <translation>Hvis paytxfee ikke er angivet, inkludér da nok gebyr til at transaktioner gennemsnitligt bekræftes inden for n blokke (standard: %u)</translation> - </message> - <message> <source>Log transaction priority and fee per kB when mining blocks (default: %u)</source> <translation>Prioritet for transaktionslog og gebyr pr. kB under udvinding af blokke (standard: %u)</translation> </message> @@ -3415,6 +3509,10 @@ fx: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo.com <translation>Oprethold højest <n> forbindelser til andre knuder (standard: %u)</translation> </message> <message> + <source>Make the wallet broadcast transactions</source> + <translation>Få tegnebogen til at transmittere transaktioner</translation> + </message> + <message> <source>Maximum per-connection receive buffer, <n>*1000 bytes (default: %u)</source> <translation>Maksimum for modtagelsesbuffer pr. forbindelse, <n>*1000 byte (standard: %u)</translation> </message> @@ -3431,10 +3529,6 @@ fx: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo.com <translation>Føj tidsstempel foran fejlsøgningsoutput (standard: %u)</translation> </message> <message> - <source>Print block tree on startup (default: %u)</source> - <translation>Udskriv bloktræ under opstart (standard: %u)</translation> - </message> - <message> <source>Relay and mine data carrier transactions (default: %u)</source> <translation>Videresend og udvind databærer-transaktioner (standard: %u)</translation> </message> @@ -3513,10 +3607,6 @@ fx: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo.com <translation>Ugyldigt beløb for -paytxfee=<beløb>: "%s"</translation> </message> <message> - <source>Invalid amount</source> - <translation>Ugyldigt beløb</translation> - </message> - <message> <source>Insufficient funds</source> <translation>Manglende dækning</translation> </message> @@ -3549,10 +3639,6 @@ fx: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo.com <translation>Indlæsning gennemført</translation> </message> <message> - <source>To use the %s option</source> - <translation>For at bruge %s mulighed</translation> - </message> - <message> <source>Error</source> <translation>Fejl</translation> </message> diff --git a/src/qt/locale/bitcoin_de.ts b/src/qt/locale/bitcoin_de.ts index 2804d2d665..928b72fae8 100644 --- a/src/qt/locale/bitcoin_de.ts +++ b/src/qt/locale/bitcoin_de.ts @@ -1,9 +1,9 @@ -<TS language="de" version="2.0"> +<TS language="de" version="2.1"> <context> <name>AddressBookPage</name> <message> - <source>Double-click to edit address or label</source> - <translation>Doppelklick zum Bearbeiten der Adresse oder der Bezeichnung</translation> + <source>Right-click to edit address or label</source> + <translation>Rechtsklick zum Bearbeiten der Adresse oder der Bezeichnung</translation> </message> <message> <source>Create a new address</source> @@ -156,10 +156,6 @@ <translation>Passphrase ändern</translation> </message> <message> - <source>Enter the old and new passphrase to the wallet.</source> - <translation>Geben Sie die alte und neue Wallet-Passphrase ein.</translation> - </message> - <message> <source>Confirm wallet encryption</source> <translation>Wallet-Verschlüsselung bestätigen</translation> </message> @@ -188,10 +184,6 @@ <translation>Geben Sie die neue Passphrase für die Wallet ein.<br>Bitte benutzen Sie eine Passphrase bestehend aus <b>zehn oder mehr zufälligen Zeichen</b> oder <b>acht oder mehr Wörtern</b>.</translation> </message> <message> - <source>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>Bitcoin wird jetzt beendet, um den Verschlüsselungsprozess abzuschließen. Bitte beachten Sie, dass die Wallet-Verschlüsselung nicht vollständig vor Diebstahl Ihrer Bitcoins durch Schadprogramme schützt, die Ihren Computer befällt.</translation> - </message> - <message> <source>Wallet encryption failed</source> <translation>Wallet-Verschlüsselung fehlgeschlagen</translation> </message> @@ -311,10 +303,6 @@ <translation>Bitcoins an eine Bitcoin-Adresse überweisen</translation> </message> <message> - <source>Modify configuration options for Bitcoin</source> - <translation>Die Konfiguration des Clients bearbeiten</translation> - </message> - <message> <source>Backup wallet to another location</source> <translation>Eine Wallet-Sicherungskopie erstellen und abspeichern</translation> </message> @@ -403,6 +391,10 @@ <translation>&Über Bitcoin Core</translation> </message> <message> + <source>Modify configuration options for Bitcoin Core</source> + <translation>Konfigurationsoptionen für Bitcoin Core ändern</translation> + </message> + <message> <source>Show the list of used sending addresses and labels</source> <translation>Liste verwendeter Zahlungsadressen und Bezeichnungen anzeigen</translation> </message> @@ -483,6 +475,36 @@ <translation>Hole auf...</translation> </message> <message> + <source>Date: %1 +</source> + <translation>Datum: %1 +</translation> + </message> + <message> + <source>Amount: %1 +</source> + <translation>Betrag: %1 +</translation> + </message> + <message> + <source>Type: %1 +</source> + <translation>Typ: %1 +</translation> + </message> + <message> + <source>Label: %1 +</source> + <translation>Bezeichnung: %1 +</translation> + </message> + <message> + <source>Address: %1 +</source> + <translation>Adresse: %1 +</translation> + </message> + <message> <source>Sent transaction</source> <translation>Gesendete Transaktion</translation> </message> @@ -491,17 +513,6 @@ <translation>Eingehende Transaktion</translation> </message> <message> - <source>Date: %1 -Amount: %2 -Type: %3 -Address: %4 -</source> - <translation>Datum: %1 -Betrag: %2 -Typ: %3 -Adresse: %4</translation> - </message> - <message> <source>Wallet is <b>encrypted</b> and currently <b>unlocked</b></source> <translation>Wallet ist <b>verschlüsselt</b> und aktuell <b>entsperrt</b></translation> </message> @@ -704,10 +715,6 @@ Adresse: %4</translation> <translation>nein</translation> </message> <message> - <source>This label turns red, if the transaction size is greater than 1000 bytes.</source> - <translation>Diese Bezeichnung wird rot, wenn die Transaktion größer als 1000 Byte ist.</translation> - </message> - <message> <source>This means a fee of at least %1 per kB is required.</source> <translation>Das bedeutet, dass eine Gebühr von mindestens %1 pro kB erforderlich ist.</translation> </message> @@ -720,14 +727,6 @@ Adresse: %4</translation> <translation>Transaktionen mit höherer Priorität haben eine größere Chance in einen Block aufgenommen zu werden.</translation> </message> <message> - <source>This label turns red, if the priority is smaller than "medium".</source> - <translation>Diese Bezeichnung wird rot, wenn die Priorität niedriger als "mittel" ist.</translation> - </message> - <message> - <source>This label turns red, if any recipient receives an amount smaller than %1.</source> - <translation>Diese Bezeichnung wird rot, wenn irgendein Empfänger einen Betrag kleiner als %1 erhält.</translation> - </message> - <message> <source>(no label)</source> <translation>(keine Bezeichnung)</translation> </message> @@ -848,30 +847,6 @@ Adresse: %4</translation> <source>command-line options</source> <translation>Kommandozeilenoptionen</translation> </message> - <message> - <source>UI options</source> - <translation>UI-Optionen</translation> - </message> - <message> - <source>Set language, for example "de_DE" (default: system locale)</source> - <translation>Sprache festlegen, z.B. "de_DE" (Standard: Systemstandard)</translation> - </message> - <message> - <source>Start minimized</source> - <translation>Minimiert starten</translation> - </message> - <message> - <source>Set SSL root certificates for payment request (default: -system-)</source> - <translation>SSL-Wurzelzertifikate für Zahlungsanforderungen festlegen (Standard: Systemstandard)</translation> - </message> - <message> - <source>Show splash screen on startup (default: 1)</source> - <translation>Startbildschirm beim Starten anzeigen (Standard: 1)</translation> - </message> - <message> - <source>Choose data directory on startup (default: 0)</source> - <translation>Datenverzeichnis beim Starten auswählen (Standard: 0)</translation> - </message> </context> <context> <name>Intro</name> @@ -954,14 +929,6 @@ Adresse: %4</translation> <translation>&Allgemein</translation> </message> <message> - <source>Automatically start Bitcoin after logging in to the system.</source> - <translation>Bitcoin nach der Anmeldung am System automatisch ausführen.</translation> - </message> - <message> - <source>&Start Bitcoin on system login</source> - <translation>&Starte Bitcoin nach Systemanmeldung</translation> - </message> - <message> <source>Size of &database cache</source> <translation>Größe des &Datenbankcaches</translation> </message> @@ -1010,6 +977,14 @@ Adresse: %4</translation> <translation>&Netzwerk</translation> </message> <message> + <source>Automatically start Bitcoin Core after logging in to the system.</source> + <translation>Bitcoin Core nach dem Anmelden am System automatisch starten.</translation> + </message> + <message> + <source>&Start Bitcoin Core on system login</source> + <translation>Bitcoin Core bei der Systemanmeldung &starten</translation> + </message> + <message> <source>(0 = auto, <0 = leave that many cores free)</source> <translation>(0 = automatisch, <0 = so viele Kerne frei lassen)</translation> </message> @@ -1074,10 +1049,6 @@ Adresse: %4</translation> <translation>In den Infobereich anstatt in die Taskleiste &minimieren</translation> </message> <message> - <source>Minimize instead of exit the application when the window is closed. When this option is enabled, the application will be closed only after selecting Quit in the menu.</source> - <translation>Minimiert die Anwendung anstatt sie zu beenden wenn das Fenster geschlossen wird. Wenn dies aktiviert ist, müssen Sie das Programm über "Beenden" im Menü schließen.</translation> - </message> - <message> <source>M&inimize on close</source> <translation>Beim Schließen m&inimieren</translation> </message> @@ -1090,10 +1061,6 @@ Adresse: %4</translation> <translation>&Sprache der Benutzeroberfläche:</translation> </message> <message> - <source>The user interface language can be set here. This setting will take effect after restarting Bitcoin.</source> - <translation>Legt die Sprache der Benutzeroberfläche fest. Diese Einstellung wird erst nach einem Neustart von Bitcoin aktiv.</translation> - </message> - <message> <source>&Unit to show amounts in:</source> <translation>&Einheit der Beträge:</translation> </message> @@ -1130,8 +1097,8 @@ Adresse: %4</translation> <translation>Clientneustart nötig, um die Änderungen zu aktivieren.</translation> </message> <message> - <source>Client will be shutdown, do you want to proceed?</source> - <translation>Client wird beendet, wollen Sie fortfahren?</translation> + <source>Client will be shut down. Do you want to proceed?</source> + <translation>Client wird heruntergefahren. Möchten Sie den Vorgang fortsetzen?</translation> </message> <message> <source>This change would require a client restart.</source> @@ -1240,10 +1207,6 @@ Adresse: %4</translation> <translation>Netzwerk der Zahlungsanforderung stimmt nicht mit dem Client-Netzwerk überein.</translation> </message> <message> - <source>Payment request has expired.</source> - <translation>Zahlungsanforderung ist abgelaufen.</translation> - </message> - <message> <source>Payment request is not initialized.</source> <translation>Zahlungsanforderung ist nicht initialisiert.</translation> </message> @@ -1284,6 +1247,14 @@ Adresse: %4</translation> <translation>Rücküberweisung von %1</translation> </message> <message> + <source>Payment request %1 is too large (%2 bytes, allowed %3 bytes).</source> + <translation>Zahlungsanforderung %1 ist zu groß (%2 Byte, erlaubt sind %3 Byte).</translation> + </message> + <message> + <source>Payment request DoS protection</source> + <translation>Zahlungsanforderungs-DoS-Schutz</translation> + </message> + <message> <source>Error communicating with %1: %2</source> <translation>Kommunikationsfehler mit %1: %2</translation> </message> @@ -1311,8 +1282,8 @@ Adresse: %4</translation> <translation>User-Agent</translation> </message> <message> - <source>Address/Hostname</source> - <translation>Adresse/Hostname</translation> + <source>Node/Service</source> + <translation>Knoten/Dienst</translation> </message> <message> <source>Ping Time</source> @@ -1346,14 +1317,6 @@ Adresse: %4</translation> <translation>%1 s</translation> </message> <message> - <source>NETWORK</source> - <translation>NETZWERK</translation> - </message> - <message> - <source>UNKNOWN</source> - <translation>UNBEKANNT</translation> - </message> - <message> <source>None</source> <translation>Keine</translation> </message> @@ -1512,6 +1475,10 @@ Adresse: %4</translation> <translation>Pingzeit</translation> </message> <message> + <source>Time Offset</source> + <translation>Zeitversatz</translation> + </message> + <message> <source>Last block time</source> <translation>Letzte Blockzeit</translation> </message> @@ -1552,16 +1519,12 @@ Adresse: %4</translation> <translation>Debugprotokolldatei</translation> </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>Öffnet die Bitcoin-Debugprotokolldatei aus dem aktuellen Datenverzeichnis. Dies kann bei großen Protokolldateien einige Sekunden dauern.</translation> - </message> - <message> <source>Clear console</source> <translation>Konsole zurücksetzen</translation> </message> <message> - <source>Welcome to the Bitcoin RPC console.</source> - <translation>Willkommen in der Bitcoin-RPC-Konsole.</translation> + <source>Welcome to the Bitcoin Core RPC console.</source> + <translation>Willkommen in der Bitcoin Core RPC-Konsole.</translation> </message> <message> <source>Use up and down arrows to navigate history, and <b>Ctrl-L</b> to clear screen.</source> @@ -1852,14 +1815,6 @@ Adresse: %4</translation> <translation>Transaktionsgebühreneinstellungen ausblenden</translation> </message> <message> - <source>Minimize</source> - <translation>Minimieren</translation> - </message> - <message> - <source>If the custom fee is set to 1000 satoshis and the transaction is only 250 bytes, then "per kilobyte" only pays 250 satoshis in fee, while "at least" pays 1000 satoshis. For transactions bigger than a kilobyte both pay by kilobyte.</source> - <translation>Wenn die benutzerdefinierte Gebühr 1000 Satoshis beträgt und die Transaktion nur 250 Byte groß ist, wird bei Auswahl von "pro Kilobyte" eine Gebühr in Höhe von 250 Satoshis, bei Auswahl von "Mindestbetrag" eine Gebühr in Höhe von 1000 Satoshis bezahlt. Bei Transaktionen die Größer als ein Kilobyte sind, werden bei beiden Optionen die Gebühren pro Kilobyte bezahlt.</translation> - </message> - <message> <source>per kilobyte</source> <translation>pro Kilobyte</translation> </message> @@ -1868,6 +1823,10 @@ Adresse: %4</translation> <translation>Wenn die benutzerdefinierte Gebühr 1000 Satoshis beträgt und die Transaktion nur 250 Byte groß ist, wird bei Auswahl von "pro Kilobyte" eine Gebühr in Höhe von 250 Satoshis, bei Auswahl von "Mindestbetrag" eine Gebühr in Höhe von 1000 Satoshis bezahlt. Bei Transaktionen die Größer als ein Kilobyte sind, werden bei beiden Optionen die Gebühren pro Kilobyte bezahlt.</translation> </message> <message> + <source>Hide</source> + <translation>Ausblenden</translation> + </message> + <message> <source>total at least</source> <translation>Mindestbetrag</translation> </message> @@ -1988,10 +1947,6 @@ Adresse: %4</translation> <translation>oder</translation> </message> <message> - <source>The recipient address is not valid, please recheck.</source> - <translation>Die Zahlungsadresse ist ungültig, bitte nochmals überprüfen.</translation> - </message> - <message> <source>The amount to pay must be larger than 0.</source> <translation>Der zu zahlende Betrag muss größer als 0 sein.</translation> </message> @@ -2004,10 +1959,6 @@ Adresse: %4</translation> <translation>Der angegebene Betrag übersteigt aufgrund der Transaktionsgebühr in Höhe von %1 Ihren Kontostand.</translation> </message> <message> - <source>Duplicate address found, can only send to each address once per send operation.</source> - <translation>Doppelte Zahlungsadresse gefunden, pro Überweisung kann an jede Adresse nur einmalig etwas überwiesen werden.</translation> - </message> - <message> <source>Transaction creation failed!</source> <translation>Transaktionserstellung fehlgeschlagen!</translation> </message> @@ -2016,7 +1967,7 @@ Adresse: %4</translation> <translation>Die Transaktion wurde abgelehnt! Dies kann passieren, wenn einige Bitcoins aus Ihrer Wallet bereits ausgegeben wurden. Beispielsweise weil Sie eine Kopie Ihrer wallet.dat genutzt, die Bitcoins dort ausgegeben haben und dies daher in der derzeit aktiven Wallet nicht vermerkt ist.</translation> </message> <message> - <source>A fee higher than %1 is considered an insanely high fee.</source> + <source>A fee higher than %1 is considered an absurdly high fee.</source> <translation>Eine höhere Gebühr als %1 wird als unsinnig hohe Gebühr angesehen.</translation> </message> <message> @@ -2024,10 +1975,6 @@ Adresse: %4</translation> <translation>Nur die minimale Gebühr in Höhe von %1 zahlen</translation> </message> <message> - <source>Estimated to begin confirmation within %1 block(s).</source> - <translation>Voraussichtlicher Beginn der Bestätigung innerhalb von %1 Blöcken.</translation> - </message> - <message> <source>Warning: Invalid Bitcoin address</source> <translation>Warnung: Ungültige Bitcoin-Adresse</translation> </message> @@ -2099,12 +2046,12 @@ Adresse: %4</translation> <translation>Diesen Eintrag entfernen</translation> </message> <message> - <source>Message:</source> - <translation>Nachricht:</translation> + <source>S&ubtract fee from amount</source> + <translation>Gebühr von Betrag ab&ziehen</translation> </message> <message> - <source>This is a verified payment request.</source> - <translation>Dies is eine verifizierte Zahlungsanforderung.</translation> + <source>Message:</source> + <translation>Nachricht:</translation> </message> <message> <source>Enter a label for this address to add it to the list of used addresses</source> @@ -2115,10 +2062,6 @@ Adresse: %4</translation> <translation>Eine an die "bitcoin:"-URI angefügte Nachricht, die zusammen mit der Transaktion gespeichert wird. Hinweis: Diese Nachricht wird nicht über das Bitcoin-Netzwerk gesendet.</translation> </message> <message> - <source>This is an unverified payment request.</source> - <translation>Dies is eine unverifizierte Zahlungsanforderung.</translation> - </message> - <message> <source>Pay To:</source> <translation>Empfänger:</translation> </message> @@ -2149,10 +2092,6 @@ Adresse: %4</translation> <translation>Nachricht &signieren</translation> </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>Sie können Nachrichten mit Ihren Adressen signieren, um den Besitz dieser Adressen zu beweisen. Bitte nutzen Sie diese Funktion mit Vorsicht und nehmen Sie sich vor Phishingangriffen in Acht. Signieren Sie nur Nachrichten, mit denen Sie vollständig einverstanden sind.</translation> - </message> - <message> <source>The Bitcoin address to sign the message with</source> <translation>Die Bitcoin-Adresse mit der die Nachricht signiert wird</translation> </message> @@ -2205,10 +2144,6 @@ Adresse: %4</translation> <translation>Nachricht &verifizieren</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>Geben Sie die signierende Adresse, Nachricht (achten Sie darauf Zeilenumbrüche, Leerzeichen, Tabulatoren usw. exakt zu kopieren) und Signatur unten ein, um die Nachricht zu verifizieren. Vorsicht, interpretieren Sie nicht mehr in die Signatur hinein, als in der signierten Nachricht selber enthalten ist, um nicht von einem Man-in-the-middle-Angriff hinters Licht geführt zu werden.</translation> - </message> - <message> <source>The Bitcoin address the message was signed with</source> <translation>Die Bitcoin-Adresse mit der die Nachricht signiert wurde</translation> </message> @@ -2472,10 +2407,6 @@ Adresse: %4</translation> <translation>Typ</translation> </message> <message> - <source>Address</source> - <translation>Adresse</translation> - </message> - <message> <source>Immature (%1 confirmations, will be available after %2)</source> <translation>Unreif (%1 Bestätigungen, wird verfügbar sein nach %2)</translation> </message> @@ -2504,6 +2435,10 @@ Adresse: %4</translation> <translation>Offline</translation> </message> <message> + <source>Label</source> + <translation>Bezeichnung</translation> + </message> + <message> <source>Unconfirmed</source> <translation>Unbestätigt</translation> </message> @@ -2560,10 +2495,6 @@ Adresse: %4</translation> <translation>Zeigt an, ob eine beobachtete Adresse in diese Transaktion involviert ist.</translation> </message> <message> - <source>Destination address of transaction.</source> - <translation>Zieladresse der Transaktion.</translation> - </message> - <message> <source>Amount removed from or added to balance.</source> <translation>Der Betrag, der dem Kontostand abgezogen oder hinzugefügt wurde.</translation> </message> @@ -2802,30 +2733,6 @@ Adresse: %4</translation> <translation>Eingehende Verbindungen annehmen (Standard: 1, wenn nicht -proxy oder -connect)</translation> </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>%s, Sie müssen den Wert rpcpasswort in dieser Konfigurationsdatei angeben: -%s -Es wird empfohlen das folgende Zufallspasswort zu verwenden: -rpcuser=bitcoinrpc -rpcpassword=%s -(Sie müssen sich dieses Passwort nicht merken!) -Der Benutzername und das Passwort dürfen NICHT identisch sein. -Falls die Konfigurationsdatei nicht existiert, erzeugen Sie diese bitte mit Leserechten nur für den Dateibesitzer. -Es wird ebenfalls empfohlen alertnotify anzugeben, um im Problemfall benachrichtig zu werden; -zum Beispiel: alertnotify=echo %%s | mail -s \"Bitcoin Alert\" admin@foo.com -</translation> - </message> - <message> <source>Bind to given address and always listen on it. Use [host]:port notation for IPv6</source> <translation>An die angegebene Adresse binden und immer abhören. Für IPv6 "[Host]:Port"-Notation verwenden</translation> </message> @@ -2842,14 +2749,6 @@ zum Beispiel: alertnotify=echo %%s | mail -s \"Bitcoin Alert\" admin@foo.com <translation>Regressionstest-Modus aktivieren, der eine spezielle Blockkette nutzt, in der Blöcke sofort gelöst werden können.</translation> </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>Fehler: Die Transaktion wurde abgelehnt! Dies kann passieren, wenn einige Bitcoins aus Ihrer Wallet bereits ausgegeben wurden. Beispielsweise weil Sie eine Kopie Ihrer wallet.dat genutzt, die Bitcoins dort ausgegeben haben und dies daher in der derzeit aktiven Wallet nicht vermerkt ist.</translation> - </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>Fehler: Diese Transaktion benötigt aufgrund Ihres Betrags, Ihrer Komplexität oder der Nutzung erst kürzlich erhaltener Zahlungen eine Transaktionsgebühr in Höhe von mindestens %s!</translation> - </message> - <message> <source>Execute command when a wallet transaction changes (%s in cmd is replaced by TxID)</source> <translation>Befehl ausführen wenn sich eine Wallet-Transaktion verändert (%s im Befehl wird durch die Transaktions-ID ersetzt)</translation> </message> @@ -2926,10 +2825,6 @@ zum Beispiel: alertnotify=echo %%s | mail -s \"Bitcoin Alert\" admin@foo.com <translation>Debugging-/Testoptionen:</translation> </message> <message> - <source>Discover own IP address (default: 1 when listening and no -externalip)</source> - <translation>Eigene IP-Adresse erkennen (Standard: 1, wenn abgehört wird und nicht -externalip)</translation> - </message> - <message> <source>Do not load the wallet and disable wallet RPC calls</source> <translation>Die Wallet nicht laden und Wallet-RPC-Aufrufe deaktivieren</translation> </message> @@ -2962,10 +2857,6 @@ zum Beispiel: alertnotify=echo %%s | mail -s \"Bitcoin Alert\" admin@foo.com <translation>Fehler: Zu wenig freier Speicherplatz auf dem Datenträger!</translation> </message> <message> - <source>Error: Wallet locked, unable to create transaction!</source> - <translation>Fehler: Wallet gesperrt, Transaktion kann nicht erstellt werden!</translation> - </message> - <message> <source>Failed to listen on any port. Use -listen=0 if you want this.</source> <translation>Fehler, es konnte kein Port abgehört werden. Wenn dies so gewünscht wird -listen=0 verwenden.</translation> </message> @@ -2994,10 +2885,6 @@ zum Beispiel: alertnotify=echo %%s | mail -s \"Bitcoin Alert\" admin@foo.com <translation>Nur zu Knoten des Netzwerktyps <net> verbinden (ipv4, ipv6 oder onion)</translation> </message> <message> - <source>Rebuild block chain index from current blk000??.dat files</source> - <translation>Blockkettenindex aus aktuellen Dateien blk000??.dat wiederaufbauen</translation> - </message> - <message> <source>Set database cache size in megabytes (%d to %d, default: %d)</source> <translation>Größe des Datenbankcaches in Megabyte festlegen (%d bis %d, Standard: %d)</translation> </message> @@ -3062,10 +2949,6 @@ zum Beispiel: alertnotify=echo %%s | mail -s \"Bitcoin Alert\" admin@foo.com <translation>Datenverzeichnis %s kann nicht gesperrt werden, da Bitcoin Core wahrscheinlich bereits gestartet wurde.</translation> </message> <message> - <source>Continuously rate-limit free transactions to <n>*1000 bytes per minute (default:%u)</source> - <translation>Anzahl der freien Transaktionen auf <n> * 1000 Byte pro Minute begrenzen (Standard: %u)</translation> - </message> - <message> <source>Create new files with system default permissions, instead of umask 077 (only effective with disabled wallet functionality)</source> <translation>Neue Dateien mit Standard-Systemrechten erzeugen, anstatt mit umask 077 (nur mit deaktivierter Walletfunktion nutzbar)</translation> </message> @@ -3090,6 +2973,14 @@ zum Beispiel: alertnotify=echo %%s | mail -s \"Bitcoin Alert\" admin@foo.com <translation>Niedrigere Gebühren (in BTC/Kb) als diese werden bei der Transaktionserstellung als gebührenfrei angesehen (Standard: %s)</translation> </message> <message> + <source>If paytxfee is not set, include enough fee so transactions begin confirmation on average within n blocks (default: %u)</source> + <translation>Wenn -paytxfee nicht festgelegt wurde Gebühren einschließen, so dass mit der Bestätigung von Transaktionen im Schnitt innerhalb von n Blöcken begonnen wird (Standard: %u)</translation> + </message> + <message> + <source>Invalid amount for -maxtxfee=<amount>: '%s' (must be at least the minrelay fee of %s to prevent stuck transactions)</source> + <translation>Ungültiger Betrag für -maxtxfee=<amount>: '%s' (muss mindestens die minimale Weiterleitungsgebühr in Höhe von %s sein, um zu verhindern dass Transaktionen nicht bearbeitet werden)</translation> + </message> + <message> <source>Maximum size of data in data carrier transactions we relay and mine (default: %u)</source> <translation>Maximale Datengröße in "Data Carrier"-Transaktionen die weitergeleitet und erarbeitet werden (Standard: %u)</translation> </message> @@ -3110,6 +3001,34 @@ zum Beispiel: alertnotify=echo %%s | mail -s \"Bitcoin Alert\" admin@foo.com <translation>Dieses Produkt enthält Software, die vom OpenSSL-Projekt zur Verwendung im OpenSSL-Toolkit <https://www.openssl.org/> entwickelt wird, sowie von Eric Young geschriebene kryptographische Software und von Thomas Bernard geschriebene UPnP-Software.</translation> </message> <message> + <source>To use bitcoind, or the -server option to bitcoin-qt, you must set an 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>Um bitcoind oder die Option -server mit bitcoin-qt verwenden zu können, müssen Sie rpcpassword in der Konfigurationsdatei angeben: +%s +Es wird empfohlen das folgende Zufallspasswort zu verwenden. +rpcuser=bitcoinrpc +rpcpassword=%s +(Sie müssen sich dieses Passwort nicht merken!) +Der Benutzername und das Passwort dürfen NICHT identisch sein. +Falls die Konfigurationsdatei nicht existiert, erzeugen Sie diese bitte mit Leserechten nur für den Dateibesitzer. +Es wird ebenfalls empfohlen alertnotify anzugeben, um im Problemfall benachrichtigt zu werden. +Beispiel: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo.com +</translation> + </message> + <message> + <source>Warning: -maxtxfee is set very high! Fees this large could be paid on a single transaction.</source> + <translation>Warnung: -maxtxfee ist auf einen sehr hohen Wert festgelegt! Gebühren dieser Höhe könnten für eine einzelne Transaktion bezahlt werden.</translation> + </message> + <message> <source>Warning: Please check that your computer's date and time are correct! If your clock is wrong Bitcoin Core will not work properly.</source> <translation>Warnung: Bitte korrigieren Sie die Datums- und Uhrzeiteinstellungen Ihres Computers, da Bitcoin Core ansonsten nicht ordnungsgemäß funktionieren wird.</translation> </message> @@ -3118,10 +3037,22 @@ zum Beispiel: alertnotify=echo %%s | mail -s \"Bitcoin Alert\" admin@foo.com <translation>Erlaubte Gegenstellen werden nicht für DoS-Attacken gesperrt und ihre Transkationen werden immer weitergeleitet, auch wenn sie sich bereits im Speicherpool befinden, was z.B. für Gateways sinnvoll ist.</translation> </message> <message> + <source>(default: %u)</source> + <translation>(Standard: %u)</translation> + </message> + <message> + <source>Accept public REST requests (default: %u)</source> + <translation>Öffentliche REST-Anfragen annehmen (Standard: %u)</translation> + </message> + <message> <source>Cannot resolve -whitebind address: '%s'</source> <translation>Kann Adresse in -whitebind nicht auflösen: '%s'</translation> </message> <message> + <source>Choose data directory on startup (default: 0)</source> + <translation>Datenverzeichnis beim Starten auswählen (Standard: 0)</translation> + </message> + <message> <source>Connect through SOCKS5 proxy</source> <translation>Über einen SOCKS5-Proxy &verbinden</translation> </message> @@ -3138,6 +3069,10 @@ zum Beispiel: alertnotify=echo %%s | mail -s \"Bitcoin Alert\" admin@foo.com <translation>Fehler beim Laden von wallet.dat: Wallet benötigt neuere Version von Bitcoin Core</translation> </message> <message> + <source>Error reading from database, shutting down.</source> + <translation>Fehler beim lesen der Datenbank, Ausführung wird beendet.</translation> + </message> + <message> <source>Error: Unsupported argument -tor found, use -onion.</source> <translation>Fehler: Nicht unterstütztes Argument -tor gefunden, bitte -onion verwenden.</translation> </message> @@ -3154,6 +3089,10 @@ zum Beispiel: alertnotify=echo %%s | mail -s \"Bitcoin Alert\" admin@foo.com <translation>Initialisierungsplausibilitätsprüfung fehlgeschlagen. Bitcoin Core wird beendet.</translation> </message> <message> + <source>Invalid amount for -maxtxfee=<amount>: '%s'</source> + <translation>Ungültiger Betrag für -maxtxfee=<amount>: '%s'</translation> + </message> + <message> <source>Invalid amount for -minrelaytxfee=<amount>: '%s'</source> <translation>Ungültiger Betrag für -minrelaytxfee=<amount>: '%s'</translation> </message> @@ -3170,10 +3109,6 @@ zum Beispiel: alertnotify=echo %%s | mail -s \"Bitcoin Alert\" admin@foo.com <translation>Ungültige Netzmaske angegeben in -whitelist: '%s'</translation> </message> <message> - <source>Keep at most <n> unconnectable blocks in memory (default: %u)</source> - <translation>Maximal <n> nicht-verbindbare Blöcke im Speicher halten (Standard: %u)</translation> - </message> - <message> <source>Keep at most <n> unconnectable transactions in memory (default: %u)</source> <translation>Maximal <n> nicht-verbindbare Transaktionen im Speicher halten (Standard: %u)</translation> </message> @@ -3186,10 +3121,6 @@ zum Beispiel: alertnotify=echo %%s | mail -s \"Bitcoin Alert\" admin@foo.com <translation>Knoten-Weiterleitungsoptionen:</translation> </message> <message> - <source>Print block on startup, if found in block index</source> - <translation>Block beim Starten ausgeben, wenn dieser im Blockindex gefunden wurde.</translation> - </message> - <message> <source>RPC SSL options: (see the Bitcoin Wiki for SSL setup instructions)</source> <translation>RPC-SSL-Optionen (siehe Bitcoin-Wiki für SSL-Einrichtung):</translation> </message> @@ -3198,6 +3129,10 @@ zum Beispiel: alertnotify=echo %%s | mail -s \"Bitcoin Alert\" admin@foo.com <translation>RPC-Serveroptionen:</translation> </message> <message> + <source>RPC support for HTTP persistent connections (default: %d)</source> + <translation>Unterstützung für persistente HTTP-Verbindungen bei RPC (Standard: %d)</translation> + </message> + <message> <source>Randomly drop 1 of every <n> network messages</source> <translation>Zufällig eine von <n> Netzwerknachrichten verwerfen</translation> </message> @@ -3214,10 +3149,22 @@ zum Beispiel: alertnotify=echo %%s | mail -s \"Bitcoin Alert\" admin@foo.com <translation>Transaktionen, wenn möglich, als gebührenfreie Transaktion senden (Standard: %u)</translation> </message> <message> + <source>Set SSL root certificates for payment request (default: -system-)</source> + <translation>SSL-Wurzelzertifikate für Zahlungsanforderungen festlegen (Standard: -system-)</translation> + </message> + <message> + <source>Set language, for example "de_DE" (default: system locale)</source> + <translation>Sprache festlegen, z.B. "de_DE" (Standard: Systemstandard)</translation> + </message> + <message> <source>Show all debugging options (usage: --help -help-debug)</source> <translation>Zeige alle Debuggingoptionen (Benutzung: --help -help-debug)</translation> </message> <message> + <source>Show splash screen on startup (default: 1)</source> + <translation>Startbildschirm beim Starten anzeigen (Standard: 1)</translation> + </message> + <message> <source>Shrink debug.log file on client startup (default: 1 when no -debug)</source> <translation>Protokolldatei debug.log beim Starten des Clients kürzen (Standard: 1, wenn kein -debug)</translation> </message> @@ -3226,6 +3173,10 @@ zum Beispiel: alertnotify=echo %%s | mail -s \"Bitcoin Alert\" admin@foo.com <translation>Signierung der Transaktion fehlgeschlagen</translation> </message> <message> + <source>Start minimized</source> + <translation>Minimiert starten</translation> + </message> + <message> <source>This is experimental software.</source> <translation>Dies ist experimentelle Software.</translation> </message> @@ -3238,10 +3189,18 @@ zum Beispiel: alertnotify=echo %%s | mail -s \"Bitcoin Alert\" admin@foo.com <translation>Transaktionsbeträge müssen positiv sein</translation> </message> <message> + <source>Transaction too large for fee policy</source> + <translation>Transaktion ist für die Gebührenrichtlinie zu groß</translation> + </message> + <message> <source>Transaction too large</source> <translation>Transaktion zu groß</translation> </message> <message> + <source>UI Options:</source> + <translation>Benutzeroberflächenoptionen:</translation> + </message> + <message> <source>Unable to bind to %s on this computer (bind returned error %s)</source> <translation>Kann auf diesem Computer nicht an %s binden (bind meldete Fehler %s)</translation> </message> @@ -3262,10 +3221,6 @@ zum Beispiel: alertnotify=echo %%s | mail -s \"Bitcoin Alert\" admin@foo.com <translation>Warnung</translation> </message> <message> - <source>Warning: This version is obsolete, upgrade required!</source> - <translation>Warnung: Diese Version is veraltet, Aktualisierung erforderlich!</translation> - </message> - <message> <source>Warning: Unsupported argument -benchmark ignored, use -debug=bench.</source> <translation>Warnung: Nicht unterstütztes Argument -benchmark wurde ignoriert, bitte -debug=bench verwenden.</translation> </message> @@ -3334,10 +3289,6 @@ zum Beispiel: alertnotify=echo %%s | mail -s \"Bitcoin Alert\" admin@foo.com <translation>Legt fest, wie gründlich die Blockverifikation von -checkblocks ist (0-4, Standard: %u)</translation> </message> <message> - <source>If paytxfee is not set, include enough fee so transactions are confirmed on average within n blocks (default: %u)</source> - <translation>Wenn keine Transaktionsgebühr festgelegt wurde eine Gebühr einbeziehen, sodass Transaktionen im Schnitt innerhalb von <n> Blöcken bestätigt werden (Standard: %u)</translation> - </message> - <message> <source>Log transaction priority and fee per kB when mining blocks (default: %u)</source> <translation>Transaktionspriorität und Gebühr pro kB beim Erzeugen von Blöcken protokollieren (Standard: %u)</translation> </message> @@ -3426,10 +3377,6 @@ zum Beispiel: alertnotify=echo %%s | mail -s \"Bitcoin Alert\" admin@foo.com <translation>Debugausgaben einen Zeitstempel voranstellen (Standard: %u)</translation> </message> <message> - <source>Print block tree on startup (default: %u)</source> - <translation>Blockbaum beim Starten ausgeben (Standard: %u)</translation> - </message> - <message> <source>Relay and mine data carrier transactions (default: %u)</source> <translation>"Data Carrier"-Transaktionen weiterleiten und erarbeiten (Standard: %u)</translation> </message> @@ -3506,10 +3453,6 @@ zum Beispiel: alertnotify=echo %%s | mail -s \"Bitcoin Alert\" admin@foo.com <translation>Ungültiger Betrag für -paytxfee=<amount>: '%s'</translation> </message> <message> - <source>Invalid amount</source> - <translation>Ungültiger Betrag</translation> - </message> - <message> <source>Insufficient funds</source> <translation>Unzureichender Kontostand</translation> </message> @@ -3542,10 +3485,6 @@ zum Beispiel: alertnotify=echo %%s | mail -s \"Bitcoin Alert\" admin@foo.com <translation>Laden abgeschlossen</translation> </message> <message> - <source>To use the %s option</source> - <translation>Zur Nutzung der %s-Option</translation> - </message> - <message> <source>Error</source> <translation>Fehler</translation> </message> diff --git a/src/qt/locale/bitcoin_el_GR.ts b/src/qt/locale/bitcoin_el_GR.ts index cf29c222ed..5cabe43032 100644 --- a/src/qt/locale/bitcoin_el_GR.ts +++ b/src/qt/locale/bitcoin_el_GR.ts @@ -1,17 +1,13 @@ -<TS language="el_GR" version="2.0"> +<TS language="el_GR" version="2.1"> <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>&Νέα</translation> + <translation>&Νέo</translation> </message> <message> <source>Copy the currently selected address to the system clipboard</source> @@ -91,7 +87,7 @@ </message> <message> <source>Exporting Failed</source> - <translation>Η εξαγωγή απέτυχε</translation> + <translation>Η Εξαγωγή Απέτυχε</translation> </message> <message> <source>There was an error trying to save the address list to %1. Please try again.</source> @@ -102,7 +98,7 @@ <name>AddressTableModel</name> <message> <source>Label</source> - <translation>Ετικέτα</translation> + <translation>Επιγραφή</translation> </message> <message> <source>Address</source> @@ -156,10 +152,6 @@ <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> @@ -189,10 +181,6 @@ <translation>Εισάγετε τον νέο κωδικό πρόσβασης στον πορτοφόλι <br/> Παρακαλώ χρησιμοποιείστε ένα κωδικό με <b> 10 ή περισσότερους τυχαίους χαρακτήρες</b> ή <b> οχτώ ή παραπάνω λέξεις</b>.</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>Το Bitcoin θα κλεισει τώρα για να τελειώσει την διαδικασία κρυπτογραφησης. Θυμησου ότι κρυπτογραφώντας το πορτοφολι σου δεν μπορείς να προστατέψεις πλήρως τα bitcoins σου από κλοπή στην περίπτωση όπου μολυνθεί ο υπολογιστής σου με κακόβουλο λογισμικό.</translation> - </message> - <message> <source>Wallet encryption failed</source> <translation>Η κρυπτογραφηση του πορτοφολιού απέτυχε</translation> </message> @@ -312,10 +300,6 @@ <translation>Στείλε νομίσματα σε μια διεύθυνση bitcoin</translation> </message> <message> - <source>Modify configuration options for Bitcoin</source> - <translation>Επεργασία ρυθμισεων επιλογών για το Bitcoin</translation> - </message> - <message> <source>Backup wallet to another location</source> <translation>Δημιουργία αντιγράφου ασφαλείας πορτοφολιού σε άλλη τοποθεσία</translation> </message> @@ -423,34 +407,14 @@ <source>Show the Bitcoin Core help message to get a list with possible Bitcoin command-line options</source> <translation>Εμφανιση του Bitcoin-Qt μήνυματος βοήθειας για να πάρετε μια λίστα με τις πιθανές επιλογές Bitcoin γραμμής εντολών.</translation> </message> - <message numerus="yes"> - <source>%n active connection(s) to Bitcoin network</source> - <translation><numerusform>%n ενεργή σύνδεση στο δίκτυο Bitcoin</numerusform><numerusform>%n ενεργές συνδέσεις στο δίκτυο Βitcoin</numerusform></translation> - </message> <message> <source>No block source available...</source> <translation>Η πηγή του μπλοκ δεν ειναι διαθέσιμη... </translation> </message> - <message numerus="yes"> - <source>%n hour(s)</source> - <translation><numerusform>%n ώρες </numerusform><numerusform>%n ώρες </numerusform></translation> - </message> - <message numerus="yes"> - <source>%n day(s)</source> - <translation><numerusform>%n ημέρες </numerusform><numerusform>%n ημέρες </numerusform></translation> - </message> - <message numerus="yes"> - <source>%n week(s)</source> - <translation><numerusform>%n εβδομαδες</numerusform><numerusform>%n εβδομαδες</numerusform></translation> - </message> <message> <source>%1 and %2</source> <translation>%1 και %2</translation> </message> - <message numerus="yes"> - <source>%n year(s)</source> - <translation><numerusform>%n έτος</numerusform><numerusform>%n έτη</numerusform></translation> - </message> <message> <source>%1 behind</source> <translation>%1 πίσω</translation> @@ -492,18 +456,6 @@ <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> @@ -631,7 +583,7 @@ Address: %4 </message> <message> <source>Copy after fee</source> - <translation>Αντιγραφή ταρίφας</translation> + <translation>Αντιγραφή μετα-ταρίφας</translation> </message> <message> <source>Copy bytes</source> @@ -702,10 +654,6 @@ Address: %4 <translation>όχι</translation> </message> <message> - <source>This label turns red, if the transaction size is greater than 1000 bytes.</source> - <translation>Η ετικετα γινετε κοκκινη , αν το μεγεθος της συναλαγης ειναι μεγαλητερο απο 1000 bytes.</translation> - </message> - <message> <source>This means a fee of at least %1 per kB is required.</source> <translation>Ελάχιστο χρεώσιμο ποσό τουλάχιστο %1 ανα kB</translation> </message> @@ -714,14 +662,6 @@ Address: %4 <translation>Συναλλαγές με υψηλότερη προτεραιότητα είναι πιο πιθανό να περιλαμβάνονται σε ένα μπλοκ.</translation> </message> <message> - <source>This label turns red, if the priority is smaller than "medium".</source> - <translation>Η ετικέτα γίνεται κόκκινη , αν το μέγεθος της συναλαγής είναι μεγαλύτερο απο το ",μεσαίο",</translation> - </message> - <message> - <source>This label turns red, if any recipient receives an amount smaller than %1.</source> - <translation>Η ετικέτα γίνεται κόκκινη , αν ο παραλήπτης παραλάβει ένα ποσό μικρότερο απο %1.</translation> - </message> - <message> <source>(no label)</source> <translation>(χωρίς ετικέτα)</translation> </message> @@ -843,30 +783,6 @@ Address: %4 <source>command-line options</source> <translation>επιλογής γραμμής εντολών</translation> </message> - <message> - <source>UI options</source> - <translation>επιλογές UI</translation> - </message> - <message> - <source>Set language, for example "de_DE" (default: system locale)</source> - <translation>Όρισε γλώσσα, για παράδειγμα "de_DE"(προεπιλογή:τοπικές ρυθμίσεις)</translation> - </message> - <message> - <source>Start minimized</source> - <translation>Έναρξη ελαχιστοποιημένο</translation> - </message> - <message> - <source>Set SSL root certificates for payment request (default: -system-)</source> - <translation>Ορίστε SSL root certificates για αίτηση πληρωμής (default: -system-)</translation> - </message> - <message> - <source>Show splash screen on startup (default: 1)</source> - <translation>Εμφάνισε την οθόνη εκκίνησης κατά την εκκίνηση(προεπιλογή:1)</translation> - </message> - <message> - <source>Choose data directory on startup (default: 0)</source> - <translation>Επιλογή καταλόγου</translation> - </message> </context> <context> <name>Intro</name> @@ -941,14 +857,6 @@ Address: %4 <translation>&Κύριο</translation> </message> <message> - <source>Automatically start Bitcoin after logging in to the system.</source> - <translation>Αυτόματη εκκίνηση του Bitcoin μετά την εισαγωγή στο σύστημα</translation> - </message> - <message> - <source>&Start Bitcoin on system login</source> - <translation>&Έναρξη του Βιtcoin κατά την εκκίνηση του συστήματος</translation> - </message> - <message> <source>Size of &database cache</source> <translation>Μέγεθος κρυφής μνήμης βάσης δεδομένων.</translation> </message> @@ -1041,10 +949,6 @@ Address: %4 <translation>&Ελαχιστοποίηση στην περιοχή ειδοποιήσεων αντί της γραμμής εργασιών</translation> </message> <message> - <source>Minimize instead of exit the application when the window is closed. When this option is enabled, the application will be closed only after selecting Quit in the menu.</source> - <translation>Ελαχιστοποίηση αντί για έξοδο κατά το κλείσιμο του παραθύρου</translation> - </message> - <message> <source>M&inimize on close</source> <translation>Ε&λαχιστοποίηση κατά το κλείσιμο</translation> </message> @@ -1057,10 +961,6 @@ Address: %4 <translation>Γλώσσα περιβάλλοντος εργασίας: </translation> </message> <message> - <source>The user interface language can be set here. This setting will take effect after restarting Bitcoin.</source> - <translation>Εδώ μπορεί να ρυθμιστεί η γλώσσα διεπαφής χρήστη. Αυτή η ρύθμιση θα ισχύσει μετά την επανεκκίνηση του Bitcoin.</translation> - </message> - <message> <source>&Unit to show amounts in:</source> <translation>&Μονάδα μέτρησης:</translation> </message> @@ -1070,7 +970,8 @@ Address: %4 </message> <message> <source>Whether to show coin control features or not.</source> - <translation>Επιλογή κατα πόσο να αναδείχνονται οι δυνατότητες ελέγχου κερμάτων.</translation> + <translation>Επιλογή κατα πόσο να αναδείχνονται οι δυνατότητες ελέγχου κερμάτων. +</translation> </message> <message> <source>&OK</source> @@ -1097,10 +998,6 @@ Address: %4 <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>Η αλλαγή αυτή θα χρειαστεί επανεκκίνηση του προγράμματος</translation> </message> @@ -1187,10 +1084,6 @@ Address: %4 <translation>Η αίτηση πληρωμής έχει αρνηθεί.</translation> </message> <message> - <source>Payment request has expired.</source> - <translation>Η αίτηση πληρωμής έχει λήξει.</translation> - </message> - <message> <source>Payment request is not initialized.</source> <translation>Η αίτηση πληρωμής δεν έχει αρχίζει ακόμα.</translation> </message> @@ -1226,10 +1119,6 @@ Address: %4 <context> <name>PeerTableModel</name> <message> - <source>Address/Hostname</source> - <translation>Διεύθυθνση/Όνομα υπολογιστή</translation> - </message> - <message> <source>Ping Time</source> <translation>Χρόνος καθυστέρησης</translation> </message> @@ -1261,14 +1150,6 @@ Address: %4 <translation>%1 s</translation> </message> <message> - <source>NETWORK</source> - <translation>Δίκτυο</translation> - </message> - <message> - <source>UNKNOWN</source> - <translation>Άγνωστο(α)</translation> - </message> - <message> <source>None</source> <translation>Κανένα</translation> </message> @@ -1411,18 +1292,10 @@ Address: %4 <translation>Αρχείο καταγραφής εντοπισμού σφαλμάτων </translation> </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>Ανοίξτε το αρχείο καταγραφής εντοπισμού σφαλμάτων από τον τρέχοντα κατάλογο δεδομένων. Αυτό μπορεί να πάρει μερικά δευτερόλεπτα για τα μεγάλα αρχεία καταγραφής. </translation> - </message> - <message> <source>Clear console</source> <translation>Καθαρισμός κονσόλας</translation> </message> <message> - <source>Welcome to the Bitcoin RPC console.</source> - <translation>Καλώς ήρθατε στην Bitcoin RPC κονσόλα.</translation> - </message> - <message> <source>Use up and down arrows to navigate history, and <b>Ctrl-L</b> to clear screen.</source> <translation>Χρησιμοποιήστε το πάνω και κάτω βέλος για να περιηγηθείτε στο ιστορικο, και <b>Ctrl-L</b> για εκκαθαριση οθονης.</translation> </message> @@ -1546,7 +1419,7 @@ Address: %4 </message> <message> <source>Label</source> - <translation>Ετικέτα</translation> + <translation>Επιγραφή</translation> </message> <message> <source>Message</source> @@ -1569,7 +1442,7 @@ Address: %4 </message> <message> <source>Label</source> - <translation>Ετικέτα</translation> + <translation>Επιγραφή</translation> </message> <message> <source>Message</source> @@ -1647,10 +1520,6 @@ Address: %4 <translation>Επιλογή...</translation> </message> <message> - <source>Minimize</source> - <translation>Ελαχιστοποίηση</translation> - </message> - <message> <source>fast</source> <translation>Γρήγορο</translation> </message> @@ -1731,10 +1600,6 @@ Address: %4 <translation>ή</translation> </message> <message> - <source>The recipient address is not valid, please recheck.</source> - <translation>Η διεύθυνση του αποδέκτη δεν είναι σωστή. Παρακαλώ ελέγξτε ξανά.</translation> - </message> - <message> <source>The amount to pay must be larger than 0.</source> <translation>Το ποσό πληρωμής πρέπει να είναι μεγαλύτερο από 0.</translation> </message> @@ -1747,10 +1612,6 @@ Address: %4 <translation>Το σύνολο υπερβαίνει το υπόλοιπό σας όταν συμπεριληφθεί και η αμοιβή %1</translation> </message> <message> - <source>Duplicate address found, can only send to each address once per send operation.</source> - <translation>Βρέθηκε η ίδια διεύθυνση δύο φορές. Επιτρέπεται μία μόνο εγγραφή για κάθε διεύθυνση, σε κάθε διαδικασία αποστολής.</translation> - </message> - <message> <source>Transaction creation failed!</source> <translation>Η δημιουργία της συναλλαγής απέτυχε!</translation> </message> @@ -1803,7 +1664,7 @@ Address: %4 </message> <message> <source>Paste address from clipboard</source> - <translation>Επικόλληση διεύθυνσης από το πρόχειρο</translation> + <translation>Επικόλληση διεύθυνσης από το βιβλίο διευθύνσεων</translation> </message> <message> <source>Alt+P</source> @@ -1848,10 +1709,6 @@ Address: %4 <translation>&Υπογραφή Μηνύματος</translation> </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>Μπορείτε να υπογράφετε μηνύματα με τις διευθύνσεις σας, ώστε ν' αποδεικνύετε πως αυτές σας ανήκουν. Αποφεύγετε να υπογράφετε κάτι αόριστο καθώς ενδέχεται να εξαπατηθείτε. Υπογράφετε μόνο πλήρης δηλώσεις με τις οποίες συμφωνείτε.</translation> - </message> - <message> <source>The Bitcoin address to sign the message with</source> <translation>Διεύθυνση Bitcoin που θα σταλεί το μήνυμα</translation> </message> @@ -1904,10 +1761,6 @@ Address: %4 <translation>&Επιβεβαίωση μηνύματος</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>Πληκτρολογήστε την υπογραφή διεύθυνσης, μήνυμα (βεβαιωθείτε ότι έχετε αντιγράψει τις αλλαγές γραμμής, κενά, tabs, κ.λπ. ακριβώς) και την υπογραφή παρακάτω, για να ελέγξει το μήνυμα. Να είστε προσεκτικοί για να μην διαβάσετε περισσότερα στην υπογραφή ό, τι είναι στην υπογραφή ίδιο το μήνυμα , για να μην εξαπατηθούν από έναν άνθρωπο -in - the-middle επίθεση.</translation> - </message> - <message> <source>The Bitcoin address the message was signed with</source> <translation>Διεύθυνση Bitcoin η οποία το μήνυμα έχει υπογραφεί</translation> </message> @@ -2024,10 +1877,6 @@ Address: %4 <source>Status</source> <translation>Κατάσταση</translation> </message> - <message numerus="yes"> - <source>, broadcast through %n node(s)</source> - <translation><numerusform>, έχει μεταδοθεί μέσω %n κόμβων</numerusform><numerusform>, έχει μεταδοθεί μέσω %n κόμβων</numerusform></translation> - </message> <message> <source>Date</source> <translation>Ημερομηνία</translation> @@ -2064,10 +1913,6 @@ Address: %4 <source>Credit</source> <translation>Πίστωση </translation> </message> - <message numerus="yes"> - <source>matures in %n more block(s)</source> - <translation><numerusform>ωρίμανση σε %n επιπλέον μπλοκ</numerusform><numerusform>ωρίμανση σε %n επιπλέον μπλοκ</numerusform></translation> - </message> <message> <source>not accepted</source> <translation>μη αποδεκτό</translation> @@ -2140,10 +1985,6 @@ Address: %4 <source>, has not been successfully broadcast yet</source> <translation>, δεν έχει ακόμα μεταδοθεί μ' επιτυχία</translation> </message> - <message numerus="yes"> - <source>Open for %n more block(s)</source> - <translation><numerusform>Ανοιχτό για %n μπλοκ</numerusform><numerusform>Ανοιχτό για %n μπλοκ</numerusform></translation> - </message> <message> <source>unknown</source> <translation>άγνωστο</translation> @@ -2171,14 +2012,6 @@ Address: %4 <translation>Τύπος</translation> </message> <message> - <source>Address</source> - <translation>Διεύθυνση</translation> - </message> - <message numerus="yes"> - <source>Open for %n more block(s)</source> - <translation><numerusform>Ανοιχτό για %n μπλοκ</numerusform><numerusform>Ανοιχτό για %n μπλοκ</numerusform></translation> - </message> - <message> <source>Open until %1</source> <translation>Ανοιχτό μέχρι %1</translation> </message> @@ -2199,6 +2032,10 @@ Address: %4 <translation>Offline</translation> </message> <message> + <source>Label</source> + <translation>Επιγραφή</translation> + </message> + <message> <source>Unconfirmed</source> <translation>Ανεπιβεβαίωτες</translation> </message> @@ -2208,7 +2045,7 @@ Address: %4 </message> <message> <source>Received with</source> - <translation>Παραλαβή με</translation> + <translation>Ελήφθη με</translation> </message> <message> <source>Received from</source> @@ -2216,7 +2053,7 @@ Address: %4 </message> <message> <source>Sent to</source> - <translation>Αποστολή προς</translation> + <translation>Απεστάλη προς</translation> </message> <message> <source>Payment to yourself</source> @@ -2247,10 +2084,6 @@ Address: %4 <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> @@ -2477,43 +2310,10 @@ Address: %4 <translation>Να δέχεσαι συνδέσεις από έξω(προεπιλογή:1)</translation> </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>%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 -</translation> - </message> - <message> <source>Bind to given address and always listen on it. Use [host]:port notation for IPv6</source> <translation>Αποθηκευση σε συγκεκριμένη διεύθυνση. Χρησιμοποιήστε τα πλήκτρα [Host] : συμβολισμός θύρα για IPv6</translation> </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>Σφάλμα: Η συναλλαγή απορρίφθηκε. -Αυτό ίσως οφείλεται στο ότι τα νομίσματά σας έχουν ήδη ξοδευτεί, π.χ. με την αντιγραφή του wallet.dat σε άλλο σύστημα και την χρήση τους εκεί, χωρίς η συναλλαγή να έχει καταγραφεί στο παρόν σύστημα.</translation> - </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>Σφάλμα: Αυτή η συναλλαγή απαιτεί αμοιβή συναλλαγής τουλάχιστον %s λόγω του μεγέθους, πολυπλοκότητας ή της χρήσης πρόσφατης παραλαβής κεφαλαίου</translation> - </message> - <message> <source>Execute command when a wallet transaction changes (%s in cmd is replaced by TxID)</source> <translation>Εκτέλεσε την εντολή όταν το καλύτερο μπλοκ αλλάξει(%s στην εντολή αντικαθίσταται από το hash του μπλοκ)</translation> </message> @@ -2558,10 +2358,6 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo.com <translation>Εντοπισθηκε διεφθαρμενη βαση δεδομενων των μπλοκ</translation> </message> <message> - <source>Discover own IP address (default: 1 when listening and no -externalip)</source> - <translation>Ανακαλύψτε την δικη σας IP διεύθυνση (προεπιλογή: 1 όταν ακούει και δεν - externalip) </translation> - </message> - <message> <source>Do you want to rebuild the block database now?</source> <translation>Θελετε να δημιουργηθει τωρα η βαση δεδομενων του μπλοκ? </translation> </message> @@ -2590,10 +2386,6 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo.com <translation>Προειδοποίηση: Χαμηλός χώρος στο δίσκο </translation> </message> <message> - <source>Error: Wallet locked, unable to create transaction!</source> - <translation>Σφάλμα: το πορτοφόλι είναι κλειδωμένο, δεν μπορεί να δημιουργηθεί συναλλαγή</translation> - </message> - <message> <source>Failed to listen on any port. Use -listen=0 if you want this.</source> <translation>ταλαιπωρηθειτε για να ακούσετε σε οποιαδήποτε θύρα. Χρήση - ακούστε = 0 , αν θέλετε αυτό.</translation> </message> @@ -2610,10 +2402,6 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo.com <translation>Δεν ειναι αρκετες περιγραφες αρχείων διαθέσιμες.</translation> </message> <message> - <source>Rebuild block chain index from current blk000??.dat files</source> - <translation>Εισαγωγή μπλοκ από εξωτερικό αρχείο blk000?.dat</translation> - </message> - <message> <source>Specify wallet file (within data directory)</source> <translation>Επιλέξτε αρχείο πορτοφολιού (μέσα απο κατάλογο δεδομένων)</translation> </message> @@ -2638,6 +2426,10 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo.com <translation>Αδυναμία κλειδώματος του φακέλου δεδομένων %s. Πιθανώς το Bitcoin να είναι ήδη ενεργό.</translation> </message> <message> + <source>Choose data directory on startup (default: 0)</source> + <translation>Επιλογή φακέλου δεδομένων στην εκκίνηση (προεπιλεγμένο: 0)</translation> + </message> + <message> <source>Connect through SOCKS5 proxy</source> <translation>Σύνδεση μέσω διαμεσολαβητή SOCKS5</translation> </message> @@ -2674,6 +2466,18 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo.com <translation>Αποστολή πληροφοριών εντοπισμού σφαλμάτων στην κονσόλα αντί του αρχείου debug.log</translation> </message> <message> + <source>Set SSL root certificates for payment request (default: -system-)</source> + <translation>Ορίστε SSL root certificates για αίτηση πληρωμής (default: -system-)</translation> + </message> + <message> + <source>Set language, for example "de_DE" (default: system locale)</source> + <translation>Όρισε γλώσσα, για παράδειγμα "de_DE"(προεπιλογή:τοπικές ρυθμίσεις)</translation> + </message> + <message> + <source>Show splash screen on startup (default: 1)</source> + <translation>Εμφάνισε την οθόνη εκκίνησης κατά την εκκίνηση(προεπιλογή:1)</translation> + </message> + <message> <source>Shrink debug.log file on client startup (default: 1 when no -debug)</source> <translation>Συρρίκνωση του αρχείο debug.log κατα την εκκίνηση του πελάτη (προεπιλογή: 1 όταν δεν-debug)</translation> </message> @@ -2682,6 +2486,10 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo.com <translation>Η υπογραφή συναλλαγής απέτυχε </translation> </message> <message> + <source>Start minimized</source> + <translation>Έναρξη ελαχιστοποιημένο</translation> + </message> + <message> <source>This is experimental software.</source> <translation>Η εφαρμογή είναι σε πειραματικό στάδιο.</translation> </message> @@ -2710,10 +2518,6 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo.com <translation>Προειδοποίηση</translation> </message> <message> - <source>Warning: This version is obsolete, upgrade required!</source> - <translation>Προειδοποίηση: Αυτή η έκδοση είναι ξεπερασμένη, απαιτείται αναβάθμιση </translation> - </message> - <message> <source>Zapping all transactions from wallet...</source> <translation>Μεταφορά όλων των συναλλαγών απο το πορτοφόλι</translation> </message> @@ -2798,10 +2602,6 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo.com <translation>Δεν είναι έγκυρη η διεύθυνση διαμεσολαβητή: '%s'</translation> </message> <message> - <source>Print block tree on startup (default: %u)</source> - <translation>Εκτύπωση μπλοκ δέντρου κατά την εκκίνηση (προεπιλογή: %u)</translation> - </message> - <message> <source>Server certificate file (default: %s)</source> <translation>Αρχείο πιστοποιητικού του διακομιστή (προεπιλογή: %s)</translation> </message> @@ -2834,10 +2634,6 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo.com <translation>Μη έγκυρο ποσό για την παράμετρο -paytxfee=<amount>: '%s'</translation> </message> <message> - <source>Invalid amount</source> - <translation>Λάθος ποσότητα</translation> - </message> - <message> <source>Insufficient funds</source> <translation>Ανεπαρκές κεφάλαιο</translation> </message> @@ -2870,10 +2666,6 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo.com <translation>Η φόρτωση ολοκληρώθηκε</translation> </message> <message> - <source>To use the %s option</source> - <translation>Χρήση της %s επιλογής</translation> - </message> - <message> <source>Error</source> <translation>Σφάλμα</translation> </message> diff --git a/src/qt/locale/bitcoin_en.ts b/src/qt/locale/bitcoin_en.ts index 71c626be4b..8dfef68373 100644 --- a/src/qt/locale/bitcoin_en.ts +++ b/src/qt/locale/bitcoin_en.ts @@ -1,12 +1,12 @@ <?xml version="1.0" encoding="utf-8"?> <!DOCTYPE TS> -<TS version="2.0" language="en"> +<TS version="2.1" language="en"> <context> <name>AddressBookPage</name> <message> <location filename="../forms/addressbookpage.ui" line="+30"/> - <source>Double-click to edit address or label</source> - <translation>Double-click to edit address or label</translation> + <source>Right-click to edit address or label</source> + <translation type="unfinished"></translation> </message> <message> <location line="+27"/> @@ -34,7 +34,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../addressbookpage.cpp" line="+74"/> + <location filename="../addressbookpage.cpp" line="+80"/> <source>&Copy Address</source> <translation>&Copy Address</translation> </message> @@ -127,7 +127,7 @@ <context> <name>AddressTableModel</name> <message> - <location filename="../addresstablemodel.cpp" line="+168"/> + <location filename="../addresstablemodel.cpp" line="+170"/> <source>Label</source> <translation>Label</translation> </message> @@ -195,12 +195,7 @@ <translation>Change passphrase</translation> </message> <message> - <location line="+1"/> - <source>Enter the old and new passphrase to the wallet.</source> - <translation>Enter the old and new passphrase to the wallet.</translation> - </message> - <message> - <location line="+45"/> + <location line="+46"/> <source>Confirm wallet encryption</source> <translation>Confirm wallet encryption</translation> </message> @@ -215,7 +210,12 @@ <translation>Are you sure you wish to encrypt your wallet?</translation> </message> <message> - <location line="+15"/> + <location line="+11"/> + <source>Bitcoin Core will close now to finish the encryption process. Remember that encrypting your wallet cannot fully protect your bitcoins from being stolen by malware infecting your computer.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+4"/> <source>IMPORTANT: Any previous backups you have made of your wallet file should be replaced with the newly generated, encrypted wallet file. For security reasons, previous backups of the unencrypted wallet file will become useless as soon as you start using the new, encrypted wallet.</source> <translation>IMPORTANT: Any previous backups you have made of your wallet file should be replaced with the newly generated, encrypted wallet file. For security reasons, previous backups of the unencrypted wallet file will become useless as soon as you start using the new, encrypted wallet.</translation> </message> @@ -237,12 +237,12 @@ <translation type="unfinished"></translation> </message> <message> - <location line="+80"/> - <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>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.</translation> + <location line="+23"/> + <source>Enter the old passphrase and new passphrase to the wallet.</source> + <translation type="unfinished"></translation> </message> <message> - <location line="+13"/> + <location line="+70"/> <location line="+7"/> <location line="+42"/> <location line="+6"/> @@ -286,32 +286,32 @@ <context> <name>BitcoinGUI</name> <message> - <location filename="../bitcoingui.cpp" line="+311"/> + <location filename="../bitcoingui.cpp" line="+326"/> <source>Sign &message...</source> <translation>Sign &message...</translation> </message> <message> - <location line="+339"/> + <location line="+342"/> <source>Synchronizing with network...</source> <translation>Synchronizing with network...</translation> </message> <message> - <location line="-407"/> + <location line="-418"/> <source>&Overview</source> <translation>&Overview</translation> </message> <message> - <location line="-129"/> + <location line="-134"/> <source>Node</source> <translation type="unfinished"></translation> </message> <message> - <location line="+130"/> + <location line="+135"/> <source>Show general overview of wallet</source> <translation>Show general overview of wallet</translation> </message> <message> - <location line="+20"/> + <location line="+28"/> <source>&Transactions</source> <translation>&Transactions</translation> </message> @@ -321,7 +321,7 @@ <translation>Browse transaction history</translation> </message> <message> - <location line="+19"/> + <location line="+23"/> <source>E&xit</source> <translation>E&xit</translation> </message> @@ -331,13 +331,12 @@ <translation>Quit application</translation> </message> <message> - <location line="+7"/> - <location line="+2"/> + <location line="+6"/> <source>About &Qt</source> <translation>About &Qt</translation> </message> <message> - <location line="+2"/> + <location line="+1"/> <source>Show information about Qt</source> <translation>Show information about Qt</translation> </message> @@ -377,7 +376,7 @@ <translation type="unfinished"></translation> </message> <message> - <location line="+172"/> + <location line="+175"/> <source>Bitcoin Core client</source> <translation type="unfinished"></translation> </message> @@ -392,17 +391,12 @@ <translation>Reindexing blocks on disk...</translation> </message> <message> - <location line="-405"/> + <location line="-416"/> <source>Send coins to a Bitcoin address</source> <translation>Send coins to a Bitcoin address</translation> </message> <message> - <location line="+48"/> - <source>Modify configuration options for Bitcoin</source> - <translation>Modify configuration options for Bitcoin</translation> - </message> - <message> - <location line="+9"/> + <location line="+65"/> <source>Backup wallet to another location</source> <translation>Backup wallet to another location</translation> </message> @@ -427,32 +421,32 @@ <translation>&Verify message...</translation> </message> <message> - <location line="+437"/> + <location line="+439"/> <source>Bitcoin</source> <translation>Bitcoin</translation> </message> <message> - <location line="-638"/> + <location line="-653"/> <source>Wallet</source> <translation>Wallet</translation> </message> <message> - <location line="+138"/> + <location line="+143"/> <source>&Send</source> <translation>&Send</translation> </message> <message> - <location line="+7"/> + <location line="+11"/> <source>&Receive</source> <translation>&Receive</translation> </message> <message> - <location line="+32"/> + <location line="+40"/> <source>Show information about Bitcoin Core</source> <translation type="unfinished"></translation> </message> <message> - <location line="+12"/> + <location line="+8"/> <source>&Show / Hide</source> <translation>&Show / Hide</translation> </message> @@ -477,7 +471,7 @@ <translation>Verify messages to ensure they were signed with specified Bitcoin addresses</translation> </message> <message> - <location line="+48"/> + <location line="+49"/> <source>&File</source> <translation>&File</translation> </message> @@ -497,22 +491,27 @@ <translation>Tabs toolbar</translation> </message> <message> - <location line="-297"/> + <location line="-311"/> <source>Bitcoin Core</source> <translation type="unfinished">Bitcoin Core</translation> </message> <message> - <location line="+155"/> + <location line="+164"/> <source>Request payments (generates QR codes and bitcoin: URIs)</source> <translation type="unfinished"></translation> </message> <message> - <location line="+30"/> + <location line="+38"/> <source>&About Bitcoin Core</source> <translation type="unfinished"></translation> </message> <message> - <location line="+32"/> + <location line="+7"/> + <source>Modify configuration options for Bitcoin Core</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+21"/> <source>Show the list of used sending addresses and labels</source> <translation type="unfinished"></translation> </message> @@ -532,12 +531,12 @@ <translation type="unfinished"></translation> </message> <message> - <location line="+1"/> + <location line="+2"/> <source>Show the Bitcoin Core help message to get a list with possible Bitcoin command-line options</source> <translation type="unfinished"></translation> </message> <message numerus="yes"> - <location line="+307"/> + <location line="+309"/> <source>%n active connection(s) to Bitcoin network</source> <translation> <numerusform>%n active connection to Bitcoin network</numerusform> @@ -550,7 +549,15 @@ <translation>No block source available...</translation> </message> <message numerus="yes"> - <location line="+36"/> + <location line="+9"/> + <source>Processed %n block(s) of transaction history.</source> + <translation> + <numerusform>Processed %n block of transaction history.</numerusform> + <numerusform>Processed %n blocks of transaction history.</numerusform> + </translation> + </message> + <message numerus="yes"> + <location line="+26"/> <source>%n hour(s)</source> <translation> <numerusform>%n hour</numerusform> @@ -622,21 +629,43 @@ <source>Up to date</source> <translation>Up to date</translation> </message> - <message numerus="yes"> - <location line="-5"/> - <source>Processed %n blocks of transaction history.</source> - <translation type="unfinished"> - <numerusform></numerusform> - <numerusform></numerusform> - </translation> - </message> <message> - <location line="+49"/> + <location line="+44"/> <source>Catching up...</source> <translation>Catching up...</translation> </message> <message> - <location line="+126"/> + <location line="+129"/> + <source>Date: %1 +</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+1"/> + <source>Amount: %1 +</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+1"/> + <source>Type: %1 +</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+2"/> + <source>Label: %1 +</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+2"/> + <source>Address: %1 +</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+1"/> <source>Sent transaction</source> <translation>Sent transaction</translation> </message> @@ -646,20 +675,7 @@ <translation>Incoming transaction</translation> </message> <message> - <location line="+1"/> - <source>Date: %1 -Amount: %2 -Type: %3 -Address: %4 -</source> - <translation>Date: %1 -Amount: %2 -Type: %3 -Address: %4 -</translation> - </message> - <message> - <location line="+68"/> + <location line="+62"/> <source>Wallet is <b>encrypted</b> and currently <b>unlocked</b></source> <translation>Wallet is <b>encrypted</b> and currently <b>unlocked</b></translation> </message> @@ -672,7 +688,7 @@ Address: %4 <context> <name>ClientModel</name> <message> - <location filename="../clientmodel.cpp" line="+140"/> + <location filename="../clientmodel.cpp" line="+141"/> <source>Network Alert</source> <translation>Network Alert</translation> </message> @@ -775,7 +791,7 @@ Address: %4 <translation type="unfinished"></translation> </message> <message> - <location filename="../coincontroldialog.cpp" line="+44"/> + <location filename="../coincontroldialog.cpp" line="+46"/> <source>Copy address</source> <translation type="unfinished">Copy address</translation> </message> @@ -841,7 +857,7 @@ Address: %4 <translation type="unfinished"></translation> </message> <message> - <location line="+347"/> + <location line="+351"/> <source>highest</source> <translation type="unfinished"></translation> </message> @@ -896,7 +912,22 @@ Address: %4 <translation type="unfinished"></translation> </message> <message> - <location line="+165"/> + <location line="+161"/> + <source>This label turns red if the transaction size is greater than 1000 bytes.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+5"/> + <source>This label turns red if the priority is smaller than "medium".</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+3"/> + <source>This label turns red if any recipient receives an amount smaller than %1.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+8"/> <source>Can vary +/- %1 satoshi(s) per input.</source> <translation type="unfinished"></translation> </message> @@ -911,12 +942,7 @@ Address: %4 <translation type="unfinished"></translation> </message> <message> - <location line="+16"/> - <source>This label turns red, if the transaction size is greater than 1000 bytes.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+1"/> + <location line="+17"/> <location line="+5"/> <source>This means a fee of at least %1 per kB is required.</source> <translation type="unfinished"></translation> @@ -932,17 +958,7 @@ Address: %4 <translation type="unfinished"></translation> </message> <message> - <location line="+1"/> - <source>This label turns red, if the priority is smaller than "medium".</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+3"/> - <source>This label turns red, if any recipient receives an amount smaller than %1.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+55"/> + <location line="+59"/> <location line="+61"/> <source>(no label)</source> <translation type="unfinished">(no label)</translation> @@ -1029,7 +1045,7 @@ Address: %4 <context> <name>FreespaceChecker</name> <message> - <location filename="../intro.cpp" line="+68"/> + <location filename="../intro.cpp" line="+69"/> <source>A new data directory will be created.</source> <translation>A new data directory will be created.</translation> </message> @@ -1057,7 +1073,7 @@ Address: %4 <context> <name>HelpMessageDialog</name> <message> - <location filename="../utilitydialog.cpp" line="+31"/> + <location filename="../utilitydialog.cpp" line="+33"/> <source>Bitcoin Core</source> <translation type="unfinished">Bitcoin Core</translation> </message> @@ -1078,7 +1094,7 @@ Address: %4 <translation type="unfinished"></translation> </message> <message> - <location line="+18"/> + <location line="+19"/> <source>Command-line options</source> <translation type="unfinished"></translation> </message> @@ -1092,36 +1108,6 @@ Address: %4 <source>command-line options</source> <translation type="unfinished">command-line options</translation> </message> - <message> - <location line="+4"/> - <source>UI options</source> - <translation type="unfinished">UI options</translation> - </message> - <message> - <location line="+2"/> - <source>Set language, for example "de_DE" (default: system locale)</source> - <translation type="unfinished">Set language, for example "de_DE" (default: system locale)</translation> - </message> - <message> - <location line="+1"/> - <source>Start minimized</source> - <translation type="unfinished">Start minimized</translation> - </message> - <message> - <location line="+1"/> - <source>Set SSL root certificates for payment request (default: -system-)</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+1"/> - <source>Show splash screen on startup (default: 1)</source> - <translation type="unfinished">Show splash screen on startup (default: 1)</translation> - </message> - <message> - <location line="-4"/> - <source>Choose data directory on startup (default: 0)</source> - <translation type="unfinished">Choose data directory on startup (default: 0)</translation> - </message> </context> <context> <name>Intro</name> @@ -1228,17 +1214,7 @@ Address: %4 <translation>&Main</translation> </message> <message> - <location line="+6"/> - <source>Automatically start Bitcoin after logging in to the system.</source> - <translation>Automatically start Bitcoin after logging in to the system.</translation> - </message> - <message> - <location line="+3"/> - <source>&Start Bitcoin on system login</source> - <translation>&Start Bitcoin on system login</translation> - </message> - <message> - <location line="+9"/> + <location line="+18"/> <source>Size of &database cache</source> <translation type="unfinished"></translation> </message> @@ -1268,7 +1244,17 @@ Address: %4 <translation type="unfinished"></translation> </message> <message> - <location line="+164"/> + <location line="+84"/> + <source>Minimize instead of exit the application when the window is closed. When this option is enabled, the application will be closed only after selecting Exit in the menu.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+45"/> + <source>The user interface language can be set here. This setting will take effect after restarting Bitcoin Core.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+35"/> <location line="+13"/> <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"></translation> @@ -1299,7 +1285,17 @@ Address: %4 <translation>&Network</translation> </message> <message> - <location line="-85"/> + <location line="-153"/> + <source>Automatically start Bitcoin Core after logging in to the system.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+3"/> + <source>&Start Bitcoin Core on system login</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+65"/> <source>(0 = auto, <0 = leave that many cores free)</source> <translation type="unfinished"></translation> </message> @@ -1379,12 +1375,7 @@ Address: %4 <translation>&Minimize to the tray instead of the taskbar</translation> </message> <message> - <location line="+7"/> - <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>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.</translation> - </message> - <message> - <location line="+3"/> + <location line="+10"/> <source>M&inimize on close</source> <translation>M&inimize on close</translation> </message> @@ -1399,12 +1390,7 @@ Address: %4 <translation>User Interface &language:</translation> </message> <message> - <location line="+13"/> - <source>The user interface language can be set here. This setting will take effect after restarting Bitcoin.</source> - <translation>The user interface language can be set here. This setting will take effect after restarting Bitcoin.</translation> - </message> - <message> - <location line="+11"/> + <location line="+24"/> <source>&Unit to show amounts in:</source> <translation>&Unit to show amounts in:</translation> </message> @@ -1429,12 +1415,12 @@ Address: %4 <translation>&Cancel</translation> </message> <message> - <location filename="../optionsdialog.cpp" line="+76"/> + <location filename="../optionsdialog.cpp" line="+75"/> <source>default</source> <translation>default</translation> </message> <message> - <location line="+60"/> + <location line="+59"/> <source>none</source> <translation type="unfinished"></translation> </message> @@ -1451,7 +1437,7 @@ Address: %4 </message> <message> <location line="-29"/> - <source>Client will be shutdown, do you want to proceed?</source> + <source>Client will be shut down. Do you want to proceed?</source> <translation type="unfinished"></translation> </message> <message> @@ -1559,7 +1545,7 @@ Address: %4 <translation type="unfinished"></translation> </message> <message> - <location filename="../overviewpage.cpp" line="+131"/> + <location filename="../overviewpage.cpp" line="+133"/> <location line="+1"/> <source>out of sync</source> <translation>out of sync</translation> @@ -1568,7 +1554,7 @@ Address: %4 <context> <name>PaymentServer</name> <message> - <location filename="../paymentserver.cpp" line="+410"/> + <location filename="../paymentserver.cpp" line="+434"/> <location line="+14"/> <location line="+7"/> <source>URI handling</source> @@ -1580,49 +1566,46 @@ Address: %4 <translation type="unfinished"></translation> </message> <message> - <location line="+84"/> + <location line="+88"/> <location line="+9"/> - <location line="+32"/> + <location line="+31"/> + <location line="+10"/> + <location line="+17"/> <source>Payment request rejected</source> <translation type="unfinished"></translation> </message> <message> - <location line="-41"/> + <location line="-67"/> <source>Payment request network doesn't match client network.</source> <translation type="unfinished"></translation> </message> <message> - <location line="+9"/> - <source>Payment request has expired.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+7"/> + <location line="+15"/> <source>Payment request is not initialized.</source> <translation type="unfinished"></translation> </message> <message> - <location line="+34"/> + <location line="+42"/> <source>Requested payment amount of %1 is too small (considered dust).</source> <translation type="unfinished"></translation> </message> <message> - <location line="-253"/> - <location line="+219"/> - <location line="+34"/> - <location line="+98"/> + <location line="-263"/> + <location line="+221"/> + <location line="+42"/> + <location line="+114"/> <location line="+14"/> <location line="+18"/> <source>Payment request error</source> <translation type="unfinished"></translation> </message> <message> - <location line="-382"/> + <location line="-408"/> <source>Cannot start bitcoin: click-to-pay handler</source> <translation type="unfinished"></translation> </message> <message> - <location line="+105"/> + <location line="+104"/> <source>Payment request fetch URL is invalid: %1</source> <translation type="unfinished"></translation> </message> @@ -1642,17 +1625,38 @@ Address: %4 <translation type="unfinished"></translation> </message> <message> - <location line="+104"/> + <location line="+75"/> + <source>Payment request expired.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+32"/> <source>Unverified payment requests to custom payment scripts are unsupported.</source> <translation type="unfinished"></translation> </message> <message> - <location line="+58"/> + <location line="+9"/> + <location line="+17"/> + <source>Invalid payment request.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+45"/> <source>Refund from %1</source> <translation type="unfinished"></translation> </message> <message> <location line="+43"/> + <source>Payment request %1 is too large (%2 bytes, allowed %3 bytes).</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+6"/> + <source>Payment request DoS protection</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+5"/> <source>Error communicating with %1: %2</source> <translation type="unfinished"></translation> </message> @@ -1686,7 +1690,7 @@ Address: %4 </message> <message> <location line="+0"/> - <source>Address/Hostname</source> + <source>Node/Service</source> <translation type="unfinished"></translation> </message> <message> @@ -1698,17 +1702,17 @@ Address: %4 <context> <name>QObject</name> <message> - <location filename="../bitcoinunits.cpp" line="+196"/> + <location filename="../bitcoinunits.cpp" line="+183"/> <source>Amount</source> <translation type="unfinished">Amount</translation> </message> <message> - <location filename="../guiutil.cpp" line="+106"/> + <location filename="../guiutil.cpp" line="+110"/> <source>Enter a Bitcoin address (e.g. %1)</source> <translation type="unfinished"></translation> </message> <message> - <location line="+698"/> + <location line="+748"/> <source>%1 d</source> <translation type="unfinished"></translation> </message> @@ -1724,21 +1728,12 @@ Address: %4 </message> <message> <location line="+2"/> + <location line="+41"/> <source>%1 s</source> <translation type="unfinished"></translation> </message> <message> - <location line="+17"/> - <source>NETWORK</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+3"/> - <source>UNKNOWN</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+8"/> + <location line="-10"/> <source>None</source> <translation type="unfinished"></translation> </message> @@ -1807,11 +1802,12 @@ Address: %4 <location line="+23"/> <location line="+23"/> <location line="+23"/> + <location line="+23"/> <source>N/A</source> <translation>N/A</translation> </message> <message> - <location line="-967"/> + <location line="-990"/> <source>Client version</source> <translation>Client version</translation> </message> @@ -1871,7 +1867,12 @@ Address: %4 <translation>Current number of blocks</translation> </message> <message> - <location line="+303"/> + <location line="+72"/> + <source>Open the Bitcoin Core debug log file from the current data directory. This can take a few seconds for large log files.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+231"/> <source>Received</source> <translation type="unfinished"></translation> </message> @@ -1887,8 +1888,8 @@ Address: %4 </message> <message> <location line="+39"/> - <location filename="../rpcconsole.cpp" line="+236"/> - <location line="+327"/> + <location filename="../rpcconsole.cpp" line="+238"/> + <location line="+326"/> <source>Select a peer to view detailed information.</source> <translation type="unfinished"></translation> </message> @@ -1958,7 +1959,12 @@ Address: %4 <translation type="unfinished"></translation> </message> <message> - <location line="-741"/> + <location line="+23"/> + <source>Time Offset</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="-764"/> <source>Last block time</source> <translation>Last block time</translation> </message> @@ -1988,7 +1994,7 @@ Address: %4 <translation type="unfinished"></translation> </message> <message> - <location filename="../rpcconsole.cpp" line="-165"/> + <location filename="../rpcconsole.cpp" line="-164"/> <source>In:</source> <translation type="unfinished"></translation> </message> @@ -2008,19 +2014,14 @@ Address: %4 <translation>Debug log file</translation> </message> <message> - <location line="+7"/> - <source>Open the Bitcoin debug log file from the current data directory. This can take a few seconds for large log files.</source> - <translation>Open the Bitcoin debug log file from the current data directory. This can take a few seconds for large log files.</translation> - </message> - <message> - <location line="+76"/> + <location line="+83"/> <source>Clear console</source> <translation>Clear console</translation> </message> <message> - <location filename="../rpcconsole.cpp" line="-35"/> - <source>Welcome to the Bitcoin RPC console.</source> - <translation>Welcome to the Bitcoin RPC console.</translation> + <location filename="../rpcconsole.cpp" line="-36"/> + <source>Welcome to the Bitcoin Core RPC console.</source> + <translation type="unfinished"></translation> </message> <message> <location line="+1"/> @@ -2064,7 +2065,7 @@ Address: %4 <translation type="unfinished"></translation> </message> <message> - <location line="+7"/> + <location line="+8"/> <source>Inbound</source> <translation type="unfinished"></translation> </message> @@ -2176,7 +2177,7 @@ Address: %4 <translation type="unfinished"></translation> </message> <message> - <location filename="../receivecoinsdialog.cpp" line="+39"/> + <location filename="../receivecoinsdialog.cpp" line="+45"/> <source>Copy label</source> <translation type="unfinished">Copy label</translation> </message> @@ -2262,7 +2263,7 @@ Address: %4 <context> <name>RecentRequestsTableModel</name> <message> - <location filename="../recentrequeststablemodel.cpp" line="+28"/> + <location filename="../recentrequeststablemodel.cpp" line="+29"/> <source>Date</source> <translation type="unfinished">Date</translation> </message> @@ -2301,7 +2302,7 @@ Address: %4 <name>SendCoinsDialog</name> <message> <location filename="../forms/sendcoinsdialog.ui" line="+14"/> - <location filename="../sendcoinsdialog.cpp" line="+529"/> + <location filename="../sendcoinsdialog.cpp" line="+543"/> <source>Send Coins</source> <translation>Send Coins</translation> </message> @@ -2381,32 +2382,28 @@ Address: %4 <translation type="unfinished"></translation> </message> <message> - <location line="+7"/> + <location line="+37"/> <source>collapse fee-settings</source> <translation type="unfinished"></translation> </message> <message> - <location line="+3"/> - <source>Minimize</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+78"/> - <source>If the custom fee is set to 1000 satoshis and the transaction is only 250 bytes, then "per kilobyte" only pays 250 satoshis in fee, while "at least" pays 1000 satoshis. For transactions bigger than a kilobyte both pay by kilobyte.</source> + <location line="+54"/> + <source>per kilobyte</source> <translation type="unfinished"></translation> </message> <message> - <location line="+3"/> - <source>per kilobyte</source> + <location line="-3"/> + <location line="+16"/> + <source>If the custom fee is set to 1000 satoshis and the transaction is only 250 bytes, then "per kilobyte" only pays 250 satoshis in fee, while "total at least" pays 1000 satoshis. For transactions bigger than a kilobyte both pay by kilobyte.</source> <translation type="unfinished"></translation> </message> <message> - <location line="+13"/> - <source>If the custom fee is set to 1000 satoshis and the transaction is only 250 bytes, then "per kilobyte" only pays 250 satoshis in fee, while "total at least" pays 1000 satoshis. For transactions bigger than a kilobyte both pay by kilobyte.</source> + <location line="-64"/> + <source>Hide</source> <translation type="unfinished"></translation> </message> <message> - <location line="+3"/> + <location line="+67"/> <source>total at least</source> <translation type="unfinished"></translation> </message> @@ -2502,12 +2499,12 @@ Address: %4 <translation>S&end</translation> </message> <message> - <location filename="../sendcoinsdialog.cpp" line="-221"/> + <location filename="../sendcoinsdialog.cpp" line="-226"/> <source>Confirm send coins</source> <translation>Confirm send coins</translation> </message> <message> - <location line="-77"/> + <location line="-48"/> <location line="+5"/> <location line="+5"/> <location line="+4"/> @@ -2515,7 +2512,7 @@ Address: %4 <translation type="unfinished"></translation> </message> <message> - <location line="-192"/> + <location line="-221"/> <source>Copy quantity</source> <translation type="unfinished"></translation> </message> @@ -2560,12 +2557,7 @@ Address: %4 <translation type="unfinished"></translation> </message> <message> - <location line="+192"/> - <source>The recipient address is not valid, please recheck.</source> - <translation>The recipient address is not valid, please recheck.</translation> - </message> - <message> - <location line="+3"/> + <location line="+196"/> <source>The amount to pay must be larger than 0.</source> <translation>The amount to pay must be larger than 0.</translation> </message> @@ -2580,12 +2572,7 @@ Address: %4 <translation>The total exceeds your balance when the %1 transaction fee is included.</translation> </message> <message> - <location line="+3"/> - <source>Duplicate address found, can only send to each address once per send operation.</source> - <translation>Duplicate address found, can only send to each address once per send operation.</translation> - </message> - <message> - <location line="+3"/> + <location line="+6"/> <source>Transaction creation failed!</source> <translation type="unfinished"></translation> </message> @@ -2596,21 +2583,39 @@ Address: %4 </message> <message> <location line="+4"/> - <source>A fee higher than %1 is considered an insanely high fee.</source> + <source>A fee higher than %1 is considered an absurdly high fee.</source> <translation type="unfinished"></translation> </message> <message> - <location line="+87"/> + <location line="+3"/> + <source>Payment request expired.</source> + <translation type="unfinished"></translation> + </message> + <message numerus="yes"> + <location line="+110"/> + <source>Estimated to begin confirmation within %n block(s).</source> + <translation type="unfinished"> + <numerusform>Estimated to begin confirmation within %n block.</numerusform> + <numerusform>Estimated to begin confirmation within %n blocks.</numerusform> + </translation> + </message> + <message> + <location line="-22"/> <source>Pay only the minimum fee of %1</source> <translation type="unfinished"></translation> </message> <message> - <location line="+22"/> - <source>Estimated to begin confirmation within %1 block(s).</source> + <location line="-114"/> + <source>The recipient address is not valid. Please recheck.</source> <translation type="unfinished"></translation> </message> <message> - <location line="+107"/> + <location line="+12"/> + <source>Duplicate address found: addresses should only be used once each.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+231"/> <source>Warning: Invalid Bitcoin address</source> <translation type="unfinished"></translation> </message> @@ -2625,7 +2630,7 @@ Address: %4 <translation type="unfinished"></translation> </message> <message> - <location line="-687"/> + <location line="-692"/> <source>Copy dust</source> <translation type="unfinished"></translation> </message> @@ -2643,29 +2648,29 @@ Address: %4 <context> <name>SendCoinsEntry</name> <message> - <location filename="../forms/sendcoinsentry.ui" line="+131"/> - <location line="+521"/> + <location filename="../forms/sendcoinsentry.ui" line="+149"/> + <location line="+535"/> <location line="+536"/> <source>A&mount:</source> <translation>A&mount:</translation> </message> <message> - <location line="-1152"/> + <location line="-1184"/> <source>Pay &To:</source> <translation>Pay &To:</translation> </message> <message> - <location filename="../sendcoinsentry.cpp" line="+30"/> + <location filename="../sendcoinsentry.cpp" line="+37"/> <source>Enter a label for this address to add it to your address book</source> <translation>Enter a label for this address to add it to your address book</translation> </message> <message> - <location filename="../forms/sendcoinsentry.ui" line="+75"/> + <location filename="../forms/sendcoinsentry.ui" line="+93"/> <source>&Label:</source> <translation>&Label:</translation> </message> <message> - <location line="-50"/> + <location line="-68"/> <source>Choose previously used address</source> <translation type="unfinished"></translation> </message> @@ -2680,7 +2685,7 @@ Address: %4 <translation type="unfinished"></translation> </message> <message> - <location line="+17"/> + <location line="+23"/> <source>Alt+A</source> <translation>Alt+A</translation> </message> @@ -2690,44 +2695,54 @@ Address: %4 <translation>Paste address from clipboard</translation> </message> <message> - <location line="+10"/> + <location line="+16"/> <source>Alt+P</source> <translation>Alt+P</translation> </message> <message> <location line="+7"/> - <location line="+524"/> + <location line="+544"/> <location line="+536"/> <source>Remove this entry</source> <translation type="unfinished"></translation> </message> <message> - <location line="-1008"/> + <location line="-1020"/> + <source>The fee will be deducted from the amount being sent. The recipient will receive less bitcoins than you enter in the amount field. If multiple recipients are selected, the fee is split equally.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+3"/> + <source>S&ubtract fee from amount</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+9"/> <source>Message:</source> <translation type="unfinished"></translation> </message> <message> - <location line="+968"/> - <source>This is a verified payment request.</source> + <location line="+436"/> + <source>This is an unauthenticated payment request.</source> <translation type="unfinished"></translation> </message> <message> - <location line="-991"/> - <source>Enter a label for this address to add it to the list of used addresses</source> + <location line="+532"/> + <source>This is an authenticated payment request.</source> <translation type="unfinished"></translation> </message> <message> - <location line="+33"/> - <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> + <location line="-1005"/> + <source>Enter a label for this address to add it to the list of used addresses</source> <translation type="unfinished"></translation> </message> <message> - <location line="+426"/> - <source>This is an unverified payment request.</source> + <location line="+47"/> + <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"></translation> </message> <message> - <location line="+18"/> + <location line="+444"/> <location line="+532"/> <source>Pay To:</source> <translation type="unfinished"></translation> @@ -2742,7 +2757,7 @@ Address: %4 <context> <name>ShutdownWindow</name> <message> - <location filename="../utilitydialog.cpp" line="+47"/> + <location filename="../utilitydialog.cpp" line="+81"/> <source>Bitcoin Core is shutting down...</source> <translation type="unfinished"></translation> </message> @@ -2766,8 +2781,8 @@ Address: %4 </message> <message> <location line="+6"/> - <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>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.</translation> + <source>You can sign messages/agreements with your addresses to prove you can receive bitcoins sent to them. Be careful not to sign anything vague or random, as phishing attacks may try to trick you into signing your identity over to them. Only sign fully-detailed statements you agree to.</source> + <translation type="unfinished"></translation> </message> <message> <location line="+18"/> @@ -2839,8 +2854,8 @@ Address: %4 </message> <message> <location line="+6"/> - <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>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.</translation> + <source>Enter the receiver's address, message (ensure you copy line breaks, spaces, tabs, etc. exactly) and signature below to verify the message. Be careful not to read more into the signature than what is in the signed message itself, to avoid being tricked by a man-in-the-middle attack. Note that this only proves the signing party receives with the address, it cannot prove sendership of any transaction!</source> + <translation type="unfinished"></translation> </message> <message> <location line="+21"/> @@ -2863,7 +2878,7 @@ Address: %4 <translation>Reset all verify message fields</translation> </message> <message> - <location filename="../signverifymessagedialog.cpp" line="+29"/> + <location filename="../signverifymessagedialog.cpp" line="+40"/> <source>Click "Sign Message" to generate signature</source> <translation>Click "Sign Message" to generate signature</translation> </message> @@ -2937,7 +2952,7 @@ Address: %4 <context> <name>SplashScreen</name> <message> - <location filename="../splashscreen.cpp" line="+35"/> + <location filename="../splashscreen.cpp" line="+41"/> <source>Bitcoin Core</source> <translation type="unfinished">Bitcoin Core</translation> </message> @@ -2947,7 +2962,7 @@ Address: %4 <translation type="unfinished"></translation> </message> <message> - <location filename="../networkstyle.cpp" line="+19"/> + <location filename="../networkstyle.cpp" line="+20"/> <source>[testnet]</source> <translation>[testnet]</translation> </message> @@ -3187,7 +3202,7 @@ Address: %4 <context> <name>TransactionTableModel</name> <message> - <location filename="../transactiontablemodel.cpp" line="+229"/> + <location filename="../transactiontablemodel.cpp" line="+230"/> <source>Date</source> <translation>Date</translation> </message> @@ -3197,11 +3212,6 @@ Address: %4 <translation>Type</translation> </message> <message> - <location line="+0"/> - <source>Address</source> - <translation>Address</translation> - </message> - <message> <location line="+79"/> <source>Immature (%1 confirmations, will be available after %2)</source> <translation type="unfinished"></translation> @@ -3240,7 +3250,12 @@ Address: %4 <translation type="unfinished"></translation> </message> <message> - <location line="+3"/> + <location line="-64"/> + <source>Label</source> + <translation type="unfinished">Label</translation> + </message> + <message> + <location line="+67"/> <source>Unconfirmed</source> <translation type="unfinished"></translation> </message> @@ -3290,7 +3305,7 @@ Address: %4 <translation>(n/a)</translation> </message> <message> - <location line="+210"/> + <location line="+215"/> <source>Transaction status. Hover over this field to show number of confirmations.</source> <translation>Transaction status. Hover over this field to show number of confirmations.</translation> </message> @@ -3311,8 +3326,8 @@ Address: %4 </message> <message> <location line="+2"/> - <source>Destination address of transaction.</source> - <translation>Destination address of transaction.</translation> + <source>User-defined intent/purpose of the transaction.</source> + <translation type="unfinished"></translation> </message> <message> <location line="+2"/> @@ -3323,7 +3338,7 @@ Address: %4 <context> <name>TransactionView</name> <message> - <location filename="../transactionview.cpp" line="+67"/> + <location filename="../transactionview.cpp" line="+68"/> <location line="+16"/> <source>All</source> <translation>All</translation> @@ -3518,7 +3533,7 @@ Address: %4 <context> <name>WalletModel</name> <message> - <location filename="../walletmodel.cpp" line="+276"/> + <location filename="../walletmodel.cpp" line="+288"/> <source>Send Coins</source> <translation>Send Coins</translation> </message> @@ -3526,7 +3541,7 @@ Address: %4 <context> <name>WalletView</name> <message> - <location filename="../walletview.cpp" line="+44"/> + <location filename="../walletview.cpp" line="+45"/> <source>&Export</source> <translation>&Export</translation> </message> @@ -3536,7 +3551,7 @@ Address: %4 <translation>Export the data in the current tab to a file</translation> </message> <message> - <location line="+187"/> + <location line="+189"/> <source>Backup Wallet</source> <translation>Backup Wallet</translation> </message> @@ -3569,82 +3584,62 @@ Address: %4 <context> <name>bitcoin-core</name> <message> - <location filename="../bitcoinstrings.cpp" line="+239"/> + <location filename="../bitcoinstrings.cpp" line="+268"/> <source>Options:</source> <translation>Options:</translation> </message> <message> - <location line="+31"/> + <location line="+34"/> <source>Specify data directory</source> <translation>Specify data directory</translation> </message> <message> - <location line="-91"/> + <location line="-93"/> <source>Connect to a node to retrieve peer addresses, and disconnect</source> <translation>Connect to a node to retrieve peer addresses, and disconnect</translation> </message> <message> - <location line="+94"/> + <location line="+96"/> <source>Specify your own public address</source> <translation>Specify your own public address</translation> </message> <message> - <location line="-109"/> + <location line="-116"/> <source>Accept command line and JSON-RPC commands</source> <translation>Accept command line and JSON-RPC commands</translation> </message> <message> - <location line="+90"/> + <location line="+94"/> <source>Run in the background as a daemon and accept commands</source> <translation>Run in the background as a daemon and accept commands</translation> </message> <message> - <location line="+36"/> + <location line="+42"/> <source>Use the test network</source> <translation>Use the test network</translation> </message> <message> - <location line="-125"/> + <location line="-135"/> <source>Accept connections from outside (default: 1 if no -proxy or -connect)</source> <translation>Accept connections from outside (default: 1 if no -proxy or -connect)</translation> </message> <message> - <location line="-153"/> - <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>%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 -</translation> - </message> - <message> - <location line="+22"/> + <location line="-168"/> <source>Bind to given address and always listen on it. Use [host]:port notation for IPv6</source> <translation>Bind to given address and always listen on it. Use [host]:port notation for IPv6</translation> </message> <message> - <location line="+19"/> + <location line="+13"/> + <source>Continuously rate-limit free transactions to <n>*1000 bytes per minute (default: %u)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+6"/> <source>Delete all wallet transactions and only recover those parts of the blockchain through -rescan on startup</source> <translation type="unfinished"></translation> </message> <message> - <location line="+3"/> + <location line="+6"/> <source>Distributed under the MIT software license, see the accompanying file COPYING or <http://www.opensource.org/licenses/mit-license.php>.</source> <translation type="unfinished"></translation> </message> @@ -3654,17 +3649,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"></translation> </message> <message> - <location line="+5"/> - <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>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.</translation> - </message> - <message> - <location line="+4"/> - <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>Error: This transaction requires a transaction fee of at least %s because of its amount, complexity, or use of recently received funds!</translation> - </message> - <message> - <location line="+9"/> + <location line="+11"/> <source>Execute command when a wallet transaction changes (%s in cmd is replaced by TxID)</source> <translation>Execute command when a wallet transaction changes (%s in cmd is replaced by TxID)</translation> </message> @@ -3674,22 +3659,32 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"></translation> </message> <message> - <location line="+20"/> + <location line="+14"/> + <source>Maximum total fees to use in a single wallet transaction; setting this too low may abort large transactions (default: %s)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+15"/> + <source>Reduce storage requirements by pruning (deleting) old blocks. This mode disables wallet support and is incompatible with -txindex. Warning: Reverting this setting requires re-downloading the entire blockchain. (default: 0 = disable pruning blocks, >%u = target size in MiB to use for block files)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+10"/> <source>Set the number of script verification threads (%u to %d, 0 = auto, <0 = leave that many cores free, default: %d)</source> <translation type="unfinished"></translation> </message> <message> - <location line="+6"/> + <location line="+8"/> <source>This is a pre-release test build - use at your own risk - do not use for mining or merchant applications</source> <translation>This is a pre-release test build - use at your own risk - do not use for mining or merchant applications</translation> </message> <message> - <location line="+7"/> + <location line="+20"/> <source>Unable to bind to %s on this computer. Bitcoin Core is probably already running.</source> <translation type="unfinished"></translation> </message> <message> - <location line="+6"/> + <location line="+9"/> <source>Warning: -paytxfee is set very high! This is the transaction fee you will pay if you send a transaction.</source> <translation>Warning: -paytxfee is set very high! This is the transaction fee you will pay if you send a transaction.</translation> </message> @@ -3719,7 +3714,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"></translation> </message> <message> - <location line="+7"/> + <location line="+11"/> <source>(default: 1)</source> <translation type="unfinished"></translation> </message> @@ -3729,7 +3724,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"></translation> </message> <message> - <location line="+7"/> + <location line="+10"/> <source>Attempt to recover private keys from a corrupt wallet.dat</source> <translation>Attempt to recover private keys from a corrupt wallet.dat</translation> </message> @@ -3739,7 +3734,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Block creation options:</translation> </message> <message> - <location line="+6"/> + <location line="+8"/> <source>Connect only to the specified node(s)</source> <translation>Connect only to the specified node(s)</translation> </message> @@ -3760,11 +3755,6 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. </message> <message> <location line="+2"/> - <source>Discover own IP address (default: 1 when listening and no -externalip)</source> - <translation>Discover own IP address (default: 1 when listening and no -externalip)</translation> - </message> - <message> - <location line="+1"/> <source>Do not load the wallet and disable wallet RPC calls</source> <translation type="unfinished"></translation> </message> @@ -3794,7 +3784,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Error opening block database</translation> </message> <message> - <location line="+2"/> + <location line="+3"/> <source>Error: A fatal internal error occured, see debug.log for details</source> <translation type="unfinished"></translation> </message> @@ -3805,11 +3795,6 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. </message> <message> <location line="+2"/> - <source>Error: Wallet locked, unable to create transaction!</source> - <translation>Error: Wallet locked, unable to create transaction!</translation> - </message> - <message> - <location line="+1"/> <source>Failed to listen on any port. Use -listen=0 if you want this.</source> <translation>Failed to listen on any port. Use -listen=0 if you want this.</translation> </message> @@ -3844,32 +3829,37 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"></translation> </message> <message> - <location line="+10"/> - <source>Rebuild block chain index from current blk000??.dat files</source> - <translation>Rebuild block chain index from current blk000??.dat files</translation> + <location line="+4"/> + <source>Prune cannot be configured with a negative value.</source> + <translation type="unfinished"></translation> </message> <message> - <location line="+11"/> + <location line="+1"/> + <source>Prune mode is incompatible with -txindex.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+17"/> <source>Set database cache size in megabytes (%d to %d, default: %d)</source> <translation type="unfinished"></translation> </message> <message> - <location line="+2"/> + <location line="+3"/> <source>Set maximum block size in bytes (default: %d)</source> <translation type="unfinished"></translation> </message> <message> - <location line="+11"/> + <location line="+12"/> <source>Specify wallet file (within data directory)</source> <translation>Specify wallet file (within data directory)</translation> </message> <message> - <location line="+6"/> + <location line="+8"/> <source>This is intended for regression testing tools and app development.</source> <translation type="unfinished"></translation> </message> <message> - <location line="+10"/> + <location line="+11"/> <source>Use UPnP to map the listening port (default: %u)</source> <translation type="unfinished"></translation> </message> @@ -3894,17 +3884,22 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"></translation> </message> <message> - <location line="+5"/> + <location line="+2"/> + <source>Warning: This version is obsolete; upgrade required!</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+3"/> <source>You need to rebuild the database using -reindex to change -txindex</source> <translation>You need to rebuild the database using -reindex to change -txindex</translation> </message> <message> - <location line="-92"/> + <location line="-98"/> <source>Imports blocks from external blk000??.dat file</source> <translation>Imports blocks from external blk000??.dat file</translation> </message> <message> - <location line="-182"/> + <location line="-223"/> <source>Allow JSON-RPC connections from specified source. Valid for <ip> are a single IP (e.g. 1.2.3.4), a network/netmask (e.g. 1.2.3.4/255.255.255.0) or a network/CIDR (e.g. 1.2.3.4/24). This option can be specified multiple times</source> <translation type="unfinished"></translation> </message> @@ -3929,22 +3924,22 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"></translation> </message> <message> - <location line="+3"/> - <source>Continuously rate-limit free transactions to <n>*1000 bytes per minute (default:%u)</source> + <location line="+6"/> + <source>Create new files with system default permissions, instead of umask 077 (only effective with disabled wallet functionality)</source> <translation type="unfinished"></translation> </message> <message> - <location line="+3"/> - <source>Create new files with system default permissions, instead of umask 077 (only effective with disabled wallet functionality)</source> + <location line="+6"/> + <source>Discover own IP addresses (default: 1 when listening and no -externalip or -proxy)</source> <translation type="unfinished"></translation> </message> <message> - <location line="+12"/> + <location line="+9"/> <source>Error: Listening for incoming connections failed (listen returned error %s)</source> <translation type="unfinished"></translation> </message> <message> - <location line="+9"/> + <location line="+2"/> <source>Error: Unsupported argument -socks found. Setting SOCKS version isn't possible anymore, only SOCKS5 proxies are supported.</source> <translation type="unfinished"></translation> </message> @@ -3964,17 +3959,42 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"></translation> </message> <message> - <location line="+19"/> + <location line="+8"/> + <source>If paytxfee is not set, include enough fee so transactions begin confirmation on average within n blocks (default: %u)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+6"/> + <source>Invalid amount for -maxtxfee=<amount>: '%s' (must be at least the minrelay fee of %s to prevent stuck transactions)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+8"/> <source>Maximum size of data in data carrier transactions we relay and mine (default: %u)</source> <translation type="unfinished"></translation> </message> <message> - <location line="+7"/> + <location line="+10"/> + <source>Prune configured below the minimum of %d MB. Please use a higher number.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+2"/> <source>Query for peer addresses via DNS lookup, if low on addresses (default: 1 unless -connect)</source> <translation type="unfinished"></translation> </message> <message> <location line="+3"/> + <source>Randomize credentials for every proxy connection. This enables Tor stream isolation (default: %u)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+9"/> + <source>Require high priority for relaying free or low-fee transactions (default: %u)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+2"/> <source>Set maximum size of high-priority/low-fee transactions in bytes (default: %d)</source> <translation type="unfinished"></translation> </message> @@ -3984,12 +4004,37 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"></translation> </message> <message> - <location line="+6"/> + <location line="+3"/> + <source>The transaction amount is too small to send after the fee has been deducted</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+5"/> <source>This product includes software developed by the OpenSSL Project for use in the OpenSSL Toolkit <https://www.openssl.org/> and cryptographic software written by Eric Young and UPnP software written by Thomas Bernard.</source> <translation type="unfinished"></translation> </message> <message> - <location line="+13"/> + <location line="+4"/> + <source>To use bitcoind, or the -server option to bitcoin-qt, you must set an 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"></translation> + </message> + <message> + <location line="+19"/> + <source>Warning: -maxtxfee is set very high! Fees this large could be paid on a single transaction.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+6"/> <source>Warning: Please check that your computer's date and time are correct! If your clock is wrong Bitcoin Core will not work properly.</source> <translation type="unfinished"></translation> </message> @@ -3999,12 +4044,47 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"></translation> </message> <message> - <location line="+17"/> - <source>Cannot resolve -whitebind address: '%s'</source> + <location line="+3"/> + <source>You need to rebuild the database using -reindex to go back to unpruned mode. This will redownload the entire blockchain</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+4"/> + <source>(default: %u)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+5"/> + <source>Accept public REST requests (default: %u)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+2"/> + <source>Activating best chain...</source> <translation type="unfinished"></translation> </message> <message> <location line="+3"/> + <source>Allow self signed root certificates (default: 0)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+4"/> + <source>Can't run with a wallet in prune mode.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+4"/> + <source>Cannot resolve -whitebind address: '%s'</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+2"/> + <source>Choose data directory on startup (default: 0)</source> + <translation type="unfinished">Choose data directory on startup (default: 0)</translation> + </message> + <message> + <location line="+2"/> <source>Connect through SOCKS5 proxy</source> <translation type="unfinished"></translation> </message> @@ -4019,17 +4099,22 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"></translation> </message> <message> - <location line="+12"/> + <location line="+11"/> <source>Error loading wallet.dat: Wallet requires newer version of Bitcoin Core</source> <translation type="unfinished"></translation> </message> <message> - <location line="+5"/> + <location line="+2"/> + <source>Error reading from database, shutting down.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+4"/> <source>Error: Unsupported argument -tor found, use -onion.</source> <translation type="unfinished"></translation> </message> <message> - <location line="+3"/> + <location line="+2"/> <source>Fee (in BTC/kB) to add to transactions you send (default: %s)</source> <translation type="unfinished"></translation> </message> @@ -4045,6 +4130,11 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. </message> <message> <location line="+4"/> + <source>Invalid amount for -maxtxfee=<amount>: '%s'</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+1"/> <source>Invalid amount for -minrelaytxfee=<amount>: '%s'</source> <translation>Invalid amount for -minrelaytxfee=<amount>: '%s'</translation> </message> @@ -4059,22 +4149,17 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"></translation> </message> <message> - <location line="+3"/> + <location line="+2"/> <source>Invalid netmask specified in -whitelist: '%s'</source> <translation type="unfinished"></translation> </message> <message> <location line="+1"/> - <source>Keep at most <n> unconnectable blocks in memory (default: %u)</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+1"/> <source>Keep at most <n> unconnectable transactions in memory (default: %u)</source> <translation type="unfinished"></translation> </message> <message> - <location line="+10"/> + <location line="+11"/> <source>Need to specify a port with -whitebind: '%s'</source> <translation type="unfinished"></translation> </message> @@ -4084,18 +4169,18 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"></translation> </message> <message> - <location line="+7"/> - <source>Print block on startup, if found in block index</source> + <location line="+9"/> + <source>RPC SSL options: (see the Bitcoin Wiki for SSL setup instructions)</source> <translation type="unfinished"></translation> </message> <message> - <location line="+2"/> - <source>RPC SSL options: (see the Bitcoin Wiki for SSL setup instructions)</source> + <location line="+1"/> + <source>RPC server options:</source> <translation type="unfinished"></translation> </message> <message> <location line="+1"/> - <source>RPC server options:</source> + <source>RPC support for HTTP persistent connections (default: %d)</source> <translation type="unfinished"></translation> </message> <message> @@ -4109,7 +4194,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"></translation> </message> <message> - <location line="+8"/> + <location line="+7"/> <source>Send trace/debug info to console instead of debug.log file</source> <translation>Send trace/debug info to console instead of debug.log file</translation> </message> @@ -4119,12 +4204,27 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"></translation> </message> <message> - <location line="+9"/> + <location line="+3"/> + <source>Set SSL root certificates for payment request (default: -system-)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+3"/> + <source>Set language, for example "de_DE" (default: system locale)</source> + <translation type="unfinished">Set language, for example "de_DE" (default: system locale)</translation> + </message> + <message> + <location line="+5"/> <source>Show all debugging options (usage: --help -help-debug)</source> <translation type="unfinished"></translation> </message> <message> <location line="+1"/> + <source>Show splash screen on startup (default: 1)</source> + <translation type="unfinished">Show splash screen on startup (default: 1)</translation> + </message> + <message> + <location line="+1"/> <source>Shrink debug.log file on client startup (default: 1 when no -debug)</source> <translation>Shrink debug.log file on client startup (default: 1 when no -debug)</translation> </message> @@ -4134,12 +4234,22 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Signing transaction failed</translation> </message> <message> - <location line="+10"/> + <location line="+8"/> + <source>Start minimized</source> + <translation type="unfinished">Start minimized</translation> + </message> + <message> + <location line="+2"/> + <source>The transaction amount is too small to pay the fee</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+2"/> <source>This is experimental software.</source> <translation type="unfinished"></translation> </message> <message> - <location line="+4"/> + <location line="+3"/> <source>Transaction amount too small</source> <translation>Transaction amount too small</translation> </message> @@ -4150,11 +4260,21 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. </message> <message> <location line="+1"/> + <source>Transaction too large for fee policy</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+1"/> <source>Transaction too large</source> <translation>Transaction too large</translation> </message> <message> <location line="+1"/> + <source>UI Options:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+1"/> <source>Unable to bind to %s on this computer (bind returned error %s)</source> <translation type="unfinished"></translation> </message> @@ -4179,12 +4299,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Warning</translation> </message> <message> - <location line="+1"/> - <source>Warning: This version is obsolete, upgrade required!</source> - <translation>Warning: This version is obsolete, upgrade required!</translation> - </message> - <message> - <location line="+1"/> + <location line="+2"/> <source>Warning: Unsupported argument -benchmark ignored, use -debug=bench.</source> <translation type="unfinished"></translation> </message> @@ -4209,57 +4324,57 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>wallet.dat corrupt, salvage failed</translation> </message> <message> - <location line="-64"/> + <location line="-70"/> <source>Password for JSON-RPC connections</source> <translation>Password for JSON-RPC connections</translation> </message> <message> - <location line="-160"/> + <location line="-205"/> <source>Execute command when the best block changes (%s in cmd is replaced by block hash)</source> <translation>Execute command when the best block changes (%s in cmd is replaced by block hash)</translation> </message> <message> - <location line="+206"/> + <location line="+257"/> <source>Upgrade wallet to latest format</source> <translation>Upgrade wallet to latest format</translation> </message> <message> - <location line="-35"/> + <location line="-41"/> <source>Rescan the block chain for missing wallet transactions</source> <translation>Rescan the block chain for missing wallet transactions</translation> </message> <message> - <location line="+36"/> + <location line="+42"/> <source>Use OpenSSL (https) for JSON-RPC connections</source> <translation>Use OpenSSL (https) for JSON-RPC connections</translation> </message> <message> - <location line="-11"/> + <location line="-12"/> <source>This help message</source> <translation>This help message</translation> </message> <message> - <location line="-108"/> + <location line="-115"/> <source>Allow DNS lookups for -addnode, -seednode and -connect</source> <translation>Allow DNS lookups for -addnode, -seednode and -connect</translation> </message> <message> - <location line="+60"/> + <location line="+61"/> <source>Loading addresses...</source> <translation>Loading addresses...</translation> </message> <message> - <location line="-34"/> + <location line="-33"/> <source>Error loading wallet.dat: Wallet corrupted</source> <translation>Error loading wallet.dat: Wallet corrupted</translation> </message> <message> - <location line="-170"/> + <location line="-211"/> <source>(1 = keep tx meta data e.g. account owner and payment request information, 2 = drop tx meta data)</source> <translation type="unfinished"></translation> </message> <message> - <location line="+65"/> + <location line="+61"/> <source>Flush database activity from memory pool to disk log every <n> megabytes (default: %u)</source> <translation type="unfinished"></translation> </message> @@ -4269,12 +4384,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"></translation> </message> <message> - <location line="+2"/> - <source>If paytxfee is not set, include enough fee so transactions are confirmed on average within n blocks (default: %u)</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+6"/> + <location line="+11"/> <source>Log transaction priority and fee per kB when mining blocks (default: %u)</source> <translation type="unfinished"></translation> </message> @@ -4284,7 +4394,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"></translation> </message> <message> - <location line="+6"/> + <location line="+9"/> <source>Number of seconds to keep misbehaving peers from reconnecting (default: %u)</source> <translation type="unfinished"></translation> </message> @@ -4294,32 +4404,32 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"></translation> </message> <message> - <location line="+23"/> + <location line="+51"/> <source>Use separate SOCKS5 proxy to reach peers via Tor hidden services (default: %s)</source> <translation type="unfinished"></translation> </message> <message> - <location line="+28"/> + <location line="+34"/> <source>(default: %s)</source> <translation type="unfinished"></translation> </message> <message> - <location line="+5"/> + <location line="+7"/> <source>Acceptable ciphers (default: %s)</source> <translation type="unfinished"></translation> </message> <message> - <location line="+3"/> + <location line="+5"/> <source>Always query for peer addresses via DNS lookup (default: %u)</source> <translation type="unfinished"></translation> </message> <message> - <location line="+16"/> + <location line="+18"/> <source>Disable safemode, override a real safe mode event (default: %u)</source> <translation type="unfinished"></translation> </message> <message> - <location line="+8"/> + <location line="+7"/> <source>Error loading wallet.dat</source> <translation>Error loading wallet.dat</translation> </message> @@ -4349,7 +4459,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Invalid -proxy address: '%s'</translation> </message> <message> - <location line="+9"/> + <location line="+8"/> <source>Limit size of signature cache to <n> entries (default: %u)</source> <translation type="unfinished"></translation> </message> @@ -4370,6 +4480,11 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. </message> <message> <location line="+1"/> + <source>Make the wallet broadcast transactions</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+1"/> <source>Maximum per-connection receive buffer, <n>*1000 bytes (default: %u)</source> <translation type="unfinished"></translation> </message> @@ -4389,12 +4504,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"></translation> </message> <message> - <location line="+2"/> - <source>Print block tree on startup (default: %u)</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+6"/> + <location line="+8"/> <source>Relay and mine data carrier transactions (default: %u)</source> <translation type="unfinished"></translation> </message> @@ -4419,12 +4529,12 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"></translation> </message> <message> - <location line="+2"/> + <location line="+3"/> <source>Set key pool size to <n> (default: %u)</source> <translation type="unfinished"></translation> </message> <message> - <location line="+2"/> + <location line="+3"/> <source>Set minimum block size in bytes (default: %u)</source> <translation type="unfinished"></translation> </message> @@ -4439,7 +4549,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"></translation> </message> <message> - <location line="+4"/> + <location line="+5"/> <source>Specify configuration file (default: %s)</source> <translation type="unfinished"></translation> </message> @@ -4459,22 +4569,22 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"></translation> </message> <message> - <location line="+1"/> + <location line="+2"/> <source>Stop running after importing blocks from disk (default: %u)</source> <translation type="unfinished"></translation> </message> <message> - <location line="+4"/> + <location line="+5"/> <source>Threshold for disconnecting misbehaving peers (default: %u)</source> <translation type="unfinished"></translation> </message> <message> - <location line="+6"/> + <location line="+7"/> <source>Unknown network specified in -onlynet: '%s'</source> <translation>Unknown network specified in -onlynet: '%s'</translation> </message> <message> - <location line="-112"/> + <location line="-118"/> <source>Cannot resolve -bind address: '%s'</source> <translation>Cannot resolve -bind address: '%s'</translation> </message> @@ -4484,37 +4594,32 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Cannot resolve -externalip address: '%s'</translation> </message> <message> - <location line="+46"/> + <location line="+47"/> <source>Invalid amount for -paytxfee=<amount>: '%s'</source> <translation>Invalid amount for -paytxfee=<amount>: '%s'</translation> </message> <message> - <location line="+1"/> - <source>Invalid amount</source> - <translation>Invalid amount</translation> - </message> - <message> <location line="-7"/> <source>Insufficient funds</source> <translation>Insufficient funds</translation> </message> <message> - <location line="+15"/> + <location line="+14"/> <source>Loading block index...</source> <translation>Loading block index...</translation> </message> <message> - <location line="-62"/> + <location line="-63"/> <source>Add a node to connect to and attempt to keep the connection open</source> <translation>Add a node to connect to and attempt to keep the connection open</translation> </message> <message> - <location line="+63"/> + <location line="+64"/> <source>Loading wallet...</source> <translation>Loading wallet...</translation> </message> <message> - <location line="-58"/> + <location line="-57"/> <source>Cannot downgrade wallet</source> <translation>Cannot downgrade wallet</translation> </message> @@ -4534,12 +4639,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Done loading</translation> </message> <message> - <location line="+91"/> - <source>To use the %s option</source> - <translation>To use the %s option</translation> - </message> - <message> - <location line="-83"/> + <location line="+9"/> <source>Error</source> <translation>Error</translation> </message> diff --git a/src/qt/locale/bitcoin_eo.ts b/src/qt/locale/bitcoin_eo.ts index 5189310e64..fbfac8fc10 100644 --- a/src/qt/locale/bitcoin_eo.ts +++ b/src/qt/locale/bitcoin_eo.ts @@ -1,11 +1,7 @@ -<TS language="eo" version="2.0"> +<TS language="eo" version="2.1"> <context> <name>AddressBookPage</name> <message> - <source>Double-click to edit address or label</source> - <translation>Duoble-klaku por redakti adreson aŭ etikedon</translation> - </message> - <message> <source>Create a new address</source> <translation>Krei novan adreson</translation> </message> @@ -35,7 +31,7 @@ </message> <message> <source>Export the data in the current tab to a file</source> - <translation>Eksporti al dosiero la datumojn el la aktuala langeto</translation> + <translation>Eksporti la datumojn el la aktuala langeto al dosiero</translation> </message> <message> <source>&Export</source> @@ -89,6 +85,10 @@ <source>Comma separated file (*.csv)</source> <translation>Perkome disigita dosiero (*.csv)</translation> </message> + <message> + <source>Exporting Failed</source> + <translation>ekspotado malsukcesinta</translation> + </message> </context> <context> <name>AddressTableModel</name> @@ -148,10 +148,6 @@ <translation>Ŝanĝi la pasfrazon</translation> </message> <message> - <source>Enter the old and new passphrase to the wallet.</source> - <translation>Tajpu la malnovan kaj novan monujajn pasfrazojn.</translation> - </message> - <message> <source>Confirm wallet encryption</source> <translation>Konfirmo de ĉifrado de la monujo</translation> </message> @@ -176,10 +172,6 @@ <translation>La monujo estas ĉifrita</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>Bitmono nun fermiĝos por fini la ĉifradon. Memoru, ke eĉ ĉifrado ne protektas kontraŭ ĉiu atako, ekz. se viruso infektus vian komputilon.</translation> - </message> - <message> <source>Wallet encryption failed</source> <translation>Ĉifrado de la monujo fiaskis</translation> </message> @@ -283,6 +275,10 @@ <translation>Malfermi &URI-on...</translation> </message> <message> + <source>Bitcoin Core client</source> + <translation>kliento de bitmon-kerno</translation> + </message> + <message> <source>Importing blocks from disk...</source> <translation>Importado de blokoj el disko...</translation> </message> @@ -295,10 +291,6 @@ <translation>Sendi monon al Bitmon-adreso</translation> </message> <message> - <source>Modify configuration options for Bitcoin</source> - <translation>Modifi agordaĵojn por Bitmono</translation> - </message> - <message> <source>Backup wallet to another location</source> <translation>Krei alilokan sekurkopion de monujo</translation> </message> @@ -398,26 +390,10 @@ <source>&Command-line options</source> <translation>&Komandliniaj agordaĵoj</translation> </message> - <message numerus="yes"> - <source>%n active connection(s) to Bitcoin network</source> - <translation><numerusform>%n aktiva konekto al la bitmona reto</numerusform><numerusform>%n aktivaj konektoj al la bitmona reto</numerusform></translation> - </message> <message> <source>No block source available...</source> <translation>Neniu fonto de blokoj trovebla...</translation> </message> - <message numerus="yes"> - <source>%n hour(s)</source> - <translation><numerusform>%n horo</numerusform><numerusform>%n horoj</numerusform></translation> - </message> - <message numerus="yes"> - <source>%n day(s)</source> - <translation><numerusform>%n tago</numerusform><numerusform>%n tagoj</numerusform></translation> - </message> - <message numerus="yes"> - <source>%n week(s)</source> - <translation><numerusform>%n semajno</numerusform><numerusform>%n semajnoj</numerusform></translation> - </message> <message> <source>%1 and %2</source> <translation>%1 kaj %2</translation> @@ -463,18 +439,6 @@ <translation>Envenanta transakcio</translation> </message> <message> - <source>Date: %1 -Amount: %2 -Type: %3 -Address: %4 -</source> - <translation>Dato: %1 -Sumo: %2 -Tipo: %3 -Adreso: %4 -</translation> - </message> - <message> <source>Wallet is <b>encrypted</b> and currently <b>unlocked</b></source> <translation>Monujo estas <b>ĉifrita</b> kaj aktuale <b>malŝlosita</b></translation> </message> @@ -653,10 +617,6 @@ Adreso: %4 <translation>ne</translation> </message> <message> - <source>This label turns red, if the transaction size is greater than 1000 bytes.</source> - <translation>Tiu ĉi etikedo ruĝiĝas se la grando de la transakcio estas pli ol 1000 bajtoj.</translation> - </message> - <message> <source>This means a fee of at least %1 per kB is required.</source> <translation>Tio signifas, ke krompago de almenaŭ po %1 por ĉiu kB estas deviga.</translation> </message> @@ -669,10 +629,6 @@ Adreso: %4 <translation>Transakcioj kun pli alta prioritato havas pli altan ŝancon inkluziviĝi en bloko.</translation> </message> <message> - <source>This label turns red, if any recipient receives an amount smaller than %1.</source> - <translation>Tiu ĉi etikedo ruĝiĝas se iu ajn ricevonto ricevos sumon malpli ol %1.</translation> - </message> - <message> <source>(no label)</source> <translation>(neniu etikedo)</translation> </message> @@ -789,26 +745,6 @@ Adreso: %4 <source>command-line options</source> <translation>komandliniaj agordaĵoj</translation> </message> - <message> - <source>UI options</source> - <translation>UI-agordaĵoj</translation> - </message> - <message> - <source>Set language, for example "de_DE" (default: system locale)</source> - <translation>Agordi lingvon, ekzemple "de_DE" (defaŭlte: tiu de la sistemo)</translation> - </message> - <message> - <source>Start minimized</source> - <translation>Lanĉiĝi plejete</translation> - </message> - <message> - <source>Show splash screen on startup (default: 1)</source> - <translation>Montri salutŝildon dum lanĉo (defaŭlte: 1)</translation> - </message> - <message> - <source>Choose data directory on startup (default: 0)</source> - <translation>Elekti dosierujon por datumoj dum lanĉo (defaŭlte: 0)</translation> - </message> </context> <context> <name>Intro</name> @@ -879,14 +815,6 @@ Adreso: %4 <translation>Ĉ&efa</translation> </message> <message> - <source>Automatically start Bitcoin after logging in to the system.</source> - <translation>Aŭtomate lanĉi Bitmonon post ensaluto al la sistemo.</translation> - </message> - <message> - <source>&Start Bitcoin on system login</source> - <translation>&Lanĉi Bitmonon tuj post ensaluto al la sistemo</translation> - </message> - <message> <source>Size of &database cache</source> <translation>Dosiergrando de &datumbasa kaŝmemoro</translation> </message> @@ -939,10 +867,6 @@ Adreso: %4 <translation>&Minimumigi al la sistempleto anstataŭ al la taskopleto</translation> </message> <message> - <source>Minimize instead of exit the application when the window is closed. When this option is enabled, the application will be closed only after selecting Quit in the menu.</source> - <translation>Minimumigi la aplikaĵon anstataŭ eliri kaj ĉesi kiam la fenestro estas fermita. Se tiu ĉi estas agordita, la aplikaĵo ĉesas nur kiam oni elektas "Eliri" el la menuo.</translation> - </message> - <message> <source>M&inimize on close</source> <translation>M&inimumigi je fermo</translation> </message> @@ -955,10 +879,6 @@ Adreso: %4 <translation>&Lingvo de la fasado:</translation> </message> <message> - <source>The user interface language can be set here. This setting will take effect after restarting Bitcoin.</source> - <translation>Vi povas elekti la lingvon uzata en la aplikaĵo ĉi tie. Tiu ekefikos nur post relanĉo de Bitmono.</translation> - </message> - <message> <source>&Unit to show amounts in:</source> <translation>&Unuo por vidigi sumojn:</translation> </message> @@ -1213,18 +1133,10 @@ Adreso: %4 <translation>Sencimiga protokoldosiero</translation> </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>Malfermi la sencimiga protokoldosiero de Bitmono el la aktuala dosierujo por datumoj. Tio eble daŭros plurajn sekundojn por granda protokoldosiero.</translation> - </message> - <message> <source>Clear console</source> <translation>Malplenigi konzolon</translation> </message> <message> - <source>Welcome to the Bitcoin RPC console.</source> - <translation>Bonvenon al la RPC-konzolo de Bitmono.</translation> - </message> - <message> <source>Use up and down arrows to navigate history, and <b>Ctrl-L</b> to clear screen.</source> <translation>Uzu la sagojn supran kaj malsupran por esplori la historion, kaj <b>stir-L</b> por malplenigi la ekranon.</translation> </message> @@ -1390,7 +1302,7 @@ Adreso: %4 <name>SendCoinsDialog</name> <message> <source>Send Coins</source> - <translation>Sendi Monon</translation> + <translation>Sendi Bitmonon</translation> </message> <message> <source>Coin Control Features</source> @@ -1446,7 +1358,7 @@ Adreso: %4 </message> <message> <source>Clear &All</source> - <translation>&Forigi ĉion</translation> + <translation>&Forigi Ĉion</translation> </message> <message> <source>Balance:</source> @@ -1505,10 +1417,6 @@ Adreso: %4 <translation>aŭ</translation> </message> <message> - <source>The recipient address is not valid, please recheck.</source> - <translation>La adreso de la ricevonto ne validas. Bonvolu kontroli.</translation> - </message> - <message> <source>The amount to pay must be larger than 0.</source> <translation>La pagenda sumo devas esti pli ol 0.</translation> </message> @@ -1521,10 +1429,6 @@ Adreso: %4 <translation>La sumo kun la %1 krompago estas pli granda ol via saldo.</translation> </message> <message> - <source>Duplicate address found, can only send to each address once per send operation.</source> - <translation>Iu adreso estas ripetita. Vi povas sendi al ĉiu adreso po unufoje en iu send-operacio.</translation> - </message> - <message> <source>Transaction creation failed!</source> <translation>Kreo de transakcio fiaskis!</translation> </message> @@ -1577,7 +1481,7 @@ Adreso: %4 </message> <message> <source>Paste address from clipboard</source> - <translation>Alglui adreson el tondejo</translation> + <translation>Alglui adreson de tondejo</translation> </message> <message> <source>Alt+P</source> @@ -1622,10 +1526,6 @@ Adreso: %4 <translation>&Subskribi Mesaĝon</translation> </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>Vi povas subskribi mesaĝon per viaj adresoj, por pravigi ke vi estas la posedanto de tiuj adresoj. Atentu, ke vi ne subskriu ion neprecizan, ĉar trompisto povus ruzi kontraŭ vi kaj ŝteli vian identecon. Subskribu nur plene detaligitaj deklaroj pri kiuj vi konsentas.</translation> - </message> - <message> <source>Choose previously used address</source> <translation>Elektu la jam uzitan adreson</translation> </message> @@ -1674,10 +1574,6 @@ Adreso: %4 <translation>&Kontroli Mesaĝon</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>Enmeti la subskriban adreson, la mesaĝon (kune kun ĉiu linisalto, spaceto, taboj, ktp. precize) kaj la subskribon ĉi sube por kontroli la mesaĝon. Atentu, ke vi ne komprenu per la subskribo pli ol la enhavo de la mesaĝo mem, por eviti homo-en-la-mezo-atakon.</translation> - </message> - <message> <source>Verify the message to ensure it was signed with the specified Bitcoin address</source> <translation>Kontroli la mesaĝon por pravigi, ke ĝi ja estas subskribita per la specifa Bitmon-adreso</translation> </message> @@ -1786,10 +1682,6 @@ Adreso: %4 <source>Status</source> <translation>Stato</translation> </message> - <message numerus="yes"> - <source>, broadcast through %n node(s)</source> - <translation><numerusform>, elsendita(j) tra %n nodo</numerusform><numerusform>, elsendita(j) tra %n nodoj</numerusform></translation> - </message> <message> <source>Date</source> <translation>Dato</translation> @@ -1822,10 +1714,6 @@ Adreso: %4 <source>Credit</source> <translation>Kredito</translation> </message> - <message numerus="yes"> - <source>matures in %n more block(s)</source> - <translation><numerusform>maturiĝos post %n bloko</numerusform><numerusform>maturiĝos post %n blokoj</numerusform></translation> - </message> <message> <source>not accepted</source> <translation>ne akceptita</translation> @@ -1890,10 +1778,6 @@ Adreso: %4 <source>, has not been successfully broadcast yet</source> <translation>, ankoraŭ ne elsendita sukcese</translation> </message> - <message numerus="yes"> - <source>Open for %n more block(s)</source> - <translation><numerusform>Malferma dum ankoraŭ %n bloko</numerusform><numerusform>Malferma dum ankoraŭ %n blokoj</numerusform></translation> - </message> <message> <source>unknown</source> <translation>nekonata</translation> @@ -1921,14 +1805,6 @@ Adreso: %4 <translation>Tipo</translation> </message> <message> - <source>Address</source> - <translation>Adreso</translation> - </message> - <message numerus="yes"> - <source>Open for %n more block(s)</source> - <translation><numerusform>Malferma dum ankoraŭ %n bloko</numerusform><numerusform>Malferma dum ankoraŭ %n blokoj</numerusform></translation> - </message> - <message> <source>Open until %1</source> <translation>Malferma ĝis %1</translation> </message> @@ -1949,6 +1825,10 @@ Adreso: %4 <translation>Senkonekte</translation> </message> <message> + <source>Label</source> + <translation>Etikedo</translation> + </message> + <message> <source>Unconfirmed</source> <translation>Nekonfirmita</translation> </message> @@ -1989,10 +1869,6 @@ Adreso: %4 <translation>Tipo de transakcio.</translation> </message> <message> - <source>Destination address of transaction.</source> - <translation>Celadreso de la transakcio.</translation> - </message> - <message> <source>Amount removed from or added to balance.</source> <translation>Sumo elprenita de aŭ aldonita al la saldo.</translation> </message> @@ -2080,6 +1956,10 @@ Adreso: %4 <translation>Montri detalojn de transakcio</translation> </message> <message> + <source>Exporting Failed</source> + <translation>ekspotado malsukcesinta</translation> + </message> + <message> <source>Comma separated file (*.csv)</source> <translation>Perkome disigita dosiero (*.csv)</translation> </message> @@ -2191,42 +2071,10 @@ Adreso: %4 <translation>Akcepti konektojn el ekstere (defaŭlte: 1 se ne estas -proxy nek -connect)</translation> </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>%s, vi devas specifi rpcpassword en la konfigura dosiero: -%s -Estas konsilinde uzi tiun ĉi aleatore kreitan pasvorton: -rpcuser=bitcoinrpc -rpcpassword=%s -(ne utilas al vi memorigi tiun ĉi pasvorton) -La salutnomo kaj la pasvorto estu nepre MALSAMAJ. -Se la dosiero ne ekzistas, kreu ĝin kun permeso "nur posedanto rajtas legi". -Estas konsilinde ankaŭ agordi alertnotify por ke vi ricevu avertojn pri eventualaj problemoj; -ekzemple: alertnotify=echo %%s | mail -s "Averto de Bitmono" admin@foo.com -</translation> - </message> - <message> <source>Bind to given address and always listen on it. Use [host]:port notation for IPv6</source> <translation>Bindi al donita adreso kaj ĉiam aŭskulti per ĝi. Uzu la formaton [gastigo]:pordo por IPv6</translation> </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>Eraro: la transakcio estas rifuzita. Tio povas okazi se iom da Bitmono en via monujo jam elspeziĝis (ekz. se vi uzis kopion de wallet.dat kies Bitmono jam elspeziĝis, sed ne estis markita kiel elspezita ĉi tie).</translation> - </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>Eraro: tiu ĉi transakcio bezonas krompagon de almenaŭ %s pro la sumo, la komplekseco, aŭ la uzo de ĵus ricevita mono!</translation> - </message> - <message> <source>Execute command when a wallet transaction changes (%s in cmd is replaced by TxID)</source> <translation>Plenumi komandon kiam monuja transakcio ŝanĝiĝas (%s en cmd anstataŭiĝas per TxID)</translation> </message> @@ -2275,10 +2123,6 @@ ekzemple: alertnotify=echo %%s | mail -s "Averto de Bitmono" admin@foo.com <translation>Difektita blokdatumbazo trovita</translation> </message> <message> - <source>Discover own IP address (default: 1 when listening and no -externalip)</source> - <translation>Malkovri la propran IP-adreson (defaŭlte: 1 dum aŭskultado sen -externalip)</translation> - </message> - <message> <source>Do you want to rebuild the block database now?</source> <translation>Ĉu vi volas rekonstrui la blokdatumbazon nun?</translation> </message> @@ -2303,10 +2147,6 @@ ekzemple: alertnotify=echo %%s | mail -s "Averto de Bitmono" admin@foo.com <translation>Eraro: restas malmulte da diskospaco!</translation> </message> <message> - <source>Error: Wallet locked, unable to create transaction!</source> - <translation>Eraro: monujo ŝlosita, ne eblas krei transakcion!</translation> - </message> - <message> <source>Failed to listen on any port. Use -listen=0 if you want this.</source> <translation>Ne sukcesis aŭskulti ajnan pordon. Uzu -listen=0 se tion vi volas.</translation> </message> @@ -2323,10 +2163,6 @@ ekzemple: alertnotify=echo %%s | mail -s "Averto de Bitmono" admin@foo.com <translation>Nesufiĉa nombro de dosierpriskribiloj disponeblas.</translation> </message> <message> - <source>Rebuild block chain index from current blk000??.dat files</source> - <translation>Rekontrui blokĉenan indekson el la aktualaj blk000??.dat dosieroj</translation> - </message> - <message> <source>Specify wallet file (within data directory)</source> <translation>Specifi monujan dosieron (ene de dosierujo por datumoj)</translation> </message> @@ -2359,6 +2195,10 @@ ekzemple: alertnotify=echo %%s | mail -s "Averto de Bitmono" admin@foo.com <translation>Plenumi komandon kiam rilata alerto riceviĝas, aŭ kiam ni vidas tre longan forkon (%s en cms anstataŭiĝas per mesaĝo)</translation> </message> <message> + <source>Choose data directory on startup (default: 0)</source> + <translation>Elekti dosierujon por datumoj dum lanĉo (defaŭlte: 0)</translation> + </message> + <message> <source>Information</source> <translation>Informoj</translation> </message> @@ -2375,6 +2215,14 @@ ekzemple: alertnotify=echo %%s | mail -s "Averto de Bitmono" admin@foo.com <translation>Sendi spurajn/sencimigajn informojn al la konzolo anstataŭ al dosiero debug.log</translation> </message> <message> + <source>Set language, for example "de_DE" (default: system locale)</source> + <translation>Agordi lingvon, ekzemple "de_DE" (defaŭlte: tiu de la sistemo)</translation> + </message> + <message> + <source>Show splash screen on startup (default: 1)</source> + <translation>Montri salutŝildon dum lanĉo (defaŭlte: 1)</translation> + </message> + <message> <source>Shrink debug.log file on client startup (default: 1 when no -debug)</source> <translation>Malpligrandigi la sencimigan protokol-dosieron kiam kliento lanĉiĝas (defaŭlte: 1 kiam mankas -debug)</translation> </message> @@ -2383,6 +2231,14 @@ ekzemple: alertnotify=echo %%s | mail -s "Averto de Bitmono" admin@foo.com <translation>Subskriba transakcio fiaskis</translation> </message> <message> + <source>Start minimized</source> + <translation>Lanĉiĝi plejete</translation> + </message> + <message> + <source>This is experimental software.</source> + <translation>ĝi estas eksperimenta programo</translation> + </message> + <message> <source>Transaction amount too small</source> <translation>Transakcia sumo tro malgranda</translation> </message> @@ -2407,10 +2263,6 @@ ekzemple: alertnotify=echo %%s | mail -s "Averto de Bitmono" admin@foo.com <translation>Averto</translation> </message> <message> - <source>Warning: This version is obsolete, upgrade required!</source> - <translation>Averto: tiu ĉi versio estas eksdata. Vi bezonas ĝisdatigon!</translation> - </message> - <message> <source>wallet.dat corrupt, salvage failed</source> <translation>wallet.dat estas difektita, riparo malsukcesis</translation> </message> @@ -2475,10 +2327,6 @@ ekzemple: alertnotify=echo %%s | mail -s "Averto de Bitmono" admin@foo.com <translation>Nevalida sumo por -paytxfee=<amount>: '%s'</translation> </message> <message> - <source>Invalid amount</source> - <translation>Nevalida sumo</translation> - </message> - <message> <source>Insufficient funds</source> <translation>Nesufiĉa mono</translation> </message> @@ -2511,10 +2359,6 @@ ekzemple: alertnotify=echo %%s | mail -s "Averto de Bitmono" admin@foo.com <translation>Ŝargado finiĝis</translation> </message> <message> - <source>To use the %s option</source> - <translation>Por uzi la agordon %s</translation> - </message> - <message> <source>Error</source> <translation>Eraro</translation> </message> diff --git a/src/qt/locale/bitcoin_es.ts b/src/qt/locale/bitcoin_es.ts index b701366706..2e1b7dd278 100644 --- a/src/qt/locale/bitcoin_es.ts +++ b/src/qt/locale/bitcoin_es.ts @@ -1,9 +1,9 @@ -<TS language="es" version="2.0"> +<TS language="es" version="2.1"> <context> <name>AddressBookPage</name> <message> - <source>Double-click to edit address or label</source> - <translation>Haga doble clic para editar la etiqueta o dirección </translation> + <source>Right-click to edit address or label</source> + <translation>Haz-clic para editar la dirección o etiqueta</translation> </message> <message> <source>Create a new address</source> @@ -31,11 +31,11 @@ </message> <message> <source>Delete the currently selected address from the list</source> - <translation>Borrar de la lista la dirección seleccionada</translation> + <translation>Eliminar la dirección seleccionada de la lista</translation> </message> <message> <source>Export the data in the current tab to a file</source> - <translation>Exportar a un archivo los datos de esta pestaña</translation> + <translation>Exportar los datos en la ficha actual a un archivo</translation> </message> <message> <source>&Export</source> @@ -47,11 +47,11 @@ </message> <message> <source>Choose the address to send coins to</source> - <translation>Escoja la dirección a la que enviar bitcoins</translation> + <translation>Elije la dirección para enviar monedas a</translation> </message> <message> <source>Choose the address to receive coins with</source> - <translation>Escoja la dirección de la que recibir bitcoins</translation> + <translation>Elije la dirección para recibir monedas con</translation> </message> <message> <source>C&hoose</source> @@ -67,11 +67,11 @@ </message> <message> <source>These are your Bitcoin addresses for sending payments. Always check the amount and the receiving address before sending coins.</source> - <translation>Estas son sus direcciones Bitcoin para enviar pagos. Compruebe siempre la cantidad y la dirección receptora antes de enviar bitcoins.</translation> + <translation>Estas son tus direcciones Bitcoin para enviar los pagos. Comprueba siempre la cantidad y la dirección receptora antes de enviar las monedas.</translation> </message> <message> <source>These are your Bitcoin addresses for receiving payments. It is recommended to use a new receiving address for each transaction.</source> - <translation>Estas son sus direcciones de Bitcoin para recibir pagos. Se recomienda utilizar una nueva dirección de recepción para cada transacción.</translation> + <translation>Estas son tus direcciones de Bitcoin para recibir los pagos. Se recomienda utilizar una nueva dirección de recepción para cada transacción.</translation> </message> <message> <source>Copy &Label</source> @@ -87,17 +87,13 @@ </message> <message> <source>Comma separated file (*.csv)</source> - <translation>Archivos de columnas separadas por coma (*.csv)</translation> + <translation>Archivos separados por coma (*.csv)</translation> </message> <message> <source>Exporting Failed</source> - <translation>Error exportando</translation> - </message> - <message> - <source>There was an error trying to save the address list to %1. Please try again.</source> - <translation>Se ha producido un error al intentar guardar la lista de direcciones en %1. Por favor vuelva a intentarlo.</translation> + <translation>Fallo al exportar</translation> </message> -</context> + </context> <context> <name>AddressTableModel</name> <message> @@ -156,10 +152,6 @@ <translation>Cambiar contraseña</translation> </message> <message> - <source>Enter the old and new passphrase to the wallet.</source> - <translation>Introduzca la contraseña anterior del monedero y la nueva. </translation> - </message> - <message> <source>Confirm wallet encryption</source> <translation>Confirmar cifrado del monedero</translation> </message> @@ -169,7 +161,11 @@ </message> <message> <source>Are you sure you wish to encrypt your wallet?</source> - <translation>¿Seguro que desea cifrar su monedero?</translation> + <translation>¿Estás seguro que deseas cifrar tu monedero ?</translation> + </message> + <message> + <source>Bitcoin Core will close now to finish the encryption process. Remember that encrypting your wallet cannot fully protect your bitcoins from being stolen by malware infecting your computer.</source> + <translation>Bitcoin Core se cerrará ahora para completar el procedo de encriptación. Recuerda que encriptar tu cartera no te protegerá completamente de la pérdida de bitcoins por infección de malware en tu computadora.</translation> </message> <message> <source>IMPORTANT: Any previous backups you have made of your wallet file should be replaced with the newly generated, encrypted wallet file. For security reasons, previous backups of the unencrypted wallet file will become useless as soon as you start using the new, encrypted wallet.</source> @@ -177,7 +173,7 @@ </message> <message> <source>Warning: The Caps Lock key is on!</source> - <translation>Aviso: ¡La tecla de bloqueo de mayúsculas está activada!</translation> + <translation>Aviso: ¡La tecla de Mayúsculas está activada!</translation> </message> <message> <source>Wallet encrypted</source> @@ -188,8 +184,8 @@ <translation>Introduzca la nueva contraseña para el monedero.<br/>Utilice por favor una contraseña con <b>diez o más caracteres aleatorios</b> o con <b>ocho o más palabras</b>.</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>Bitcoin se cerrará para finalizar el proceso de cifrado. Recuerde que el cifrado de su monedero no puede proteger totalmente sus bitcoins de robo por malware que infecte su sistema.</translation> + <source>Enter the old passphrase and new passphrase to the wallet.</source> + <translation>Introduce la antigua y la nueva contraseña de la cartera.</translation> </message> <message> <source>Wallet encryption failed</source> @@ -311,10 +307,6 @@ <translation>Enviar bitcoins a una dirección Bitcoin</translation> </message> <message> - <source>Modify configuration options for Bitcoin</source> - <translation>Modificar las opciones de configuración de Bitcoin</translation> - </message> - <message> <source>Backup wallet to another location</source> <translation>Copia de seguridad del monedero en otra ubicación</translation> </message> @@ -324,7 +316,7 @@ </message> <message> <source>&Debug window</source> - <translation>Ventana de &depuración</translation> + <translation>&Ventana de depuración</translation> </message> <message> <source>Open debugging and diagnostic console</source> @@ -478,35 +470,37 @@ <source>Up to date</source> <translation>Actualizado</translation> </message> - <message numerus="yes"> - <source>Processed %n blocks of transaction history.</source> - <translation><numerusform>%n bloques procesados del historial de transacciones</numerusform><numerusform>Procesados %n bloques del historial de transacciones</numerusform></translation> - </message> <message> <source>Catching up...</source> <translation>Actualizando...</translation> </message> <message> - <source>Sent transaction</source> - <translation>Transacción enviada</translation> + <source>Date: %1 +</source> + <translation>Fecha: %1 +</translation> </message> <message> - <source>Incoming transaction</source> - <translation>Transacción entrante</translation> + <source>Label: %1 +</source> + <translation>Etiqueta: %1 +</translation> </message> <message> - <source>Date: %1 -Amount: %2 -Type: %3 -Address: %4 + <source>Address: %1 </source> - <translation>Fecha: %1 -Cantidad: %2 -Tipo: %3 -Dirección: %4 + <translation>Dirección: %1 </translation> </message> <message> + <source>Sent transaction</source> + <translation>Transacción enviada</translation> + </message> + <message> + <source>Incoming transaction</source> + <translation>Transacción entrante</translation> + </message> + <message> <source>Wallet is <b>encrypted</b> and currently <b>unlocked</b></source> <translation>El monedero está <b>cifrado</b> y actualmente <b>desbloqueado</b></translation> </message> @@ -697,6 +691,14 @@ Dirección: %4 <translation>ninguna</translation> </message> <message> + <source>This label turns red if the transaction size is greater than 1000 bytes.</source> + <translation>Esta etiqueta se mostrará en rojo si el tamaño de la transacción es mayor de 1000 bytes.</translation> + </message> + <message> + <source>This label turns red if the priority is smaller than "medium".</source> + <translation>Esta etiqueta se mostrará en rojo si la prioridad es menor a "media"</translation> + </message> + <message> <source>Can vary +/- %1 satoshi(s) per input.</source> <translation>Puede variar en +/- %1 satoshi(s) por entrada.</translation> </message> @@ -709,10 +711,6 @@ Dirección: %4 <translation>no</translation> </message> <message> - <source>This label turns red, if the transaction size is greater than 1000 bytes.</source> - <translation>Esta etiqueta se torna roja si el tamaño de la transacción es mayor de 1000 bytes.</translation> - </message> - <message> <source>This means a fee of at least %1 per kB is required.</source> <translation>Esto implica que se requiere una comisión de al menos %1 por kB</translation> </message> @@ -725,14 +723,6 @@ Dirección: %4 <translation>Las transacciones con mayor prioridad tienen mayor probabilidad de ser incluidas en un bloque.</translation> </message> <message> - <source>This label turns red, if the priority is smaller than "medium".</source> - <translation>Esta etiqueta se torna roja si la prioridad es menor que "media".</translation> - </message> - <message> - <source>This label turns red, if any recipient receives an amount smaller than %1.</source> - <translation>Esta etiqueta se torna roja si cualquier destinatario recibe una cantidad menor de %1.</translation> - </message> - <message> <source>(no label)</source> <translation>(sin etiqueta)</translation> </message> @@ -853,30 +843,6 @@ Dirección: %4 <source>command-line options</source> <translation>opciones de la consola de comandos</translation> </message> - <message> - <source>UI options</source> - <translation>Opciones de interfaz de usuario</translation> - </message> - <message> - <source>Set language, for example "de_DE" (default: system locale)</source> - <translation>Establecer el idioma, por ejemplo, "es_ES" (predeterminado: configuración regional del sistema)</translation> - </message> - <message> - <source>Start minimized</source> - <translation>Arrancar minimizado</translation> - </message> - <message> - <source>Set SSL root certificates for payment request (default: -system-)</source> - <translation>Establecer los certificados raíz SSL para solicitudes de pago (predeterminado: -system-)</translation> - </message> - <message> - <source>Show splash screen on startup (default: 1)</source> - <translation>Mostrar pantalla de bienvenida en el inicio (predeterminado: 1)</translation> - </message> - <message> - <source>Choose data directory on startup (default: 0)</source> - <translation>Elegir directorio de datos al iniciar (predeterminado: 0)</translation> - </message> </context> <context> <name>Intro</name> @@ -959,14 +925,6 @@ Dirección: %4 <translation>&Principal</translation> </message> <message> - <source>Automatically start Bitcoin after logging in to the system.</source> - <translation>Iniciar Bitcoin automáticamente al encender el sistema.</translation> - </message> - <message> - <source>&Start Bitcoin on system login</source> - <translation>&Iniciar Bitcoin al iniciar el sistema</translation> - </message> - <message> <source>Size of &database cache</source> <translation>Tamaño de cache de la &base de datos</translation> </message> @@ -1015,6 +973,14 @@ Dirección: %4 <translation>&Red</translation> </message> <message> + <source>Automatically start Bitcoin Core after logging in to the system.</source> + <translation>Iniciar automáticamente Bitcoin Core al iniciar el sistema.</translation> + </message> + <message> + <source>&Start Bitcoin Core on system login</source> + <translation>&Iniciar Bitcoin Core al inicio del sistema</translation> + </message> + <message> <source>(0 = auto, <0 = leave that many cores free)</source> <translation>(0 = automático, <0 = dejar libres ese número de núcleos)</translation> </message> @@ -1079,10 +1045,6 @@ Dirección: %4 <translation>&Minimizar a la bandeja en vez de a la barra de tareas</translation> </message> <message> - <source>Minimize instead of exit the application when the window is closed. When this option is enabled, the application will be closed only after selecting Quit in the menu.</source> - <translation>Minimizar en lugar de salir de la aplicación al cerrar la ventana. Cuando esta opción está activa, la aplicación solo se puede cerrar seleccionando Salir desde el menú.</translation> - </message> - <message> <source>M&inimize on close</source> <translation>M&inimizar al cerrar</translation> </message> @@ -1095,10 +1057,6 @@ Dirección: %4 <translation>I&dioma de la interfaz de usuario</translation> </message> <message> - <source>The user interface language can be set here. This setting will take effect after restarting Bitcoin.</source> - <translation>El idioma de la interfaz de usuario puede establecerse aquí. Este ajuste se aplicará cuando se reinicie Bitcoin.</translation> - </message> - <message> <source>&Unit to show amounts in:</source> <translation>Mostrar las cantidades en la &unidad:</translation> </message> @@ -1135,10 +1093,6 @@ Dirección: %4 <translation>Se necesita reiniciar el cliente para activar los cambios.</translation> </message> <message> - <source>Client will be shutdown, do you want to proceed?</source> - <translation>El cliente se cerrará. ¿Desea continuar?</translation> - </message> - <message> <source>This change would require a client restart.</source> <translation>Este cambio exige el reinicio del cliente.</translation> </message> @@ -1245,10 +1199,6 @@ Dirección: %4 <translation>La red de solicitud de pago no coincide con la red cliente</translation> </message> <message> - <source>Payment request has expired.</source> - <translation>La solicitud de pago ha cadiucado</translation> - </message> - <message> <source>Payment request is not initialized.</source> <translation>La solicitud de pago no está inicializada</translation> </message> @@ -1281,14 +1231,30 @@ Dirección: %4 <translation>¡No puede leerse el archivo de solicitud de pago! Esto puede deberse a un archivo inválido de solicitud de pago.</translation> </message> <message> + <source>Payment request expired.</source> + <translation>Solicitud de pago caducada.</translation> + </message> + <message> <source>Unverified payment requests to custom payment scripts are unsupported.</source> <translation>No están soportadas las peticiones inseguras a scripts de pago personalizados</translation> </message> <message> + <source>Invalid payment request.</source> + <translation>Petición de pago no válida.</translation> + </message> + <message> <source>Refund from %1</source> <translation>Devolución desde %1</translation> </message> <message> + <source>Payment request %1 is too large (%2 bytes, allowed %3 bytes).</source> + <translation>La petición de pago %1 es demasiado grande (%2 bytes, permitidos %3 bytes).</translation> + </message> + <message> + <source>Payment request DoS protection</source> + <translation> Solicitud pago de protección DoS</translation> + </message> + <message> <source>Error communicating with %1: %2</source> <translation>Error en la comunicación con %1: %2</translation> </message> @@ -1316,8 +1282,8 @@ Dirección: %4 <translation>User Agent</translation> </message> <message> - <source>Address/Hostname</source> - <translation>DIrección/Nombre de host</translation> + <source>Node/Service</source> + <translation>Nodo/Servicio</translation> </message> <message> <source>Ping Time</source> @@ -1351,14 +1317,6 @@ Dirección: %4 <translation>%1 s</translation> </message> <message> - <source>NETWORK</source> - <translation>RED</translation> - </message> - <message> - <source>UNKNOWN</source> - <translation>DESCONOCIDO</translation> - </message> - <message> <source>None</source> <translation>Ninguno</translation> </message> @@ -1557,16 +1515,12 @@ Dirección: %4 <translation>Archivo de registro de depuración</translation> </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>Abrir el archivo de registro de depuración en el directorio actual de datos. Esto puede llevar varios segundos para archivos de registro grandes.</translation> - </message> - <message> <source>Clear console</source> <translation>Borrar consola</translation> </message> <message> - <source>Welcome to the Bitcoin RPC console.</source> - <translation>Bienvenido a la consola RPC de Bitcoin</translation> + <source>Welcome to the Bitcoin Core RPC console.</source> + <translation>Bienvenido a la consola RPC de Bitcoin Core.</translation> </message> <message> <source>Use up and down arrows to navigate history, and <b>Ctrl-L</b> to clear screen.</source> @@ -1849,18 +1803,38 @@ Dirección: %4 <translation>Comisión de Transacción:</translation> </message> <message> - <source>Minimize</source> - <translation>Minimizar</translation> + <source>Choose...</source> + <translation>Elija...</translation> + </message> + <message> + <source>collapse fee-settings</source> + <translation>Colapsar ajustes de cuota</translation> </message> <message> <source>per kilobyte</source> <translation>por kilobyte</translation> </message> <message> + <source>If the custom fee is set to 1000 satoshis and the transaction is only 250 bytes, then "per kilobyte" only pays 250 satoshis in fee, while "total at least" pays 1000 satoshis. For transactions bigger than a kilobyte both pay by kilobyte.</source> + <translation>Si la tarifa de aduana se establece en 1000 satoshis y la transacción está a sólo 250 bytes, entonces "por kilobyte" sólo paga 250 satoshis de cuota, mientras que "el mínimo total" pagaría 1.000 satoshis. Para las transacciones más grandes que un kilobyte ambos pagan por kilobyte</translation> + </message> + <message> + <source>Hide</source> + <translation>Ocultar</translation> + </message> + <message> <source>total at least</source> <translation>total por lo menos</translation> </message> <message> + <source>Paying only the minimum fee is just fine as long as there is less transaction volume than space in the blocks. But be aware that this can end up in a never confirming transaction once there is more demand for bitcoin transactions than the network can process.</source> + <translation>Pagando solamente la cuota mínima es correcto, siempre y cuando haya menos volumen de transacciones que el espacio en los bloques. Pero tenga en cuenta que esto puede terminar en una transacción nunca confirmada, una vez que haya más demanda para transacciones Bitcoin que la red pueda procesar.</translation> + </message> + <message> + <source>(read the tooltip)</source> + <translation>(leer la sugerencia)</translation> + </message> + <message> <source>Recommended:</source> <translation>Recomendado:</translation> </message> @@ -1885,6 +1859,10 @@ Dirección: %4 <translation>rápido</translation> </message> <message> + <source>Send as zero-fee transaction if possible</source> + <translation>Enviar transacción, si es posible, sin comisión</translation> + </message> + <message> <source>(confirmation may take longer)</source> <translation>(confirmación puede tardar más tiempo)</translation> </message> @@ -1965,10 +1943,6 @@ Dirección: %4 <translation>o</translation> </message> <message> - <source>The recipient address is not valid, please recheck.</source> - <translation>La dirección de recepción no es válida, compruébela de nuevo.</translation> - </message> - <message> <source>The amount to pay must be larger than 0.</source> <translation>La cantidad por pagar tiene que ser mayor de 0.</translation> </message> @@ -1981,10 +1955,6 @@ Dirección: %4 <translation>El total sobrepasa su saldo cuando se incluye la tasa de envío de %1</translation> </message> <message> - <source>Duplicate address found, can only send to each address once per send operation.</source> - <translation>Se ha encontrado una dirección duplicada. Solo se puede enviar a cada dirección una vez por operación de envío.</translation> - </message> - <message> <source>Transaction creation failed!</source> <translation>¡Ha fallado la creación de la transacción!</translation> </message> @@ -1993,12 +1963,12 @@ Dirección: %4 <translation>¡La transacción fue rechazada! Esto puede haber ocurrido si alguno de los bitcoins de su monedero ya estaba gastado o si ha usado una copia de wallet.dat y los bitcoins estaban gastados en la copia pero no se habían marcado como gastados aqui.</translation> </message> <message> - <source>Pay only the minimum fee of %1</source> - <translation>Paga sólo la cuota mínima de %1</translation> + <source>Payment request expired.</source> + <translation>Solicitud de pago caducada.</translation> </message> <message> - <source>Estimated to begin confirmation within %1 block(s).</source> - <translation>Estimado para comenzar confirmación dentro de %1 bloque(s)</translation> + <source>Pay only the minimum fee of %1</source> + <translation>Paga sólo la cuota mínima de %1</translation> </message> <message> <source>Warning: Invalid Bitcoin address</source> @@ -2072,12 +2042,20 @@ Dirección: %4 <translation>Eliminar esta transacción</translation> </message> <message> + <source>S&ubtract fee from amount</source> + <translation>Restar comisiones a la cantidad</translation> + </message> + <message> <source>Message:</source> <translation>Mensaje:</translation> </message> <message> - <source>This is a verified payment request.</source> - <translation>Esto es una petición de pago verificado.</translation> + <source>This is an unauthenticated payment request.</source> + <translation>Esta es una petición de pago no autentificada.</translation> + </message> + <message> + <source>This is an authenticated payment request.</source> + <translation>Esta es una petición de pago autentificada.</translation> </message> <message> <source>Enter a label for this address to add it to the list of used addresses</source> @@ -2088,10 +2066,6 @@ Dirección: %4 <translation>Un mensaje que se adjuntó a la bitcoin: URL que será almacenada con la transacción para su referencia. Nota: Este mensaje no se envía a través de la red Bitcoin.</translation> </message> <message> - <source>This is an unverified payment request.</source> - <translation>Esto es una petición de pago no verificado.</translation> - </message> - <message> <source>Pay To:</source> <translation>Paga a:</translation> </message> @@ -2122,10 +2096,6 @@ Dirección: %4 <translation>&Firmar mensaje</translation> </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>Puede firmar mensajes con sus direcciones para demostrar que las posee. Tenga cuidado de no firmar cualquier cosa vaga, ya que los ataques de phishing pueden tratar de engañarle para suplantar su identidad. Firme solo declaraciones totalmente detalladas con las que usted esté de acuerdo.</translation> - </message> - <message> <source>The Bitcoin address to sign the message with</source> <translation>Dirección Bitcoin con la que firmar el mensaje</translation> </message> @@ -2178,10 +2148,6 @@ Dirección: %4 <translation>&Verificar mensaje</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>Introduzca la dirección para la firma, el mensaje (asegurándose de copiar tal cual los saltos de línea, espacios, tabulaciones, etc.) y la firma a continuación para verificar el mensaje. Tenga cuidado de no asumir más información de lo que dice el propio mensaje firmado para evitar fraudes basados en ataques de tipo man-in-the-middle.</translation> - </message> - <message> <source>The Bitcoin address the message was signed with</source> <translation>La dirección Bitcoin con la que se firmó el mensaje</translation> </message> @@ -2445,10 +2411,6 @@ Dirección: %4 <translation>Tipo</translation> </message> <message> - <source>Address</source> - <translation>Dirección</translation> - </message> - <message> <source>Immature (%1 confirmations, will be available after %2)</source> <translation>No vencidos (%1 confirmaciones. Estarán disponibles al cabo de %2)</translation> </message> @@ -2477,6 +2439,10 @@ Dirección: %4 <translation>Sin conexión</translation> </message> <message> + <source>Label</source> + <translation>Etiqueta</translation> + </message> + <message> <source>Unconfirmed</source> <translation>Sin confirmar</translation> </message> @@ -2533,10 +2499,6 @@ Dirección: %4 <translation>Sea o no una dirección sólo está involucrada en esta transacción.</translation> </message> <message> - <source>Destination address of transaction.</source> - <translation>Dirección de destino de la transacción.</translation> - </message> - <message> <source>Amount removed from or added to balance.</source> <translation>Cantidad retirada o añadida al saldo.</translation> </message> @@ -2779,30 +2741,6 @@ Dirección: %4 <translation>Aceptar conexiones desde el exterior (predeterminado: 1 si no -proxy o -connect)</translation> </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>%s, debe establecer un valor rpcpassword en el archivo de configuración: -%s -Se recomienda utilizar la siguiente contraseña aleatoria: -rpcuser=bitcoinrpc -rpcpassword=%s -(no es necesario recordar esta contraseña) -El nombre de usuario y la contraseña DEBEN NO ser iguales. -Si el archivo no existe, créelo con permisos de archivo de solo lectura. -Se recomienda también establecer alertnotify para recibir notificaciones de problemas. -Por ejemplo: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo.com -</translation> - </message> - <message> <source>Bind to given address and always listen on it. Use [host]:port notation for IPv6</source> <translation>Vincular a la dirección dada y escuchar siempre en ella. Utilice la notación [host]:port para IPv6</translation> </message> @@ -2819,14 +2757,6 @@ Por ejemplo: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo.com <translation>Ingresar en el modo de prueba de regresión, que utiliza una cadena especial en la que los bloques se pueden resolver instantáneamente.</translation> </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>¡Error: se ha rechazado la transacción! Esto puede ocurrir si ya se han gastado algunos de los bitcoins del monedero, como ocurriría si hubiera hecho una copia de wallet.dat y se hubieran gastado bitcoins a partir de la copia, con lo que no se habrían marcado aquí como gastados.</translation> - </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>¡Error: Esta transacción requiere una comisión de al menos %s debido a su cantidad, complejidad, o al uso de fondos recién recibidos!</translation> - </message> - <message> <source>Execute command when a wallet transaction changes (%s in cmd is replaced by TxID)</source> <translation>Ejecutar comando cuando una transacción del monedero cambia (%s en cmd se remplazará por TxID)</translation> </message> @@ -2903,10 +2833,6 @@ Por ejemplo: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo.com <translation>Opciones de depuración/pruebas:</translation> </message> <message> - <source>Discover own IP address (default: 1 when listening and no -externalip)</source> - <translation>Descubrir dirección IP propia (predeterminado: 1 al escuchar sin -externalip)</translation> - </message> - <message> <source>Do not load the wallet and disable wallet RPC calls</source> <translation>No cargar el monedero y desactivar las llamadas RPC del monedero</translation> </message> @@ -2939,10 +2865,6 @@ Por ejemplo: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo.com <translation>Error: ¡Espacio en disco bajo!</translation> </message> <message> - <source>Error: Wallet locked, unable to create transaction!</source> - <translation>Error: ¡El monedero está bloqueado; no se puede crear la transacción!</translation> - </message> - <message> <source>Failed to listen on any port. Use -listen=0 if you want this.</source> <translation>Ha fallado la escucha en todos los puertos. Use -listen=0 si desea esto.</translation> </message> @@ -2971,10 +2893,6 @@ Por ejemplo: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo.com <translation>Sólo conectar a nodos en redes <net> (ipv4, ipv6 o onion)</translation> </message> <message> - <source>Rebuild block chain index from current blk000??.dat files</source> - <translation>Reconstruir el índice de la cadena de bloques a partir de los archivos blk000??.dat actuales</translation> - </message> - <message> <source>Set database cache size in megabytes (%d to %d, default: %d)</source> <translation>Asignar tamaño de cache en megabytes (entre %d y %d; predeterminado: %d)</translation> </message> @@ -3011,6 +2929,10 @@ Por ejemplo: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo.com <translation>Opciones de monedero:</translation> </message> <message> + <source>Warning: This version is obsolete; upgrade required!</source> + <translation>Peligro: Esta versión es obsoleta; actualización requerida!</translation> + </message> + <message> <source>You need to rebuild the database using -reindex to change -txindex</source> <translation>Usted necesita reconstruir la base de datos utilizando -reindex para cambiar -txindex</translation> </message> @@ -3039,10 +2961,6 @@ Por ejemplo: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo.com <translation>No se ha podido bloquear el directorio de datos %s. Probablemente ya se está ejecutando Bitcoin Core.</translation> </message> <message> - <source>Continuously rate-limit free transactions to <n>*1000 bytes per minute (default:%u)</source> - <translation>Limitar continuamente las transacciones gratuitas a <n>*1000 bytes por minuto (predeterminado:%u)</translation> - </message> - <message> <source>Create new files with system default permissions, instead of umask 077 (only effective with disabled wallet functionality)</source> <translation>Crear nuevos archivos con permisos por defecto del sistema, en lugar de umask 077 (sólo efectivo con la funcionalidad de monedero desactivada)</translation> </message> @@ -3067,6 +2985,14 @@ Por ejemplo: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo.com <translation>Tarifas (en BTC/Kb) más pequeños que esto se consideran cero cuota para la creación de la transacción (por defecto: %s)</translation> </message> <message> + <source>If paytxfee is not set, include enough fee so transactions begin confirmation on average within n blocks (default: %u)</source> + <translation>Si el pago de comisión no está establecido, incluir la cuota suficiente para que las transacciones comiencen la confirmación en una media de n bloques ( por defecto :%u)</translation> + </message> + <message> + <source>Maximum size of data in data carrier transactions we relay and mine (default: %u)</source> + <translation>El tamaño máximo de los datos en las operaciones de transporte de datos que transmitimos y el mio (default: %u)</translation> + </message> + <message> <source>Query for peer addresses via DNS lookup, if low on addresses (default: 1 unless -connect)</source> <translation>Consulta de direcciones pares mediante búsqueda de DNS, si bajo en direcciones (por defecto: 1 a menos que - conectar)</translation> </message> @@ -3075,10 +3001,42 @@ Por ejemplo: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo.com <translation>Establecer tamaño máximo de las transacciones de alta prioridad/baja comisión en bytes (predeterminado: %d)</translation> </message> <message> + <source>Set the number of threads for coin generation if enabled (-1 = all cores, default: %d)</source> + <translation>Ajuste el número de hilos para la generación de moneda si está habilitado (-1 = all cores, default: %d)</translation> + </message> + <message> <source>This product includes software developed by the OpenSSL Project for use in the OpenSSL Toolkit <https://www.openssl.org/> and cryptographic software written by Eric Young and UPnP software written by Thomas Bernard.</source> <translation>Este producto incluye software desarrollado por el OpenSSL Project para su uso en OpenSSL Toolkit <https://www.openssl.org/>, software de cifrado escrito por Eric Young y software UPnP escrito por Thomas Bernard.</translation> </message> <message> + <source>To use bitcoind, or the -server option to bitcoin-qt, you must set an 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>Para utilizar bitcoind, o la -opción servidor a bitcoin-qt, debes establecer una rpcpassword en el fichero de configuración: +%s +Se recomienda utilizar la siguiente contraseña aleatoria: +rpcuser=bitcoinrpc +rpcpassword=%s +(no es necesario que recuerdes esta contraseña) +El nombre de usuario y contraseña NO DEBEN ser la misma. +Si no existe el archivo, crearlo con los permisos de archivos de propietarios de -sólo lectura-. +También se recomienda establecer una notificación de alerta para ser notificado de problemas; +por ejemplo: alertnotify=echo %% s | correo -s "Alerta Bitcoin" admin@foo.com +</translation> + </message> + <message> + <source>Warning: -maxtxfee is set very high! Fees this large could be paid on a single transaction.</source> + <translation>Advertencia: ¡-maxtxfee se establece muy alta! Esta gran tarifa podría ser pagada en una sola transacción .</translation> + </message> + <message> <source>Warning: Please check that your computer's date and time are correct! If your clock is wrong Bitcoin Core will not work properly.</source> <translation>Aviso: ¡Comprueba la fecha y hora de tu ordenador y verifica si es correcta! Si no es correcta Bitcoin Core no funcionará adecuadamente.</translation> </message> @@ -3087,6 +3045,18 @@ Por ejemplo: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo.com <translation>A los equipos en lista blanca no se les pueden prohibir los ataques DoS y sus transacciones siempre son retransmitidas, incluso si ya están en el mempool, es útil por ejemplo para un gateway.</translation> </message> <message> + <source>Accept public REST requests (default: %u)</source> + <translation>Aceptar solicitudes públicas en FERIADOS (por defecto: %u)</translation> + </message> + <message> + <source>Cannot resolve -whitebind address: '%s'</source> + <translation>No se puede resolver -whitebind address: '%s'</translation> + </message> + <message> + <source>Choose data directory on startup (default: 0)</source> + <translation>Elegir directorio de datos al iniciar (predeterminado: 0)</translation> + </message> + <message> <source>Connect through SOCKS5 proxy</source> <translation>Conectar usando SOCKS5 proxy</translation> </message> @@ -3095,10 +3065,22 @@ Por ejemplo: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo.com <translation>Copyright (C) 2009-%i The Bitcoin Core Developers</translation> </message> <message> + <source>Could not parse -rpcbind value %s as network address</source> + <translation>No se pudo analizar -rpcbind valor%s como dirección de red</translation> + </message> + <message> <source>Error loading wallet.dat: Wallet requires newer version of Bitcoin Core</source> <translation>Error al cargar wallet.dat: El monedero requiere una versión más reciente de Bitcoin Core</translation> </message> <message> + <source>Error reading from database, shutting down.</source> + <translation>Error al leer la base de datos, cerrando.</translation> + </message> + <message> + <source>Error: Unsupported argument -tor found, use -onion.</source> + <translation>Error: Argumento encontrado -tor no soportado, utilice -onion</translation> + </message> + <message> <source>Fee (in BTC/kB) to add to transactions you send (default: %s)</source> <translation>Cuota (in BTC/kB) para añadir a las transacciones que envíes (por defecto: %s)</translation> </message> @@ -3111,6 +3093,10 @@ Por ejemplo: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo.com <translation>La inicialización de la verificación de validez falló. Se está apagando Bitcoin Core.</translation> </message> <message> + <source>Invalid amount for -maxtxfee=<amount>: '%s'</source> + <translation>Monto inválido para -maxtxfee=<amount>: '%s'</translation> + </message> + <message> <source>Invalid amount for -minrelaytxfee=<amount>: '%s'</source> <translation>Cantidad inválida para -minrelaytxfee=<amount>: '%s'</translation> </message> @@ -3127,10 +3113,6 @@ Por ejemplo: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo.com <translation>Máscara de red inválida especificada en -whitelist: '%s'</translation> </message> <message> - <source>Keep at most <n> unconnectable blocks in memory (default: %u)</source> - <translation>Mantener como máximo <n> bloques no conectables en memoria (por defecto: %u)</translation> - </message> - <message> <source>Keep at most <n> unconnectable transactions in memory (default: %u)</source> <translation>Mantener como máximo <n> transacciones no conectables en memoria (por defecto: %u)</translation> </message> @@ -3143,10 +3125,6 @@ Por ejemplo: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo.com <translation>Opciones de nodos de retransmisión:</translation> </message> <message> - <source>Print block on startup, if found in block index</source> - <translation>Imprimir bloque al iniciar, si se encuentra en el índice de bloques</translation> - </message> - <message> <source>RPC SSL options: (see the Bitcoin Wiki for SSL setup instructions)</source> <translation>Opciones SSL de RPC: (véase la wiki de Bitcoin para las instrucciones de instalación de SSL)</translation> </message> @@ -3155,6 +3133,10 @@ Por ejemplo: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo.com <translation>Opciones de servidor RPC:</translation> </message> <message> + <source>RPC support for HTTP persistent connections (default: %d)</source> + <translation>Soporte RPC para conexiones HTTP persistentes (por defecto: %d)</translation> + </message> + <message> <source>Randomly drop 1 of every <n> network messages</source> <translation>Ignorar 1 de cada <n> mensajes de red al azar</translation> </message> @@ -3167,10 +3149,26 @@ Por ejemplo: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo.com <translation>Enviar información de trazas/depuración a la consola en lugar de al archivo debug.log</translation> </message> <message> + <source>Send transactions as zero-fee transactions if possible (default: %u)</source> + <translation>Mandar transacciones como comisión-cero si es posible (por defecto: %u)</translation> + </message> + <message> + <source>Set SSL root certificates for payment request (default: -system-)</source> + <translation>Establecer los certificados raíz SSL para solicitudes de pago (predeterminado: -system-)</translation> + </message> + <message> + <source>Set language, for example "de_DE" (default: system locale)</source> + <translation>Establecer el idioma, por ejemplo, "es_ES" (predeterminado: configuración regional del sistema)</translation> + </message> + <message> <source>Show all debugging options (usage: --help -help-debug)</source> <translation>Muestra todas las opciones de depuración (uso: --help -help-debug)</translation> </message> <message> + <source>Show splash screen on startup (default: 1)</source> + <translation>Mostrar pantalla de bienvenida en el inicio (predeterminado: 1)</translation> + </message> + <message> <source>Shrink debug.log file on client startup (default: 1 when no -debug)</source> <translation>Reducir el archivo debug.log al iniciar el cliente (predeterminado: 1 sin -debug)</translation> </message> @@ -3179,6 +3177,10 @@ Por ejemplo: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo.com <translation>Transacción falló</translation> </message> <message> + <source>Start minimized</source> + <translation>Arrancar minimizado</translation> + </message> + <message> <source>This is experimental software.</source> <translation>Este software es experimental.</translation> </message> @@ -3191,6 +3193,10 @@ Por ejemplo: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo.com <translation>Las cantidades en las transacciones deben ser positivas</translation> </message> <message> + <source>Transaction too large for fee policy</source> + <translation>Operación demasiado grande para la política de tasas</translation> + </message> + <message> <source>Transaction too large</source> <translation>Transacción demasiado grande</translation> </message> @@ -3216,8 +3222,8 @@ Por ejemplo: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo.com <translation>Aviso</translation> </message> <message> - <source>Warning: This version is obsolete, upgrade required!</source> - <translation>Aviso: Esta versión es obsoleta, actualización necesaria!</translation> + <source>Warning: Unsupported argument -benchmark ignored, use -debug=bench.</source> + <translation>Advertencia: Argumento no soportado -benchmark ignored, use -debug=bench.</translation> </message> <message> <source>Warning: Unsupported argument -debugnet ignored, use -debug=net.</source> @@ -3275,6 +3281,10 @@ Por ejemplo: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo.com <translation>Error al cargar wallet.dat: el monedero está dañado</translation> </message> <message> + <source>(1 = keep tx meta data e.g. account owner and payment request information, 2 = drop tx meta data)</source> + <translation>(1 = keep tx meta data e.g. account owner and payment request information, 2 = drop tx meta data)</translation> + </message> + <message> <source>Flush database activity from memory pool to disk log every <n> megabytes (default: %u)</source> <translation>Volcar la actividad de la base de datos de memoria al registro en disco cada <n> megabytes (predeterminado: %u)</translation> </message> @@ -3375,14 +3385,14 @@ Por ejemplo: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo.com <translation>Anteponer marca temporal a la información de depuración (por defecto: %u)</translation> </message> <message> - <source>Print block tree on startup (default: %u)</source> - <translation>Imprimir árbol de bloques al iniciar (predeterminado: %u)</translation> - </message> - <message> <source>Relay and mine data carrier transactions (default: %u)</source> <translation>Retransmitir y minar transacciones de transporte de datos (por defecto: %u)</translation> </message> <message> + <source>Relay non-P2SH multisig (default: %u)</source> + <translation>Relay non-P2SH multisig (default: %u)</translation> + </message> + <message> <source>Run a thread to flush wallet periodically (default: %u)</source> <translation>Ejecutar un hilo para limpiar de la memoria el monedero periódicamente (predeterminado: %u)</translation> </message> @@ -3451,10 +3461,6 @@ Por ejemplo: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo.com <translation>Cantidad inválida para -paytxfee=<amount>: '%s'</translation> </message> <message> - <source>Invalid amount</source> - <translation>Cuantía no válida</translation> - </message> - <message> <source>Insufficient funds</source> <translation>Fondos insuficientes</translation> </message> @@ -3487,10 +3493,6 @@ Por ejemplo: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo.com <translation>Se terminó de cargar</translation> </message> <message> - <source>To use the %s option</source> - <translation>Para utilizar la opción %s</translation> - </message> - <message> <source>Error</source> <translation>Error</translation> </message> diff --git a/src/qt/locale/bitcoin_es_CL.ts b/src/qt/locale/bitcoin_es_CL.ts index e6f81e650f..c3690480d8 100644 --- a/src/qt/locale/bitcoin_es_CL.ts +++ b/src/qt/locale/bitcoin_es_CL.ts @@ -1,27 +1,47 @@ -<TS language="es_CL" version="2.0"> +<TS language="es_CL" version="2.1"> <context> <name>AddressBookPage</name> <message> - <source>Double-click to edit address or label</source> - <translation>Haz doble clic para editar una dirección o etiqueta</translation> + <source>Right-click to edit address or label</source> + <translation>Haga clic para editar la dirección o etiqueta</translation> </message> <message> <source>Create a new address</source> - <translation>Crea una nueva dirección</translation> + <translation>Crea una nueva direCrea una nueva direccióncción</translation> + </message> + <message> + <source>&New</source> + <translation>y nueva</translation> </message> <message> <source>Copy the currently selected address to the system clipboard</source> <translation>Copia la dirección seleccionada al portapapeles</translation> </message> <message> + <source>&Copy</source> + <translation>y copiar</translation> + </message> + <message> + <source>C&lose</source> + <translation>C y perder</translation> + </message> + <message> <source>&Copy Address</source> <translation>&Copia dirección</translation> </message> <message> + <source>Delete the currently selected address from the list</source> + <translation>Eliminar la dirección seleccionada de la lista</translation> + </message> + <message> <source>Export the data in the current tab to a file</source> <translation>Exportar los datos de la pestaña actual a un archivo</translation> </message> <message> + <source>&Export</source> + <translation>y exportar</translation> + </message> + <message> <source>&Delete</source> <translation>&Borrar</translation> </message> @@ -92,10 +112,6 @@ <translation>Cambia contraseña</translation> </message> <message> - <source>Enter the old and new passphrase to the wallet.</source> - <translation>Introduce la contraseña anterior y la nueva de cartera</translation> - </message> - <message> <source>Confirm wallet encryption</source> <translation>Confirma la codificación de cartera</translation> </message> @@ -120,10 +136,6 @@ <translation>Billetera codificada</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>Bitcoin se cerrará para finalizar el proceso de encriptación. Recuerde que encriptar su billetera no protegera completatamente sus bitcoins de ser robados por malware que infecte su computador</translation> - </message> - <message> <source>Wallet encryption failed</source> <translation>Falló la codificación de la billetera</translation> </message> @@ -211,6 +223,14 @@ <translation>&Cambiar la contraseña...</translation> </message> <message> + <source>Open &URI...</source> + <translation>Abrir y url...</translation> + </message> + <message> + <source>Bitcoin Core client</source> + <translation>cliente bitcoin core</translation> + </message> + <message> <source>Reindexing blocks on disk...</source> <translation>Cargando el index de bloques...</translation> </message> @@ -219,10 +239,6 @@ <translation>Enviar monedas a una dirección bitcoin</translation> </message> <message> - <source>Modify configuration options for Bitcoin</source> - <translation>Modifica las opciones de configuración de bitcoin</translation> - </message> - <message> <source>Backup wallet to another location</source> <translation>Respaldar billetera en otra ubicación</translation> </message> @@ -251,6 +267,10 @@ <translation>&Envía</translation> </message> <message> + <source>&Receive</source> + <translation>y recibir</translation> + </message> + <message> <source>&Show / Hide</source> <translation>&Mostrar/Ocultar</translation> </message> @@ -274,21 +294,9 @@ <source>Tabs toolbar</source> <translation>Barra de pestañas</translation> </message> - <message numerus="yes"> - <source>%n active connection(s) to Bitcoin network</source> - <translation><numerusform>%n conexión activa hacia la red Bitcoin</numerusform><numerusform>%n conexiones activas hacia la red Bitcoin</numerusform></translation> - </message> - <message numerus="yes"> - <source>%n hour(s)</source> - <translation><numerusform>%n hora</numerusform><numerusform>%n horas</numerusform></translation> - </message> - <message numerus="yes"> - <source>%n day(s)</source> - <translation><numerusform>%n día</numerusform><numerusform>%n días</numerusform></translation> - </message> - <message numerus="yes"> - <source>%n week(s)</source> - <translation><numerusform>%n semana</numerusform><numerusform>%n semanas</numerusform></translation> + <message> + <source>Bitcoin Core</source> + <translation>bitcoin core</translation> </message> <message> <source>Error</source> @@ -319,17 +327,6 @@ <translation>Transacción entrante</translation> </message> <message> - <source>Date: %1 -Amount: %2 -Type: %3 -Address: %4 -</source> - <translation>Fecha: %1 -Cantidad: %2 -Tipo: %3 -Dirección: %4</translation> - </message> - <message> <source>Wallet is <b>encrypted</b> and currently <b>unlocked</b></source> <translation>La billetera esta <b>codificada</b> y actualmente <b>desbloqueda</b></translation> </message> @@ -364,6 +361,10 @@ Dirección: %4</translation> <translation>Confirmado</translation> </message> <message> + <source>Priority</source> + <translation>prioridad</translation> + </message> + <message> <source>Copy address</source> <translation>Copia dirección</translation> </message> @@ -376,6 +377,18 @@ Dirección: %4</translation> <translation>Copiar Cantidad</translation> </message> <message> + <source>medium</source> + <translation>medio</translation> + </message> + <message> + <source>yes</source> + <translation>si</translation> + </message> + <message> + <source>no</source> + <translation>no</translation> + </message> + <message> <source>(no label)</source> <translation>(sin etiqueta)</translation> </message> @@ -437,6 +450,10 @@ Dirección: %4</translation> <context> <name>HelpMessageDialog</name> <message> + <source>Bitcoin Core</source> + <translation>bitcoin core</translation> + </message> + <message> <source>version</source> <translation>versión</translation> </message> @@ -444,18 +461,17 @@ Dirección: %4</translation> <source>Usage:</source> <translation>Uso:</translation> </message> + </context> +<context> + <name>Intro</name> <message> - <source>UI options</source> - <translation>UI opciones</translation> + <source>Welcome</source> + <translation>bienvenido</translation> </message> <message> - <source>Start minimized</source> - <translation>Arranca minimizado -</translation> + <source>Bitcoin Core</source> + <translation>bitcoin core</translation> </message> - </context> -<context> - <name>Intro</name> <message> <source>Error</source> <translation>Error</translation> @@ -463,6 +479,10 @@ Dirección: %4</translation> </context> <context> <name>OpenURIDialog</name> + <message> + <source>URI:</source> + <translation>url:</translation> + </message> </context> <context> <name>OptionsDialog</name> @@ -475,14 +495,6 @@ Dirección: %4</translation> <translation>&Principal</translation> </message> <message> - <source>Automatically start Bitcoin after logging in to the system.</source> - <translation>Inicia Bitcoin automáticamente despues de encender el computador</translation> - </message> - <message> - <source>&Start Bitcoin on system login</source> - <translation>&Inicia Bitcoin al iniciar el sistema</translation> - </message> - <message> <source>Reset all client options to default.</source> <translation>Reestablece todas las opciones.</translation> </message> @@ -491,6 +503,10 @@ Dirección: %4</translation> <translation>&Red</translation> </message> <message> + <source>Expert</source> + <translation>experto</translation> + </message> + <message> <source>Automatically open the Bitcoin client port on the router. This only works when your router supports UPnP and it is enabled.</source> <translation>Abre automáticamente el puerto del cliente Bitcoin en el router. Esto funciona solo cuando tu router es compatible con UPnP y está habilitado.</translation> </message> @@ -511,6 +527,11 @@ Dirección: %4</translation> <translation>Puerto del servidor proxy (ej. 9050)</translation> </message> <message> + <source>&Window</source> + <translation>y windows +</translation> + </message> + <message> <source>Show only a tray icon after minimizing the window.</source> <translation>Muestra solo un ícono en la bandeja después de minimizar la ventana</translation> </message> @@ -519,10 +540,6 @@ Dirección: %4</translation> <translation>&Minimiza a la bandeja en vez de la barra de tareas</translation> </message> <message> - <source>Minimize instead of exit the application when the window is closed. When this option is enabled, the application will be closed only after selecting Quit in the menu.</source> - <translation>Minimiza la ventana en lugar de salir del programa cuando la ventana se cierra. Cuando esta opción esta activa el programa solo se puede cerrar seleccionando Salir desde el menu.</translation> - </message> - <message> <source>M&inimize on close</source> <translation>M&inimiza a la bandeja al cerrar</translation> </message> @@ -621,6 +638,10 @@ Dirección: %4</translation> <translation>&Información</translation> </message> <message> + <source>General</source> + <translation>General</translation> + </message> + <message> <source>Startup time</source> <translation>Tiempo de inicio</translation> </message> @@ -641,6 +662,11 @@ Dirección: %4</translation> <translation>Bloquea cadena</translation> </message> <message> + <source>Version</source> + <translation>version +</translation> + </message> + <message> <source>&Open</source> <translation>&Abrir</translation> </message> @@ -773,10 +799,6 @@ Dirección: %4</translation> <translation>Copiar Cantidad</translation> </message> <message> - <source>The recipient address is not valid, please recheck.</source> - <translation>La dirección de destinatarion no es valida, comprueba otra vez.</translation> - </message> - <message> <source>The amount to pay must be larger than 0.</source> <translation>La cantidad por pagar tiene que ser mayor 0.</translation> </message> @@ -789,10 +811,6 @@ Dirección: %4</translation> <translation>El total sobrepasa tu saldo cuando se incluyen %1 como tasa de envio.</translation> </message> <message> - <source>Duplicate address found, can only send to each address once per send operation.</source> - <translation>Tienes una dirección duplicada, solo puedes enviar a direcciónes individuales de una sola vez.</translation> - </message> - <message> <source>(no label)</source> <translation>(sin etiqueta)</translation> </message> @@ -909,6 +927,10 @@ Dirección: %4</translation> <context> <name>SplashScreen</name> <message> + <source>Bitcoin Core</source> + <translation>bitcoin core</translation> + </message> + <message> <source>[testnet]</source> <translation>[red-de-pruebas]</translation> </message> @@ -1010,10 +1032,6 @@ Dirección: %4</translation> <source>, has not been successfully broadcast yet</source> <translation>, no ha sido emitido satisfactoriamente todavía</translation> </message> - <message numerus="yes"> - <source>Open for %n more block(s)</source> - <translation><numerusform>Abierto para %n bloque más</numerusform><numerusform>Abierto para %n bloques más</numerusform></translation> - </message> <message> <source>unknown</source> <translation>desconocido</translation> @@ -1041,10 +1059,6 @@ Dirección: %4</translation> <translation>Tipo</translation> </message> <message> - <source>Address</source> - <translation>Dirección</translation> - </message> - <message> <source>Open until %1</source> <translation>Abierto hasta %1</translation> </message> @@ -1061,6 +1075,10 @@ Dirección: %4</translation> <translation>Generado pero no acceptado</translation> </message> <message> + <source>Label</source> + <translation>Etiqueta</translation> + </message> + <message> <source>Received with</source> <translation>Recibido con</translation> </message> @@ -1097,10 +1115,6 @@ Dirección: %4</translation> <translation>Tipo de transacción.</translation> </message> <message> - <source>Destination address of transaction.</source> - <translation>Dirección de destino para la transacción</translation> - </message> - <message> <source>Amount removed from or added to balance.</source> <translation>Cantidad restada o añadida al balance</translation> </message> @@ -1236,6 +1250,10 @@ Dirección: %4</translation> <context> <name>WalletView</name> <message> + <source>&Export</source> + <translation>y exportar</translation> + </message> + <message> <source>Export the data in the current tab to a file</source> <translation>Exportar los datos de la pestaña actual a un archivo</translation> </message> @@ -1309,6 +1327,11 @@ Dirección: %4</translation> <translation>Enviar informacion de seguimiento a la consola en vez del archivo debug.log</translation> </message> <message> + <source>Start minimized</source> + <translation>Arranca minimizado +</translation> + </message> + <message> <source>Use UPnP to map the listening port (default: 1 when listening)</source> <translation>Intenta usar UPnP para mapear el puerto de escucha (default: 1 when listening)</translation> </message> @@ -1322,10 +1345,6 @@ Dirección: %4</translation> <translation>Atención</translation> </message> <message> - <source>Warning: This version is obsolete, upgrade required!</source> - <translation>Advertencia: Esta versión está obsoleta, se necesita actualizar!</translation> - </message> - <message> <source>wallet.dat corrupt, salvage failed</source> <translation>wallet.dat corrompió, guardado fallido</translation> </message> @@ -1379,10 +1398,6 @@ Dirección: %4</translation> <translation>Cantidad inválida para -paytxfee=<amount>: '%s'</translation> </message> <message> - <source>Invalid amount</source> - <translation>Cantidad inválida</translation> - </message> - <message> <source>Insufficient funds</source> <translation>Fondos insuficientes</translation> </message> @@ -1407,10 +1422,6 @@ Dirección: %4</translation> <translation>Carga completa</translation> </message> <message> - <source>To use the %s option</source> - <translation>Para utilizar la opción %s</translation> - </message> - <message> <source>Error</source> <translation>Error</translation> </message> diff --git a/src/qt/locale/bitcoin_es_DO.ts b/src/qt/locale/bitcoin_es_DO.ts index 2e5daf4cdb..c5b1e41886 100644 --- a/src/qt/locale/bitcoin_es_DO.ts +++ b/src/qt/locale/bitcoin_es_DO.ts @@ -1,11 +1,7 @@ -<TS language="es_DO" version="2.0"> +<TS language="es_DO" version="2.1"> <context> <name>AddressBookPage</name> <message> - <source>Double-click to edit address or label</source> - <translation>Haga doble clic para editar una dirección o etiqueta</translation> - </message> - <message> <source>Create a new address</source> <translation>Crear una nueva dirección</translation> </message> @@ -152,10 +148,6 @@ <translation>Cambiar contraseña</translation> </message> <message> - <source>Enter the old and new passphrase to the wallet.</source> - <translation>Introduzca la contraseña anterior de la cartera y la nueva. </translation> - </message> - <message> <source>Confirm wallet encryption</source> <translation>Confirmar cifrado de la cartera</translation> </message> @@ -180,10 +172,6 @@ <translation>Monedero cifrado</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>Bitcoin se cerrará para finalizar el proceso de cifrado. Recuerde que el cifrado de su monedero no puede proteger totalmente sus bitcoins de robo por malware que infecte su sistema.</translation> - </message> - <message> <source>Wallet encryption failed</source> <translation>Ha fallado el cifrado del monedero</translation> </message> @@ -299,10 +287,6 @@ <translation>Enviar monedas a una dirección Bitcoin</translation> </message> <message> - <source>Modify configuration options for Bitcoin</source> - <translation>Modificar las opciones de configuración de Bitcoin</translation> - </message> - <message> <source>Backup wallet to another location</source> <translation>Copia de seguridad del monedero en otra ubicación</translation> </message> @@ -447,18 +431,6 @@ <translation>Transacción entrante</translation> </message> <message> - <source>Date: %1 -Amount: %2 -Type: %3 -Address: %4 -</source> - <translation>Fecha: %1 -Cantidad: %2 -Tipo: %3 -Dirección: %4 -</translation> - </message> - <message> <source>Wallet is <b>encrypted</b> and currently <b>unlocked</b></source> <translation>El monedero está <b>cifrado</b> y actualmente <b>desbloqueado</b></translation> </message> @@ -637,10 +609,6 @@ Dirección: %4 <translation>no</translation> </message> <message> - <source>This label turns red, if the transaction size is greater than 1000 bytes.</source> - <translation>Esta etiqueta se torna roja si el tamaño de la transación es mayor a 1000 bytes.</translation> - </message> - <message> <source>This means a fee of at least %1 per kB is required.</source> <translation>Esto implica que se requiere una tarifa de al menos %1 por kB</translation> </message> @@ -653,14 +621,6 @@ Dirección: %4 <translation>Las transacciones con alta prioridad son más propensas a ser incluidas dentro de un bloque.</translation> </message> <message> - <source>This label turns red, if the priority is smaller than "medium".</source> - <translation>Esta etiqueta se convierte en rojo, si la prioridad es menor que "medio".</translation> - </message> - <message> - <source>This label turns red, if any recipient receives an amount smaller than %1.</source> - <translation>Esta etiqueta se torna roja si cualquier destinatario recibe una cantidad menor a %1.</translation> - </message> - <message> <source>(no label)</source> <translation>(sin etiqueta)</translation> </message> @@ -777,26 +737,6 @@ Dirección: %4 <source>command-line options</source> <translation>opciones de la línea de órdenes</translation> </message> - <message> - <source>UI options</source> - <translation>Opciones GUI</translation> - </message> - <message> - <source>Set language, for example "de_DE" (default: system locale)</source> - <translation>Establecer el idioma, por ejemplo, "es_ES" (predeterminado: configuración regional del sistema)</translation> - </message> - <message> - <source>Start minimized</source> - <translation>Arrancar minimizado</translation> - </message> - <message> - <source>Show splash screen on startup (default: 1)</source> - <translation>Mostrar pantalla de bienvenida en el inicio (predeterminado: 1)</translation> - </message> - <message> - <source>Choose data directory on startup (default: 0)</source> - <translation>Elegir directorio de datos al iniciar (predeterminado: 0)</translation> - </message> </context> <context> <name>Intro</name> @@ -867,14 +807,6 @@ Dirección: %4 <translation>&Principal</translation> </message> <message> - <source>Automatically start Bitcoin after logging in to the system.</source> - <translation>Iniciar Bitcoin automáticamente al encender el sistema.</translation> - </message> - <message> - <source>&Start Bitcoin on system login</source> - <translation>&Iniciar Bitcoin al iniciar el sistema</translation> - </message> - <message> <source>MB</source> <translation>MB</translation> </message> @@ -931,10 +863,6 @@ Dirección: %4 <translation>&Minimizar a la bandeja en vez de a la barra de tareas</translation> </message> <message> - <source>Minimize instead of exit the application when the window is closed. When this option is enabled, the application will be closed only after selecting Quit in the menu.</source> - <translation>Minimizar en lugar de salir de la aplicación al cerrar la ventana. Cuando esta opción está activa, la aplicación solo se puede cerrar seleccionando Salir desde el menú.</translation> - </message> - <message> <source>M&inimize on close</source> <translation>M&inimizar al cerrar</translation> </message> @@ -947,10 +875,6 @@ Dirección: %4 <translation>I&dioma de la interfaz de usuario</translation> </message> <message> - <source>The user interface language can be set here. This setting will take effect after restarting Bitcoin.</source> - <translation>El idioma de la interfaz de usuario puede establecerse aquí. Este ajuste se aplicará cuando se reinicie Bitcoin.</translation> - </message> - <message> <source>&Unit to show amounts in:</source> <translation>Mostrar las cantidades en la &unidad:</translation> </message> @@ -1217,18 +1141,10 @@ Dirección: %4 <translation>Archivo de registro de depuración</translation> </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>Abrir el archivo de registro de depuración en el directorio actual de datos. Esto puede llevar varios segundos para archivos de registro grandes.</translation> - </message> - <message> <source>Clear console</source> <translation>Borrar consola</translation> </message> <message> - <source>Welcome to the Bitcoin RPC console.</source> - <translation>Bienvenido a la consola RPC de Bitcoin</translation> - </message> - <message> <source>Use up and down arrows to navigate history, and <b>Ctrl-L</b> to clear screen.</source> <translation>Use las flechas arriba y abajo para navegar por el historial y <b>Control+L</b> para limpiar la pantalla.</translation> </message> @@ -1525,10 +1441,6 @@ Dirección: %4 <translation>o</translation> </message> <message> - <source>The recipient address is not valid, please recheck.</source> - <translation>La dirección de recepción no es válida, compruébela de nuevo.</translation> - </message> - <message> <source>The amount to pay must be larger than 0.</source> <translation>La cantidad por pagar tiene que ser mayor de 0.</translation> </message> @@ -1541,10 +1453,6 @@ Dirección: %4 <translation>El total sobrepasa su saldo cuando se incluye la tasa de envío de %1</translation> </message> <message> - <source>Duplicate address found, can only send to each address once per send operation.</source> - <translation>Se ha encontrado una dirección duplicada. Solo se puede enviar a cada dirección una vez por operación de envío.</translation> - </message> - <message> <source>Transaction creation failed!</source> <translation>¡Ha fallado la creación de la transacción!</translation> </message> @@ -1616,18 +1524,10 @@ Dirección: %4 <translation>Eliminar esta transacción</translation> </message> <message> - <source>This is a verified payment request.</source> - <translation>Esto es una petición de pago verificado.</translation> - </message> - <message> <source>Enter a label for this address to add it to the list of used addresses</source> <translation>Introduce una etiqueta para esta dirección para añadirla a la lista de direcciones utilizadas</translation> </message> <message> - <source>This is an unverified payment request.</source> - <translation>Esto es una petición de pago no verificado.</translation> - </message> - <message> <source>Pay To:</source> <translation>Paga a:</translation> </message> @@ -1650,10 +1550,6 @@ Dirección: %4 <translation>&Firmar mensaje</translation> </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>Puede firmar mensajes con sus direcciones para demostrar que las posee. Tenga cuidado de no firmar cualquier cosa vaga, ya que los ataques de phishing pueden tratar de engañarle para suplantar su identidad. Firme solo declaraciones totalmente detalladas con las que usted esté de acuerdo.</translation> - </message> - <message> <source>Choose previously used address</source> <translation>Escoger dirección previamente usada</translation> </message> @@ -1702,10 +1598,6 @@ Dirección: %4 <translation>&Verificar mensaje</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>Introduzca la dirección para la firma, el mensaje (asegurándose de copiar tal cual los saltos de línea, espacios, tabulaciones, etc.) y la firma a continuación para verificar el mensaje. Tenga cuidado de no asumir más información de lo que dice el propio mensaje firmado para evitar fraudes basados en ataques de tipo man-in-the-middle.</translation> - </message> - <message> <source>Verify the message to ensure it was signed with the specified Bitcoin address</source> <translation>Verificar el mensaje para comprobar que fue firmado con la dirección Bitcoin indicada</translation> </message> @@ -1937,10 +1829,6 @@ Dirección: %4 <translation>Tipo</translation> </message> <message> - <source>Address</source> - <translation>Dirección</translation> - </message> - <message> <source>Open until %1</source> <translation>Abierto hasta %1</translation> </message> @@ -1957,6 +1845,10 @@ Dirección: %4 <translation>Generado pero no aceptado</translation> </message> <message> + <source>Label</source> + <translation>Etiqueta</translation> + </message> + <message> <source>Received with</source> <translation>Recibido con</translation> </message> @@ -1993,10 +1885,6 @@ Dirección: %4 <translation>Tipo de transacción.</translation> </message> <message> - <source>Destination address of transaction.</source> - <translation>Dirección de destino de la transacción.</translation> - </message> - <message> <source>Amount removed from or added to balance.</source> <translation>Cantidad retirada o añadida al saldo.</translation> </message> @@ -2231,42 +2119,10 @@ Dirección: %4 <translation>Aceptar conexiones desde el exterior (predeterminado: 1 si no -proxy o -connect)</translation> </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>%s, debe establecer un valor rpcpassword en el archivo de configuración: -%s -Se recomienda utilizar la siguiente contraseña aleatoria: -rpcuser=bitcoinrpc -rpcpassword=%s -(no es necesario recordar esta contraseña) -El nombre de usuario y la contraseña DEBEN NO ser iguales. -Si el archivo no existe, créelo con permisos de archivo de solo lectura. -Se recomienda también establecer alertnotify para recibir notificaciones de problemas. -Por ejemplo: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo.com -</translation> - </message> - <message> <source>Bind to given address and always listen on it. Use [host]:port notation for IPv6</source> <translation>Vincular a la dirección dada y escuchar siempre en ella. Utilice la notación [host]:port para IPv6</translation> </message> <message> - <source>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>¡Error: se ha rechazado la transacción! Esto puede ocurrir si ya se han gastado algunas de las monedas del monedero, como ocurriría si hubiera hecho una copia de wallet.dat y se hubieran gastado monedas a partir de la copia, con lo que no se habrían marcado aquí como gastadas.</translation> - </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>¡Error: Esta transacción requiere una comisión de al menos %s debido a su monto, complejidad, o al uso de fondos recién recibidos!</translation> - </message> - <message> <source>Execute command when a wallet transaction changes (%s in cmd is replaced by TxID)</source> <translation>Ejecutar comando cuando una transacción del monedero cambia (%s en cmd se remplazará por TxID)</translation> </message> @@ -2315,10 +2171,6 @@ Por ejemplo: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo.com <translation>Corrupción de base de datos de bloques detectada.</translation> </message> <message> - <source>Discover own IP address (default: 1 when listening and no -externalip)</source> - <translation>Descubrir dirección IP propia (predeterminado: 1 al escuchar sin -externalip)</translation> - </message> - <message> <source>Do you want to rebuild the block database now?</source> <translation>¿Quieres reconstruir la base de datos de bloques ahora?</translation> </message> @@ -2343,10 +2195,6 @@ Por ejemplo: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo.com <translation>Error: ¡Espacio en disco bajo!</translation> </message> <message> - <source>Error: Wallet locked, unable to create transaction!</source> - <translation>Error: ¡El monedero está bloqueado; no se puede crear la transacción!</translation> - </message> - <message> <source>Failed to listen on any port. Use -listen=0 if you want this.</source> <translation>Ha fallado la escucha en todos los puertos. Use -listen=0 si desea esto.</translation> </message> @@ -2367,10 +2215,6 @@ Por ejemplo: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo.com <translation>No hay suficientes descriptores de archivo disponibles. </translation> </message> <message> - <source>Rebuild block chain index from current blk000??.dat files</source> - <translation>Reconstruir el índice de la cadena de bloques a partir de los archivos blk000??.dat actuales</translation> - </message> - <message> <source>Set maximum block size in bytes (default: %d)</source> <translation>Establecer tamaño máximo de bloque en bytes (por defecto: %d)</translation> </message> @@ -2407,6 +2251,10 @@ Por ejemplo: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo.com <translation>Establecer tamaño máximo de las transacciones de alta prioridad/comisión baja en bytes (por defecto: %d)</translation> </message> <message> + <source>Choose data directory on startup (default: 0)</source> + <translation>Elegir directorio de datos al iniciar (predeterminado: 0)</translation> + </message> + <message> <source>Information</source> <translation>Información</translation> </message> @@ -2419,10 +2267,34 @@ Por ejemplo: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo.com <translation>Inválido por el monto -mintxfee=<amount>: '%s'</translation> </message> <message> + <source>RPC SSL options: (see the Bitcoin Wiki for SSL setup instructions)</source> + <translation>Opciones RPC SSL: (Vea la Wiki de Bitcoin para las instrucciones de la configuración de SSL)</translation> + </message> + <message> + <source>RPC server options:</source> + <translation>Opciones del sservidor RPC:</translation> + </message> + <message> + <source>Randomly drop 1 of every <n> network messages</source> + <translation>Descartar aleatoriamente 1 de cada <n> mensajes de red</translation> + </message> + <message> <source>Send trace/debug info to console instead of debug.log file</source> <translation>Enviar información de trazas/depuración a la consola en lugar de al archivo debug.log</translation> </message> <message> + <source>Set language, for example "de_DE" (default: system locale)</source> + <translation>Establecer el idioma, por ejemplo, "es_ES" (predeterminado: configuración regional del sistema)</translation> + </message> + <message> + <source>Show all debugging options (usage: --help -help-debug)</source> + <translation>Mostrar todas las opciones de depuración (uso: --help -help-debug)</translation> + </message> + <message> + <source>Show splash screen on startup (default: 1)</source> + <translation>Mostrar pantalla de bienvenida en el inicio (predeterminado: 1)</translation> + </message> + <message> <source>Shrink debug.log file on client startup (default: 1 when no -debug)</source> <translation>Reducir el archivo debug.log al iniciar el cliente (predeterminado: 1 sin -debug)</translation> </message> @@ -2431,6 +2303,10 @@ Por ejemplo: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo.com <translation>Transacción falló</translation> </message> <message> + <source>Start minimized</source> + <translation>Arrancar minimizado</translation> + </message> + <message> <source>Transaction amount too small</source> <translation>Monto de la transacción muy pequeño</translation> </message> @@ -2456,8 +2332,8 @@ Por ejemplo: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo.com <translation>Aviso</translation> </message> <message> - <source>Warning: This version is obsolete, upgrade required!</source> - <translation>Aviso: Esta versión es obsoleta, actualización necesaria!</translation> + <source>on startup</source> + <translation>al iniciar</translation> </message> <message> <source>wallet.dat corrupt, salvage failed</source> @@ -2527,10 +2403,6 @@ Por ejemplo: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo.com <translation>Cantidad inválida para -paytxfee=<amount>: '%s'</translation> </message> <message> - <source>Invalid amount</source> - <translation>Cuantía no válida</translation> - </message> - <message> <source>Insufficient funds</source> <translation>Fondos insuficientes</translation> </message> @@ -2563,10 +2435,6 @@ Por ejemplo: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo.com <translation>Generado pero no aceptado</translation> </message> <message> - <source>To use the %s option</source> - <translation>Para utilizar la opción %s</translation> - </message> - <message> <source>Error</source> <translation>Error</translation> </message> diff --git a/src/qt/locale/bitcoin_es_MX.ts b/src/qt/locale/bitcoin_es_MX.ts index bedc5d243e..4238330105 100644 --- a/src/qt/locale/bitcoin_es_MX.ts +++ b/src/qt/locale/bitcoin_es_MX.ts @@ -1,11 +1,7 @@ -<TS language="es_MX" version="2.0"> +<TS language="es_MX" version="2.1"> <context> <name>AddressBookPage</name> <message> - <source>Double-click to edit address or label</source> - <translation>Haga doble clic para editar el domicilio o la etiqueta</translation> - </message> - <message> <source>Create a new address</source> <translation>Crear una dirección nueva</translation> </message> @@ -87,11 +83,11 @@ </message> <message> <source>Comma separated file (*.csv)</source> - <translation>Archivo separado por comas (*.CSV)</translation> + <translation>Arhchivo separado por comas (*.CSV)</translation> </message> <message> <source>Exporting Failed</source> - <translation>Fallo en la exportación</translation> + <translation>Exportación fallida</translation> </message> </context> <context> @@ -125,7 +121,7 @@ </message> <message> <source>Encrypt wallet</source> - <translation>Cartera encriptada.</translation> + <translation>Encriptar cartera.</translation> </message> <message> <source>This operation needs your wallet passphrase to unlock the wallet.</source> @@ -141,17 +137,13 @@ </message> <message> <source>Decrypt wallet</source> - <translation>Desencriptar la cartera</translation> + <translation>Desencriptar cartera</translation> </message> <message> <source>Change passphrase</source> <translation>Cambiar contraseña</translation> </message> <message> - <source>Enter the old and new passphrase to the wallet.</source> - <translation>Ingrese la antugüa y nueva contraseña de la cartera</translation> - </message> - <message> <source>Confirm wallet encryption</source> <translation>Confirmar la encriptación de cartera</translation> </message> @@ -172,12 +164,8 @@ <translation>Cartera encriptada</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>Bitcoin se cerrará para finalizar el proceso de encriptación. Recuerda que encriptar tu cartera no protege completamente a tus bitcoins de ser robadas por malware infectando tu computadora.</translation> - </message> - <message> <source>Wallet encryption failed</source> - <translation>La encriptación de la cartera falló</translation> + <translation>Encriptación de la cartera fallida</translation> </message> <message> <source>Wallet encryption failed due to an internal error. Your wallet was not encrypted.</source> @@ -189,11 +177,11 @@ </message> <message> <source>Wallet unlock failed</source> - <translation>El desbloqueo de la cartera Fallo</translation> + <translation>El desbloqueo de la cartera falló</translation> </message> <message> <source>The passphrase entered for the wallet decryption was incorrect.</source> - <translation>La contraseña ingresada para la des encriptación de la cartera es incorrecto</translation> + <translation>La contraseña ingresada para la desencriptación de la cartera es incorrecto</translation> </message> <message> <source>Wallet decryption failed</source> @@ -291,10 +279,6 @@ <translation>Enviar monedas a una dirección Bitcoin</translation> </message> <message> - <source>Modify configuration options for Bitcoin</source> - <translation>Modificar las opciones de configuración de Bitcoin</translation> - </message> - <message> <source>Backup wallet to another location</source> <translation>Respaldar cartera en otra ubicación</translation> </message> @@ -342,10 +326,6 @@ <source>Show the Bitcoin Core help message to get a list with possible Bitcoin command-line options</source> <translation>Mostrar mensaje de ayuda del nucleo de Bitcoin para optener una lista con los posibles comandos de Bitcoin</translation> </message> - <message numerus="yes"> - <source>%n active connection(s) to Bitcoin network</source> - <translation><numerusform>%n Activar conexión a la red de Bitcoin</numerusform><numerusform>%n Activar conexiones a la red de Bitcoin</numerusform></translation> - </message> <message> <source>Up to date</source> <translation>Actualizado al dia </translation> @@ -517,26 +497,6 @@ <source>command-line options</source> <translation>Opciones de comando de lineas</translation> </message> - <message> - <source>UI options</source> - <translation>Opciones de interfaz</translation> - </message> - <message> - <source>Set language, for example "de_DE" (default: system locale)</source> - <translation>Definir idioma, por ejemplo "de_DE" (por defecto: Sistema local)</translation> - </message> - <message> - <source>Start minimized</source> - <translation>Iniciar minimizado</translation> - </message> - <message> - <source>Show splash screen on startup (default: 1)</source> - <translation>Mostrar pantalla de arraque al iniciar (por defecto: 1)</translation> - </message> - <message> - <source>Choose data directory on startup (default: 0)</source> - <translation>Escojer el directorio de información al iniciar (por defecto : 0)</translation> - </message> </context> <context> <name>Intro</name> @@ -788,14 +748,6 @@ <translation>Mensaje:</translation> </message> <message> - <source>This is a verified payment request.</source> - <translation>Esta es una verificación de solicituda de pago.</translation> - </message> - <message> - <source>This is an unverified payment request.</source> - <translation>Esta es una solicitud de pago no verificada.</translation> - </message> - <message> <source>Pay To:</source> <translation>Pago para:</translation> </message> @@ -834,7 +786,7 @@ </message> <message> <source>The Bitcoin Core developers</source> - <translation>El nucleo de Bitcoin de desarrolladores</translation> + <translation>Los desarrolladores de Bitcoin Core</translation> </message> </context> <context> @@ -897,10 +849,6 @@ <translation>Tipo</translation> </message> <message> - <source>Address</source> - <translation>Domicilio</translation> - </message> - <message> <source>Open until %1</source> <translation>Abrir hasta %1</translation> </message> @@ -917,6 +865,10 @@ <translation>Generado pero no aprovado</translation> </message> <message> + <source>Label</source> + <translation>Etiqueta</translation> + </message> + <message> <source>Received with</source> <translation>Recivido con</translation> </message> @@ -930,7 +882,7 @@ </message> <message> <source>Mined</source> - <translation>Minado</translation> + <translation>Minado </translation> </message> <message> <source>(n/a)</source> @@ -945,10 +897,6 @@ <translation>Escriba una transacción</translation> </message> <message> - <source>Destination address of transaction.</source> - <translation>Direccion del destinatario de la transacción</translation> - </message> - <message> <source>Amount removed from or added to balance.</source> <translation>Cantidad removida del saldo o agregada </translation> </message> @@ -1029,7 +977,7 @@ </message> <message> <source>Exporting Failed</source> - <translation>Fallo en la exportación</translation> + <translation>Exportación fallida</translation> </message> <message> <source>There was an error trying to save the transaction history to %1.</source> @@ -1115,6 +1063,22 @@ <translation>Opciones de cartera:</translation> </message> <message> + <source>Choose data directory on startup (default: 0)</source> + <translation>Escojer el directorio de información al iniciar (por defecto : 0)</translation> + </message> + <message> + <source>Set language, for example "de_DE" (default: system locale)</source> + <translation>Definir idioma, por ejemplo "de_DE" (por defecto: Sistema local)</translation> + </message> + <message> + <source>Show splash screen on startup (default: 1)</source> + <translation>Mostrar pantalla de arraque al iniciar (por defecto: 1)</translation> + </message> + <message> + <source>Start minimized</source> + <translation>Iniciar minimizado</translation> + </message> + <message> <source>Loading addresses...</source> <translation>Cargando direcciones...</translation> </message> diff --git a/src/qt/locale/bitcoin_es_UY.ts b/src/qt/locale/bitcoin_es_UY.ts index a5a1583b19..48a6f35f92 100644 --- a/src/qt/locale/bitcoin_es_UY.ts +++ b/src/qt/locale/bitcoin_es_UY.ts @@ -1,11 +1,7 @@ -<TS language="es_UY" version="2.0"> +<TS language="es_UY" version="2.1"> <context> <name>AddressBookPage</name> <message> - <source>Double-click to edit address or label</source> - <translation>Doble clic para editar etiqueta o dirección </translation> - </message> - <message> <source>Create a new address</source> <translation>Crear una nueva dirección </translation> </message> @@ -76,10 +72,6 @@ <translation>Cambiar contraseña</translation> </message> <message> - <source>Enter the old and new passphrase to the wallet.</source> - <translation>Ingrese la contraseña anterior y la nueva de acceso a el monedero</translation> - </message> - <message> <source>Confirm wallet encryption</source> <translation>Confirme el cifrado del monedero</translation> </message> @@ -162,10 +154,6 @@ <source>Tabs toolbar</source> <translation>Barra de herramientas</translation> </message> - <message numerus="yes"> - <source>%n active connection(s) to Bitcoin network</source> - <translation><numerusform>%n conexión activa a la red Bitcoin </numerusform><numerusform>%n conexiones activas a la red Bitcoin</numerusform></translation> - </message> <message> <source>Up to date</source> <translation>A la fecha</translation> @@ -433,13 +421,13 @@ <translation>Fecha</translation> </message> <message> - <source>Address</source> - <translation>Direccion </translation> - </message> - <message> <source>Open until %1</source> <translation>Abrir hasta %1</translation> </message> + <message> + <source>Label</source> + <translation>Etiqueta</translation> + </message> </context> <context> <name>TransactionView</name> diff --git a/src/qt/locale/bitcoin_et.ts b/src/qt/locale/bitcoin_et.ts index 801fcf6258..4a502f1a54 100644 --- a/src/qt/locale/bitcoin_et.ts +++ b/src/qt/locale/bitcoin_et.ts @@ -1,21 +1,29 @@ -<TS language="et" version="2.0"> +<TS language="et" version="2.1"> <context> <name>AddressBookPage</name> <message> - <source>Double-click to edit address or label</source> - <translation>Topeltklõps aadressi või märgise muutmiseks</translation> - </message> - <message> <source>Create a new address</source> <translation>Loo uus aadress</translation> </message> <message> + <source>&New</source> + <translation>&Uus</translation> + </message> + <message> <source>Copy the currently selected address to the system clipboard</source> <translation>Kopeeri märgistatud aadress vahemällu</translation> </message> <message> + <source>&Copy</source> + <translation>&Kopeeri</translation> + </message> + <message> + <source>C&lose</source> + <translation>S&ulge</translation> + </message> + <message> <source>&Copy Address</source> - <translation>&Aadressi kopeerimine</translation> + <translation>&Kopeeri Aadress</translation> </message> <message> <source>Delete the currently selected address from the list</source> @@ -26,10 +34,18 @@ <translation>Ekspordi kuvatava vahelehe sisu faili</translation> </message> <message> + <source>&Export</source> + <translation>&Ekspordi</translation> + </message> + <message> <source>&Delete</source> <translation>&Kustuta</translation> </message> <message> + <source>C&hoose</source> + <translation>V&ali</translation> + </message> + <message> <source>These are your Bitcoin addresses for sending payments. Always check the amount and the receiving address before sending coins.</source> <translation>Need on sinu Bitcoini aadressid maksete saatmiseks. Müntide saatmisel kontrolli alati summat ning saaja aadressi.</translation> </message> @@ -45,6 +61,10 @@ <source>Comma separated file (*.csv)</source> <translation>Komaeraldatud fail (*.csv)</translation> </message> + <message> + <source>Exporting Failed</source> + <translation>Eksportimine Ebaõnnestus</translation> + </message> </context> <context> <name>AddressTableModel</name> @@ -104,10 +124,6 @@ <translation>Muuda salafraasi</translation> </message> <message> - <source>Enter the old and new passphrase to the wallet.</source> - <translation>Sisesta rahakoti vana ning uus salafraas.</translation> - </message> - <message> <source>Confirm wallet encryption</source> <translation>Kinnita rahakoti krüpteering</translation> </message> @@ -132,10 +148,6 @@ <translation>Rahakott krüpteeritud</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>Bitcoin sulgub krüpteeringu lõpetamiseks. Pea meeles, et rahakoti krüpteerimine ei välista bitcoinide vargust, kui sinu arvuti on nakatunud pahavaraga.</translation> - </message> - <message> <source>Wallet encryption failed</source> <translation>Tõrge rahakoti krüpteerimisel</translation> </message> @@ -223,6 +235,10 @@ <translation>&Salafraasi muutmine</translation> </message> <message> + <source>Open &URI...</source> + <translation>Ava &URI...</translation> + </message> + <message> <source>Importing blocks from disk...</source> <translation>Impordi blokid kettalt...</translation> </message> @@ -235,10 +251,6 @@ <translation>Saada münte Bitcoini aadressile</translation> </message> <message> - <source>Modify configuration options for Bitcoin</source> - <translation>Muuda Bitcoini seadeid</translation> - </message> - <message> <source>Backup wallet to another location</source> <translation>Varunda rahakott teise asukohta</translation> </message> @@ -315,10 +327,6 @@ <translation>Bitcoini tuumik</translation> </message> <message numerus="yes"> - <source>%n active connection(s) to Bitcoin network</source> - <translation><numerusform>%n aktiivne ühendus Bitcoini võrku</numerusform><numerusform>%n aktiivset ühendust Bitcoini võrku</numerusform></translation> - </message> - <message numerus="yes"> <source>%n hour(s)</source> <translation><numerusform>%n tund</numerusform><numerusform>%n tundi</numerusform></translation> </message> @@ -331,6 +339,14 @@ <translation><numerusform>%n nädal</numerusform><numerusform>%n nädalat</numerusform></translation> </message> <message> + <source>%1 and %2</source> + <translation>%1 ja %2</translation> + </message> + <message numerus="yes"> + <source>%n year(s)</source> + <translation><numerusform>%n aasta</numerusform><numerusform>%n aastat</numerusform></translation> + </message> + <message> <source>%1 behind</source> <translation>%1 maas</translation> </message> @@ -363,6 +379,36 @@ <translation>Jõuan...</translation> </message> <message> + <source>Date: %1 +</source> + <translation>Kuupäev: %1 +</translation> + </message> + <message> + <source>Amount: %1 +</source> + <translation>Summa: %1 +</translation> + </message> + <message> + <source>Type: %1 +</source> + <translation>Tüüp: %1 +</translation> + </message> + <message> + <source>Label: %1 +</source> + <translation>&Märgis: %1 +</translation> + </message> + <message> + <source>Address: %1 +</source> + <translation>Aadress: %1 +</translation> + </message> + <message> <source>Sent transaction</source> <translation>Saadetud tehing</translation> </message> @@ -371,17 +417,6 @@ <translation>Sisenev tehing</translation> </message> <message> - <source>Date: %1 -Amount: %2 -Type: %3 -Address: %4 -</source> - <translation>Kuupäev: %1⏎ -Summa: %2⏎ -Tüüp: %3⏎ -Aadress: %4⏎</translation> - </message> - <message> <source>Wallet is <b>encrypted</b> and currently <b>unlocked</b></source> <translation>Rahakott on <b>krüpteeritud</b> ning hetkel <b>avatud</b></translation> </message> @@ -400,10 +435,18 @@ Aadress: %4⏎</translation> <context> <name>CoinControlDialog</name> <message> + <source>Quantity:</source> + <translation>Kogus:</translation> + </message> + <message> <source>Amount:</source> <translation>Summa:</translation> </message> <message> + <source>Fee:</source> + <translation>Tasu:</translation> + </message> + <message> <source>Amount</source> <translation>Kogus</translation> </message> @@ -432,6 +475,50 @@ Aadress: %4⏎</translation> <translation>Kopeeri tehingu ID</translation> </message> <message> + <source>Copy fee</source> + <translation>Kopeeri tasu</translation> + </message> + <message> + <source>highest</source> + <translation>kõrgeim</translation> + </message> + <message> + <source>higher</source> + <translation>kõrgem</translation> + </message> + <message> + <source>high</source> + <translation>kõrge</translation> + </message> + <message> + <source>medium</source> + <translation>keskmine</translation> + </message> + <message> + <source>low</source> + <translation>madal</translation> + </message> + <message> + <source>lower</source> + <translation>madalam</translation> + </message> + <message> + <source>lowest</source> + <translation>madalaim</translation> + </message> + <message> + <source>(%1 locked)</source> + <translation>(%1 lukustatud)</translation> + </message> + <message> + <source>yes</source> + <translation>jah</translation> + </message> + <message> + <source>no</source> + <translation>ei</translation> + </message> + <message> <source>(no label)</source> <translation>(silti pole)</translation> </message> @@ -485,6 +572,10 @@ Aadress: %4⏎</translation> </context> <context> <name>FreespaceChecker</name> + <message> + <source>name</source> + <translation>nimi</translation> + </message> </context> <context> <name>HelpMessageDialog</name> @@ -497,6 +588,10 @@ Aadress: %4⏎</translation> <translation>versioon</translation> </message> <message> + <source>About Bitcoin Core</source> + <translation>Kirjeldus Bitcoini Tuumast</translation> + </message> + <message> <source>Command-line options</source> <translation>Käsurea valikud</translation> </message> @@ -508,26 +603,14 @@ Aadress: %4⏎</translation> <source>command-line options</source> <translation>käsurea valikud</translation> </message> - <message> - <source>UI options</source> - <translation>UI valikud</translation> - </message> - <message> - <source>Set language, for example "de_DE" (default: system locale)</source> - <translation>Keele valik, nt "ee_ET" (vaikeväärtus: system locale)</translation> - </message> - <message> - <source>Start minimized</source> - <translation>Käivitu tegumiribale</translation> - </message> - <message> - <source>Show splash screen on startup (default: 1)</source> - <translation>Käivitamisel teabeakna kuvamine (vaikeväärtus: 1)</translation> - </message> - </context> +</context> <context> <name>Intro</name> <message> + <source>Welcome</source> + <translation>Teretulemast</translation> + </message> + <message> <source>Bitcoin Core</source> <translation>Bitcoini tuumik</translation> </message> @@ -538,6 +621,14 @@ Aadress: %4⏎</translation> </context> <context> <name>OpenURIDialog</name> + <message> + <source>Open URI</source> + <translation>Ava URI</translation> + </message> + <message> + <source>URI:</source> + <translation>URI:</translation> + </message> </context> <context> <name>OptionsDialog</name> @@ -546,12 +637,8 @@ Aadress: %4⏎</translation> <translation>Valikud</translation> </message> <message> - <source>Automatically start Bitcoin after logging in to the system.</source> - <translation>Käivita Bitcoin süsteemi logimisel.</translation> - </message> - <message> - <source>&Start Bitcoin on system login</source> - <translation>&Start Bitcoin sisselogimisel</translation> + <source>MB</source> + <translation>MB</translation> </message> <message> <source>Reset all client options to default.</source> @@ -566,6 +653,14 @@ Aadress: %4⏎</translation> <translation>&Võrk</translation> </message> <message> + <source>W&allet</source> + <translation>R&ahakott</translation> + </message> + <message> + <source>Expert</source> + <translation>Ekspert</translation> + </message> + <message> <source>Automatically open the Bitcoin client port on the router. This only works when your router supports UPnP and it is enabled.</source> <translation>Bitcoini kliendi pordi automaatne avamine ruuteris. Toimib, kui sinu ruuter aktsepteerib UPnP ühendust.</translation> </message> @@ -598,10 +693,6 @@ Aadress: %4⏎</translation> <translation>&Minimeeri systray alale</translation> </message> <message> - <source>Minimize instead of exit the application when the window is closed. When this option is enabled, the application will be closed only after selecting Quit in the menu.</source> - <translation>Sulgemise asemel minimeeri aken. Selle valiku tegemisel suletakse programm Menüüst "Välju" käsuga.</translation> - </message> - <message> <source>M&inimize on close</source> <translation>M&inimeeri sulgemisel</translation> </message> @@ -614,10 +705,6 @@ Aadress: %4⏎</translation> <translation>Kasutajaliidese &keel:</translation> </message> <message> - <source>The user interface language can be set here. This setting will take effect after restarting Bitcoin.</source> - <translation>Kasutajaliidese keele valimise koht. Valik rakendub Bitcoini käivitamisel.</translation> - </message> - <message> <source>&Unit to show amounts in:</source> <translation>Summade kuvamise &Unit:</translation> </message> @@ -665,6 +752,10 @@ Aadress: %4⏎</translation> <translation>Mitte aegunud mine'itud jääk</translation> </message> <message> + <source>Recent transactions</source> + <translation>Hiljutised tehingud</translation> + </message> + <message> <source>out of sync</source> <translation>sünkimata</translation> </message> @@ -720,6 +811,10 @@ Aadress: %4⏎</translation> <translation>&Informatsioon</translation> </message> <message> + <source>General</source> + <translation>Üldine</translation> + </message> + <message> <source>Using OpenSSL version</source> <translation>Kasutan OpenSSL versiooni</translation> </message> @@ -732,6 +827,10 @@ Aadress: %4⏎</translation> <translation>Võrgustik</translation> </message> <message> + <source>Name</source> + <translation>Nimi</translation> + </message> + <message> <source>Number of connections</source> <translation>Ühenduste arv</translation> </message> @@ -744,6 +843,26 @@ Aadress: %4⏎</translation> <translation>Plokkide hetkearv</translation> </message> <message> + <source>Received</source> + <translation>Vastuvõetud</translation> + </message> + <message> + <source>Sent</source> + <translation>Saadetud</translation> + </message> + <message> + <source>Direction</source> + <translation>Suund</translation> + </message> + <message> + <source>Version</source> + <translation>Versioon</translation> + </message> + <message> + <source>Services</source> + <translation>Teenused</translation> + </message> + <message> <source>Last block time</source> <translation>Viimane ploki aeg</translation> </message> @@ -764,18 +883,10 @@ Aadress: %4⏎</translation> <translation>Debugimise logifail</translation> </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>Ava Bitcoini logifail praegusest andmekaustast. Toiminguks võib kuluda kuni mõni sekund.</translation> - </message> - <message> <source>Clear console</source> <translation>Puhasta konsool</translation> </message> <message> - <source>Welcome to the Bitcoin RPC console.</source> - <translation>Teretulemast Bitcoini RPC konsooli.</translation> - </message> - <message> <source>Use up and down arrows to navigate history, and <b>Ctrl-L</b> to clear screen.</source> <translation>Ajaloo sirvimiseks kasuta üles ja alla nooli, ekraani puhastamiseks <b>Ctrl-L</b>.</translation> </message> @@ -783,18 +894,54 @@ Aadress: %4⏎</translation> <source>Type <b>help</b> for an overview of available commands.</source> <translation>Ülevaateks võimalikest käsklustest trüki <b>help</b>.</translation> </message> + <message> + <source>%1 B</source> + <translation>%1 B</translation> + </message> + <message> + <source>%1 KB</source> + <translation>%1 B</translation> + </message> + <message> + <source>%1 MB</source> + <translation>%1 MB</translation> + </message> + <message> + <source>%1 GB</source> + <translation>%1 GB</translation> + </message> </context> <context> <name>ReceiveCoinsDialog</name> <message> + <source>&Amount:</source> + <translation>&Summa:</translation> + </message> + <message> <source>&Label:</source> <translation>&Märgis</translation> </message> <message> + <source>&Message:</source> + <translation>&Sõnum:</translation> + </message> + <message> + <source>Show</source> + <translation>Näita</translation> + </message> + <message> + <source>Remove</source> + <translation>Eemalda</translation> + </message> + <message> <source>Copy label</source> <translation>Märgise kopeerimine</translation> </message> <message> + <source>Copy message</source> + <translation>Kopeeri sõnum</translation> + </message> + <message> <source>Copy amount</source> <translation>Kopeeri summa</translation> </message> @@ -848,7 +995,15 @@ Aadress: %4⏎</translation> <source>(no label)</source> <translation>(silti pole)</translation> </message> - </context> + <message> + <source>(no message)</source> + <translation>(sõnum puudub)</translation> + </message> + <message> + <source>(no amount)</source> + <translation>(summa puudub)</translation> + </message> +</context> <context> <name>SendCoinsDialog</name> <message> @@ -856,10 +1011,38 @@ Aadress: %4⏎</translation> <translation>Müntide saatmine</translation> </message> <message> + <source>Quantity:</source> + <translation>Kogus:</translation> + </message> + <message> <source>Amount:</source> <translation>Summa:</translation> </message> <message> + <source>Fee:</source> + <translation>Tasu:</translation> + </message> + <message> + <source>Choose...</source> + <translation>Vali...</translation> + </message> + <message> + <source>Hide</source> + <translation>Peida</translation> + </message> + <message> + <source>Recommended:</source> + <translation>Soovitatud:</translation> + </message> + <message> + <source>normal</source> + <translation>normaalne</translation> + </message> + <message> + <source>fast</source> + <translation>kiire</translation> + </message> + <message> <source>Send to multiple recipients at once</source> <translation>Saatmine mitmele korraga</translation> </message> @@ -892,8 +1075,12 @@ Aadress: %4⏎</translation> <translation>Kopeeri summa</translation> </message> <message> - <source>The recipient address is not valid, please recheck.</source> - <translation>Saaja aadress ei ole kehtiv, palun kontrolli.</translation> + <source>Copy fee</source> + <translation>Kopeeri tasu</translation> + </message> + <message> + <source>or</source> + <translation>või</translation> </message> <message> <source>The amount to pay must be larger than 0.</source> @@ -908,10 +1095,6 @@ Aadress: %4⏎</translation> <translation>Summa koos tehingu tasuga %1 ületab sinu jääki.</translation> </message> <message> - <source>Duplicate address found, can only send to each address once per send operation.</source> - <translation>Ühe saatmisega topelt-adressaati olla ei tohi.</translation> - </message> - <message> <source>(no label)</source> <translation>(silti pole)</translation> </message> @@ -965,10 +1148,6 @@ Aadress: %4⏎</translation> <translation>&Allkirjastamise teade</translation> </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>Omandiõigsuse tõestamiseks saad sõnumeid allkirjastada oma aadressiga. Ettevaatust petturitega, kes üritavad saada sinu allkirja endale saada. Allkirjasta ainult korralikult täidetud avaldusi, millega nõustud.</translation> - </message> - <message> <source>Alt+A</source> <translation>Alt+A</translation> </message> @@ -1013,10 +1192,6 @@ Aadress: %4⏎</translation> <translation>&Kinnita Sõnum</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>Kinnitamiseks sisesta allkirjastamise aadress, sõnum (kindlasti kopeeri täpselt ka reavahetused, tühikud, tabulaatorid jms) ning allolev signatuur.</translation> - </message> - <message> <source>Verify the message to ensure it was signed with the specified Bitcoin address</source> <translation>Kinnita sõnum tõestamaks selle allkirjastatust määratud Bitcoini aadressiga.</translation> </message> @@ -1088,13 +1263,21 @@ Aadress: %4⏎</translation> <translation>Bitcoini tuumik</translation> </message> <message> + <source>The Bitcoin Core developers</source> + <translation>Bitcoini Tuuma arendajad</translation> + </message> + <message> <source>[testnet]</source> <translation>[testnet]</translation> </message> </context> <context> <name>TrafficGraphWidget</name> - </context> + <message> + <source>KB/s</source> + <translation>KB/s</translation> + </message> +</context> <context> <name>TransactionDesc</name> <message> @@ -1113,10 +1296,6 @@ Aadress: %4⏎</translation> <source>Status</source> <translation>Staatus</translation> </message> - <message numerus="yes"> - <source>, broadcast through %n node(s)</source> - <translation><numerusform>, levita läbi %n node'i</numerusform><numerusform>, levita läbi %n node'i</numerusform></translation> - </message> <message> <source>Date</source> <translation>Kuupäev</translation> @@ -1149,10 +1328,6 @@ Aadress: %4⏎</translation> <source>Credit</source> <translation>Krediit</translation> </message> - <message numerus="yes"> - <source>matures in %n more block(s)</source> - <translation><numerusform>aegub %n bloki pärast</numerusform><numerusform>aegub %n bloki pärast</numerusform></translation> - </message> <message> <source>not accepted</source> <translation>mitte aktsepteeritud</translation> @@ -1209,10 +1384,6 @@ Aadress: %4⏎</translation> <source>, has not been successfully broadcast yet</source> <translation>, veel esitlemata</translation> </message> - <message numerus="yes"> - <source>Open for %n more block(s)</source> - <translation><numerusform>Avaneb %n bloki pärast</numerusform><numerusform>Avaneb %n bloki pärast</numerusform></translation> - </message> <message> <source>unknown</source> <translation>tundmatu</translation> @@ -1240,14 +1411,6 @@ Aadress: %4⏎</translation> <translation>Tüüp</translation> </message> <message> - <source>Address</source> - <translation>Aadress</translation> - </message> - <message numerus="yes"> - <source>Open for %n more block(s)</source> - <translation><numerusform>Avaneb %n bloki pärast</numerusform><numerusform>Avaneb %n bloki pärast</numerusform></translation> - </message> - <message> <source>Open until %1</source> <translation>Avatud kuni %1</translation> </message> @@ -1264,6 +1427,10 @@ Aadress: %4⏎</translation> <translation>Loodud, kuid aktsepteerimata</translation> </message> <message> + <source>Label</source> + <translation>Silt</translation> + </message> + <message> <source>Received with</source> <translation>Saadud koos</translation> </message> @@ -1300,10 +1467,6 @@ Aadress: %4⏎</translation> <translation>Tehingu tüüp.</translation> </message> <message> - <source>Destination address of transaction.</source> - <translation>Tehingu saaja aadress.</translation> - </message> - <message> <source>Amount removed from or added to balance.</source> <translation>Jäägile lisatud või eemaldatud summa.</translation> </message> @@ -1391,6 +1554,10 @@ Aadress: %4⏎</translation> <translation>Kuva tehingu detailid</translation> </message> <message> + <source>Exporting Failed</source> + <translation>Eksportimine Ebaõnnestus</translation> + </message> + <message> <source>Comma separated file (*.csv)</source> <translation>Komaeraldatud fail (*.csv)</translation> </message> @@ -1443,6 +1610,10 @@ Aadress: %4⏎</translation> <context> <name>WalletView</name> <message> + <source>&Export</source> + <translation>&Ekspordi</translation> + </message> + <message> <source>Export the data in the current tab to a file</source> <translation>Ekspordi kuvatava vahelehe sisu faili</translation> </message> @@ -1498,42 +1669,10 @@ Aadress: %4⏎</translation> <translation>Luba välisühendusi (vaikeväärtus: 1 kui puudub -proxy või -connect)</translation> </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>%s, sul tuleb rpcpassword määrata seadete failis: -%s -Soovitatav on kasutada järgmist juhuslikku parooli: -rpcuser=bitcoinrpc -rpcpassword=%s -(seda parooli ei pea meeles pidama) -Kasutajanimi ning parool EI TOHI kattuda. -Kui faili ei leita, loo see ainult-omaniku-loetavas failiõigustes . -Soovitatav on seadistada tõrgete puhul teavitus; -nt: alertnotify=echo %%s | email -s "Bitcoin Alert" admin@foo.com -</translation> - </message> - <message> <source>Bind to given address and always listen on it. Use [host]:port notation for IPv6</source> <translation>Määratud aadressiga sidumine ning sellelt kuulamine. IPv6 jaoks kasuta vormingut [host]:port</translation> </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>Tõrge: Tehingust keelduti! Põhjuseks võib olla juba kulutatud mündid, nt kui wallet.dat fail koopias kulutatid mündid, kuid ei märgitud neid siin vastavalt.</translation> - </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>Tõrge: Selle tehingu jaoks on nõutav lisatasu vähemalt %s. Põhjuseks võib olla summa suurus, keerukus või hiljuti saadud summade kasutamine!</translation> - </message> - <message> <source>Execute command when a wallet transaction changes (%s in cmd is replaced by TxID)</source> <translation>Käivita käsklus, kui rahakoti tehing muutub (%s cmd's muudetakse TxID'ks)</translation> </message> @@ -1570,10 +1709,6 @@ nt: alertnotify=echo %%s | email -s "Bitcoin Alert" admin@foo.com <translation>Tuvastati vigane bloki andmebaas</translation> </message> <message> - <source>Discover own IP address (default: 1 when listening and no -externalip)</source> - <translation>Leia oma IP aadress (vaikeväärtus: 1, kui kuulatakse ning puudub -externalip)</translation> - </message> - <message> <source>Do you want to rebuild the block database now?</source> <translation>Kas soovid bloki andmebaasi taastada?</translation> </message> @@ -1598,18 +1733,10 @@ nt: alertnotify=echo %%s | email -s "Bitcoin Alert" admin@foo.com <translation>Tõrge: liiga vähe kettaruumi!</translation> </message> <message> - <source>Error: Wallet locked, unable to create transaction!</source> - <translation>Tõrge: Rahakott on lukus, tehingu loomine ei ole võimalik!</translation> - </message> - <message> <source>Failed to listen on any port. Use -listen=0 if you want this.</source> <translation>Pordi kuulamine nurjus. Soovikorral kasuta -listen=0.</translation> </message> <message> - <source>Rebuild block chain index from current blk000??.dat files</source> - <translation>Taasta bloki jada indeks blk000??.dat failist</translation> - </message> - <message> <source>Verifying blocks...</source> <translation>Kontrollin blokke...</translation> </message> @@ -1618,6 +1745,10 @@ nt: alertnotify=echo %%s | email -s "Bitcoin Alert" admin@foo.com <translation>Kontrollin rahakotti...</translation> </message> <message> + <source>Wallet options:</source> + <translation>Rahakoti valikud:</translation> + </message> + <message> <source>Imports blocks from external blk000??.dat file</source> <translation>Impordi blokid välisest blk000??.dat failist</translation> </message> @@ -1626,14 +1757,50 @@ nt: alertnotify=echo %%s | email -s "Bitcoin Alert" admin@foo.com <translation>Informatsioon</translation> </message> <message> + <source>RPC server options:</source> + <translation>RPC serveri valikud:</translation> + </message> + <message> <source>Send trace/debug info to console instead of debug.log file</source> <translation>Saada jälitus/debug, debug.log faili asemel, konsooli</translation> </message> <message> + <source>Set language, for example "de_DE" (default: system locale)</source> + <translation>Keele valik, nt "ee_ET" (vaikeväärtus: system locale)</translation> + </message> + <message> + <source>Show splash screen on startup (default: 1)</source> + <translation>Käivitamisel teabeakna kuvamine (vaikeväärtus: 1)</translation> + </message> + <message> <source>Shrink debug.log file on client startup (default: 1 when no -debug)</source> <translation>Kahanda programmi käivitamisel debug.log faili (vaikeväärtus: 1, kui ei ole -debug)</translation> </message> <message> + <source>Signing transaction failed</source> + <translation>Tehingu allkirjastamine ebaõnnestus</translation> + </message> + <message> + <source>Start minimized</source> + <translation>Käivitu tegumiribale</translation> + </message> + <message> + <source>The transaction amount is too small to pay the fee</source> + <translation>Tehingu summa on tasu maksmiseks liiga väikene</translation> + </message> + <message> + <source>Transaction amount too small</source> + <translation>Tehingu summa liiga väikene</translation> + </message> + <message> + <source>Transaction too large</source> + <translation>Tehing liiga suur</translation> + </message> + <message> + <source>UI Options:</source> + <translation>UI Valikud:</translation> + </message> + <message> <source>Use UPnP to map the listening port (default: 1 when listening)</source> <translation>Kasuta kuulatava pordi määramiseks UPnP ühendust (vaikeväärtus: 1, kui kuulatakse)</translation> </message> @@ -1646,8 +1813,8 @@ nt: alertnotify=echo %%s | email -s "Bitcoin Alert" admin@foo.com <translation>Hoiatus</translation> </message> <message> - <source>Warning: This version is obsolete, upgrade required!</source> - <translation>Hoiatus: versioon on aegunud, uuendus on nõutav!</translation> + <source>on startup</source> + <translation>käivitamisel</translation> </message> <message> <source>wallet.dat corrupt, salvage failed</source> @@ -1690,6 +1857,10 @@ nt: alertnotify=echo %%s | email -s "Bitcoin Alert" admin@foo.com <translation>Viga wallet.dat käivitamisel. Vigane rahakkott</translation> </message> <message> + <source>(default: %s)</source> + <translation>(vaikimisi: %s)</translation> + </message> + <message> <source>Error loading wallet.dat</source> <translation>Viga wallet.dat käivitamisel</translation> </message> @@ -1714,10 +1885,6 @@ nt: alertnotify=echo %%s | email -s "Bitcoin Alert" admin@foo.com <translation>-paytxfee=<amount> jaoks vigane kogus: '%s'</translation> </message> <message> - <source>Invalid amount</source> - <translation>Kehtetu summa</translation> - </message> - <message> <source>Insufficient funds</source> <translation>Liiga suur summa</translation> </message> @@ -1750,10 +1917,6 @@ nt: alertnotify=echo %%s | email -s "Bitcoin Alert" admin@foo.com <translation>Laetud</translation> </message> <message> - <source>To use the %s option</source> - <translation>%s valiku kasutamine</translation> - </message> - <message> <source>Error</source> <translation>Tõrge</translation> </message> diff --git a/src/qt/locale/bitcoin_eu_ES.ts b/src/qt/locale/bitcoin_eu_ES.ts index ea0ce1a67d..d68411d382 100644 --- a/src/qt/locale/bitcoin_eu_ES.ts +++ b/src/qt/locale/bitcoin_eu_ES.ts @@ -1,11 +1,7 @@ -<TS language="eu_ES" version="2.0"> +<TS language="eu_ES" version="2.1"> <context> <name>AddressBookPage</name> <message> - <source>Double-click to edit address or label</source> - <translation>Klik bikoitza helbidea edo etiketa editatzeko</translation> - </message> - <message> <source>Create a new address</source> <translation>Sortu helbide berria</translation> </message> @@ -76,10 +72,6 @@ <translation>Aldatu pasahitza</translation> </message> <message> - <source>Enter the old and new passphrase to the wallet.</source> - <translation>Sartu zorroaren pasahitz zaharra eta berria.</translation> - </message> - <message> <source>Confirm wallet encryption</source> <translation>Berretsi zorroaren enkriptazioa</translation> </message> @@ -513,10 +505,6 @@ <translation>Mota</translation> </message> <message> - <source>Address</source> - <translation>Helbidea</translation> - </message> - <message> <source>Open until %1</source> <translation>Zabalik %1 arte</translation> </message> @@ -533,6 +521,10 @@ <translation>Sortua, baina ez onartua</translation> </message> <message> + <source>Label</source> + <translation>Etiketa</translation> + </message> + <message> <source>Received with</source> <translation>Jasota honekin: </translation> </message> @@ -565,10 +557,6 @@ <translation>Transakzio mota.</translation> </message> <message> - <source>Destination address of transaction.</source> - <translation>Transakzioaren xede-helbidea.</translation> - </message> - <message> <source>Amount removed from or added to balance.</source> <translation>Saldoan kendu edo gehitutako kopurua.</translation> </message> diff --git a/src/qt/locale/bitcoin_fa.ts b/src/qt/locale/bitcoin_fa.ts index 475515f4b7..0bed017614 100644 --- a/src/qt/locale/bitcoin_fa.ts +++ b/src/qt/locale/bitcoin_fa.ts @@ -1,11 +1,7 @@ -<TS language="fa" version="2.0"> +<TS language="fa" version="2.1"> <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> @@ -128,10 +124,6 @@ <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> @@ -156,10 +148,6 @@ <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> @@ -259,10 +247,6 @@ <translation>ارسال وجه به نشانی بیتکوین</translation> </message> <message> - <source>Modify configuration options for Bitcoin</source> - <translation>تغییر و اصلاح تنظیمات پیکربندی بیتکوین</translation> - </message> - <message> <source>Backup wallet to another location</source> <translation>تهیهٔ پشتیبان از کیف پول در یک مکان دیگر</translation> </message> @@ -399,18 +383,6 @@ <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> @@ -565,26 +537,6 @@ Address: %4 <source>command-line options</source> <translation>گزینههای خط فرمان</translation> </message> - <message> - <source>UI options</source> - <translation>گزینههای رابط کاربری</translation> - </message> - <message> - <source>Set language, for example "de_DE" (default: system locale)</source> - <translation>زبان را تنظیم کنید؛ برای مثال «de_DE» (زبان پیشفرض محلی)</translation> - </message> - <message> - <source>Start minimized</source> - <translation>اجرای برنامه به صورت کوچکشده</translation> - </message> - <message> - <source>Show splash screen on startup (default: 1)</source> - <translation>نمایش پنجرهٔ خوشامدگویی در ابتدای اجرای برنامه (پیشفرض: 1)</translation> - </message> - <message> - <source>Choose data directory on startup (default: 0)</source> - <translation>انتخاب مسیر دادهها در ابتدای اجرای برنامه (پیشفرض: 0)</translation> - </message> </context> <context> <name>Intro</name> @@ -623,14 +575,6 @@ Address: %4 <translation>&عمومی</translation> </message> <message> - <source>Automatically start Bitcoin after logging in to the system.</source> - <translation>اجرای خودکار بیتکوین در زمان ورود به سیستم.</translation> - </message> - <message> - <source>&Start Bitcoin on system login</source> - <translation>&اجرای بیتکوین با ورود به سیستم</translation> - </message> - <message> <source>Reset all client options to default.</source> <translation>بازنشانی تمام تنظیمات به پیشفرض.</translation> </message> @@ -679,10 +623,6 @@ Address: %4 <translation>&کوچک کردن به سینی بهجای نوار وظیفه</translation> </message> <message> - <source>Minimize instead of exit the application when the window is closed. When this option is enabled, the application will be closed only after selecting Quit in the menu.</source> - <translation>مخفی کردن در نوار کناری بهجای خروج هنگام بستن پنجره. زمانی که این گزینه فعال است، برنامه فقط با استفاده از گزینهٔ خروج در منو قابل بسته شدن است.</translation> - </message> - <message> <source>M&inimize on close</source> <translation>کوچک کردن &در زمان بسته شدن</translation> </message> @@ -695,10 +635,6 @@ Address: %4 <translation>زبان &رابط کاربری:</translation> </message> <message> - <source>The user interface language can be set here. This setting will take effect after restarting Bitcoin.</source> - <translation>زبان رابط کاربر میتواند در اینجا تنظیم شود. تنظیمات بعد از ظروع مجدد بیتکوین اعمال خواهد شد.</translation> - </message> - <message> <source>&Unit to show amounts in:</source> <translation>&واحد نمایش مبالغ:</translation> </message> @@ -877,18 +813,10 @@ Address: %4 <translation>فایلِ لاگِ اشکال زدایی</translation> </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>فایلِ لاگِ اشکال زدایی Bitcoin را از دایرکتوری جاری داده ها باز کنید. این عملیات ممکن است برای فایلهای لاگِ حجیم طولانی شود.</translation> - </message> - <message> <source>Clear console</source> <translation>پاکسازی کنسول</translation> </message> <message> - <source>Welcome to the Bitcoin RPC console.</source> - <translation>به کنسور RPC بیتکوین خوش آمدید.</translation> - </message> - <message> <source>Use up and down arrows to navigate history, and <b>Ctrl-L</b> to clear screen.</source> <translation>دکمههای بالا و پایین برای پیمایش تاریخچه و <b>Ctrl-L</b> برای پاک کردن صفحه.</translation> </message> @@ -1017,10 +945,6 @@ Address: %4 <translation>یا</translation> </message> <message> - <source>The recipient address is not valid, please recheck.</source> - <translation>نشانی گیرنده معتبر نیست؛ لطفا دوباره بررسی کنید.</translation> - </message> - <message> <source>The amount to pay must be larger than 0.</source> <translation>مبلغ پرداخت باید بیشتر از ۰ باشد.</translation> </message> @@ -1033,10 +957,6 @@ Address: %4 <translation>با احتساب هزینهٔ %1 برای هر تراکنش، مجموع میزان پرداختی از مبلغ تراز شما بیشتر میشود.</translation> </message> <message> - <source>Duplicate address found, can only send to each address once per send operation.</source> - <translation>یک نشانی تکراری پیدا شد. در هر عملیات ارسال، به هر نشانی فقط مبلغ میتوان ارسال کرد.</translation> - </message> - <message> <source>(no label)</source> <translation>(بدون برچسب)</translation> </message> @@ -1090,10 +1010,6 @@ Address: %4 <translation>ا&مضای پیام</translation> </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>برای احراز اینکه پیامها از جانب شما هستند، میتوانید آنها را با نشانی خودتان امضا کنید. مراقب باشید چیزی که بدان اطمینان ندارید را امضا نکنید زیرا حملات فیشینگ ممکن است بخواهند از.پیامی با امضای شما سوءاستفاده کنند. تنها مواردی را که حاوی اطلاعات دقیق و قابل قبول برای شما هستند امضا کنید.</translation> - </message> - <message> <source>Alt+A</source> <translation>Alt+A</translation> </message> @@ -1138,10 +1054,6 @@ Address: %4 <translation>&شناسایی پیام</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>برای شناسایی پیام، نشانیِ امضا کننده و متن پیام را وارد کنید. (مطمئن شوید که فاصلهها، تبها و خطوط را عیناً کپی میکنید.) مراقب باشید در امضا چیزی بیشتر از آنچه در پیام میبینید وجود نداشته باشد تا فریب دزدان اینترنتی و حملات از نوع MITM را نخورید.</translation> - </message> - <message> <source>Verify the message to ensure it was signed with the specified Bitcoin address</source> <translation>برای حصول اطمینان از اینکه پیام با نشانی بیتکوین مشخص شده امضا است یا خیر، پیام را شناسایی کنید</translation> </message> @@ -1368,10 +1280,6 @@ Address: %4 <source>Type</source> <translation>نوع</translation> </message> - <message> - <source>Address</source> - <translation>نشانی</translation> - </message> <message numerus="yes"> <source>Open for %n more block(s)</source> <translation><numerusform>باز برای %n بلوک دیگر</numerusform></translation> @@ -1393,6 +1301,10 @@ Address: %4 <translation>تولید شده ولی قبول نشده</translation> </message> <message> + <source>Label</source> + <translation>برچسب</translation> + </message> + <message> <source>Received with</source> <translation>دریافتشده با</translation> </message> @@ -1429,10 +1341,6 @@ Address: %4 <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> @@ -1639,14 +1547,6 @@ Address: %4 <translation>مقید به نشانی داده شده باشید و همیشه از آن پیروی کنید. از نشانه گذاری استاندار IPv6 به صورت Host]:Port] استفاده کنید.</translation> </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>تراکنش پذیرفته نیست! این خطا ممکن است در حالتی رخ داده باشد که مقداری از سکه های شما در کیف پولتان از جایی دیگر، همانند یک کپی از کیف پول اصلی اتان، خرج شده باشد اما در کیف پول اصلی اتان به عنوان مبلغ خرج شده، نشانه گذاری نشده باشد.</translation> - </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>خطا: این تراکنش به علت میزان وجه، دشواری، و یا استفاده از وجوه دریافتی اخیر نیازمند کارمزد به مبلغ حداقل %s است.</translation> - </message> - <message> <source>Execute command when a wallet transaction changes (%s in cmd is replaced by TxID)</source> <translation>هنگامی که یک تراکنش در کیف پولی رخ می دهد، دستور را اجرا کن(%s در دستورات بوسیله ی TxID جایگزین می شود)</translation> </message> @@ -1671,10 +1571,6 @@ Address: %4 <translation>یک پایگاه داده ی بلوک خراب یافت شد</translation> </message> <message> - <source>Discover own IP address (default: 1 when listening and no -externalip)</source> - <translation>آدرس آی.پی. خود را شناسایی کنید (پیش فرض:1 در زمان when listening وno -externalip)</translation> - </message> - <message> <source>Do you want to rebuild the block database now?</source> <translation>آیا مایلید که اکنون پایگاه داده ی بلوک را بازسازی کنید؟</translation> </message> @@ -1703,6 +1599,10 @@ Address: %4 <translation>در حال بازبینی کیف پول...</translation> </message> <message> + <source>Choose data directory on startup (default: 0)</source> + <translation>انتخاب مسیر دادهها در ابتدای اجرای برنامه (پیشفرض: 0)</translation> + </message> + <message> <source>Information</source> <translation>اطلاعات</translation> </message> @@ -1711,10 +1611,22 @@ Address: %4 <translation>اطلاعات ردگیری/اشکالزدایی را به جای فایل لاگ اشکالزدایی به کنسول بفرستید</translation> </message> <message> + <source>Set language, for example "de_DE" (default: system locale)</source> + <translation>زبان را تنظیم کنید؛ برای مثال «de_DE» (زبان پیشفرض محلی)</translation> + </message> + <message> + <source>Show splash screen on startup (default: 1)</source> + <translation>نمایش پنجرهٔ خوشامدگویی در ابتدای اجرای برنامه (پیشفرض: 1)</translation> + </message> + <message> <source>Shrink debug.log file on client startup (default: 1 when no -debug)</source> <translation>فایل debug.log را در startup مشتری کوچک کن (پیش فرض:1 اگر اشکال زدایی روی نداد)</translation> </message> <message> + <source>Start minimized</source> + <translation>اجرای برنامه به صورت کوچکشده</translation> + </message> + <message> <source>Use UPnP to map the listening port (default: 1 when listening)</source> <translation>از UPnP برای شناسایی درگاه شنیداری استفاده کنید (پیش فرض:1 در زمان شنیدن)</translation> </message> @@ -1727,10 +1639,6 @@ Address: %4 <translation>هشدار</translation> </message> <message> - <source>Warning: This version is obsolete, upgrade required!</source> - <translation>هشدار: این نسخه قدیمی است، روزآمدسازی مورد نیاز است</translation> - </message> - <message> <source>Password for JSON-RPC connections</source> <translation>JSON-RPC عبارت عبور برای ارتباطات</translation> </message> @@ -1791,10 +1699,6 @@ Address: %4 <translation>میزان وجه اشتباه برای paytxfee=<میزان وجه>: %s</translation> </message> <message> - <source>Invalid amount</source> - <translation>میزان وجه اشتباه</translation> - </message> - <message> <source>Insufficient funds</source> <translation>بود جه نا کافی </translation> </message> @@ -1827,10 +1731,6 @@ Address: %4 <translation>بار گیری انجام شده است</translation> </message> <message> - <source>To use the %s option</source> - <translation>برای استفاده از %s از انتخابات</translation> - </message> - <message> <source>Error</source> <translation>خطا</translation> </message> diff --git a/src/qt/locale/bitcoin_fa_IR.ts b/src/qt/locale/bitcoin_fa_IR.ts index 1a639a8592..2dde67d3d5 100644 --- a/src/qt/locale/bitcoin_fa_IR.ts +++ b/src/qt/locale/bitcoin_fa_IR.ts @@ -1,15 +1,15 @@ -<TS language="fa_IR" version="2.0"> +<TS language="fa_IR" version="2.1"> <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>جدید</translation> + </message> + <message> <source>Copy the currently selected address to the system clipboard</source> <translation>کپی کردن حساب انتخاب شده به حافظه سیستم - کلیپ بورد</translation> </message> @@ -92,10 +92,6 @@ <translation>تغییر رمز/پَس فرِیز</translation> </message> <message> - <source>Enter the old and new passphrase to the wallet.</source> - <translation>رمز/پَس فرِیزِ قدیم و جدید را در wallet وارد کنید</translation> - </message> - <message> <source>Confirm wallet encryption</source> <translation>رمزگذاری wallet را تایید کنید</translation> </message> @@ -104,10 +100,6 @@ <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>Bitcoin برای اتمام فرایند رمزگذاری بسته خواهد شد. به خاطر داشته باشید که رمزگذاری WALLET شما، کامپیوتر شما را از آلودگی به بدافزارها مصون نمی دارد.</translation> - </message> - <message> <source>Wallet encryption failed</source> <translation>رمزگذاری تایید نشد</translation> </message> @@ -191,10 +183,6 @@ <translation>تغییر رمز/پَس فرِیز</translation> </message> <message> - <source>Modify configuration options for Bitcoin</source> - <translation>اصلاح انتخابها برای پیکربندی Bitcoin</translation> - </message> - <message> <source>Backup wallet to another location</source> <translation>گرفتن نسخه پیشتیبان در آدرسی دیگر</translation> </message> @@ -255,15 +243,6 @@ <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>wallet رمزگذاری شد و در حال حاضر از حالت قفل در آمده است</translation> </message> @@ -458,10 +437,6 @@ Address: %4 <source>Current number of blocks</source> <translation>تعداد زنجیره های حاضر</translation> </message> - <message> - <source>Welcome to the Bitcoin RPC console.</source> - <translation>به کنسول آر.پی.سی. BITCOIN خوش آمدید</translation> - </message> </context> <context> <name>ReceiveCoinsDialog</name> @@ -707,10 +682,6 @@ Address: %4 <translation>گونه</translation> </message> <message> - <source>Address</source> - <translation>حساب</translation> - </message> - <message> <source>Open until %1</source> <translation>باز کن تا %1</translation> </message> @@ -727,6 +698,10 @@ Address: %4 <translation>تولید شده اما قبول نشده است</translation> </message> <message> + <source>Label</source> + <translation>برچسب</translation> + </message> + <message> <source>Received with</source> <translation>دریافت با</translation> </message> @@ -763,10 +738,6 @@ Address: %4 <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> @@ -986,10 +957,6 @@ Address: %4 <translation>میزان اشتباه است for -paytxfee=<amount>: '%s'</translation> </message> <message> - <source>Invalid amount</source> - <translation>میزان اشتباه است</translation> - </message> - <message> <source>Insufficient funds</source> <translation>وجوه ناکافی</translation> </message> @@ -1022,10 +989,6 @@ Address: %4 <translation>اتمام لود شدن</translation> </message> <message> - <source>To use the %s option</source> - <translation>برای استفاده از %s از اختیارات</translation> - </message> - <message> <source>Error</source> <translation>خطا</translation> </message> diff --git a/src/qt/locale/bitcoin_fi.ts b/src/qt/locale/bitcoin_fi.ts index 9a2eadd6ea..0ca66e8b26 100644 --- a/src/qt/locale/bitcoin_fi.ts +++ b/src/qt/locale/bitcoin_fi.ts @@ -1,9 +1,9 @@ -<TS language="fi" version="2.0"> +<TS language="fi" version="2.1"> <context> <name>AddressBookPage</name> <message> - <source>Double-click to edit address or label</source> - <translation>Kaksoisnapauta muokataksesi osoitetta tai nimeä</translation> + <source>Right-click to edit address or label</source> + <translation>Klikkaa hiiren oikealla painikkeella muokataksesi osoitetta tai nimikettä</translation> </message> <message> <source>Create a new address</source> @@ -23,7 +23,7 @@ </message> <message> <source>C&lose</source> - <translation>&Sulje</translation> + <translation>S&ulje</translation> </message> <message> <source>&Copy Address</source> @@ -39,7 +39,7 @@ </message> <message> <source>&Export</source> - <translation>&Vie...</translation> + <translation>&Vie</translation> </message> <message> <source>&Delete</source> @@ -47,15 +47,15 @@ </message> <message> <source>Choose the address to send coins to</source> - <translation>Valitse osoite johon lähetetään kolikoita</translation> + <translation>Valitse osoite johon kolikot lähetetään</translation> </message> <message> <source>Choose the address to receive coins with</source> - <translation>Valitse osoite jolla vastaanotetaan kolikoita</translation> + <translation>Valitse osoite johon vastaanotetaan kolikoita</translation> </message> <message> <source>C&hoose</source> - <translation>&Valitse</translation> + <translation>V&alitse</translation> </message> <message> <source>Sending addresses</source> @@ -67,15 +67,15 @@ </message> <message> <source>These are your Bitcoin addresses for sending payments. Always check the amount and the receiving address before sending coins.</source> - <translation>Nämä ovat sinun Bitcoin osoitteita maksujen lähetykseen. Tarkista aina rahan määrä ja vastaanottajan osoite ennenkuin lähetät kolikkoja.</translation> + <translation>Nämä ovat sinun Bitcoin osoitteita maksujen lähetykseen. Tarkista aina summa ja vastaanottajan osoite ennenkuin lähetät kolikkoja.</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>Nämä ovat sinun Bitcoin-osoitteesi suoritusten vastaanottamiseen. Suositellaan että annat uuden osoitteen kullekin rahansiirrolle</translation> + <translation>Nämä ovat sinun Bitcoin-osoitteesi suoritusten vastaanottamiseen. Suositellaan että annat uuden osoitteen kullekin transaktiolle.</translation> </message> <message> <source>Copy &Label</source> - <translation>Kopioi &Nimi</translation> + <translation>Kopioi &nimike</translation> </message> <message> <source>&Edit</source> @@ -110,14 +110,14 @@ </message> <message> <source>(no label)</source> - <translation>(ei nimeä)</translation> + <translation>(ei nimikettä)</translation> </message> </context> <context> <name>AskPassphraseDialog</name> <message> <source>Passphrase Dialog</source> - <translation>Tunnuslauseen Dialogi</translation> + <translation>Tunnuslauseen tekstinsyöttökenttä</translation> </message> <message> <source>Enter passphrase</source> @@ -129,7 +129,7 @@ </message> <message> <source>Repeat new passphrase</source> - <translation>Kirjoita uusi tunnuslause uudelleen</translation> + <translation>Toista uusi tunnuslause</translation> </message> <message> <source>Encrypt wallet</source> @@ -156,10 +156,6 @@ <translation>Vaihda tunnuslause</translation> </message> <message> - <source>Enter the old and new passphrase to the wallet.</source> - <translation>Anna vanha ja uusi tunnuslause.</translation> - </message> - <message> <source>Confirm wallet encryption</source> <translation>Vahvista lompakon salaus</translation> </message> @@ -188,10 +184,6 @@ <translation>Anna salauslause lompakkoon. <br/>Ole hyvä ja käytä lausetta jossa on <b>kymmenen tai enemmän satunnaista merkkiä</b> tai <b>kahdeksan tai useampi sanaa</b>.</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>Bitcoin sulkeutuu lopettaakseen salausprosessin. Muista, että salattukaan lompakko ei täysin suojaa sitä haittaohjelmien aiheuttamilta varkauksilta.</translation> - </message> - <message> <source>Wallet encryption failed</source> <translation>Lompakon salaus epäonnistui</translation> </message> @@ -311,10 +303,6 @@ <translation>Lähetä kolikoita Bitcoin-osoitteeseen</translation> </message> <message> - <source>Modify configuration options for Bitcoin</source> - <translation>Muuta Bitcoinin konfiguraatioasetuksia</translation> - </message> - <message> <source>Backup wallet to another location</source> <translation>Varmuuskopioi lompakko toiseen sijaintiin</translation> </message> @@ -491,17 +479,6 @@ <translation>Saapuva rahansiirto</translation> </message> <message> - <source>Date: %1 -Amount: %2 -Type: %3 -Address: %4 -</source> - <translation>Päivä: %1 -Määrä: %2 -Tyyppi: %3 -Osoite: %4</translation> - </message> - <message> <source>Wallet is <b>encrypted</b> and currently <b>unlocked</b></source> <translation>Lompakko on <b>salattu</b> ja tällä hetkellä <b>avoinna</b></translation> </message> @@ -520,6 +497,10 @@ Osoite: %4</translation> <context> <name>CoinControlDialog</name> <message> + <source>Coin Selection</source> + <translation>Kolikoiden valinta</translation> + </message> + <message> <source>Quantity:</source> <translation>Määrä:</translation> </message> @@ -568,6 +549,14 @@ Osoite: %4</translation> <translation>Määrä</translation> </message> <message> + <source>Received with label</source> + <translation>Vastaanotettu nimikkeellä</translation> + </message> + <message> + <source>Received with address</source> + <translation>Vastaanotettu osoitteella</translation> + </message> + <message> <source>Date</source> <translation>Aika</translation> </message> @@ -692,10 +681,6 @@ Osoite: %4</translation> <translation>ei</translation> </message> <message> - <source>This label turns red, if the transaction size is greater than 1000 bytes.</source> - <translation>Tämä nimi muuttuu punaiseksi jos rahansiirron koko on suurempi kuin 1000 tavua</translation> - </message> - <message> <source>This means a fee of at least %1 per kB is required.</source> <translation>Tämä tarkoittaa että vähintään %1 per kB palkkio on pakollinen.</translation> </message> @@ -708,14 +693,6 @@ Osoite: %4</translation> <translation>Rahansiirrot korkeammalla prioriteetilla sisällytetään varmemmin lohkoon.</translation> </message> <message> - <source>This label turns red, if the priority is smaller than "medium".</source> - <translation>Tämä nimi muuttuu punaiseksi jos prioriteetti on pienempi kuin "keskisuuri".</translation> - </message> - <message> - <source>This label turns red, if any recipient receives an amount smaller than %1.</source> - <translation>Tämä nimi muuttuu punaiseksi jos vastaanottaja saa pienemmän määrän kuin %1</translation> - </message> - <message> <source>(no label)</source> <translation>(ei nimeä)</translation> </message> @@ -836,30 +813,6 @@ Osoite: %4</translation> <source>command-line options</source> <translation>komentorivi parametrit</translation> </message> - <message> - <source>UI options</source> - <translation>Käyttöliittymäasetukset</translation> - </message> - <message> - <source>Set language, for example "de_DE" (default: system locale)</source> - <translation>Set language, for example "de_DE" (default: system locale)</translation> - </message> - <message> - <source>Start minimized</source> - <translation>Käynnistä pienennettynä</translation> - </message> - <message> - <source>Set SSL root certificates for payment request (default: -system-)</source> - <translation>Aseta SSL root varmenne maksupyynnöille (oletus: -system-)</translation> - </message> - <message> - <source>Show splash screen on startup (default: 1)</source> - <translation>Näytä aloitusruutu käynnistettäessä (oletus: 1)</translation> - </message> - <message> - <source>Choose data directory on startup (default: 0)</source> - <translation>Valitse data-hakemisto käynnistyksessä (oletus: 0)</translation> - </message> </context> <context> <name>Intro</name> @@ -899,7 +852,15 @@ Osoite: %4</translation> <source>Error</source> <translation>Virhe</translation> </message> - </context> + <message numerus="yes"> + <source>%n GB of free space available</source> + <translation><numerusform>%n Gt vapaata tilaa käytettävissä</numerusform><numerusform>%n Gt vapaata tilaa käytettävissä</numerusform></translation> + </message> + <message numerus="yes"> + <source>(of %n GB needed)</source> + <translation><numerusform>(%n Gt tarvittavasta tilasta)</numerusform><numerusform>(%n Gt tarvittavasta tilasta)</numerusform></translation> + </message> +</context> <context> <name>OpenURIDialog</name> <message> @@ -934,14 +895,6 @@ Osoite: %4</translation> <translation>&Yleiset</translation> </message> <message> - <source>Automatically start Bitcoin after logging in to the system.</source> - <translation>Käynnistä Bitcoin kirjautumisen yhteydessä.</translation> - </message> - <message> - <source>&Start Bitcoin on system login</source> - <translation>&Käynnistä Bitcoin kirjautumisen yhteydessä</translation> - </message> - <message> <source>Size of &database cache</source> <translation>&Tietokannan välimuistin koko</translation> </message> @@ -1022,6 +975,14 @@ Osoite: %4</translation> <translation>Portin uudelleenohjaus &UPnP:llä</translation> </message> <message> + <source>Connect to the Bitcoin network through a SOCKS5 proxy.</source> + <translation>Yhdistä Bitcoin-verkkoon SOCKS5-välityspalvelimen kautta.</translation> + </message> + <message> + <source>&Connect through SOCKS5 proxy (default proxy):</source> + <translation>&Yhdistä SOCKS5-välityspalvelimen kautta (oletus välityspalvelin):</translation> + </message> + <message> <source>Proxy &IP:</source> <translation>Proxyn &IP:</translation> </message> @@ -1046,10 +1007,6 @@ Osoite: %4</translation> <translation>&Pienennä ilmaisinalueelle työkalurivin sijasta</translation> </message> <message> - <source>Minimize instead of exit the application when the window is closed. When this option is enabled, the application will be closed only after selecting Quit in the menu.</source> - <translation>Ikkunaa suljettaessa vain pienentää Bitcoin-ohjelman ikkunan lopettamatta itse ohjelmaa. Kun tämä asetus on valittuna, ohjelman voi sulkea vain valitsemalla Lopeta ohjelman valikosta.</translation> - </message> - <message> <source>M&inimize on close</source> <translation>P&ienennä suljettaessa</translation> </message> @@ -1062,10 +1019,6 @@ Osoite: %4</translation> <translation>&Käyttöliittymän kieli</translation> </message> <message> - <source>The user interface language can be set here. This setting will take effect after restarting Bitcoin.</source> - <translation>Tässä voit määritellä käyttöliittymän kielen. Muutokset astuvat voimaan seuraavan kerran, kun Bitcoin käynnistetään.</translation> - </message> - <message> <source>&Unit to show amounts in:</source> <translation>Yksikkö jona bitcoin-määrät näytetään</translation> </message> @@ -1102,10 +1055,6 @@ Osoite: %4</translation> <translation>Ohjelman uudelleenkäynnistys aktivoi muutokset.</translation> </message> <message> - <source>Client will be shutdown, do you want to proceed?</source> - <translation>Ohjelma lopetetaan. Haluatko jatkaa?</translation> - </message> - <message> <source>This change would require a client restart.</source> <translation>Tämä muutos vaatii ohjelman uudelleenkäynnistyksen.</translation> </message> @@ -1153,6 +1102,10 @@ Osoite: %4</translation> <translation>Louhittu saldo, joka ei ole vielä kypsynyt</translation> </message> <message> + <source>Balances</source> + <translation>Saldot</translation> + </message> + <message> <source>Total:</source> <translation>Yhteensä:</translation> </message> @@ -1165,6 +1118,22 @@ Osoite: %4</translation> <translation>Nykyinen tase seurantaosoitetteissa</translation> </message> <message> + <source>Spendable:</source> + <translation>Käytettävissä:</translation> + </message> + <message> + <source>Recent transactions</source> + <translation>Viimeisimmät rahansiirrot</translation> + </message> + <message> + <source>Unconfirmed transactions to watch-only addresses</source> + <translation>Vahvistamattomat rahansiirrot vain katseltaviin osoitteisiin</translation> + </message> + <message> + <source>Mined balance in watch-only addresses that has not yet matured</source> + <translation>Louhittu, ei vielä kypsynyt saldo vain katseltavissa osoitteissa</translation> + </message> + <message> <source>Current total balance in watch-only addresses</source> <translation>Nykyinen tase seurantaosoitetteissa</translation> </message> @@ -1188,8 +1157,12 @@ Osoite: %4</translation> <translation>Maksupyyntö hylätty</translation> </message> <message> - <source>Payment request has expired.</source> - <translation>Maksupyyntö on vanhentunut.</translation> + <source>Payment request network doesn't match client network.</source> + <translation>Maksypyyntö verkossa ei täsmää asiakasohjelman verkkoon.</translation> + </message> + <message> + <source>Payment request is not initialized.</source> + <translation>Maksupyyntöä ei ole alustettu.</translation> </message> <message> <source>Requested payment amount of %1 is too small (considered dust).</source> @@ -1224,6 +1197,10 @@ Osoite: %4</translation> <translation>Maksupalautus %1:sta</translation> </message> <message> + <source>Payment request DoS protection</source> + <translation>Maksupyynnön DoS-suojaus</translation> + </message> + <message> <source>Error communicating with %1: %2</source> <translation>Virhe kommunikoidessa %1n kanssa: %2</translation> </message> @@ -1246,7 +1223,11 @@ Osoite: %4</translation> <source>User Agent</source> <translation>Käyttöliittymä</translation> </message> - </context> + <message> + <source>Ping Time</source> + <translation>Vasteaika</translation> + </message> +</context> <context> <name>QObject</name> <message> @@ -1254,6 +1235,10 @@ Osoite: %4</translation> <translation>Määrä</translation> </message> <message> + <source>Enter a Bitcoin address (e.g. %1)</source> + <translation>Syötä Bitcoin-osoite (esim. %1)</translation> + </message> + <message> <source>%1 d</source> <translation>%1 d</translation> </message> @@ -1270,6 +1255,10 @@ Osoite: %4</translation> <translation>%1 s</translation> </message> <message> + <source>None</source> + <translation>Ei yhtään</translation> + </message> + <message> <source>N/A</source> <translation>Ei saatavilla</translation> </message> @@ -1328,6 +1317,10 @@ Osoite: %4</translation> <translation>Käytössä oleva OpenSSL-versio</translation> </message> <message> + <source>Using BerkeleyDB version</source> + <translation>Käyttää BerkeleyDB-versiota</translation> + </message> + <message> <source>Startup time</source> <translation>Käynnistysaika</translation> </message> @@ -1360,6 +1353,18 @@ Osoite: %4</translation> <translation>Lähetetyt</translation> </message> <message> + <source>&Peers</source> + <translation>&Vertaiset</translation> + </message> + <message> + <source>Select a peer to view detailed information.</source> + <translation>Valitse vertainen eriteltyjä tietoja varten.</translation> + </message> + <message> + <source>Direction</source> + <translation>Suunta</translation> + </message> + <message> <source>Version</source> <translation>Versio</translation> </message> @@ -1368,6 +1373,46 @@ Osoite: %4</translation> <translation>Käyttöliittymä</translation> </message> <message> + <source>Services</source> + <translation>Palvelut</translation> + </message> + <message> + <source>Starting Height</source> + <translation>Aloituskorkeus</translation> + </message> + <message> + <source>Sync Height</source> + <translation>Synkronointikorkeus</translation> + </message> + <message> + <source>Ban Score</source> + <translation>Panna-pisteytys</translation> + </message> + <message> + <source>Connection Time</source> + <translation>Yhteysaika</translation> + </message> + <message> + <source>Last Send</source> + <translation>Viimeisin lähetetty</translation> + </message> + <message> + <source>Last Receive</source> + <translation>Viimeisin vastaanotettu</translation> + </message> + <message> + <source>Bytes Sent</source> + <translation>Tavua lähetetty</translation> + </message> + <message> + <source>Bytes Received</source> + <translation>Tavua vastaanotettu</translation> + </message> + <message> + <source>Ping Time</source> + <translation>Vasteaika</translation> + </message> + <message> <source>Last block time</source> <translation>Viimeisimmän lohkon aika</translation> </message> @@ -1408,18 +1453,10 @@ Osoite: %4</translation> <translation>Debug lokitiedosto</translation> </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>Avaa lokitiedosto nykyisestä data-kansiosta. Tämä voi viedä useamman sekunnin, jos lokitiedosto on iso.</translation> - </message> - <message> <source>Clear console</source> <translation>Tyhjennä konsoli</translation> </message> <message> - <source>Welcome to the Bitcoin RPC console.</source> - <translation>Tervetuloa Bitcoin RPC konsoliin.</translation> - </message> - <message> <source>Use up and down arrows to navigate history, and <b>Ctrl-L</b> to clear screen.</source> <translation>Ylös- ja alas-nuolet selaavat historiaa ja <b>Ctrl-L</b> tyhjentää ruudun.</translation> </message> @@ -1444,10 +1481,30 @@ Osoite: %4</translation> <translation>%1 GB</translation> </message> <message> + <source>via %1</source> + <translation>%1 kautta</translation> + </message> + <message> + <source>never</source> + <translation>ei koskaan</translation> + </message> + <message> + <source>Inbound</source> + <translation>Sisääntuleva</translation> + </message> + <message> + <source>Outbound</source> + <translation>Ulosmenevä</translation> + </message> + <message> <source>Unknown</source> <translation>Tuntematon</translation> </message> - </context> + <message> + <source>Fetching...</source> + <translation>Hankitaan...</translation> + </message> +</context> <context> <name>ReceiveCoinsDialog</name> <message> @@ -1676,6 +1733,58 @@ Osoite: %4</translation> <translation>Kustomoitu vaihtorahan osoite</translation> </message> <message> + <source>Transaction Fee:</source> + <translation>Rahansiirtokulu:</translation> + </message> + <message> + <source>Choose...</source> + <translation>Valitse...</translation> + </message> + <message> + <source>collapse fee-settings</source> + <translation>pudota kulujen asetukset</translation> + </message> + <message> + <source>per kilobyte</source> + <translation>per kilotavu</translation> + </message> + <message> + <source>total at least</source> + <translation>yhteensä ainakin</translation> + </message> + <message> + <source>(read the tooltip)</source> + <translation>(lue työkaluvinkki)</translation> + </message> + <message> + <source>Recommended:</source> + <translation>Suositeltu:</translation> + </message> + <message> + <source>Custom:</source> + <translation>Muokattu:</translation> + </message> + <message> + <source>Confirmation time:</source> + <translation>Vahvistusaika:</translation> + </message> + <message> + <source>normal</source> + <translation>normaali</translation> + </message> + <message> + <source>fast</source> + <translation>nopea</translation> + </message> + <message> + <source>Send as zero-fee transaction if possible</source> + <translation>Lähetä siirtokuluttomana jos mahdollista</translation> + </message> + <message> + <source>(confirmation may take longer)</source> + <translation>(vahvistaminen voi viedä kauemmin)</translation> + </message> + <message> <source>Send to multiple recipients at once</source> <translation>Lähetä usealla vastaanottajalle samanaikaisesti</translation> </message> @@ -1752,10 +1861,6 @@ Osoite: %4</translation> <translation>tai</translation> </message> <message> - <source>The recipient address is not valid, please recheck.</source> - <translation>Vastaanottajan osoite on virheellinen. Tarkista osoite.</translation> - </message> - <message> <source>The amount to pay must be larger than 0.</source> <translation>Maksettavan summan tulee olla suurempi kuin 0 Bitcoinia.</translation> </message> @@ -1768,10 +1873,6 @@ Osoite: %4</translation> <translation>Kokonaismäärä ylittää saldosi kun %1 maksukulu lisätään summaan.</translation> </message> <message> - <source>Duplicate address found, can only send to each address once per send operation.</source> - <translation>Sama osoite toistuu useamman kerran. Samaan osoitteeseen voi lähettää vain kerran per maksu.</translation> - </message> - <message> <source>Transaction creation failed!</source> <translation>Rahansiirron luonti epäonnistui!</translation> </message> @@ -1780,6 +1881,10 @@ Osoite: %4</translation> <translation>Rahansiirto hylättiin! Tämä saattaa tapahtua jos lompakossa olevat kolikot on jo kulutettu, kuten jos käytät kopioita wallet.dat tiedostosta ja kolikot oli jos käytetty mutta ei merkattu täällä.</translation> </message> <message> + <source>Pay only the minimum fee of %1</source> + <translation>Maksa vain vähimmäiskulu %1</translation> + </message> + <message> <source>Warning: Invalid Bitcoin address</source> <translation>Varoitus: Virheellinen Bitcoin osoite</translation> </message> @@ -1831,6 +1936,10 @@ Osoite: %4</translation> <translation>Tämä on normaali maksu.</translation> </message> <message> + <source>The Bitcoin address to send the payment to</source> + <translation>Bitcoin-osoite johon maksu lähetetään</translation> + </message> + <message> <source>Alt+A</source> <translation>Alt+A</translation> </message> @@ -1851,10 +1960,6 @@ Osoite: %4</translation> <translation>Viesti:</translation> </message> <message> - <source>This is a verified payment request.</source> - <translation>Tämä on varmistettu maksupyyntö.</translation> - </message> - <message> <source>Enter a label for this address to add it to the list of used addresses</source> <translation>Aseta nimi tälle osoitteelle lisätäksesi sen käytettyjen osoitteiden listalle.</translation> </message> @@ -1863,10 +1968,6 @@ Osoite: %4</translation> <translation>Viesti joka liitettiin bitcoin: URI:iin tallennetaan rahansiirtoon viitteeksi. Tätä viestiä ei lähetetä Bitcoin-verkkoon.</translation> </message> <message> - <source>This is an unverified payment request.</source> - <translation>Tämä on varmistamaton maksupyyntö</translation> - </message> - <message> <source>Pay To:</source> <translation>Saaja:</translation> </message> @@ -1897,8 +1998,8 @@ Osoite: %4</translation> <translation>&Allekirjoita viesti</translation> </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>Voit allekirjoittaa viestit omalla osoitteellasi todistaaksesi että omistat ne. Ole huolellinen, että et allekirjoita mitään epämääräistä, phishing-hyökkääjät voivat huijata sinua allekirjoittamaan luovuttamalla henkilöllisyytesi. Allekirjoita selvitys täysin yksityiskohtaisesti mihin olet sitoutunut.</translation> + <source>The Bitcoin address to sign the message with</source> + <translation>Bitcoin-osoite jolla viesti allekirjoitetaan</translation> </message> <message> <source>Choose previously used address</source> @@ -1949,8 +2050,8 @@ Osoite: %4</translation> <translation>&Varmista viesti</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>Syötä allekirjoittava osoite, viesti ja allekirjoitus alla oleviin kenttiin varmistaaksesi allekirjoituksen aitouden. Varmista että kopioit kaikki kentät täsmälleen oikein, myös rivinvaihdot, välilyönnit, tabulaattorit, jne.</translation> + <source>The Bitcoin address the message was signed with</source> + <translation>Bitcoin-osoite jolla viesti on allekirjoitettu</translation> </message> <message> <source>Verify the message to ensure it was signed with the specified Bitcoin address</source> @@ -2094,6 +2195,10 @@ Osoite: %4</translation> <translation>oma osoite</translation> </message> <message> + <source>watch-only</source> + <translation>vain katseltava</translation> + </message> + <message> <source>label</source> <translation>nimi</translation> </message> @@ -2114,6 +2219,14 @@ Osoite: %4</translation> <translation>Debit</translation> </message> <message> + <source>Total debit</source> + <translation>Yhteensä debit</translation> + </message> + <message> + <source>Total credit</source> + <translation>Yhteensä credit</translation> + </message> + <message> <source>Transaction fee</source> <translation>Maksukulu</translation> </message> @@ -2200,10 +2313,6 @@ Osoite: %4</translation> <translation>Laatu</translation> </message> <message> - <source>Address</source> - <translation>Osoite</translation> - </message> - <message> <source>Immature (%1 confirmations, will be available after %2)</source> <translation>Epäkypsä (%1 varmistusta, saatavilla %2 jälkeen)</translation> </message> @@ -2232,6 +2341,10 @@ Osoite: %4</translation> <translation>Offline</translation> </message> <message> + <source>Label</source> + <translation>Nimi</translation> + </message> + <message> <source>Unconfirmed</source> <translation>Varmistamaton</translation> </message> @@ -2264,6 +2377,10 @@ Osoite: %4</translation> <translation>Louhittu</translation> </message> <message> + <source>watch-only</source> + <translation>vain katseltava</translation> + </message> + <message> <source>(n/a)</source> <translation>(ei saatavilla)</translation> </message> @@ -2280,10 +2397,6 @@ Osoite: %4</translation> <translation>Rahansiirron laatu.</translation> </message> <message> - <source>Destination address of transaction.</source> - <translation>Rahansiirron kohteen Bitcoin-osoite</translation> - </message> - <message> <source>Amount removed from or added to balance.</source> <translation>Saldoon lisätty tai siitä vähennetty määrä.</translation> </message> @@ -2375,6 +2488,10 @@ Osoite: %4</translation> <translation>Vie rahansiirtohistoria</translation> </message> <message> + <source>Watch-only</source> + <translation>Vain katseltava</translation> + </message> + <message> <source>Exporting Failed</source> <translation>Vienti epäonnistui</translation> </message> @@ -2429,7 +2546,11 @@ Osoite: %4</translation> </context> <context> <name>UnitDisplayStatusBarControl</name> - </context> + <message> + <source>Unit to show amounts in. Click to select another unit.</source> + <translation>Yksikkö jossa määrät näytetään. Klikkaa valitaksesi toisen yksikön.</translation> + </message> +</context> <context> <name>WalletFrame</name> <message> @@ -2514,30 +2635,6 @@ Osoite: %4</translation> <translation>Hyväksy yhteyksiä ulkopuolelta (vakioasetus: 1 jos -proxy tai -connect ei määritelty)</translation> </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>%s, sinun tulee asettaa rpcpassword asetustietostossa: -%s -Suositellaan että käytät allaolevaa satunnaista salasanaa: -rpcuser=bitcoinrpc -rpcpassword=%s -(sinun ei tarvitse muistaa tätä salasanaa) -Tämän tunnuksen ja salasanan TULEE OLLA sama. -Jos tiedostoa ei ole, luo se vain omistajan-luku-oikeudella. -Suositellaan asettaa alertnotify jotta saat tietoa ongelmista; -esimerkiksi: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo.com -</translation> - </message> - <message> <source>Bind to given address and always listen on it. Use [host]:port notation for IPv6</source> <translation>Kytkeydy annettuun osoitteeseen ja pidä linja aina auki. Käytä [host]:portin merkintätapaa IPv6:lle.</translation> </message> @@ -2546,14 +2643,6 @@ esimerkiksi: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo.com <translation>Aloita regression testimoodi joka käyttää erikoisketjua jossa lohkoja voidaan ratkaista välittömästi.</translation> </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>Virhe: Rahansiirto hylättiin! Tämä saattaa tapahtua jos jotkut kolikot lompakossa on jo käytetty. Esimerkiksi jos kopioit wallet.dat tiedoston ja kolikot on käytetty mutta ei merkattu täällä.</translation> - </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>Virhe: Tämä rahansiirto vaatii rahansiirtopalkkion vähintään %s johtuen sen määrästä, monimutkaisuudesta tai hiljattain vastaanotettujen summien käytöstä</translation> - </message> - <message> <source>Execute command when a wallet transaction changes (%s in cmd is replaced by TxID)</source> <translation>Suorita käsky kun lompakossa rahansiirto muuttuu (%s cmd on vaihdettu TxID kanssa)</translation> </message> @@ -2626,10 +2715,6 @@ esimerkiksi: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo.com <translation>Debuggaus/Testauksen valinnat:</translation> </message> <message> - <source>Discover own IP address (default: 1 when listening and no -externalip)</source> - <translation>Hae oma IP osoite (vakioasetus: 1 kun kuuntelemassa ja ei -externalip)</translation> - </message> - <message> <source>Do not load the wallet and disable wallet RPC calls</source> <translation>Älä lataa lompakkoa ja poista lompakon RPC kutsut</translation> </message> @@ -2658,10 +2743,6 @@ esimerkiksi: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo.com <translation>Varoitus: Levytila on vähissä!</translation> </message> <message> - <source>Error: Wallet locked, unable to create transaction!</source> - <translation>Virhe: Lompakko on lukittu, rahansiirtoa ei voida luoda</translation> - </message> - <message> <source>Failed to listen on any port. Use -listen=0 if you want this.</source> <translation>Ei onnistuttu kuuntelemaan missään portissa. Käytä -listen=0 jos haluat tätä.</translation> </message> @@ -2686,10 +2767,6 @@ esimerkiksi: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo.com <translation>Ei tarpeeksi tiedostomerkintöjä vapaana.</translation> </message> <message> - <source>Rebuild block chain index from current blk000??.dat files</source> - <translation>Uudelleenrakenna lohkoketjuindeksi nykyisistä blk000??.dat tiedostoista</translation> - </message> - <message> <source>Set database cache size in megabytes (%d to %d, default: %d)</source> <translation>Aseta tietokannan välimuistin koko megatavuissa (%d - %d, oletus: %d</translation> </message> @@ -2706,6 +2783,10 @@ esimerkiksi: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo.com <translation>Tämä on tarkoitettu regression testityökaluille ja ohjelman kehittämiseen.</translation> </message> <message> + <source>Use UPnP to map the listening port (default: %u)</source> + <translation>Käytä UPnP:ta kuuntelevan portin kartoittamiseen (oletus: %u)</translation> + </message> + <message> <source>Verifying blocks...</source> <translation>Varmistetaan lohkoja...</translation> </message> @@ -2742,6 +2823,14 @@ esimerkiksi: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo.com <translation>Aseta maksimikoko korkea prioriteetti/pieni palkkio rahansiirtoihin tavuissa (oletus: %d)</translation> </message> <message> + <source>Set the number of threads for coin generation if enabled (-1 = all cores, default: %d)</source> + <translation>Aseta kolikoiden luomiseen tarkoitettujen säikeiden lukumäärä (-1 = kaikki ytimet, oletus: %d)</translation> + </message> + <message> + <source>Choose data directory on startup (default: 0)</source> + <translation>Valitse data-hakemisto käynnistyksessä (oletus: 0)</translation> + </message> + <message> <source>Connect through SOCKS5 proxy</source> <translation>Yhdistä SOCKS5 proxin kautta</translation> </message> @@ -2766,8 +2855,8 @@ esimerkiksi: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo.com <translation>Virheellinen määrä -mintxfee=<amount>: '%s'</translation> </message> <message> - <source>Print block on startup, if found in block index</source> - <translation>Tulosta lohko käynnistyksessä jos löydetään lohkoindeksistä</translation> + <source>Node relay options:</source> + <translation>Välityssolmukohdan asetukset:</translation> </message> <message> <source>RPC SSL options: (see the Bitcoin Wiki for SSL setup instructions)</source> @@ -2790,10 +2879,22 @@ esimerkiksi: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo.com <translation>Lähetä jäljitys/debug-tieto konsoliin, debug.log-tiedoston sijaan</translation> </message> <message> + <source>Set SSL root certificates for payment request (default: -system-)</source> + <translation>Aseta SSL root varmenne maksupyynnöille (oletus: -system-)</translation> + </message> + <message> + <source>Set language, for example "de_DE" (default: system locale)</source> + <translation>Set language, for example "de_DE" (default: system locale)</translation> + </message> + <message> <source>Show all debugging options (usage: --help -help-debug)</source> <translation>Näytä kaikki debuggaus valinnat: (käyttö: --help -help-debug)</translation> </message> <message> + <source>Show splash screen on startup (default: 1)</source> + <translation>Näytä aloitusruutu käynnistettäessä (oletus: 1)</translation> + </message> + <message> <source>Shrink debug.log file on client startup (default: 1 when no -debug)</source> <translation>Pienennä debug.log tiedosto käynnistyksen yhteydessä (vakioasetus: 1 kun ei -debug)</translation> </message> @@ -2802,6 +2903,14 @@ esimerkiksi: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo.com <translation>Siirron vahvistus epäonnistui</translation> </message> <message> + <source>Start minimized</source> + <translation>Käynnistä pienennettynä</translation> + </message> + <message> + <source>This is experimental software.</source> + <translation>Tämä on ohjelmistoa kokeelliseen käyttöön.</translation> + </message> + <message> <source>Transaction amount too small</source> <translation>Siirtosumma liian pieni</translation> </message> @@ -2830,10 +2939,6 @@ esimerkiksi: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo.com <translation>Varoitus</translation> </message> <message> - <source>Warning: This version is obsolete, upgrade required!</source> - <translation>Varoitus: Tämä versio on vanhentunut, päivitys tarpeen!</translation> - </message> - <message> <source>Zapping all transactions from wallet...</source> <translation>Tyhjennetään kaikki rahansiirrot lompakosta....</translation> </message> @@ -2882,14 +2987,70 @@ esimerkiksi: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo.com <translation>Virhe ladattaessa wallet.dat-tiedostoa: Lompakko vioittunut</translation> </message> <message> + <source>(default: %s)</source> + <translation>(oletus: %s)</translation> + </message> + <message> + <source>Acceptable ciphers (default: %s)</source> + <translation>Hyväksyttävät salaukset (oletus: %s)</translation> + </message> + <message> <source>Error loading wallet.dat</source> <translation>Virhe ladattaessa wallet.dat-tiedostoa</translation> </message> <message> + <source>Force safe mode (default: %u)</source> + <translation>Pakota yhteensopivuustila (oletus: %u)</translation> + </message> + <message> + <source>Generate coins (default: %u)</source> + <translation>Luo kolikoita (oletus: %u)</translation> + </message> + <message> + <source>How many blocks to check at startup (default: %u, 0 = all)</source> + <translation>Kuinka monta lohkoa tarkistetaan käynnistyksessä (oletus: %u, 0 = kaikki)</translation> + </message> + <message> + <source>Include IP addresses in debug output (default: %u)</source> + <translation>Sisällytä IP-osoitteet virheenkorjauslokissa (oletus: %u)</translation> + </message> + <message> <source>Invalid -proxy address: '%s'</source> <translation>Virheellinen proxy-osoite '%s'</translation> </message> <message> + <source>Relay non-P2SH multisig (default: %u)</source> + <translation>Välitä ei-P2SH-multisig (oletus: %u)</translation> + </message> + <message> + <source>Server certificate file (default: %s)</source> + <translation>Palvelimen sertifikaattitiedosto (oletus: %s)</translation> + </message> + <message> + <source>Server private key (default: %s)</source> + <translation>Palvelimen private key (oletus: %s)</translation> + </message> + <message> + <source>Set key pool size to <n> (default: %u)</source> + <translation>Aseta avainaltaan kooksi <n> (oletus: %u)</translation> + </message> + <message> + <source>Set minimum block size in bytes (default: %u)</source> + <translation>Aseta pienin mahdollinen lohkokoko tavuina (oletus: %u)</translation> + </message> + <message> + <source>Set the number of threads to service RPC calls (default: %d)</source> + <translation>Aseta RPC-kutsujen palvelemiseen tarkoitettujen säikeiden lukumäärä (oletus: %d)</translation> + </message> + <message> + <source>Specify configuration file (default: %s)</source> + <translation>Määritä asetustiedosto (oletus: %s)</translation> + </message> + <message> + <source>Specify pid file (default: %s)</source> + <translation>Määritä pid-tiedosto (oletus: %s)</translation> + </message> + <message> <source>Unknown network specified in -onlynet: '%s'</source> <translation>Tuntematon verkko -onlynet parametrina: '%s'</translation> </message> @@ -2906,10 +3067,6 @@ esimerkiksi: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo.com <translation>-paytxfee=<amount>: '%s' on virheellinen</translation> </message> <message> - <source>Invalid amount</source> - <translation>Virheellinen määrä</translation> - </message> - <message> <source>Insufficient funds</source> <translation>Lompakon saldo ei riitä</translation> </message> @@ -2942,10 +3099,6 @@ esimerkiksi: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo.com <translation>Lataus on valmis</translation> </message> <message> - <source>To use the %s option</source> - <translation>Käytä %s optiota</translation> - </message> - <message> <source>Error</source> <translation>Virhe</translation> </message> diff --git a/src/qt/locale/bitcoin_fr.ts b/src/qt/locale/bitcoin_fr.ts index 71a1519411..fe4288467b 100644 --- a/src/qt/locale/bitcoin_fr.ts +++ b/src/qt/locale/bitcoin_fr.ts @@ -1,9 +1,9 @@ -<TS language="fr" version="2.0"> +<TS language="fr" version="2.1"> <context> <name>AddressBookPage</name> <message> - <source>Double-click to edit address or label</source> - <translation>Double cliquer afin de modifier l'adresse ou l'étiquette</translation> + <source>Right-click to edit address or label</source> + <translation>Cliquer à droite pour modifier l'adresse ou l'étiquette</translation> </message> <message> <source>Create a new address</source> @@ -156,10 +156,6 @@ <translation>Changer la phrase de passe</translation> </message> <message> - <source>Enter the old and new passphrase to the wallet.</source> - <translation>Saisir l’ancienne phrase de passe pour le portefeuille ainsi que la nouvelle.</translation> - </message> - <message> <source>Confirm wallet encryption</source> <translation>Confirmer le chiffrement du portefeuille</translation> </message> @@ -172,6 +168,10 @@ <translation>Êtes-vous sûr de vouloir chiffrer votre portefeuille ?</translation> </message> <message> + <source>Bitcoin Core will close now to finish the encryption process. Remember that encrypting your wallet cannot fully protect your bitcoins from being stolen by malware infecting your computer.</source> + <translation>Bitcoin Core va maintenant se fermer pour terminer le processus de chiffrement. Souvenez-vous que le chiffrement de votre portefeuille ne peut pas vous protéger complètement contre le vol de vos bitcoins par des programmes malveillants infectant votre ordinateur.</translation> + </message> + <message> <source>IMPORTANT: Any previous backups you have made of your wallet file should be replaced with the newly generated, encrypted wallet file. For security reasons, previous backups of the unencrypted wallet file will become useless as soon as you start using the new, encrypted wallet.</source> <translation>IMPORTANT : Toute sauvegarde précédente de votre fichier de portefeuille devrait être remplacée par le nouveau fichier de portefeuille chiffré. Pour des raisons de sécurité, les sauvegardes précédentes de votre fichier de portefeuille non chiffré deviendront inutilisables dès que vous commencerez à utiliser le nouveau portefeuille chiffré.</translation> </message> @@ -188,8 +188,8 @@ <translation>Saisissez une nouvelle phrase de passe pour le portefeuille.<br/>Veuillez utiliser une phrase composée de <b>dix caractères aléatoires ou plus</b>, ou bien de <b>huit mots ou plus</b>.</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>Bitcoin va à présent se fermer pour terminer le chiffrement. N'oubliez pas que le chiffrement de votre portefeuille n'est pas une protection totale contre le vol par des logiciels malveillants qui infecteraient votre ordinateur.</translation> + <source>Enter the old passphrase and new passphrase to the wallet.</source> + <translation>Saisir l'ancienne phrase de passe puis la nouvelle phrase de passe du portefeuille.</translation> </message> <message> <source>Wallet encryption failed</source> @@ -300,7 +300,7 @@ </message> <message> <source>Importing blocks from disk...</source> - <translation>Importation des blocs depuis le disque...</translation> + <translation>Importation des blocs à partir du disque...</translation> </message> <message> <source>Reindexing blocks on disk...</source> @@ -311,10 +311,6 @@ <translation>Envoyer des pièces à une adresse Bitcoin</translation> </message> <message> - <source>Modify configuration options for Bitcoin</source> - <translation>Modifier les options de configuration de Bitcoin</translation> - </message> - <message> <source>Backup wallet to another location</source> <translation>Sauvegarder le portefeuille vers un autre emplacement</translation> </message> @@ -403,6 +399,10 @@ <translation>À &propos de Bitcoin Core</translation> </message> <message> + <source>Modify configuration options for Bitcoin Core</source> + <translation>Modifier les options de configuration de Bitcoin Core</translation> + </message> + <message> <source>Show the list of used sending addresses and labels</source> <translation>Afficher la liste d'adresses d'envoi et d'étiquettes utilisées</translation> </message> @@ -431,6 +431,10 @@ <translation>Aucune source de blocs disponible...</translation> </message> <message numerus="yes"> + <source>Processed %n block(s) of transaction history.</source> + <translation><numerusform>%n bloc d'historique transactionnel a été traité</numerusform><numerusform>%n blocs d'historique transactionnel ont été traités</numerusform></translation> + </message> + <message numerus="yes"> <source>%n hour(s)</source> <translation><numerusform>%n heure</numerusform><numerusform>%n heures</numerusform></translation> </message> @@ -478,35 +482,49 @@ <source>Up to date</source> <translation>À jour</translation> </message> - <message numerus="yes"> - <source>Processed %n blocks of transaction history.</source> - <translation><numerusform>%n bloc de l'historique transactionnel a été traité</numerusform><numerusform>%n blocs de l'historique transactionnel ont été traités</numerusform></translation> - </message> <message> <source>Catching up...</source> <translation>Rattrapage en cours…</translation> </message> <message> - <source>Sent transaction</source> - <translation>Transaction envoyée</translation> + <source>Date: %1 +</source> + <translation>Date : %1 +</translation> </message> <message> - <source>Incoming transaction</source> - <translation>Transaction entrante</translation> + <source>Amount: %1 +</source> + <translation>Montant : %1 +</translation> </message> <message> - <source>Date: %1 -Amount: %2 -Type: %3 -Address: %4 + <source>Type: %1 +</source> + <translation>Type : %1 +</translation> + </message> + <message> + <source>Label: %1 </source> - <translation>Date : %1 -Montant : %2 -Type : %3 -Adresse : %4 + <translation>Étiquette : %1 </translation> </message> <message> + <source>Address: %1 +</source> + <translation>Adresse : %1 +</translation> + </message> + <message> + <source>Sent transaction</source> + <translation>Transaction envoyée</translation> + </message> + <message> + <source>Incoming transaction</source> + <translation>Transaction entrante</translation> + </message> + <message> <source>Wallet is <b>encrypted</b> and currently <b>unlocked</b></source> <translation>Le portefeuille est <b>chiffré</b> et est actuellement <b>déverrouillé</b></translation> </message> @@ -697,6 +715,14 @@ Adresse : %4 <translation>aucun</translation> </message> <message> + <source>This label turns red if the transaction size is greater than 1000 bytes.</source> + <translation>Cette étiquette devient rouge si la taille de la transaction est plus grande que 1 000 octets.</translation> + </message> + <message> + <source>This label turns red if the priority is smaller than "medium".</source> + <translation>Cette étiquette devient rouge si la priorité est plus basse que « moyenne ».</translation> + </message> + <message> <source>Can vary +/- %1 satoshi(s) per input.</source> <translation>Peut varier +/- %1 satoshi(s) par entrée.</translation> </message> @@ -709,10 +735,6 @@ Adresse : %4 <translation>non</translation> </message> <message> - <source>This label turns red, if the transaction size is greater than 1000 bytes.</source> - <translation>Cette étiquette devient rouge si la taille de la transaction est plus grande que 1 000 octets.</translation> - </message> - <message> <source>This means a fee of at least %1 per kB is required.</source> <translation>Ceci signifie que des frais d'au moins %1 par ko sont exigés.</translation> </message> @@ -725,10 +747,6 @@ Adresse : %4 <translation>Les transactions à priorité plus haute sont plus à même d'être incluses dans un bloc.</translation> </message> <message> - <source>This label turns red, if the priority is smaller than "medium".</source> - <translation>Cette étiquette devient rouge si la priorité est plus basse que « moyenne »</translation> - </message> - <message> <source>(no label)</source> <translation>(aucune étiquette)</translation> </message> @@ -849,30 +867,6 @@ Adresse : %4 <source>command-line options</source> <translation>options de ligne de commande</translation> </message> - <message> - <source>UI options</source> - <translation>Options de l'interface utilisateur</translation> - </message> - <message> - <source>Set language, for example "de_DE" (default: system locale)</source> - <translation>Définir la langue, par exemple « fr_CA » (par défaut : la langue du système)</translation> - </message> - <message> - <source>Start minimized</source> - <translation>Démarrer minimisé</translation> - </message> - <message> - <source>Set SSL root certificates for payment request (default: -system-)</source> - <translation>Définir les certificats SSL racine pour les requêtes de paiement (par défaut : -système-)</translation> - </message> - <message> - <source>Show splash screen on startup (default: 1)</source> - <translation>Afficher l'écran d'accueil au démarrage (par défaut : 1)</translation> - </message> - <message> - <source>Choose data directory on startup (default: 0)</source> - <translation>Choisir un répertoire de données au démarrage (par défaut : 0)</translation> - </message> </context> <context> <name>Intro</name> @@ -951,14 +945,6 @@ Adresse : %4 <translation>Réglages &principaux</translation> </message> <message> - <source>Automatically start Bitcoin after logging in to the system.</source> - <translation>Démarrer Bitcoin automatiquement après avoir ouvert une session sur l'ordinateur.</translation> - </message> - <message> - <source>&Start Bitcoin on system login</source> - <translation>&Démarrer Bitcoin lors de l'ouverture d'une session</translation> - </message> - <message> <source>Size of &database cache</source> <translation>Taille du cache de la base de &données</translation> </message> @@ -983,6 +969,14 @@ Adresse : %4 <translation>Adresse IP du mandataire (par ex. IPv4 : 127.0.0.1 / IPv6 : ::1)</translation> </message> <message> + <source>Minimize instead of exit the application when the window is closed. When this option is enabled, the application will be closed only after selecting Exit in the menu.</source> + <translation>Minimiser au lieu de quitter l'application lorsque la fenêtre est fermée. Si cette option est activée, l'application ne sera fermée qu'en sélectionnant Quitter dans le menu.</translation> + </message> + <message> + <source>The user interface language can be set here. This setting will take effect after restarting Bitcoin Core.</source> + <translation>La langue de l'interface utilisateur peut être définie ici. Ce réglage sera pris en compte après redémarrage de Bitcoin.</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> @@ -1007,6 +1001,14 @@ Adresse : %4 <translation>&Réseau</translation> </message> <message> + <source>Automatically start Bitcoin Core after logging in to the system.</source> + <translation>Démarrer Bitcoin Core automatiquement après avoir ouvert une session sur le système.</translation> + </message> + <message> + <source>&Start Bitcoin Core on system login</source> + <translation>&Démarrer Bitcoin Core lors de l'ouverture d'une session</translation> + </message> + <message> <source>(0 = auto, <0 = leave that many cores free)</source> <translation>(0 = auto, < 0 = laisser ce nombre de cœurs inutilisés)</translation> </message> @@ -1071,10 +1073,6 @@ Adresse : %4 <translation>&Minimiser dans la barre système au lieu de la barre des tâches</translation> </message> <message> - <source>Minimize instead of exit the application when the window is closed. When this option is enabled, the application will be closed only after selecting Quit in the menu.</source> - <translation>Minimiser au lieu de quitter l'application lorsque la fenêtre est fermée. Si cette option est activée, l'application ne pourra être fermée qu'en sélectionnant Quitter dans le menu.</translation> - </message> - <message> <source>M&inimize on close</source> <translation>M&inimiser lors de la fermeture</translation> </message> @@ -1087,10 +1085,6 @@ Adresse : %4 <translation>&Langue de l'interface utilisateur :</translation> </message> <message> - <source>The user interface language can be set here. This setting will take effect after restarting Bitcoin.</source> - <translation>La langue de l'interface utilisateur peut être définie ici. Ce réglage sera pris en compte après redémarrage de Bitcoin.</translation> - </message> - <message> <source>&Unit to show amounts in:</source> <translation>&Unité d'affichage des montants :</translation> </message> @@ -1127,8 +1121,8 @@ Adresse : %4 <translation>Le redémarrage du client est nécessaire pour activer les changements.</translation> </message> <message> - <source>Client will be shutdown, do you want to proceed?</source> - <translation>Le client sera arrêté, voulez-vous continuer?</translation> + <source>Client will be shut down. Do you want to proceed?</source> + <translation>Le client sera arrêté. Voulez-vous continuer ?</translation> </message> <message> <source>This change would require a client restart.</source> @@ -1237,10 +1231,6 @@ Adresse : %4 <translation>Le réseau de la demande de paiement ne correspond pas au réseau du client.</translation> </message> <message> - <source>Payment request has expired.</source> - <translation>La demande de paiement est expirée.</translation> - </message> - <message> <source>Payment request is not initialized.</source> <translation>La demande de paiement n'est pas initialisée.</translation> </message> @@ -1273,14 +1263,30 @@ Adresse : %4 <translation>Le fichier de demande de paiement ne peut pas être lu ! Ceci peut être causé par un fichier de demande de paiement invalide.</translation> </message> <message> + <source>Payment request expired.</source> + <translation>Demande de paiement expirée.</translation> + </message> + <message> <source>Unverified payment requests to custom payment scripts are unsupported.</source> <translation>Les demandes de paiements non vérifiées à des scripts de paiement personnalisés ne sont pas prises en charge.</translation> </message> <message> + <source>Invalid payment request.</source> + <translation>Demande de paiement invalide.</translation> + </message> + <message> <source>Refund from %1</source> <translation>Remboursement de %1</translation> </message> <message> + <source>Payment request %1 is too large (%2 bytes, allowed %3 bytes).</source> + <translation>La demande de paiement %1 est trop grande (%2 octets, %3 octets permis).</translation> + </message> + <message> + <source>Payment request DoS protection</source> + <translation>Protection DdS des demandes de paiement</translation> + </message> + <message> <source>Error communicating with %1: %2</source> <translation>Erreur de communication avec %1 : %2</translation> </message> @@ -1308,8 +1314,8 @@ Adresse : %4 <translation>Agent utilisateur</translation> </message> <message> - <source>Address/Hostname</source> - <translation>Adresse/nom d'hôte</translation> + <source>Node/Service</source> + <translation>Nœud/service</translation> </message> <message> <source>Ping Time</source> @@ -1343,14 +1349,6 @@ Adresse : %4 <translation>%1 s</translation> </message> <message> - <source>NETWORK</source> - <translation>RÉSEAU</translation> - </message> - <message> - <source>UNKNOWN</source> - <translation>INCONNU</translation> - </message> - <message> <source>None</source> <translation>Aucun</translation> </message> @@ -1441,6 +1439,10 @@ Adresse : %4 <translation>Nombre actuel de blocs</translation> </message> <message> + <source>Open the Bitcoin Core debug log file from the current data directory. This can take a few seconds for large log files.</source> + <translation>Ouvrir le journal de débogage du répertoire de données actuel. Ceci pourrait prendre quelques secondes pour les gros fichiers de journalisation.</translation> + </message> + <message> <source>Received</source> <translation>Reçu</translation> </message> @@ -1509,6 +1511,10 @@ Adresse : %4 <translation>Temps de ping</translation> </message> <message> + <source>Time Offset</source> + <translation>Décalage temporel</translation> + </message> + <message> <source>Last block time</source> <translation>Horodatage du dernier bloc</translation> </message> @@ -1549,16 +1555,12 @@ Adresse : %4 <translation>Journal de débogage</translation> </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>Ouvrir le journal de débogage de Bitcoin depuis le répertoire de données actuel. Ceci peut prendre quelques secondes pour les journaux de grande taille.</translation> - </message> - <message> <source>Clear console</source> <translation>Nettoyer la console</translation> </message> <message> - <source>Welcome to the Bitcoin RPC console.</source> - <translation>Bienvenue sur la console RPC de Bitcoin.</translation> + <source>Welcome to the Bitcoin Core RPC console.</source> + <translation>Bienvenue dans le console RPC de Bitcoin Core.</translation> </message> <message> <source>Use up and down arrows to navigate history, and <b>Ctrl-L</b> to clear screen.</source> @@ -1566,7 +1568,7 @@ Adresse : %4 </message> <message> <source>Type <b>help</b> for an overview of available commands.</source> - <translation>Taper <b>help</b> pour afficher une vue générale des commandes disponibles.</translation> + <translation>Taper <b>help</b> pour afficher une vue générale des commandes proposées.</translation> </message> <message> <source>%1 B</source> @@ -1849,14 +1851,6 @@ Adresse : %4 <translation>réduire les paramètres des frais</translation> </message> <message> - <source>Minimize</source> - <translation>Minimiser</translation> - </message> - <message> - <source>If the custom fee is set to 1000 satoshis and the transaction is only 250 bytes, then "per kilobyte" only pays 250 satoshis in fee, while "at least" pays 1000 satoshis. For transactions bigger than a kilobyte both pay by kilobyte.</source> - <translation>Si les frais personnalisés sont définis à 1 000 satoshis et que la transaction est seulement de 250 octets, donc le « par kilo-octet » ne paiera que 250 satoshis de frais, alors que le « au moins » paiera 1 000 satoshis. Pour des transactions supérieures à un kilo-octet, les deux paieront par kilo-octets.</translation> - </message> - <message> <source>per kilobyte</source> <translation>par kilo-octet</translation> </message> @@ -1865,6 +1859,10 @@ Adresse : %4 <translation>Si les frais personnalisés sont définis à 1 000 satoshis et que la transaction est seulement de 250 octets, donc le « par kilo-octet » ne paiera que 250 satoshis de frais, alors que le « total au moins » paiera 1 000 satoshis. Pour des transactions supérieures à un kilo-octet, les deux paieront par kilo-octets.</translation> </message> <message> + <source>Hide</source> + <translation>Cacher</translation> + </message> + <message> <source>total at least</source> <translation>total au moins</translation> </message> @@ -1985,10 +1983,6 @@ Adresse : %4 <translation>ou</translation> </message> <message> - <source>The recipient address is not valid, please recheck.</source> - <translation>L'adresse du destinataire n’est pas valide, veuillez la vérifier.</translation> - </message> - <message> <source>The amount to pay must be larger than 0.</source> <translation>Le montant à payer doit être supérieur à 0.</translation> </message> @@ -2001,10 +1995,6 @@ Adresse : %4 <translation>Le montant dépasse votre solde lorsque les frais de transaction de %1 sont inclus.</translation> </message> <message> - <source>Duplicate address found, can only send to each address once per send operation.</source> - <translation>Adresse indentique trouvée, il n'est possible d'envoyer qu'une fois à chaque adresse par opération d'envoi.</translation> - </message> - <message> <source>Transaction creation failed!</source> <translation>La création de la transaction a échoué !</translation> </message> @@ -2013,16 +2003,28 @@ Adresse : %4 <translation>La transaction a été rejetée ! Ceci peut arriver si certaines pièces de votre portefeuille étaient déjà dépensées, par exemple si vous avez utilisé une copie de wallet.dat et que des pièces ont été dépensées dans la copie sans être marquées comme telles ici.</translation> </message> <message> - <source>A fee higher than %1 is considered an insanely high fee.</source> - <translation>Des frais supérieurs à %1 sont considérés comme follement élevés.</translation> + <source>A fee higher than %1 is considered an absurdly high fee.</source> + <translation>Des frais supérieurs à %1 sont considérés comme ridiculement élevés.</translation> + </message> + <message> + <source>Payment request expired.</source> + <translation>Demande de paiement expirée.</translation> + </message> + <message numerus="yes"> + <source>Estimated to begin confirmation within %n block(s).</source> + <translation><numerusform>Il est estimé que la confirmation commencera dans %n bloc.</numerusform><numerusform>Il est estimé que la confirmation commencera dans %n blocs.</numerusform></translation> </message> <message> <source>Pay only the minimum fee of %1</source> <translation>Payer seulement les frais minimum de %1</translation> </message> <message> - <source>Estimated to begin confirmation within %1 block(s).</source> - <translation>Début de confirmation estimé à %1 bloc(s).</translation> + <source>The recipient address is not valid. Please recheck.</source> + <translation>L'adresse du destinataire est invalide. Veuillez la vérifier.</translation> + </message> + <message> + <source>Duplicate address found: addresses should only be used once each.</source> + <translation>Adresse identique trouvée : chaque adresse ne devrait être utilisée qu'une fois.</translation> </message> <message> <source>Warning: Invalid Bitcoin address</source> @@ -2096,12 +2098,24 @@ Adresse : %4 <translation>Enlever cette entrée</translation> </message> <message> + <source>The fee will be deducted from the amount being sent. The recipient will receive less bitcoins than you enter in the amount field. If multiple recipients are selected, the fee is split equally.</source> + <translation>Les frais seront déduits du montant envoyé. Le destinataire recevra moins de bitcoins que le montant saisi dans le champ de montant. Si plusieurs destinataires sont sélectionnés, les frais seront partagés également..</translation> + </message> + <message> + <source>S&ubtract fee from amount</source> + <translation>S&oustraire les frais du montant</translation> + </message> + <message> <source>Message:</source> <translation>Message :</translation> </message> <message> - <source>This is a verified payment request.</source> - <translation>Ceci est une demande de paiement vérifiée.</translation> + <source>This is an unauthenticated payment request.</source> + <translation>Cette demande de paiement n'est pas authentifiée.</translation> + </message> + <message> + <source>This is an authenticated payment request.</source> + <translation>Cette demande de paiement est authentifiée.</translation> </message> <message> <source>Enter a label for this address to add it to the list of used addresses</source> @@ -2112,10 +2126,6 @@ Adresse : %4 <translation>Un message qui était joint à l'URI Bitcoin et qui sera stocké avec la transaction pour référence. Note : ce message ne sera pas envoyé par le réseau Bitcoin.</translation> </message> <message> - <source>This is an unverified payment request.</source> - <translation>Ceci est une demande de paiement non vérifiée.</translation> - </message> - <message> <source>Pay To:</source> <translation>Payer à :</translation> </message> @@ -2146,8 +2156,8 @@ Adresse : %4 <translation>&Signer un message</translation> </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>Vous pouvez signer des messages avec vos adresses pour prouver que vous les détenez. Faites attention de ne pas signer de vague car des attaques d'hameçonnage peuvent essayer d'usurper votre identité par votre signature. Ne signez que des déclarations entièrement détaillées et avec lesquelles vous serez d'accord.</translation> + <source>You can sign messages/agreements with your addresses to prove you can receive bitcoins sent to them. Be careful not to sign anything vague or random, as phishing attacks may try to trick you into signing your identity over to them. Only sign fully-detailed statements you agree to.</source> + <translation>Vous pouvez signer des messages/accords avec vos adresses pour prouver que vous pouvez recevoir des bitcoins à ces dernières. Faites attention de ne rien signer de vague ou au hasard, car des attaques d'hameçonnage pourraient essayer de vous faire signer avec votre identité afin de l'usurper. Ne signez que des déclarations entièrement détaillées et avec lesquelles vous êtes d'accord.</translation> </message> <message> <source>The Bitcoin address to sign the message with</source> @@ -2202,8 +2212,8 @@ Adresse : %4 <translation>&Vérifier un message</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>Saisir ci-dessous l'adresse de signature, le message (assurez-vous d'avoir copié exactement les retours à la ligne, les espaces, tabulations etc.) et la signature pour vérifier le message. Faire attention à ne pas déduire davantage de la signature que ce qui est contenu dans le message signé lui-même pour éviter d'être trompé par une attaque d'homme du milieu.</translation> + <source>Enter the receiver's address, message (ensure you copy line breaks, spaces, tabs, etc. exactly) and signature below to verify the message. Be careful not to read more into the signature than what is in the signed message itself, to avoid being tricked by a man-in-the-middle attack. Note that this only proves the signing party receives with the address, it cannot prove sendership of any transaction!</source> + <translation>Saisissez ci-dessous l'adresse de destinataire, le message (assurez-vous de copier exactement les retours à la ligne, les espaces, les tabulations, etc.) et la signature pour vérifier le message. Faites attention à ne pas déduire davantage de la signature que ce qui est contenu dans le message signé même, pour éviter d'être trompé par une attaque d'homme du milieu. Notez que ceci ne fait que prouver que le signataire reçoit l'adresse et ne peut pas prouver la provenance d'une transaction.</translation> </message> <message> <source>The Bitcoin address the message was signed with</source> @@ -2243,7 +2253,7 @@ Adresse : %4 </message> <message> <source>Private key for the entered address is not available.</source> - <translation>La clef privée pour l'adresse indiquée n'est pas disponible.</translation> + <translation>La clef privée n'est pas disponible pour l'adresse indiquée.</translation> </message> <message> <source>Message signing failed.</source> @@ -2469,10 +2479,6 @@ Adresse : %4 <translation>Type</translation> </message> <message> - <source>Address</source> - <translation>Adresse</translation> - </message> - <message> <source>Immature (%1 confirmations, will be available after %2)</source> <translation>Immature (%1 confirmations, sera disponible après %2)</translation> </message> @@ -2501,6 +2507,10 @@ Adresse : %4 <translation>Hors ligne</translation> </message> <message> + <source>Label</source> + <translation>Étiquette</translation> + </message> + <message> <source>Unconfirmed</source> <translation>Non confirmé</translation> </message> @@ -2557,8 +2567,8 @@ Adresse : %4 <translation>Une adresse juste-regarder est-elle impliquée dans cette transaction.</translation> </message> <message> - <source>Destination address of transaction.</source> - <translation>L’adresse de destination de la transaction.</translation> + <source>User-defined intent/purpose of the transaction.</source> + <translation>Intention/but de la transaction défini par l'utilisateur.</translation> </message> <message> <source>Amount removed from or added to balance.</source> @@ -2799,34 +2809,14 @@ Adresse : %4 <translation>Accepter les connexions entrantes (par défaut : 1 si aucun -proxy ou -connect )</translation> </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>%s, vous devez définir un mot de passe rpc dans le fichier de configuration : -%s -Il vous est conseillé d'utiliser le mot de passe aléatoire suivant : -rpcuser=bitcoinrpc -rpcpassword=%s -(vous n'avez pas besoin de retenir ce mot de passe) -Le nom d'utilisateur et le mot de passe NE DOIVENT PAS être identiques. -Si le fichier n'existe pas, créez-le avec les droits de lecture accordés au propriétaire. -Il est aussi conseillé de régler alertnotify pour être prévenu des problèmes ; -par exemple : alertnotify=echo %%s | mail -s "Alerte Bitcoin" admin@foo.com -</translation> - </message> - <message> <source>Bind to given address and always listen on it. Use [host]:port notation for IPv6</source> <translation>Se lier à l'adresse donnée et toujours l'écouter. Utilisez la notation [host]:port pour l'IPv6</translation> </message> <message> + <source>Continuously rate-limit free transactions to <n>*1000 bytes per minute (default: %u)</source> + <translation>Limiter continuellement les transactions gratuites à <n>*1000 octets par minute (par défaut : %u)</translation> + </message> + <message> <source>Delete all wallet transactions and only recover those parts of the blockchain through -rescan on startup</source> <translation>Supprimer toutes les transactions du portefeuille et ne récupérer que ces parties de la chaîne de bloc avec -rescan au démarrage</translation> </message> @@ -2839,14 +2829,6 @@ par exemple : alertnotify=echo %%s | mail -s "Alerte Bitcoin" admin@foo.com <translation>Passer en mode de test de régression qui utilise une chaîne spéciale dans laquelle les blocs sont résolus instantanément.</translation> </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>Erreur : La transaction a été rejetée ! Ceci peut arriver si certaines pièces de votre portefeuille étaient déjà dépensées, par exemple si vous avez utilisé une copie de wallet.dat et les pièces ont été dépensées avec cette copie sans être marquées comme tel ici.</translation> - </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>Erreur : cette transaction exige des frais de transaction d'au moins %s en raison de son montant, de sa complexité ou de l'utilisation de fonds reçus récemment !</translation> - </message> - <message> <source>Execute command when a wallet transaction changes (%s in cmd is replaced by TxID)</source> <translation>Exécuter la commande lorsqu'une transaction de portefeuille change (%s dans la commande est remplacée par TxID)</translation> </message> @@ -2855,6 +2837,14 @@ par exemple : alertnotify=echo %%s | mail -s "Alerte Bitcoin" admin@foo.com <translation>Dans ce mode -genproclimit contrôle combien de blocs sont générés immédiatement.</translation> </message> <message> + <source>Maximum total fees to use in a single wallet transaction; setting this too low may abort large transactions (default: %s)</source> + <translation>Total maximal des frais à utiliser en une seule transaction de portefeuille. Le définir trop bas pourrait interrompre les grosses transactions (par défaut : %s)</translation> + </message> + <message> + <source>Reduce storage requirements by pruning (deleting) old blocks. This mode disables wallet support and is incompatible with -txindex. Warning: Reverting this setting requires re-downloading the entire blockchain. (default: 0 = disable pruning blocks, >%u = target size in MiB to use for block files)</source> + <translation>Réduire les exigences de stockage en élaguant (supprimant) les anciens blocs. Ce mode désactive la prise en charge de portefeuilles et n'est pas compatible avec -txindex. Avertissement : configurer ce paramètre à sa valeur antérieure retéléchargera complètement la chaîne de blocs (par défaut : 0 = désactiver l'élagage des blocs, >%u = taille cible en Mo à utiliser pour les fichiers de blocs).</translation> + </message> + <message> <source>Set the number of script verification threads (%u to %d, 0 = auto, <0 = leave that many cores free, default: %d)</source> <translation>Définir le nombre d'exétrons de vérification des scripts (%u à %d, 0 = auto, < 0 = laisser ce nombre de cœurs inutilisés, par défaut : %d)</translation> </message> @@ -2923,10 +2913,6 @@ par exemple : alertnotify=echo %%s | mail -s "Alerte Bitcoin" admin@foo.com <translation>Options de test/de débogage :</translation> </message> <message> - <source>Discover own IP address (default: 1 when listening and no -externalip)</source> - <translation>Découvrir sa propre adresse IP (par défaut : 1 lors de l'écoute et si aucun -externalip)</translation> - </message> - <message> <source>Do not load the wallet and disable wallet RPC calls</source> <translation>Ne pas charger le portefeuille et désactiver les appels RPC</translation> </message> @@ -2959,10 +2945,6 @@ par exemple : alertnotify=echo %%s | mail -s "Alerte Bitcoin" admin@foo.com <translation>Erreur : l'espace disque est faible !</translation> </message> <message> - <source>Error: Wallet locked, unable to create transaction!</source> - <translation>Erreur : Portefeuille verrouillé, impossible de créer la transaction !</translation> - </message> - <message> <source>Failed to listen on any port. Use -listen=0 if you want this.</source> <translation>Échec de l'écoute sur un port quelconque. Utilisez -listen=0 si vous voulez ceci.</translation> </message> @@ -2984,15 +2966,19 @@ par exemple : alertnotify=echo %%s | mail -s "Alerte Bitcoin" admin@foo.com </message> <message> <source>Not enough file descriptors available.</source> - <translation>Pas assez de descripteurs de fichiers de disponibles.</translation> + <translation>Pas assez de descripteurs de fichiers proposés.</translation> </message> <message> <source>Only connect to nodes in network <net> (ipv4, ipv6 or onion)</source> <translation>Seulement se connecter aux nœuds du réseau <net> (IPv4, IPv6 ou oignon)</translation> </message> <message> - <source>Rebuild block chain index from current blk000??.dat files</source> - <translation>Reconstruire l'index de la chaîne de blocs à partir des fichiers blk000??.dat courants</translation> + <source>Prune cannot be configured with a negative value.</source> + <translation>L'élagage ne peut pas être configuré avec une valeur négative.</translation> + </message> + <message> + <source>Prune mode is incompatible with -txindex.</source> + <translation>Le mode élagage n'est pas compatible avec -txindex.</translation> </message> <message> <source>Set database cache size in megabytes (%d to %d, default: %d)</source> @@ -3031,6 +3017,10 @@ par exemple : alertnotify=echo %%s | mail -s "Alerte Bitcoin" admin@foo.com <translation>Options du portefeuille :</translation> </message> <message> + <source>Warning: This version is obsolete; upgrade required!</source> + <translation>Avertissement : cette version est obsolète. Une mise à niveau est exigée !</translation> + </message> + <message> <source>You need to rebuild the database using -reindex to change -txindex</source> <translation>Vous devez reconstruire la base de données en utilisant -reindex afin de modifier -txindex</translation> </message> @@ -3059,14 +3049,14 @@ par exemple : alertnotify=echo %%s | mail -s "Alerte Bitcoin" admin@foo.com <translation>Impossible d’obtenir un verrou sur le répertoire de données %s. Bitcoin Core fonctionne probablement déjà.</translation> </message> <message> - <source>Continuously rate-limit free transactions to <n>*1000 bytes per minute (default:%u)</source> - <translation>Limiter continuellement les transactions gratuites à <n>*1000 octets par minute (par défaut : %u)</translation> - </message> - <message> <source>Create new files with system default permissions, instead of umask 077 (only effective with disabled wallet functionality)</source> <translation>Créer de nouveaux fichiers avec les permissions système par défaut, au lieu de umask 077 (effectif seulement avec la fonction du portefeuille désactivée)</translation> </message> <message> + <source>Discover own IP addresses (default: 1 when listening and no -externalip or -proxy)</source> + <translation>Découvrir ses propres adresses (par défaut : 1 en écoute et sans externalip ou -proxy)</translation> + </message> + <message> <source>Error: Listening for incoming connections failed (listen returned error %s)</source> <translation>Erreur : l'écoute des connexions entrantes a échoué (l'écoute a retourné l'erreur %s)</translation> </message> @@ -3087,14 +3077,30 @@ par exemple : alertnotify=echo %%s | mail -s "Alerte Bitcoin" admin@foo.com <translation>Les frais (en BTC/Ko) inférieurs à ce seuil sont considérés comme étant nuls pour la création de transactions (par défaut : %s)</translation> </message> <message> + <source>If paytxfee is not set, include enough fee so transactions begin confirmation on average within n blocks (default: %u)</source> + <translation>Si paytxfee n'est pas défini, inclure suffisamment de frais afin que les transactions commencent la confirmation en moyenne avant n blocs (par défaut : %u)</translation> + </message> + <message> + <source>Invalid amount for -maxtxfee=<amount>: '%s' (must be at least the minrelay fee of %s to prevent stuck transactions)</source> + <translation>Montant invalide pour -maxtxfee=<amount> : « %s » (doit être au moins les frais minrelay de %s pour prévenir le blocage des transactions)</translation> + </message> + <message> <source>Maximum size of data in data carrier transactions we relay and mine (default: %u)</source> <translation>Quantité maximale de données dans les transactions du porteur de données que nous relayons et minons (par défaut : %u)</translation> </message> <message> + <source>Prune configured below the minimum of %d MB. Please use a higher number.</source> + <translation>L'élagage est configuré au-dessous du minimum de %d Mo. Veuillez utiliser un nombre plus élevé.</translation> + </message> + <message> <source>Query for peer addresses via DNS lookup, if low on addresses (default: 1 unless -connect)</source> <translation>Demander les adresses des pairs par recherche DNS si l'on manque d'adresses (par défaut : 1 sauf si -connect)</translation> </message> <message> + <source>Randomize credentials for every proxy connection. This enables Tor stream isolation (default: %u)</source> + <translation>Aléer les authentifiants pour chaque connexion mandataire. Ceci active l'isolement de flux de Tor (par défaut : %u) </translation> + </message> + <message> <source>Set maximum size of high-priority/low-fee transactions in bytes (default: %d)</source> <translation>Définir la taille maximale en octets des transactions prioritaires/à frais modiques (par défaut : %d)</translation> </message> @@ -3103,10 +3109,42 @@ par exemple : alertnotify=echo %%s | mail -s "Alerte Bitcoin" admin@foo.com <translation>Définir le nombre de fils de génération de pièces, si elle est activée (-1 = tous les cœurs, par défaut : %d)</translation> </message> <message> + <source>The transaction amount is too small to send after the fee has been deducted</source> + <translation>Le montant de la transaction est trop bas pour être envoyé une fois que les frais ont été déduits</translation> + </message> + <message> <source>This product includes software developed by the OpenSSL Project for use in the OpenSSL Toolkit <https://www.openssl.org/> and cryptographic software written by Eric Young and UPnP software written by Thomas Bernard.</source> <translation>Ce produit comprend des logiciels développés par le projet OpenSSL pour être utilisés dans la boîte à outils OpenSSL <https://www.openssl.org/> et un logiciel cryptographique écrit par Eric Young, ainsi qu'un logiciel UPnP écrit par Thomas Bernard.</translation> </message> <message> + <source>To use bitcoind, or the -server option to bitcoin-qt, you must set an 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>Pour utiliser bitcoind, ou l'option -server de bitcoin-qt, vous devez définir un mot de passe rpc dans le fichier de configuration : +%s +Il est recommandé d'utiliser le mot de passe aléatoire suivant : +rpcuser=bitcoinrpc +rpcpassword=%s +(vous n'avez pas à mémoriser ce mot de passe) +Le nom d'utilisateur et le mot de passe NE DOIVENT PAS être identiques. +Si le fichier n'existe pas, créez-le avec la permission lecture-seule-par-le-propriétaire. +Il est aussi recommandé de définir alertnotify afin que les problèmes vous soient signalés ; +par exemple : alertnotify=echo %%s | mail -s "Alerte Bitcoin" admin@foo.com +</translation> + </message> + <message> + <source>Warning: -maxtxfee is set very high! Fees this large could be paid on a single transaction.</source> + <translation>Avertissement :-maxtxfee est défini très haut ! Des frais aussi élevés pourraient être payés sur une seule transaction.</translation> + </message> + <message> <source>Warning: Please check that your computer's date and time are correct! If your clock is wrong Bitcoin Core will not work properly.</source> <translation>Avertissement : veuillez vérifier que l'heure et la date de votre ordinateur sont correctes ! Si votre horloge n'est pas à l'heure, Bitcoin Core ne fonctionnera pas correctement.</translation> </message> @@ -3115,10 +3153,38 @@ par exemple : alertnotify=echo %%s | mail -s "Alerte Bitcoin" admin@foo.com <translation>Les pairs de la liste blanche ne peuvent pas être bannis DoS et leurs transactions sont toujours relayées, même si elles sont déjà dans le mempool, utile p. ex. pour une passerelle</translation> </message> <message> + <source>You need to rebuild the database using -reindex to go back to unpruned mode. This will redownload the entire blockchain</source> + <translation>Vous devez reconstruire la base de données en utilisant -reindex afin de revenir au mode sans élagage. Ceci retéléchargera complètement la chaîne de blocs.</translation> + </message> + <message> + <source>(default: %u)</source> + <translation>(par défaut : %u)</translation> + </message> + <message> + <source>Accept public REST requests (default: %u)</source> + <translation>Accepter les demandes REST publiques (par défaut : %u)</translation> + </message> + <message> + <source>Activating best chain...</source> + <translation>Activation de la meilleure chaîne...</translation> + </message> + <message> + <source>Allow self signed root certificates (default: 0)</source> + <translation>Permettre les certificats racine autosignés (par défaut : 0)</translation> + </message> + <message> + <source>Can't run with a wallet in prune mode.</source> + <translation>L'exécution est impossible quand le portefeuille est en mode élagage.</translation> + </message> + <message> <source>Cannot resolve -whitebind address: '%s'</source> <translation>Impossible de résoudre l'adresse -whitebind : « %s »</translation> </message> <message> + <source>Choose data directory on startup (default: 0)</source> + <translation>Choisir un répertoire de données au démarrage (par défaut : 0)</translation> + </message> + <message> <source>Connect through SOCKS5 proxy</source> <translation>Se connecter par un mandataire SOCKS5</translation> </message> @@ -3135,6 +3201,10 @@ par exemple : alertnotify=echo %%s | mail -s "Alerte Bitcoin" admin@foo.com <translation>Erreur lors du chargement de wallet.dat : le portefeuille exige une version plus récente de Bitcoin Core</translation> </message> <message> + <source>Error reading from database, shutting down.</source> + <translation>Erreur de lecture de la base de données, fermeture en cours.</translation> + </message> + <message> <source>Error: Unsupported argument -tor found, use -onion.</source> <translation>Erreur : argument non pris en charge -tor trouvé, utiliser -onion.</translation> </message> @@ -3151,6 +3221,10 @@ par exemple : alertnotify=echo %%s | mail -s "Alerte Bitcoin" admin@foo.com <translation>L'initialisation du test de cohérence a échoué. Bitcoin est en cours de fermeture. </translation> </message> <message> + <source>Invalid amount for -maxtxfee=<amount>: '%s'</source> + <translation>Montant invalide pour -maxtxfee=<amount> : « %s »</translation> + </message> + <message> <source>Invalid amount for -minrelaytxfee=<amount>: '%s'</source> <translation>Montant invalide pour -minrelayfee=<montant> : « %s »</translation> </message> @@ -3167,10 +3241,6 @@ par exemple : alertnotify=echo %%s | mail -s "Alerte Bitcoin" admin@foo.com <translation>Masque réseau invalide spécifié dans -whitelist : « %s »</translation> </message> <message> - <source>Keep at most <n> unconnectable blocks in memory (default: %u)</source> - <translation>Garder au plus <n> blocs non connectables en mémoire (par défaut : %u)</translation> - </message> - <message> <source>Keep at most <n> unconnectable transactions in memory (default: %u)</source> <translation>Garder au plus <n> transactions non connectables en mémoire (par défaut : %u)</translation> </message> @@ -3183,10 +3253,6 @@ par exemple : alertnotify=echo %%s | mail -s "Alerte Bitcoin" admin@foo.com <translation>Options de relais du nœud :</translation> </message> <message> - <source>Print block on startup, if found in block index</source> - <translation>Imprimer le bloc au démarrage s'il est trouvé dans l'index des blocs</translation> - </message> - <message> <source>RPC SSL options: (see the Bitcoin Wiki for SSL setup instructions)</source> <translation>Options RPC SSL : (voir le wiki Bitcoin pour les instructions de configuration de SSL)</translation> </message> @@ -3195,6 +3261,10 @@ par exemple : alertnotify=echo %%s | mail -s "Alerte Bitcoin" admin@foo.com <translation>Options du serveur RPC :</translation> </message> <message> + <source>RPC support for HTTP persistent connections (default: %d)</source> + <translation>Prise en charge de RPC pour les connexions persistantes HTTP (par défaut : %d)</translation> + </message> + <message> <source>Randomly drop 1 of every <n> network messages</source> <translation>Abandonner aléatoirement 1 message du réseau sur <n></translation> </message> @@ -3211,10 +3281,22 @@ par exemple : alertnotify=echo %%s | mail -s "Alerte Bitcoin" admin@foo.com <translation>Envoyer si possible les transactions comme étant sans frais (par défaut : %u)</translation> </message> <message> + <source>Set SSL root certificates for payment request (default: -system-)</source> + <translation>Définir les certificats racine SSL pour les demandes de paiement (par défaut : -système-)</translation> + </message> + <message> + <source>Set language, for example "de_DE" (default: system locale)</source> + <translation>Définir la langue, par exemple « fr_CA » (par défaut : la langue du système)</translation> + </message> + <message> <source>Show all debugging options (usage: --help -help-debug)</source> <translation>Montrer toutes les options de débogage (utilisation : --help --help-debug)</translation> </message> <message> + <source>Show splash screen on startup (default: 1)</source> + <translation>Afficher la page de garde au démarrage (par défaut : 1)</translation> + </message> + <message> <source>Shrink debug.log file on client startup (default: 1 when no -debug)</source> <translation>Réduire le fichier debug.log lors du démarrage du client (par défaut : 1 lorsque -debug n'est pas présent)</translation> </message> @@ -3223,6 +3305,14 @@ par exemple : alertnotify=echo %%s | mail -s "Alerte Bitcoin" admin@foo.com <translation>La signature de la transaction a échoué</translation> </message> <message> + <source>Start minimized</source> + <translation>Démarrer minimisé</translation> + </message> + <message> + <source>The transaction amount is too small to pay the fee</source> + <translation>Le montant de la transaction est trop bas pour que les frais soient payés</translation> + </message> + <message> <source>This is experimental software.</source> <translation>Ceci est un logiciel expérimental.</translation> </message> @@ -3235,10 +3325,18 @@ par exemple : alertnotify=echo %%s | mail -s "Alerte Bitcoin" admin@foo.com <translation>Les montants de transaction doivent être positifs</translation> </message> <message> + <source>Transaction too large for fee policy</source> + <translation>La transaction est trop grosse pour la politique de frais</translation> + </message> + <message> <source>Transaction too large</source> <translation>Transaction trop volumineuse</translation> </message> <message> + <source>UI Options:</source> + <translation>Options de l'IU :</translation> + </message> + <message> <source>Unable to bind to %s on this computer (bind returned error %s)</source> <translation>Impossible de se lier à %s sur cet ordinateur (bind a retourné l'erreur %s)</translation> </message> @@ -3259,10 +3357,6 @@ par exemple : alertnotify=echo %%s | mail -s "Alerte Bitcoin" admin@foo.com <translation>Avertissement</translation> </message> <message> - <source>Warning: This version is obsolete, upgrade required!</source> - <translation>Avertissement : cette version est obsolète, une mise à niveau est nécessaire !</translation> - </message> - <message> <source>Warning: Unsupported argument -benchmark ignored, use -debug=bench.</source> <translation>Avertissement : l'argument -benchmark non pris en charge a été ignoré, utiliser -debug=bench.</translation> </message> @@ -3331,10 +3425,6 @@ par exemple : alertnotify=echo %%s | mail -s "Alerte Bitcoin" admin@foo.com <translation>Degré de profondeur de la vérification des blocs -checkblocks (0-4, par défaut : %u)</translation> </message> <message> - <source>If paytxfee is not set, include enough fee so transactions are confirmed on average within n blocks (default: %u)</source> - <translation>Si paytxfee n'est pas défini, inclure des frais suffisants afin que les transactions soient confirmées en moyenne en n blocs (par défaut : %u)</translation> - </message> - <message> <source>Log transaction priority and fee per kB when mining blocks (default: %u)</source> <translation>Lors du minage, journaliser la priorité des transactions et les frais par ko (par défaut : %u) </translation> </message> @@ -3411,6 +3501,10 @@ par exemple : alertnotify=echo %%s | mail -s "Alerte Bitcoin" admin@foo.com <translation>Garder au plus <n> connexions avec les pairs (par défaut : %u)</translation> </message> <message> + <source>Make the wallet broadcast transactions</source> + <translation>Obliger le portefeuille à diffuser les transactions</translation> + </message> + <message> <source>Maximum per-connection receive buffer, <n>*1000 bytes (default: %u)</source> <translation>Tampon maximal de réception par connexion, <n>*1000 octets (par défaut : %u)</translation> </message> @@ -3427,10 +3521,6 @@ par exemple : alertnotify=echo %%s | mail -s "Alerte Bitcoin" admin@foo.com <translation>Ajouter l'horodatage au début de la sortie de débogage (par défaut : %u)</translation> </message> <message> - <source>Print block tree on startup (default: %u)</source> - <translation>Imprimer l'arborescence des blocs au démarrage (par défaut : %u)</translation> - </message> - <message> <source>Relay and mine data carrier transactions (default: %u)</source> <translation>Relayer et miner les transactions du porteur de données (par défaut : %u)</translation> </message> @@ -3495,10 +3585,6 @@ par exemple : alertnotify=echo %%s | mail -s "Alerte Bitcoin" admin@foo.com <translation>Montant invalide pour -paytxfee=<montant> : « %s »</translation> </message> <message> - <source>Invalid amount</source> - <translation>Montant invalide</translation> - </message> - <message> <source>Insufficient funds</source> <translation>Fonds insuffisants</translation> </message> @@ -3531,10 +3617,6 @@ par exemple : alertnotify=echo %%s | mail -s "Alerte Bitcoin" admin@foo.com <translation>Chargement terminé</translation> </message> <message> - <source>To use the %s option</source> - <translation>Pour utiliser l'option %s</translation> - </message> - <message> <source>Error</source> <translation>Erreur</translation> </message> diff --git a/src/qt/locale/bitcoin_fr_CA.ts b/src/qt/locale/bitcoin_fr_CA.ts index eae0b00b76..186985d493 100644 --- a/src/qt/locale/bitcoin_fr_CA.ts +++ b/src/qt/locale/bitcoin_fr_CA.ts @@ -1,11 +1,7 @@ -<TS language="fr_CA" version="2.0"> +<TS language="fr_CA" version="2.1"> <context> <name>AddressBookPage</name> <message> - <source>Double-click to edit address or label</source> - <translation>Double-cliquez afin de modifier l'adress ou l'étiquette</translation> - </message> - <message> <source>Create a new address</source> <translation>Créer une nouvelle adresse</translation> </message> @@ -173,8 +169,8 @@ <context> <name>TransactionTableModel</name> <message> - <source>Address</source> - <translation>Addresse</translation> + <source>Label</source> + <translation>Record</translation> </message> </context> <context> diff --git a/src/qt/locale/bitcoin_gl.ts b/src/qt/locale/bitcoin_gl.ts index 2252baec73..93ece390d1 100644 --- a/src/qt/locale/bitcoin_gl.ts +++ b/src/qt/locale/bitcoin_gl.ts @@ -1,11 +1,7 @@ -<TS language="gl" version="2.0"> +<TS language="gl" version="2.1"> <context> <name>AddressBookPage</name> <message> - <source>Double-click to edit address or label</source> - <translation>Doble click para editar a dirección ou a etiqueta</translation> - </message> - <message> <source>Create a new address</source> <translation>Crear unha nova dirección</translation> </message> @@ -152,10 +148,6 @@ <translation>Cambiar contrasinal</translation> </message> <message> - <source>Enter the old and new passphrase to the wallet.</source> - <translation>Introduce o vello e novo contrasinais no moedeiro.</translation> - </message> - <message> <source>Confirm wallet encryption</source> <translation>Confirmar encriptación de moedeiro</translation> </message> @@ -180,10 +172,6 @@ <translation>Moedeiro encriptado</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>Bitcoin se pechará agora para rematar o proceso de encriptación. Lembra que encriptar o teu moedeiro non protexe totalmente os teus bitcoins de ser robados por malware que infecte o teu ordenador.</translation> - </message> - <message> <source>Wallet encryption failed</source> <translation>Encriptación de moedeiro fallida</translation> </message> @@ -283,10 +271,6 @@ <translation>Enviar moedas a unha dirección Bitcoin</translation> </message> <message> - <source>Modify configuration options for Bitcoin</source> - <translation>Modificar opcións de configuración para Bitcoin</translation> - </message> - <message> <source>Backup wallet to another location</source> <translation>Facer copia de seguridade do moedeiro noutra localización</translation> </message> @@ -382,26 +366,10 @@ <source>Open a bitcoin: URI or payment request</source> <translation>Abrir un bitcoin: URI ou solicitude de pago</translation> </message> - <message numerus="yes"> - <source>%n active connection(s) to Bitcoin network</source> - <translation><numerusform>%n conexión activa coa rede Bitcoin</numerusform><numerusform>%n conexións activas coa rede Bitcoin</numerusform></translation> - </message> <message> <source>No block source available...</source> <translation>Non hai orixe de bloques dispoñible...</translation> </message> - <message numerus="yes"> - <source>%n hour(s)</source> - <translation><numerusform>%n hora</numerusform><numerusform>%n horas</numerusform></translation> - </message> - <message numerus="yes"> - <source>%n day(s)</source> - <translation><numerusform>%n día</numerusform><numerusform>%n días</numerusform></translation> - </message> - <message numerus="yes"> - <source>%n week(s)</source> - <translation><numerusform>%n semana</numerusform><numerusform>%n semanas</numerusform></translation> - </message> <message> <source>%1 behind</source> <translation>%1 detrás</translation> @@ -443,18 +411,6 @@ <translation>Transacción entrante</translation> </message> <message> - <source>Date: %1 -Amount: %2 -Type: %3 -Address: %4 -</source> - <translation>Data: %1 -Cantidade: %2 -Tipo: %3 -Dirección: %4 -</translation> - </message> - <message> <source>Wallet is <b>encrypted</b> and currently <b>unlocked</b></source> <translation>O moedeiro está <b>encriptado</b> e actualmente <b>desbloqueado</b></translation> </message> @@ -737,26 +693,6 @@ Dirección: %4 <source>command-line options</source> <translation>opcións da liña de comandos</translation> </message> - <message> - <source>UI options</source> - <translation>opcións de UI</translation> - </message> - <message> - <source>Set language, for example "de_DE" (default: system locale)</source> - <translation>Fixar idioma, por exemplo "de_DE" (por defecto: locale del sistema)</translation> - </message> - <message> - <source>Start minimized</source> - <translation>Comezar minimizado</translation> - </message> - <message> - <source>Show splash screen on startup (default: 1)</source> - <translation>Amosar pantalla splash no arranque (por defecto: 1)</translation> - </message> - <message> - <source>Choose data directory on startup (default: 0)</source> - <translation>Escolle directorio de datos ao arrancar (por defecto: 0)</translation> - </message> </context> <context> <name>Intro</name> @@ -815,14 +751,6 @@ Dirección: %4 <translation>&Principal</translation> </message> <message> - <source>Automatically start Bitcoin after logging in to the system.</source> - <translation>Comezar Bitcoin automáticamente despois de loguearse no sistema.</translation> - </message> - <message> - <source>&Start Bitcoin on system login</source> - <translation>&Comezar Bitcoin ao facer login no sistema</translation> - </message> - <message> <source>Reset all client options to default.</source> <translation>Restaurar todas as opcións de cliente ás por defecto</translation> </message> @@ -867,10 +795,6 @@ Dirección: %4 <translation>&Minimizar á bandexa en lugar de á barra de tarefas.</translation> </message> <message> - <source>Minimize instead of exit the application when the window is closed. When this option is enabled, the application will be closed only after selecting Quit in the menu.</source> - <translation>Minimizar en lugar de saír da aplicación cando se pecha a xanela. Cando se habilita esta opción, a aplicación so se pechará tras seleccionar Saír no menú.</translation> - </message> - <message> <source>M&inimize on close</source> <translation>M&inimizar ao pechar</translation> </message> @@ -883,10 +807,6 @@ Dirección: %4 <translation>&Linguaxe de interface de usuario:</translation> </message> <message> - <source>The user interface language can be set here. This setting will take effect after restarting Bitcoin.</source> - <translation>A linguaxe de interface de usuario pode fixarse aquí. Esta configuración terá efecto tras reiniciar Bitcoin.</translation> - </message> - <message> <source>&Unit to show amounts in:</source> <translation>&Unidade na que amosar as cantidades:</translation> </message> @@ -1113,18 +1033,10 @@ Dirección: %4 <translation>Arquivo de log de depuración</translation> </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>Abrir o arquivo de log de depuración de Bitcoin dende o directorio actual de datos. Esto pode levar uns cantos segundos para grandes arquivos de log.</translation> - </message> - <message> <source>Clear console</source> <translation>Limpar consola</translation> </message> <message> - <source>Welcome to the Bitcoin RPC console.</source> - <translation>Benvido á consola RPC de Bitcoin</translation> - </message> - <message> <source>Use up and down arrows to navigate history, and <b>Ctrl-L</b> to clear screen.</source> <translation>Emprega as flechas arriba e abaixo para navegar polo historial, e <b>Ctrl-L</b> para limpar a pantalla.</translation> </message> @@ -1173,7 +1085,7 @@ Dirección: %4 </message> <message> <source>Clear all fields of the form.</source> - <translation>Limpar todos os campos do formulario</translation> + <translation>Limpar tódolos campos do formulario</translation> </message> <message> <source>Clear</source> @@ -1365,10 +1277,6 @@ Dirección: %4 <translation>Copiar cambio</translation> </message> <message> - <source>The recipient address is not valid, please recheck.</source> - <translation>A dirección de recepción non é válida, por favor compróbea.</translation> - </message> - <message> <source>The amount to pay must be larger than 0.</source> <translation>A cantidade a pagar debe ser maior que 0.</translation> </message> @@ -1381,10 +1289,6 @@ Dirección: %4 <translation>O total sobrepasa o teu balance cando se inclúe a tarifa de transacción %1.</translation> </message> <message> - <source>Duplicate address found, can only send to each address once per send operation.</source> - <translation>Atopouse dirección duplicada, so se pode enviar a cada dirección unha vez por operación.</translation> - </message> - <message> <source>Warning: Invalid Bitcoin address</source> <translation>Atención: Enderezo Bitcoin non válido</translation> </message> @@ -1448,18 +1352,10 @@ Dirección: %4 <translation>Eliminar esta entrada</translation> </message> <message> - <source>This is a verified payment request.</source> - <translation>Esta é unha solicitude de pago verificada</translation> - </message> - <message> <source>Enter a label for this address to add it to the list of used addresses</source> <translation>Introduce unha etiqueta para esta dirección para engadila á listaxe de direccións empregadas</translation> </message> <message> - <source>This is an unverified payment request.</source> - <translation>Esta é unha solicitude de pago non verificada</translation> - </message> - <message> <source>Pay To:</source> <translation>Pagar A:</translation> </message> @@ -1482,10 +1378,6 @@ Dirección: %4 <translation>&Asinar Mensaxe</translation> </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>Podes asinar mensaxes coas túas direccións para probar que ti as posees. Ten conta de non asinar nada vago, xa que hai ataques de phishing que tentarán que asines coa túa identidade por riba deles. Asina únicamente declaracións totalmente detalladas coas que esteas de acordo.</translation> - </message> - <message> <source>Choose previously used address</source> <translation>Escoller dirección previamente empregada</translation> </message> @@ -1534,10 +1426,6 @@ Dirección: %4 <translation>&Verificar Mensaxe</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>Introduce a dirección coa que asinar, a mensaxe (asegúrate de copiar exactamente os saltos de liña, espacios, tabulacións, etc.) e a sinatura debaixo para verificar a mensaxe. Ten coidado de non ler máis na sinatura do que hai no mensaxe asinado mesmo, a fin de evitar ser cazado nun ataque de home no medio.</translation> - </message> - <message> <source>Verify the message to ensure it was signed with the specified Bitcoin address</source> <translation>Verificar a mensaxe para asegurar que foi asinada coa dirección Bitcoin especificada</translation> </message> @@ -1769,14 +1657,6 @@ Dirección: %4 <translation>Tipo</translation> </message> <message> - <source>Address</source> - <translation>Dirección</translation> - </message> - <message numerus="yes"> - <source>Open for %n more block(s)</source> - <translation><numerusform>Abrir para %n bloque máis</numerusform><numerusform>Abrir para %n bloques máis</numerusform></translation> - </message> - <message> <source>Open until %1</source> <translation>Aberto ata %1</translation> </message> @@ -1793,6 +1673,10 @@ Dirección: %4 <translation>Xerado pero non aceptado</translation> </message> <message> + <source>Label</source> + <translation>Etiqueta</translation> + </message> + <message> <source>Received with</source> <translation>Recibido con</translation> </message> @@ -1829,10 +1713,6 @@ Dirección: %4 <translation>Tipo de transacción.</translation> </message> <message> - <source>Destination address of transaction.</source> - <translation>Dirección de destino da transacción.</translation> - </message> - <message> <source>Amount removed from or added to balance.</source> <translation>Cantidade borrada ou engadida no balance.</translation> </message> @@ -2063,42 +1943,10 @@ Dirección: %4 <translation>Aceptar conexións de fóra (por defecto: 1 se non -proxy ou -connect)</translation> </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>%s, debes fixar unha rpcpassword no arquivo de configuración: -%s -Reoméndase usar o seguinte contrasinal aleatorio: -rpcuser=bitcoinrpc -rpcpassword=%s -(non precisas lembrar este contrasinal) -O nome do usuario e o contrasinal DEBEN NON ser o mesmo. -Se o arquivo non existe, debes crealo con permisos de so lectura para o propietario. -Tamén é recomendable fixar alertnotify de modo que recibas notificación dos problemas; -por exemplo: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo.com -</translation> - </message> - <message> <source>Bind to given address and always listen on it. Use [host]:port notation for IPv6</source> <translation>Enlazar a unha dirección dada e escoitar sempre nela. Emprega a notación [host]:post para IPv6</translation> </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>Erro: A transacción foi rexeitada! Esto podería suceder se unha das moedas do teu moedeiro xa foi gastada, como se usas unha copia de wallet.dat e hai moedas que se gastaron na copia pero non foron marcadas como gastadas aquí.</translation> - </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>Erro: Esta transacción require unha tarifa de transacción de alomenos %s debido á súa cantidade, complexidade ou emprego de fondos recentemente recibidos!</translation> - </message> - <message> <source>Execute command when a wallet transaction changes (%s in cmd is replaced by TxID)</source> <translation>Executar comando cando unha transacción do moedeiro cambia (%s no comando é substituído por TxID)</translation> </message> @@ -2147,10 +1995,6 @@ por exemplo: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo.com <translation>Detectada base de datos de bloques corrupta.</translation> </message> <message> - <source>Discover own IP address (default: 1 when listening and no -externalip)</source> - <translation>Descobrir dirección IP propia (por defecto: 1 se á escoita e non -externalip)</translation> - </message> - <message> <source>Do you want to rebuild the block database now?</source> <translation>Queres reconstruír a base de datos de bloques agora?</translation> </message> @@ -2175,10 +2019,6 @@ por exemplo: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo.com <translation>Erro: Espacio en disco escaso!</translation> </message> <message> - <source>Error: Wallet locked, unable to create transaction!</source> - <translation>Erro: Moedeiro bloqueado, imposible crear transacción!</translation> - </message> - <message> <source>Failed to listen on any port. Use -listen=0 if you want this.</source> <translation>Fallou escoitar en calquera porto. Emprega -listen=0 se queres esto.</translation> </message> @@ -2195,10 +2035,6 @@ por exemplo: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo.com <translation>Non hai suficientes descritores de arquivo dispoñibles.</translation> </message> <message> - <source>Rebuild block chain index from current blk000??.dat files</source> - <translation>Reconstruír índice de cadea de bloque dende os ficheiros actuais blk000??.dat</translation> - </message> - <message> <source>Specify wallet file (within data directory)</source> <translation>Especificar arquivo do moedeiro (dentro do directorio de datos)</translation> </message> @@ -2227,6 +2063,10 @@ por exemplo: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo.com <translation>Executar comando cando se recibe unha alerta relevante ou vemos un fork realmente longo (%s no cmd é substituído pola mensaxe)</translation> </message> <message> + <source>Choose data directory on startup (default: 0)</source> + <translation>Escolle directorio de datos ao arrancar (por defecto: 0)</translation> + </message> + <message> <source>Information</source> <translation>Información</translation> </message> @@ -2243,6 +2083,14 @@ por exemplo: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo.com <translation>Enviar traza/información de depuración á consola en lugar de ao arquivo debug.log</translation> </message> <message> + <source>Set language, for example "de_DE" (default: system locale)</source> + <translation>Fixar idioma, por exemplo "de_DE" (por defecto: locale del sistema)</translation> + </message> + <message> + <source>Show splash screen on startup (default: 1)</source> + <translation>Amosar pantalla splash no arranque (por defecto: 1)</translation> + </message> + <message> <source>Shrink debug.log file on client startup (default: 1 when no -debug)</source> <translation>Recortar o arquivo debug.log ao arrancar o cliente (por defecto: 1 cando no-debug)</translation> </message> @@ -2251,6 +2099,10 @@ por exemplo: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo.com <translation>Fallou a sinatura da transacción</translation> </message> <message> + <source>Start minimized</source> + <translation>Comezar minimizado</translation> + </message> + <message> <source>Transaction amount too small</source> <translation>A cantidade da transacción é demasiado pequena</translation> </message> @@ -2275,10 +2127,6 @@ por exemplo: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo.com <translation>Precaución</translation> </message> <message> - <source>Warning: This version is obsolete, upgrade required!</source> - <translation>Precaución: Esta versión é obsoleta, precísase unha actualización!</translation> - </message> - <message> <source>wallet.dat corrupt, salvage failed</source> <translation>wallet.dat corrupto, fallou o gardado</translation> </message> @@ -2343,10 +2191,6 @@ por exemplo: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo.com <translation>Cantidade inválida para -paytxfee=<cantidade>: '%s'</translation> </message> <message> - <source>Invalid amount</source> - <translation>Cantidade inválida</translation> - </message> - <message> <source>Insufficient funds</source> <translation>Fondos insuficientes</translation> </message> @@ -2379,10 +2223,6 @@ por exemplo: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo.com <translation>Carga completa</translation> </message> <message> - <source>To use the %s option</source> - <translation>Empregar a opción %s</translation> - </message> - <message> <source>Error</source> <translation>Erro</translation> </message> diff --git a/src/qt/locale/bitcoin_gu_IN.ts b/src/qt/locale/bitcoin_gu_IN.ts index ef99b0dd39..b7b091aa39 100644 --- a/src/qt/locale/bitcoin_gu_IN.ts +++ b/src/qt/locale/bitcoin_gu_IN.ts @@ -1,4 +1,4 @@ -<TS language="gu_IN" version="2.0"> +<TS language="gu_IN" version="2.1"> <context> <name>AddressBookPage</name> </context> diff --git a/src/qt/locale/bitcoin_he.ts b/src/qt/locale/bitcoin_he.ts index b547058986..0a4b2f7847 100644 --- a/src/qt/locale/bitcoin_he.ts +++ b/src/qt/locale/bitcoin_he.ts @@ -1,11 +1,7 @@ -<TS language="he" version="2.0"> +<TS language="he" version="2.1"> <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> @@ -110,7 +106,7 @@ </message> <message> <source>(no label)</source> - <translation>(ללא תווית)</translation> + <translation>(אין תווית)</translation> </message> </context> <context> @@ -156,10 +152,6 @@ <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> @@ -188,10 +180,6 @@ <translation>נא להזין את מילת הצופן החדשה לארנק.<br/>כדאי להשתמש במילת צופן המורכבת מ<b>עשרה תווים אקראיים ומעלה</b>, או <b>שמונה מילים ומעלה</b>.</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> @@ -311,10 +299,6 @@ <translation>שליחת מטבעות לכתובת ביטקוין</translation> </message> <message> - <source>Modify configuration options for Bitcoin</source> - <translation>שינוי התצורה של ביטקוין</translation> - </message> - <message> <source>Backup wallet to another location</source> <translation>גיבוי הארנק למיקום אחר</translation> </message> @@ -426,18 +410,6 @@ <source>No block source available...</source> <translation>אין מקור מקטעים זמין…</translation> </message> - <message numerus="yes"> - <source>%n hour(s)</source> - <translation><numerusform>%n שעה</numerusform><numerusform>%n שעות</numerusform></translation> - </message> - <message numerus="yes"> - <source>%n day(s)</source> - <translation><numerusform>%n יום</numerusform><numerusform>%n ימים</numerusform></translation> - </message> - <message numerus="yes"> - <source>%n week(s)</source> - <translation><numerusform>%n שבוע</numerusform><numerusform>%n שבועות</numerusform></translation> - </message> <message> <source>%1 and %2</source> <translation>%1 ו%2</translation> @@ -479,17 +451,6 @@ <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> @@ -517,7 +478,7 @@ Address: %4 </message> <message> <source>Amount:</source> - <translation>כמות:</translation> + <translation>סכום:</translation> </message> <message> <source>Priority:</source> @@ -525,7 +486,7 @@ Address: %4 </message> <message> <source>Fee:</source> - <translation>תשלום:</translation> + <translation>עמלה:</translation> </message> <message> <source>Dust:</source> @@ -537,7 +498,7 @@ Address: %4 </message> <message> <source>Change:</source> - <translation>שינוי:</translation> + <translation>עודף:</translation> </message> <message> <source>(un)select all</source> @@ -601,7 +562,7 @@ Address: %4 </message> <message> <source>Copy fee</source> - <translation>העתקת מחיר</translation> + <translation>העתקת עמלה</translation> </message> <message> <source>Copy after fee</source> @@ -676,10 +637,6 @@ Address: %4 <translation>לא</translation> </message> <message> - <source>This label turns red, if the transaction size is greater than 1000 bytes.</source> - <translation>תווית זו מאדימה אם גודל ההעברה עולה על 1000 בתים.</translation> - </message> - <message> <source>This means a fee of at least %1 per kB is required.</source> <translation>זאת אומרת שנחוצה עמלה של לא פחות מ־%1 לכל קילו בית.</translation> </message> @@ -692,10 +649,6 @@ Address: %4 <translation>העברות עם עדיפות גבוהה, יותר סיכוי שיכנסו לתוך המקטע.</translation> </message> <message> - <source>This label turns red, if the priority is smaller than "medium".</source> - <translation>תווית זו מאדימה אם העדיפות היא פחות מ„בינוני“</translation> - </message> - <message> <source>(no label)</source> <translation>(אין תווית)</translation> </message> @@ -816,30 +769,6 @@ Address: %4 <source>command-line options</source> <translation>אפשרויות שורת פקודה</translation> </message> - <message> - <source>UI options</source> - <translation>אפשרויות מנשק</translation> - </message> - <message> - <source>Set language, for example "de_DE" (default: system locale)</source> - <translation>הגדרת שפה, למשל „he_il“ (בררת מחדל: שפת המערכת)</translation> - </message> - <message> - <source>Start minimized</source> - <translation>התחלה במצב ממוזער</translation> - </message> - <message> - <source>Set SSL root certificates for payment request (default: -system-)</source> - <translation>הגדרות אישורי בסיס של SSL לבקשות תשלום (בררת המחדל: -מערכת-)</translation> - </message> - <message> - <source>Show splash screen on startup (default: 1)</source> - <translation>הצגת מסך פתיחה בעת הפעלה (בררת מחדל: 1)</translation> - </message> - <message> - <source>Choose data directory on startup (default: 0)</source> - <translation>בחירת תיקיית נתונים עם ההפעלה (בררת מחדל: 0)</translation> - </message> </context> <context> <name>Intro</name> @@ -914,14 +843,6 @@ Address: %4 <translation>&ראשי</translation> </message> <message> - <source>Automatically start Bitcoin after logging in to the system.</source> - <translation>הפעלת ביטקוין אוטומטית לאחר כניסה למערכת.</translation> - </message> - <message> - <source>&Start Bitcoin on system login</source> - <translation>ה&פעלת ביטקוין בעת הכניסה למערכת</translation> - </message> - <message> <source>Size of &database cache</source> <translation>גודל מ&טמון מסד הנתונים</translation> </message> @@ -1026,10 +947,6 @@ Address: %4 <translation>מ&זעור למגש במקום לשורת המשימות</translation> </message> <message> - <source>Minimize instead of exit the application when the window is closed. When this option is enabled, the application will be closed only after selecting Quit in the menu.</source> - <translation>מזעור התכנית במקום לצאת ממנה כשהחלון נסגר. כשאפשרות זו פעילה, התכנית תיסגר רק לאחר בחירת יציאה מהתפריט.</translation> - </message> - <message> <source>M&inimize on close</source> <translation>מ&זעור עם סגירה</translation> </message> @@ -1042,10 +959,6 @@ Address: %4 <translation>&שפת מנשק המשתמש:</translation> </message> <message> - <source>The user interface language can be set here. This setting will take effect after restarting Bitcoin.</source> - <translation>להלן ניתן לקבוע את שפת מנשק המשתמש. הגדרה זו תיכנס לתוקף לאחר הפעלה מחדש של ביטקוין.</translation> - </message> - <message> <source>&Unit to show amounts in:</source> <translation>י&חידת מידה להצגת כמויות:</translation> </message> @@ -1082,10 +995,6 @@ Address: %4 <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>שינוי זה ידרוש הפעלה מחדש של תכנית הלקוח.</translation> </message> @@ -1188,10 +1097,6 @@ Address: %4 <translation>רשת בקשת התשלום אינה תואמת לרשת הלקוח.</translation> </message> <message> - <source>Payment request has expired.</source> - <translation>בקשת התשלום פגה.</translation> - </message> - <message> <source>Payment request is not initialized.</source> <translation>בקשת התשלום לא החלה.</translation> </message> @@ -1259,10 +1164,6 @@ Address: %4 <translation>סוכן משתמש</translation> </message> <message> - <source>Address/Hostname</source> - <translation>כתובת/שם מארח</translation> - </message> - <message> <source>Ping Time</source> <translation>זמן המענה</translation> </message> @@ -1294,14 +1195,6 @@ Address: %4 <translation>%1 שניות</translation> </message> <message> - <source>NETWORK</source> - <translation>רשת</translation> - </message> - <message> - <source>UNKNOWN</source> - <translation>לא ידוע</translation> - </message> - <message> <source>None</source> <translation>ללא</translation> </message> @@ -1500,18 +1393,10 @@ Address: %4 <translation>קובץ יומן ניפוי</translation> </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>פתיחת קובץ יומן הניפוי מתיקיית הנתונים הנוכחית. פעולה זו עשויה להימשך מספר שניות עבור קובצי יומן גדולים.</translation> - </message> - <message> <source>Clear console</source> <translation>ניקוי מסוף הבקרה</translation> </message> <message> - <source>Welcome to the Bitcoin RPC console.</source> - <translation>ברוכים הבאים למסוף ה־RPC של ביטקוין.</translation> - </message> - <message> <source>Use up and down arrows to navigate history, and <b>Ctrl-L</b> to clear screen.</source> <translation>יש להשתמש בחצים למעלה ולמטה כדי לנווט בהיסטוריה, וב־<b>Ctrl-L</b> כדי לנקות את המסך.</translation> </message> @@ -1600,7 +1485,7 @@ Address: %4 </message> <message> <source>Clear all fields of the form.</source> - <translation>ניקוי כל השדות של הטופס.</translation> + <translation>ניקוי של כל השדות בטופס.</translation> </message> <message> <source>Clear</source> @@ -1805,7 +1690,7 @@ Address: %4 </message> <message> <source>Clear &All</source> - <translation>ניקוי ה&כול</translation> + <translation>&ניקוי הכול</translation> </message> <message> <source>Balance:</source> @@ -1833,7 +1718,7 @@ Address: %4 </message> <message> <source>Copy amount</source> - <translation>העתקת סכום</translation> + <translation>העתקת כמות</translation> </message> <message> <source>Copy fee</source> @@ -1864,10 +1749,6 @@ Address: %4 <translation>או</translation> </message> <message> - <source>The recipient address is not valid, please recheck.</source> - <translation>כתובת המוטב אינה תקינה, נא לבדוק שוב.</translation> - </message> - <message> <source>The amount to pay must be larger than 0.</source> <translation>הכמות לתשלום חייבת להיות גדולה מ־0.</translation> </message> @@ -1880,10 +1761,6 @@ Address: %4 <translation>הכמות הכוללת, ובכללה עמלת העברה בסך %1, עולה על המאזן שלך.</translation> </message> <message> - <source>Duplicate address found, can only send to each address once per send operation.</source> - <translation>כתובת כפולה נמצאה, ניתן לשלוח לכל כתובת רק פעם אחת בכל פעולת שליחה.</translation> - </message> - <message> <source>Transaction creation failed!</source> <translation>יצירת ההעברה נכשלה!</translation> </message> @@ -1967,10 +1844,6 @@ Address: %4 <translation>הודעה:</translation> </message> <message> - <source>This is a verified payment request.</source> - <translation>זוהי בקשה מאומתת לתשלום.</translation> - </message> - <message> <source>Enter a label for this address to add it to the list of used addresses</source> <translation>יש להזין תווית עבור כתובת זו כדי להוסיף אותה לרשימת הכתובות בשימוש</translation> </message> @@ -1979,10 +1852,6 @@ Address: %4 <translation>הודעה שצורפה לביטקוין: כתובת שתאוחסן בהעברה לצורך מעקב מצדך. לתשומת לבך: הודעה זו לא תישלח ברשת הביטקוין.</translation> </message> <message> - <source>This is an unverified payment request.</source> - <translation>זוהי בקשת תשלום בלתי־מאומתת.</translation> - </message> - <message> <source>Pay To:</source> <translation>תשלום לטובת:</translation> </message> @@ -2013,10 +1882,6 @@ Address: %4 <translation>חתימה על הו&דעה</translation> </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>ניתן לחתום על הודעות עם הכתובות שלך כדי להוכיח שהן בבעלותך. מומלץ להיזהר לא לחתום על משהו מפוקפק, שכן התקפות דיוג עשויות לגרום לך בעורמה למסור את זהותך. רצוי לחתום רק על הצהרות מפורטות לחלוטין שהסכמת עמן.</translation> - </message> - <message> <source>The Bitcoin address to sign the message with</source> <translation>כתובת הביטקוין אתה לחתום אתה את ההודעה</translation> </message> @@ -2069,10 +1934,6 @@ Address: %4 <translation>&אימות הודעה</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>הכנס למטה את הכתובת החותמת, ההודעה (ודא שאתה מעתיק מעברי שורה, רווחים, טאבים וכו' באופן מדויק) והחתימה כדי לאמת את ההודעה. היזהר לא לפרש את החתימה כיותר ממה שמופיע בהודעה החתומה בעצמה, כדי להימנע מליפול קורבן למתקפת איש-באמצע.</translation> - </message> - <message> <source>The Bitcoin address the message was signed with</source> <translation>כתובת הביטקוין שאתה נחתמה ההודעה</translation> </message> @@ -2297,10 +2158,6 @@ Address: %4 <source>, has not been successfully broadcast yet</source> <translation>, טרם שודר בהצלחה</translation> </message> - <message numerus="yes"> - <source>Open for %n more block(s)</source> - <translation><numerusform>פתיחה למשך מקטע %n נוסף</numerusform><numerusform>פתיחה למשך %n מקטעים נוספים</numerusform></translation> - </message> <message> <source>unknown</source> <translation>לא ידוע</translation> @@ -2328,17 +2185,9 @@ Address: %4 <translation>סוג</translation> </message> <message> - <source>Address</source> - <translation>כתובת</translation> - </message> - <message> <source>Immature (%1 confirmations, will be available after %2)</source> <translation>לא בשל (%1 אישורים, יהיו זמינים לאחר %2)</translation> </message> - <message numerus="yes"> - <source>Open for %n more block(s)</source> - <translation><numerusform>פתח למשך בלוק %n יותר</numerusform><numerusform>פתיחה למשך %n מקטעים נוספים</numerusform></translation> - </message> <message> <source>Open until %1</source> <translation>פתוחה עד %1</translation> @@ -2360,6 +2209,10 @@ Address: %4 <translation>מנותק</translation> </message> <message> + <source>Label</source> + <translation>תווית</translation> + </message> + <message> <source>Unconfirmed</source> <translation>ללא אישור</translation> </message> @@ -2416,10 +2269,6 @@ Address: %4 <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> @@ -2658,30 +2507,6 @@ Address: %4 <translation>קבלת חיבורים מבחוץ (בררת מחדל: 1 ללא -proxy או -connect)</translation> </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>%s, עליך להגדיר את ססמת ה־RPC בקובץ התצורה: - %s -מומלץ להשתמש בססמה האקראית הבאה: -rpcuser=bitcoinrpc -rpcpassword=%s -(אין צורך לזכור את הססמה) -אסור ששם המשתמש והססמה יהיו זהים. -אם הקובץ אינו קיים, יש ליצור אותו עם הרשאות קריאה לבעלים בלבד. -כמו כן, מומלץ להגדיר את alertnotify כדי לקבל דיווח על תקלות; -למשל: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo.com -</translation> - </message> - <message> <source>Bind to given address and always listen on it. Use [host]:port notation for IPv6</source> <translation>להתאגד לכתובת נתונה להאזין לה תמיד. יש להשתמש בצורה [host]:port עבור IPv6.</translation> </message> @@ -2694,14 +2519,6 @@ rpcpassword=%s <translation>כניסה למצב בדיקת נסיגה, שמשתמש בשרשרת מיוחדת בה ניתן לפתור את המקטעים במהירות.</translation> </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>שגיאה: ההעברה נדחתה! מצב כזה עלול לקרות אם כמה מהמטבעות בארנק שלך כבר נוצלו, למשל אם השתמשת בעותק של wallet.dat ומטבעות נשלחו בעותק אך לא סומנו כמושקעות כאן.</translation> - </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>שגיאה: ההעברה הזאת דורשת עמלת פעולה של לפחות %s עקב הכמות, המורכבות או השימוש בכספים שהתקבלו לאחרונה!</translation> - </message> - <message> <source>Execute command when a wallet transaction changes (%s in cmd is replaced by TxID)</source> <translation>ביצוע פקודה כאשר העברה בארנק משתנה (%s ב־cmd יוחלף ב־TxID)</translation> </message> @@ -2766,10 +2583,6 @@ rpcpassword=%s <translation>אפשרויות ניפוי/בדיקה:</translation> </message> <message> - <source>Discover own IP address (default: 1 when listening and no -externalip)</source> - <translation>לגלות את כתובת ה־IP העצמית (בררת מחדל: 1 בעת האזנה וללא -externalip)</translation> - </message> - <message> <source>Do not load the wallet and disable wallet RPC calls</source> <translation>לא לטעון את הארנק ולנטרל קריאות RPC</translation> </message> @@ -2798,10 +2611,6 @@ rpcpassword=%s <translation>שגיאה: מעט מקום פנוי בכונן!</translation> </message> <message> - <source>Error: Wallet locked, unable to create transaction!</source> - <translation>שגיאה: הארנק נעול, אין אפשרות ליצור העברה!</translation> - </message> - <message> <source>Failed to listen on any port. Use -listen=0 if you want this.</source> <translation>האזנה נכשלה בכל פורט. השתמש ב- -listen=0 אם ברצונך בכך.</translation> </message> @@ -2830,10 +2639,6 @@ rpcpassword=%s <translation>תמיד להתחבר למפרקים ברשת <net> (ipv4, ipv6 או onion)</translation> </message> <message> - <source>Rebuild block chain index from current blk000??.dat files</source> - <translation>בנייה מחדש של מפתח שרשרת המקטעים מקובצי ה־blk000??.dat הנוכחיים.</translation> - </message> - <message> <source>Set database cache size in megabytes (%d to %d, default: %d)</source> <translation>הגדרת גודל מטמון מסדי הנתונים במגה בתים (%d עד %d, בררת מחדל: %d)</translation> </message> @@ -2890,6 +2695,10 @@ rpcpassword=%s <translation>לא ניתן לפתור את הכתובת -whitebind: '%s'</translation> </message> <message> + <source>Choose data directory on startup (default: 0)</source> + <translation>בחירת תיקיית נתונים עם ההפעלה (בררת מחדל: 0)</translation> + </message> + <message> <source>Connect through SOCKS5 proxy</source> <translation>התחברות דרך מתווך SOCKS5</translation> </message> @@ -2946,10 +2755,6 @@ rpcpassword=%s <translation>אפשרויות ממסר מפרק:</translation> </message> <message> - <source>Print block on startup, if found in block index</source> - <translation>הצגת מקטע בהפעלה, אם נמצא במפתח המקטעים</translation> - </message> - <message> <source>RPC SSL options: (see the Bitcoin Wiki for SSL setup instructions)</source> <translation>אפשרויות RPC SSL: (נא לעיין בוויקי של ביטקוין לקבלת הנחיות על הגדרת SSL)</translation> </message> @@ -2966,10 +2771,22 @@ rpcpassword=%s <translation>שלח מידע דיבאג ועקבה לקונסולה במקום לקובץ debug.log</translation> </message> <message> + <source>Set SSL root certificates for payment request (default: -system-)</source> + <translation>הגדרות אישורי בסיס של SSL לבקשות תשלום (בררת המחדל: -מערכת-)</translation> + </message> + <message> + <source>Set language, for example "de_DE" (default: system locale)</source> + <translation>הגדרת שפה, למשל „he_il“ (בררת מחדל: שפת המערכת)</translation> + </message> + <message> <source>Show all debugging options (usage: --help -help-debug)</source> <translation>הצגת כל אפשרויות הניפוי (שימוש: --help -help-debug)</translation> </message> <message> + <source>Show splash screen on startup (default: 1)</source> + <translation>הצגת מסך פתיחה בעת הפעלה (בררת מחדל: 1)</translation> + </message> + <message> <source>Shrink debug.log file on client startup (default: 1 when no -debug)</source> <translation>כיווץ הקובץ debug.log בהפעלת הלקוח (בררת מחדל: 1 ללא -debug)</translation> </message> @@ -2978,6 +2795,10 @@ rpcpassword=%s <translation>החתימה על ההעברה נכשלה</translation> </message> <message> + <source>Start minimized</source> + <translation>התחלה במצב ממוזער</translation> + </message> + <message> <source>This is experimental software.</source> <translation>זוהי תכנית נסיונית.</translation> </message> @@ -3014,10 +2835,6 @@ rpcpassword=%s <translation>אזהרה</translation> </message> <message> - <source>Warning: This version is obsolete, upgrade required!</source> - <translation>אזהרה: הגרסה הזאת מיושנת, יש צורך בשדרוג!</translation> - </message> - <message> <source>Warning: Unsupported argument -benchmark ignored, use -debug=bench.</source> <translation>אזהרה: הארגומנט שאינו נתמך עוד -benchmark לא הופעל, נא להשתמש ב־-debug=bench.</translation> </message> @@ -3094,10 +2911,6 @@ rpcpassword=%s <translation>כמות לא תקינה עבור -paytxfee=<amount>: '%s'</translation> </message> <message> - <source>Invalid amount</source> - <translation>כמות לא תקינה</translation> - </message> - <message> <source>Insufficient funds</source> <translation>אין מספיק כספים</translation> </message> @@ -3130,10 +2943,6 @@ rpcpassword=%s <translation>טעינה הושלמה</translation> </message> <message> - <source>To use the %s option</source> - <translation>שימוש באפשרות %s</translation> - </message> - <message> <source>Error</source> <translation>שגיאה</translation> </message> diff --git a/src/qt/locale/bitcoin_hi_IN.ts b/src/qt/locale/bitcoin_hi_IN.ts index 09a8392c27..5fe8635dc0 100644 --- a/src/qt/locale/bitcoin_hi_IN.ts +++ b/src/qt/locale/bitcoin_hi_IN.ts @@ -1,11 +1,7 @@ -<TS language="hi_IN" version="2.0"> +<TS language="hi_IN" version="2.1"> <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> @@ -88,10 +84,6 @@ <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> @@ -191,22 +183,6 @@ <source>Tabs toolbar</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 numerus="yes"> - <source>%n hour(s)</source> - <translation><numerusform>%n घंटा</numerusform><numerusform>%n घंटे</numerusform></translation> - </message> - <message numerus="yes"> - <source>%n day(s)</source> - <translation><numerusform>%n दिन</numerusform><numerusform>%n दिनो</numerusform></translation> - </message> - <message numerus="yes"> - <source>%n week(s)</source> - <translation><numerusform>%n हफ़्ता</numerusform><numerusform>%n हफ्ते</numerusform></translation> - </message> <message> <source>%1 behind</source> <translation>%1 पीछे</translation> @@ -236,17 +212,6 @@ <translation>प्राप्त हुई ट्रांजक्शन</translation> </message> <message> - <source>Date: %1 -Amount: %2 -Type: %3 -Address: %4 -</source> - <translation>तारीख: %1\n -राशि: %2\n -टाइप: %3\n -पता:%4\n</translation> - </message> - <message> <source>Wallet is <b>encrypted</b> and currently <b>unlocked</b></source> <translation>वॉलेट एन्क्रिप्टेड है तथा अभी लॉक्ड नहीं है</translation> </message> @@ -631,10 +596,6 @@ Address: %4 <translation>टाइप</translation> </message> <message> - <source>Address</source> - <translation>पता</translation> - </message> - <message> <source>Open until %1</source> <translation>खुला है जबतक %1</translation> </message> @@ -651,8 +612,12 @@ Address: %4 <translation>जेनरेट किया गया किंतु स्वीकारा नही गया !</translation> </message> <message> + <source>Label</source> + <translation>लेबल</translation> + </message> + <message> <source>Received with</source> - <translation>स्वीकारा गया</translation> + <translation>स्वीकार करना</translation> </message> <message> <source>Received from</source> @@ -687,10 +652,6 @@ Address: %4 <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> @@ -877,10 +838,6 @@ Address: %4 <translation>पता पुस्तक आ रही है...</translation> </message> <message> - <source>Invalid amount</source> - <translation>राशि ग़लत है</translation> - </message> - <message> <source>Loading block index...</source> <translation>ब्लॉक इंडेक्स आ रहा है...</translation> </message> diff --git a/src/qt/locale/bitcoin_hr.ts b/src/qt/locale/bitcoin_hr.ts index 22831a0fd5..62bfe6a11f 100644 --- a/src/qt/locale/bitcoin_hr.ts +++ b/src/qt/locale/bitcoin_hr.ts @@ -1,11 +1,7 @@ -<TS language="hr" version="2.0"> +<TS language="hr" version="2.1"> <context> <name>AddressBookPage</name> <message> - <source>Double-click to edit address or label</source> - <translation>Dvostruki klik za uređivanje adrese ili oznake</translation> - </message> - <message> <source>Create a new address</source> <translation>Dodajte novu adresu</translation> </message> @@ -87,7 +83,7 @@ </message> <message> <source>Comma separated file (*.csv)</source> - <translation>Datoteka vrijednosti odvojenih zarezom (*. csv)</translation> + <translation>Datoteka podataka odvojenih zarezima (*.csv)</translation> </message> <message> <source>Exporting Failed</source> @@ -156,10 +152,6 @@ <translation>Promjena lozinke</translation> </message> <message> - <source>Enter the old and new passphrase to the wallet.</source> - <translation>Unesite staru i novu lozinku za novčanik.</translation> - </message> - <message> <source>Confirm wallet encryption</source> <translation>Potvrdi šifriranje novčanika</translation> </message> @@ -188,10 +180,6 @@ <translation>Unesite novu lozinku za novčanik. <br/>Molimo Vas da koristite zaporku od <b>deset ili više slučajnih znakova</b>, ili <b>osam ili više riječi.</b></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>Bitcoin će se sada zatvoriti kako bi dovršio postupak šifriranja. Zapamtite da šifriranje vašeg novčanika ne može u potpunosti zaštititi vaše bitcoine od krađe preko zloćudnog softvera koji bi bio na vašem računalu.</translation> - </message> - <message> <source>Wallet encryption failed</source> <translation>Šifriranje novčanika nije uspjelo</translation> </message> @@ -311,10 +299,6 @@ <translation>Slanje novca na bitcoin adresu</translation> </message> <message> - <source>Modify configuration options for Bitcoin</source> - <translation>Promijeni postavke konfiguracije za bitcoin</translation> - </message> - <message> <source>Backup wallet to another location</source> <translation>Napravite sigurnosnu kopiju novčanika na drugoj lokaciji</translation> </message> @@ -410,10 +394,6 @@ <source>Show the list of used receiving addresses and labels</source> <translation>Prikaži popis korištenih adresa i oznaka za primanje isplate</translation> </message> - <message numerus="yes"> - <source>%n active connection(s) to Bitcoin network</source> - <translation><numerusform>%n aktivna veza na Bitcoin mrežu</numerusform><numerusform>%n aktivne veze na Bitcoin mrežu</numerusform><numerusform>%n aktivnih veza na Bitcoin mrežu</numerusform></translation> - </message> <message> <source>Error</source> <translation>Greška</translation> @@ -443,18 +423,6 @@ <translation>Dolazna transakcija</translation> </message> <message> - <source>Date: %1 -Amount: %2 -Type: %3 -Address: %4 -</source> - <translation>Datum:%1 -Iznos:%2 -Tip:%3 -Adresa:%4 -</translation> - </message> - <message> <source>Wallet is <b>encrypted</b> and currently <b>unlocked</b></source> <translation>Novčanik je <b>šifriran</b> i trenutno <b>otključan</b></translation> </message> @@ -567,20 +535,12 @@ Adresa:%4 </message> <message> <source>About Bitcoin Core</source> - <translation>O Bitcoin Jezrgu</translation> + <translation>O Bitcoinovoj jezgri</translation> </message> <message> <source>Usage:</source> <translation>Upotreba:</translation> </message> - <message> - <source>UI options</source> - <translation>UI postavke</translation> - </message> - <message> - <source>Start minimized</source> - <translation>Pokreni minimiziran</translation> - </message> </context> <context> <name>Intro</name> @@ -594,7 +554,7 @@ Adresa:%4 </message> <message> <source>Error</source> - <translation>Pogreška</translation> + <translation>Greška</translation> </message> </context> <context> @@ -611,14 +571,6 @@ Adresa:%4 <translation>&Glavno</translation> </message> <message> - <source>Automatically start Bitcoin after logging in to the system.</source> - <translation>Automatski pokreni Bitcoin kad se uključi računalo</translation> - </message> - <message> - <source>&Start Bitcoin on system login</source> - <translation>&Pokreni Bitcoin kod pokretanja sustava</translation> - </message> - <message> <source>&Network</source> <translation>&Mreža</translation> </message> @@ -651,10 +603,6 @@ Adresa:%4 <translation>&Minimiziraj u sistemsku traku umjesto u traku programa</translation> </message> <message> - <source>Minimize instead of exit the application when the window is closed. When this option is enabled, the application will be closed only after selecting Quit in the menu.</source> - <translation>Minimizirati umjesto izaći iz aplikacije kada je prozor zatvoren. Kada je ova opcija omogućena, aplikacija će biti zatvorena tek nakon odabira Izlaz u izborniku.</translation> - </message> - <message> <source>M&inimize on close</source> <translation>M&inimiziraj kod zatvaranja</translation> </message> @@ -793,10 +741,6 @@ Adresa:%4 <translation>Očisti konzolu</translation> </message> <message> - <source>Welcome to the Bitcoin RPC console.</source> - <translation>Dobrodošli u Bitcoin RPC konzolu.</translation> - </message> - <message> <source>Use up and down arrows to navigate history, and <b>Ctrl-L</b> to clear screen.</source> <translation>Kako bi navigirali kroz povijest koristite strelice gore i dolje. <b>Ctrl-L</b> kako bi očistili ekran.</translation> </message> @@ -917,10 +861,6 @@ Adresa:%4 <translation>ili</translation> </message> <message> - <source>The recipient address is not valid, please recheck.</source> - <translation>Adresa primatelja je nevaljala, molimo provjerite je ponovo.</translation> - </message> - <message> <source>The amount to pay must be larger than 0.</source> <translation>Iznos mora biti veći od 0.</translation> </message> @@ -933,10 +873,6 @@ Adresa:%4 <translation>Iznos je veći od stanja računa kad se doda naknada za transakcije od %1.</translation> </message> <message> - <source>Duplicate address found, can only send to each address once per send operation.</source> - <translation>Pronašli smo adresu koja se ponavlja. U svakom plaćanju program može svaku adresu koristiti samo jedanput.</translation> - </message> - <message> <source>(no label)</source> <translation>(bez oznake)</translation> </message> @@ -990,10 +926,6 @@ Adresa:%4 <translation>&Potpišite poruku</translation> </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>Možete potpisati poruke sa svojom adresom kako bi dokazali da ih posjedujete. Budite oprezni da ne potpisujete ništa mutno, jer bi vas phishing napadi mogli na prevaru natjerati da prepišete svoj identitet njima. Potpisujte samo detaljno objašnjene izjave sa kojima se slažete.</translation> - </message> - <message> <source>Alt+A</source> <translation>Alt+A</translation> </message> @@ -1169,10 +1101,6 @@ Adresa:%4 <translation>Tip</translation> </message> <message> - <source>Address</source> - <translation>Adresa</translation> - </message> - <message> <source>Open until %1</source> <translation>Otvoren do %1</translation> </message> @@ -1189,6 +1117,10 @@ Adresa:%4 <translation>Generirano, ali nije prihvaćeno</translation> </message> <message> + <source>Label</source> + <translation>Oznaka</translation> + </message> + <message> <source>Received with</source> <translation>Primljeno s</translation> </message> @@ -1225,10 +1157,6 @@ Adresa:%4 <translation>Vrsta transakcije.</translation> </message> <message> - <source>Destination address of transaction.</source> - <translation>Odredište transakcije</translation> - </message> - <message> <source>Amount removed from or added to balance.</source> <translation>Iznos odbijen od ili dodan k saldu.</translation> </message> @@ -1443,6 +1371,10 @@ Adresa:%4 <translation>Šalji trace/debug informacije na konzolu umjesto u debug.log datoteku</translation> </message> <message> + <source>Start minimized</source> + <translation>Pokreni minimiziran</translation> + </message> + <message> <source>Use UPnP to map the listening port (default: 1 when listening)</source> <translation>Pokušaj koristiti UPnP da otvoriš port za uslugu (default: 1 when listening)</translation> </message> @@ -1503,10 +1435,6 @@ Adresa:%4 <translation>Nevaljali iznos za opciju -paytxfee=<amount>: '%s'</translation> </message> <message> - <source>Invalid amount</source> - <translation>Nevaljali iznos za opciju</translation> - </message> - <message> <source>Insufficient funds</source> <translation>Nedovoljna sredstva</translation> </message> diff --git a/src/qt/locale/bitcoin_hu.ts b/src/qt/locale/bitcoin_hu.ts index 8109542405..0d9a57d3b4 100644 --- a/src/qt/locale/bitcoin_hu.ts +++ b/src/qt/locale/bitcoin_hu.ts @@ -1,9 +1,9 @@ -<TS language="hu" version="2.0"> +<TS language="hu" version="2.1"> <context> <name>AddressBookPage</name> <message> - <source>Double-click to edit address or label</source> - <translation>Dupla-kattintás a cím vagy címke szerkesztéséhez</translation> + <source>Right-click to edit address or label</source> + <translation>A cím vagy címke szerkeszteséhez kattintson a jobb gombbal</translation> </message> <message> <source>Create a new address</source> @@ -87,7 +87,7 @@ </message> <message> <source>Comma separated file (*.csv)</source> - <translation>Vesszővel elválasztott fájl (*. csv)</translation> + <translation>Vesszővel elválasztott fájl (*.csv)</translation> </message> <message> <source>Exporting Failed</source> @@ -156,10 +156,6 @@ <translation>Jelszó megváltoztatása</translation> </message> <message> - <source>Enter the old and new passphrase to the wallet.</source> - <translation>Írd be a tárca régi és új jelszavát.</translation> - </message> - <message> <source>Confirm wallet encryption</source> <translation>Biztosan titkosítani akarod a tárcát?</translation> </message> @@ -188,10 +184,6 @@ <translation>Add meg a tárca új jelszavát.<br/>Olyan jelszót válassz, ami <b>legalább tíz véletlenszerű karakterből</b> vagy <b>legalább 8 véletlenszerű szóból</b> áll.</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>A Bitcoin Core most bezár, hogy befejezze a titkosítást. Ne feledd: a tárca titkosítása nem nyújt teljes védelmet azzal szemben, hogy adathalász programok megfertőzzék a számítógéped és ellopják a bitcoinjaid.</translation> - </message> - <message> <source>Wallet encryption failed</source> <translation>A tárca titkosítása sikertelen.</translation> </message> @@ -311,10 +303,6 @@ <translation>Bitcoin küldése megadott címre</translation> </message> <message> - <source>Modify configuration options for Bitcoin</source> - <translation>Bitcoin konfigurációs opciók</translation> - </message> - <message> <source>Backup wallet to another location</source> <translation>Biztonsági másolat készítése a tárcáról egy másik helyre</translation> </message> @@ -422,34 +410,14 @@ <source>Show the Bitcoin Core help message to get a list with possible Bitcoin command-line options</source> <translation>A Bitcoin Core súgóüzenet megjelenítése a Bitcoin lehetséges parancssori kapcsolóival.</translation> </message> - <message numerus="yes"> - <source>%n active connection(s) to Bitcoin network</source> - <translation><numerusform>%n aktív kapcsolat a Bitcoin-hálózattal</numerusform><numerusform>%n aktív kapcsolat a Bitcoin-hálózattal</numerusform></translation> - </message> <message> <source>No block source available...</source> <translation>Blokk forrása ismeretlen...</translation> </message> - <message numerus="yes"> - <source>%n hour(s)</source> - <translation><numerusform>%n óra</numerusform><numerusform>%n óra</numerusform></translation> - </message> - <message numerus="yes"> - <source>%n day(s)</source> - <translation><numerusform>%n nap</numerusform><numerusform>%n nap</numerusform></translation> - </message> - <message numerus="yes"> - <source>%n week(s)</source> - <translation><numerusform>%n hét</numerusform><numerusform>%n hét</numerusform></translation> - </message> <message> <source>%1 and %2</source> <translation>%1 és %2</translation> </message> - <message numerus="yes"> - <source>%n year(s)</source> - <translation><numerusform>%n év</numerusform><numerusform>%n év</numerusform></translation> - </message> <message> <source>%1 behind</source> <translation>%1 lemaradás</translation> @@ -491,18 +459,6 @@ <translation>Beérkező tranzakció</translation> </message> <message> - <source>Date: %1 -Amount: %2 -Type: %3 -Address: %4 -</source> - <translation>Dátum: %1 -Összeg: %2 -Típus: %3 -Cím: %4 -</translation> - </message> - <message> <source>Wallet is <b>encrypted</b> and currently <b>unlocked</b></source> <translation>A tárca <b>titkosítva</b> és jelenleg <b>nyitva</b>.</translation> </message> @@ -630,7 +586,7 @@ Cím: %4 </message> <message> <source>Copy dust</source> - <translation>Por-határ másolása</translation> + <translation>Visszajáró másolása</translation> </message> <message> <source>Copy change</source> @@ -693,10 +649,6 @@ Cím: %4 <translation>nem</translation> </message> <message> - <source>This label turns red, if the transaction size is greater than 1000 bytes.</source> - <translation>Ez a címke piros lesz, ha tranzakció mérete nagyobb 1000 byte-nál.</translation> - </message> - <message> <source>This means a fee of at least %1 per kB is required.</source> <translation>Legalább %1 díj szüksége kB-onként.</translation> </message> @@ -709,14 +661,6 @@ Cím: %4 <translation>Nagyobb prioritású tranzakciók nagyobb valószínűséggel kerülnek be egy blokkba.</translation> </message> <message> - <source>This label turns red, if the priority is smaller than "medium".</source> - <translation>Ez a címke piros lesz, ha a prioritás közepesnél alacsonyabb.</translation> - </message> - <message> - <source>This label turns red, if any recipient receives an amount smaller than %1.</source> - <translation>Ez a címke piros lesz, ha valamelyik elfogadó kevesebbet kap mint %1.</translation> - </message> - <message> <source>(no label)</source> <translation>(nincs címke)</translation> </message> @@ -833,31 +777,6 @@ Cím: %4 <source>command-line options</source> <translation>parancssoros opciók</translation> </message> - <message> - <source>UI options</source> - <translation>UI opciók</translation> - </message> - <message> - <source>Set language, for example "de_DE" (default: system locale)</source> - <translation>Nyelvbeállítás, például "de_DE" (alapértelmezett: rendszer nyelve)</translation> - </message> - <message> - <source>Start minimized</source> - <translation>Indítás lekicsinyítve -</translation> - </message> - <message> - <source>Set SSL root certificates for payment request (default: -system-)</source> - <translation>SLL gyökér-igazolások megadása fizetési kérelmekhez (alapértelmezett: -system-)</translation> - </message> - <message> - <source>Show splash screen on startup (default: 1)</source> - <translation>Indítóképernyő mutatása induláskor (alapértelmezett: 1)</translation> - </message> - <message> - <source>Choose data directory on startup (default: 0)</source> - <translation>Adatkönyvtár kiválasztása induláskor (alapbeállítás: 0)</translation> - </message> </context> <context> <name>Intro</name> @@ -870,10 +789,22 @@ Cím: %4 <translation>Üdvözlünk a Bitcoin Core-ban.</translation> </message> <message> + <source>Use the default data directory</source> + <translation>Az alapértelmezett adat könyvtár használata</translation> + </message> + <message> + <source>Use a custom data directory:</source> + <translation>Saját adatkönyvtár használata:</translation> + </message> + <message> <source>Bitcoin Core</source> <translation>Bitcoin Core</translation> </message> <message> + <source>Error: Specified data directory "%1" cannot be created.</source> + <translation>Hiba: A megadott "%1" adatkönyvtár nem hozható létre. </translation> + </message> + <message> <source>Error</source> <translation>Hiba</translation> </message> @@ -896,7 +827,11 @@ Cím: %4 <source>Select payment request file</source> <translation>Fizetési kérelmi fájl kiválasztása</translation> </message> - </context> + <message> + <source>Select payment request file to open</source> + <translation>Fizetés kérelmi fájl kiválasztása</translation> + </message> +</context> <context> <name>OptionsDialog</name> <message> @@ -908,16 +843,20 @@ Cím: %4 <translation>&Fő</translation> </message> <message> - <source>Automatically start Bitcoin after logging in to the system.</source> - <translation>Induljon el a Bitcoin a számítógép bekapcsolásakor</translation> + <source>MB</source> + <translation>MB</translation> </message> <message> - <source>&Start Bitcoin on system login</source> - <translation>&Induljon el a számítógép bekapcsolásakor</translation> + <source>Accept connections from outside</source> + <translation>Külső kapcsolatok elfogadása</translation> </message> <message> - <source>MB</source> - <translation>MB</translation> + <source>Allow incoming connections</source> + <translation>Bejövő kapcsolatok engedélyezése</translation> + </message> + <message> + <source>IP address of the proxy (e.g. IPv4: 127.0.0.1 / IPv6: ::1)</source> + <translation>A proxy IP címe (pl.: IPv4: 127.0.0.1 / IPv6: ::1)</translation> </message> <message> <source>Reset all client options to default.</source> @@ -964,10 +903,6 @@ Cím: %4 <translation>&Kicsinyítés a tálcára az eszköztár helyett</translation> </message> <message> - <source>Minimize instead of exit the application when the window is closed. When this option is enabled, the application will be closed only after selecting Quit in the menu.</source> - <translation>Az alkalmazásból való kilépés helyett az eszköztárba kicsinyíti az alkalmazást az ablak bezárásakor. Ez esetben az alkalmazás csak a Kilépés menüponttal zárható be.</translation> - </message> - <message> <source>M&inimize on close</source> <translation>K&icsinyítés záráskor</translation> </message> @@ -980,10 +915,6 @@ Cím: %4 <translation>Felhasználófelület nye&lve:</translation> </message> <message> - <source>The user interface language can be set here. This setting will take effect after restarting Bitcoin.</source> - <translation>Itt beállíthatod a felhasználófelület nyelvét. Ez a beállítás a Bitcoin ujraindítása után lép érvénybe.</translation> - </message> - <message> <source>&Unit to show amounts in:</source> <translation>&Mértékegység:</translation> </message> @@ -1012,6 +943,10 @@ Cím: %4 <translation>Beállítások törlésének jóváhagyása.</translation> </message> <message> + <source>Client restart required to activate changes.</source> + <translation>A változtatások aktiválásahoz újra kell indítani a klienst.</translation> + </message> + <message> <source>The supplied proxy address is invalid.</source> <translation>A megadott proxy cím nem érvényes.</translation> </message> @@ -1059,6 +994,14 @@ Cím: %4 <translation>Aktuális egyenleged</translation> </message> <message> + <source>Spendable:</source> + <translation>Elkölthető:</translation> + </message> + <message> + <source>Recent transactions</source> + <translation>A legutóbbi tranzakciók</translation> + </message> + <message> <source>out of sync</source> <translation>Nincs szinkronban.</translation> </message> @@ -1076,7 +1019,11 @@ Cím: %4 </context> <context> <name>PeerTableModel</name> - </context> + <message> + <source>Ping Time</source> + <translation>Ping idő</translation> + </message> +</context> <context> <name>QObject</name> <message> @@ -1084,8 +1031,20 @@ Cím: %4 <translation>Összeg</translation> </message> <message> - <source>NETWORK</source> - <translation>HÁLÓZAT</translation> + <source>%1 d</source> + <translation>%1 n</translation> + </message> + <message> + <source>%1 h</source> + <translation>%1 ó</translation> + </message> + <message> + <source>%1 m</source> + <translation>%1 p</translation> + </message> + <message> + <source>%1 s</source> + <translation>%1 mp</translation> </message> <message> <source>N/A</source> @@ -1134,6 +1093,10 @@ Cím: %4 <translation>Debug ablak</translation> </message> <message> + <source>General</source> + <translation>Általános</translation> + </message> + <message> <source>Using OpenSSL version</source> <translation>Használt OpenSSL verzió</translation> </message> @@ -1174,6 +1137,18 @@ Cím: %4 <translation>&Peerek</translation> </message> <message> + <source>Version</source> + <translation>Verzió</translation> + </message> + <message> + <source>Services</source> + <translation>Szolgáltatások</translation> + </message> + <message> + <source>Ping Time</source> + <translation>Ping idő</translation> + </message> + <message> <source>Last block time</source> <translation>Utolsó blokk ideje</translation> </message> @@ -1214,10 +1189,6 @@ Cím: %4 <translation>Konzol törlése</translation> </message> <message> - <source>Welcome to the Bitcoin RPC console.</source> - <translation>Üdv a Bitcoin RPC konzoljában!</translation> - </message> - <message> <source>Use up and down arrows to navigate history, and <b>Ctrl-L</b> to clear screen.</source> <translation>Navigálhat a fel és le nyilakkal, és <b>Ctrl-L</b> -vel törölheti a képernyőt.</translation> </message> @@ -1450,10 +1421,6 @@ Cím: %4 <translation>vagy</translation> </message> <message> - <source>The recipient address is not valid, please recheck.</source> - <translation>A címzett címe érvénytelen, kérlek, ellenőrizd.</translation> - </message> - <message> <source>The amount to pay must be larger than 0.</source> <translation>A fizetendő összegnek nagyobbnak kell lennie 0-nál.</translation> </message> @@ -1466,10 +1433,6 @@ Cím: %4 <translation>A küldeni kívánt összeg és a %1 tranzakciós díj együtt meghaladja az egyenlegeden rendelkezésedre álló összeget.</translation> </message> <message> - <source>Duplicate address found, can only send to each address once per send operation.</source> - <translation>Többször szerepel ugyanaz a cím. Egy küldési műveletben egy címre csak egyszer lehet küldeni.</translation> - </message> - <message> <source>(no label)</source> <translation>(nincs címke)</translation> </message> @@ -1536,10 +1499,6 @@ Cím: %4 <translation>Üzenet aláírása...</translation> </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>Aláírhat a címeivel üzeneteket, amivel bizonyíthatja, hogy a címek az önéi. Vigyázzon, hogy ne írjon alá semmi félreérthetőt, mivel a phising támadásokkal megpróbálhatják becsapni, hogy az azonosságát átírja másokra. Csak olyan részletes állításokat írjon alá, amivel egyetért.</translation> - </message> - <message> <source>Alt+A</source> <translation>Alt+A</translation> </message> @@ -1580,10 +1539,6 @@ Cím: %4 <translation>Üzenet ellenőrzése</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>Írja be az aláírás címét, az üzenetet (ügyelve arra, hogy az új-sor, szóköz, tab, stb. karaktereket is pontosan) és az aláírást az üzenet ellenőrzéséhez. Ügyeljen arra, ne gondoljon többet az aláírásról, mint amennyi az aláírt szövegben ténylegesen áll, hogy elkerülje a köztes-ember (man-in-the-middle) támadást.</translation> - </message> - <message> <source>The entered address is invalid.</source> <translation>A megadott cím nem érvényes.</translation> </message> @@ -1628,7 +1583,7 @@ Cím: %4 </message> <message> <source>The Bitcoin Core developers</source> - <translation>A Bitcoin fejlesztői</translation> + <translation>A Bitcoin Core fejlesztői</translation> </message> <message> <source>[testnet]</source> @@ -1646,7 +1601,7 @@ Cím: %4 <name>TransactionDesc</name> <message> <source>Open until %1</source> - <translation>Megnyitva %1-ig</translation> + <translation>%1-ig megnyitva</translation> </message> <message> <source>%1/unconfirmed</source> @@ -1692,10 +1647,6 @@ Cím: %4 <source>Credit</source> <translation>Jóváírás</translation> </message> - <message numerus="yes"> - <source>matures in %n more block(s)</source> - <translation><numerusform>beérik %n blokk múlva</numerusform><numerusform>beérik %n blokk múlva</numerusform></translation> - </message> <message> <source>not accepted</source> <translation>elutasítva</translation> @@ -1752,10 +1703,6 @@ Cím: %4 <source>, has not been successfully broadcast yet</source> <translation>, még nem sikerült elküldeni.</translation> </message> - <message numerus="yes"> - <source>Open for %n more block(s)</source> - <translation><numerusform>%n további blokkra megnyitva</numerusform><numerusform>%n további blokkra megnyitva</numerusform></translation> - </message> <message> <source>unknown</source> <translation>ismeretlen</translation> @@ -1783,14 +1730,6 @@ Cím: %4 <translation>Típus</translation> </message> <message> - <source>Address</source> - <translation>Cím</translation> - </message> - <message numerus="yes"> - <source>Open for %n more block(s)</source> - <translation><numerusform>%n további blokkra megnyitva</numerusform><numerusform>%n további blokkra megnyitva</numerusform></translation> - </message> - <message> <source>Open until %1</source> <translation>%1-ig megnyitva</translation> </message> @@ -1811,6 +1750,10 @@ Cím: %4 <translation>Offline</translation> </message> <message> + <source>Label</source> + <translation>Címke</translation> + </message> + <message> <source>Received with</source> <translation>Erre a címre</translation> </message> @@ -1847,10 +1790,6 @@ Cím: %4 <translation>Tranzakció típusa.</translation> </message> <message> - <source>Destination address of transaction.</source> - <translation>A tranzakció címzettjének címe.</translation> - </message> - <message> <source>Amount removed from or added to balance.</source> <translation>Az egyenleghez jóváírt vagy ráterhelt összeg.</translation> </message> @@ -1995,7 +1934,7 @@ Cím: %4 <name>WalletView</name> <message> <source>&Export</source> - <translation>&Exportálás...</translation> + <translation>&Exportálás</translation> </message> <message> <source>Export the data in the current tab to a file</source> @@ -2058,10 +1997,6 @@ Cím: %4 <translation>Kívülről érkező kapcsolatok elfogadása (alapértelmezett: 1, ha nem használt a -proxy vagy a -connect)</translation> </message> <message> - <source>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>Hiba: a tranzakciót elutasították. Ezt az okozhatja, ha már elköltöttél valamennyi érmét a tárcádból például ha a wallet.dat-od egy másolatát használtad, és így az elköltés csak abban lett jelölve, de itt nem.</translation> - </message> - <message> <source>Execute command when a wallet transaction changes (%s in cmd is replaced by TxID)</source> <translation>Parancs, amit akkor hajt végre, amikor egy tárca-tranzakció megváltozik (%s a parancsban lecserélődik a blokk TxID-re)</translation> </message> @@ -2078,10 +2013,6 @@ Cím: %4 <translation>Sérült blokk-adatbázis észlelve</translation> </message> <message> - <source>Discover own IP address (default: 1 when listening and no -externalip)</source> - <translation>Saját IP-cím felfedezése (alapértelmezett: 1, amikor figyel és nem használt a -externalip)</translation> - </message> - <message> <source>Do you want to rebuild the block database now?</source> <translation>Újra akarod építeni a blokk adatbázist most?</translation> </message> @@ -2122,10 +2053,6 @@ Cím: %4 <translation>Nincs elég fájlleíró. </translation> </message> <message> - <source>Rebuild block chain index from current blk000??.dat files</source> - <translation>Blokklánc index újraalkotása az alábbi blk000??.dat fájlokból</translation> - </message> - <message> <source>Verifying blocks...</source> <translation>Blokkok ellenőrzése...</translation> </message> @@ -2138,6 +2065,10 @@ Cím: %4 <translation>Az adatbázist újra kell építeni -reindex használatával (módosítás -tindex).</translation> </message> <message> + <source>Choose data directory on startup (default: 0)</source> + <translation>Adatkönyvtár kiválasztása induláskor (alapbeállítás: 0)</translation> + </message> + <message> <source>Information</source> <translation>Információ</translation> </message> @@ -2154,10 +2085,27 @@ Cím: %4 <translation>trace/debug információ küldése a konzolra a debog.log fájl helyett</translation> </message> <message> + <source>Set SSL root certificates for payment request (default: -system-)</source> + <translation>SLL gyökér-igazolások megadása fizetési kérelmekhez (alapértelmezett: -system-)</translation> + </message> + <message> + <source>Set language, for example "de_DE" (default: system locale)</source> + <translation>Nyelvbeállítás, például "de_DE" (alapértelmezett: rendszer nyelve)</translation> + </message> + <message> + <source>Show splash screen on startup (default: 1)</source> + <translation>Indítóképernyő mutatása induláskor (alapértelmezett: 1)</translation> + </message> + <message> <source>Signing transaction failed</source> <translation>Tranzakció aláírása sikertelen</translation> </message> <message> + <source>Start minimized</source> + <translation>Indítás lekicsinyítve +</translation> + </message> + <message> <source>This is experimental software.</source> <translation>Ez egy kísérleti szoftver.</translation> </message> @@ -2251,10 +2199,6 @@ Cím: %4 <translation>Étvénytelen -paytxfee=<összeg> összeg: '%s'</translation> </message> <message> - <source>Invalid amount</source> - <translation>Étvénytelen összeg</translation> - </message> - <message> <source>Insufficient funds</source> <translation>Nincs elég bitcoinod.</translation> </message> @@ -2287,10 +2231,6 @@ Cím: %4 <translation>Betöltés befejezve.</translation> </message> <message> - <source>To use the %s option</source> - <translation>Használd a %s opciót</translation> - </message> - <message> <source>Error</source> <translation>Hiba</translation> </message> diff --git a/src/qt/locale/bitcoin_id_ID.ts b/src/qt/locale/bitcoin_id_ID.ts index ea2750ed08..7bc7ed4607 100644 --- a/src/qt/locale/bitcoin_id_ID.ts +++ b/src/qt/locale/bitcoin_id_ID.ts @@ -1,11 +1,7 @@ -<TS language="id_ID" version="2.0"> +<TS language="id_ID" version="2.1"> <context> <name>AddressBookPage</name> <message> - <source>Double-click to edit address or label</source> - <translation>Klik-ganda untuk mengubah alamat atau label</translation> - </message> - <message> <source>Create a new address</source> <translation>Buat alamat baru</translation> </message> @@ -152,10 +148,6 @@ <translation>Ubah kata kunci</translation> </message> <message> - <source>Enter the old and new passphrase to the wallet.</source> - <translation>Masukkan kata kunci lama dan baru ke dompet ini.</translation> - </message> - <message> <source>Confirm wallet encryption</source> <translation>Konfirmasi enkripsi dompet</translation> </message> @@ -176,10 +168,6 @@ <translation>Dompet terenkripsi</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>Bitcoin akan menutup untuk menyelesaikan proses enkripsi. Ingat bahwa dengan mengenkripsi dompet Anda tidak sepenuhnya melindungi bitcoin Anda dari perangkat lunak berbahaya yang menginfeksi komputer Anda.</translation> - </message> - <message> <source>Wallet encryption failed</source> <translation>Enkripsi dompet gagal</translation> </message> @@ -295,10 +283,6 @@ <translation>Kirim koin ke alamat Bitcoin</translation> </message> <message> - <source>Modify configuration options for Bitcoin</source> - <translation>Ubah pilihan konfigurasi untuk Bitcoin</translation> - </message> - <message> <source>Backup wallet to another location</source> <translation>Cadangkan dompet ke lokasi lain</translation> </message> @@ -475,18 +459,6 @@ <translation>Transaksi diterima</translation> </message> <message> - <source>Date: %1 -Amount: %2 -Type: %3 -Address: %4 -</source> - <translation>Tanggal: %1 -Nilai: %2 -Jenis: %3 -Alamat: %4 -</translation> - </message> - <message> <source>Wallet is <b>encrypted</b> and currently <b>unlocked</b></source> <translation>Dompet saat ini <b>terenkripsi</b> dan <b>terbuka</b></translation> </message> @@ -665,10 +637,6 @@ Alamat: %4 <translation>tidak</translation> </message> <message> - <source>This label turns red, if the transaction size is greater than 1000 bytes.</source> - <translation>Label ini akan berubah merah, jika ukuran transaksi lebih besar dari 1000 byte.</translation> - </message> - <message> <source>This means a fee of at least %1 per kB is required.</source> <translation>Berarti perlu biaya lebih dari %1 untuk setiap kB.</translation> </message> @@ -681,14 +649,6 @@ Alamat: %4 <translation>Makin penting transaksinya, makin kemungkinan akan termasuk dalam blok.</translation> </message> <message> - <source>This label turns red, if the priority is smaller than "medium".</source> - <translation>Label ini akan berubah merah, jika prioritas lebih kecil dari "medium".</translation> - </message> - <message> - <source>This label turns red, if any recipient receives an amount smaller than %1.</source> - <translation>Label ini akan berubah merah, jika setiap penerima menerima nilai lebih kecil dari %1.</translation> - </message> - <message> <source>(no label)</source> <translation>(tidak ada label)</translation> </message> @@ -801,23 +761,7 @@ Alamat: %4 <source>command-line options</source> <translation>pilihan perintah-baris</translation> </message> - <message> - <source>UI options</source> - <translation>pilihan UI</translation> - </message> - <message> - <source>Set language, for example "de_DE" (default: system locale)</source> - <translation>Atur bahasa, sebagai contoh "id_ID" (standar: system locale)</translation> - </message> - <message> - <source>Start minimized</source> - <translation>Memulai terminimalisi</translation> - </message> - <message> - <source>Show splash screen on startup (default: 1)</source> - <translation>Tampilkan layar pembuka saat nyala (standar: 1)</translation> - </message> - </context> +</context> <context> <name>Intro</name> <message> @@ -883,14 +827,6 @@ Alamat: %4 <translation>&Utama</translation> </message> <message> - <source>Automatically start Bitcoin after logging in to the system.</source> - <translation>Menyalakan Bitcoin secara otomatis setelah masuk ke dalam sistem.</translation> - </message> - <message> - <source>&Start Bitcoin on system login</source> - <translation>&Menyalakan Bitcoin pada login sistem</translation> - </message> - <message> <source>MB</source> <translation>MB</translation> </message> @@ -971,10 +907,6 @@ Alamat: %4 <translation>&Meminilisasi ke tray daripada taskbar</translation> </message> <message> - <source>Minimize instead of exit the application when the window is closed. When this option is enabled, the application will be closed only after selecting Quit in the menu.</source> - <translation>Meminimalkan tanpa keluar dari aplikasi saat jendela ditutup. Apabila pilihan ini diaktifkan, aplikasi hanya bisa ditutup dengan memilih Keluar di menu Berkas.</translation> - </message> - <message> <source>M&inimize on close</source> <translation>M&eminilisasi saat tutup</translation> </message> @@ -987,10 +919,6 @@ Alamat: %4 <translation>&Bahasa Antarmuka Pengguna:</translation> </message> <message> - <source>The user interface language can be set here. This setting will take effect after restarting Bitcoin.</source> - <translation>Tampilan bahasa pengguna dapat diatur disini. Pengaturan ini akan berpengaruh setelah memulai kembali aplikasi Bitcoin.</translation> - </message> - <message> <source>&Unit to show amounts in:</source> <translation>&Unit untuk menunjukkan nilai:</translation> </message> @@ -1027,10 +955,6 @@ Alamat: %4 <translation>Restart klien diperlukan untuk mengaktifkan perubahan.</translation> </message> <message> - <source>Client will be shutdown, do you want to proceed?</source> - <translation>Klien akan dimatikan, apakah anda hendak melanjutkan?</translation> - </message> - <message> <source>This change would require a client restart.</source> <translation>Perubahan ini akan memerlukan restart klien</translation> </message> @@ -1261,18 +1185,10 @@ Alamat: %4 <translation>Berkas catatan debug</translation> </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>Buka berkas catatan debug Bitcoin dari direktori data sekarang. Hal ini dapat memakan waktu beberapa detik untuk berkas catatan yang besar.</translation> - </message> - <message> <source>Clear console</source> <translation>Bersihkan konsol</translation> </message> <message> - <source>Welcome to the Bitcoin RPC console.</source> - <translation>Selamat datang ke konsol RPC Bitcoin.</translation> - </message> - <message> <source>Use up and down arrows to navigate history, and <b>Ctrl-L</b> to clear screen.</source> <translation>Gunakan panah keatas dan kebawah untuk menampilkan sejarah, dan <b>Ctrl-L</b> untuk bersihkan layar.</translation> </message> @@ -1585,10 +1501,6 @@ Alamat: %4 <translation>atau</translation> </message> <message> - <source>The recipient address is not valid, please recheck.</source> - <translation>Alamat penerima tidak sah, silakan periksa sekali lagi.</translation> - </message> - <message> <source>The amount to pay must be larger than 0.</source> <translation>Nilai yang dibayar harus lebih besar dari 0.</translation> </message> @@ -1601,10 +1513,6 @@ Alamat: %4 <translation>Jumlah melebihi saldo Anda ketika biaya transaksi %1 ditambahkan.</translation> </message> <message> - <source>Duplicate address found, can only send to each address once per send operation.</source> - <translation>Ditemukan alamat ganda, hanya dapat mengirim ke tiap alamat sekali per operasi pengiriman.</translation> - </message> - <message> <source>Transaction creation failed!</source> <translation>Gagal membuat transaksi!</translation> </message> @@ -1676,18 +1584,10 @@ Alamat: %4 <translation>Pesan:</translation> </message> <message> - <source>This is a verified payment request.</source> - <translation>Permintaan pembayaran terverifikasi.</translation> - </message> - <message> <source>Enter a label for this address to add it to the list of used addresses</source> <translation>Masukkan label untuk alamat ini untuk dimasukan dalam daftar alamat yang pernah digunakan</translation> </message> <message> - <source>This is an unverified payment request.</source> - <translation>Permintaan pembayaran tidak terverifikasi.</translation> - </message> - <message> <source>Pay To:</source> <translation>Kirim Ke:</translation> </message> @@ -2001,10 +1901,6 @@ Alamat: %4 <translation>Jenis</translation> </message> <message> - <source>Address</source> - <translation>Alamat</translation> - </message> - <message> <source>Immature (%1 confirmations, will be available after %2)</source> <translation>Terlalu muda (cuma %1 konfirmasi, akan siap sesudah %2) </translation> </message> @@ -2033,6 +1929,10 @@ Alamat: %4 <translation>Tidak terhubung</translation> </message> <message> + <source>Label</source> + <translation>Label</translation> + </message> + <message> <source>Unconfirmed</source> <translation>Belum dikonfirmasi</translation> </message> @@ -2081,10 +1981,6 @@ Alamat: %4 <translation>Jenis transaksi.</translation> </message> <message> - <source>Destination address of transaction.</source> - <translation>Alamat tujuan dari transaksi.</translation> - </message> - <message> <source>Amount removed from or added to balance.</source> <translation>Nilai dihapus dari atau ditambahkan ke saldo.</translation> </message> @@ -2307,10 +2203,6 @@ Alamat: %4 <translation>Terima hubungan dari luar (standar: 1 kalau -proxy atau -connect tidak dipilih)</translation> </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>Gagal: Transaksi ditolak. Ini mungkin terjadi jika beberapa dari koin dalam dompet Anda telah digunakan, seperti ketika Anda menggunakan salinan wallet.dat dan beberapa koin telah dibelanjakan dalam salinan tersebut tetapi disini tidak tertandai sebagai terpakai.</translation> - </message> - <message> <source>Execute command when a wallet transaction changes (%s in cmd is replaced by TxID)</source> <translation>Jalankan perintah ketika perubahan transaksi dompet (%s di cmd digantikan oleh TxID)</translation> </message> @@ -2359,10 +2251,6 @@ Alamat: %4 <translation>Menemukan database blok yang rusak </translation> </message> <message> - <source>Discover own IP address (default: 1 when listening and no -externalip)</source> - <translation>Cari alamat IP Anda sendiri (biasanya: 1 saat mendengarkan dan -externalip tidak terpilih)</translation> - </message> - <message> <source>Do not load the wallet and disable wallet RPC calls</source> <translation>Jangan memuat dompet dan menonaktifkan panggilan dompet RPC</translation> </message> @@ -2391,10 +2279,6 @@ Alamat: %4 <translation>Gagal: Hard disk hampir terisi!</translation> </message> <message> - <source>Error: Wallet locked, unable to create transaction!</source> - <translation>Gagal: Dompet terkunci, transaksi tidak bisa dibuat!</translation> - </message> - <message> <source>Importing...</source> <translation>mengimpor...</translation> </message> @@ -2467,6 +2351,14 @@ Alamat: %4 <translation>Kirim info jejak/debug ke konsol bukan berkas debug.log</translation> </message> <message> + <source>Set language, for example "de_DE" (default: system locale)</source> + <translation>Atur bahasa, sebagai contoh "id_ID" (standar: system locale)</translation> + </message> + <message> + <source>Show splash screen on startup (default: 1)</source> + <translation>Tampilkan layar pembuka saat nyala (standar: 1)</translation> + </message> + <message> <source>Shrink debug.log file on client startup (default: 1 when no -debug)</source> <translation>Mengecilkan berkas debug.log saat klien berjalan (Standar: 1 jika tidak -debug)</translation> </message> @@ -2475,6 +2367,10 @@ Alamat: %4 <translation>Tandatangani transaksi tergagal</translation> </message> <message> + <source>Start minimized</source> + <translation>Memulai terminimalisi</translation> + </message> + <message> <source>Transaction amount too small</source> <translation>Nilai transaksi terlalu kecil</translation> </message> @@ -2495,10 +2391,6 @@ Alamat: %4 <translation>Peringatan</translation> </message> <message> - <source>Warning: This version is obsolete, upgrade required!</source> - <translation>Perhatian: Versi ini sudah lama, perlu ditingkatkan!</translation> - </message> - <message> <source>Zapping all transactions from wallet...</source> <translation>Setiap transaksi dalam dompet sedang di-'Zap'...</translation> </message> @@ -2567,10 +2459,6 @@ Alamat: %4 <translation>Nilai salah untuk -paytxfee=<amount>: '%s'</translation> </message> <message> - <source>Invalid amount</source> - <translation>Nilai salah</translation> - </message> - <message> <source>Insufficient funds</source> <translation>Saldo tidak mencukupi</translation> </message> @@ -2603,10 +2491,6 @@ Alamat: %4 <translation>Memuat selesai</translation> </message> <message> - <source>To use the %s option</source> - <translation>Gunakan pilihan %s</translation> - </message> - <message> <source>Error</source> <translation>Gagal</translation> </message> diff --git a/src/qt/locale/bitcoin_it.ts b/src/qt/locale/bitcoin_it.ts index 06cf0e0162..2aa1e1da43 100644 --- a/src/qt/locale/bitcoin_it.ts +++ b/src/qt/locale/bitcoin_it.ts @@ -1,9 +1,9 @@ -<TS language="it" version="2.0"> +<TS language="it" version="2.1"> <context> <name>AddressBookPage</name> <message> - <source>Double-click to edit address or label</source> - <translation>Doppio click per modificare l'indirizzo o l'etichetta</translation> + <source>Right-click to edit address or label</source> + <translation>Fare clic con il tasto destro del mouse per modificare l'indirizzo o l'etichetta</translation> </message> <message> <source>Create a new address</source> @@ -15,7 +15,7 @@ </message> <message> <source>Copy the currently selected address to the system clipboard</source> - <translation>Copia l'indirizzo attualmente selezionato negli appunti</translation> + <translation>Copia negli appunti l'indirizzo attualmente selezionato</translation> </message> <message> <source>&Copy</source> @@ -31,11 +31,11 @@ </message> <message> <source>Delete the currently selected address from the list</source> - <translation>Cancella l'indirizzo attualmente selezionato dalla lista</translation> + <translation>Rimuove dalla lista l'indirizzo attualmente selezionato</translation> </message> <message> <source>Export the data in the current tab to a file</source> - <translation>Esporta i dati nella tabella corrente in un file</translation> + <translation>Esporta su file i dati contenuti nella tabella corrente</translation> </message> <message> <source>&Export</source> @@ -43,7 +43,7 @@ </message> <message> <source>&Delete</source> - <translation>&Cancella</translation> + <translation>&Elimina</translation> </message> <message> <source>Choose the address to send coins to</source> @@ -67,11 +67,11 @@ </message> <message> <source>These are your Bitcoin addresses for sending payments. Always check the amount and the receiving address before sending coins.</source> - <translation>Questo è un elenco di indirizzi bitcoin a cui puoi inviare pagamenti. Controlla sempre l'importo e l'indirizzo del beneficiario prima di inviare bitcoin.</translation> + <translation>Questo è un elenco di indirizzi Bitcoin a cui puoi inviare pagamenti. Controlla sempre l'importo e l'indirizzo del beneficiario prima di inviare bitcoin.</translation> </message> <message> <source>These are your Bitcoin addresses for receiving payments. It is recommended to use a new receiving address for each transaction.</source> - <translation>Questi sono i tuoi indirizzi bitcoin che puoi usare per ricevere pagamenti. Si raccomanda di generare un nuovo indirizzo per ogni transazione.</translation> + <translation>Questi sono i tuoi indirizzi Bitcoin che puoi usare per ricevere pagamenti. Si raccomanda di generare un nuovo indirizzo per ogni transazione.</translation> </message> <message> <source>Copy &Label</source> @@ -95,7 +95,7 @@ </message> <message> <source>There was an error trying to save the address list to %1. Please try again.</source> - <translation>Si è verificato un errore tentando di salvare la lista degli indirizzi. %1. Riprova</translation> + <translation>Si è verificato un errore tentando di salvare la lista degli indirizzi su %1. Si prega di riprovare.</translation> </message> </context> <context> @@ -117,19 +117,19 @@ <name>AskPassphraseDialog</name> <message> <source>Passphrase Dialog</source> - <translation>Finestra parola d'ordine</translation> + <translation>Finestra passphrase</translation> </message> <message> <source>Enter passphrase</source> - <translation>Inserisci la parola d'ordine</translation> + <translation>Inserisci la passphrase</translation> </message> <message> <source>New passphrase</source> - <translation>Nuova parola d'ordine</translation> + <translation>Nuova passphrase</translation> </message> <message> <source>Repeat new passphrase</source> - <translation>Ripeti la nuova parola d'ordine</translation> + <translation>Ripeti la nuova passphrase</translation> </message> <message> <source>Encrypt wallet</source> @@ -137,7 +137,7 @@ </message> <message> <source>This operation needs your wallet passphrase to unlock the wallet.</source> - <translation>Quest'operazione necessita della passphrase per sbloccare il portamonete.</translation> + <translation>Questa operazione necessita della passphrase per sbloccare il portamonete.</translation> </message> <message> <source>Unlock wallet</source> @@ -156,16 +156,12 @@ <translation>Cambia la passphrase</translation> </message> <message> - <source>Enter the old and new passphrase to the wallet.</source> - <translation>Inserisci la vecchia e la nuova passphrase per il portamonete.</translation> - </message> - <message> <source>Confirm wallet encryption</source> <translation>Conferma la cifratura del portamonete</translation> </message> <message> <source>Warning: If you encrypt your wallet and lose your passphrase, you will <b>LOSE ALL OF YOUR BITCOINS</b>!</source> - <translation>Attenzione: se si cifra il portamonete e si perde la passphrase <b>TUTTI I PROPRI BITCOIN ANDRANNO PERSI</b>!</translation> + <translation>Attenzione: perdendo la passphrase di un portamonete cifrato <b>TUTTI I PROPRI BITCOIN ANDRANNO PERSI</b>!</translation> </message> <message> <source>Are you sure you wish to encrypt your wallet?</source> @@ -185,11 +181,7 @@ </message> <message> <source>Enter the new passphrase to the wallet.<br/>Please use a passphrase of <b>ten or more random characters</b>, or <b>eight or more words</b>.</source> - <translation>Inserisci una nuona password per il postafoglio.<br/>Perfavore usa una password di<b>dieci o più caratteri</b>, o <b>otto o più parole</b>.</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>Bitcoin si chiuderà per portare a termine il processo di cifratura. Ricorda che cifrare il tuo portamonete non può fornire una protezione totale contro i furti causati da infezioni malware.</translation> + <translation>Inserisci la nuova passphrase per il portamonete.<br/>Si consiglia di utilizzare <b>almeno dieci caratteri casuali</b> oppure <b>otto o più parole</b>.</translation> </message> <message> <source>Wallet encryption failed</source> @@ -224,7 +216,7 @@ <name>BitcoinGUI</name> <message> <source>Sign &message...</source> - <translation>Firma il &messaggio...</translation> + <translation>Firma &messaggio...</translation> </message> <message> <source>Synchronizing with network...</source> @@ -264,7 +256,7 @@ </message> <message> <source>Show information about Qt</source> - <translation>Mostra informazioni su Qt</translation> + <translation>Mostra le informazioni su Qt</translation> </message> <message> <source>&Options...</source> @@ -276,11 +268,11 @@ </message> <message> <source>&Backup Wallet...</source> - <translation>&Backup Portamonete...</translation> + <translation>&Backup portamonete...</translation> </message> <message> <source>&Change Passphrase...</source> - <translation>&Cambia la passphrase...</translation> + <translation>&Cambia passphrase...</translation> </message> <message> <source>&Sending addresses...</source> @@ -308,11 +300,7 @@ </message> <message> <source>Send coins to a Bitcoin address</source> - <translation>Invia monete ad un indirizzo bitcoin</translation> - </message> - <message> - <source>Modify configuration options for Bitcoin</source> - <translation>Modifica opzioni di configurazione per bitcoin</translation> + <translation>Invia fondi ad un indirizzo Bitcoin</translation> </message> <message> <source>Backup wallet to another location</source> @@ -324,7 +312,7 @@ </message> <message> <source>&Debug window</source> - <translation>Finestra &Debug</translation> + <translation>Finestra di &debug</translation> </message> <message> <source>Open debugging and diagnostic console</source> @@ -352,7 +340,7 @@ </message> <message> <source>Show information about Bitcoin Core</source> - <translation>Mostra le informazioni riguardo a Bitcoin core</translation> + <translation>Mostra le informazioni su Bitcoin Core</translation> </message> <message> <source>&Show / Hide</source> @@ -368,11 +356,11 @@ </message> <message> <source>Sign messages with your Bitcoin addresses to prove you own them</source> - <translation>Firma i messaggi con il tuo indirizzo bitcoin per dimostrarne il possesso</translation> + <translation>Firma messaggi con i tuoi indirizzi Bitcoin per dimostrarne il possesso</translation> </message> <message> <source>Verify messages to ensure they were signed with specified Bitcoin addresses</source> - <translation>Verifica i messaggi per accertare che siano stati firmati con gli indirizzi bitcoin specificati</translation> + <translation>Verifica che i messaggi siano stati firmati con gli indirizzi Bitcoin specificati</translation> </message> <message> <source>&File</source> @@ -388,7 +376,7 @@ </message> <message> <source>Tabs toolbar</source> - <translation>Barra degli strumenti "Tabs"</translation> + <translation>Barra degli strumenti</translation> </message> <message> <source>Bitcoin Core</source> @@ -400,7 +388,7 @@ </message> <message> <source>&About Bitcoin Core</source> - <translation>Info su Bitcoin Core</translation> + <translation>&Informazioni su Bitcoin Core</translation> </message> <message> <source>Show the list of used sending addresses and labels</source> @@ -412,23 +400,23 @@ </message> <message> <source>Open a bitcoin: URI or payment request</source> - <translation>Apri un URI o una richiesta di pagamento</translation> + <translation>Apri un bitcoin: URI o una richiesta di pagamento</translation> </message> <message> <source>&Command-line options</source> - <translation>Opzioni riga di &comando</translation> + <translation>Opzioni della riga di &comando</translation> </message> <message> <source>Show the Bitcoin Core help message to get a list with possible Bitcoin command-line options</source> - <translation>Mostra il messaggio di aiuto di Bitcoin Core per avere la lista di tutte le opzioni della riga di comando di Bitcoin.</translation> + <translation>Mostra il messaggio di aiuto di Bitcoin Core per ottenere la lista delle opzioni della riga di comando valide.</translation> </message> <message numerus="yes"> <source>%n active connection(s) to Bitcoin network</source> - <translation><numerusform>%n connessione attiva alla rete Bitcoin</numerusform><numerusform>%n connessioni attive alla rete Bitcoin</numerusform></translation> + <translation><numerusform>%n connessione attiva alla rete Bitcoin</numerusform><numerusform>%n connessioni alla rete Bitcoin attive</numerusform></translation> </message> <message> <source>No block source available...</source> - <translation>Nessuna fonte di blocchi disponibile</translation> + <translation>Nessuna fonte di blocchi disponibile...</translation> </message> <message numerus="yes"> <source>%n hour(s)</source> @@ -460,7 +448,7 @@ </message> <message> <source>Transactions after this will not yet be visible.</source> - <translation>Transazioni successive a questa non saranno ancora visibili.</translation> + <translation>Le transazioni effettuate successivamente non sono ancora visibili.</translation> </message> <message> <source>Error</source> @@ -478,10 +466,6 @@ <source>Up to date</source> <translation>Aggiornato</translation> </message> - <message numerus="yes"> - <source>Processed %n blocks of transaction history.</source> - <translation><numerusform>Processati %n blocchi dello storico transazioni.</numerusform><numerusform>Processati %n blocchi dello storico delle transazioni.</numerusform></translation> - </message> <message> <source>Catching up...</source> <translation>In aggiornamento...</translation> @@ -495,19 +479,6 @@ <translation>Transazione ricevuta</translation> </message> <message> - <source>Date: %1 -Amount: %2 -Type: %3 -Address: %4 -</source> - <translation>Data: %1 -Quantità: %2 -Tipo: %3 -Indirizzo: %4 - -</translation> - </message> - <message> <source>Wallet is <b>encrypted</b> and currently <b>unlocked</b></source> <translation>Il portamonete è <b>cifrato</b> ed attualmente <b>sbloccato</b></translation> </message> @@ -527,8 +498,7 @@ Indirizzo: %4 <name>CoinControlDialog</name> <message> <source>Coin Selection</source> - <translation>Seleziona Moneta -</translation> + <translation>Selezione Input</translation> </message> <message> <source>Quantity:</source> @@ -552,7 +522,7 @@ Indirizzo: %4 </message> <message> <source>Dust:</source> - <translation>Importo</translation> + <translation>Trascurabile:</translation> </message> <message> <source>After Fee:</source> @@ -580,7 +550,7 @@ Indirizzo: %4 </message> <message> <source>Received with label</source> - <translation>Ricevuto con etichetta</translation> + <translation>Ricevuto con l'etichetta</translation> </message> <message> <source>Received with address</source> @@ -592,7 +562,7 @@ Indirizzo: %4 </message> <message> <source>Confirmations</source> - <translation>Conferme:</translation> + <translation>Conferme</translation> </message> <message> <source>Confirmed</source> @@ -612,7 +582,7 @@ Indirizzo: %4 </message> <message> <source>Copy amount</source> - <translation>Copia l'importo</translation> + <translation>Copia importo</translation> </message> <message> <source>Copy transaction ID</source> @@ -648,7 +618,7 @@ Indirizzo: %4 </message> <message> <source>Copy dust</source> - <translation>Copia l'importo</translation> + <translation>Copia trascurabile</translation> </message> <message> <source>Copy change</source> @@ -660,7 +630,7 @@ Indirizzo: %4 </message> <message> <source>higher</source> - <translation>superiore</translation> + <translation>molto alta</translation> </message> <message> <source>high</source> @@ -684,7 +654,7 @@ Indirizzo: %4 </message> <message> <source>lower</source> - <translation>minore</translation> + <translation>molto bassa</translation> </message> <message> <source>lowest</source> @@ -700,7 +670,7 @@ Indirizzo: %4 </message> <message> <source>Can vary +/- %1 satoshi(s) per input.</source> - <translation>Può variare +/- %1 satoshi(s) per input.</translation> + <translation>Può variare di +/- %1 satoshi per input.</translation> </message> <message> <source>yes</source> @@ -711,12 +681,8 @@ Indirizzo: %4 <translation>no</translation> </message> <message> - <source>This label turns red, if the transaction size is greater than 1000 bytes.</source> - <translation>Questa etichetta diventa rossa se la dimensione della transazione supera i 1000 bytes</translation> - </message> - <message> <source>This means a fee of at least %1 per kB is required.</source> - <translation>Questo significa che è richiesta una commissione di almeno %1 per ogni kB.</translation> + <translation>In tal caso sarà necessaria una commissione di almeno %1 per ogni kB.</translation> </message> <message> <source>Can vary +/- 1 byte per input.</source> @@ -727,14 +693,6 @@ Indirizzo: %4 <translation>Le transazioni con priorità più alta hanno più probabilità di essere incluse in un blocco.</translation> </message> <message> - <source>This label turns red, if the priority is smaller than "medium".</source> - <translation>Questa etichetta diventa rossa se la priorità è inferiore a "media".</translation> - </message> - <message> - <source>This label turns red, if any recipient receives an amount smaller than %1.</source> - <translation>Questa etichetta diventa rossa se uno qualsiasi dei destinatari riceve un ammontare inferiore di %1.</translation> - </message> - <message> <source>(no label)</source> <translation>(nessuna etichetta)</translation> </message> @@ -763,7 +721,7 @@ Indirizzo: %4 </message> <message> <source>The address associated with this address list entry. This can only be modified for sending addresses.</source> - <translation>L'indirizzo associato a questa voce della rubrica. Può essere modificato solo per gli indirizzi d'invio.</translation> + <translation>L'indirizzo associato con questa voce della lista degli indirizzi. Può essere modificato solo per gli indirizzi d'invio.</translation> </message> <message> <source>&Address</source> @@ -787,11 +745,11 @@ Indirizzo: %4 </message> <message> <source>The entered address "%1" is already in the address book.</source> - <translation>L'indirizzo inserito "%1" è già in rubrica.</translation> + <translation>L'indirizzo "%1" è già presente in rubrica.</translation> </message> <message> <source>The entered address "%1" is not a valid Bitcoin address.</source> - <translation>L'indirizzo inserito "%1" non è un indirizzo bitcoin valido.</translation> + <translation>L'indirizzo "%1" non è un indirizzo bitcoin valido.</translation> </message> <message> <source>Could not unlock wallet.</source> @@ -810,11 +768,11 @@ Indirizzo: %4 </message> <message> <source>name</source> - <translation>Nome</translation> + <translation>nome</translation> </message> <message> <source>Directory already exists. Add %1 if you intend to create a new directory here.</source> - <translation>La cartella esiste già. Aggiungi %1 se intendi creare qui una nuova cartella.</translation> + <translation>Cartella già esistente. Aggiungi %1 se intendi creare qui una nuova cartella.</translation> </message> <message> <source>Path already exists, and is not a directory.</source> @@ -822,7 +780,7 @@ Indirizzo: %4 </message> <message> <source>Cannot create data directory here.</source> - <translation>Qui non è possibile creare una cartella dati.</translation> + <translation>Impossibile creare una cartella dati qui.</translation> </message> </context> <context> @@ -841,11 +799,11 @@ Indirizzo: %4 </message> <message> <source>About Bitcoin Core</source> - <translation>Info su Bitcoin Core</translation> + <translation>Informazioni su Bitcoin Core</translation> </message> <message> <source>Command-line options</source> - <translation>opzioni riga di comando</translation> + <translation>Opzioni della riga di comando</translation> </message> <message> <source>Usage:</source> @@ -853,31 +811,7 @@ Indirizzo: %4 </message> <message> <source>command-line options</source> - <translation>opzioni riga di comando</translation> - </message> - <message> - <source>UI options</source> - <translation>UI opzioni</translation> - </message> - <message> - <source>Set language, for example "de_DE" (default: system locale)</source> - <translation>Imposta lingua, ad esempio "it_IT" (predefinita: lingua di sistema)</translation> - </message> - <message> - <source>Start minimized</source> - <translation>Avvia ridotto a icona</translation> - </message> - <message> - <source>Set SSL root certificates for payment request (default: -system-)</source> - <translation>Imposta i certificati radice SSL per le richieste di pagamento (predefinito: -system-)</translation> - </message> - <message> - <source>Show splash screen on startup (default: 1)</source> - <translation>Mostra finestra di presentazione all'avvio (predefinito: 1)</translation> - </message> - <message> - <source>Choose data directory on startup (default: 0)</source> - <translation>Scegli una cartella dati all'avvio (predefinito: 0)</translation> + <translation>opzioni della riga di comando</translation> </message> </context> <context> @@ -896,7 +830,7 @@ Indirizzo: %4 </message> <message> <source>Bitcoin Core will download and store a copy of the Bitcoin block chain. At least %1GB of data will be stored in this directory, and it will grow over time. The wallet will also be stored in this directory.</source> - <translation>Bitcoin Core scaricherà e salverà una copia del block chain di Bitcoin. Almeno %1GB di dati che andranno ad aumentare col tempo saranno salvati in questa cartella. Anche il portamonete sarà salvato in questa cartella.</translation> + <translation>Bitcoin Core scaricherà e salverà una copia della block chain di Bitcoin. Il portamonete ed almeno %1GB di dati saranno salvati in questa cartella. Si ricorda che lo spazio occupato andrà ad aumentare nel tempo.</translation> </message> <message> <source>Use the default data directory</source> @@ -953,14 +887,6 @@ Indirizzo: %4 <translation>&Principale</translation> </message> <message> - <source>Automatically start Bitcoin after logging in to the system.</source> - <translation>Avvia automaticamente Bitcoin una volta effettuato l'accesso al sistema.</translation> - </message> - <message> - <source>&Start Bitcoin on system login</source> - <translation>&Avvia Bitcoin all'accesso al sistema</translation> - </message> - <message> <source>Size of &database cache</source> <translation>Dimensione della cache del &database.</translation> </message> @@ -974,20 +900,20 @@ Indirizzo: %4 </message> <message> <source>Accept connections from outside</source> - <translation>Accetta connessioni da fuori</translation> + <translation>Accetta connessioni provenienti dall'esterno</translation> </message> <message> <source>Allow incoming connections</source> - <translation>Permetti connessioni in entrata</translation> + <translation>Permetti connessioni in ingresso</translation> </message> <message> <source>IP address of the proxy (e.g. IPv4: 127.0.0.1 / IPv6: ::1)</source> - <translation>Indirizzo IP del proxy (es: IPv4: 127.0.0.1 / IPv6: ::1)</translation> + <translation>Indirizzo IP del proxy (ad 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> + <translation>URL di terze parti (ad es. un block explorer) che appaiono nella tabella delle transazioni come voci nel menu contestuale. "%s" nell'URL è sostituito dall'hash della transazione. +Per specificare più URL separarli con una barra verticale "|".</translation> </message> <message> <source>Third party transaction URLs</source> @@ -995,7 +921,7 @@ Più URL vengono separati da una barra verticale |.</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> + <translation>Opzioni della riga di comando attive che sostituiscono i settaggi sopra elencati:</translation> </message> <message> <source>Reset all client options to default.</source> @@ -1027,11 +953,11 @@ Più URL vengono separati da una barra verticale |.</translation> </message> <message> <source>If you disable the spending of unconfirmed change, the change from a transaction cannot be used until that transaction has at least one confirmation. This also affects how your balance is computed.</source> - <translation>Disabilitando l'uso di resti non confermati, il resto di una transazione non potrà essere speso fino a quando la transazione non avrà ottenuto almeno una conferma. Questa impostazione influisce inoltre sul calcolo saldo.</translation> + <translation>Disabilitando l'uso di resti non confermati, il resto di una transazione non potrà essere speso fino a quando non avrà ottenuto almeno una conferma. Questa impostazione influisce inoltre sul calcolo del saldo.</translation> </message> <message> <source>&Spend unconfirmed change</source> - <translation>&Spendere resti non confermati</translation> + <translation>&Spendi resti non confermati</translation> </message> <message> <source>Automatically open the Bitcoin client port on the router. This only works when your router supports UPnP and it is enabled.</source> @@ -1059,7 +985,7 @@ Più URL vengono separati da una barra verticale |.</translation> </message> <message> <source>Port of the proxy (e.g. 9050)</source> - <translation>Porta del proxy (es. 9050)</translation> + <translation>Porta del proxy (ad es. 9050)</translation> </message> <message> <source>&Window</source> @@ -1074,10 +1000,6 @@ Più URL vengono separati da una barra verticale |.</translation> <translation>&Minimizza nella tray bar invece che sulla barra delle applicazioni</translation> </message> <message> - <source>Minimize instead of exit the application when the window is closed. When this option is enabled, the application will be closed only after selecting Quit in the menu.</source> - <translation>Riduci ad icona invece di uscire dall'applicazione quando la finestra viene chiusa. Se l'opzione è attiva, l'applicazione terminerà solo dopo aver selezionato Esci dal menu File.</translation> - </message> - <message> <source>M&inimize on close</source> <translation>M&inimizza alla chiusura</translation> </message> @@ -1090,16 +1012,12 @@ Più URL vengono separati da una barra verticale |.</translation> <translation>&Lingua Interfaccia Utente:</translation> </message> <message> - <source>The user interface language can be set here. This setting will take effect after restarting Bitcoin.</source> - <translation>La lingua dell'interfaccia utente può essere impostata qui. L'impostazione avrà effetto dopo il riavvio di Bitcoin.</translation> - </message> - <message> <source>&Unit to show amounts in:</source> <translation>&Unità di misura con cui visualizzare gli importi:</translation> </message> <message> <source>Choose the default subdivision unit to show in the interface and when sending coins.</source> - <translation>Scegli l'unità di suddivisione predefinita da utilizzare per l'interfaccia e per l'invio di monete.</translation> + <translation>Scegli l'unità di suddivisione predefinita da utilizzare per l'interfaccia e per l'invio di bitcoin.</translation> </message> <message> <source>Whether to show coin control features or not.</source> @@ -1127,19 +1045,15 @@ Più URL vengono separati da una barra verticale |.</translation> </message> <message> <source>Client restart required to activate changes.</source> - <translation>È necessario un riavvio del client per rendere attivi i cambiamenti.</translation> - </message> - <message> - <source>Client will be shutdown, do you want to proceed?</source> - <translation>Il client sarà arrestato, vuoi procedere?</translation> + <translation>È necessario un riavvio del client per applicare le modifiche.</translation> </message> <message> <source>This change would require a client restart.</source> - <translation>Questo cambiamento richiede un riavvio del client.</translation> + <translation>Questa modifica richiede un riavvio del client.</translation> </message> <message> <source>The supplied proxy address is invalid.</source> - <translation>L'indirizzo proxy che hai fornito è invalido.</translation> + <translation>L'indirizzo proxy che hai fornito non è valido.</translation> </message> </context> <context> @@ -1154,7 +1068,7 @@ Più URL vengono separati da una barra verticale |.</translation> </message> <message> <source>Watch-only:</source> - <translation>Guarda solo</translation> + <translation>Sola lettura:</translation> </message> <message> <source>Available:</source> @@ -1162,7 +1076,7 @@ Più URL vengono separati da una barra verticale |.</translation> </message> <message> <source>Your current spendable balance</source> - <translation>Saldo spendibile attuale</translation> + <translation>Il tuo saldo spendibile attuale</translation> </message> <message> <source>Pending:</source> @@ -1190,15 +1104,15 @@ Più URL vengono separati da una barra verticale |.</translation> </message> <message> <source>Your current total balance</source> - <translation>Saldo totale attuale</translation> + <translation>Il tuo saldo totale attuale</translation> </message> <message> <source>Your current balance in watch-only addresses</source> - <translation>Il tuo saldo attuale negli indirizzi watch-only</translation> + <translation>Il tuo saldo attuale negli indirizzi di sola lettura</translation> </message> <message> <source>Spendable:</source> - <translation>Saldo Spendibile:</translation> + <translation>Spendibile:</translation> </message> <message> <source>Recent transactions</source> @@ -1210,11 +1124,11 @@ Più URL vengono separati da una barra verticale |.</translation> </message> <message> <source>Mined balance in watch-only addresses that has not yet matured</source> - <translation>l'equilibrio estratto solo nello sguardo degli indirizzi non è ancora maturo </translation> + <translation>Importo generato dal mining su indirizzi di sola lettura e non ancora maturato</translation> </message> <message> <source>Current total balance in watch-only addresses</source> - <translation>Saldo corrente totale negli indirizzi watch-only</translation> + <translation>Saldo corrente totale negli indirizzi di sola lettura</translation> </message> <message> <source>out of sync</source> @@ -1233,15 +1147,11 @@ Più URL vengono separati da una barra verticale |.</translation> </message> <message> <source>Payment request rejected</source> - <translation>Richiesta di pagamento rifiutata</translation> + <translation>Richiesta di pagamento respinta</translation> </message> <message> <source>Payment request network doesn't match client network.</source> - <translation>Il network della richiesta di pagamento non corrisponde al network del client.</translation> - </message> - <message> - <source>Payment request has expired.</source> - <translation>Richieda di pagamento scaduta</translation> + <translation>La rete della richiesta di pagamento non corrisponde alla rete del client.</translation> </message> <message> <source>Payment request is not initialized.</source> @@ -1249,7 +1159,7 @@ Più URL vengono separati da una barra verticale |.</translation> </message> <message> <source>Requested payment amount of %1 is too small (considered dust).</source> - <translation>L'importo di pagamento richiesto di %1 è troppo basso (considerato come trascurabile).</translation> + <translation>L'importo di pagamento di %1 richiesto è troppo basso (considerato come trascurabile).</translation> </message> <message> <source>Payment request error</source> @@ -1265,7 +1175,7 @@ Più URL vengono separati da una barra verticale |.</translation> </message> <message> <source>URI cannot be parsed! This can be caused by an invalid Bitcoin address or malformed URI parameters.</source> - <translation>Impossibile interpretare l'URI! Ciò può essere causato da un indirizzo Bitcoin invalido o da parametri URI non corretti.</translation> + <translation>Impossibile interpretare l'URI! I parametri URI o l'indirizzo Bitcoin potrebbero non essere corretti.</translation> </message> <message> <source>Payment request file handling</source> @@ -1273,7 +1183,7 @@ Più URL vengono separati da una barra verticale |.</translation> </message> <message> <source>Payment request file cannot be read! This can be caused by an invalid payment request file.</source> - <translation>Il file di richiesta del pagamento non può essere letto o elaborato! Questo può essere causato da una richiesta di pagamento non valida.</translation> + <translation>Impossibile leggere il file della richiesta di pagamento! Il file della richiesta di pagamento potrebbe non essere valido.</translation> </message> <message> <source>Unverified payment requests to custom payment scripts are unsupported.</source> @@ -1284,12 +1194,20 @@ Più URL vengono separati da una barra verticale |.</translation> <translation>Rimborso da %1</translation> </message> <message> + <source>Payment request %1 is too large (%2 bytes, allowed %3 bytes).</source> + <translation>La richiesta di pagamento %1 (%2 byte) supera la dimensione massima di %3 byte.</translation> + </message> + <message> + <source>Payment request DoS protection</source> + <translation>Protezione DoS per la richiesta di pagamento</translation> + </message> + <message> <source>Error communicating with %1: %2</source> <translation>Errore di comunicazione con %1: %2</translation> </message> <message> <source>Payment request cannot be parsed!</source> - <translation>La richiesta di pagamento non può essere analizzata.</translation> + <translation>La richiesta di pagamento non può essere analizzata!</translation> </message> <message> <source>Bad response from server %1</source> @@ -1311,10 +1229,6 @@ Più URL vengono separati da una barra verticale |.</translation> <translation>User Agent</translation> </message> <message> - <source>Address/Hostname</source> - <translation>Indirizzo/Hostname</translation> - </message> - <message> <source>Ping Time</source> <translation>Tempo di ping</translation> </message> @@ -1327,7 +1241,7 @@ Più URL vengono separati da una barra verticale |.</translation> </message> <message> <source>Enter a Bitcoin address (e.g. %1)</source> - <translation>Inserisci un indirizzo Bitcoin (e.g. %1)</translation> + <translation>Inserisci un indirizzo Bitcoin (ad es. %1)</translation> </message> <message> <source>%1 d</source> @@ -1346,14 +1260,6 @@ Più URL vengono separati da una barra verticale |.</translation> <translation>%1 s</translation> </message> <message> - <source>NETWORK</source> - <translation>RETE</translation> - </message> - <message> - <source>UNKNOWN</source> - <translation>SCONOSCIUTO</translation> - </message> - <message> <source>None</source> <translation>Nessuno</translation> </message> @@ -1370,7 +1276,7 @@ Più URL vengono separati da una barra verticale |.</translation> <name>QRImageWidget</name> <message> <source>&Save Image...</source> - <translation>&Salva Immagine</translation> + <translation>&Salva Immagine...</translation> </message> <message> <source>&Copy Image</source> @@ -1421,7 +1327,7 @@ Più URL vengono separati da una barra verticale |.</translation> </message> <message> <source>Startup time</source> - <translation>Tempo di avvio</translation> + <translation>Ora di avvio</translation> </message> <message> <source>Network</source> @@ -1453,7 +1359,7 @@ Più URL vengono separati da una barra verticale |.</translation> </message> <message> <source>&Peers</source> - <translation>&Peers</translation> + <translation>&Peer</translation> </message> <message> <source>Select a peer to view detailed information.</source> @@ -1477,35 +1383,35 @@ Più URL vengono separati da una barra verticale |.</translation> </message> <message> <source>Starting Height</source> - <translation>Blocco di partenza</translation> + <translation>Nr. Blocco Iniziale</translation> </message> <message> <source>Sync Height</source> - <translation>valore di sincronizzazione</translation> + <translation>Nr. Blocco Sincronizzato</translation> </message> <message> <source>Ban Score</source> - <translation>divieto di segnalazione </translation> + <translation>Punteggio di Ban</translation> </message> <message> <source>Connection Time</source> - <translation>Tempo di connessione</translation> + <translation>Tempo di Connessione</translation> </message> <message> <source>Last Send</source> - <translation>Ultimo invio</translation> + <translation>Ultimo Invio</translation> </message> <message> <source>Last Receive</source> - <translation>Ultima ricevuta</translation> + <translation>Ultima Ricezione</translation> </message> <message> <source>Bytes Sent</source> - <translation>Bytes Inviati</translation> + <translation>Byte Inviati</translation> </message> <message> <source>Bytes Received</source> - <translation>Bytes Ricevuti</translation> + <translation>Byte Ricevuti</translation> </message> <message> <source>Ping Time</source> @@ -1552,24 +1458,16 @@ Più URL vengono separati da una barra verticale |.</translation> <translation>File log del Debug</translation> </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>Apri il file di log del debug di Bitcoin dalla cartella attuale. Può richiedere alcuni secondi per file di log grandi.</translation> - </message> - <message> <source>Clear console</source> <translation>Cancella console</translation> </message> <message> - <source>Welcome to the Bitcoin RPC console.</source> - <translation>Benvenuto nella console RPC di Bitcoin</translation> - </message> - <message> <source>Use up and down arrows to navigate history, and <b>Ctrl-L</b> to clear screen.</source> - <translation>Usa le frecce direzionali per navigare la cronologia, e <b>Ctrl-L</b> per cancellarla.</translation> + <translation>Usa le frecce direzionali per scorrere la cronologia, e <b>Ctrl-L</b> per cancellarla.</translation> </message> <message> <source>Type <b>help</b> for an overview of available commands.</source> - <translation>Scrivi <b>help</b> per un riassunto dei comandi disponibili</translation> + <translation>Scrivi <b>help</b> per un riassunto dei comandi disponibili.</translation> </message> <message> <source>%1 B</source> @@ -1609,7 +1507,7 @@ Più URL vengono separati da una barra verticale |.</translation> </message> <message> <source>Fetching...</source> - <translation>attraente</translation> + <translation>Recuperando...</translation> </message> </context> <context> @@ -1620,7 +1518,7 @@ Più URL vengono separati da una barra verticale |.</translation> </message> <message> <source>&Label:</source> - <translation>&Etichetta</translation> + <translation>&Etichetta:</translation> </message> <message> <source>&Message:</source> @@ -1628,7 +1526,7 @@ Più URL vengono separati da una barra verticale |.</translation> </message> <message> <source>Reuse one of the previously used receiving addresses. Reusing addresses has security and privacy issues. Do not use this unless re-generating a payment request made before.</source> - <translation>Riutilizza uno degli indirizzi di ricezione generati in precedenza. Riutilizzare un indirizzo comporta problemi di sicurezza e privacy. Non utilizzare a meno che non si stia rigenerando una richiesta di pagamento creata in precedenza.</translation> + <translation>Riutilizza uno degli indirizzi di ricezione generati in precedenza. Riutilizzare un indirizzo comporta problemi di sicurezza e privacy. Non selezionare questa opzione a meno che non si stia rigenerando una richiesta di pagamento creata in precedenza.</translation> </message> <message> <source>R&euse an existing receiving address (not recommended)</source> @@ -1636,11 +1534,11 @@ Più URL vengono separati da una barra verticale |.</translation> </message> <message> <source>An optional message to attach to the payment request, which will be displayed when the request is opened. Note: The message will not be sent with the payment over the Bitcoin network.</source> - <translation>Un messaggio opzionale da allegare alla richiesta di pagamento, il quale sarà mostrato all'apertura della richiesta. Nota: Il messaggio non sarà inviato con il pagamento sulla rete Bitcoin.</translation> + <translation>Un messaggio opzionale da allegare e mostrare all'apertura della richiesta di pagamento. Nota: Il messaggio non sarà inviato con il pagamento sulla rete Bitcoin.</translation> </message> <message> <source>An optional label to associate with the new receiving address.</source> - <translation>Un'etichetta facoltativa da associare al nuovo indirizzo di ricezione</translation> + <translation>Un'etichetta opzionale da associare al nuovo indirizzo di ricezione.</translation> </message> <message> <source>Use this form to request payments. All fields are <b>optional</b>.</source> @@ -1688,7 +1586,7 @@ Più URL vengono separati da una barra verticale |.</translation> </message> <message> <source>Copy message</source> - <translation>Copia messaggio</translation> + <translation>Copia il messaggio</translation> </message> <message> <source>Copy amount</source> @@ -1711,7 +1609,7 @@ Più URL vengono separati da una barra verticale |.</translation> </message> <message> <source>&Save Image...</source> - <translation>&Salva Immagine</translation> + <translation>&Salva Immagine...</translation> </message> <message> <source>Request payment to %1</source> @@ -1747,7 +1645,7 @@ Più URL vengono separati da una barra verticale |.</translation> </message> <message> <source>Error encoding URI into QR Code.</source> - <translation>Errore nella codifica dell'URI nel codice QR</translation> + <translation>Errore nella codifica dell'URI nel codice QR.</translation> </message> </context> <context> @@ -1833,7 +1731,7 @@ Più URL vengono separati da una barra verticale |.</translation> </message> <message> <source>If this is activated, but the change address is empty or invalid, change will be sent to a newly generated address.</source> - <translation>Se questo è abilitato e l'indirizzo per il resto è vuoto o invalido, il resto sarà inviato ad un nuovo indirizzo bitcoin generato appositamente.</translation> + <translation>In caso di abilitazione con indirizzo vuoto o non valido, il resto sarà inviato ad un nuovo indirizzo generato appositamente.</translation> </message> <message> <source>Custom change address</source> @@ -1841,31 +1739,47 @@ Più URL vengono separati da una barra verticale |.</translation> </message> <message> <source>Transaction Fee:</source> - <translation>Tasse di Transazione</translation> + <translation>Commissione di Transazione:</translation> </message> <message> <source>Choose...</source> <translation>Scegli...</translation> </message> <message> - <source>Minimize</source> - <translation>Minimizza</translation> + <source>collapse fee-settings</source> + <translation>minimizza le impostazioni di commissione</translation> </message> <message> <source>per kilobyte</source> <translation>per kilobyte</translation> </message> <message> + <source>If the custom fee is set to 1000 satoshis and the transaction is only 250 bytes, then "per kilobyte" only pays 250 satoshis in fee, while "total at least" pays 1000 satoshis. For transactions bigger than a kilobyte both pay by kilobyte.</source> + <translation>Se la commissione personalizzata è impostata su 1000 satoshi e la transazione è di soli 250 byte, allora "per kilobyte" paga solo 250 satoshi di commissione, mentre "somma almeno" paga 1000 satoshi. Per transazioni più grandi di un kilobyte, entrambe le opzioni pagano al kilobyte.</translation> + </message> + <message> + <source>total at least</source> + <translation>somma almeno</translation> + </message> + <message> <source>Paying only the minimum fee is just fine as long as there is less transaction volume than space in the blocks. But be aware that this can end up in a never confirming transaction once there is more demand for bitcoin transactions than the network can process.</source> - <translation>Pagando solo la tariffa minima è bene finché c'è meno volume di transazioni di spazio nei blocchi. Ma essere consapevoli che questo può finire in una transazione non confermando ancora una volta non vi è più richiesta per le transazioni Bitcoin di rete in grado di elaborare.</translation> + <translation>Non vi è alcuna controindicazione a pagare la commissione minima, a patto che il volume delle transazioni sia inferiore allo spazio disponibile nei blocchi. Occorre comunque essere consapevoli che ciò potrebbe impedire la conferma delle transazioni nel caso in cui la rete risultasse satura.</translation> + </message> + <message> + <source>(read the tooltip)</source> + <translation>(leggi il suggerimento)</translation> </message> <message> <source>Recommended:</source> - <translation>Raccomandati:</translation> + <translation>Raccomandata:</translation> </message> <message> <source>Custom:</source> - <translation>Personalizza:</translation> + <translation>Personalizzata:</translation> + </message> + <message> + <source>(Smart fee not initialized yet. This usually takes a few blocks...)</source> + <translation>(Commissione intelligente non ancora inizializzata. Normalmente richiede un'attesa di alcuni blocchi...)</translation> </message> <message> <source>Confirmation time:</source> @@ -1881,11 +1795,15 @@ Più URL vengono separati da una barra verticale |.</translation> </message> <message> <source>Send as zero-fee transaction if possible</source> - <translation>Invia una transazione a zero commissioni se possibile</translation> + <translation>Invia come transazione a zero commissioni se possibile</translation> + </message> + <message> + <source>(confirmation may take longer)</source> + <translation>(la conferma potrebbe richiedere più tempo)</translation> </message> <message> <source>Send to multiple recipients at once</source> - <translation>Invia a diversi beneficiari in una volta sola</translation> + <translation>Invia simultaneamente a più beneficiari</translation> </message> <message> <source>Add &Recipient</source> @@ -1897,7 +1815,7 @@ Più URL vengono separati da una barra verticale |.</translation> </message> <message> <source>Dust:</source> - <translation>Trascurabile</translation> + <translation>Trascurabile:</translation> </message> <message> <source>Clear &All</source> @@ -1929,7 +1847,7 @@ Più URL vengono separati da una barra verticale |.</translation> </message> <message> <source>Copy amount</source> - <translation>Copia l'importo</translation> + <translation>Copia importo</translation> </message> <message> <source>Copy fee</source> @@ -1960,32 +1878,28 @@ Più URL vengono separati da una barra verticale |.</translation> <translation>o</translation> </message> <message> - <source>The recipient address is not valid, please recheck.</source> - <translation>L'indirizzo del beneficiario non è valido, si prega di ricontrollare.</translation> - </message> - <message> <source>The amount to pay must be larger than 0.</source> - <translation>L'importo da pagare dev'essere maggiore di 0.</translation> + <translation>L'importo da pagare deve essere maggiore di 0.</translation> </message> <message> <source>The amount exceeds your balance.</source> - <translation>L'importo è superiore al tuo saldo attuale</translation> + <translation>L'importo è superiore al tuo saldo attuale.</translation> </message> <message> <source>The total exceeds your balance when the %1 transaction fee is included.</source> <translation>Il totale è superiore al tuo saldo attuale includendo la commissione di %1.</translation> </message> <message> - <source>Duplicate address found, can only send to each address once per send operation.</source> - <translation>Rilevato un indirizzo duplicato, è possibile inviare bitcoin una sola volta agli indirizzi durante un'operazione di invio.</translation> - </message> - <message> <source>Transaction creation failed!</source> <translation>Creazione transazione fallita!</translation> </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>La transazione è stata rifiutata! Questo può accadere se alcuni bitcoin nel tuo portamonete sono già stati spesi, ad esempio se hai utilizzato una copia del file wallet.dat per spendere bitcoin e questi non sono stati considerati spesi dal portamonete corrente.</translation> + <translation>La transazione è stata respinta! Questo può accadere se alcuni bitcoin nel tuo portamonete sono già stati spesi, come nel caso in cui tu avessi utilizzato una copia del file wallet.dat per spendere bitcoin e questi non fossero stati considerati come spesi dal portamonete corrente.</translation> + </message> + <message> + <source>Pay only the minimum fee of %1</source> + <translation>Paga solamente la commissione minima di %1</translation> </message> <message> <source>Warning: Invalid Bitcoin address</source> @@ -2001,7 +1915,7 @@ Più URL vengono separati da una barra verticale |.</translation> </message> <message> <source>Copy dust</source> - <translation>Copia l'importo</translation> + <translation>Copia trascurabile</translation> </message> <message> <source>Are you sure you want to send?</source> @@ -2024,11 +1938,11 @@ Più URL vengono separati da una barra verticale |.</translation> </message> <message> <source>Enter a label for this address to add it to your address book</source> - <translation>Inserisci un'etichetta per questo indirizzo, per aggiungerlo nella rubrica</translation> + <translation>Inserisci un'etichetta per questo indirizzo, per aggiungerlo alla rubrica</translation> </message> <message> <source>&Label:</source> - <translation>&Etichetta</translation> + <translation>&Etichetta:</translation> </message> <message> <source>Choose previously used address</source> @@ -2063,10 +1977,6 @@ Più URL vengono separati da una barra verticale |.</translation> <translation>Messaggio:</translation> </message> <message> - <source>This is a verified payment request.</source> - <translation>Questa è una richiesta di pagamento verificata.</translation> - </message> - <message> <source>Enter a label for this address to add it to the list of used addresses</source> <translation>Inserisci un'etichetta per questo indirizzo per aggiungerlo alla lista degli indirizzi utilizzati</translation> </message> @@ -2075,10 +1985,6 @@ Più URL vengono separati da una barra verticale |.</translation> <translation>Messaggio incluso nel bitcoin URI e che sarà memorizzato con la transazione per vostro riferimento. Nota: Questo messaggio non sarà inviato attraverso la rete Bitcoin.</translation> </message> <message> - <source>This is an unverified payment request.</source> - <translation>Questa è una richiesta di pagamento non verificata.</translation> - </message> - <message> <source>Pay To:</source> <translation>Pagare a:</translation> </message> @@ -2106,15 +2012,11 @@ Più URL vengono separati da una barra verticale |.</translation> </message> <message> <source>&Sign Message</source> - <translation>&Firma il messaggio</translation> - </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>Puoi firmare messaggi con i tuoi indirizzi in modo da dimostrarne il possesso. Presta attenzione a non firmare dichiarazioni vaghe, attacchi di phishing potrebbero cercare di spingerti ad apporre la tua firma su di esse. Firma solo dichiarazioni completamente dettagliate e delle quali condividi in pieno il contenuto.</translation> + <translation>&Firma Messaggio</translation> </message> <message> <source>The Bitcoin address to sign the message with</source> - <translation>L'indirizzo Bitcoin con cui vuoi contrassegnare il messaggio</translation> + <translation>L'indirizzo Bitcoin da utilizzare per firmare il messaggio</translation> </message> <message> <source>Choose previously used address</source> @@ -2146,7 +2048,7 @@ Più URL vengono separati da una barra verticale |.</translation> </message> <message> <source>Sign the message to prove you own this Bitcoin address</source> - <translation>Firma un messaggio per dimostrare di possedere questo indirizzo</translation> + <translation>Firma un messaggio per dimostrare di possedere questo indirizzo Bitcoin</translation> </message> <message> <source>Sign &Message</source> @@ -2158,17 +2060,13 @@ Più URL vengono separati da una barra verticale |.</translation> </message> <message> <source>Clear &All</source> - <translation>Cancella &tutto</translation> + <translation>Cancella &Tutto</translation> </message> <message> <source>&Verify Message</source> <translation>&Verifica Messaggio</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>Inserisci l'indirizzo del firmatario, il messaggio (assicurati di copiare esattamente anche i ritorni a capo, gli spazi, le tabulazioni, etc..) e la firma qui sotto, per verificare il messaggio. Presta attenzione a non vedere nella firma più di quanto non sia riportato nel messaggio stesso, per evitare di cadere vittima di attacchi di tipo man-in-the-middle.</translation> - </message> - <message> <source>The Bitcoin address the message was signed with</source> <translation>L'indirizzo Bitcoin con cui è stato contrassegnato il messaggio</translation> </message> @@ -2194,7 +2092,7 @@ Più URL vengono separati da una barra verticale |.</translation> </message> <message> <source>Please check the address and try again.</source> - <translation>Per favore controlla l'indirizzo e prova ancora</translation> + <translation>Per favore controlla l'indirizzo e prova di nuovo.</translation> </message> <message> <source>The entered address does not refer to a key.</source> @@ -2222,7 +2120,7 @@ Più URL vengono separati da una barra verticale |.</translation> </message> <message> <source>Please check the signature and try again.</source> - <translation>Per favore controlla la firma e prova ancora.</translation> + <translation>Per favore controlla la firma e prova di nuovo.</translation> </message> <message> <source>The signature did not match the message digest.</source> @@ -2245,7 +2143,7 @@ Più URL vengono separati da una barra verticale |.</translation> </message> <message> <source>The Bitcoin Core developers</source> - <translation>Gli sviluppatori del Bitcoin Core</translation> + <translation>Gli sviluppatori di Bitcoin Core</translation> </message> <message> <source>[testnet]</source> @@ -2275,7 +2173,7 @@ Più URL vengono separati da una barra verticale |.</translation> </message> <message> <source>%1/unconfirmed</source> - <translation>%1/non confermato</translation> + <translation>%1/non confermata</translation> </message> <message> <source>%1 confirmations</source> @@ -2287,7 +2185,7 @@ Più URL vengono separati da una barra verticale |.</translation> </message> <message numerus="yes"> <source>, broadcast through %n node(s)</source> - <translation><numerusform>, trasmesso attraverso %n nodo</numerusform><numerusform>, trasmesso attraverso %n nodi</numerusform></translation> + <translation><numerusform>, trasmesso attraverso %n nodo</numerusform><numerusform>, trasmessa attraverso %n nodi</numerusform></translation> </message> <message> <source>Date</source> @@ -2315,7 +2213,7 @@ Più URL vengono separati da una barra verticale |.</translation> </message> <message> <source>watch-only</source> - <translation>Guarda solo</translation> + <translation>sola lettura</translation> </message> <message> <source>label</source> @@ -2339,7 +2237,7 @@ Più URL vengono separati da una barra verticale |.</translation> </message> <message> <source>Total debit</source> - <translation>Credito Totale</translation> + <translation>Debito totale</translation> </message> <message> <source>Total credit</source> @@ -2367,11 +2265,11 @@ Più URL vengono separati da una barra verticale |.</translation> </message> <message> <source>Merchant</source> - <translation>Mercante</translation> + <translation>Commerciante</translation> </message> <message> <source>Generated coins must mature %1 blocks before they can be spent. When you generated this block, it was broadcast to the network to be added to the block chain. If it fails to get into the chain, its state will change to "not accepted" and it won't be spendable. This may occasionally happen if another node generates a block within a few seconds of yours.</source> - <translation>È necessario attendere %1 blocchi prima che i bitcoin generati possano essere spesi. Quando è stato generato questo blocco, è stato trasmesso alla rete in modo da poter essere aggiunto alla block chain. Se l'inserimento avrà esito negativo il suo stato sarà modificato in "non accettato" e risulterà non spendibile. Questo può occasionalmente accadere se un altro nodo genera un blocco entro pochi secondi dal tuo.</translation> + <translation>È necessario attendere %1 blocchi prima che i bitcoin generati possano essere spesi. Al momento della generazione questo blocco è stato trasmesso alla rete in modo da poter essere aggiunto alla block chain. Se l'inserimento avrà esito negativo lo stato del blocco sarà modificato in "non accettato" ed esso risulterà non spendibile. Ciò può verificarsi occasionalmente nel caso in cui un altro blocco sia stato generato entro pochi secondi dal tuo.</translation> </message> <message> <source>Debug information</source> @@ -2399,7 +2297,7 @@ Più URL vengono separati da una barra verticale |.</translation> </message> <message> <source>, has not been successfully broadcast yet</source> - <translation>, non è stato ancora trasmesso con successo</translation> + <translation>, non è ancora stata trasmessa con successo</translation> </message> <message numerus="yes"> <source>Open for %n more block(s)</source> @@ -2432,10 +2330,6 @@ Più URL vengono separati da una barra verticale |.</translation> <translation>Tipo</translation> </message> <message> - <source>Address</source> - <translation>Indirizzo</translation> - </message> - <message> <source>Immature (%1 confirmations, will be available after %2)</source> <translation>Immaturo (%1 conferme, sarà disponibile fra %2)</translation> </message> @@ -2449,11 +2343,11 @@ Più URL vengono separati da una barra verticale |.</translation> </message> <message> <source>Confirmed (%1 confirmations)</source> - <translation>Confermato (%1 conferme)</translation> + <translation>Confermata (%1 conferme)</translation> </message> <message> <source>This block was not received by any other nodes and will probably not be accepted!</source> - <translation>Questo blocco non è stato ricevuto dagli altri nodi e probabilmente non sarà accettato!</translation> + <translation>Questo blocco non è stato ricevuto da alcun altro nodo e probabilmente non sarà accettato!</translation> </message> <message> <source>Generated but not accepted</source> @@ -2464,8 +2358,12 @@ Più URL vengono separati da una barra verticale |.</translation> <translation>Offline</translation> </message> <message> + <source>Label</source> + <translation>Etichetta</translation> + </message> + <message> <source>Unconfirmed</source> - <translation>Non confermato:</translation> + <translation>Non confermata</translation> </message> <message> <source>Confirming (%1 of %2 recommended confirmations)</source> @@ -2497,11 +2395,11 @@ Più URL vengono separati da una barra verticale |.</translation> </message> <message> <source>watch-only</source> - <translation>Guarda solo</translation> + <translation>sola lettura</translation> </message> <message> <source>(n/a)</source> - <translation>(N / a)</translation> + <translation>(n/d)</translation> </message> <message> <source>Transaction status. Hover over this field to show number of confirmations.</source> @@ -2516,8 +2414,8 @@ Più URL vengono separati da una barra verticale |.</translation> <translation>Tipo di transazione.</translation> </message> <message> - <source>Destination address of transaction.</source> - <translation>Indirizzo di destinazione della transazione.</translation> + <source>Whether or not a watch-only address is involved in this transaction.</source> + <translation>Indica se un indirizzo di sola lettura sia o meno coinvolto in questa transazione.</translation> </message> <message> <source>Amount removed from or added to balance.</source> @@ -2671,7 +2569,7 @@ Più URL vengono separati da una barra verticale |.</translation> <name>UnitDisplayStatusBarControl</name> <message> <source>Unit to show amounts in. Click to select another unit.</source> - <translation>Tipo di unità visualizzata. Clicca per selezionare un altra unità</translation> + <translation>Unità con cui visualizzare gli importi. Clicca per selezionare un altra unità.</translation> </message> </context> <context> @@ -2696,7 +2594,7 @@ Più URL vengono separati da una barra verticale |.</translation> </message> <message> <source>Export the data in the current tab to a file</source> - <translation>Esporta su file i dati della tabella corrente</translation> + <translation>Esporta su file i dati contenuti nella tabella corrente</translation> </message> <message> <source>Backup Wallet</source> @@ -2735,7 +2633,7 @@ Più URL vengono separati da una barra verticale |.</translation> </message> <message> <source>Connect to a node to retrieve peer addresses, and disconnect</source> - <translation>Connettiti ad un nodo per recuperare gli indirizzi dei peer e scollegati</translation> + <translation>Connessione ad un nodo e successiva disconnessione per recuperare gli indirizzi dei peer</translation> </message> <message> <source>Specify your own public address</source> @@ -2755,55 +2653,27 @@ Più URL vengono separati da una barra verticale |.</translation> </message> <message> <source>Accept connections from outside (default: 1 if no -proxy or -connect)</source> - <translation>Accetta connessioni dall'esterno (predefinito: 1 se no -proxy o -connect)</translation> - </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>%s, devi impostare una rpcpassword nel file di configurazione: -%s -Si raccomanda l'uso della seguente password generata casualmente: -rpcuser=bitcoinrpc -rpcpassword=%s -(non serve ricordare questa password) -Il nome utente e la password NON DEVONO essere uguali. -Se il file non esiste, crealo concedendo permessi di lettura al solo proprietario del file. -Si raccomanda anche di impostare alertnotify così sarai avvisato di eventuali problemi; -ad esempio: alertnotify=echo %%s | mail -s "Allarme Bitcoin" admin@foo.com -</translation> + <translation>Accetta connessioni dall'esterno (predefinito: 1 se -proxy o -connect non sono utilizzati)</translation> </message> <message> <source>Bind to given address and always listen on it. Use [host]:port notation for IPv6</source> - <translation>Associa all'indirizzo indicato e resta permanentemente in ascolto su questo. Usa la notazione [host]:porta per l'IPv6</translation> + <translation>Associa all'indirizzo indicato e resta permanentemente in ascolto su di esso. Usa la notazione [host]:porta per l'IPv6</translation> </message> <message> <source>Delete all wallet transactions and only recover those parts of the blockchain through -rescan on startup</source> - <translation>Elimina tutte le transazioni dal wallet e recupera solo le parti della blockchain con il comando -rescan all'avvio.</translation> + <translation>Elimina tutte le transazioni dal portamonete e recupera solo quelle che fanno parte della blockchain attraverso il comando -rescan all'avvio.</translation> </message> <message> - <source>Enter regression test mode, which uses a special chain in which blocks can be solved instantly.</source> - <translation>Entra in modalità di test di regressione, la quale usa una speciale catena in cui i blocchi possono essere risolti istantaneamente.</translation> - </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>Errore: la transazione è stata rifiutata! Questo può accadere se alcuni bitcoin nel tuo portamonete sono già stati spesi, ad esempio se hai utilizzato una copia del file wallet.dat per spendere bitcoin e questi non sono stati considerati spesi dal portamonete corrente.</translation> + <source>Distributed under the MIT software license, see the accompanying file COPYING or <http://www.opensource.org/licenses/mit-license.php>.</source> + <translation>Distribuito secondo la licenza software MIT, vedi il file COPYING incluso oppure <http://www.opensource.org/licenses/mit-license.php>.</translation> </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>Errore: questa transazione necessita di una commissione di almeno %s a causa del suo ammontare, della sua complessità, o dell'uso di fondi recentemente ricevuti!</translation> + <source>Enter regression test mode, which uses a special chain in which blocks can be solved instantly.</source> + <translation>Entra in modalità test di regressione. Questa utilizza una speciale catena in cui i blocchi possono essere risolti istantaneamente.</translation> </message> <message> <source>Execute command when a wallet transaction changes (%s in cmd is replaced by TxID)</source> - <translation>Esegui comando quando una transazione del portamonete cambia (%s in cmd è sostituito da TxID)</translation> + <translation>Esegue un comando quando lo stato di una transazione del portamonete cambia (%s in cmd è sostituito da TxID)</translation> </message> <message> <source>In this mode -genproclimit controls how many blocks are generated immediately.</source> @@ -2823,23 +2693,27 @@ ad esempio: alertnotify=echo %%s | mail -s "Allarme Bitcoin" admin@foo.com </message> <message> <source>Warning: -paytxfee is set very high! This is the transaction fee you will pay if you send a transaction.</source> - <translation>Attenzione: -paytxfee è molto alta. Questa è la commissione che si paga quando si invia una transazione.</translation> + <translation>Attenzione: -paytxfee è impostato su un valore molto elevato. Questa è la commissione che si paga quando si invia una transazione.</translation> </message> <message> <source>Warning: The network does not appear to fully agree! Some miners appear to be experiencing issues.</source> - <translation>Attenzione: La rete non sembra essere d'accordo pienamente! Alcuni minatori sembrano riscontrare problemi.</translation> + <translation>Attenzione: La rete non sembra trovarsi in pieno consenso! Alcuni minatori sembrano riscontrare problemi.</translation> </message> <message> <source>Warning: We do not appear to fully agree with our peers! You may need to upgrade, or other nodes may need to upgrade.</source> - <translation>Attenzione: Sembra che non ci sia completo accordo con i nostri peer! Un aggiornamento da parte tua o degli altri nodi potrebbe essere necessario.</translation> + <translation>Attenzione: Sembra che non vi sia pieno consenso con i nostri peer! Un aggiornamento da parte tua o degli altri nodi potrebbe essere necessario.</translation> </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>Attenzione: errore di lettura di wallet.dat! Tutte le chiavi sono state lette correttamente, ma i dati delle transazioni o le voci in rubrica potrebbero mancare o non essere corretti.</translation> + <translation>Attenzione: errore di lettura di wallet.dat! Tutte le chiavi sono state lette correttamente, ma i dati delle transazioni o della rubrica potrebbero essere mancanti o non corretti.</translation> </message> <message> <source>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>Attenzione: wallet.dat corrotto, dati recuperati! Il wallet.dat originale è stato salvato come wallet.{timestamp}.bak in %s; se il tuo saldo o le transazioni non sono corrette dovresti ripristinare da un backup.</translation> + <translation>Attenzione: wallet.dat corrotto, dati recuperati! Il wallet.dat originale è stato salvato come wallet.{timestamp}.bak in %s. Se i dati relativi a saldo o transazioni non dovessero risultare corretti si consiglia di procedere al ripristino da un backup.</translation> + </message> + <message> + <source>Whitelist peers connecting from the given netmask or IP address. Can be specified multiple times.</source> + <translation>Inserisce in whitelist i peer che si connettono da un dato indirizzo IP o netmask. Può essere specificato più volte.</translation> </message> <message> <source>(default: 1)</source> @@ -2847,7 +2721,7 @@ ad esempio: alertnotify=echo %%s | mail -s "Allarme Bitcoin" admin@foo.com </message> <message> <source><category> can be:</source> - <translation><category> può essere:</translation> + <translation>Valori possibili per <category>:</translation> </message> <message> <source>Attempt to recover private keys from a corrupt wallet.dat</source> @@ -2859,7 +2733,7 @@ ad esempio: alertnotify=echo %%s | mail -s "Allarme Bitcoin" admin@foo.com </message> <message> <source>Connect only to the specified node(s)</source> - <translation>Connetti solo al nodo specificato</translation> + <translation>Connessione ai soli nodi specificati</translation> </message> <message> <source>Connection options:</source> @@ -2874,12 +2748,8 @@ ad esempio: alertnotify=echo %%s | mail -s "Allarme Bitcoin" admin@foo.com <translation>Opzioni di Debug/Test:</translation> </message> <message> - <source>Discover own IP address (default: 1 when listening and no -externalip)</source> - <translation>Scopre il proprio indirizzo IP (predefinito: 1 se in ascolto e no -externalip)</translation> - </message> - <message> <source>Do not load the wallet and disable wallet RPC calls</source> - <translation>Non caricare il portamonete e disabilita le chiamate RPC al portamonete</translation> + <translation>Disabilita il portamonete e le relative chiamate RPC</translation> </message> <message> <source>Do you want to rebuild the block database now?</source> @@ -2891,29 +2761,25 @@ ad esempio: alertnotify=echo %%s | mail -s "Allarme Bitcoin" admin@foo.com </message> <message> <source>Error initializing wallet database environment %s!</source> - <translation>Errore durante l'inizializzazione dell'ambiente %s del database del portamonete!</translation> + <translation>Errore durante l'inizializzazione dell'ambiente del database del portamonete %s!</translation> </message> <message> <source>Error loading block database</source> - <translation>Errore caricamento database blocchi</translation> + <translation>Errore durante il caricamento del database blocchi</translation> </message> <message> <source>Error opening block database</source> - <translation>Errore caricamento database blocchi</translation> + <translation>Errore durante l'apertura del database blocchi</translation> </message> <message> <source>Error: A fatal internal error occured, see debug.log for details</source> - <translation>Errore: si è verificato un errore fatale, consulta il file debug.log for maggiori dettagli.</translation> + <translation>Errore: si è verificato un errore interno fatale. Consulta il file debug.log for maggiori dettagli.</translation> </message> <message> <source>Error: Disk space is low!</source> <translation>Errore: la spazio libero sul disco è insufficiente!</translation> </message> <message> - <source>Error: Wallet locked, unable to create transaction!</source> - <translation>Errore: portamonete bloccato, impossibile creare la transazione!</translation> - </message> - <message> <source>Failed to listen on any port. Use -listen=0 if you want this.</source> <translation>Nessuna porta disponibile per l'ascolto. Usa -listen=0 se vuoi procedere comunque.</translation> </message> @@ -2927,7 +2793,7 @@ ad esempio: alertnotify=echo %%s | mail -s "Allarme Bitcoin" admin@foo.com </message> <message> <source>Incorrect or no genesis block found. Wrong datadir for network?</source> - <translation>Blocco genesis non corretto o non trovato. Cartella dati errata?</translation> + <translation>Blocco genesi non corretto o non trovato. È possibile che la cartella dati appartenga ad un'altra rete.</translation> </message> <message> <source>Invalid -onion address: '%s'</source> @@ -2939,27 +2805,27 @@ ad esempio: alertnotify=echo %%s | mail -s "Allarme Bitcoin" admin@foo.com </message> <message> <source>Only connect to nodes in network <net> (ipv4, ipv6 or onion)</source> - <translation>Connetti solo ai nodi nella rete <net> (ipv4, ipv6 o Tor)</translation> - </message> - <message> - <source>Rebuild block chain index from current blk000??.dat files</source> - <translation>Ricreare l'indice della catena di blocchi dai file blk000??.dat correnti</translation> + <translation>Connessione ai soli nodi appartenenti alla rete <net> (ipv4, ipv6 o Tor)</translation> </message> <message> <source>Set database cache size in megabytes (%d to %d, default: %d)</source> - <translation>Imposta la dimensione cache del database in megabyte (%d a %d, predefinito: %d)</translation> + <translation>Imposta la dimensione della cache del database in megabyte (%d a %d, predefinito: %d)</translation> </message> <message> <source>Set maximum block size in bytes (default: %d)</source> - <translation>Imposta la dimensione massima del blocco in byte (predefinita: %d)</translation> + <translation>Imposta la dimensione massima del blocco in byte (predefinito: %d)</translation> </message> <message> <source>Specify wallet file (within data directory)</source> - <translation>Specifica il file portamonete (all'interno della cartella dati)</translation> + <translation>Specifica il file del portamonete (all'interno della cartella dati)</translation> </message> <message> <source>This is intended for regression testing tools and app development.</source> - <translation>Questo è previsto per l'uso con test di regressione e per lo sviluppo di applicazioni.</translation> + <translation>Questa impostazione è destinata all'uso con i test di regressione e per lo sviluppo di applicazioni.</translation> + </message> + <message> + <source>Use UPnP to map the listening port (default: %u)</source> + <translation>Usa UPnP per mappare la porta di ascolto (predefinito: %u)</translation> </message> <message> <source>Verifying blocks...</source> @@ -2986,54 +2852,165 @@ ad esempio: alertnotify=echo %%s | mail -s "Allarme Bitcoin" admin@foo.com <translation>Importa blocchi da un file blk000??.dat esterno</translation> </message> <message> - <source>An error occurred while setting up the RPC address %s port %u for listening: %s</source> - <translation>Si è verificato un errore durante l'impostazione della %s porta %u RPC per l'ascolto su: %s</translation> + <source>Allow JSON-RPC connections from specified source. Valid for <ip> are a single IP (e.g. 1.2.3.4), a network/netmask (e.g. 1.2.3.4/255.255.255.0) or a network/CIDR (e.g. 1.2.3.4/24). This option can be specified multiple times</source> + <translation>Permette connessioni JSON-RPC dall'origine specificata. I valori validi per <ip> sono un singolo IP (ad es. 1.2.3.4), una network/netmask (ad es. 1.2.3.4/255.255.255.0) oppure una network/CIDR (ad es. 1.2.3.4/24). Questa opzione può essere specificata più volte.</translation> + </message> + <message> + <source>Bind to given address and whitelist peers connecting to it. Use [host]:port notation for IPv6</source> + <translation>Resta in ascolto sull'indirizzo indicato ed inserisce in whitelist i peer che vi si collegano. Usa la notazione [host]:porta per l'IPv6</translation> + </message> + <message> + <source>Bind to given address to listen for JSON-RPC connections. Use [host]:port notation for IPv6. This option can be specified multiple times (default: bind to all interfaces)</source> + <translation>Resta in attesa di connessioni JSON-RPC sull'indirizzo indicato. Usa la notazione [host]:porta per IPv6. Questa opzione può essere specificata più volte (predefinito: associa a tutte le interfacce) </translation> </message> <message> <source>Cannot obtain a lock on data directory %s. Bitcoin Core is probably already running.</source> <translation>Non è possibile ottenere un lock sulla cartella %s. Probabilmente Bitcoin Core è già in esecuzione.</translation> </message> <message> + <source>Create new files with system default permissions, instead of umask 077 (only effective with disabled wallet functionality)</source> + <translation>Crea nuovi file con i permessi di default del sistema, invece che con umask 077 (ha effetto solo con funzionalità di portamonete disabilitate)</translation> + </message> + <message> <source>Error: Listening for incoming connections failed (listen returned error %s)</source> - <translation>Errore: l'ascolto per per connessioni in arrivo fallito (errore riportato %s)</translation> + <translation>Errore: attesa per connessioni in arrivo fallita (errore riportato %s)</translation> + </message> + <message> + <source>Error: Unsupported argument -socks found. Setting SOCKS version isn't possible anymore, only SOCKS5 proxies are supported.</source> + <translation>Errore: individuato argomento -socks non supportato. Non è più possibile impostare la versione SOCKS, solamente i proxy SOCKS5 sono supportati.</translation> </message> <message> <source>Execute command when a relevant alert is received or we see a really long fork (%s in cmd is replaced by message)</source> - <translation>Esegue un comando quando viene ricevuto un allarme rilevante o quando vediamo un fork veramente lungo (%s in cmd è sostituito dal messaggio)</translation> + <translation>Esegue un comando in caso di ricezione di un allarme pertinente o se si rileva un fork molto lungo (%s in cmd è sostituito dal messaggio)</translation> </message> <message> <source>Fees (in BTC/Kb) smaller than this are considered zero fee for relaying (default: %s)</source> - <translation>Le commissioni (in BTC/kb) minori di questa saranno considerate nulle per la trasmissione (predefinito: %s)</translation> + <translation>Le commissioni (in BTC/kB) inferiori a questo valore sono considerate pari a zero relativamente alla trasmissione (predefinito: %s)</translation> </message> <message> <source>Fees (in BTC/Kb) smaller than this are considered zero fee for transaction creation (default: %s)</source> - <translation>Le commissioni inferiori a questo valore saranno considerate nulle per la creazione della transazione (predefinito: %s)</translation> + <translation>Le commissioni (in BTC/kB) inferiori a questo valore sono considerate pari a zero relativamente alla creazione della transazione (predefinito: %s)</translation> + </message> + <message> + <source>If paytxfee is not set, include enough fee so transactions begin confirmation on average within n blocks (default: %u)</source> + <translation>Nel caso in cui paytxfee non sia impostato, include una commissione tale da ottenere un avvio delle conferme entro una media di n blocchi (predefinito: %u)</translation> + </message> + <message> + <source>Invalid amount for -maxtxfee=<amount>: '%s' (must be at least the minrelay fee of %s to prevent stuck transactions)</source> + <translation>Importo non valido per -maxtxfee=<amount>: '%s' (deve essere almeno pari alla commissione 'minrelay fee' di %s per prevenire transazioni bloccate)</translation> + </message> + <message> + <source>Maximum size of data in data carrier transactions we relay and mine (default: %u)</source> + <translation>Dimensione massima dei dati in transazioni di trasporto dati che saranno trasmesse ed incluse nei blocchi (predefinito: %u)</translation> + </message> + <message> + <source>Query for peer addresses via DNS lookup, if low on addresses (default: 1 unless -connect)</source> + <translation>Ottiene gli indirizzi dei peer attraverso interrogazioni DNS, in caso di scarsa disponibilità (predefinito: 1 a meno che -connect non sia specificato)</translation> </message> <message> <source>Set maximum size of high-priority/low-fee transactions in bytes (default: %d)</source> - <translation>Imposta la dimensione massima in byte delle transazioni ad alta-priorità/basse-commissioni (predefinita: %d)</translation> + <translation>Imposta la dimensione massima in byte delle transazioni ad alta-priorità/basse-commissioni (predefinito: %d)</translation> + </message> + <message> + <source>Set the number of threads for coin generation if enabled (-1 = all cores, default: %d)</source> + <translation>Specifica il numero di thread per la generazione di bitcoin, se abilitata (-1 = tutti i core, predefinito: %d)</translation> + </message> + <message> + <source>This product includes software developed by the OpenSSL Project for use in the OpenSSL Toolkit <https://www.openssl.org/> and cryptographic software written by Eric Young and UPnP software written by Thomas Bernard.</source> + <translation>Questo prodotto include software sviluppato dal progetto OpenSSL per l'uso del Toolkit OpenSSL <https://www.openssl.org/>, software crittografico scritto da Eric Young e software UPnP scritto da Thomas Bernard.</translation> + </message> + <message> + <source>To use bitcoind, or the -server option to bitcoin-qt, you must set an 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>Per utilizzare bitcoind o l'opzione -server in Bitcoin Core è necessario specificare una rpcpassword nel file di configurazione: +%s +Si raccomanda di utilizzare la seguente password casuale: +rpcuser=bitcoinrpc +rpcpassword=%s +(non è necessario ricordare questa password) +Il nome utente e la password NON DEVONO corrispondere. +Se il file non esiste si raccomanda di crearlo con permessi di lettura per il solo proprietario. +Si raccomanda inoltre di configurare alertnotify in modo da ricevere notifiche di eventuali problemi, ad es. alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo.com +</translation> + </message> + <message> + <source>Warning: -maxtxfee is set very high! Fees this large could be paid on a single transaction.</source> + <translation>Attenzione: -maxtxfee è impostato su un valore molto elevato. Tali commissioni potrebbero essere pagate anche in una singola transazione.</translation> + </message> + <message> + <source>Warning: Please check that your computer's date and time are correct! If your clock is wrong Bitcoin Core will not work properly.</source> + <translation>Attenzione: Si prega di verificare che data ed ora del computer siano corrette! Una configurazione errata dell'orologio di sistema potrebbe impedire a Bitcoin Core di funzionare regolarmente.</translation> + </message> + <message> + <source>Whitelisted peers cannot be DoS banned and their transactions are always relayed, even if they are already in the mempool, useful e.g. for a gateway</source> + <translation>I peer inclusi in whitelist non possono subire ban per DoS e le loro transazioni saranno sempre trasmesse, anche nel caso in cui si trovino già nel mempool. Ciò è utile ad es. per i gateway</translation> + </message> + <message> + <source>(default: %u)</source> + <translation>(default: %u)</translation> + </message> + <message> + <source>Accept public REST requests (default: %u)</source> + <translation>Accetta richieste REST pubbliche (predefinito: %u)</translation> </message> <message> <source>Cannot resolve -whitebind address: '%s'</source> - <translation>Impossibile risolvere -whitebind address: '%s'</translation> + <translation>Impossibile risolvere indirizzo -whitebind: '%s'</translation> + </message> + <message> + <source>Choose data directory on startup (default: 0)</source> + <translation>Seleziona la cartella dati all'avvio (predefinito: 0)</translation> </message> <message> <source>Connect through SOCKS5 proxy</source> - <translation>Connetti attraverso SOCKS5 proxy</translation> + <translation>Connessione attraverso un proxy SOCKS5</translation> + </message> + <message> + <source>Copyright (C) 2009-%i The Bitcoin Core Developers</source> + <translation>Copyright (C) 2009-%i Gli sviluppatori di Bitcoin Core</translation> + </message> + <message> + <source>Could not parse -rpcbind value %s as network address</source> + <translation>Non è stato possibile riconoscere il valore %s di -rpcbind come indirizzo di rete</translation> </message> <message> <source>Error loading wallet.dat: Wallet requires newer version of Bitcoin Core</source> - <translation>Errore caricamento wallet.dat: il wallet richiede una versione nuova di Bitcoin Core</translation> + <translation>Errore durante il caricamento del file wallet.dat: il portamonete richiede una versione di Bitcoin Core più recente</translation> + </message> + <message> + <source>Error reading from database, shutting down.</source> + <translation>Errore durante lalettura del database. Arresto in corso.</translation> + </message> + <message> + <source>Error: Unsupported argument -tor found, use -onion.</source> + <translation>Errore: Rilevato argomento -tor non supportato, utilizzare -onion.</translation> </message> <message> <source>Fee (in BTC/kB) to add to transactions you send (default: %s)</source> - <translation>Commissione (in BTC/kB) da aggiungere alla transazione che invii (default: %s)</translation> + <translation>Commissione (in BTC/kB) da aggiungere alle transazioni che invii (predefinito: %s)</translation> </message> <message> <source>Information</source> <translation>Informazioni</translation> </message> <message> + <source>Initialization sanity check failed. Bitcoin Core is shutting down.</source> + <translation>Test di integrità iniziale fallito. Bitcoin Core si arresterà.</translation> + </message> + <message> + <source>Invalid amount for -maxtxfee=<amount>: '%s'</source> + <translation>Importo non valido per -maxtxfee=<amount>: '%s'</translation> + </message> + <message> <source>Invalid amount for -minrelaytxfee=<amount>: '%s'</source> <translation>Importo non valido per -minrelaytxfee=<amount>: '%s'</translation> </message> @@ -3042,12 +3019,24 @@ ad esempio: alertnotify=echo %%s | mail -s "Allarme Bitcoin" admin@foo.com <translation>Importo non valido per -mintxfee=<amount>: '%s'</translation> </message> <message> - <source>Node relay options:</source> - <translation>Opzioni relay nodo:</translation> + <source>Invalid amount for -paytxfee=<amount>: '%s' (must be at least %s)</source> + <translation>Importo non valido per -paytxfee=<amount>: '%s' (deve essere almeno %s)</translation> + </message> + <message> + <source>Invalid netmask specified in -whitelist: '%s'</source> + <translation>Netmask non valida specificata in -whitelist: '%s'</translation> + </message> + <message> + <source>Keep at most <n> unconnectable transactions in memory (default: %u)</source> + <translation>Mantiene in memoria al massimo <n> transazioni non collegabili (predefinito: %u)</translation> </message> <message> - <source>Print block on startup, if found in block index</source> - <translation>Stampa il blocco all'avvio, se presente nell'indice dei blocchi</translation> + <source>Need to specify a port with -whitebind: '%s'</source> + <translation>È necessario specificare una porta con -whitebind: '%s'</translation> + </message> + <message> + <source>Node relay options:</source> + <translation>Opzioni trasmissione nodo:</translation> </message> <message> <source>RPC SSL options: (see the Bitcoin Wiki for SSL setup instructions)</source> @@ -3058,6 +3047,10 @@ ad esempio: alertnotify=echo %%s | mail -s "Allarme Bitcoin" admin@foo.com <translation>Opzioni server RPC:</translation> </message> <message> + <source>RPC support for HTTP persistent connections (default: %d)</source> + <translation>Supporto RPC per le connessioni HTTP persistenti (predefinito: %d)</translation> + </message> + <message> <source>Randomly drop 1 of every <n> network messages</source> <translation>Scarta casualmente 1 ogni <n> messaggi di rete</translation> </message> @@ -3071,19 +3064,35 @@ ad esempio: alertnotify=echo %%s | mail -s "Allarme Bitcoin" admin@foo.com </message> <message> <source>Send transactions as zero-fee transactions if possible (default: %u)</source> - <translation>Invia transazioni a zero commissioni se possibile (default: %u)</translation> + <translation>Invia transazioni a zero commissioni se possibile (predefinito: %u)</translation> + </message> + <message> + <source>Set SSL root certificates for payment request (default: -system-)</source> + <translation>Imposta i certificati radice SSL per le richieste di pagamento (predefinito: -system-)</translation> + </message> + <message> + <source>Set language, for example "de_DE" (default: system locale)</source> + <translation>Imposta lingua, ad esempio "it_IT" (predefinito: lingua di sistema)</translation> </message> <message> <source>Show all debugging options (usage: --help -help-debug)</source> <translation>Mostra tutte le opzioni di debug (utilizzo: --help -help-debug)</translation> </message> <message> + <source>Show splash screen on startup (default: 1)</source> + <translation>Mostra finestra di presentazione all'avvio (predefinito: 1)</translation> + </message> + <message> <source>Shrink debug.log file on client startup (default: 1 when no -debug)</source> - <translation>Riduci il file debug.log all'avvio del client (predefinito: 1 se non impostato -debug)</translation> + <translation>Riduce il file debug.log all'avvio del client (predefinito: 1 se -debug non è impostato)</translation> </message> <message> <source>Signing transaction failed</source> - <translation>Transazione di firma fallita</translation> + <translation>Firma transazione fallita</translation> + </message> + <message> + <source>Start minimized</source> + <translation>Avvia ridotto a icona</translation> </message> <message> <source>This is experimental software.</source> @@ -3095,36 +3104,47 @@ ad esempio: alertnotify=echo %%s | mail -s "Allarme Bitcoin" admin@foo.com </message> <message> <source>Transaction amounts must be positive</source> - <translation>L'importo della transazione deve essere positivo</translation> + <translation>Gli importi della transazione devono essere positivi</translation> + </message> + <message> + <source>Transaction too large for fee policy</source> + <translation>Transazione troppo grande in base alla policy sulle commissioni</translation> </message> <message> <source>Transaction too large</source> <translation>Transazione troppo grande</translation> </message> <message> + <source>Unable to bind to %s on this computer (bind returned error %s)</source> + <translation>Impossibile associarsi a %s su questo computer (l'associazione ha restituito l'errore %s)</translation> + </message> + <message> <source>Use UPnP to map the listening port (default: 1 when listening)</source> - <translation>Usa UPnP per mappare la porta in ascolto (predefinito: 1 when listening)</translation> + <translation>Usa UPnP per mappare la porta in ascolto (predefinito: 1 quando in ascolto)</translation> </message> <message> <source>Username for JSON-RPC connections</source> - <translation>Nome utente per connessioni JSON-RPC -</translation> + <translation>Nome utente per connessioni JSON-RPC</translation> </message> <message> <source>Wallet needed to be rewritten: restart Bitcoin Core to complete</source> - <translation>Il wallet ha bisogno di essere reiscritto : riavvia Bitcoin Core per completare l'operazione</translation> + <translation>Il portamonete necessitava di essere riscritto: riavviare Bitcoin Core per completare l'operazione</translation> </message> <message> <source>Warning</source> <translation>Attenzione</translation> </message> <message> - <source>Warning: This version is obsolete, upgrade required!</source> - <translation>Attenzione: questa versione è obsoleta, aggiornamento necessario!</translation> + <source>Warning: Unsupported argument -benchmark ignored, use -debug=bench.</source> + <translation>Attenzione: Argomento -benchmark ignorato in quanto non supportato, usare -debug=bench.</translation> + </message> + <message> + <source>Warning: Unsupported argument -debugnet ignored, use -debug=net.</source> + <translation>Attenzione: Argomento -debugnet ignorato in quanto non supportato, usare -debug=net.</translation> </message> <message> <source>Zapping all transactions from wallet...</source> - <translation>Cancella e ricompila tutte le transazioni dal wallet...</translation> + <translation>Eliminazione dal portamonete di tutte le transazioni...</translation> </message> <message> <source>on startup</source> @@ -3136,12 +3156,11 @@ ad esempio: alertnotify=echo %%s | mail -s "Allarme Bitcoin" admin@foo.com </message> <message> <source>Password for JSON-RPC connections</source> - <translation>Password per connessioni JSON-RPC -</translation> + <translation>Password per connessioni JSON-RPC</translation> </message> <message> <source>Execute command when the best block changes (%s in cmd is replaced by block hash)</source> - <translation>Esegui il comando quando il migliore blocco cambia(%s nel cmd è sostituito dall'hash del blocco)</translation> + <translation>Esegue un comando quando il miglior blocco cambia (%s nel cmd è sostituito dall'hash del blocco)</translation> </message> <message> <source>Upgrade wallet to latest format</source> @@ -3149,22 +3168,19 @@ ad esempio: alertnotify=echo %%s | mail -s "Allarme Bitcoin" admin@foo.com </message> <message> <source>Rescan the block chain for missing wallet transactions</source> - <translation>Ripeti analisi della catena dei blocchi per cercare le transazioni mancanti dal portamonete -</translation> + <translation>Ripete la scansione della block chain per individuare le transazioni che mancano dal portamonete</translation> </message> <message> <source>Use OpenSSL (https) for JSON-RPC connections</source> - <translation>Utilizzare OpenSSL (https) per le connessioni JSON-RPC -</translation> + <translation>Utilizza OpenSSL (https) per le connessioni JSON-RPC</translation> </message> <message> <source>This help message</source> - <translation>Questo messaggio di aiuto -</translation> + <translation>Questo messaggio di aiuto</translation> </message> <message> <source>Allow DNS lookups for -addnode, -seednode and -connect</source> - <translation>Consenti ricerche DNS per -addnode, -seednode e -connect</translation> + <translation>Consente interrogazioni DNS per -addnode, -seednode e -connect</translation> </message> <message> <source>Loading addresses...</source> @@ -3175,64 +3191,168 @@ ad esempio: alertnotify=echo %%s | mail -s "Allarme Bitcoin" admin@foo.com <translation>Errore caricamento wallet.dat: Portamonete corrotto</translation> </message> <message> + <source>(1 = keep tx meta data e.g. account owner and payment request information, 2 = drop tx meta data)</source> + <translation>(1 = mantiene metadati tx, ad es. proprietario account ed informazioni di richiesta di pagamento, 2 = scarta metadati tx)</translation> + </message> + <message> + <source>Flush database activity from memory pool to disk log every <n> megabytes (default: %u)</source> + <translation>Scarica l'attività del database dal pool in memoria al log su disco ogni <n> megabyte (predefinito: %u)</translation> + </message> + <message> + <source>How thorough the block verification of -checkblocks is (0-4, default: %u)</source> + <translation>Determina quanto sarà approfondita la verifica da parte di -checkblocks (0-4, predefinito: %u)</translation> + </message> + <message> + <source>Log transaction priority and fee per kB when mining blocks (default: %u)</source> + <translation>Abilita il log della priorità di transazione e della commissione per kB quando si generano blocchi (predefinito: %u)</translation> + </message> + <message> + <source>Maintain a full transaction index, used by the getrawtransaction rpc call (default: %u)</source> + <translation>Mantiene l'indice completo delle transazioni usato dalla chiamata rpc getrawtransaction (predefinito: %u)</translation> + </message> + <message> + <source>Number of seconds to keep misbehaving peers from reconnecting (default: %u)</source> + <translation>Numero di secondi di sospensione prima della riconnessione per i peer che mostrano un comportamento anomalo (predefinito: %u)</translation> + </message> + <message> + <source>Output debugging information (default: %u, supplying <category> is optional)</source> + <translation>Emette informazioni di debug (predefinito: %u, fornire <category> è opzionale)</translation> + </message> + <message> + <source>Use separate SOCKS5 proxy to reach peers via Tor hidden services (default: %s)</source> + <translation>Usa un proxy SOCKS5 a parte per raggiungere i peer attraverso gli hidden services di Tor (predefinito: %s)</translation> + </message> + <message> + <source>(default: %s)</source> + <translation>(predefinito: %s)</translation> + </message> + <message> + <source>Acceptable ciphers (default: %s)</source> + <translation>Cifrari accettabili (predefinito: %s)</translation> + </message> + <message> + <source>Always query for peer addresses via DNS lookup (default: %u)</source> + <translation>Interroga sempre i DNS per ottenere gli indirizzi dei peer (predefinito: %u)</translation> + </message> + <message> + <source>Disable safemode, override a real safe mode event (default: %u)</source> + <translation>Disabilita la modalità sicura ignorando gli eventi che porterebbero alla sua attivazione (predefinito: %u)</translation> + </message> + <message> <source>Error loading wallet.dat</source> <translation>Errore caricamento wallet.dat</translation> </message> <message> <source>Force safe mode (default: %u)</source> - <translation>Forza modalità provvisoria (dafault: %u)</translation> + <translation>Forza modalità sicura (predefinito: %u)</translation> </message> <message> <source>Generate coins (default: %u)</source> - <translation>Genera coins (default: %u)</translation> + <translation>Genera bitcoin (predefinito: %u)</translation> </message> <message> <source>How many blocks to check at startup (default: %u, 0 = all)</source> - <translation>Quanti blocchi da controllare all'avvio (dafault: %u, 0 = tutti)</translation> + <translation>Numero di blocchi da controllare all'avvio (predefinito: %u, 0 = tutti)</translation> + </message> + <message> + <source>Include IP addresses in debug output (default: %u)</source> + <translation>Include gli indirizzi IP nell'output del debug (predefinito: %u)</translation> </message> <message> <source>Invalid -proxy address: '%s'</source> <translation>Indirizzo -proxy non valido: '%s'</translation> </message> <message> + <source>Limit size of signature cache to <n> entries (default: %u)</source> + <translation>Limita la dimensione della cache delle firme a <n> voci (predefinito: %u)</translation> + </message> + <message> + <source>Listen for JSON-RPC connections on <port> (default: %u or testnet: %u)</source> + <translation>Resta in attesa di connessioni JSON-RPC su <port> (predefinito: %u o testnet: %u)</translation> + </message> + <message> + <source>Listen for connections on <port> (default: %u or testnet: %u)</source> + <translation>Resta in attesa di connessioni su <port> (predefinito: %u o testnet: %u)</translation> + </message> + <message> <source>Maintain at most <n> connections to peers (default: %u)</source> - <translation>Mantieni al massimo <n> connessioni ai peers (default: %u)</translation> + <translation>Mantiene al massimo <n> connessioni verso i peer (predefinito: %u)</translation> + </message> + <message> + <source>Maximum per-connection receive buffer, <n>*1000 bytes (default: %u)</source> + <translation>Buffer di ricezione massimo per connessione, <n>*1000 byte (predefinito: %u)</translation> + </message> + <message> + <source>Maximum per-connection send buffer, <n>*1000 bytes (default: %u)</source> + <translation>Buffer di invio massimo per connessione, <n>*1000 byte (predefinito: %u)</translation> + </message> + <message> + <source>Only accept block chain matching built-in checkpoints (default: %u)</source> + <translation>Accetta solo block chain corrispondenti ai checkpoint integrati nel codice (predefinito: %u)</translation> </message> <message> <source>Prepend debug output with timestamp (default: %u)</source> - <translation>Pretendi output di debug con timestamp (default: %u)</translation> + <translation>Antepone un timestamp all'output del debug (predefinito: %u)</translation> </message> <message> - <source>Print block tree on startup (default: %u)</source> - <translation>Stampa l'albero dei blocchi all'avvio (default: %u)</translation> + <source>Relay and mine data carrier transactions (default: %u)</source> + <translation>Trasmette ed include nei blocchi transazioni di trasporto dati (predefinito: %u)</translation> + </message> + <message> + <source>Relay non-P2SH multisig (default: %u)</source> + <translation>Trasmette transazioni non-P2SH multisig (predefinito: %u)</translation> + </message> + <message> + <source>Run a thread to flush wallet periodically (default: %u)</source> + <translation>Mantieni in esecuzione un thread per scaricare periodicamente il portamonete (predefinito: %u)</translation> </message> <message> <source>Server certificate file (default: %s)</source> - <translation>File certificato del server (default: %s)</translation> + <translation>File del certificato del server (predefinito: %s)</translation> </message> <message> <source>Server private key (default: %s)</source> - <translation>Chiave privata del server (default: %s)</translation> + <translation>Chiave privata del server (predefinito: %s)</translation> + </message> + <message> + <source>Set key pool size to <n> (default: %u)</source> + <translation>Imposta la dimensione del pool di chiavi a <n> (predefinito: %u)</translation> + </message> + <message> + <source>Set minimum block size in bytes (default: %u)</source> + <translation>Imposta la dimensione minima del blocco in byte (predefinito: %u)</translation> + </message> + <message> + <source>Set the number of threads to service RPC calls (default: %d)</source> + <translation>Imposta il numero di thread destinati a rispondere alle chiamate RPC (predefinito %d)</translation> + </message> + <message> + <source>Sets the DB_PRIVATE flag in the wallet db environment (default: %u)</source> + <translation>Imposta il flag DB_PRIVATE nell'ambiente di database del portamonete (predefinito: %u)</translation> </message> <message> <source>Specify configuration file (default: %s)</source> - <translation>Specifica il file di configurazione (default: %s)</translation> + <translation>Specifica il file di configurazione (predefinito: %s)</translation> </message> <message> <source>Specify connection timeout in milliseconds (minimum: 1, default: %d)</source> - <translation>Specifica il timeout di connessione in millisecondi (minimo:1, default: %d)</translation> + <translation>Specifica il timeout di connessione in millisecondi (minimo:1, predefinito: %d)</translation> </message> <message> <source>Specify pid file (default: %s)</source> - <translation>Specifica il file pid (default: %s)</translation> + <translation>Specifica il file pid (predefinito: %s)</translation> </message> <message> <source>Spend unconfirmed change when sending transactions (default: %u)</source> - <translation>Spendi il resto non confermato quando si inviano transazioni (default: %u)</translation> + <translation>Abilita la spesa di resto non confermato quando si inviano transazioni (predefinito: %u)</translation> </message> <message> <source>Stop running after importing blocks from disk (default: %u)</source> - <translation>Interrompi dopo aver importato i blocchi dal disco (default: %u)</translation> + <translation>Interrompi l'esecuzione dopo aver importato i blocchi dal disco (predefinito: %u)</translation> + </message> + <message> + <source>Threshold for disconnecting misbehaving peers (default: %u)</source> + <translation>Soglia di disconnessione per i peer che si comportano in maniera anomala (predefinito: %u)</translation> </message> <message> <source>Unknown network specified in -onlynet: '%s'</source> @@ -3240,7 +3360,7 @@ ad esempio: alertnotify=echo %%s | mail -s "Allarme Bitcoin" admin@foo.com </message> <message> <source>Cannot resolve -bind address: '%s'</source> - <translation>Impossibile risolvere -bind address: '%s'</translation> + <translation>Impossibile risolvere indirizzo -bind: '%s'</translation> </message> <message> <source>Cannot resolve -externalip address: '%s'</source> @@ -3251,20 +3371,16 @@ ad esempio: alertnotify=echo %%s | mail -s "Allarme Bitcoin" admin@foo.com <translation>Importo non valido per -paytxfee=<amount>: '%s'</translation> </message> <message> - <source>Invalid amount</source> - <translation>Importo non valido</translation> - </message> - <message> <source>Insufficient funds</source> <translation>Fondi insufficienti</translation> </message> <message> <source>Loading block index...</source> - <translation>Caricamento dell'indice del blocco...</translation> + <translation>Caricamento dell'indice dei blocchi...</translation> </message> <message> <source>Add a node to connect to and attempt to keep the connection open</source> - <translation>Aggiunge un nodo a cui connettersi e tenta di tenere aperta la connessione</translation> + <translation>Aggiunge un nodo a cui connettersi e tenta di mantenere aperta la connessione</translation> </message> <message> <source>Loading wallet...</source> @@ -3287,10 +3403,6 @@ ad esempio: alertnotify=echo %%s | mail -s "Allarme Bitcoin" admin@foo.com <translation>Caricamento completato</translation> </message> <message> - <source>To use the %s option</source> - <translation>Per usare l'opzione %s</translation> - </message> - <message> <source>Error</source> <translation>Errore</translation> </message> diff --git a/src/qt/locale/bitcoin_ja.ts b/src/qt/locale/bitcoin_ja.ts index 0c9805de8f..329141edff 100644 --- a/src/qt/locale/bitcoin_ja.ts +++ b/src/qt/locale/bitcoin_ja.ts @@ -1,9 +1,9 @@ -<TS language="ja" version="2.0"> +<TS language="ja" version="2.1"> <context> <name>AddressBookPage</name> <message> - <source>Double-click to edit address or label</source> - <translation>アドレスまたはラベルを編集するにはダブルクリック</translation> + <source>Right-click to edit address or label</source> + <translation>右クリックでアドレスまたはラベルを編集します</translation> </message> <message> <source>Create a new address</source> @@ -156,10 +156,6 @@ <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> @@ -188,10 +184,6 @@ <translation>ウォレットの新しいパスフレーズを入力してください。<br/><b>10文字以上のランダムな文字</b>で構成されたものか、<b>8単語以上の単語</b>で構成されたパスフレーズを使用してください。</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>Bitcoin は暗号化プロセスを終了するために今すぐ終了します。あなたのコンピュータがマルウェアに感染してコインを盗まれることもあるので、暗号化してもあなたのウォレットを完全に保護できないことを覚えていてください。</translation> - </message> - <message> <source>Wallet encryption failed</source> <translation>ウォレットの暗号化に失敗しました</translation> </message> @@ -311,10 +303,6 @@ <translation>Bitcoin アドレスにコインを送る</translation> </message> <message> - <source>Modify configuration options for Bitcoin</source> - <translation>Bitcoin の設定を変更する</translation> - </message> - <message> <source>Backup wallet to another location</source> <translation>ウォレットを他の場所にバックアップ</translation> </message> @@ -411,9 +399,17 @@ <translation>支払いを受け取るアドレスとラベルのリストを表示する</translation> </message> <message> + <source>Open a bitcoin: URI or payment request</source> + <translation>bitcoin: URIまたは支払いリクエストを開く</translation> + </message> + <message> <source>&Command-line options</source> <translation>コマンドラインオプション (&C)</translation> </message> + <message> + <source>Show the Bitcoin Core help message to get a list with possible Bitcoin command-line options</source> + <translation>有効な Bitcoin のコマンドライン オプションを見るために Bitcoin Core のヘルプメッセージを表示します。</translation> + </message> <message numerus="yes"> <source>%n active connection(s) to Bitcoin network</source> <translation><numerusform>%n の Bitcoin ネットワークへのアクティブな接続</numerusform></translation> @@ -483,17 +479,6 @@ <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></translation> </message> @@ -536,10 +521,18 @@ Address: %4 <translation>手数料:</translation> </message> <message> + <source>Dust:</source> + <translation>ダスト：</translation> + </message> + <message> <source>After Fee:</source> <translation>手数料差引後:</translation> </message> <message> + <source>Change:</source> + <translation>釣り銭:</translation> + </message> + <message> <source>(un)select all</source> <translation>すべて選択/選択解除</translation> </message> @@ -556,6 +549,14 @@ Address: %4 <translation>総額</translation> </message> <message> + <source>Received with label</source> + <translation>ラベルに対する入金一覧</translation> + </message> + <message> + <source>Received with address</source> + <translation>アドレスに対する入金一覧</translation> + </message> + <message> <source>Date</source> <translation>日付</translation> </message> @@ -616,10 +617,62 @@ Address: %4 <translation>優先度をコピーする</translation> </message> <message> + <source>Copy dust</source> + <translation>ダストをコピーする</translation> + </message> + <message> + <source>Copy change</source> + <translation>釣り銭をコピー</translation> + </message> + <message> + <source>highest</source> + <translation>最高</translation> + </message> + <message> + <source>higher</source> + <translation>非常に高</translation> + </message> + <message> + <source>high</source> + <translation>高</translation> + </message> + <message> + <source>medium-high</source> + <translation>中〜高</translation> + </message> + <message> + <source>medium</source> + <translation>中</translation> + </message> + <message> + <source>low-medium</source> + <translation>低〜中</translation> + </message> + <message> + <source>low</source> + <translation>低</translation> + </message> + <message> + <source>lower</source> + <translation>非常に低</translation> + </message> + <message> + <source>lowest</source> + <translation>最低</translation> + </message> + <message> + <source>(%1 locked)</source> + <translation>(%1 がロック済み)</translation> + </message> + <message> <source>none</source> <translation>なし</translation> </message> <message> + <source>Can vary +/- %1 satoshi(s) per input.</source> + <translation>ひとつの入力につき %1 satoshi 前後ずれることがあります。</translation> + </message> + <message> <source>yes</source> <translation>はい</translation> </message> @@ -628,14 +681,30 @@ Address: %4 <translation>いいえ</translation> </message> <message> - <source>This label turns red, if the priority is smaller than "medium".</source> - <translation>優先度が「中」未満の場合には、このラベルは赤くなります。</translation> + <source>This means a fee of at least %1 per kB is required.</source> + <translation>これは少なくとも1kBあたり %1 の手数料が必要であることを意味します。</translation> + </message> + <message> + <source>Can vary +/- 1 byte per input.</source> + <translation>ひとつの入力につき1バイト程度ずれることがあります。</translation> + </message> + <message> + <source>Transactions with higher priority are more likely to get included into a block.</source> + <translation>より高い優先度を持つトランザクションの方がブロックに取り込まれやすくなります。</translation> </message> <message> <source>(no label)</source> <translation>（ラベル無し）</translation> </message> - </context> + <message> + <source>change from %1 (%2)</source> + <translation>%1 (%2) からのおつり</translation> + </message> + <message> + <source>(change)</source> + <translation>(おつり)</translation> + </message> +</context> <context> <name>EditAddressDialog</name> <message> @@ -647,6 +716,14 @@ Address: %4 <translation>ラベル(&L)</translation> </message> <message> + <source>The label associated with this address list entry</source> + <translation>このアドレス帳項目に結びつけられているラベル</translation> + </message> + <message> + <source>The address associated with this address list entry. This can only be modified for sending addresses.</source> + <translation>このアドレス帳項目に結びつけられているアドレス。この項目は送金用アドレスの場合のみ編集することができます。</translation> + </message> + <message> <source>&Address</source> <translation>アドレス帳 (&A)</translation> </message> @@ -717,6 +794,10 @@ Address: %4 <translation>バージョン</translation> </message> <message> + <source>(%1-bit)</source> + <translation>(%1ビット)</translation> + </message> + <message> <source>About Bitcoin Core</source> <translation>Bitcoinコアについて</translation> </message> @@ -732,26 +813,6 @@ Address: %4 <source>command-line options</source> <translation>コマンドライン オプション</translation> </message> - <message> - <source>UI options</source> - <translation>UI オプション</translation> - </message> - <message> - <source>Set language, for example "de_DE" (default: system locale)</source> - <translation>言語設定 例: "de_DE" (初期値: システムの言語)</translation> - </message> - <message> - <source>Start minimized</source> - <translation>最小化された状態で起動する</translation> - </message> - <message> - <source>Show splash screen on startup (default: 1)</source> - <translation>起動時にスプラッシュ画面を表示する (初期値: 1)</translation> - </message> - <message> - <source>Choose data directory on startup (default: 0)</source> - <translation>起動時にデータ ディレクトリを選ぶ (初期値: 0)</translation> - </message> </context> <context> <name>Intro</name> @@ -764,6 +825,14 @@ Address: %4 <translation>ようこそ！</translation> </message> <message> + <source>As this is the first time the program is launched, you can choose where Bitcoin Core will store its data.</source> + <translation>これはプログラム最初の起動です。Bitcoin Coreがデータを保存する場所を選択して下さい。</translation> + </message> + <message> + <source>Bitcoin Core will download and store a copy of the Bitcoin block chain. At least %1GB of data will be stored in this directory, and it will grow over time. The wallet will also be stored in this directory.</source> + <translation>Bitcoin Coreは、ビットコインのブロックチェーンのコピーを、ダウンロードして保存します。少なくとも%1ギガバイトのデータが、このディレクトリに保存されます。そしてそれは時間と共に増加します。またウォレットもこのディレクトリに保存されます。</translation> + </message> + <message> <source>Use the default data directory</source> <translation>初期値のデータ ディレクトリを使用</translation> </message> @@ -776,6 +845,10 @@ Address: %4 <translation>Bitcoin のコア</translation> </message> <message> + <source>Error: Specified data directory "%1" cannot be created.</source> + <translation>エラー: 指定のデータディレクトリ "%1" を作成できません。</translation> + </message> + <message> <source>Error</source> <translation>エラー</translation> </message> @@ -822,14 +895,6 @@ Address: %4 <translation>メイン (&M)</translation> </message> <message> - <source>Automatically start Bitcoin after logging in to the system.</source> - <translation>システムにログインした時に自動的に Bitcoin を起動します。</translation> - </message> - <message> - <source>&Start Bitcoin on system login</source> - <translation>システムにログインした時に Bitcoin を起動 (&S)</translation> - </message> - <message> <source>Size of &database cache</source> <translation>データベースキャッシュのサイズ (&D)</translation> </message> @@ -846,10 +911,26 @@ Address: %4 <translation>外部からの接続を許可する</translation> </message> <message> + <source>Allow incoming connections</source> + <translation>外部からの接続を許可する</translation> + </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>トランザクションタブのコンテキストメニュー項目に表示する、サードパーティURL (例えばブロックエクスプローラ)。URL中の%sはトランザクションのハッシュ値に置き換えられます。垂直バー | で区切ることで、複数の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> + <message> <source>Reset all client options to default.</source> <translation>すべてのオプションを初期値に戻します。</translation> </message> @@ -862,6 +943,10 @@ Address: %4 <translation>ネットワーク (&N)</translation> </message> <message> + <source>(0 = auto, <0 = leave that many cores free)</source> + <translation>(0 = 自動、0以上 = 指定した数のコアをフリーにする)</translation> + </message> + <message> <source>W&allet</source> <translation>ウォレット (&A)</translation> </message> @@ -874,6 +959,14 @@ Address: %4 <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> + <translation>未検証のおつりの使用を無効化すると、トランザクションが少なくとも1検証を獲得するまではそのトランザクションのおつりは利用できなくなります。これは残高の計算方法にも影響します。</translation> + </message> + <message> + <source>&Spend unconfirmed change</source> + <translation>未検証のおつりを使用する (&S)</translation> + </message> + <message> <source>Automatically open the Bitcoin client port on the router. This only works when your router supports UPnP and it is enabled.</source> <translation>自動的にルーター上の Bitcoin クライアントのポートを開きます。あなたのルーターが UPnP に対応していて、それが有効になっている場合に作動します。</translation> </message> @@ -882,6 +975,14 @@ Address: %4 <translation>UPnP を使ってポートを割り当てる (&U)</translation> </message> <message> + <source>Connect to the Bitcoin network through a SOCKS5 proxy.</source> + <translation>SOCKS5 プロキシ経由でBitcoinネットワークに接続する</translation> + </message> + <message> + <source>&Connect through SOCKS5 proxy (default proxy):</source> + <translation>SOCKS5 プロキシ経由で接続する (デフォルトプロキシ): (&C)</translation> + </message> + <message> <source>Proxy &IP:</source> <translation>プロキシの IP (&I) :</translation> </message> @@ -906,10 +1007,6 @@ Address: %4 <translation>タスクバーの代わりにトレイに最小化 (&M)</translation> </message> <message> - <source>Minimize instead of exit the application when the window is closed. When this option is enabled, the application will be closed only after selecting Quit in the menu.</source> - <translation>ウインドウが閉じられる時アプリケーションを終了せずに最小化します。このオプションが有効な時にアプリケーションを終了するにはメニューから終了を選択します。</translation> - </message> - <message> <source>M&inimize on close</source> <translation>閉じる時に最小化 (&i)</translation> </message> @@ -922,10 +1019,6 @@ Address: %4 <translation>ユーザインターフェースの言語 (&l) :</translation> </message> <message> - <source>The user interface language can be set here. This setting will take effect after restarting Bitcoin.</source> - <translation>ここでユーザインターフェースの言語を設定できます。設定を反映するには Bitcoin を再起動します。</translation> - </message> - <message> <source>&Unit to show amounts in:</source> <translation>額を表示する単位 (&U) :</translation> </message> @@ -934,6 +1027,10 @@ Address: %4 <translation>インターフェース上の表示とコインの送信で使用する単位を選択します。</translation> </message> <message> + <source>Whether to show coin control features or not.</source> + <translation>コインコントロール機能を表示するかどうか。</translation> + </message> + <message> <source>&OK</source> <translation>&OK</translation> </message> @@ -954,6 +1051,14 @@ Address: %4 <translation>オプションのリセットの確認</translation> </message> <message> + <source>Client restart required to activate changes.</source> + <translation>変更を有効化するにはクライアントを再起動する必要があります。</translation> + </message> + <message> + <source>This change would require a client restart.</source> + <translation>この変更はクライアントの再起動が必要です。</translation> + </message> + <message> <source>The supplied proxy address is invalid.</source> <translation>プロキシアドレスが無効です。</translation> </message> @@ -969,10 +1074,22 @@ Address: %4 <translation>表示された情報は古いかもしれません。接続が確立されると、あなたのウォレットは Bitcoin ネットワークと自動的に同期しますが、このプロセスはまだ完了していません。</translation> </message> <message> + <source>Watch-only:</source> + <translation>監視限定:</translation> + </message> + <message> + <source>Available:</source> + <translation>利用可能:</translation> + </message> + <message> <source>Your current spendable balance</source> <translation>あなたの利用可能残高</translation> </message> <message> + <source>Pending:</source> + <translation>検証待ち:</translation> + </message> + <message> <source>Total of transactions that have yet to be confirmed, and do not yet count toward the spendable balance</source> <translation>未検証の取引で利用可能残高に反映されていない数</translation> </message> @@ -985,6 +1102,10 @@ Address: %4 <translation>完成していない採掘された残高</translation> </message> <message> + <source>Balances</source> + <translation>残高</translation> + </message> + <message> <source>Total:</source> <translation>合計:</translation> </message> @@ -993,14 +1114,30 @@ Address: %4 <translation>あなたの現在の残高</translation> </message> <message> + <source>Your current balance in watch-only addresses</source> + <translation>監視限定アドレス内の現在の残高</translation> + </message> + <message> + <source>Spendable:</source> + <translation>使用可能:</translation> + </message> + <message> <source>Recent transactions</source> <translation>最近のトランザクション</translation> </message> <message> + <source>Unconfirmed transactions to watch-only addresses</source> + <translation>監視限定アドレスに対する未検証のトランザクション</translation> + </message> + <message> <source>Mined balance in watch-only addresses that has not yet matured</source> <translation>ウォッチオンリーアドレスの採掘された残高のうち、成熟していないもの</translation> </message> <message> + <source>Current total balance in watch-only addresses</source> + <translation>監視限定アドレス内の現在の全残高</translation> + </message> + <message> <source>out of sync</source> <translation>同期していない</translation> </message> @@ -1020,8 +1157,16 @@ Address: %4 <translation>支払い要求は拒否されました</translation> </message> <message> - <source>Payment request has expired.</source> - <translation>支払いのリクエストは期限切れです</translation> + <source>Payment request network doesn't match client network.</source> + <translation>支払いリクエストのネットワークは現在のクライアントのネットワークに一致しません。</translation> + </message> + <message> + <source>Payment request is not initialized.</source> + <translation>支払いリクエストは開始されていません。</translation> + </message> + <message> + <source>Requested payment amount of %1 is too small (considered dust).</source> + <translation>要求された支払額 %1 は少なすぎます (ダストとみなされてしまいます)。</translation> </message> <message> <source>Payment request error</source> @@ -1032,10 +1177,46 @@ Address: %4 <translation>Bitcoin を起動できません: click-to-pay handler</translation> </message> <message> + <source>Payment request fetch URL is invalid: %1</source> + <translation>支払い要求の取得先URLが無効です: %1</translation> + </message> + <message> + <source>URI cannot be parsed! This can be caused by an invalid Bitcoin address or malformed URI parameters.</source> + <translation>URI を解析できません! これは無効な Bitcoin アドレスあるいや不正な形式の URI パラメーターによって引き起こされる場合があります。</translation> + </message> + <message> + <source>Payment request file handling</source> + <translation>支払いリクエストファイルを処理しています</translation> + </message> + <message> + <source>Payment request file cannot be read! This can be caused by an invalid payment request file.</source> + <translation>支払いリクエストファイルを読み込めませんでした！無効な支払いリクエストファイルにより引き起こされた可能性があります。</translation> + </message> + <message> + <source>Unverified payment requests to custom payment scripts are unsupported.</source> + <translation>カスタム支払いスクリプトに対する、検証されていない支払いリクエストはサポートされていません。</translation> + </message> + <message> + <source>Refund from %1</source> + <translation>%1 からの返金</translation> + </message> + <message> + <source>Payment request %1 is too large (%2 bytes, allowed %3 bytes).</source> + <translation>支払リクエスト %1 は大きすぎます（%2バイトですが、%3バイトまでが許されています）。</translation> + </message> + <message> + <source>Payment request DoS protection</source> + <translation>支払リクエストDoS保護</translation> + </message> + <message> <source>Error communicating with %1: %2</source> <translation>%1: %2とコミュニケーション・エラーです</translation> </message> <message> + <source>Payment request cannot be parsed!</source> + <translation>支払リクエストを読み込めませんでした！</translation> + </message> + <message> <source>Bad response from server %1</source> <translation>サーバーの返事は無効 %1</translation> </message> @@ -1054,7 +1235,11 @@ Address: %4 <source>User Agent</source> <translation>ユーザエージェント</translation> </message> - </context> + <message> + <source>Ping Time</source> + <translation>Ping時間</translation> + </message> +</context> <context> <name>QObject</name> <message> @@ -1062,6 +1247,14 @@ Address: %4 <translation>総額</translation> </message> <message> + <source>Enter a Bitcoin address (e.g. %1)</source> + <translation>Bitcoinアドレスを入力してください (例 %1)</translation> + </message> + <message> + <source>%1 d</source> + <translation>%1日</translation> + </message> + <message> <source>%1 h</source> <translation>%1 h</translation> </message> @@ -1070,10 +1263,22 @@ Address: %4 <translation>%1 m</translation> </message> <message> + <source>%1 s</source> + <translation>%1秒</translation> + </message> + <message> + <source>None</source> + <translation>なし</translation> + </message> + <message> <source>N/A</source> <translation>N/A</translation> </message> - </context> + <message> + <source>%1 ms</source> + <translation>%1ミリ秒</translation> + </message> +</context> <context> <name>QRImageWidget</name> <message> @@ -1116,10 +1321,18 @@ Address: %4 <translation>デバッグ ウインドウ</translation> </message> <message> + <source>General</source> + <translation>一般</translation> + </message> + <message> <source>Using OpenSSL version</source> <translation>使用中の OpenSSL のバージョン</translation> </message> <message> + <source>Using BerkeleyDB version</source> + <translation>使用中のBerkleyDBバージョン</translation> + </message> + <message> <source>Startup time</source> <translation>起動した日時</translation> </message> @@ -1144,10 +1357,74 @@ Address: %4 <translation>現在のブロック数</translation> </message> <message> + <source>Received</source> + <translation>受取</translation> + </message> + <message> + <source>Sent</source> + <translation>送金</translation> + </message> + <message> + <source>&Peers</source> + <translation>ピア (&P)</translation> + </message> + <message> + <source>Select a peer to view detailed information.</source> + <translation>詳しい情報を見たいピアを選択してください。</translation> + </message> + <message> + <source>Direction</source> + <translation>方向</translation> + </message> + <message> + <source>Version</source> + <translation>バージョン</translation> + </message> + <message> <source>User Agent</source> <translation>ユーザエージェント</translation> </message> <message> + <source>Services</source> + <translation>サービス</translation> + </message> + <message> + <source>Starting Height</source> + <translation>開始時のブロック高</translation> + </message> + <message> + <source>Sync Height</source> + <translation>同期済みブロック高</translation> + </message> + <message> + <source>Ban Score</source> + <translation>Banスコア</translation> + </message> + <message> + <source>Connection Time</source> + <translation>接続時間</translation> + </message> + <message> + <source>Last Send</source> + <translation>最終送信</translation> + </message> + <message> + <source>Last Receive</source> + <translation>最終受信</translation> + </message> + <message> + <source>Bytes Sent</source> + <translation>送信済バイト数</translation> + </message> + <message> + <source>Bytes Received</source> + <translation>受信済バイト数</translation> + </message> + <message> + <source>Ping Time</source> + <translation>Ping時間</translation> + </message> + <message> <source>Last block time</source> <translation>最終ブロックの日時</translation> </message> @@ -1188,18 +1465,10 @@ Address: %4 <translation>デバッグ用ログファイル</translation> </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>現在のデータ ディレクトリから Bitcoin のデバッグ用ログファイルを開きます。ログファイルが大規模な場合には数秒かかることがあります。</translation> - </message> - <message> <source>Clear console</source> <translation>コンソールをクリア</translation> </message> <message> - <source>Welcome to the Bitcoin RPC console.</source> - <translation>Bitcoin RPC コンソールへようこそ。</translation> - </message> - <message> <source>Use up and down arrows to navigate history, and <b>Ctrl-L</b> to clear screen.</source> <translation>上下の矢印で履歴をたどれます。 <b>Ctrl-L</b> でスクリーンを消去できます。</translation> </message> @@ -1223,7 +1492,31 @@ Address: %4 <source>%1 GB</source> <translation>%1 GB</translation> </message> - </context> + <message> + <source>via %1</source> + <translation>%1経由</translation> + </message> + <message> + <source>never</source> + <translation>一度もなし</translation> + </message> + <message> + <source>Inbound</source> + <translation>内向き</translation> + </message> + <message> + <source>Outbound</source> + <translation>外向き</translation> + </message> + <message> + <source>Unknown</source> + <translation>未知</translation> + </message> + <message> + <source>Fetching...</source> + <translation>取得中……</translation> + </message> +</context> <context> <name>ReceiveCoinsDialog</name> <message> @@ -1239,6 +1532,30 @@ Address: %4 <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> + <translation>以前利用した受取用アドレスのどれかを再利用します。アドレスの再利用はセキュリティおよびプライバシーにおいて問題があります。以前作成した支払リクエストを再生成するとき以外は利用しないでください。</translation> + </message> + <message> + <source>R&euse an existing receiving address (not recommended)</source> + <translation>既存の受取用アドレスを再利用する (非推奨) (&E)</translation> + </message> + <message> + <source>An optional message to attach to the payment request, which will be displayed when the request is opened. Note: The message will not be sent with the payment over the Bitcoin network.</source> + <translation>支払リクエストが開始された時に表示される、支払リクエストに添える任意のメッセージです。注意：メッセージはBitcoinネットワークを通じて、支払と共に送られるわけではありません。</translation> + </message> + <message> + <source>An optional label to associate with the new receiving address.</source> + <translation>受取用アドレスに紐づく任意のラベル。</translation> + </message> + <message> + <source>Use this form to request payments. All fields are <b>optional</b>.</source> + <translation>このフォームを使用して支払のリクエストを行いましょう。すべての項目は<b>任意入力</b>です。</translation> + </message> + <message> + <source>An optional amount to request. Leave this empty or zero to not request a specific amount.</source> + <translation>リクエストする任意の金額。特定の金額をリクエストするのでない場合には、この欄は空白のままかゼロにしてください。</translation> + </message> + <message> <source>Clear all fields of the form.</source> <translation>全ての入力項目をクリア</translation> </message> @@ -1247,6 +1564,18 @@ Address: %4 <translation>クリア</translation> </message> <message> + <source>Requested payments history</source> + <translation>支払リクエスト履歴</translation> + </message> + <message> + <source>&Request payment</source> + <translation>支払をリクエストする (&R)</translation> + </message> + <message> + <source>Show the selected request (does the same as double clicking an entry)</source> + <translation>選択されたリクエストを表示する（項目をダブルクリックすることでも表示できます）</translation> + </message> + <message> <source>Show</source> <translation>表示</translation> </message> @@ -1255,6 +1584,10 @@ Address: %4 <translation>リストから選択項目を削除</translation> </message> <message> + <source>Remove</source> + <translation>削除</translation> + </message> + <message> <source>Copy label</source> <translation>ラベルをコピーする</translation> </message> @@ -1344,7 +1677,15 @@ Address: %4 <source>(no label)</source> <translation>（ラベル無し）</translation> </message> - </context> + <message> + <source>(no message)</source> + <translation>（メッセージなし）</translation> + </message> + <message> + <source>(no amount)</source> + <translation>（金額なし）</translation> + </message> +</context> <context> <name>SendCoinsDialog</name> <message> @@ -1392,6 +1733,82 @@ Address: %4 <translation>手数料差引後:</translation> </message> <message> + <source>Change:</source> + <translation>釣り銭:</translation> + </message> + <message> + <source>If this is activated, but the change address is empty or invalid, change will be sent to a newly generated address.</source> + <translation>これが有効にもかかわらずおつりアドレスが空欄であったり無効であった場合には、おつりは新しく生成されたアドレスへ送金されます。</translation> + </message> + <message> + <source>Custom change address</source> + <translation>カスタムおつりアドレス</translation> + </message> + <message> + <source>Transaction Fee:</source> + <translation>トランザクション手数料：</translation> + </message> + <message> + <source>Choose...</source> + <translation>選択……</translation> + </message> + <message> + <source>collapse fee-settings</source> + <translation>手数料設定を折りたたむ</translation> + </message> + <message> + <source>per kilobyte</source> + <translation>1キロバイトあたり手数料</translation> + </message> + <message> + <source>If the custom fee is set to 1000 satoshis and the transaction is only 250 bytes, then "per kilobyte" only pays 250 satoshis in fee, while "total at least" pays 1000 satoshis. For transactions bigger than a kilobyte both pay by kilobyte.</source> + <translation>カスタム手数料が1000satoshiに設定されている場合、トランザクションサイズが250バイトとすると、「1キロバイトあたり手数料」では250satoshiの手数料のみを支払いますが、「最小手数料」では1000satoshiを支払います。1キロバイトを超えるトランザクションの場合には、どちらの方法を選択したとしても1キロバイトあたりで支払われます。</translation> + </message> + <message> + <source>total at least</source> + <translation>最小手数料</translation> + </message> + <message> + <source>Paying only the minimum fee is just fine as long as there is less transaction volume than space in the blocks. But be aware that this can end up in a never confirming transaction once there is more demand for bitcoin transactions than the network can process.</source> + <translation>ブロックの容量に比べてトランザクション流量が少ないうちは最小手数料のみの支払で十分です。しかしながらネットワークが処理しきれないほどbitcoinトランザクションの需要がひとたび生まれてしまった場合には、永遠に検証がされないトランザクションになってしまう可能性があることに注意してください。</translation> + </message> + <message> + <source>(read the tooltip)</source> + <translation>（ツールチップをお読みください）</translation> + </message> + <message> + <source>Recommended:</source> + <translation>推奨：</translation> + </message> + <message> + <source>Custom:</source> + <translation>カスタム：</translation> + </message> + <message> + <source>(Smart fee not initialized yet. This usually takes a few blocks...)</source> + <translation>（スマート手数料はまだ初期化されていません。これにはおおよそ数ブロックほどかかります……）</translation> + </message> + <message> + <source>Confirmation time:</source> + <translation>検証時間：</translation> + </message> + <message> + <source>normal</source> + <translation>普通</translation> + </message> + <message> + <source>fast</source> + <translation>高速</translation> + </message> + <message> + <source>Send as zero-fee transaction if possible</source> + <translation>可能な場合には手数料ゼロのトランザクションとして送金する</translation> + </message> + <message> + <source>(confirmation may take longer)</source> + <translation>（検証に長い時間がかかる可能性があります）</translation> + </message> + <message> <source>Send to multiple recipients at once</source> <translation>一度に複数の人に送る</translation> </message> @@ -1404,6 +1821,10 @@ Address: %4 <translation>全ての入力項目をクリア</translation> </message> <message> + <source>Dust:</source> + <translation>ダスト：</translation> + </message> + <message> <source>Clear &All</source> <translation>すべてクリア (&A)</translation> </message> @@ -1424,6 +1845,10 @@ Address: %4 <translation>コインを送る確認</translation> </message> <message> + <source>%1 to %2</source> + <translation>%1 から %2</translation> + </message> + <message> <source>Copy quantity</source> <translation>数量をコピーする</translation> </message> @@ -1448,8 +1873,16 @@ Address: %4 <translation>優先度をコピーする</translation> </message> <message> - <source>The recipient address is not valid, please recheck.</source> - <translation>受取人のアドレスが不正です。再確認してください。</translation> + <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 amount to pay must be larger than 0.</source> @@ -1464,14 +1897,34 @@ Address: %4 <translation>%1 の取引手数料を含めると額が残高を超えています。</translation> </message> <message> - <source>Duplicate address found, can only send to each address once per send operation.</source> - <translation>重複しているアドレスが見つかりました。1回の送信で同じアドレスに送ることは出来ません。</translation> + <source>Transaction creation failed!</source> + <translation>トラザクションの作成に失敗しました!</translation> + </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>トランザクションは拒否されました。wallet.dat のコピーを使い、そしてコピーしたウォレットからコインを使用したことがマークされなかったときなど、ウォレットのいくつかのコインがすでに使用されている場合に、このエラーは起こるかもしれません。</translation> + </message> + <message> + <source>Pay only the minimum fee of %1</source> + <translation>最小手数料 %1 のみを支払う</translation> + </message> + <message> + <source>Warning: Invalid Bitcoin address</source> + <translation>警告：無効なBitcoinアドレスです</translation> </message> <message> <source>(no label)</source> <translation>（ラベル無し）</translation> </message> <message> + <source>Warning: Unknown change address</source> + <translation>警告：未知のおつりアドレスです</translation> + </message> + <message> + <source>Copy dust</source> + <translation>ダストをコピーする</translation> + </message> + <message> <source>Are you sure you want to send?</source> <translation>送ってよろしいですか？</translation> </message> @@ -1503,6 +1956,14 @@ Address: %4 <translation>前に使用したアドレスを選ぶ</translation> </message> <message> + <source>This is a normal payment.</source> + <translation>これは通常の支払です。</translation> + </message> + <message> + <source>The Bitcoin address to send the payment to</source> + <translation>支払の送金先Bitcoinアドレス</translation> + </message> + <message> <source>Alt+A</source> <translation>Alt+A</translation> </message> @@ -1515,10 +1976,22 @@ Address: %4 <translation>Alt+P</translation> </message> <message> + <source>Remove this entry</source> + <translation>この項目を削除する</translation> + </message> + <message> <source>Message:</source> <translation>メッセージ:</translation> </message> <message> + <source>Enter a label for this address to add it to the list of used addresses</source> + <translation>このアドレスに対するラベルを入力することで、使用済みアドレスの一覧に追加することができます</translation> + </message> + <message> + <source>A message that was attached to the bitcoin: URI which will be stored with the transaction for your reference. Note: This message will not be sent over the Bitcoin network.</source> + <translation>bitcoin: URIに添付されていたメッセージです。これは参照用としてトランザクションとともに保存されます。注意：このメッセージはBitcoinネットワークを通して送信されるわけではありません。</translation> + </message> + <message> <source>Pay To:</source> <translation>支払先:</translation> </message> @@ -1549,8 +2022,8 @@ Address: %4 <translation>メッセージの署名 (&S)</translation> </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>あなた自身を立証するためにあなたのアドレスでメッセージに署名することができます。フィッシング攻撃によってあなたを騙して署名を譲渡させようとするかもしれないので、不明確なものは絶対に署名しないように注意してください。あなたが同意する完全に詳細な声明にだけ署名してください。</translation> + <source>The Bitcoin address to sign the message with</source> + <translation>メッセージを署名するBitcoinアドレス</translation> </message> <message> <source>Choose previously used address</source> @@ -1601,8 +2074,8 @@ Address: %4 <translation>メッセージの検証 (&V)</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>メッセージを検証するために、署名するアドレスとメッセージ(改行、スペース、タブなどを正確にコピーしてください)、そして署名を入力します。中間者攻撃によってだまされることを避けるために、署名されたメッセージそのものよりも、署名を読み取られないように注意してください。</translation> + <source>The Bitcoin address the message was signed with</source> + <translation>メッセージの署名に使われたBitcoinアドレス</translation> </message> <message> <source>Verify the message to ensure it was signed with the specified Bitcoin address</source> @@ -1698,6 +2171,10 @@ Address: %4 <translation>ユニット %1 を開く</translation> </message> <message> + <source>conflicted</source> + <translation>衝突</translation> + </message> + <message> <source>%1/offline</source> <translation>%1/オフライン</translation> </message> @@ -1742,6 +2219,10 @@ Address: %4 <translation>自分のアドレス</translation> </message> <message> + <source>watch-only</source> + <translation>監視限定</translation> + </message> + <message> <source>label</source> <translation>ラベル</translation> </message> @@ -1762,6 +2243,14 @@ Address: %4 <translation>引き落とし額</translation> </message> <message> + <source>Total debit</source> + <translation>総出金額</translation> + </message> + <message> + <source>Total credit</source> + <translation>総入金額</translation> + </message> + <message> <source>Transaction fee</source> <translation>取引手数料</translation> </message> @@ -1786,6 +2275,10 @@ Address: %4 <translation>商人</translation> </message> <message> + <source>Generated coins must mature %1 blocks before they can be spent. When you generated this block, it was broadcast to the network to be added to the block chain. If it fails to get into the chain, its state will change to "not accepted" and it won't be spendable. This may occasionally happen if another node generates a block within a few seconds of yours.</source> + <translation>生成されたコインは使う前に%1のブロックを完成させる必要があります。あなたが生成した時、このブロックはブロック チェーンに追加されるネットワークにブロードキャストされました。チェーンに追加されるのが失敗した場合、状態が"不承認"に変更されて使えなくなるでしょう。これは、別のノードがあなたの数秒前にブロックを生成する場合に時々起こるかもしれません。</translation> + </message> + <message> <source>Debug information</source> <translation>デバッグ情報</translation> </message> @@ -1844,8 +2337,8 @@ Address: %4 <translation>タイプ</translation> </message> <message> - <source>Address</source> - <translation>Helbidea</translation> + <source>Immature (%1 confirmations, will be available after %2)</source> + <translation>未成熟（%1検証。%2検証完了後に使用可能となります）</translation> </message> <message numerus="yes"> <source>Open for %n more block(s)</source> @@ -1872,10 +2365,22 @@ Address: %4 <translation>オフライン</translation> </message> <message> + <source>Label</source> + <translation>ラベル</translation> + </message> + <message> <source>Unconfirmed</source> <translation>未検証</translation> </message> <message> + <source>Confirming (%1 of %2 recommended confirmations)</source> + <translation>検証中（%2の推奨検証数のうち、%1検証が完了）</translation> + </message> + <message> + <source>Conflicted</source> + <translation>衝突</translation> + </message> + <message> <source>Received with</source> <translation>受信元</translation> </message> @@ -1896,6 +2401,10 @@ Address: %4 <translation>発掘した</translation> </message> <message> + <source>watch-only</source> + <translation>監視限定</translation> + </message> + <message> <source>(n/a)</source> <translation>(n/a)</translation> </message> @@ -1912,8 +2421,8 @@ Address: %4 <translation>取引の種類。</translation> </message> <message> - <source>Destination address of transaction.</source> - <translation>取引の宛先アドレス。</translation> + <source>Whether or not a watch-only address is involved in this transaction.</source> + <translation>監視限定アドレスがこのトランザクションに含まれているかどうか</translation> </message> <message> <source>Amount removed from or added to balance.</source> @@ -2007,6 +2516,10 @@ Address: %4 <translation>トランザクション履歴をエクスポートする</translation> </message> <message> + <source>Watch-only</source> + <translation>監視限定</translation> + </message> + <message> <source>Exporting Failed</source> <translation>エクスポートに失敗しました</translation> </message> @@ -2019,6 +2532,10 @@ Address: %4 <translation>エクスポートに成功しました</translation> </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 (*.csv)</translation> </message> @@ -2057,7 +2574,11 @@ Address: %4 </context> <context> <name>UnitDisplayStatusBarControl</name> - </context> + <message> + <source>Unit to show amounts in. Click to select another unit.</source> + <translation>金額を表示する際の単位。クリックすることで他の単位を選択します。</translation> + </message> +</context> <context> <name>WalletFrame</name> <message> @@ -2095,6 +2616,14 @@ Address: %4 <translation>バックアップに失敗しました</translation> </message> <message> + <source>There was an error trying to save the wallet data to %1.</source> + <translation>ウォレットデータを%1へ保存する際にエラーが発生しました。</translation> + </message> + <message> + <source>The wallet data was successfully saved to %1.</source> + <translation>ウォレット データは正常に%1に保存されました。</translation> + </message> + <message> <source>Backup Successful</source> <translation>バックアップ成功</translation> </message> @@ -2134,49 +2663,42 @@ Address: %4 <translation>外部からの接続を許可 (初期値: -proxy または -connect を使用していない場合は1)</translation> </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>%s, rpcpassword を設定ファイルで設定してください: -%s -下記のランダムなパスワードの使用を推奨します: -rpcuser=bitcoinrpc -rpcpassword=%s -(このパスワードを覚える必要はありません) -ユーザー名とパスワードが同じであってはいけません。 -もしもファイルが存在しないなら、所有者だけが読み取れる権限で作成してください。 -また、問題が通知されるように alertnotify を設定することをお勧めします; -例えば: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo.com</translation> - </message> - <message> <source>Bind to given address and always listen on it. Use [host]:port notation for IPv6</source> <translation>指定のアドレスへバインドし、その上で常にリスンします。IPv6 は [ホスト名]:ポート番号 と表記します</translation> </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>エラー: 取引は拒否されました。wallet.dat のコピーを使い、そしてコピーしたウォレットからコインを使用したことがマークされなかったときなど、ウォレットのいくつかのコインがすでに使用されている場合に、このエラーは起こるかもしれません。</translation> + <source>Delete all wallet transactions and only recover those parts of the blockchain through -rescan on startup</source> + <translation>ウォレットの全トランザクションを削除し、これらを-rescanオプションを用いることで起動時にブロックチェインのデータのみからリカバリします。</translation> + </message> + <message> + <source>Distributed under the MIT software license, see the accompanying file COPYING or <http://www.opensource.org/licenses/mit-license.php>.</source> + <translation>MITソフトウェアライセンスのもとで配布されています。付属のCOPYINGファイルまたは<http://www.opensource.org/licenses/mit-license.php>を参照してください。</translation> </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>エラー: この取引は、額、複雑さ、あるいは最近受け取った資金の使用のために、少なくとも %s の手数料が必要です!</translation> + <source>Enter regression test mode, which uses a special chain in which blocks can be solved instantly.</source> + <translation>ブロックを瞬時に解決することができる特別なチェーンを使用して、リグレッションテストモードに入る。</translation> </message> <message> <source>Execute command when a wallet transaction changes (%s in cmd is replaced by TxID)</source> <translation>ウォレットの取引を変更する際にコマンドを実行 (cmd の %s は TxID に置換される)</translation> </message> <message> + <source>In this mode -genproclimit controls how many blocks are generated immediately.</source> + <translation>このモードでは -genproclimit は何個のブロックをただちに生成するのか制御します。</translation> + </message> + <message> + <source>Set the number of script verification threads (%u to %d, 0 = auto, <0 = leave that many cores free, default: %d)</source> + <translation>スクリプト検証スレッドを設定 (%uから%dの間, 0 = 自動, <0 = たくさんのコアを自由にしておく, 初期値: %d)</translation> + </message> + <message> <source>This is a pre-release test build - use at your own risk - do not use for mining or merchant applications</source> <translation>これはリリース前のテストビルドです - 各自の責任で利用すること - 採掘や商取引に使用しないでください</translation> </message> <message> + <source>Unable to bind to %s on this computer. Bitcoin Core is probably already running.</source> + <translation>このコンピュータの %s にバインドすることができません。おそらく Bitcoin Core は既に実行されています。</translation> + </message> + <message> <source>Warning: -paytxfee is set very high! This is the transaction fee you will pay if you send a transaction.</source> <translation>警告: -paytxfee が非常に高く設定されています! これは取引を送信する場合に支払う取引手数料です。</translation> </message> @@ -2197,10 +2719,18 @@ rpcpassword=%s <translation>警告: wallet.dat が壊れたのでデータを復旧しました! オリジナルの wallet.dat は wallet.{timestamp}.bak として %s に保存されました; もしもあなたの残高や取引が正しくないならバックアップから復元してください。</translation> </message> <message> + <source>Whitelist peers connecting from the given netmask or IP address. Can be specified multiple times.</source> + <translation>与えられたネットマスクやIPアドレスから接続を行う、ホワイトリストのピア。複数回指定できます。</translation> + </message> + <message> <source>(default: 1)</source> <translation>(デフォルト: 1)</translation> </message> <message> + <source><category> can be:</source> + <translation><category>は以下の値を指定できます：</translation> + </message> + <message> <source>Attempt to recover private keys from a corrupt wallet.dat</source> <translation>壊れた wallet.dat から秘密鍵を復旧することを試す</translation> </message> @@ -2213,6 +2743,10 @@ rpcpassword=%s <translation>指定したノードだけに接続</translation> </message> <message> + <source>Connection options:</source> + <translation>接続オプション：</translation> + </message> + <message> <source>Corrupted block database detected</source> <translation>破損したブロック データベースが見つかりました </translation> @@ -2222,8 +2756,8 @@ rpcpassword=%s <translation>デバッグ／テスト用オプション:</translation> </message> <message> - <source>Discover own IP address (default: 1 when listening and no -externalip)</source> - <translation>自分の IP アドレスを発見 (初期値: リスン中と -externalip を使用していない場合は1)</translation> + <source>Do not load the wallet and disable wallet RPC calls</source> + <translation>ウォレットは読み込まず、ウォレットRPCコールを無効化する</translation> </message> <message> <source>Do you want to rebuild the block database now?</source> @@ -2246,12 +2780,12 @@ rpcpassword=%s <translation>ブロック データベースの開始エラー</translation> </message> <message> - <source>Error: Disk space is low!</source> - <translation>エラー: ディスク容量不足!</translation> + <source>Error: A fatal internal error occured, see debug.log for details</source> + <translation>エラー：致命的な内部エラーが発生しました。詳細はdebug.logを参照してください</translation> </message> <message> - <source>Error: Wallet locked, unable to create transaction!</source> - <translation>エラー: ウォレットはロックされ、取引を作成できません!</translation> + <source>Error: Disk space is low!</source> + <translation>エラー: ディスク容量不足!</translation> </message> <message> <source>Failed to listen on any port. Use -listen=0 if you want this.</source> @@ -2262,22 +2796,46 @@ rpcpassword=%s <translation><category> が与えられなかった場合には、すべてのデバッグ情報が出力されます。</translation> </message> <message> + <source>Importing...</source> + <translation>インポートしています……</translation> + </message> + <message> <source>Incorrect or no genesis block found. Wrong datadir for network?</source> <translation>不正なブロックあるいは、生成されていないブロックが見つかりました。ネットワークの datadir が間違っていませんか?</translation> </message> <message> + <source>Invalid -onion address: '%s'</source> + <translation>無効な -onion アドレス：'%s'</translation> + </message> + <message> <source>Not enough file descriptors available.</source> <translation>使用可能なファイルディスクリプタが不足しています。</translation> </message> <message> - <source>Rebuild block chain index from current blk000??.dat files</source> - <translation>現在の blk000??.dat ファイルからブロック チェーンのインデックスを再構築</translation> + <source>Only connect to nodes in network <net> (ipv4, ipv6 or onion)</source> + <translation><net> (ipv4, ipv6 または onion) ネットワーク内のノードだけに接続する</translation> + </message> + <message> + <source>Set database cache size in megabytes (%d to %d, default: %d)</source> + <translation>データベースのキャッシュサイズをメガバイトで設定 (%dから%d。初期値: %d)</translation> + </message> + <message> + <source>Set maximum block size in bytes (default: %d)</source> + <translation>最大ブロックサイズをバイトで設定 (初期値: %d)</translation> </message> <message> <source>Specify wallet file (within data directory)</source> <translation>ウォレットのファイルを指定 (データ・ディレクトリの中に)</translation> </message> <message> + <source>This is intended for regression testing tools and app development.</source> + <translation>これはリグレッションテストツールやアプリ開発のためのものです。</translation> + </message> + <message> + <source>Use UPnP to map the listening port (default: %u)</source> + <translation>リッスンポートの割当に UPnP を使用 (初期値: %u)</translation> + </message> + <message> <source>Verifying blocks...</source> <translation>ブロックの検証中...</translation> </message> @@ -2290,6 +2848,10 @@ rpcpassword=%s <translation>財布 %s はデータ・ディレクトリ%sの外にあります</translation> </message> <message> + <source>Wallet options:</source> + <translation>ウォレットオプション：</translation> + </message> + <message> <source>You need to rebuild the database using -reindex to change -txindex</source> <translation>-txindex を変更するには -reindex を使用してデータベースを再構築する必要があります</translation> </message> @@ -2298,14 +2860,166 @@ rpcpassword=%s <translation>外部の blk000??.dat ファイルからブロックをインポート</translation> </message> <message> + <source>Allow JSON-RPC connections from specified source. Valid for <ip> are a single IP (e.g. 1.2.3.4), a network/netmask (e.g. 1.2.3.4/255.255.255.0) or a network/CIDR (e.g. 1.2.3.4/24). This option can be specified multiple times</source> + <translation>指定したアクセス元からのJSON-RPC接続を許可する。有効な<ip>は、単一のIP (例 1.2.3.4)、ネットワーク/ネットマスク (1.2.3.4/255.255.255.0)、またはネットワーク/CIDR (1.2.3.4/24)です。このオプションは複数回指定できます。</translation> + </message> + <message> + <source>An error occurred while setting up the RPC address %s port %u for listening: %s</source> + <translation>リッスンする RPC アドレス %s、ポート %u の設定中にエラーが発生しました: %s</translation> + </message> + <message> + <source>Bind to given address and whitelist peers connecting to it. Use [host]:port notation for IPv6</source> + <translation>指定されたアドレスおよび、そこに接続を行ってきたホワイトリストのピアに対してバインドを行います。IPv6の場合には [host]:port 表記を使用してください</translation> + </message> + <message> + <source>Bind to given address to listen for JSON-RPC connections. Use [host]:port notation for IPv6. This option can be specified multiple times (default: bind to all interfaces)</source> + <translation>指定されたアドレスに対して JSON-RPC 接続をリッスンしするようバインドします。IPv6の場合には [host]:port 表記を使用してください。このオプションは複数回指定することが可能です (初期値: すべてのインターフェースに対してバインドする)</translation> + </message> + <message> + <source>Cannot obtain a lock on data directory %s. Bitcoin Core is probably already running.</source> + <translation>データ ディレクトリ %s のロックを取得することができません。おそらく Bitcoin Core は実行中です。</translation> + </message> + <message> + <source>Create new files with system default permissions, instead of umask 077 (only effective with disabled wallet functionality)</source> + <translation>umask 077 ではなく、システムのデフォルトパーミッションで新規ファイルを作成する (ウォレット機能が無効化されていた場合にのみ有効)</translation> + </message> + <message> + <source>Error: Listening for incoming connections failed (listen returned error %s)</source> + <translation>エラー: 内向きの接続をリッスンするのに失敗しました (エラー %s が返却されました)</translation> + </message> + <message> + <source>Error: Unsupported argument -socks found. Setting SOCKS version isn't possible anymore, only SOCKS5 proxies are supported.</source> + <translation>エラー: サポートされていない引数 -socks が見つかりました。SOCKSバージョンの設定はできないようになりました。SOCKS5プロキシのみがサポートされています。</translation> + </message> + <message> <source>Execute command when a relevant alert is received or we see a really long fork (%s in cmd is replaced by message)</source> <translation>関連のアラートをもらってもすごく長いのフォークを見てもコマンドを実行 (コマンドの中にあるの%sはメッセージから置き換えさせる)</translation> </message> <message> + <source>Fees (in BTC/Kb) smaller than this are considered zero fee for relaying (default: %s)</source> + <translation>中継の際、この値未満の手数料 (BTC/Kb単位) はゼロであるとみなす (デフォルト: %s)</translation> + </message> + <message> + <source>Fees (in BTC/Kb) smaller than this are considered zero fee for transaction creation (default: %s)</source> + <translation>トランザクション作成の際、この値未満の手数料 (BTC/Kb単位) はゼロであるとみなす (デフォルト: %s)</translation> + </message> + <message> + <source>If paytxfee is not set, include enough fee so transactions begin confirmation on average within n blocks (default: %u)</source> + <translation>paytxfee が設定されていなかった場合、平均して n ブロック以内にトランザクションが検証され始めるのに十分な手数料を含める (初期値: %u)</translation> + </message> + <message> + <source>Invalid amount for -maxtxfee=<amount>: '%s' (must be at least the minrelay fee of %s to prevent stuck transactions)</source> + <translation>-maxtxfee=<amount> の数量の指定が不正です: '%s' (トランザクションが詰まってしまうのを防ぐため、少なくとも %s の最小中継手数料を指定しなければいけません)</translation> + </message> + <message> + <source>Maximum size of data in data carrier transactions we relay and mine (default: %u)</source> + <translation>中継および採掘を行う際の、データ運送トランザクションの中のデータの最大サイズ (初期値: %u)</translation> + </message> + <message> + <source>Query for peer addresses via DNS lookup, if low on addresses (default: 1 unless -connect)</source> + <translation>保有するピアアドレスが少ない場合、DNS ルックアップによりピアアドレスを問い合わせる (-connect を使っていない場合の初期値: 1)</translation> + </message> + <message> + <source>Set maximum size of high-priority/low-fee transactions in bytes (default: %d)</source> + <translation>最優先/最低手数料の最大サイズをバイトで指定 (初期値: %d)</translation> + </message> + <message> + <source>Set the number of threads for coin generation if enabled (-1 = all cores, default: %d)</source> + <translation>コイン生成が有効になっていた場合の利用スレッド数を設定する (-1 = すべてのコア, 初期値: %d)</translation> + </message> + <message> + <source>This product includes software developed by the OpenSSL Project for use in the OpenSSL Toolkit <https://www.openssl.org/> and cryptographic software written by Eric Young and UPnP software written by Thomas Bernard.</source> + <translation>この製品はOpenSSLプロジェクトにより開発されたソフトウェアをOpenSSLツールキットとして利用しています <https://www.openssl.org/>。また、Eric Young氏により開発された暗号ソフトウェア、Thomas Bernard氏により書かれたUPnPソフトウェアを用いています。</translation> + </message> + <message> + <source>To use bitcoind, or the -server option to bitcoin-qt, you must set an 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>bitcoindを用いる場合や、-server オプションをbitcoin-qtに指定する場合には、設定ファイルにrpcpasswordを設定しなければなりません: +%s +以下のランダムなパスワードを用いることが推奨されます: +rpcuser=bitcoinrpc +rpcpassword=%s +(このパスワードを暗記する必要はありません) +ユーザ名とパスワードは一致してはいけません。 +ファイルが存在しない場合には、所有者のみ読み込み可能なファイルパーミッションでファイルを作成してください。 +またalertnotifyを設定し、問題発生時に通知が行くようにすることをおすすめします; +例: alertnotify=echo %%s | mail -s "Bitcoinアラート" admin@foo.com +</translation> + </message> + <message> + <source>Warning: -maxtxfee is set very high! Fees this large could be paid on a single transaction.</source> + <translation>警告: -maxtxfee が非常に高く設定されています！ひとつのトランザクションでこの量の手数料が支払われてしまうことがあります。</translation> + </message> + <message> + <source>Warning: Please check that your computer's date and time are correct! If your clock is wrong Bitcoin Core will not work properly.</source> + <translation>警告： あなたのPCの日付と時刻が正しいことを確認して下さい！ もしあなたの時計が正しくなければBitcoin Coreが正確に動作しません。</translation> + </message> + <message> + <source>Whitelisted peers cannot be DoS banned and their transactions are always relayed, even if they are already in the mempool, useful e.g. for a gateway</source> + <translation>ホワイトリストのピアはDoSによるアクセス禁止処理が無効化され、トランザクションは例えmempool内に既に存在していたとしても常にリレーされます。これは例えばゲートウェイに対して有用です</translation> + </message> + <message> + <source>Accept public REST requests (default: %u)</source> + <translation>公開 REST リクエストを許可する (初期値: %u)</translation> + </message> + <message> + <source>Cannot resolve -whitebind address: '%s'</source> + <translation>-whitebind アドレス '%s' を解決できません</translation> + </message> + <message> + <source>Choose data directory on startup (default: 0)</source> + <translation>起動時にデータ ディレクトリを選ぶ (初期値: 0)</translation> + </message> + <message> + <source>Connect through SOCKS5 proxy</source> + <translation>SOCKS5 プロキシ経由で接続する</translation> + </message> + <message> + <source>Copyright (C) 2009-%i The Bitcoin Core Developers</source> + <translation>Copyright (C) 2009-%i Bitcoin Core 開発者</translation> + </message> + <message> + <source>Could not parse -rpcbind value %s as network address</source> + <translation>-rpcbind の値 %s をネットワークアドレスとして解釈できませんでした</translation> + </message> + <message> + <source>Error loading wallet.dat: Wallet requires newer version of Bitcoin Core</source> + <translation>wallet.dat の読み込みに失敗しました: ウォレットの読み込みにはより新しいバージョンの Bitcoin Core が必要です</translation> + </message> + <message> + <source>Error reading from database, shutting down.</source> + <translation>データベースの読み込みエラー。シャットダウンします。</translation> + </message> + <message> + <source>Error: Unsupported argument -tor found, use -onion.</source> + <translation>エラー: サポートされていない引数 -tor が見つかりました。-onion を使用してください。</translation> + </message> + <message> + <source>Fee (in BTC/kB) to add to transactions you send (default: %s)</source> + <translation>送信するトランザクションに付加する手数料 (BTC/kB単位) (初期値: %s)</translation> + </message> + <message> <source>Information</source> <translation>情報</translation> </message> <message> + <source>Initialization sanity check failed. Bitcoin Core is shutting down.</source> + <translation>初期化時の健全性チェックに失敗しました。Bitcoin Coreを終了します。</translation> + </message> + <message> + <source>Invalid amount for -maxtxfee=<amount>: '%s'</source> + <translation>-maxtxfee=<amount> に対する無効な数量です: '%s'</translation> + </message> + <message> <source>Invalid amount for -minrelaytxfee=<amount>: '%s'</source> <translation>不正な額 -minrelaytxfee=<amount>: '%s'</translation> </message> @@ -2314,6 +3028,26 @@ rpcpassword=%s <translation>不正な額 -minrelaytxfee=<amount>: '%s'</translation> </message> <message> + <source>Invalid amount for -paytxfee=<amount>: '%s' (must be at least %s)</source> + <translation>-paytxfee=<amount> に対する無効な数量です: '%s' (少なくとも %s でなければいけません)</translation> + </message> + <message> + <source>Invalid netmask specified in -whitelist: '%s'</source> + <translation>-whitelist に対する無効なネットマスクです: '%s'</translation> + </message> + <message> + <source>Keep at most <n> unconnectable transactions in memory (default: %u)</source> + <translation>最大で <n> 個の孤立したトランザクションをメモリの中に保持する (初期値: %u)</translation> + </message> + <message> + <source>Need to specify a port with -whitebind: '%s'</source> + <translation>-whitebind を用いてポートを指定する必要があります: '%s'</translation> + </message> + <message> + <source>Node relay options:</source> + <translation>ノード中継オプション:</translation> + </message> + <message> <source>RPC SSL options: (see the Bitcoin Wiki for SSL setup instructions)</source> <translation>RPC SSL オプション: (SSLのセットアップ手順はビットコインWikiを参照してください)</translation> </message> @@ -2322,10 +3056,42 @@ rpcpassword=%s <translation>RPCサーバのオプション:</translation> </message> <message> + <source>RPC support for HTTP persistent connections (default: %d)</source> + <translation>RPCにおけるHTTPの持続的接続のサポート (初期値: %d)</translation> + </message> + <message> + <source>Randomly drop 1 of every <n> network messages</source> + <translation><n> 個のネットワークメッセージごとにひとつをランダムに捨てる</translation> + </message> + <message> + <source>Randomly fuzz 1 of every <n> network messages</source> + <translation><n>個のネットワークメッセージごとにひとつをランダムに改変する</translation> + </message> + <message> <source>Send trace/debug info to console instead of debug.log file</source> <translation>トレース/デバッグ情報を debug.log ファイルの代わりにコンソールへ送る</translation> </message> <message> + <source>Send transactions as zero-fee transactions if possible (default: %u)</source> + <translation>可能な場合には手数料ゼロのトランザクションとしてトランザクションを送信する (初期値: %u)</translation> + </message> + <message> + <source>Set SSL root certificates for payment request (default: -system-)</source> + <translation>支払いリクエスト用にSSLルート証明書を設定する（デフォルト：-system-）</translation> + </message> + <message> + <source>Set language, for example "de_DE" (default: system locale)</source> + <translation>言語設定 例: "de_DE" (初期値: システムの言語)</translation> + </message> + <message> + <source>Show all debugging options (usage: --help -help-debug)</source> + <translation>すべてのデバッグオプションを表示する (使い方: --help -help-debug)</translation> + </message> + <message> + <source>Show splash screen on startup (default: 1)</source> + <translation>起動時にスプラッシュ画面を表示する (初期値: 1)</translation> + </message> + <message> <source>Shrink debug.log file on client startup (default: 1 when no -debug)</source> <translation>クライアント起動時に debug.log ファイルを縮小 (初期値: -debug オプションを指定しない場合は1)</translation> </message> @@ -2334,6 +3100,14 @@ rpcpassword=%s <translation>取引の署名に失敗しました</translation> </message> <message> + <source>Start minimized</source> + <translation>最小化された状態で起動する</translation> + </message> + <message> + <source>This is experimental software.</source> + <translation>これは実験的なソフトウェアです。</translation> + </message> + <message> <source>Transaction amount too small</source> <translation>取引の額が小さ過ぎます</translation> </message> @@ -2342,10 +3116,18 @@ rpcpassword=%s <translation>取引の額は0より大きくしてください</translation> </message> <message> + <source>Transaction too large for fee policy</source> + <translation>手数料ポリシーに対してトランザクションが大きすぎます</translation> + </message> + <message> <source>Transaction too large</source> <translation>取引が大き過ぎます</translation> </message> <message> + <source>Unable to bind to %s on this computer (bind returned error %s)</source> + <translation>このコンピュータの %s にバインドすることができません (バインドが返したエラーは %s)</translation> + </message> + <message> <source>Use UPnP to map the listening port (default: 1 when listening)</source> <translation>リスン ポートの割当に UPnP を使用 (初期値: リスン中は1)</translation> </message> @@ -2354,12 +3136,28 @@ rpcpassword=%s <translation>JSON-RPC 接続のユーザー名</translation> </message> <message> + <source>Wallet needed to be rewritten: restart Bitcoin Core to complete</source> + <translation>ウォレットが書き直される必要がありました: 完了するために Bitcoin Core を再起動します</translation> + </message> + <message> <source>Warning</source> <translation>警告</translation> </message> <message> - <source>Warning: This version is obsolete, upgrade required!</source> - <translation>警告: このバージョンは古いのでアップグレードが必要です!</translation> + <source>Warning: Unsupported argument -benchmark ignored, use -debug=bench.</source> + <translation>警告: サポートされていない引数 -benchmark は無視されました。-debug=bench を使用してください。</translation> + </message> + <message> + <source>Warning: Unsupported argument -debugnet ignored, use -debug=net.</source> + <translation>警告: サポートされていない引数 -debugnet は無視されました。-debug=net を使用してください。</translation> + </message> + <message> + <source>Zapping all transactions from wallet...</source> + <translation>ウォレットからすべてのトランザクションを消去しています...</translation> + </message> + <message> + <source>on startup</source> + <translation>起動時</translation> </message> <message> <source>wallet.dat corrupt, salvage failed</source> @@ -2402,14 +3200,170 @@ rpcpassword=%s <translation>wallet.dat 読み込みエラー: ウォレットが壊れました</translation> </message> <message> + <source>(1 = keep tx meta data e.g. account owner and payment request information, 2 = drop tx meta data)</source> + <translation>(1 = トランザクションのメタデータ、例えばアカウントの所有者や支払リクエストの内容を保持する, 2 = トランザクションのメタデータを破棄する)</translation> + </message> + <message> + <source>Flush database activity from memory pool to disk log every <n> megabytes (default: %u)</source> + <translation><n> メガバイトごとにメモリプールからデータベースのアクティビティをディスクログに書き出す (初期値: %u)</translation> + </message> + <message> + <source>How thorough the block verification of -checkblocks is (0-4, default: %u)</source> + <translation>-checkblocks のブロックの検証レベル (0-4, 初期値: %u)</translation> + </message> + <message> + <source>Log transaction priority and fee per kB when mining blocks (default: %u)</source> + <translation>ブロックの採掘時にトランザクションの優先度と1kBあたりの手数料をログに残す (デフォルト: %u)</translation> + </message> + <message> + <source>Maintain a full transaction index, used by the getrawtransaction rpc call (default: %u)</source> + <translation>getrawtransaction rpc 呼び出し時に用いる、完全なトランザクションインデックスを保持する (初期値: %u)</translation> + </message> + <message> + <source>Number of seconds to keep misbehaving peers from reconnecting (default: %u)</source> + <translation>不正なピアを再接続するまでの秒数 (初期値: %u)</translation> + </message> + <message> + <source>Output debugging information (default: %u, supplying <category> is optional)</source> + <translation>デバッグ情報を出力する (初期値: %u, <category> の指定は任意です)</translation> + </message> + <message> + <source>Use separate SOCKS5 proxy to reach peers via Tor hidden services (default: %s)</source> + <translation>Tor 秘匿サービスを通し、別々の SOCKS5 プロキシを用いることでピアに到達する (初期値: %s)</translation> + </message> + <message> + <source>(default: %s)</source> + <translation>(デフォルト: %s)</translation> + </message> + <message> + <source>Acceptable ciphers (default: %s)</source> + <translation>受付可能な暗号化方式 (初期値: %s)</translation> + </message> + <message> + <source>Always query for peer addresses via DNS lookup (default: %u)</source> + <translation>DNS ルックアップを通してピアアドレスを常に問い合わせる (初期値: %u)</translation> + </message> + <message> + <source>Disable safemode, override a real safe mode event (default: %u)</source> + <translation>セーフモードを無効化し、実際のセーフモードイベントも無効化する (初期値: %u)</translation> + </message> + <message> <source>Error loading wallet.dat</source> <translation>wallet.dat 読み込みエラー</translation> </message> <message> + <source>Force safe mode (default: %u)</source> + <translation>セーフモードを強制する (初期値: %u)</translation> + </message> + <message> + <source>Generate coins (default: %u)</source> + <translation>コインを生成 (初期値: %u)</translation> + </message> + <message> + <source>How many blocks to check at startup (default: %u, 0 = all)</source> + <translation>起動時に点検するブロック数 (初期値: %u, 0=すべて)</translation> + </message> + <message> + <source>Include IP addresses in debug output (default: %u)</source> + <translation>デバッグ出力にIPアドレスを含める (初期値: %u)</translation> + </message> + <message> <source>Invalid -proxy address: '%s'</source> <translation>無効な -proxy アドレス: '%s'</translation> </message> <message> + <source>Limit size of signature cache to <n> entries (default: %u)</source> + <translation>署名キャッシュのサイズを <n> エントリーに制限する (デフォルト: %u)</translation> + </message> + <message> + <source>Listen for JSON-RPC connections on <port> (default: %u or testnet: %u)</source> + <translation><port> で JSON-RPC 接続をリスン (初期値: %u、testnet は %u)</translation> + </message> + <message> + <source>Listen for connections on <port> (default: %u or testnet: %u)</source> + <translation>接続のリッスンを <port> で行う (初期値: %u、testnet: %u)</translation> + </message> + <message> + <source>Maintain at most <n> connections to peers (default: %u)</source> + <translation>ピアの接続数を最大でも <n> 個に維持する (初期値: %u)</translation> + </message> + <message> + <source>Maximum per-connection receive buffer, <n>*1000 bytes (default: %u)</source> + <translation>接続毎の最大受信バッファ <n>*1000 バイト (初期値: %u)</translation> + </message> + <message> + <source>Maximum per-connection send buffer, <n>*1000 bytes (default: %u)</source> + <translation>接続毎の最大送信バッファ <n>*1000 バイト (初期値: %u)</translation> + </message> + <message> + <source>Only accept block chain matching built-in checkpoints (default: %u)</source> + <translation>内蔵のチェックポイントと一致するブロック チェーンのみを許可 (初期値: %u)</translation> + </message> + <message> + <source>Prepend debug output with timestamp (default: %u)</source> + <translation>デバッグ出力にタイムスタンプを付ける (初期値: %u)</translation> + </message> + <message> + <source>Relay and mine data carrier transactions (default: %u)</source> + <translation>データ運送トランザクションのリレーおよび採掘を行う (初期値: %u)</translation> + </message> + <message> + <source>Relay non-P2SH multisig (default: %u)</source> + <translation>P2SHでないマルチシグトランザクションをリレーする (初期値: %u)</translation> + </message> + <message> + <source>Run a thread to flush wallet periodically (default: %u)</source> + <translation>ウォレットを定期的に書き出すためのスレッドを走らせる (初期値: %u)</translation> + </message> + <message> + <source>Server certificate file (default: %s)</source> + <translation>サーバ証明書ファイル (初期値: %s)</translation> + </message> + <message> + <source>Server private key (default: %s)</source> + <translation>サーバの秘密鍵 (初期値: %s)</translation> + </message> + <message> + <source>Set key pool size to <n> (default: %u)</source> + <translation>key pool のサイズを <n> (初期値: %u) にセット</translation> + </message> + <message> + <source>Set minimum block size in bytes (default: %u)</source> + <translation>最小ブロックサイズをバイトで設定 (初期値: %u)</translation> + </message> + <message> + <source>Set the number of threads to service RPC calls (default: %d)</source> + <translation>RPC サービスのスレッド数を設定 (初期値: %d)</translation> + </message> + <message> + <source>Sets the DB_PRIVATE flag in the wallet db environment (default: %u)</source> + <translation>ウォレットDB環境内にDB_PRIVATEフラグを設定する (デフォルト: %u)</translation> + </message> + <message> + <source>Specify configuration file (default: %s)</source> + <translation>設定ファイルの指定 (初期値: %s)</translation> + </message> + <message> + <source>Specify connection timeout in milliseconds (minimum: 1, default: %d)</source> + <translation>接続のタイムアウトをミリセコンドで指定 (最小値: 1, 初期値: %d)</translation> + </message> + <message> + <source>Specify pid file (default: %s)</source> + <translation>pid ファイルの指定 (初期値: %s)</translation> + </message> + <message> + <source>Spend unconfirmed change when sending transactions (default: %u)</source> + <translation>トランザクション送信時に未検証のおつりを使用する (デフォルト: %u)</translation> + </message> + <message> + <source>Stop running after importing blocks from disk (default: %u)</source> + <translation>ディスクからブロックを読み込んだ後に終了する (デフォルト: %u)</translation> + </message> + <message> + <source>Threshold for disconnecting misbehaving peers (default: %u)</source> + <translation>不正なピアを切断するためのしきい値 (初期値: %u)</translation> + </message> + <message> <source>Unknown network specified in -onlynet: '%s'</source> <translation>-onlynet で指定された '%s' は未知のネットワークです</translation> </message> @@ -2426,10 +3380,6 @@ rpcpassword=%s <translation>-paytxfee=<amount> の額 '%s' が無効です</translation> </message> <message> - <source>Invalid amount</source> - <translation>無効な総額</translation> - </message> - <message> <source>Insufficient funds</source> <translation>残高不足</translation> </message> @@ -2462,10 +3412,6 @@ rpcpassword=%s <translation>読み込み完了</translation> </message> <message> - <source>To use the %s option</source> - <translation>%s オプションを使うには</translation> - </message> - <message> <source>Error</source> <translation>エラー</translation> </message> diff --git a/src/qt/locale/bitcoin_ka.ts b/src/qt/locale/bitcoin_ka.ts index 3faad159ad..0b96a18d18 100644 --- a/src/qt/locale/bitcoin_ka.ts +++ b/src/qt/locale/bitcoin_ka.ts @@ -1,11 +1,7 @@ -<TS language="ka" version="2.0"> +<TS language="ka" version="2.1"> <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> @@ -152,10 +148,6 @@ <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> @@ -180,10 +172,6 @@ <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>ახლა Bitcoin დაიხურება დაშიფრვის პროცესის დასასრულებლად. გაითვალისწინეთ, რომ დაშიფრვა სრულად ვერ დაიცავს თქვენს ბითქოინებს თქვენს კომპიუტერში შემოპარული მავნე პროგრამების საშუალებით დატაცებისაგან.</translation> - </message> - <message> <source>Wallet encryption failed</source> <translation>ვერ მოხერხდა საფულის დაშიფრვა</translation> </message> @@ -299,10 +287,6 @@ <translation>მონეტების გაგზავნა Bitcoin-მისამართზე</translation> </message> <message> - <source>Modify configuration options for Bitcoin</source> - <translation>Bitcoin-ის საკონფიგურაციო პარამეტრების ცვლილება</translation> - </message> - <message> <source>Backup wallet to another location</source> <translation>საფულის არქივირება სხვა ადგილზე</translation> </message> @@ -455,18 +439,6 @@ <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> @@ -645,10 +617,6 @@ Address: %4 <translation>არა</translation> </message> <message> - <source>This label turns red, if the transaction size is greater than 1000 bytes.</source> - <translation>ნიშნული წითლდება, როცა ტრანსაქციის ზომა 1000 ბაიტზე მეტია.</translation> - </message> - <message> <source>This means a fee of at least %1 per kB is required.</source> <translation>ეს ნიშნავს, რომ კილობაიტზე საკომისიო იქნება მინიმუმ %1</translation> </message> @@ -661,14 +629,6 @@ Address: %4 <translation>მეტი პრიორიტეტის ტრანსაქციებს მეტი შანსი აქვს მოხვდეს ბლოკში.</translation> </message> <message> - <source>This label turns red, if the priority is smaller than "medium".</source> - <translation>ნიშნული წითლდება, როცა პრიორიტეტი "საშუალო"-ზე დაბალია.</translation> - </message> - <message> - <source>This label turns red, if any recipient receives an amount smaller than %1.</source> - <translation>ნიშნული წითლდება, როცა რომელიმე რეციპიენტი მიიღებს %1-ზე ნაკლებს.</translation> - </message> - <message> <source>(no label)</source> <translation>(არ არის ნიშნული)</translation> </message> @@ -785,26 +745,6 @@ Address: %4 <source>command-line options</source> <translation>კომანდების ზოლის ოპციები</translation> </message> - <message> - <source>UI options</source> - <translation>ინტერფეისის პარამეტრები</translation> - </message> - <message> - <source>Set language, for example "de_DE" (default: system locale)</source> - <translation>აირჩიეთ ენა, მაგალითად "de_DE" (ნაგულისხმევია სისტემური ლოკალი)</translation> - </message> - <message> - <source>Start minimized</source> - <translation>გაშვება მინიმიზებული ეკრანით</translation> - </message> - <message> - <source>Show splash screen on startup (default: 1)</source> - <translation>მისალმების ეკრანის ჩვენება გაშვებისას (ნაგულისხმევი:1)</translation> - </message> - <message> - <source>Choose data directory on startup (default: 0)</source> - <translation>მონაცემთა კატალოგის მითითება ყოველი გაშვებისას (ნაგულისხმევი: 0)</translation> - </message> </context> <context> <name>Intro</name> @@ -871,14 +811,6 @@ Address: %4 <translation>&მთავარი</translation> </message> <message> - <source>Automatically start Bitcoin after logging in to the system.</source> - <translation>სისტემაში შესვლის შემდეგ Bitcoin-ის ავტომატური გაშვება.</translation> - </message> - <message> - <source>&Start Bitcoin on system login</source> - <translation>&სისტემაში შესვლისას გაშვება</translation> - </message> - <message> <source>Size of &database cache</source> <translation>მონაცემთა ბაზის კეშის სი&დიდე</translation> </message> @@ -951,10 +883,6 @@ Address: %4 <translation>&მინიმიზება სისტემურ ზონაში პროგრამების პანელის ნაცვლად</translation> </message> <message> - <source>Minimize instead of exit the application when the window is closed. When this option is enabled, the application will be closed only after selecting Quit in the menu.</source> - <translation>პროგრამის მინიმიზება ფანჯრის დახურვისას. ოპციის ჩართვის შემდეგ პროგრამის დახურვა შესაძლებელი იქნება მხოლოდ მენიუდან - პუნქტი "გასვლა".</translation> - </message> - <message> <source>M&inimize on close</source> <translation>მ&ინიმიზება დახურვისას</translation> </message> @@ -967,10 +895,6 @@ Address: %4 <translation>სამომხმარებ&ლო ენა:</translation> </message> <message> - <source>The user interface language can be set here. This setting will take effect after restarting Bitcoin.</source> - <translation>აქ შეგიძლიათ აირჩიოთ სამომხმარებლო ენა. ძალაში შევა Bitcoin-ის რესტარტის შემდეგ.</translation> - </message> - <message> <source>&Unit to show amounts in:</source> <translation>ერთეუ&ლი:</translation> </message> @@ -1007,10 +931,6 @@ Address: %4 <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>ამ ცვლილებების ძალაში შესასვლელად საჭიროა კლიენტის დახურვა და ხელახალი გაშვება.</translation> </message> @@ -1257,18 +1177,10 @@ Address: %4 <translation>დახვეწის ლოგ-ფაილი</translation> </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>გახსენით Bitcoin-ის დახვეწის ლოგ-ფაილი მიმდინარე კატალოგიდან. დიდი ლოგ-ფაილის შემთხვევაში ამას შეიძლება რამდენიმე წამი მოუნდეს.</translation> - </message> - <message> <source>Clear console</source> <translation>კონსოლის გასუფთავება</translation> </message> <message> - <source>Welcome to the Bitcoin RPC console.</source> - <translation>მოგესალმებათ Bitcoin-ის RPC კონსოლი.</translation> - </message> - <message> <source>Use up and down arrows to navigate history, and <b>Ctrl-L</b> to clear screen.</source> <translation>კლავიშები "ზევით" და "ქვევით" - ისტორიაში მოძრაობა, <b>Ctrl-L</b> - ეკრანის გასუფთავება.</translation> </message> @@ -1593,10 +1505,6 @@ Address: %4 <translation>ან</translation> </message> <message> - <source>The recipient address is not valid, please recheck.</source> - <translation>მიმღების მისამართი არასწორია, შეამოწმეთ.</translation> - </message> - <message> <source>The amount to pay must be larger than 0.</source> <translation>გადახდის მოცულობა 0-ზე მეტი უნდა იყოს</translation> </message> @@ -1605,10 +1513,6 @@ Address: %4 <translation>თანხა აღემატება თქვენს ბალანსს</translation> </message> <message> - <source>Duplicate address found, can only send to each address once per send operation.</source> - <translation>მისამართები დუბლირებულია, დაშვებულია ერთ ჯერზე თითო მისამართზე ერთხელ გაგზავნა.</translation> - </message> - <message> <source>Transaction creation failed!</source> <translation>შეცდომა ტრანსაქციის შექმნისას!</translation> </message> @@ -1684,10 +1588,6 @@ Address: %4 <translation>მესიჯი:</translation> </message> <message> - <source>This is a verified payment request.</source> - <translation>ეს არის ვერიფიცირებული გადახდის მოთხოვნა.</translation> - </message> - <message> <source>Enter a label for this address to add it to the list of used addresses</source> <translation>შეიყვანეთ ამ მისამართის ნიშნული გამოყენებული მისამართების სიაში დასამატებლად</translation> </message> @@ -1696,10 +1596,6 @@ Address: %4 <translation>მესიჯი, რომელიც თან ერთვის მონეტებს: URI, რომელიც შეინახება ტრანსაქციასთან ერთად თქვენთვის. შენიშვნა: მესიჯი არ გაყვება გადახდას ბითქოინის ქსელში.</translation> </message> <message> - <source>This is an unverified payment request.</source> - <translation>ეს არის არავერიფიცირებული გადახდის მოთხოვნა.</translation> - </message> - <message> <source>Pay To:</source> <translation>ადრესატი:</translation> </message> @@ -1730,10 +1626,6 @@ Address: %4 <translation>მე&სიჯის ხელმოწერა</translation> </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>ხელმოწერით თქვენ ადასტურებთ, რომ მესიჯი თქვენია. ფრთხილად - არ მოაწეროთ ხელი რაიმე საეჭვოს: ფიშინგური ხრიკებით შეიძლება ის თქვენს მესიჯად გაასაღონ. მოაწერეთ ხელი მხოლოდ იმას, რასაც ყველა წვრილმანში ეთანხმებით.</translation> - </message> - <message> <source>Choose previously used address</source> <translation>აირჩიეთ ადრე გამოყენებული მისამართი</translation> </message> @@ -1782,10 +1674,6 @@ Address: %4 <translation>მესიჯის &ვერიფიკაცია</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>შეიყვანეთ ხელმოწერის მისამართი, მესიჯი (დაუკვირდით, რომ ზუსტად იყოს კოპირებული სტრიქონის გადატანები, ჰარები, ტაბულაციები და სხვ) და ხელმოწერა მესიჯის ვერიფიკაციისათვის. მიაქციეთ ყურადღება, რომ რაიმე ზედმეტი არ გაგყვეთ კოპირებისას, რათა არ გახდეთ "man-in-the-middle" შეტევის ობიექტი.</translation> - </message> - <message> <source>Verify the message to ensure it was signed with the specified Bitcoin address</source> <translation>შეამოწმეთ, რომ მესიჯი ხელმოწერილია მითითებული Bitcoin-მისამართით</translation> </message> @@ -2021,10 +1909,6 @@ Address: %4 <translation>ტიპი</translation> </message> <message> - <source>Address</source> - <translation>მისამართი</translation> - </message> - <message> <source>Immature (%1 confirmations, will be available after %2)</source> <translation>არ არის მომწიფებული (%1 დასტური, საჭიროა სულ %2)</translation> </message> @@ -2049,6 +1933,10 @@ Address: %4 <translation>ოფლაინშია</translation> </message> <message> + <source>Label</source> + <translation>ნიშნული</translation> + </message> + <message> <source>Unconfirmed</source> <translation>დაუდასტურებელია</translation> </message> @@ -2097,10 +1985,6 @@ Address: %4 <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> @@ -2331,30 +2215,6 @@ Address: %4 <translation>გარედან შეერთებების დაშვება (ნაგულისხმევი: 1 თუ არ გამოიყენება -proxy ან -connect)</translation> </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>%s, მიუთითეთ rpcpassword საკონფიგურაციო ფაილში: -%s -რეკომენდებულია შემდეგი შემთხვევითი პაროლი: -rpcuser=bitcoinrpc -rpcpassword=%s -(ამის დამახსოვრება არ გჭირდებათ) -სახელი და პაროლი ერთმანეთს არ უნდა ემთხვეოდეს. -თუ ფაილი არ არსებობს, შექმენით იგი უფლებებით owner-readable-only. -ასევე რეკომენდებულია დააყენოთ alertnotify რათა მიიღოთ შეტყობინებები პრობლემების შესახებ; -მაგალითად: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo.com -</translation> - </message> - <message> <source>Bind to given address and always listen on it. Use [host]:port notation for IPv6</source> <translation>მოცემულ მისამართზე მიჯაჭვა მუდმივად მასზე მიყურადებით. გამოიყენეთ [host]:port ფორმა IPv6-სათვის</translation> </message> @@ -2363,14 +2223,6 @@ rpcpassword=%s <translation>გადასვლა რეგრესული ტესტირების რეჟიმში, რომელიც იყენებს სპეციალურ ჯაჭვს ბლოკების დაუყოვნებლივი პოვნის შესაძლებლობით.</translation> </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>შეცდომა: ტრანსაქცია უარყოფილია! შესაძლოა მონეტების ნაწილი თქვენი საფულიდან უკვე გამოყენებულია, რაც შეიძლება მოხდეს wallet.dat-ის ასლის გამოყენებისას, როცა მონეტები გაიგზავნა სხვა ასლიდან, აქ კი არ არის გაგზავნილად მონიშნული.</translation> - </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>შეცდომა: ტრანსაქცია მოითხოვს საკომისიოს მინიმუმ %s რაოდენობის, სირთულის ან ბოლოს მიღებული თანხების შესაბამისად!</translation> - </message> - <message> <source>Execute command when a wallet transaction changes (%s in cmd is replaced by TxID)</source> <translation>კომანდის შესრულება საფულის ტრანსაქციის ცვლილებისას (%s კომანდაში ჩანაცვლდება TxID-ით)</translation> </message> @@ -2419,10 +2271,6 @@ rpcpassword=%s <translation>შენიშნულია ბლოკთა ბაზის დაზიანება</translation> </message> <message> - <source>Discover own IP address (default: 1 when listening and no -externalip)</source> - <translation>საკუთარი IP-მისამართის განსაზღვრა (ნაგულისხმევი: 1 თუ ჩართულია მიყურადება და არ გამოიყენება -externalip)</translation> - </message> - <message> <source>Do not load the wallet and disable wallet RPC calls</source> <translation>არ ჩაიტვირთოს საფულე და აიკრძალოს საფულისადმი RPC-მიმართვები</translation> </message> @@ -2451,10 +2299,6 @@ rpcpassword=%s <translation>შეცდომა: დისზე არ არის ადგილი!</translation> </message> <message> - <source>Error: Wallet locked, unable to create transaction!</source> - <translation>შეცდომა: საფულე დაბლოკილია, ტრანსაქცია ვერ შეიქმნება!</translation> - </message> - <message> <source>Failed to listen on any port. Use -listen=0 if you want this.</source> <translation>ვერ ხერხდება პორტების მიყურადება. თუ გსურთ, გამოიყენეთ -listen=0.</translation> </message> @@ -2475,10 +2319,6 @@ rpcpassword=%s <translation>არ არის საკმარისი ფაილ-დესკრიპტორები.</translation> </message> <message> - <source>Rebuild block chain index from current blk000??.dat files</source> - <translation>ბლოკთა ჯაჭვის ინდექსის ხელახლა აგება blk000??.dat ფაილიდან</translation> - </message> - <message> <source>Set maximum block size in bytes (default: %d)</source> <translation>ბლოკის მაქსიმალური ზომის განსაზღვრა ბაიტებში (ნადულისხმევი: %d)</translation> </message> @@ -2523,6 +2363,10 @@ rpcpassword=%s <translation>მაღალპრიორიტეტული/დაბალსაკომისიოიანი ტრანსაქციების მაქსიმალური ზომა ბაიტებში (ნაგულისხმევი: %d)</translation> </message> <message> + <source>Choose data directory on startup (default: 0)</source> + <translation>მონაცემთა კატალოგის მითითება ყოველი გაშვებისას (ნაგულისხმევი: 0)</translation> + </message> + <message> <source>Information</source> <translation>ინფორმაცია</translation> </message> @@ -2539,6 +2383,14 @@ rpcpassword=%s <translation>ტრასირების/დახვეწის ინფოს გაგზავნა კონსოლზე debug.log ფაილის ნაცვლად</translation> </message> <message> + <source>Set language, for example "de_DE" (default: system locale)</source> + <translation>აირჩიეთ ენა, მაგალითად "de_DE" (ნაგულისხმევია სისტემური ლოკალი)</translation> + </message> + <message> + <source>Show splash screen on startup (default: 1)</source> + <translation>მისალმების ეკრანის ჩვენება გაშვებისას (ნაგულისხმევი:1)</translation> + </message> + <message> <source>Shrink debug.log file on client startup (default: 1 when no -debug)</source> <translation>debug.log ფაილის შეკუმშვა გაშვებისას (ნაგულისხმევია: 1 როცა არ აყენია -debug)</translation> </message> @@ -2547,6 +2399,10 @@ rpcpassword=%s <translation>ტრანსაქციების ხელმოწერა ვერ მოხერხდა</translation> </message> <message> + <source>Start minimized</source> + <translation>გაშვება მინიმიზებული ეკრანით</translation> + </message> + <message> <source>Transaction amount too small</source> <translation>ტრანსაქციების რაოდენობა ძალიან ცოტაა</translation> </message> @@ -2571,10 +2427,6 @@ rpcpassword=%s <translation>გაფრთხილება</translation> </message> <message> - <source>Warning: This version is obsolete, upgrade required!</source> - <translation>ყურადღება: ვერსია მოძველებულია, საჭიროა განახლება!</translation> - </message> - <message> <source>Zapping all transactions from wallet...</source> <translation>ტრანსაქციების ჩახსნა საფულიდან...</translation> </message> @@ -2643,10 +2495,6 @@ rpcpassword=%s <translation>დაუშვებელი მნიშვნელობა -paytxfee=<amount>: '%s'</translation> </message> <message> - <source>Invalid amount</source> - <translation>დაუშვებელი თანხა</translation> - </message> - <message> <source>Insufficient funds</source> <translation>არ არის საკმარისი თანხა</translation> </message> @@ -2679,10 +2527,6 @@ rpcpassword=%s <translation>ჩატვირთვა დასრულებულია</translation> </message> <message> - <source>To use the %s option</source> - <translation>%s ოპციის გამოსაყენებლად</translation> - </message> - <message> <source>Error</source> <translation>შეცდომა</translation> </message> diff --git a/src/qt/locale/bitcoin_kk_KZ.ts b/src/qt/locale/bitcoin_kk_KZ.ts index 5a39417a7a..4cc709fdb2 100644 --- a/src/qt/locale/bitcoin_kk_KZ.ts +++ b/src/qt/locale/bitcoin_kk_KZ.ts @@ -1,11 +1,7 @@ -<TS language="kk_KZ" version="2.0"> +<TS language="kk_KZ" version="2.1"> <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> @@ -377,8 +373,8 @@ <translation>Күні</translation> </message> <message> - <source>Address</source> - <translation>Адрес</translation> + <source>Label</source> + <translation>таңба</translation> </message> </context> <context> diff --git a/src/qt/locale/bitcoin_ko_KR.ts b/src/qt/locale/bitcoin_ko_KR.ts index efc41ec6b7..d9ce8ea1be 100644 --- a/src/qt/locale/bitcoin_ko_KR.ts +++ b/src/qt/locale/bitcoin_ko_KR.ts @@ -1,11 +1,7 @@ -<TS language="ko_KR" version="2.0"> +<TS language="ko_KR" version="2.1"> <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> @@ -152,10 +148,6 @@ <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> @@ -180,10 +172,6 @@ <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> @@ -303,10 +291,6 @@ <translation>비트코인 주소로 코인 전송</translation> </message> <message> - <source>Modify configuration options for Bitcoin</source> - <translation>비트코인 설정 옵션 수정</translation> - </message> - <message> <source>Backup wallet to another location</source> <translation>지갑을 다른장소에 백업</translation> </message> @@ -475,18 +459,6 @@ <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>지갑이 암호화 되었고 현재 차단해제 되었습니다</translation> </message> @@ -665,10 +637,6 @@ Address: %4 <translation>아니요</translation> </message> <message> - <source>This label turns red, if the transaction size is greater than 1000 bytes.</source> - <translation>만약 거래 양이 1000bytes 보다 크면 제목이 빨간색으로 변합니다</translation> - </message> - <message> <source>This means a fee of at least %1 per kB is required.</source> <translation>이 의미는 수수료가 최소한 %1 per 키로바이트 필요합니다</translation> </message> @@ -677,10 +645,6 @@ Address: %4 <translation>우선 순위가 높은 거래의 경우 블럭에 포함될 가능성이 더 많습니다.</translation> </message> <message> - <source>This label turns red, if the priority is smaller than "medium".</source> - <translation>우선권이 중간보다 작으면 제목이 빨간색으로 변합니다. </translation> - </message> - <message> <source>(no label)</source> <translation>(표 없음)</translation> </message> @@ -793,30 +757,6 @@ Address: %4 <source>command-line options</source> <translation>명령줄 옵션</translation> </message> - <message> - <source>UI options</source> - <translation>UI 옵션</translation> - </message> - <message> - <source>Set language, for example "de_DE" (default: system locale)</source> - <translation>"de_DE"와 같이 언어를 설정하십시오 (기본값: 시스템 로캘)</translation> - </message> - <message> - <source>Start minimized</source> - <translation>최소화 상태에서 시작</translation> - </message> - <message> - <source>Set SSL root certificates for payment request (default: -system-)</source> - <translation>지불 요청을 위해 SSL 최상위 인증을 설정합니다. (기본값: -system-)</translation> - </message> - <message> - <source>Show splash screen on startup (default: 1)</source> - <translation>시작시 시작 화면 표시 (기본값: 1)</translation> - </message> - <message> - <source>Choose data directory on startup (default: 0)</source> - <translation>파일목록을 선택하여 시작하시오(기본값: 0)</translation> - </message> </context> <context> <name>Intro</name> @@ -887,14 +827,6 @@ Address: %4 <translation>메인(&M)</translation> </message> <message> - <source>Automatically start Bitcoin after logging in to the system.</source> - <translation>시스템 로그인후에 비트코인을 자동으로 시작합니다.</translation> - </message> - <message> - <source>&Start Bitcoin on system login</source> - <translation>시스템 로그인시 비트코인 시작(&S)</translation> - </message> - <message> <source>Size of &database cache</source> <translation>데이터베이스 캐시 크기</translation> </message> @@ -987,10 +919,6 @@ Address: %4 <translation>작업 표시줄 대신 트레이로 최소화(&M)</translation> </message> <message> - <source>Minimize instead of exit the application when the window is closed. When this option is enabled, the application will be closed only after selecting Quit in the menu.</source> - <translation>창을 닫으면 프로그램에서 나가지 않고 최소화합니다. 이 옵션을 활성화하면, 프로그램은 메뉴에서 나가기를 선택한 후에만 닫힙니다.</translation> - </message> - <message> <source>M&inimize on close</source> <translation>닫을때 최소화(&I)</translation> </message> @@ -1003,10 +931,6 @@ Address: %4 <translation>사용자 인터페이스 언어(&L):</translation> </message> <message> - <source>The user interface language can be set here. This setting will take effect after restarting Bitcoin.</source> - <translation>사용자 인터페이스 언어를 여기서 설정할 수 있습니다. 이 설정은 비트코인을 다시 시작할때 적용됩니다.</translation> - </message> - <message> <source>&Unit to show amounts in:</source> <translation>거래액을 표시할 단위(&U):</translation> </message> @@ -1043,10 +967,6 @@ Address: %4 <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>이 변경 사항 적용을 위해 프로그램 재시작이 필요합니다. </translation> </message> @@ -1293,18 +1213,10 @@ Address: %4 <translation>로그 파일 디버그</translation> </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>비트코인 디버그 로그파일을 현재 데이터 폴더에서 여십시요. 용량이 큰 로그 파일들은 몇 초가 걸릴 수 있습니다.</translation> - </message> - <message> <source>Clear console</source> <translation>콘솔 초기화</translation> </message> <message> - <source>Welcome to the Bitcoin RPC console.</source> - <translation>비트코인 RPC 콘솔에 오신걸 환영합니다</translation> - </message> - <message> <source>Use up and down arrows to navigate history, and <b>Ctrl-L</b> to clear screen.</source> <translation>기록을 찾아보려면 위 아래 화살표 키를, 화면을 지우려면 <b>Ctrl-L</b>키를 사용하십시오.</translation> </message> @@ -1601,10 +1513,6 @@ Address: %4 <translation>또는</translation> </message> <message> - <source>The recipient address is not valid, please recheck.</source> - <translation>수령인 주소가 정확하지 않습니다. 재확인 바랍니다</translation> - </message> - <message> <source>The amount to pay must be larger than 0.</source> <translation>지불하는 금액은 0 보다 커야 합니다.</translation> </message> @@ -1617,10 +1525,6 @@ Address: %4 <translation>%1 의 거래수수료를 포함하면 잔고를 초과합니다.</translation> </message> <message> - <source>Duplicate address found, can only send to each address once per send operation.</source> - <translation>두개 이상의 주소입니다. 한번에 하나의 주소에만 작업할 수 있습니다.</translation> - </message> - <message> <source>Transaction creation failed!</source> <translation>거래를 생성하는 것을 실패하였습니다</translation> </message> @@ -1696,10 +1600,6 @@ Address: %4 <translation>메시지:</translation> </message> <message> - <source>This is a verified payment request.</source> - <translation>지급 확인요청입니다.</translation> - </message> - <message> <source>Enter a label for this address to add it to the list of used addresses</source> <translation>사용된 주소 목록에 새 주소를 추가하기 위해 제목을 입력합니다. </translation> </message> @@ -1708,10 +1608,6 @@ Address: %4 <translation>비트코인에 첨부된 메시지: 참고용으로 거래와 함께 저장될 URI. 메모: 이 메시지는 비트코인 네트워크로 전송되지 않습니다.</translation> </message> <message> - <source>This is an unverified payment request.</source> - <translation>지급요청 미확인입니다</translation> - </message> - <message> <source>Pay To:</source> <translation>송금할 대상 : </translation> </message> @@ -1742,10 +1638,6 @@ Address: %4 <translation>메시지 서명(&S)</translation> </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>여러분 자신을 증명하기 위해 주소를 첨가하고 섬여할 수 있습니다. 피싱 공격으로 말미암아 여러분의 서명을 통해 속아 넘어가게 할 수 있으므로, 서명하지 않은 어떤 모호한 요소든 주의하십시오. 동의하는 완전 무결한 조항에만 서명하십시오.</translation> - </message> - <message> <source>Choose previously used address</source> <translation>이전에 사용한 주소를 선택하십시오</translation> </message> @@ -1794,10 +1686,6 @@ Address: %4 <translation>메시지 검증(&V)</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>메시지를 검증하기 위해 아래 칸에 각각 지갑 주소와 메시지, 전자서명을 입력하세요. (메시지 원본의 띄어쓰기, 들여쓰기, 행 나눔 등이 정확하게 입력되어야 하므로 원본을 복사해서 입력하세요) 이 기능은 메시지 검증이 주 목적이며, 네트워크 침입자에 의해 변조되지 않도록 전자서명 해독에 불필요한 시간을 소모하지 마세요. </translation> - </message> - <message> <source>Verify the message to ensure it was signed with the specified Bitcoin address</source> <translation>정확한 비트코인주소가 입력됬는지 메시지를 확인하시오</translation> </message> @@ -2033,10 +1921,6 @@ Address: %4 <translation>종류</translation> </message> <message> - <source>Address</source> - <translation>주소</translation> - </message> - <message> <source>Immature (%1 confirmations, will be available after %2)</source> <translation>충분히 숙성되지 않은 상태 (%1 승인, %2 후에 사용 가능합니다)</translation> </message> @@ -2061,6 +1945,10 @@ Address: %4 <translation>오프라인</translation> </message> <message> + <source>Label</source> + <translation>표</translation> + </message> + <message> <source>Unconfirmed</source> <translation>미확인</translation> </message> @@ -2109,10 +1997,6 @@ Address: %4 <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> @@ -2347,16 +2231,6 @@ Address: %4 <translation>선택된 주소로 고정하며 항상 리슨(Listen)합니다. IPv6 프로토콜인 경우 [host]:port 방식의 명령어 표기법을 사용합니다.</translation> </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>에러: 거래가 거부되었습니다! 이런 일이 생길 수 있습니다 만약 몇개의 코인들을 지갑에서 이미 사용했다면요, 예를 들어 만약 당신이 wallet.dat를 복사해서 사용했거나 코인들을 사용 후에 복사했다면 여기선 표시가 안되서 사용할 수 없습니다 - --번역은 했으나 약간 이상한점이 있어서 수정해야함-</translation> - </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>오류 : 해당 거래는 송금액, 다중 거래, 최근 수령한 금액의 사용 등의 이유로 최소 %s 이상의 송금 수수료가 필요합니다.</translation> - </message> - <message> <source>Execute command when a wallet transaction changes (%s in cmd is replaced by TxID)</source> <translation>지갑 거래가 바뀌면 명령을 실행합니다.(%s 안의 명령어가 TxID로 바뀝니다)</translation> </message> @@ -2413,10 +2287,6 @@ Address: %4 <translation>디버그 및 테스트 설정</translation> </message> <message> - <source>Discover own IP address (default: 1 when listening and no -externalip)</source> - <translation>자신의 아이피 주소를 발견합니다 (기본값: 1 반응이 없거나 외부 아이피가 없을 때)</translation> - </message> - <message> <source>Do not load the wallet and disable wallet RPC calls</source> <translation>지갑 불러오기를 하지마시오 또한 지갑 RPC 연결을 차단하십시오</translation> </message> @@ -2441,10 +2311,6 @@ Address: %4 <translation>오류: 디스크 공간이 부족합니다!</translation> </message> <message> - <source>Error: Wallet locked, unable to create transaction!</source> - <translation>오류: 지갑이 잠금상태여서 거래를 생성할 수 없습니다!</translation> - </message> - <message> <source>Failed to listen on any port. Use -listen=0 if you want this.</source> <translation>어떤 포트도 반응하지 않습니다. 사용자 반응=0 만약 원한다면</translation> </message> @@ -2469,10 +2335,6 @@ Address: %4 <translation>사용 가능한 파일 디스크립터-File Descriptor-가 부족합니다. </translation> </message> <message> - <source>Rebuild block chain index from current blk000??.dat files</source> - <translation>현재의 blk000??.dat 파일들로부터 블록체인 색인을 재구성합니다.</translation> - </message> - <message> <source>Set database cache size in megabytes (%d to %d, default: %d)</source> <translation>데이터베이스 케시 크기를 메가바이트로 설정(%d 부터 %d, 기본값: %d)</translation> </message> @@ -2521,6 +2383,10 @@ Address: %4 <translation>최대 크기를 최우선으로 설정 / 바이트당 최소 수수료로 거래(기본값: %d)</translation> </message> <message> + <source>Choose data directory on startup (default: 0)</source> + <translation>파일목록을 선택하여 시작하시오(기본값: 0)</translation> + </message> + <message> <source>Information</source> <translation>정보</translation> </message> @@ -2533,10 +2399,6 @@ Address: %4 <translation>최저 거래 수수료가 부족합니다. -mintxfee=<amount>: '%s'</translation> </message> <message> - <source>Print block on startup, if found in block index</source> - <translation>블럭 색인을 발견하면 구동 시 블럭을 출력합니다.</translation> - </message> - <message> <source>RPC SSL options: (see the Bitcoin Wiki for SSL setup instructions)</source> <translation>RPC SSL 옵션: (비트코인 위키의 SSL 설정 설명서 참고)</translation> </message> @@ -2553,10 +2415,22 @@ Address: %4 <translation>추적오류 정보를 degug.log 자료로 보내는 대신 콘솔로 보내기</translation> </message> <message> + <source>Set SSL root certificates for payment request (default: -system-)</source> + <translation>지불 요청을 위해 SSL 최상위 인증을 설정합니다. (기본값: -system-)</translation> + </message> + <message> + <source>Set language, for example "de_DE" (default: system locale)</source> + <translation>"de_DE"와 같이 언어를 설정하십시오 (기본값: 시스템 로캘)</translation> + </message> + <message> <source>Show all debugging options (usage: --help -help-debug)</source> <translation>모든 디버그 설정 보기(설정: --help -help-debug)</translation> </message> <message> + <source>Show splash screen on startup (default: 1)</source> + <translation>시작시 시작 화면 표시 (기본값: 1)</translation> + </message> + <message> <source>Shrink debug.log file on client startup (default: 1 when no -debug)</source> <translation>클라이언트 시작시 debug.log 파일 비우기(기본값: 디버그 안할때 1)</translation> </message> @@ -2565,6 +2439,10 @@ Address: %4 <translation>거래를 서명하는것을 실패하였습니다.</translation> </message> <message> + <source>Start minimized</source> + <translation>최소화 상태에서 시작</translation> + </message> + <message> <source>Transaction amount too small</source> <translation>거래량이 너무 적습니다</translation> </message> @@ -2589,10 +2467,6 @@ Address: %4 <translation>경고</translation> </message> <message> - <source>Warning: This version is obsolete, upgrade required!</source> - <translation>경고: 이 버전이 오래되어 업그레이드가 필요합니다!</translation> - </message> - <message> <source>Zapping all transactions from wallet...</source> <translation>지갑의 모든거래내역 건너뛰기...</translation> </message> @@ -2665,10 +2539,6 @@ Address: %4 <translation>-paytxfee=<amount>에 대한 양이 잘못되었습니다: '%s'</translation> </message> <message> - <source>Invalid amount</source> - <translation>효력없는 금액</translation> - </message> - <message> <source>Insufficient funds</source> <translation>자금 부족</translation> </message> @@ -2701,10 +2571,6 @@ Address: %4 <translation>로딩 완료</translation> </message> <message> - <source>To use the %s option</source> - <translation>%s 옵션을 사용하려면</translation> - </message> - <message> <source>Error</source> <translation>오류</translation> </message> diff --git a/src/qt/locale/bitcoin_ky.ts b/src/qt/locale/bitcoin_ky.ts index ed7542261c..7d4511b57d 100644 --- a/src/qt/locale/bitcoin_ky.ts +++ b/src/qt/locale/bitcoin_ky.ts @@ -1,4 +1,4 @@ -<TS language="ky" version="2.0"> +<TS language="ky" version="2.1"> <context> <name>AddressBookPage</name> <message> @@ -292,10 +292,6 @@ <source>Date</source> <translation>Дата</translation> </message> - <message> - <source>Address</source> - <translation>Дарек</translation> - </message> </context> <context> <name>TransactionView</name> diff --git a/src/qt/locale/bitcoin_la.ts b/src/qt/locale/bitcoin_la.ts index c399f36159..8f03a20cf6 100644 --- a/src/qt/locale/bitcoin_la.ts +++ b/src/qt/locale/bitcoin_la.ts @@ -1,11 +1,7 @@ -<TS language="la" version="2.0"> +<TS language="la" version="2.1"> <context> <name>AddressBookPage</name> <message> - <source>Double-click to edit address or label</source> - <translation>Dupliciter-clicca ut inscriptionem vel titulum mutes</translation> - </message> - <message> <source>Create a new address</source> <translation>Crea novam inscriptionem</translation> </message> @@ -108,10 +104,6 @@ <translation>Muta tesseram</translation> </message> <message> - <source>Enter the old and new passphrase to the wallet.</source> - <translation>Insero veterem novamque tesseram cassidili.</translation> - </message> - <message> <source>Confirm wallet encryption</source> <translation>Confirma cifrationem cassidilis</translation> </message> @@ -136,10 +128,6 @@ <translation>Cassidile cifratum</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>Bitcoin iam desinet ut finiat actionem cifrandi. Memento cassidile cifrare non posse cuncte curare ne tui nummi clepantur ab malis programatibus in tuo computatro.</translation> - </message> - <message> <source>Wallet encryption failed</source> <translation>Cassidile cifrare abortum est</translation> </message> @@ -239,10 +227,6 @@ <translation>Mitte nummos ad inscriptionem Bitcoin</translation> </message> <message> - <source>Modify configuration options for Bitcoin</source> - <translation>Muta configurationis optiones pro Bitcoin</translation> - </message> - <message> <source>Backup wallet to another location</source> <translation>Conserva cassidile in locum alium</translation> </message> @@ -318,26 +302,10 @@ <source>Bitcoin Core</source> <translation>Bitcoin Nucleus</translation> </message> - <message numerus="yes"> - <source>%n active connection(s) to Bitcoin network</source> - <translation><numerusform>%n activa conexio ad rete Bitcoin</numerusform><numerusform>%n activae conexiones ad rete Bitcoin</numerusform></translation> - </message> <message> <source>No block source available...</source> <translation>Nulla fons frustorum absens...</translation> </message> - <message numerus="yes"> - <source>%n hour(s)</source> - <translation><numerusform>%n hora</numerusform><numerusform>%n horae</numerusform></translation> - </message> - <message numerus="yes"> - <source>%n day(s)</source> - <translation><numerusform>%n dies</numerusform><numerusform>%n dies</numerusform></translation> - </message> - <message numerus="yes"> - <source>%n week(s)</source> - <translation><numerusform>%n hebdomas</numerusform><numerusform>%n hebdomades</numerusform></translation> - </message> <message> <source>%1 behind</source> <translation>%1 post</translation> @@ -379,18 +347,6 @@ <translation>Transactio incipiens</translation> </message> <message> - <source>Date: %1 -Amount: %2 -Type: %3 -Address: %4 -</source> - <translation>Dies: %1 -Quantitas: %2 -Typus: %3 -Inscriptio: %4 -</translation> - </message> - <message> <source>Wallet is <b>encrypted</b> and currently <b>unlocked</b></source> <translation>Cassidile <b>cifratum</b> est et iam nunc <b>reseratum</b></translation> </message> @@ -517,23 +473,7 @@ Inscriptio: %4 <source>command-line options</source> <translation>Optiones mandati intiantis</translation> </message> - <message> - <source>UI options</source> - <translation>UI optiones</translation> - </message> - <message> - <source>Set language, for example "de_DE" (default: system locale)</source> - <translation>Constitue linguam, exempli gratia "de_DE" (praedefinitum: lingua systematis)</translation> - </message> - <message> - <source>Start minimized</source> - <translation>Incipe minifactum ut icon</translation> - </message> - <message> - <source>Show splash screen on startup (default: 1)</source> - <translation>Monstra principem imaginem ad initium (praedefinitum: 1)</translation> - </message> - </context> +</context> <context> <name>Intro</name> <message> @@ -559,14 +499,6 @@ Inscriptio: %4 <translation>&Princeps</translation> </message> <message> - <source>Automatically start Bitcoin after logging in to the system.</source> - <translation>Pelle Bitcoin per se postquam in systema inire.</translation> - </message> - <message> - <source>&Start Bitcoin on system login</source> - <translation>&Pelle Bitcoin cum inire systema</translation> - </message> - <message> <source>Reset all client options to default.</source> <translation>Reconstitue omnes optiones clientis ad praedefinita.</translation> </message> @@ -611,10 +543,6 @@ Inscriptio: %4 <translation>&Minifac in tabellam systematis potius quam applicationum</translation> </message> <message> - <source>Minimize instead of exit the application when the window is closed. When this option is enabled, the application will be closed only after selecting Quit in the menu.</source> - <translation>Minifac potius quam exire applicatione quando fenestra clausa sit. Si haec optio activa est, applicatio clausa erit tantum postquam selegeris Exi in menu.</translation> - </message> - <message> <source>M&inimize on close</source> <translation>M&inifac ad claudendum</translation> </message> @@ -627,10 +555,6 @@ Inscriptio: %4 <translation>&Lingua monstranda utenti:</translation> </message> <message> - <source>The user interface language can be set here. This setting will take effect after restarting Bitcoin.</source> - <translation>Lingua monstranda utenti hic constitui potest. Haec configuratio effectiva erit postquam Bitcoin iterum initiatum erit.</translation> - </message> - <message> <source>&Unit to show amounts in:</source> <translation>&Unita qua quantitates monstrare:</translation> </message> @@ -777,18 +701,10 @@ Inscriptio: %4 <translation>Debug catalogi plica</translation> </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>Aperi plicam catalogi de Bitcoin debug ex activo indice datorum. Hoc possit pauca secunda pro plicis magnis catalogi.</translation> - </message> - <message> <source>Clear console</source> <translation>Vacuefac terminale</translation> </message> <message> - <source>Welcome to the Bitcoin RPC console.</source> - <translation>Bene ventio in terminale RPC de Bitcoin.</translation> - </message> - <message> <source>Use up and down arrows to navigate history, and <b>Ctrl-L</b> to clear screen.</source> <translation>Utere sagittis sursum deorsumque ut per historiam naviges, et <b>Ctrl+L</b> ut scrinium vacuefacias.</translation> </message> @@ -905,10 +821,6 @@ Inscriptio: %4 <translation>Copia quantitatem</translation> </message> <message> - <source>The recipient address is not valid, please recheck.</source> - <translation>Inscriptio accipientis non est valida, sodes reproba.</translation> - </message> - <message> <source>The amount to pay must be larger than 0.</source> <translation>Oportet quantitatem ad pensandum maiorem quam 0 esse.</translation> </message> @@ -921,10 +833,6 @@ Inscriptio: %4 <translation>Quantitas est ultra quod habes cum merces transactionis %1 includitur.</translation> </message> <message> - <source>Duplicate address found, can only send to each address once per send operation.</source> - <translation>Geminata inscriptio inventa, tantum posse mittere ad quamque inscriptionem semel singulare operatione.</translation> - </message> - <message> <source>(no label)</source> <translation>(nullus titulus)</translation> </message> @@ -953,7 +861,7 @@ Inscriptio: %4 </message> <message> <source>Paste address from clipboard</source> - <translation>Conglutina inscriptionem ex latibulo</translation> + <translation>Glutina inscriptionem ex latibulo</translation> </message> <message> <source>Alt+P</source> @@ -978,10 +886,6 @@ Inscriptio: %4 <translation>&Signa Nuntium</translation> </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>Potes nuntios signare inscriptionibus tuis ut demonstres te eas possidere. Cautus es non amibiguum signare, quia impetus phiscatorum conentur te fallere ut signes identitatem tuam ad eos. Solas signa sententias cuncte descriptas quibus convenis.</translation> - </message> - <message> <source>Alt+A</source> <translation>Alt+A</translation> </message> @@ -1026,10 +930,6 @@ Inscriptio: %4 <translation>&Verifica Nuntium</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>Insere inscriptionem signantem, nuntium (cura ut copias intermissiones linearum, spatia, tabs, et cetera exacte) et signationem infra ut nuntium verifices. Cautus esto ne magis legas in signationem quam in nuntio signato ipso est, ut vites falli ab impetu homo-in-medio.</translation> - </message> - <message> <source>Verify the message to ensure it was signed with the specified Bitcoin address</source> <translation>Verifica nuntium ut cures signatum esse cum specifica inscriptione Bitcoin</translation> </message> @@ -1130,10 +1030,6 @@ Inscriptio: %4 <source>Status</source> <translation>Status</translation> </message> - <message numerus="yes"> - <source>, broadcast through %n node(s)</source> - <translation><numerusform>, disseminatum per %n nodo</numerusform><numerusform>, disseminata per %n nodis</numerusform></translation> - </message> <message> <source>Date</source> <translation>Dies</translation> @@ -1166,10 +1062,6 @@ Inscriptio: %4 <source>Credit</source> <translation>Creditum</translation> </message> - <message numerus="yes"> - <source>matures in %n more block(s)</source> - <translation><numerusform>maturum erit in %n plure frusto</numerusform><numerusform>maturum erit in %n pluribus frustis</numerusform></translation> - </message> <message> <source>not accepted</source> <translation>non acceptum</translation> @@ -1253,14 +1145,6 @@ Inscriptio: %4 <translation>Typus</translation> </message> <message> - <source>Address</source> - <translation>Inscriptio</translation> - </message> - <message numerus="yes"> - <source>Open for %n more block(s)</source> - <translation><numerusform>Aperi pro %n plure frusto</numerusform><numerusform>Aperi pro %n pluribus frustis</numerusform></translation> - </message> - <message> <source>Open until %1</source> <translation>Apertum donec %1</translation> </message> @@ -1277,6 +1161,10 @@ Inscriptio: %4 <translation>Generatum sed non acceptum</translation> </message> <message> + <source>Label</source> + <translation>Titulus</translation> + </message> + <message> <source>Received with</source> <translation>Acceptum cum</translation> </message> @@ -1313,10 +1201,6 @@ Inscriptio: %4 <translation>Typus transactionis.</translation> </message> <message> - <source>Destination address of transaction.</source> - <translation>Inscriptio destinationis transactionis.</translation> - </message> - <message> <source>Amount removed from or added to balance.</source> <translation>Quantitas remota ex pendendo aut addita ei.</translation> </message> @@ -1515,42 +1399,10 @@ Inscriptio: %4 <translation>Accipe conexiones externas (praedefinitum: 1 nisi -proxy neque -connect)</translation> </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>%s, necesse est te rpcpassword constituere in plica configurationis: -%s -Hortatur te hanc fortuitam tesseram uti: -rpcuser=bitcoinrpc -rpcpassword=%s -(non est necesse te hanc tesseram meminisse) -Nomen usoris et tessera eadem esse NON POSSUNT. -Si plica non existit, eam crea cum permissionibus ut eius dominus tantum sinitur id legere. -Quoque hortatur alertnotify constituere ut tu notificetur de problematibus; -exempli gratia: alertnotify=echo %%s | mail -s "Bitcoin Notificatio" admin@foo.com -</translation> - </message> - <message> <source>Bind to given address and always listen on it. Use [host]:port notation for IPv6</source> <translation>Conglutina ad inscriptionem datam et semper in eam ausculta. Utere [moderatrum]:porta notationem pro IPv6</translation> </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>Error: Transactio eiecta est! Hoc possit accidere si alii nummorum in cassidili tuo iam soluti sint, ut si usus es exemplar de wallet.dat et nummi soluti sunt in exemplari sed non hic notati ut soluti.</translation> - </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>Error: Huic transactioni necesse est merces saltem %s propter eius magnitudinem, complexitatem, vel usum recentum acceptorum nummorum!</translation> - </message> - <message> <source>Execute command when a wallet transaction changes (%s in cmd is replaced by TxID)</source> <translation>Facere mandatum quotiescumque cassidilis transactio mutet (%s in mandato sbstituitur ab TxID)</translation> </message> @@ -1587,10 +1439,6 @@ exempli gratia: alertnotify=echo %%s | mail -s "Bitcoin Notificatio" admin@foo.c <translation>Corruptum databasum frustorum invenitur</translation> </message> <message> - <source>Discover own IP address (default: 1 when listening and no -externalip)</source> - <translation>Discooperi propriam inscriptionem IP (praedefinitum: 1 quando auscultans et nullum -externalip)</translation> - </message> - <message> <source>Do you want to rebuild the block database now?</source> <translation>Visne reficere databasum frustorum iam?</translation> </message> @@ -1615,10 +1463,6 @@ exempli gratia: alertnotify=echo %%s | mail -s "Bitcoin Notificatio" admin@foo.c <translation>Error: Inopia spatii disci!</translation> </message> <message> - <source>Error: Wallet locked, unable to create transaction!</source> - <translation>Error: Cassidile seratum, non posse transactionem creare!</translation> - </message> - <message> <source>Failed to listen on any port. Use -listen=0 if you want this.</source> <translation>Non potuisse auscultare in ulla porta. Utere -listen=0 si hoc vis.</translation> </message> @@ -1627,10 +1471,6 @@ exempli gratia: alertnotify=echo %%s | mail -s "Bitcoin Notificatio" admin@foo.c <translation>Inopia descriptorum plicarum.</translation> </message> <message> - <source>Rebuild block chain index from current blk000??.dat files</source> - <translation>Restituere indicem catenae frustorum ex activis plicis blk000??.dat</translation> - </message> - <message> <source>Verifying blocks...</source> <translation>Verificante frusta...</translation> </message> @@ -1659,6 +1499,14 @@ exempli gratia: alertnotify=echo %%s | mail -s "Bitcoin Notificatio" admin@foo.c <translation>Mitte informationem vestigii/debug ad terminale potius quam plicam debug.log</translation> </message> <message> + <source>Set language, for example "de_DE" (default: system locale)</source> + <translation>Constitue linguam, exempli gratia "de_DE" (praedefinitum: lingua systematis)</translation> + </message> + <message> + <source>Show splash screen on startup (default: 1)</source> + <translation>Monstra principem imaginem ad initium (praedefinitum: 1)</translation> + </message> + <message> <source>Shrink debug.log file on client startup (default: 1 when no -debug)</source> <translation>Diminue plicam debug.log ad initium clientis (praedefinitum: 1 nisi -debug)</translation> </message> @@ -1667,6 +1515,10 @@ exempli gratia: alertnotify=echo %%s | mail -s "Bitcoin Notificatio" admin@foo.c <translation>Signandum transactionis abortum est</translation> </message> <message> + <source>Start minimized</source> + <translation>Incipe minifactum ut icon</translation> + </message> + <message> <source>Transaction amount too small</source> <translation>Magnitudo transactionis nimis parva</translation> </message> @@ -1691,10 +1543,6 @@ exempli gratia: alertnotify=echo %%s | mail -s "Bitcoin Notificatio" admin@foo.c <translation>Monitio</translation> </message> <message> - <source>Warning: This version is obsolete, upgrade required!</source> - <translation>Monitio: Haec versio obsoleta est, progressio postulata!</translation> - </message> - <message> <source>wallet.dat corrupt, salvage failed</source> <translation>wallet.dat corrupta, salvare abortum est</translation> </message> @@ -1759,10 +1607,6 @@ exempli gratia: alertnotify=echo %%s | mail -s "Bitcoin Notificatio" admin@foo.c <translation>Quantitas non valida pro -paytxfee=<quantitas>: '%s'</translation> </message> <message> - <source>Invalid amount</source> - <translation>Quantitas non valida</translation> - </message> - <message> <source>Insufficient funds</source> <translation>Inopia nummorum</translation> </message> @@ -1795,10 +1639,6 @@ exempli gratia: alertnotify=echo %%s | mail -s "Bitcoin Notificatio" admin@foo.c <translation>Completo lengendi</translation> </message> <message> - <source>To use the %s option</source> - <translation>Ut utaris optione %s</translation> - </message> - <message> <source>Error</source> <translation>Error</translation> </message> diff --git a/src/qt/locale/bitcoin_lt.ts b/src/qt/locale/bitcoin_lt.ts index 1f70400df6..b96afbbcc9 100644 --- a/src/qt/locale/bitcoin_lt.ts +++ b/src/qt/locale/bitcoin_lt.ts @@ -1,11 +1,7 @@ -<TS language="lt" version="2.0"> +<TS language="lt" version="2.1"> <context> <name>AddressBookPage</name> <message> - <source>Double-click to edit address or label</source> - <translation>Spragtelėkite, kad pakeistumėte adresą arba žymę</translation> - </message> - <message> <source>Create a new address</source> <translation>Sukurti naują adresą</translation> </message> @@ -63,7 +59,7 @@ </message> <message> <source>Comma separated file (*.csv)</source> - <translation>Kableliais išskirtas failas (*.csv)</translation> + <translation>Kableliais atskirtų duomenų failas (*.csv)</translation> </message> <message> <source>Exporting Failed</source> @@ -132,10 +128,6 @@ <translation>Pakeisti slaptafrazę</translation> </message> <message> - <source>Enter the old and new passphrase to the wallet.</source> - <translation>Įveskite seną ir naują piniginės slaptafrazes.</translation> - </message> - <message> <source>Confirm wallet encryption</source> <translation>Patvirtinkite piniginės užšifravimą</translation> </message> @@ -156,10 +148,6 @@ <translation>Piniginė užšifruota</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>Bitcoin dabar užsidarys šifravimo proceso pabaigai. Atminkite, kad piniginės šifravimas negali pilnai apsaugoti bitcoinų vagysčių kai tinkle esančios kenkėjiškos programos patenka į jūsų kompiuterį.</translation> - </message> - <message> <source>Wallet encryption failed</source> <translation>Nepavyko užšifruoti piniginę</translation> </message> @@ -275,10 +263,6 @@ <translation>Siųsti monetas Bitcoin adresui</translation> </message> <message> - <source>Modify configuration options for Bitcoin</source> - <translation>Keisti bitcoin konfigūracijos galimybes</translation> - </message> - <message> <source>Backup wallet to another location</source> <translation>Daryti piniginės atsarginę kopiją</translation> </message> @@ -354,26 +338,6 @@ <source>&About Bitcoin Core</source> <translation>&Apie Bitcoin Core</translation> </message> - <message numerus="yes"> - <source>%n active connection(s) to Bitcoin network</source> - <translation><numerusform>%n Bitcoin tinklo aktyvus ryšys</numerusform><numerusform>%n Bitcoin tinklo aktyvūs ryšiai</numerusform><numerusform>%n Bitcoin tinklo aktyvūs ryšiai</numerusform></translation> - </message> - <message numerus="yes"> - <source>%n hour(s)</source> - <translation><numerusform>%n valanda</numerusform><numerusform>%n valandos</numerusform><numerusform>%n valandų</numerusform></translation> - </message> - <message numerus="yes"> - <source>%n day(s)</source> - <translation><numerusform>%n diena</numerusform><numerusform>%n dienos</numerusform><numerusform>%n dienų</numerusform></translation> - </message> - <message numerus="yes"> - <source>%n week(s)</source> - <translation><numerusform>%n savaitė</numerusform><numerusform>%n savaitės</numerusform><numerusform>%n savaičių</numerusform></translation> - </message> - <message numerus="yes"> - <source>%n year(s)</source> - <translation><numerusform>%n metas</numerusform><numerusform>%n metai</numerusform><numerusform>%n metų</numerusform></translation> - </message> <message> <source>Error</source> <translation>Klaida</translation> @@ -403,17 +367,6 @@ <translation>Ateinantis sandoris</translation> </message> <message> - <source>Date: %1 -Amount: %2 -Type: %3 -Address: %4 -</source> - <translation>Data: %1 -Suma: %2 -Tipas: %3 -Adresas: %4</translation> - </message> - <message> <source>Wallet is <b>encrypted</b> and currently <b>unlocked</b></source> <translation>Piniginė <b>užšifruota</b> ir šiuo metu <b>atrakinta</b></translation> </message> @@ -656,19 +609,7 @@ Adresas: %4</translation> <source>command-line options</source> <translation>komandinės eilutės parametrai</translation> </message> - <message> - <source>UI options</source> - <translation>Naudotoji sąsajos parametrai</translation> - </message> - <message> - <source>Set language, for example "de_DE" (default: system locale)</source> - <translation>Nustatyti kalbą, pavyzdžiui "lt_LT" (numatyta: sistemos kalba)</translation> - </message> - <message> - <source>Start minimized</source> - <translation>Paleisti sumažintą</translation> - </message> - </context> +</context> <context> <name>Intro</name> <message> @@ -702,14 +643,6 @@ Adresas: %4</translation> <translation>&Pagrindinės</translation> </message> <message> - <source>Automatically start Bitcoin after logging in to the system.</source> - <translation>Automatiškai paleisti Bitkoin programą įjungus sistemą.</translation> - </message> - <message> - <source>&Start Bitcoin on system login</source> - <translation>&Paleisti Bitcoin programą su window sistemos paleidimu</translation> - </message> - <message> <source>&Network</source> <translation>&Tinklas</translation> </message> @@ -746,10 +679,6 @@ Adresas: %4</translation> <translation>&M sumažinti langą bet ne užduočių juostą</translation> </message> <message> - <source>Minimize instead of exit the application when the window is closed. When this option is enabled, the application will be closed only after selecting Quit in the menu.</source> - <translation>Uždarant langą neuždaryti programos. Kai ši parinktis įjungta, programa bus uždaryta tik pasirinkus meniu komandą Baigti.</translation> - </message> - <message> <source>M&inimize on close</source> <translation>&Sumažinti uždarant</translation> </message> @@ -762,10 +691,6 @@ Adresas: %4</translation> <translation>Naudotojo sąsajos &kalba:</translation> </message> <message> - <source>The user interface language can be set here. This setting will take effect after restarting Bitcoin.</source> - <translation>Čia gali būti nustatyta naudotojo sąsajos kalba. Šis nustatymas įsigalios iš naujo paleidus Bitcoin.</translation> - </message> - <message> <source>&Unit to show amounts in:</source> <translation>&Vienetai, kuriais rodyti sumas:</translation> </message> @@ -928,10 +853,6 @@ Adresas: %4</translation> <translation>Išvalyti konsolę</translation> </message> <message> - <source>Welcome to the Bitcoin RPC console.</source> - <translation>Sveiki atvykę į Bitcoin RPC konsolę.</translation> - </message> - <message> <source>%1 B</source> <translation>%1 B</translation> </message> @@ -1104,10 +1025,6 @@ Adresas: %4</translation> <translation>Kopijuoti pirmumą</translation> </message> <message> - <source>The recipient address is not valid, please recheck.</source> - <translation>Negaliojantis gavėjo adresas. Patikrinkite.</translation> - </message> - <message> <source>The amount to pay must be larger than 0.</source> <translation>Apmokėjimo suma turi būti didesnė nei 0.</translation> </message> @@ -1120,10 +1037,6 @@ Adresas: %4</translation> <translation>Jei pridedame sandorio mokestį %1 bendra suma viršija jūsų balansą.</translation> </message> <message> - <source>Duplicate address found, can only send to each address once per send operation.</source> - <translation>Rastas adreso dublikatas.</translation> - </message> - <message> <source>(no label)</source> <translation>(nėra žymės)</translation> </message> @@ -1404,10 +1317,6 @@ Adresas: %4</translation> <translation>Tipas</translation> </message> <message> - <source>Address</source> - <translation>Adresas</translation> - </message> - <message> <source>Open until %1</source> <translation>Atidaryta iki %1</translation> </message> @@ -1424,6 +1333,10 @@ Adresas: %4</translation> <translation>Išgauta bet nepriimta</translation> </message> <message> + <source>Label</source> + <translation>Žymė</translation> + </message> + <message> <source>Received with</source> <translation>Gauta su</translation> </message> @@ -1433,7 +1346,7 @@ Adresas: %4</translation> </message> <message> <source>Sent to</source> - <translation>Siųsta </translation> + <translation>Išsiųsta</translation> </message> <message> <source>Payment to yourself</source> @@ -1460,10 +1373,6 @@ Adresas: %4</translation> <translation>Sandorio tipas.</translation> </message> <message> - <source>Destination address of transaction.</source> - <translation>Sandorio paskirties adresas</translation> - </message> - <message> <source>Amount removed from or added to balance.</source> <translation>Suma pridėta ar išskaičiuota iš balanso</translation> </message> @@ -1678,6 +1587,14 @@ Adresas: %4</translation> <translation>Siųsti atsekimo/derinimo info į konsolę vietoj debug.log failo</translation> </message> <message> + <source>Set language, for example "de_DE" (default: system locale)</source> + <translation>Nustatyti kalbą, pavyzdžiui "lt_LT" (numatyta: sistemos kalba)</translation> + </message> + <message> + <source>Start minimized</source> + <translation>Paleisti sumažintą</translation> + </message> + <message> <source>Use UPnP to map the listening port (default: 1 when listening)</source> <translation>Bandymas naudoti UPnP struktūra klausymosi prievadui (default: 1 when listening)</translation> </message> @@ -1734,10 +1651,6 @@ Adresas: %4</translation> <translation>Neteisinga suma -paytxfee=<amount>: '%s'</translation> </message> <message> - <source>Invalid amount</source> - <translation>Neteisinga suma</translation> - </message> - <message> <source>Insufficient funds</source> <translation>Nepakanka lėšų</translation> </message> diff --git a/src/qt/locale/bitcoin_lv_LV.ts b/src/qt/locale/bitcoin_lv_LV.ts index ac5a1a1396..a46ab83c6b 100644 --- a/src/qt/locale/bitcoin_lv_LV.ts +++ b/src/qt/locale/bitcoin_lv_LV.ts @@ -1,11 +1,7 @@ -<TS language="lv_LV" version="2.0"> +<TS language="lv_LV" version="2.1"> <context> <name>AddressBookPage</name> <message> - <source>Double-click to edit address or label</source> - <translation>Adresi vai nosaukumu rediģē ar dubultklikšķi</translation> - </message> - <message> <source>Create a new address</source> <translation>Izveidot jaunu adresi</translation> </message> @@ -144,10 +140,6 @@ <translation>Mainīt paroli</translation> </message> <message> - <source>Enter the old and new passphrase to the wallet.</source> - <translation>Ierakstiet maciņa veco un jauno paroli.</translation> - </message> - <message> <source>Confirm wallet encryption</source> <translation>Apstiprināt maciņa šifrēšanu</translation> </message> @@ -168,10 +160,6 @@ <translation>Maciņš nošifrēts</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>Bitcoin aizvērsies, lai pabeigtu šifrēšanu. Atcerieties, ka maciņa šifrēšana nevar pilnībā novērst bitkoinu zādzību, ko veic datorā ieviesušās kaitīgas programmas.</translation> - </message> - <message> <source>Wallet encryption failed</source> <translation>Maciņa šifrēšana neizdevās</translation> </message> @@ -291,10 +279,6 @@ <translation>Nosūtīt bitkoinus uz Bitcoin adresi</translation> </message> <message> - <source>Modify configuration options for Bitcoin</source> - <translation>Mainīt Bitcoin konfigurācijas uzstādījumus</translation> - </message> - <message> <source>Backup wallet to another location</source> <translation>Izveidot maciņa rezerves kopiju citur</translation> </message> @@ -390,34 +374,14 @@ <source>&Command-line options</source> <translation>&Komandrindas iespējas</translation> </message> - <message numerus="yes"> - <source>%n active connection(s) to Bitcoin network</source> - <translation><numerusform>%n aktīvu savienojumu ar Bitcoin tīklu</numerusform><numerusform>%n aktīvs savienojums ar Bitcoin tīklu</numerusform><numerusform>%n aktīvu savienojumu as Bitcoin tīklu</numerusform></translation> - </message> <message> <source>No block source available...</source> <translation>Nav pieejams neviens bloku avots...</translation> </message> - <message numerus="yes"> - <source>%n hour(s)</source> - <translation><numerusform>%n stundas</numerusform><numerusform>%n stunda</numerusform><numerusform>%n stundas</numerusform></translation> - </message> - <message numerus="yes"> - <source>%n day(s)</source> - <translation><numerusform>%n dienas</numerusform><numerusform>%n diena</numerusform><numerusform>%n dienas</numerusform></translation> - </message> - <message numerus="yes"> - <source>%n week(s)</source> - <translation><numerusform>%n nedēļas</numerusform><numerusform>%n nedēļa</numerusform><numerusform>%n nedēļas</numerusform></translation> - </message> <message> <source>%1 and %2</source> <translation>%1 un %2</translation> </message> - <message numerus="yes"> - <source>%n year(s)</source> - <translation><numerusform>%n gadi</numerusform><numerusform>%n gads</numerusform><numerusform>%n gadi</numerusform></translation> - </message> <message> <source>%1 behind</source> <translation>%1 aizmugurē</translation> @@ -455,18 +419,6 @@ <translation>Ienākoša transakcija</translation> </message> <message> - <source>Date: %1 -Amount: %2 -Type: %3 -Address: %4 -</source> - <translation>Datums: %1 -Daudzums: %2 -Tips: %3 -Adrese: %4 -</translation> - </message> - <message> <source>Wallet is <b>encrypted</b> and currently <b>unlocked</b></source> <translation>Maciņš ir <b>šifrēts</b> un pašlaik <b>atslēgts</b></translation> </message> @@ -634,7 +586,7 @@ Adrese: %4 </message> <message> <source>none</source> - <translation>neviens</translation> + <translation>neviena</translation> </message> <message> <source>yes</source> @@ -749,23 +701,7 @@ Adrese: %4 <source>command-line options</source> <translation>komandrindas izvēles</translation> </message> - <message> - <source>UI options</source> - <translation>Lietotāja interfeisa izvēlnes</translation> - </message> - <message> - <source>Set language, for example "de_DE" (default: system locale)</source> - <translation>Uzstādiet valodu, piemēram "de_DE" (pēc noklusēšanas: sistēmas lokāle)</translation> - </message> - <message> - <source>Start minimized</source> - <translation>Sākt minimizētu</translation> - </message> - <message> - <source>Show splash screen on startup (default: 1)</source> - <translation>Uzsākot, parādīt programmas informācijas logu (pēc noklusēšanas: 1)</translation> - </message> - </context> +</context> <context> <name>Intro</name> <message> @@ -827,14 +763,6 @@ Adrese: %4 <translation>&Galvenais</translation> </message> <message> - <source>Automatically start Bitcoin after logging in to the system.</source> - <translation>Automātiski sākt Bitcoin pēc pieteikšanās sistēmā.</translation> - </message> - <message> - <source>&Start Bitcoin on system login</source> - <translation>&Sākt Bitcoin reizē ar sistēmu</translation> - </message> - <message> <source>Size of &database cache</source> <translation>&Datubāzes kešatmiņas izmērs</translation> </message> @@ -919,10 +847,6 @@ Adrese: %4 <translation>&Minimizēt uz sistēmas tekni, nevis rīkjoslu</translation> </message> <message> - <source>Minimize instead of exit the application when the window is closed. When this option is enabled, the application will be closed only after selecting Quit in the menu.</source> - <translation>Logu aizverot, minimizēt, nevis beigt darbu. Kad šī izvēlne iespējota, programma aizvērsies tikai pēc Beigt komandas izvēlnē.</translation> - </message> - <message> <source>M&inimize on close</source> <translation>M&inimizēt aizverot</translation> </message> @@ -935,10 +859,6 @@ Adrese: %4 <translation>Lietotāja interfeiss un &valoda:</translation> </message> <message> - <source>The user interface language can be set here. This setting will take effect after restarting Bitcoin.</source> - <translation>Šeit var iestatīt lietotāja valodu. Iestatījums aktivizēsies pēc Bitcoin pārstartēšanas.</translation> - </message> - <message> <source>&Unit to show amounts in:</source> <translation>&Vienības, kurās attēlot daudzumus:</translation> </message> @@ -971,10 +891,6 @@ Adrese: %4 <translation>Apstiprināt iestatījumu atiestatīšanu</translation> </message> <message> - <source>Client will be shutdown, do you want to proceed?</source> - <translation>Klients tiks izslēgts, vai vēlaties turpināt?</translation> - </message> - <message> <source>The supplied proxy address is invalid.</source> <translation>Norādītā starpniekservera adrese nav derīga.</translation> </message> @@ -1193,10 +1109,6 @@ Adrese: %4 <translation>Notīrīt konsoli</translation> </message> <message> - <source>Welcome to the Bitcoin RPC console.</source> - <translation>Laipni lūgti Bitcoin RPC konsolē.</translation> - </message> - <message> <source>Use up and down arrows to navigate history, and <b>Ctrl-L</b> to clear screen.</source> <translation>Izmantojiet bultiņas uz augšu un leju, lai pārvietotos pa vēsturi, un <b>Ctrl-L</b> ekrāna notīrīšanai.</translation> </message> @@ -1374,7 +1286,7 @@ Adrese: %4 <name>SendCoinsDialog</name> <message> <source>Send Coins</source> - <translation>Sūtīt bitkoinus</translation> + <translation>Sūtīt Bitkoinus</translation> </message> <message> <source>Coin Control Features</source> @@ -1497,10 +1409,6 @@ Adrese: %4 <translation>vai</translation> </message> <message> - <source>The recipient address is not valid, please recheck.</source> - <translation>Saņēmēja adrese ir nepareiza, lūdzu pārbaudi.</translation> - </message> - <message> <source>The amount to pay must be larger than 0.</source> <translation>Nosūtāmajai summai jābūt lielākai par 0.</translation> </message> @@ -1513,10 +1421,6 @@ Adrese: %4 <translation>Kopsumma pārsniedz pieejamo, ja pieskaitīta %1 transakcijas maksa.</translation> </message> <message> - <source>Duplicate address found, can only send to each address once per send operation.</source> - <translation>Atrastas divas vienādas adreses, vienā nosūtīšanas reizē uz katru adresi var sūtīt tikai vienreiz.</translation> - </message> - <message> <source>Transaction creation failed!</source> <translation>Transakcijas izveidošana neizdevās!</translation> </message> @@ -1584,14 +1488,6 @@ Adrese: %4 <translation>Ziņojums:</translation> </message> <message> - <source>This is a verified payment request.</source> - <translation>Šis ir pārbaudīts maksājuma pieprasījums.</translation> - </message> - <message> - <source>This is an unverified payment request.</source> - <translation>Šis ir nepārbaudīts maksājuma pieprasījums.</translation> - </message> - <message> <source>Pay To:</source> <translation>Maksāt:</translation> </message> @@ -1870,10 +1766,6 @@ Adrese: %4 <source>, has not been successfully broadcast yet</source> <translation>, vēl nav veiksmīgi izziņots</translation> </message> - <message numerus="yes"> - <source>Open for %n more block(s)</source> - <translation><numerusform>Atvērts vel %n blokus</numerusform><numerusform>Atvērts vel %n bloku</numerusform><numerusform>Atvērts vel %n blokus</numerusform></translation> - </message> <message> <source>unknown</source> <translation>nav zināms</translation> @@ -1901,14 +1793,6 @@ Adrese: %4 <translation>Tips</translation> </message> <message> - <source>Address</source> - <translation>Adrese</translation> - </message> - <message numerus="yes"> - <source>Open for %n more block(s)</source> - <translation><numerusform>Atvērts vel %n blokus</numerusform><numerusform>Atvērts vel %n bloku</numerusform><numerusform>Atvērts vel %n blokus</numerusform></translation> - </message> - <message> <source>Open until %1</source> <translation>Atvērts līdz %1</translation> </message> @@ -1929,6 +1813,10 @@ Adrese: %4 <translation>Bezsaitē</translation> </message> <message> + <source>Label</source> + <translation>Nosaukums</translation> + </message> + <message> <source>Unconfirmed</source> <translation>Neapstiprināts</translation> </message> @@ -1973,10 +1861,6 @@ Adrese: %4 <translation>Transakcijas tips.</translation> </message> <message> - <source>Destination address of transaction.</source> - <translation>Transakcijas mērķa adrese.</translation> - </message> - <message> <source>Amount removed from or added to balance.</source> <translation>Bilancei pievienotais vai atņemtais daudzums.</translation> </message> @@ -2235,10 +2119,6 @@ Adrese: %4 <translation>Kļūda: Zema diska vieta!</translation> </message> <message> - <source>Error: Wallet locked, unable to create transaction!</source> - <translation>Kļūda: Maciņš ir aizslēgts, nevar izveidot transakciju!</translation> - </message> - <message> <source>If <category> is not supplied, output all debugging information.</source> <translation>Ja <category> nav norādīta, izvadīt visu atkļūdošanas informāciju.</translation> </message> @@ -2275,10 +2155,22 @@ Adrese: %4 <translation>Debug/trace informāciju izvadīt konsolē, nevis debug.log failā</translation> </message> <message> + <source>Set language, for example "de_DE" (default: system locale)</source> + <translation>Uzstādiet valodu, piemēram "de_DE" (pēc noklusēšanas: sistēmas lokāle)</translation> + </message> + <message> + <source>Show splash screen on startup (default: 1)</source> + <translation>Uzsākot, parādīt programmas informācijas logu (pēc noklusēšanas: 1)</translation> + </message> + <message> <source>Signing transaction failed</source> <translation>Transakcijas parakstīšana neizdevās</translation> </message> <message> + <source>Start minimized</source> + <translation>Sākt minimizētu</translation> + </message> + <message> <source>Transaction amount too small</source> <translation>Transakcijas summa ir pārāk maza</translation> </message> @@ -2299,10 +2191,6 @@ Adrese: %4 <translation>Brīdinājums</translation> </message> <message> - <source>Warning: This version is obsolete, upgrade required!</source> - <translation>Brīdinājums: Šī versija ir novecojusi, nepieciešams atjauninājums!</translation> - </message> - <message> <source>on startup</source> <translation>startēšanas laikā</translation> </message> @@ -2371,10 +2259,6 @@ Adrese: %4 <translation>Nederīgs daudzums priekš -paytxfree=<amount>: '%s'</translation> </message> <message> - <source>Invalid amount</source> - <translation>Nederīgs daudzums</translation> - </message> - <message> <source>Insufficient funds</source> <translation>Nepietiek bitkoinu</translation> </message> @@ -2407,10 +2291,6 @@ Adrese: %4 <translation>Ielāde pabeigta</translation> </message> <message> - <source>To use the %s option</source> - <translation>Izmantot opciju %s</translation> - </message> - <message> <source>Error</source> <translation>Kļūda</translation> </message> diff --git a/src/qt/locale/bitcoin_mn.ts b/src/qt/locale/bitcoin_mn.ts index f1b0174111..a1a07af8d5 100644 --- a/src/qt/locale/bitcoin_mn.ts +++ b/src/qt/locale/bitcoin_mn.ts @@ -1,11 +1,7 @@ -<TS language="mn" version="2.0"> +<TS language="mn" version="2.1"> <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> @@ -46,7 +42,7 @@ </message> <message> <source>(no label)</source> - <translation>(шошго алга)</translation> + <translation>(шошгогүй)</translation> </message> </context> <context> @@ -88,10 +84,6 @@ <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> @@ -100,10 +92,6 @@ <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> @@ -218,18 +206,6 @@ <source>&Help</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 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> <source>Error</source> <translation>Алдаа</translation> @@ -247,21 +223,6 @@ <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> @@ -406,10 +367,6 @@ Address: %4 <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> @@ -574,7 +531,7 @@ Address: %4 </message> <message> <source>(no label)</source> - <translation>(шошго алга)</translation> + <translation>(шошгогүй)</translation> </message> <message> <source>(no message)</source> @@ -804,10 +761,6 @@ Address: %4 <translation>Тѳрѳл</translation> </message> <message> - <source>Address</source> - <translation>Хаяг</translation> - </message> - <message> <source>Open until %1</source> <translation>%1 хүртэл нээлттэй</translation> </message> @@ -824,6 +777,10 @@ Address: %4 <translation>Үүсгэгдсэн гэхдээ хүлээн авагдаагүй</translation> </message> <message> + <source>Label</source> + <translation>Шошго</translation> + </message> + <message> <source>Unconfirmed</source> <translation>Баталгаажаагүй</translation> </message> @@ -868,10 +825,6 @@ Address: %4 <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> @@ -1038,10 +991,6 @@ Address: %4 <translation>Эдгээр прокси хаягнууд буруу байна: '%s'</translation> </message> <message> - <source>Invalid amount</source> - <translation>Буруу хэмжээ</translation> - </message> - <message> <source>Insufficient funds</source> <translation>Таны дансны үлдэгдэл хүрэлцэхгүй байна</translation> </message> @@ -1066,10 +1015,6 @@ Address: %4 <translation>Ачааллаж дууслаа</translation> </message> <message> - <source>To use the %s option</source> - <translation>%s сонголтыг ашиглахын тулд</translation> - </message> - <message> <source>Error</source> <translation>Алдаа</translation> </message> diff --git a/src/qt/locale/bitcoin_ms_MY.ts b/src/qt/locale/bitcoin_ms_MY.ts index d2e8efbb49..999961beb8 100644 --- a/src/qt/locale/bitcoin_ms_MY.ts +++ b/src/qt/locale/bitcoin_ms_MY.ts @@ -1,11 +1,7 @@ -<TS language="ms_MY" version="2.0"> +<TS language="ms_MY" version="2.1"> <context> <name>AddressBookPage</name> <message> - <source>Double-click to edit address or label</source> - <translation>Klik dua kali untuk mengubah alamat atau label</translation> - </message> - <message> <source>Create a new address</source> <translation>Cipta alamat baru</translation> </message> @@ -160,10 +156,6 @@ </context> <context> <name>TransactionTableModel</name> - <message> - <source>Address</source> - <translation>Alamat</translation> - </message> </context> <context> <name>TransactionView</name> diff --git a/src/qt/locale/bitcoin_nb.ts b/src/qt/locale/bitcoin_nb.ts index bdde3da534..c42cf52212 100644 --- a/src/qt/locale/bitcoin_nb.ts +++ b/src/qt/locale/bitcoin_nb.ts @@ -1,13 +1,13 @@ -<TS language="nb" version="2.0"> +<TS language="nb" version="2.1"> <context> <name>AddressBookPage</name> <message> - <source>Double-click to edit address or label</source> - <translation>Dobbelklikk for å redigere adresse eller merkelapp</translation> + <source>Right-click to edit address or label</source> + <translation>Høyreklikk for å redigere adressen eller merkelappen</translation> </message> <message> <source>Create a new address</source> - <translation>Lag en ny adresse</translation> + <translation>Opprett en ny addresse</translation> </message> <message> <source>&New</source> @@ -91,7 +91,7 @@ </message> <message> <source>Exporting Failed</source> - <translation>Ekport Feilet</translation> + <translation>Eksportering feilet</translation> </message> <message> <source>There was an error trying to save the address list to %1. Please try again.</source> @@ -156,10 +156,6 @@ <translation>Endre adgangsfrase</translation> </message> <message> - <source>Enter the old and new passphrase to the wallet.</source> - <translation>Skriv inn gammel og ny adgangsfrase for lommeboken.</translation> - </message> - <message> <source>Confirm wallet encryption</source> <translation>Bekreft kryptering av lommebok</translation> </message> @@ -172,6 +168,10 @@ <translation>Er du sikker på at du vil kryptere lommeboken?</translation> </message> <message> + <source>Bitcoin Core will close now to finish the encryption process. Remember that encrypting your wallet cannot fully protect your bitcoins from being stolen by malware infecting your computer.</source> + <translation>Bitcoin Core vil nå avslutte for å fullføre krypteringsprosessen. Husk at kryptering av lommeboken ikke kan beskytte fullstendig mot tyveri av dine bitcoins hvis datamaskinen din er infisert av skadevare.</translation> + </message> + <message> <source>IMPORTANT: Any previous backups you have made of your wallet file should be replaced with the newly generated, encrypted wallet file. For security reasons, previous backups of the unencrypted wallet file will become useless as soon as you start using the new, encrypted wallet.</source> <translation>VIKTIG: Tidligere sikkerhetskopier av din lommebokfil bør erstattes med den nylig genererte og krypterte filen, da de blir ugyldiggjort av sikkerhetshensyn så snart du begynner å bruke den nye krypterte lommeboken.</translation> </message> @@ -188,8 +188,8 @@ <translation>Oppgi adgangsfrasen til lommeboken.<br/>Vennligst bruk en adgangsfrase med <b>ti eller flere tilfeldige tegn</b>, eller <b>åtte eller flere ord</b>.</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>Bitcoin vil nå lukkes for å fullføre krypteringsprosessen. Husk at kryptering av lommeboken ikke fullt ut kan beskytte dine bitcoins fra å bli stjålet om skadevare infiserer datamaskinen.</translation> + <source>Enter the old passphrase and new passphrase to the wallet.</source> + <translation>Oppgi gammel og ny adgangsfrase til lommeboken.</translation> </message> <message> <source>Wallet encryption failed</source> @@ -311,10 +311,6 @@ <translation>Send til en Bitcoin-adresse</translation> </message> <message> - <source>Modify configuration options for Bitcoin</source> - <translation>Endre oppsett for Bitcoin</translation> - </message> - <message> <source>Backup wallet to another location</source> <translation>Sikkerhetskopier lommebok til annet sted</translation> </message> @@ -403,6 +399,10 @@ <translation>&Om Bitcoin Core</translation> </message> <message> + <source>Modify configuration options for Bitcoin Core</source> + <translation>Endre konfigurasjonsvalg for Bitcoin Core</translation> + </message> + <message> <source>Show the list of used sending addresses and labels</source> <translation>Vis listen av brukte utsendingsadresser og merkelapper</translation> </message> @@ -476,39 +476,53 @@ </message> <message> <source>Up to date</source> - <translation>Ajour</translation> - </message> - <message numerus="yes"> - <source>Processed %n blocks of transaction history.</source> - <translation><numerusform>Lastet %n blokk med transaksjonshistorikk.</numerusform><numerusform>Lastet %n blokker med transaksjonshistorikk.</numerusform></translation> + <translation>Oppdatert</translation> </message> <message> <source>Catching up...</source> - <translation>Kommer ajour...</translation> + <translation>Laster ned...</translation> </message> <message> - <source>Sent transaction</source> - <translation>Sendt transaksjon</translation> + <source>Date: %1 +</source> + <translation>Dato: %1 +</translation> </message> <message> - <source>Incoming transaction</source> - <translation>Innkommende transaksjon</translation> + <source>Amount: %1 +</source> + <translation>Beløp: %1: +</translation> </message> <message> - <source>Date: %1 -Amount: %2 -Type: %3 -Address: %4 + <source>Type: %1 </source> - <translation>Dato: %1 -Beløp: %2 -Type: %3 -Adresse: %4 + <translation>Type: %1 +</translation> + </message> + <message> + <source>Label: %1 +</source> + <translation>Merkelapp: %1 +</translation> + </message> + <message> + <source>Address: %1 +</source> + <translation>Adresse: %1 </translation> </message> <message> + <source>Sent transaction</source> + <translation>Sendt transaksjon</translation> + </message> + <message> + <source>Incoming transaction</source> + <translation>Innkommende transaksjon</translation> + </message> + <message> <source>Wallet is <b>encrypted</b> and currently <b>unlocked</b></source> - <translation>Lommeboken er <b>kryptert</b> og for tiden <b>ulåst</b></translation> + <translation>Lommeboken er <b>kryptert</b> og for tiden <b>låst opp</b></translation> </message> <message> <source>Wallet is <b>encrypted</b> and currently <b>locked</b></source> @@ -554,7 +568,7 @@ Adresse: %4 </message> <message> <source>After Fee:</source> - <translation>Etter Gebyr:</translation> + <translation>Totalt:</translation> </message> <message> <source>Change:</source> @@ -562,15 +576,15 @@ Adresse: %4 </message> <message> <source>(un)select all</source> - <translation>velg (fjern) alt</translation> + <translation>velg (fjern) alle</translation> </message> <message> <source>Tree mode</source> - <translation>Tremodus</translation> + <translation>Trevisning</translation> </message> <message> <source>List mode</source> - <translation>Listemodus</translation> + <translation>Listevisning</translation> </message> <message> <source>Amount</source> @@ -634,7 +648,7 @@ Adresse: %4 </message> <message> <source>Copy after fee</source> - <translation>Kopier fra gebyr</translation> + <translation>Kopier totalt</translation> </message> <message> <source>Copy bytes</source> @@ -697,6 +711,18 @@ Adresse: %4 <translation>ingen</translation> </message> <message> + <source>This label turns red if the transaction size is greater than 1000 bytes.</source> + <translation>Denne teksten blir rød hvis transaksjonsstørrelsen er større enn 1000 bytes.</translation> + </message> + <message> + <source>This label turns red if the priority is smaller than "medium".</source> + <translation>Denne teksten blir rød hvis prioriteten er lavere enn "medium".</translation> + </message> + <message> + <source>This label turns red if any recipient receives an amount smaller than %1.</source> + <translation>Denne teksten blir rød dersom en mottaker mottar et beløp mindre enn %1.</translation> + </message> + <message> <source>Can vary +/- %1 satoshi(s) per input.</source> <translation>Kan variere +/- %1 satoshi(er) per input.</translation> </message> @@ -709,10 +735,6 @@ Adresse: %4 <translation>nei</translation> </message> <message> - <source>This label turns red, if the transaction size is greater than 1000 bytes.</source> - <translation>Denne merkelappen blir rød, hvis transaksjonsstørrelsen er større enn 1000 bytes.</translation> - </message> - <message> <source>This means a fee of at least %1 per kB is required.</source> <translation>Dette betyr at et gebyr på minst %1 per KB er påkrevd.</translation> </message> @@ -725,14 +747,6 @@ Adresse: %4 <translation>Transaksjoner med høyere prioritet har mer sannsynlighet for å bli inkludert i en blokk.</translation> </message> <message> - <source>This label turns red, if the priority is smaller than "medium".</source> - <translation>Denne merkelappen blir rød, hvis prioriteten er mindre enn "medium".</translation> - </message> - <message> - <source>This label turns red, if any recipient receives an amount smaller than %1.</source> - <translation>Denne merkelappen blir rød, hvis en mottaker mottar en mengde på mindre enn %1.</translation> - </message> - <message> <source>(no label)</source> <translation>(ingen merkelapp)</translation> </message> @@ -853,30 +867,6 @@ Adresse: %4 <source>command-line options</source> <translation>kommandolinjevalg</translation> </message> - <message> - <source>UI options</source> - <translation>valg i brukergrensesnitt</translation> - </message> - <message> - <source>Set language, for example "de_DE" (default: system locale)</source> - <translation>Sett språk, for eksempel "nb_NO" (standardverdi: fra operativsystem)</translation> - </message> - <message> - <source>Start minimized</source> - <translation>Start minimert</translation> - </message> - <message> - <source>Set SSL root certificates for payment request (default: -system-)</source> - <translation>Sett SSL-rotsertifikat for betalingsetterspørring (standard: -system-)</translation> - </message> - <message> - <source>Show splash screen on startup (default: 1)</source> - <translation>Vis splashskjerm ved oppstart (standardverdi: 1)</translation> - </message> - <message> - <source>Choose data directory on startup (default: 0)</source> - <translation>Velg datamappe ved oppstart (standard: 0)</translation> - </message> </context> <context> <name>Intro</name> @@ -959,14 +949,6 @@ Adresse: %4 <translation>&Hoved</translation> </message> <message> - <source>Automatically start Bitcoin after logging in to the system.</source> - <translation>Start Bitcoin automatisk etter innlogging.</translation> - </message> - <message> - <source>&Start Bitcoin on system login</source> - <translation>&Start Bitcoin ved systeminnlogging</translation> - </message> - <message> <source>Size of &database cache</source> <translation>Størrelse på &database hurtigbuffer</translation> </message> @@ -991,6 +973,10 @@ Adresse: %4 <translation>IP-adressen til proxyen (f.eks. IPv4: 127.0.0.1 / IPv6: ::1)</translation> </message> <message> + <source>Minimize instead of exit the application when the window is closed. When this option is enabled, the application will be closed only after selecting Exit in the menu.</source> + <translation>Minimer i stedet for å avslutte applikasjonen når vinduet lukkes. Når dette er valgt, vil applikasjonen avsluttes kun etter at Avslutte er valgt i menyen.</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>Tredjepart URLer (f. eks. en blokkutforsker) som dukker opp i transaksjonsfanen som kontekst meny elementer. %s i URLen er erstattet med transaksjonen sin hash. Flere URLer er separert av en vertikal linje |.</translation> </message> @@ -1079,10 +1065,6 @@ Adresse: %4 <translation>&Minimer til systemkurv istedenfor oppgavelinjen</translation> </message> <message> - <source>Minimize instead of exit the application when the window is closed. When this option is enabled, the application will be closed only after selecting Quit in the menu.</source> - <translation>Minimerer vinduet istedenfor å avslutte applikasjonen når vinduet lukkes. Når dette er slått på avsluttes applikasjonen kun ved å velge avslutt i menyen.</translation> - </message> - <message> <source>M&inimize on close</source> <translation>M&inimer ved lukking</translation> </message> @@ -1095,10 +1077,6 @@ Adresse: %4 <translation>&Språk for brukergrensesnitt</translation> </message> <message> - <source>The user interface language can be set here. This setting will take effect after restarting Bitcoin.</source> - <translation>Språket for brukergrensesnittet kan settes her. Innstillingen trer i kraft ved omstart av Bitcoin.</translation> - </message> - <message> <source>&Unit to show amounts in:</source> <translation>&Enhet for visning av beløper:</translation> </message> @@ -1135,10 +1113,6 @@ Adresse: %4 <translation>Omstart av klienten er nødvendig for å aktivere endringene.</translation> </message> <message> - <source>Client will be shutdown, do you want to proceed?</source> - <translation>Klienten vil bli lukket, vil du fortsette?</translation> - </message> - <message> <source>This change would require a client restart.</source> <translation>Denne endringen krever omstart av klienten.</translation> </message> @@ -1245,10 +1219,6 @@ Adresse: %4 <translation>Nettverk for betalingsetterspørring er ikke i overensstemmelse med klientnettverket.</translation> </message> <message> - <source>Payment request has expired.</source> - <translation>Betalingsetterspørringen har utløpt.</translation> - </message> - <message> <source>Payment request is not initialized.</source> <translation>Betalingsetterspørringen er ikke initialisert.</translation> </message> @@ -1289,6 +1259,14 @@ Adresse: %4 <translation>Refundering fra %1</translation> </message> <message> + <source>Payment request %1 is too large (%2 bytes, allowed %3 bytes).</source> + <translation>Betalingsforespørsel %1 er for stor (%2 bytes, tillatt %3 bytes).</translation> + </message> + <message> + <source>Payment request DoS protection</source> + <translation>Betalingsforespørsel DoS-beskyttelse</translation> + </message> + <message> <source>Error communicating with %1: %2</source> <translation>Feil i kommunikasjonen med %1: %2</translation> </message> @@ -1316,10 +1294,6 @@ Adresse: %4 <translation>Brukeragent</translation> </message> <message> - <source>Address/Hostname</source> - <translation>Adresse/Vertsnavn</translation> - </message> - <message> <source>Ping Time</source> <translation>Ping-tid</translation> </message> @@ -1351,14 +1325,6 @@ Adresse: %4 <translation>%1 s</translation> </message> <message> - <source>NETWORK</source> - <translation>NETTVERK</translation> - </message> - <message> - <source>UNKNOWN</source> - <translation>UKJENT</translation> - </message> - <message> <source>None</source> <translation>Ingen</translation> </message> @@ -1557,18 +1523,10 @@ Adresse: %4 <translation>Loggfil for feilsøk</translation> </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>Åpne Bitcoin sin loggfil for feilsøk fra den gjeldende datamappen. Dette kan ta noen sekunder for store loggfiler.</translation> - </message> - <message> <source>Clear console</source> <translation>Tøm konsoll</translation> </message> <message> - <source>Welcome to the Bitcoin RPC console.</source> - <translation>Velkommen til Bitcoin sin RPC-konsoll.</translation> - </message> - <message> <source>Use up and down arrows to navigate history, and <b>Ctrl-L</b> to clear screen.</source> <translation>Bruk opp og ned pil for å navigere historikken, og <b>Ctrl-L</b> for å tømme skjermen.</translation> </message> @@ -1857,14 +1815,6 @@ Adresse: %4 <translation>Legg ned gebyrinnstillinger</translation> </message> <message> - <source>Minimize</source> - <translation>Minimer</translation> - </message> - <message> - <source>If the custom fee is set to 1000 satoshis and the transaction is only 250 bytes, then "per kilobyte" only pays 250 satoshis in fee, while "at least" pays 1000 satoshis. For transactions bigger than a kilobyte both pay by kilobyte.</source> - <translation>Hvis den egendefinerte avgiften er satt til 1000 satoshis og transaksjonen bare er 250 bytes, da vil "per kilobyte" bare betale 250 satoshis i gebyr, mens "minst" betaler 1000 satoshis. For transaksjoner større enn en kilobyte vil begge betale for antall kilobyte.</translation> - </message> - <message> <source>per kilobyte</source> <translation>per kilobyte</translation> </message> @@ -1873,6 +1823,10 @@ Adresse: %4 <translation>Hvis den egendefinerte avgiften er satt til 1000 satoshis og transaksjonen bare er 250 bytes, da vil "per kilobyte" bare betale 250 satoshis i gebyr, mens "minstebeløp" betaler 1000 satoshis. For transaksjoner større enn en kilobyte vil begge betale for antall kilobyte.</translation> </message> <message> + <source>Hide</source> + <translation>Skjul</translation> + </message> + <message> <source>total at least</source> <translation>minstebeløp</translation> </message> @@ -1993,10 +1947,6 @@ Adresse: %4 <translation>eller</translation> </message> <message> - <source>The recipient address is not valid, please recheck.</source> - <translation>Adresse for mottaker er ugyldig.</translation> - </message> - <message> <source>The amount to pay must be larger than 0.</source> <translation>Beløpet som skal betales må være over 0.</translation> </message> @@ -2009,10 +1959,6 @@ Adresse: %4 <translation>Totalbeløpet overstiger saldo etter at %1 transaksjonsgebyr er lagt til.</translation> </message> <message> - <source>Duplicate address found, can only send to each address once per send operation.</source> - <translation>Doble antall adresser funnet. Kan bare sende en gang til hver adresse per operasjon.</translation> - </message> - <message> <source>Transaction creation failed!</source> <translation>Opprettelse av transaksjon feilet!</translation> </message> @@ -2021,18 +1967,10 @@ Adresse: %4 <translation>Transaksjonen ble avvist! Dette kan skje hvis noen av myntene i lommeboken allerede er brukt, som hvis du kopierte wallet.dat og mynter ble brukt i kopien uten å bli markert som brukt her.</translation> </message> <message> - <source>A fee higher than %1 is considered an insanely high fee.</source> - <translation>Et gebyr høyere enn %1 er ansett som et sinnsykt høyt gebyr.</translation> - </message> - <message> <source>Pay only the minimum fee of %1</source> <translation>Betal kun minimumsgebyret på %1</translation> </message> <message> - <source>Estimated to begin confirmation within %1 block(s).</source> - <translation>Beregner å begynne bekreftelse innen %1 blokk(er).</translation> - </message> - <message> <source>Warning: Invalid Bitcoin address</source> <translation>Advarsel: Ugyldig Bitcoin-adresse</translation> </message> @@ -2108,10 +2046,6 @@ Adresse: %4 <translation>Melding:</translation> </message> <message> - <source>This is a verified payment request.</source> - <translation>Dette er en verifisert betalingsetterspørring</translation> - </message> - <message> <source>Enter a label for this address to add it to the list of used addresses</source> <translation>Skriv inn en merkelapp for denne adressen for å legge den til listen av brukte adresser</translation> </message> @@ -2120,10 +2054,6 @@ Adresse: %4 <translation>En melding som var tilknyttet bitcoinen: URI vil bli lagret med transaksjonen for din oversikt. Denne meldingen vil ikke bli sendt over Bitcoin-nettverket.</translation> </message> <message> - <source>This is an unverified payment request.</source> - <translation>Dette er en uverifisert betalingsetterspørring</translation> - </message> - <message> <source>Pay To:</source> <translation>Betal Til:</translation> </message> @@ -2154,10 +2084,6 @@ Adresse: %4 <translation>&Signer Melding</translation> </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>Du kan signere meldinger med dine adresser for å bevise at du eier dem. Ikke signer vage meldinger da phishing-angrep kan prøve å lure deg til å signere din identitet over til andre. Signer kun fullt detaljerte utsagn som du er enig i.</translation> - </message> - <message> <source>The Bitcoin address to sign the message with</source> <translation>Bitcoin-adressen meldingen skal signeres med</translation> </message> @@ -2210,10 +2136,6 @@ Adresse: %4 <translation>&Verifiser Melding</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>Angi adresse for signering, melding (vær sikker på at du kopierer linjeskift, mellomrom, tab, etc. helt nøyaktig) og signatur under for å verifisere meldingen. Vær forsiktig med at du ikke gir signaturen mer betydning enn det som faktisk står i meldingen, for å unngå å bli lurt av såkalte "man-in-the-middle" angrep.</translation> - </message> - <message> <source>The Bitcoin address the message was signed with</source> <translation>Bitcoin-adressen meldingen ble signert med</translation> </message> @@ -2477,10 +2399,6 @@ Adresse: %4 <translation>Type</translation> </message> <message> - <source>Address</source> - <translation>Adresse</translation> - </message> - <message> <source>Immature (%1 confirmations, will be available after %2)</source> <translation>Umoden (%1 bekreftelser, vil være tilgjengelig etter %2)</translation> </message> @@ -2509,6 +2427,10 @@ Adresse: %4 <translation>Frakoblet</translation> </message> <message> + <source>Label</source> + <translation>Merkelapp</translation> + </message> + <message> <source>Unconfirmed</source> <translation>Ubekreftet</translation> </message> @@ -2565,10 +2487,6 @@ Adresse: %4 <translation>Hvorvidt en kun observerbar adresse er involvert i denne transaksjonen.</translation> </message> <message> - <source>Destination address of transaction.</source> - <translation>Mottaksadresse for transaksjonen.</translation> - </message> - <message> <source>Amount removed from or added to balance.</source> <translation>Beløp fjernet eller lagt til saldo.</translation> </message> @@ -2807,29 +2725,6 @@ Adresse: %4 <translation>Ta imot tilkoblinger fra utsiden (standardverdi: 1 hvis uten -proxy eller -connect)</translation> </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>%s, du må angi rpcpassord i konfigurasjonsfilen. -%s -Det anbefales at du bruker det følgende tilfeldige passordet: -rpcbruker=bitcoinrpc -rpcpassord=%s -(du behøver ikke å huske passordet) -Brukernavnet og passordet MÅ IKKE være like. -Om filen ikke eksisterer, opprett den nå med eier-kun-les filrettigheter. -Det er også anbefalt at å sette varselsmelding slik du får melding om problemer. -For eksempel: varselmelding=echo %%s | mail -s "Bitcoin Varsel" admin@foo.com</translation> - </message> - <message> <source>Bind to given address and always listen on it. Use [host]:port notation for IPv6</source> <translation>Bind til angitt adresse. Bruk [vertsmaskin]:port notasjon for IPv6</translation> </message> @@ -2846,14 +2741,6 @@ For eksempel: varselmelding=echo %%s | mail -s "Bitcoin Varsel" admin@foo.com</t <translation>Gå til modus for regresjonstesting, som bruker en spesiell blokkjede der blokker kan bli løst momentant.</translation> </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>Feil: Transaksjonen ble avvist! Dette kan skje hvis noen av myntene i lommeboken allerede er blitt brukt, som om du brukte en kopi av wallet.dat og myntene ble brukt i kopien, men ikke markert som brukt her.</translation> - </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>Feil: Denne transaksjonen trenger et gebyr på minst %s på grunn av beløpet, kompleksiteten eller bruk av allerede mottatte penger!</translation> - </message> - <message> <source>Execute command when a wallet transaction changes (%s in cmd is replaced by TxID)</source> <translation>Kjør kommando når en lommeboktransaksjon endres (%s i kommando er erstattet med TxID)</translation> </message> @@ -2930,10 +2817,6 @@ For eksempel: varselmelding=echo %%s | mail -s "Bitcoin Varsel" admin@foo.com</t <translation>Valg for feilsøking/testing:</translation> </message> <message> - <source>Discover own IP address (default: 1 when listening and no -externalip)</source> - <translation>Oppdag egen IP-adresse (standardverdi: 1 ved lytting og uten -externalip)</translation> - </message> - <message> <source>Do not load the wallet and disable wallet RPC calls</source> <translation>Ikke last inn lommeboken og deaktiver RPC-kall</translation> </message> @@ -2966,10 +2849,6 @@ For eksempel: varselmelding=echo %%s | mail -s "Bitcoin Varsel" admin@foo.com</t <translation>Feil: Lite ledig lagringsplass!</translation> </message> <message> - <source>Error: Wallet locked, unable to create transaction!</source> - <translation>Feil: Lommebok låst, kan ikke opprette transaksjon!</translation> - </message> - <message> <source>Failed to listen on any port. Use -listen=0 if you want this.</source> <translation>Kunne ikke lytte på noen port. Bruk -listen=0 hvis det er dette du vil.</translation> </message> @@ -2998,8 +2877,12 @@ For eksempel: varselmelding=echo %%s | mail -s "Bitcoin Varsel" admin@foo.com</t <translation>Bare koble til noder i nettverket <net> (IPv4, IPv6 eller onion)</translation> </message> <message> - <source>Rebuild block chain index from current blk000??.dat files</source> - <translation>Gjenopprett blokkjedeindeks fra blk000??.dat filer</translation> + <source>Prune cannot be configured with a negative value.</source> + <translation>Beskjæringsmodus kan ikke konfigureres med en negativ verdi.</translation> + </message> + <message> + <source>Prune mode is incompatible with -txindex.</source> + <translation>Beskjæringsmodus er ikke kompatibel med -txindex.</translation> </message> <message> <source>Set database cache size in megabytes (%d to %d, default: %d)</source> @@ -3066,10 +2949,6 @@ For eksempel: varselmelding=echo %%s | mail -s "Bitcoin Varsel" admin@foo.com</t <translation>Ute av stand til å låse datamappen %s. Bitcoin Core kjører sannsynligvis allerede.</translation> </message> <message> - <source>Continuously rate-limit free transactions to <n>*1000 bytes per minute (default:%u)</source> - <translation>Ratebegrens gratistransaksjoner kontinuerlig til <n>*1000 bytes per minutt (standardverdi: %u)</translation> - </message> - <message> <source>Create new files with system default permissions, instead of umask 077 (only effective with disabled wallet functionality)</source> <translation>Opprett nye filer med standardtillatelser i systemet, i stedet for umask 077 (kun virksom med lommebokfunksjonalitet slått av)</translation> </message> @@ -3094,10 +2973,22 @@ For eksempel: varselmelding=echo %%s | mail -s "Bitcoin Varsel" admin@foo.com</t <translation>Gebyrer (i BTC/Kb) mindre enn dette anses som null gebyr for laging av transaksjoner (standardverdi: %s)</translation> </message> <message> + <source>If paytxfee is not set, include enough fee so transactions begin confirmation on average within n blocks (default: %u)</source> + <translation>Hvis paytxfee ikke er angitt, inkluderer da nok i gebyr til at transaksjoner gjennomsnittligt bekreftes innen n blokker (standardverdi: %u)</translation> + </message> + <message> + <source>Invalid amount for -maxtxfee=<amount>: '%s' (must be at least the minrelay fee of %s to prevent stuck transactions)</source> + <translation>Ugyldig beløp for -maxtxfee=<amount>: '%s' (må være minst minimum relé gebyr på %s for å hindre fastlåste transaksjoner)</translation> + </message> + <message> <source>Maximum size of data in data carrier transactions we relay and mine (default: %u)</source> <translation>Maksimal størrelse på data i databærende transaksjoner vi videresender og ufører graving på (standardverdi: %u)</translation> </message> <message> + <source>Prune configured below the minimum of %d MB. Please use a higher number.</source> + <translation>Beskjæringsmodus er konfigurert under minimum på %d MB. Vennligst bruk et høyere nummer.</translation> + </message> + <message> <source>Query for peer addresses via DNS lookup, if low on addresses (default: 1 unless -connect)</source> <translation>Søk etter nodeadresser via DNS-oppslag, hvis vi har få adresser å koble til (standard: 1 med mindre -connect)</translation> </message> @@ -3114,6 +3005,34 @@ For eksempel: varselmelding=echo %%s | mail -s "Bitcoin Varsel" admin@foo.com</t <translation>Dette produktet inneholder programvare utviklet av OpenSSL Project for bruk i OpenSSL Toolkit <https://www.openssl.org/> og kryptografisk programvare skrevet av Eric Young og UPnP-programvare skrevet av Thomas Bernard.</translation> </message> <message> + <source>To use bitcoind, or the -server option to bitcoin-qt, you must set an 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>For å bruke bitcoind, eller -server valget til bitcoin-qt, må du angi et rpcpassord i konfigurasjonsfilen: +%s +Det anbefales at du bruker det følgende tilfeldige passordet: +rpcuser=bitcoinrpc +rpcpassword=%s +(du behøver ikke å huske passordet) +Brukernavnet og passordet MÅ IKKE være like. +Om filen ikke eksisterer, opprett den med eier-kun-les filrettigheter. +Det er også anbefalt at å sette varselsmelding slik du får melding om problemer; +for eksempel: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo.com +</translation> + </message> + <message> + <source>Warning: -maxtxfee is set very high! Fees this large could be paid on a single transaction.</source> + <translation>Advarsel: -paytxfee er satt veldig høyt! Så stort gebyr kan bli betalt ved en enkelt transaksjon.</translation> + </message> + <message> <source>Warning: Please check that your computer's date and time are correct! If your clock is wrong Bitcoin Core will not work properly.</source> <translation>Advarsel: Vennligst undersøk at din datamaskin har riktig dato og klokkeslett! Hvis klokken er stilt feil vil ikke Bitcoin Core fungere riktig.</translation> </message> @@ -3122,10 +3041,30 @@ For eksempel: varselmelding=echo %%s | mail -s "Bitcoin Varsel" admin@foo.com</t <translation>Hvitlistede noder kan ikke DoS-blokkeres, og deres transaksjoner videresendes alltid, selv om de allerede er i minnelageret. Nyttig f.eks. for en gateway.</translation> </message> <message> + <source>You need to rebuild the database using -reindex to go back to unpruned mode. This will redownload the entire blockchain</source> + <translation>Du må gjenoppbygge databasen ved hjelp av -reindex for å gå tilbake til ubeskåret modus. Dette vil laste ned hele blokkjeden på nytt.</translation> + </message> + <message> + <source>(default: %u)</source> + <translation>(standardverdi: %u)</translation> + </message> + <message> + <source>Accept public REST requests (default: %u)</source> + <translation>Godta offentlige REST forespørsler (standardverdi: %u)</translation> + </message> + <message> + <source>Can't run with a wallet in prune mode.</source> + <translation>Kan ikke kjøre med en lommebok i beskjæringsmodus.</translation> + </message> + <message> <source>Cannot resolve -whitebind address: '%s'</source> <translation>Kan ikke løse -whitebind-adresse: '%s'</translation> </message> <message> + <source>Choose data directory on startup (default: 0)</source> + <translation>Velg datamappe ved oppstart (standard: 0)</translation> + </message> + <message> <source>Connect through SOCKS5 proxy</source> <translation>Koble til via SOCKS5-proxy</translation> </message> @@ -3142,6 +3081,10 @@ For eksempel: varselmelding=echo %%s | mail -s "Bitcoin Varsel" admin@foo.com</t <translation>Feil ved lasting av wallet.dat: Lommeboken krever en nyere versjon av Bitcoin Core</translation> </message> <message> + <source>Error reading from database, shutting down.</source> + <translation>Feil ved lesing fra database, stenger ned.</translation> + </message> + <message> <source>Error: Unsupported argument -tor found, use -onion.</source> <translation>Feil: Argumentet -tor er ikke støttet, bruk -onion.</translation> </message> @@ -3158,6 +3101,10 @@ For eksempel: varselmelding=echo %%s | mail -s "Bitcoin Varsel" admin@foo.com</t <translation>Sunnhetssjekk ved oppstart feilet. Bitcoin Core stenges ned.</translation> </message> <message> + <source>Invalid amount for -maxtxfee=<amount>: '%s'</source> + <translation>Ugyldig beløp for -maxtxfee=<amount>: '%s'</translation> + </message> + <message> <source>Invalid amount for -minrelaytxfee=<amount>: '%s'</source> <translation>Ugyldig mengde for -minrelaytxfee=<beløp>: '%s'</translation> </message> @@ -3174,10 +3121,6 @@ For eksempel: varselmelding=echo %%s | mail -s "Bitcoin Varsel" admin@foo.com</t <translation>Ugyldig nettmaske spesifisert i -whitelist: '%s'</translation> </message> <message> - <source>Keep at most <n> unconnectable blocks in memory (default: %u)</source> - <translation>Behold på det meste <n> blokker i minnet som ikke er mulig å koble (standardverdi: %u)</translation> - </message> - <message> <source>Keep at most <n> unconnectable transactions in memory (default: %u)</source> <translation>Hold på det meste <n> transaksjoner som ikke kobles i minnet (standardverdi: %u)</translation> </message> @@ -3190,10 +3133,6 @@ For eksempel: varselmelding=echo %%s | mail -s "Bitcoin Varsel" admin@foo.com</t <translation>Node alternativer for videresending:</translation> </message> <message> - <source>Print block on startup, if found in block index</source> - <translation>Skriv ut blokken ved oppstart, hvis funnet i blokkindeksen</translation> - </message> - <message> <source>RPC SSL options: (see the Bitcoin Wiki for SSL setup instructions)</source> <translation>RPC SSL-valg: (se Bitcoin Wiki for oppsettsinstruksjoner for SSL)</translation> </message> @@ -3202,6 +3141,10 @@ For eksempel: varselmelding=echo %%s | mail -s "Bitcoin Varsel" admin@foo.com</t <translation>Innstillinger for RPC-server:</translation> </message> <message> + <source>RPC support for HTTP persistent connections (default: %d)</source> + <translation>RPC-støtte for persistente HTTP-forbindelser (standardverdi: %d)</translation> + </message> + <message> <source>Randomly drop 1 of every <n> network messages</source> <translation>Slumpvis dropp 1 av hver <n> nettverksmeldinger</translation> </message> @@ -3218,10 +3161,22 @@ For eksempel: varselmelding=echo %%s | mail -s "Bitcoin Varsel" admin@foo.com</t <translation>Send transaksjoner uten transaksjonsgebyr hvis mulig (standardverdi: %u)</translation> </message> <message> + <source>Set SSL root certificates for payment request (default: -system-)</source> + <translation>Sett SSL-rotsertifikat for betalingsetterspørring (standard: -system-)</translation> + </message> + <message> + <source>Set language, for example "de_DE" (default: system locale)</source> + <translation>Sett språk, for eksempel "nb_NO" (standardverdi: fra operativsystem)</translation> + </message> + <message> <source>Show all debugging options (usage: --help -help-debug)</source> <translation>Vis alle feilsøkingsvalg (bruk: --help -help-debug)</translation> </message> <message> + <source>Show splash screen on startup (default: 1)</source> + <translation>Vis splashskjerm ved oppstart (standardverdi: 1)</translation> + </message> + <message> <source>Shrink debug.log file on client startup (default: 1 when no -debug)</source> <translation>Krymp filen debug.log når klienten starter (standardverdi: 1 hvis uten -debug)</translation> </message> @@ -3230,6 +3185,10 @@ For eksempel: varselmelding=echo %%s | mail -s "Bitcoin Varsel" admin@foo.com</t <translation>Signering av transaksjon feilet</translation> </message> <message> + <source>Start minimized</source> + <translation>Start minimert</translation> + </message> + <message> <source>This is experimental software.</source> <translation>Dette er eksperimentell programvare.</translation> </message> @@ -3242,10 +3201,18 @@ For eksempel: varselmelding=echo %%s | mail -s "Bitcoin Varsel" admin@foo.com</t <translation>Transaksjonsbeløpet må være positivt</translation> </message> <message> + <source>Transaction too large for fee policy</source> + <translation>Transaksjon for stor for gebyrpolitikken</translation> + </message> + <message> <source>Transaction too large</source> <translation>Transaksjonen er for stor</translation> </message> <message> + <source>UI Options:</source> + <translation>Innstillinger for Brukergrensesnitt:</translation> + </message> + <message> <source>Unable to bind to %s on this computer (bind returned error %s)</source> <translation>Kan ikke binde til %s på denne datamaskinen (binding returnerte feilen %s)</translation> </message> @@ -3266,10 +3233,6 @@ For eksempel: varselmelding=echo %%s | mail -s "Bitcoin Varsel" admin@foo.com</t <translation>Advarsel</translation> </message> <message> - <source>Warning: This version is obsolete, upgrade required!</source> - <translation>Advarsel: Denne versjonen er foreldet, oppgradering kreves!</translation> - </message> - <message> <source>Warning: Unsupported argument -benchmark ignored, use -debug=bench.</source> <translation>Advarsel: Argumentet -benchmark er ikke støttet og ble ignorert, bruk -debug=bench.</translation> </message> @@ -3338,10 +3301,6 @@ For eksempel: varselmelding=echo %%s | mail -s "Bitcoin Varsel" admin@foo.com</t <translation>Hvor grundig blokkverifiseringen til -checkblocks er (0-4, standardverdi: %u)</translation> </message> <message> - <source>If paytxfee is not set, include enough fee so transactions are confirmed on average within n blocks (default: %u)</source> - <translation>Hvis paytxfee ikke er angitt, inkluderer da nok gebyr til at transaksjoner gjennomsnittligt bekreftes innen n blokker (standardverdi: %u)</translation> - </message> - <message> <source>Log transaction priority and fee per kB when mining blocks (default: %u)</source> <translation>Logg transaksjonsprioritet og gebyr per kB under blokkutvinning (standardverdi: %u)</translation> </message> @@ -3434,10 +3393,6 @@ For eksempel: varselmelding=echo %%s | mail -s "Bitcoin Varsel" admin@foo.com</t <translation>Sett inn tidsstempel i front av feilsøkingsdata (standardverdi: %u)</translation> </message> <message> - <source>Print block tree on startup (default: %u)</source> - <translation>Skriv ut blokktreet ved oppstart (standardverdi: %u)</translation> - </message> - <message> <source>Relay and mine data carrier transactions (default: %u)</source> <translation>Videresend og ufør graving av databærende transaksjoner (standardverdi: %u)</translation> </message> @@ -3514,10 +3469,6 @@ For eksempel: varselmelding=echo %%s | mail -s "Bitcoin Varsel" admin@foo.com</t <translation>Ugyldig beløp for -paytxfee=<beløp>: '%s'</translation> </message> <message> - <source>Invalid amount</source> - <translation>Ugyldig beløp</translation> - </message> - <message> <source>Insufficient funds</source> <translation>Utilstrekkelige midler</translation> </message> @@ -3550,10 +3501,6 @@ For eksempel: varselmelding=echo %%s | mail -s "Bitcoin Varsel" admin@foo.com</t <translation>Ferdig med lasting</translation> </message> <message> - <source>To use the %s option</source> - <translation>For å bruke %s opsjonen</translation> - </message> - <message> <source>Error</source> <translation>Feil</translation> </message> diff --git a/src/qt/locale/bitcoin_nl.ts b/src/qt/locale/bitcoin_nl.ts index 258c7f109f..3e1d568d20 100644 --- a/src/qt/locale/bitcoin_nl.ts +++ b/src/qt/locale/bitcoin_nl.ts @@ -1,13 +1,13 @@ -<TS language="nl" version="2.0"> +<TS language="nl" version="2.1"> <context> <name>AddressBookPage</name> <message> - <source>Double-click to edit address or label</source> - <translation>Dubbelklik om het adres of label te wijzigen</translation> + <source>Right-click to edit address or label</source> + <translation>Klik met de rechtermuisknop om het adres of label te wijzigen</translation> </message> <message> <source>Create a new address</source> - <translation>Maak een nieuw adres aan</translation> + <translation>Maak een nieuw adres</translation> </message> <message> <source>&New</source> @@ -15,7 +15,7 @@ </message> <message> <source>Copy the currently selected address to the system clipboard</source> - <translation>Kopieer het huidig geselecteerde adres naar het klembord</translation> + <translation>Kopieer het geselecteerde adres naar het klembord</translation> </message> <message> <source>&Copy</source> @@ -51,7 +51,7 @@ </message> <message> <source>Choose the address to receive coins with</source> - <translation>Kies het adres om munten voor te ontvangen</translation> + <translation>Kies het adres om munten op te ontvangen</translation> </message> <message> <source>C&hoose</source> @@ -59,15 +59,15 @@ </message> <message> <source>Sending addresses</source> - <translation>Bezig met het versturen van de adressen</translation> + <translation>Verstuur adressen</translation> </message> <message> <source>Receiving addresses</source> - <translation>Adressen ontvangen</translation> + <translation>Ontvang adressen</translation> </message> <message> <source>These are your Bitcoin addresses for sending payments. Always check the amount and the receiving address before sending coins.</source> - <translation>Dit zijn uw Bitcoinadressen om betalingen mee te verzenden. Controleer altijd het bedrag en het ontvangende adres voordat u uw bitcoins verzendt.</translation> + <translation>Dit zijn uw Bitcoinadressen om betalingen mee te verzenden. Controleer altijd het bedrag en het ontvang adres voordat u uw bitcoins verzendt.</translation> </message> <message> <source>These are your Bitcoin addresses for receiving payments. It is recommended to use a new receiving address for each transaction.</source> @@ -117,7 +117,7 @@ <name>AskPassphraseDialog</name> <message> <source>Passphrase Dialog</source> - <translation>Wachtwoorddialoogscherm</translation> + <translation>Wachtwoorddialoog</translation> </message> <message> <source>Enter passphrase</source> @@ -156,10 +156,6 @@ <translation>Wijzig wachtwoord</translation> </message> <message> - <source>Enter the old and new passphrase to the wallet.</source> - <translation>Vul uw oude en nieuwe portemonneewachtwoord in.</translation> - </message> - <message> <source>Confirm wallet encryption</source> <translation>Bevestig versleuteling van de portemonnee</translation> </message> @@ -185,11 +181,7 @@ </message> <message> <source>Enter the new passphrase to the wallet.<br/>Please use a passphrase of <b>ten or more random characters</b>, or <b>eight or more words</b>.</source> - <translation>Vul een nieuw </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>Bitcoin zal nu afsluiten om het versleutelingsproces te voltooien. Onthoud dat het versleutelen van uw portemonnee u niet volledig kan beschermen: Malware kan uw computer infecteren en uw bitcoins stelen.</translation> + <translation>Voer een nieuw wachtwoord in voor uw portomonee.<br/>Gebruik een wachtwoord van <b>tien of meer willekeurige karakters</b>, of <b>acht of meer woorden</b>.</translation> </message> <message> <source>Wallet encryption failed</source> @@ -240,7 +232,7 @@ </message> <message> <source>Show general overview of wallet</source> - <translation>Toon algemeen overzicht van de portemonnee</translation> + <translation>Toon algemeen overzicht van uw portemonnee</translation> </message> <message> <source>&Transactions</source> @@ -284,11 +276,11 @@ </message> <message> <source>&Sending addresses...</source> - <translation>&Adressen aan het versturen.</translation> + <translation>V&erstuur adressen...</translation> </message> <message> <source>&Receiving addresses...</source> - <translation>&Adressen aan het ontvangen...</translation> + <translation>O&ntvang adressen...</translation> </message> <message> <source>Open &URI...</source> @@ -296,7 +288,7 @@ </message> <message> <source>Bitcoin Core client</source> - <translation>Bitcoin kern applicatie</translation> + <translation>Bitcoin Kern applicatie</translation> </message> <message> <source>Importing blocks from disk...</source> @@ -311,10 +303,6 @@ <translation>Verstuur munten naar een Bitcoinadres</translation> </message> <message> - <source>Modify configuration options for Bitcoin</source> - <translation>Wijzig instellingen van Bitcoin</translation> - </message> - <message> <source>Backup wallet to another location</source> <translation>Backup portemonnee naar een andere locatie</translation> </message> @@ -424,11 +412,11 @@ </message> <message numerus="yes"> <source>%n active connection(s) to Bitcoin network</source> - <translation><numerusform>%n actieve connectie naar Bitcoinnetwerk</numerusform><numerusform>%n actieve connecties naar Bitcoinnetwerk</numerusform></translation> + <translation><numerusform>%n actieve connectie naar Bitcoin netwerk</numerusform><numerusform>%n actieve connecties naar Bitcoin netwerk</numerusform></translation> </message> <message> <source>No block source available...</source> - <translation>Geen bron van blokken beschikbaar...</translation> + <translation>Geen bron voor blokken beschikbaar...</translation> </message> <message numerus="yes"> <source>%n hour(s)</source> @@ -478,10 +466,6 @@ <source>Up to date</source> <translation>Bijgewerkt</translation> </message> - <message numerus="yes"> - <source>Processed %n blocks of transaction history.</source> - <translation><numerusform>%n Blok verwerkt van transactie geschiedenis.</numerusform><numerusform>%n Blokken verwerkt van transactie geschiedenis.</numerusform></translation> - </message> <message> <source>Catching up...</source> <translation>Aan het bijwerken...</translation> @@ -495,18 +479,6 @@ <translation>Binnenkomende transactie</translation> </message> <message> - <source>Date: %1 -Amount: %2 -Type: %3 -Address: %4 -</source> - <translation>Datum: %1 -Bedrag: %2 -Type: %3 -Adres: %4 -</translation> - </message> - <message> <source>Wallet is <b>encrypted</b> and currently <b>unlocked</b></source> <translation>Portemonnee is <b>versleuteld</b> en momenteel <b>geopend</b></translation> </message> @@ -618,7 +590,7 @@ Adres: %4 </message> <message> <source>Lock unspent</source> - <translation>Blokeer niet gebruikte</translation> + <translation>Blokeer ongebruikte</translation> </message> <message> <source>Unlock unspent</source> @@ -709,10 +681,6 @@ Adres: %4 <translation>nee</translation> </message> <message> - <source>This label turns red, if the transaction size is greater than 1000 bytes.</source> - <translation>Dit label wordt rood, als de transactie grootte meer dan 1000 bytes is.</translation> - </message> - <message> <source>This means a fee of at least %1 per kB is required.</source> <translation>Dit betekent dat een vergoeding van minimaal %1 per kB nodig is.</translation> </message> @@ -725,14 +693,6 @@ Adres: %4 <translation>Transacties met een hogere prioriteit zullen eerder in een block gezet worden.</translation> </message> <message> - <source>This label turns red, if the priority is smaller than "medium".</source> - <translation>Als dit label rood is, is de prioriteit minder dan "medium".</translation> - </message> - <message> - <source>This label turns red, if any recipient receives an amount smaller than %1.</source> - <translation>Dit label wordt rood, als een ontvanger een bedrag van minder dan %1 gekregen heeft.</translation> - </message> - <message> <source>(no label)</source> <translation>(geen label)</translation> </message> @@ -853,30 +813,6 @@ Adres: %4 <source>command-line options</source> <translation>commandoregel-opties</translation> </message> - <message> - <source>UI options</source> - <translation>gebruikersinterfaceopties</translation> - </message> - <message> - <source>Set language, for example "de_DE" (default: system locale)</source> - <translation>Stel taal in, bijvoorbeeld ''de_DE" (standaard: systeeminstellingen)</translation> - </message> - <message> - <source>Start minimized</source> - <translation>Geminimaliseerd starten</translation> - </message> - <message> - <source>Set SSL root certificates for payment request (default: -system-)</source> - <translation>Zet SSL root certificaten voor betalingsverzoek (standaard: -sytem-)</translation> - </message> - <message> - <source>Show splash screen on startup (default: 1)</source> - <translation>Laat laadscherm zien bij het opstarten. (standaard: 1)</translation> - </message> - <message> - <source>Choose data directory on startup (default: 0)</source> - <translation>Kies de gegevensmap tijdens het opstarten (standaard: 0)</translation> - </message> </context> <context> <name>Intro</name> @@ -959,14 +895,6 @@ Adres: %4 <translation>&Algemeen</translation> </message> <message> - <source>Automatically start Bitcoin after logging in to the system.</source> - <translation>Start Bitcoin automatisch na inloggen in het systeem</translation> - </message> - <message> - <source>&Start Bitcoin on system login</source> - <translation>Start &Bitcoin bij het inloggen in het systeem</translation> - </message> - <message> <source>Size of &database cache</source> <translation>Grootte van de &database cache</translation> </message> @@ -1079,10 +1007,6 @@ Adres: %4 <translation>&Minimaliseer naar het systeemvak in plaats van de taakbalk</translation> </message> <message> - <source>Minimize instead of exit the application when the window is closed. When this option is enabled, the application will be closed only after selecting Quit in the menu.</source> - <translation>Minimaliseer het venster in de plaats van de applicatie af te sluiten als het venster gesloten wordt. Wanneer deze optie aan staan, kan de applicatie alleen worden afgesloten door Afsluiten te kiezen in het menu.</translation> - </message> - <message> <source>M&inimize on close</source> <translation>Minimaliseer bij sluiten van het &venster</translation> </message> @@ -1095,10 +1019,6 @@ Adres: %4 <translation>Taal &Gebruikersinterface:</translation> </message> <message> - <source>The user interface language can be set here. This setting will take effect after restarting Bitcoin.</source> - <translation>De taal van de gebruikersinterface kan hier ingesteld worden. Deze instelling zal pas van kracht worden nadat Bitcoin herstart wordt.</translation> - </message> - <message> <source>&Unit to show amounts in:</source> <translation>&Eenheid om bedrag in te tonen:</translation> </message> @@ -1135,10 +1055,6 @@ Adres: %4 <translation>Herstart van de client is vereist om veranderingen door te voeren.</translation> </message> <message> - <source>Client will be shutdown, do you want to proceed?</source> - <translation>De client zal worden afgesloten, wilt u doorgaan?</translation> - </message> - <message> <source>This change would require a client restart.</source> <translation>Om dit aan te passen moet de client opnieuw gestart worden.</translation> </message> @@ -1245,10 +1161,6 @@ Adres: %4 <translation>Betalingsaanvraagnetwerk komt niet overeen met klantennetwerk.</translation> </message> <message> - <source>Payment request has expired.</source> - <translation>Betalingsverzoek is verlopen.</translation> - </message> - <message> <source>Payment request is not initialized.</source> <translation>Betalingsaanvraag is niet geïnitialiseerd.</translation> </message> @@ -1289,6 +1201,14 @@ Adres: %4 <translation>Restitutie van %1</translation> </message> <message> + <source>Payment request %1 is too large (%2 bytes, allowed %3 bytes).</source> + <translation>Betalingsverzoek %1 is te groot (%2 bytes, toegestaan %3 bytes).</translation> + </message> + <message> + <source>Payment request DoS protection</source> + <translation>Betalingsaanvraag DoS bescherming</translation> + </message> + <message> <source>Error communicating with %1: %2</source> <translation>Fout bij communiceren met %1: %2</translation> </message> @@ -1316,10 +1236,6 @@ Adres: %4 <translation>User Agent</translation> </message> <message> - <source>Address/Hostname</source> - <translation>Adres/Hostnaam</translation> - </message> - <message> <source>Ping Time</source> <translation>Ping tijd</translation> </message> @@ -1351,14 +1267,6 @@ Adres: %4 <translation>%1s</translation> </message> <message> - <source>NETWORK</source> - <translation>Netwerk</translation> - </message> - <message> - <source>UNKNOWN</source> - <translation>ONBEKEND</translation> - </message> - <message> <source>None</source> <translation>Geen</translation> </message> @@ -1557,18 +1465,10 @@ Adres: %4 <translation>Debug-logbestand</translation> </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>Open het Bitcoindebug-logbestand van de huidige datamap. Dit kan een aantal seconden duren voor grote logbestanden.</translation> - </message> - <message> <source>Clear console</source> <translation>Maak console leeg</translation> </message> <message> - <source>Welcome to the Bitcoin RPC console.</source> - <translation>Welkom bij de Bitcoin RPC-console.</translation> - </message> - <message> <source>Use up and down arrows to navigate history, and <b>Ctrl-L</b> to clear screen.</source> <translation>Gebruik de pijltjestoetsen om door de geschiedenis te navigeren, en <b>Ctrl-L</b> om het scherm leeg te maken.</translation> </message> @@ -1853,18 +1753,30 @@ Adres: %4 <translation>Kies...</translation> </message> <message> - <source>Minimize</source> - <translation>Minimaliseer</translation> + <source>collapse fee-settings</source> + <translation>Transactiekosteninstellingen verbergen</translation> </message> <message> <source>per kilobyte</source> <translation>per kilobyte</translation> </message> <message> + <source>If the custom fee is set to 1000 satoshis and the transaction is only 250 bytes, then "per kilobyte" only pays 250 satoshis in fee, while "total at least" pays 1000 satoshis. For transactions bigger than a kilobyte both pay by kilobyte.</source> + <translation>Als de aangepaste toeslag is ingesteld op 1000 satoshis en de transactie is maar 250 bytes, dan wordt bij "per kilobyte" 250 satoshis aan toeslag berekend, terwijl er bij "totaal tenminste" 1000 satoshis worden berekend. Voor transacties die groter zijn dan een kilobyte, wordt in beide gevallen per kilobyte de toeslag berekend.</translation> + </message> + <message> <source>total at least</source> <translation>totaal ten minste</translation> </message> <message> + <source>Paying only the minimum fee is just fine as long as there is less transaction volume than space in the blocks. But be aware that this can end up in a never confirming transaction once there is more demand for bitcoin transactions than the network can process.</source> + <translation>De minimale toeslag betalen is prima mits het transactievolume kleiner is dan de ruimte in de blokken. Let wel op dat dit tot gevolg kan hebben dat een transactie nooit wordt bevestigd als er meer vraag is naar bitcointransacties dan het netwerk kan verwerken.</translation> + </message> + <message> + <source>(read the tooltip)</source> + <translation>(lees de tooltip)</translation> + </message> + <message> <source>Recommended:</source> <translation>Aanbevolen:</translation> </message> @@ -1873,6 +1785,10 @@ Adres: %4 <translation>Handmatig:</translation> </message> <message> + <source>(Smart fee not initialized yet. This usually takes a few blocks...)</source> + <translation>(Slimme vergoeding is nog niet geïnitialiseerd. Dit duurt meestal een paar blokken...)</translation> + </message> + <message> <source>Confirmation time:</source> <translation>Bevestigings tijd:</translation> </message> @@ -1885,6 +1801,10 @@ Adres: %4 <translation>snel</translation> </message> <message> + <source>Send as zero-fee transaction if possible</source> + <translation>Verstuur als transactie zonder verzendkosten indien mogelijk</translation> + </message> + <message> <source>(confirmation may take longer)</source> <translation>(bevestiging kan langer duren)</translation> </message> @@ -1965,10 +1885,6 @@ Adres: %4 <translation>of</translation> </message> <message> - <source>The recipient address is not valid, please recheck.</source> - <translation>Het ontvangstadres is niet geldig, controleer uw invoer.</translation> - </message> - <message> <source>The amount to pay must be larger than 0.</source> <translation>Het ingevoerde bedrag moet groter zijn dan 0.</translation> </message> @@ -1981,10 +1897,6 @@ Adres: %4 <translation>Totaal overschrijdt uw huidige saldo wanneer de %1 transactiekosten worden meegerekend</translation> </message> <message> - <source>Duplicate address found, can only send to each address once per send operation.</source> - <translation>Dubbel adres gevonden, u kunt slechts eenmaal naar een bepaald adres verzenden per verstuurtransactie</translation> - </message> - <message> <source>Transaction creation failed!</source> <translation>Transactie creatie niet gelukt!</translation> </message> @@ -1993,18 +1905,10 @@ Adres: %4 <translation>De transactie was afgewezen. Dit kan gebeuren als u eerder uitgegeven munten opnieuw wilt versturen, zoals wanneer u een kopie van uw wallet.dat heeft gebruikt en in de kopie deze munten zijn gemarkeerd als uitgegeven, maar in de huidige nog niet.</translation> </message> <message> - <source>A fee higher than %1 is considered an insanely high fee.</source> - <translation>Transactiekosten hoger dan %1 worden gezien als waanzinnig hoog.</translation> - </message> - <message> <source>Pay only the minimum fee of %1</source> <translation>Betaal alleen de minimale transactiekosten van %1</translation> </message> <message> - <source>Estimated to begin confirmation within %1 block(s).</source> - <translation>Beginnen van bevesting geschat binnen %1 blok(ken).</translation> - </message> - <message> <source>Warning: Invalid Bitcoin address</source> <translation>Waarschuwing: Ongeldig Bitcoin adres</translation> </message> @@ -2080,10 +1984,6 @@ Adres: %4 <translation>Bericht:</translation> </message> <message> - <source>This is a verified payment request.</source> - <translation>Dit is een geverifieerd betalingsverzoek.</translation> - </message> - <message> <source>Enter a label for this address to add it to the list of used addresses</source> <translation>Vul een label voor dit adres in om het aan de lijst met gebruikte adressen toe te voegen</translation> </message> @@ -2092,10 +1992,6 @@ Adres: %4 <translation>Een bericht dat werd toegevoegd aan de bitcoin: URI dewelke wordt opgeslagen met de transactie ter referentie. Opmerking: Dit bericht zal niet worden verzonden over het Bitcoin netwerk.</translation> </message> <message> - <source>This is an unverified payment request.</source> - <translation>Dit is een ongeverifieerd betalingsverzoek.</translation> - </message> - <message> <source>Pay To:</source> <translation>Betaal Aan:</translation> </message> @@ -2126,10 +2022,6 @@ Adres: %4 <translation>O&nderteken Bericht</translation> </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>U kunt berichten ondertekenen met een van uw adressen om te bewijzen dat u dit adres bezit. Pas op dat u geen onduidelijke dingen ondertekent, want phishingaanvallen zouden u kunnen misleiden om zo uw identiteit te stelen. Onderteken alleen berichten waarmee u het volledig eens bent.</translation> - </message> - <message> <source>The Bitcoin address to sign the message with</source> <translation>Het Bitcoin adres om bericht mee te ondertekenen</translation> </message> @@ -2182,10 +2074,6 @@ Adres: %4 <translation>&Verifiëer Bericht</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>Voer het ondertekenende adres, bericht en handtekening hieronder in (let erop dat u nieuwe regels, spaties en tabs juist overneemt) om de handtekening te verifiëren. Let erop dat u niet meer uit het bericht interpreteert dan er daadwerkelijk staat, om te voorkomen dat u wordt misleid in een man-in-the-middle-aanval.</translation> - </message> - <message> <source>The Bitcoin address the message was signed with</source> <translation>Het Bitcoin adres waarmee het bericht ondertekend is</translation> </message> @@ -2449,10 +2337,6 @@ Adres: %4 <translation>Type</translation> </message> <message> - <source>Address</source> - <translation>Adres</translation> - </message> - <message> <source>Immature (%1 confirmations, will be available after %2)</source> <translation>immatuur (%1 bevestigingen, zal beschikbaar zijn na %2)</translation> </message> @@ -2481,6 +2365,10 @@ Adres: %4 <translation>Niet verbonden</translation> </message> <message> + <source>Label</source> + <translation>Label</translation> + </message> + <message> <source>Unconfirmed</source> <translation>Onbevestigd</translation> </message> @@ -2533,8 +2421,8 @@ Adres: %4 <translation>Type transactie.</translation> </message> <message> - <source>Destination address of transaction.</source> - <translation>Ontvangend adres van transactie.</translation> + <source>Whether or not a watch-only address is involved in this transaction.</source> + <translation>Of er een alleen-bekijken adres is betrokken bij deze transactie.</translation> </message> <message> <source>Amount removed from or added to balance.</source> @@ -2775,42 +2663,20 @@ Adres: %4 <translation>Accepteer verbindingen van buitenaf (standaard: 1 als geen -proxy of -connect is opgegeven)</translation> </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>%s, u moet een RPC-wachtwoord instellen in het configuratiebestand: %s -U wordt aangeraden het volgende willekeurige wachtwoord te gebruiken: -rpcuser=bitcoinrpc -rpcpassword=%s -(u hoeft dit wachtwoord niet te onthouden) -De gebruikersnaam en wachtwoord mogen niet hetzelfde zijn. -Als het bestand niet bestaat, make hem dan aan met leesrechten voor enkel de eigenaar. -Het is ook aan te bevelen "alertnotify" in te stellen zodat u op de hoogte gesteld wordt van problemen; -bijvoorbeeld: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo.com</translation> - </message> - <message> <source>Bind to given address and always listen on it. Use [host]:port notation for IPv6</source> <translation>Bind aan opgegeven adres en luister er altijd op. Gebruik [host]:port notatie voor IPv6</translation> </message> <message> - <source>Enter regression test mode, which uses a special chain in which blocks can be solved instantly.</source> - <translation>Schakel regressietest-modus in, die een speciale blokketen gebruikt waarin blokken onmiddellijk opgelost kunnen worden.</translation> + <source>Delete all wallet transactions and only recover those parts of the blockchain through -rescan on startup</source> + <translation>Verwijder alle transacties van de portemonnee en herstel alleen de delen van de blockchain door -rescan tijdens het opstarten</translation> </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>Fout: De transactie was afgewezen! Dit kan gebeuren als sommige munten in uw portemonnee al eerder uitgegeven zijn, zoals wanneer u een kopie van uw wallet.dat heeft gebruikt en in de kopie deze munten zijn uitgegeven, maar in deze portemonnee die munten nog niet als zodanig zijn gemarkeerd.</translation> + <source>Distributed under the MIT software license, see the accompanying file COPYING or <http://www.opensource.org/licenses/mit-license.php>.</source> + <translation>Uitgegeven onder de MIT software licentie, zie het bijgevoegde bestand COPYING of <http://www.opensource.org/licenses/mit-license.php>.</translation> </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>Fout: Deze transactie vereist transactiekosten van tenminste %s, vanwege zijn grootte, complexiteit, of het gebruik van onlangs ontvangen munten!</translation> + <source>Enter regression test mode, which uses a special chain in which blocks can be solved instantly.</source> + <translation>Schakel regressietest-modus in, die een speciale blokketen gebruikt waarin blokken onmiddellijk opgelost kunnen worden.</translation> </message> <message> <source>Execute command when a wallet transaction changes (%s in cmd is replaced by TxID)</source> @@ -2853,6 +2719,10 @@ bijvoorbeeld: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo.com</tran <translation>Waarschuwing: wallet.dat is corrupt, data is veiliggesteld! Originele wallet.dat is opgeslagen als wallet.{tijdstip}.bak in %s; als uw balans of transacties incorrect zijn dient u een backup terug te zetten.</translation> </message> <message> + <source>Whitelist peers connecting from the given netmask or IP address. Can be specified multiple times.</source> + <translation>Goedgekeurde peers die verbinden van het ingegeven netmask of IP adres. Kan meerdere keren gespecificeerd worden.</translation> + </message> + <message> <source>(default: 1)</source> <translation>(standaard: 1)</translation> </message> @@ -2885,10 +2755,6 @@ bijvoorbeeld: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo.com</tran <translation>Foutopsporing/Testopties:</translation> </message> <message> - <source>Discover own IP address (default: 1 when listening and no -externalip)</source> - <translation>Ontdek eigen IP-adres (standaard: 1 als er wordt geluisterd en geen -externalip is opgegeven)</translation> - </message> - <message> <source>Do not load the wallet and disable wallet RPC calls</source> <translation>Laad de wallet niet en schakel wallet RPC oproepen uit</translation> </message> @@ -2913,12 +2779,12 @@ bijvoorbeeld: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo.com</tran <translation>Fout bij openen blokkendatabase</translation> </message> <message> - <source>Error: Disk space is low!</source> - <translation>Fout: Weinig vrije diskruimte!</translation> + <source>Error: A fatal internal error occured, see debug.log for details</source> + <translation>Fout: Een fatale interne fout is opgetreden, zie debug.log voor details</translation> </message> <message> - <source>Error: Wallet locked, unable to create transaction!</source> - <translation>Fout: Portemonnee vergrendeld, aanmaak transactie niet mogelijk!</translation> + <source>Error: Disk space is low!</source> + <translation>Fout: Weinig vrije diskruimte!</translation> </message> <message> <source>Failed to listen on any port. Use -listen=0 if you want this.</source> @@ -2945,8 +2811,8 @@ bijvoorbeeld: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo.com</tran <translation>Niet genoeg file descriptors beschikbaar.</translation> </message> <message> - <source>Rebuild block chain index from current blk000??.dat files</source> - <translation>Blokketen opnieuw opbouwen met behulp van huidige blk000??.dat-bestanden</translation> + <source>Only connect to nodes in network <net> (ipv4, ipv6 or onion)</source> + <translation>Verbind alleen met nodes in netwerk <net> (ipv4, ipv6 of onion)</translation> </message> <message> <source>Set database cache size in megabytes (%d to %d, default: %d)</source> @@ -2993,26 +2859,143 @@ bijvoorbeeld: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo.com</tran <translation>Importeert blokken van extern blk000??.dat bestand</translation> </message> <message> + <source>Allow JSON-RPC connections from specified source. Valid for <ip> are a single IP (e.g. 1.2.3.4), a network/netmask (e.g. 1.2.3.4/255.255.255.0) or a network/CIDR (e.g. 1.2.3.4/24). This option can be specified multiple times</source> + <translation>Sta JSON-RPC verbindingen toe vanuit een gespecificeerde bron. Geldig voor <ip> zijn een enkel IP (bijv. 1.2.3.4), een netwerk/netmask (bijv. 1.2.3.4/255.255.255.0) of een netwerk/CIDR (bijv. 1.2.3.4/24). Deze optie kan meerdere keren gespecificeerd worden.</translation> + </message> + <message> + <source>An error occurred while setting up the RPC address %s port %u for listening: %s</source> + <translation>Er is een fout opgetreden tijdens het opzetten van het RPC adres %s poort %u voor luisteren: %s</translation> + </message> + <message> + <source>Bind to given address and whitelist peers connecting to it. Use [host]:port notation for IPv6</source> + <translation>Bind aan opgegeven adres en keur peers die ermee verbinden goed. Gebruik [host]:poort notatie voor IPv6</translation> + </message> + <message> + <source>Bind to given address to listen for JSON-RPC connections. Use [host]:port notation for IPv6. This option can be specified multiple times (default: bind to all interfaces)</source> + <translation>Bind aan gegeven adres om te luisteren voor JSON-RPC verbindingen. Gebruik [host]:poort notatie voor IPv6. Deze optie kan meerdere keren gespecificeerd worden (standaard: bind aan alle interfaces.</translation> + </message> + <message> <source>Cannot obtain a lock on data directory %s. Bitcoin Core is probably already running.</source> <translation>Kan geen lock verkrijgen op gegevensmap %s. Bitcoin Core draait waarschijnlijk al.</translation> </message> <message> + <source>Create new files with system default permissions, instead of umask 077 (only effective with disabled wallet functionality)</source> + <translation>Creër nieuwe bestanden met standaard systeem bestandsrechten in plaats van umask 077 (alleen effectief met uitgeschakelde portemonnee functionaliteit)</translation> + </message> + <message> + <source>Error: Listening for incoming connections failed (listen returned error %s)</source> + <translation>Fout: luisteren naar binnenkomende verbindingen mislukt (luisteren gaf foutmelding %s)</translation> + </message> + <message> + <source>Error: Unsupported argument -socks found. Setting SOCKS version isn't possible anymore, only SOCKS5 proxies are supported.</source> + <translation>Fout: er is een niet-ondersteund argument -socks aangetroffen. Het instellen van de SOCKS-versie is niet langer mogelijk. Alleen SOCKS5-proxy's worden ondersteund.</translation> + </message> + <message> <source>Execute command when a relevant alert is received or we see a really long fork (%s in cmd is replaced by message)</source> <translation>Voer commando uit zodra een waarschuwing is ontvangen of wanneer we een erg lange fork detecteren (%s in commando wordt vervangen door bericht)</translation> </message> <message> + <source>Fees (in BTC/Kb) smaller than this are considered zero fee for relaying (default: %s)</source> + <translation>Toeslagen (in BTC/Kb) kleiner dan dit worden beschouwd als geen vergoeding (voor doorgeven) (standaard: %s)</translation> + </message> + <message> + <source>Fees (in BTC/Kb) smaller than this are considered zero fee for transaction creation (default: %s)</source> + <translation>Toeslagen (in BTC/Kb) kleiner dan dit worden beschouwd als geen vergoeding transactieaanmaak (standaard: %s)</translation> + </message> + <message> + <source>If paytxfee is not set, include enough fee so transactions begin confirmation on average within n blocks (default: %u)</source> + <translation>Als paytxfee niet is ingesteld, het pakket voldoende vergoeding zodat transacties beginnen bevestiging gemiddeld binnen in blokken (default: %u)</translation> + </message> + <message> + <source>Invalid amount for -maxtxfee=<amount>: '%s' (must be at least the minrelay fee of %s to prevent stuck transactions)</source> + <translation>ongeldig bedrag voor -maxtxfee=<amount>: '%s' (moet ten minste de minrelay vergoeding van %s het voorkomen geplakt transacties voorkomen)</translation> + </message> + <message> + <source>Maximum size of data in data carrier transactions we relay and mine (default: %u)</source> + <translation>Maximale grootte va n de gegevens in gegevensdrager transacties we relais en de mijnen +(default: %u)</translation> + </message> + <message> + <source>Query for peer addresses via DNS lookup, if low on addresses (default: 1 unless -connect)</source> + <translation>Query voor peer- adressen via DNS- lookup , als laag op adressen (default: 1 unless -connect)</translation> + </message> + <message> <source>Set maximum size of high-priority/low-fee transactions in bytes (default: %d)</source> <translation>Stel maximumgrootte in bytes in voor hoge-prioriteits-/lage-transactiekosten-transacties (standaard: %d)</translation> </message> <message> + <source>Set the number of threads for coin generation if enabled (-1 = all cores, default: %d)</source> + <translation>Stel het aantal threads in voor het genereren van coins indien ingesteld (-1 = alle kernen, standaard: %d)</translation> + </message> + <message> + <source>This product includes software developed by the OpenSSL Project for use in the OpenSSL Toolkit <https://www.openssl.org/> and cryptographic software written by Eric Young and UPnP software written by Thomas Bernard.</source> + <translation>Dit product bevat software dat ontwikkeld is door het OpenSSL Project voor gebruik in de OpenSSL Toolkit <https://www.openssl.org/> en cryptografische software geschreven door Eric Young en UPnP software geschreven door Thomas Bernard.</translation> + </message> + <message> + <source>Warning: -maxtxfee is set very high! Fees this large could be paid on a single transaction.</source> + <translation>Let op: -maxtxfee is erg hoog ingesteld! Transactiekosten van dergelijke groottes kunnen in een enkele transactie worden betaald.</translation> + </message> + <message> + <source>Warning: Please check that your computer's date and time are correct! If your clock is wrong Bitcoin Core will not work properly.</source> + <translation>Waarschuwing: Controleer dat de datum en tijd van uw computer correct zijn ingesteld! Bij een onjuist ingestelde klok zal Bitcoin Core niet goed werken.</translation> + </message> + <message> + <source>Whitelisted peers cannot be DoS banned and their transactions are always relayed, even if they are already in the mempool, useful e.g. for a gateway</source> + <translation>Goedgekeurde peers kunnen niet ge-DoS-banned worden en hun transacties worden altijd doorgestuurd, zelfs als ze reeds in de mempool aanwezig zijn, nuttig voor bijv. een gateway</translation> + </message> + <message> + <source>Accept public REST requests (default: %u)</source> + <translation>Accepteer publieke REST-requests (standaard: %u)</translation> + </message> + <message> + <source>Cannot resolve -whitebind address: '%s'</source> + <translation>Kan -whitebind adres niet herleiden: '%s'</translation> + </message> + <message> + <source>Choose data directory on startup (default: 0)</source> + <translation>Kies de gegevensmap tijdens het opstarten (standaard: 0)</translation> + </message> + <message> + <source>Connect through SOCKS5 proxy</source> + <translation>Verbind door SOCKS5 proxy</translation> + </message> + <message> + <source>Copyright (C) 2009-%i The Bitcoin Core Developers</source> + <translation>Auteursrecht (C) 2009-%i De Bitcoin Core Ontwikkelaars</translation> + </message> + <message> + <source>Could not parse -rpcbind value %s as network address</source> + <translation>Niet mogelijk om -rpcbind waarde %s te verwerken als netwerk adres</translation> + </message> + <message> <source>Error loading wallet.dat: Wallet requires newer version of Bitcoin Core</source> <translation>Fout bij laden wallet.dat: Portemonnee vereist een nieuwere versie van Bitcoin Core</translation> </message> <message> + <source>Error reading from database, shutting down.</source> + <translation>Fout bij het lezen van de database, afsluiten. </translation> + </message> + <message> + <source>Error: Unsupported argument -tor found, use -onion.</source> + <translation>Fout: Niet ondersteund argument -tor gevonden, gebruik -onion.</translation> + </message> + <message> + <source>Fee (in BTC/kB) to add to transactions you send (default: %s)</source> + <translation>Transactiekosten (in BTC/kB) om toe te voegen aan transacties die u verstuurd (standaard: %s)</translation> + </message> + <message> <source>Information</source> <translation>Informatie</translation> </message> <message> + <source>Initialization sanity check failed. Bitcoin Core is shutting down.</source> + <translation>Initialisatie sanity check mislukt. Bitcoin Core is aan het afsluiten.</translation> + </message> + <message> + <source>Invalid amount for -maxtxfee=<amount>: '%s'</source> + <translation>Ongeldig bedrag voor -maxtxfee=<amount>: '%s'</translation> + </message> + <message> <source>Invalid amount for -minrelaytxfee=<amount>: '%s'</source> <translation>Ongeldig bedrag voor -minrelaytxfee=<bedrag>: '%s'</translation> </message> @@ -3025,16 +3008,20 @@ bijvoorbeeld: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo.com</tran <translation>Ongeldig bedrag voor -paytxfee=<bedrag>: '%s' (Minimum %s)</translation> </message> <message> - <source>Keep at most <n> unconnectable blocks in memory (default: %u)</source> - <translation>Houd maximaal <n> onverbonden blokken in geheugen (standaard: %u)</translation> + <source>Invalid netmask specified in -whitelist: '%s'</source> + <translation>Ongeldig netmask gespecificeerd in -whitelist: '%s'</translation> </message> <message> <source>Keep at most <n> unconnectable transactions in memory (default: %u)</source> <translation>Houd maximaal <n> onverbonden transacties in geheugen (standaard: %u)</translation> </message> <message> - <source>Print block on startup, if found in block index</source> - <translation>Toon block bij opstarten, wanneer gevonden in block index</translation> + <source>Need to specify a port with -whitebind: '%s'</source> + <translation>Verplicht een poort met -whitebind op te geven: '%s'</translation> + </message> + <message> + <source>Node relay options:</source> + <translation>Node relay opties:</translation> </message> <message> <source>RPC SSL options: (see the Bitcoin Wiki for SSL setup instructions)</source> @@ -3045,6 +3032,10 @@ bijvoorbeeld: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo.com</tran <translation>RPC server opties:</translation> </message> <message> + <source>RPC support for HTTP persistent connections (default: %d)</source> + <translation>RPC ondersteuning voor HTTP persisten verbindingen (default: %d)</translation> + </message> + <message> <source>Randomly drop 1 of every <n> network messages</source> <translation>Laat willekeurig 1 elke <n> netwerkberichten vallen</translation> </message> @@ -3057,10 +3048,26 @@ bijvoorbeeld: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo.com</tran <translation>Stuur trace/debug-info naar de console in plaats van het debug.log bestand</translation> </message> <message> + <source>Send transactions as zero-fee transactions if possible (default: %u)</source> + <translation>Verstuur transacties zonder verzendkosten indien mogelijk (standaard: %u)</translation> + </message> + <message> + <source>Set SSL root certificates for payment request (default: -system-)</source> + <translation>Zet SSL root certificaten voor betalingsverzoek (standaard: -sytem-)</translation> + </message> + <message> + <source>Set language, for example "de_DE" (default: system locale)</source> + <translation>Stel taal in, bijvoorbeeld ''de_DE" (standaard: systeeminstellingen)</translation> + </message> + <message> <source>Show all debugging options (usage: --help -help-debug)</source> <translation>Toon alle foutopsporingsopties (gebruik: --help -help-debug)</translation> </message> <message> + <source>Show splash screen on startup (default: 1)</source> + <translation>Laat laadscherm zien bij het opstarten. (standaard: 1)</translation> + </message> + <message> <source>Shrink debug.log file on client startup (default: 1 when no -debug)</source> <translation>Verklein debug.log-bestand bij het opstarten van de client (standaard: 1 als geen -debug)</translation> </message> @@ -3069,6 +3076,10 @@ bijvoorbeeld: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo.com</tran <translation>Ondertekenen van transactie mislukt</translation> </message> <message> + <source>Start minimized</source> + <translation>Geminimaliseerd starten</translation> + </message> + <message> <source>This is experimental software.</source> <translation>Dit is experimentele software.</translation> </message> @@ -3081,10 +3092,18 @@ bijvoorbeeld: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo.com</tran <translation>Transactiebedragen moeten positief zijn</translation> </message> <message> + <source>Transaction too large for fee policy</source> + <translation>De transactie is te groot voor het toeslagenbeleid</translation> + </message> + <message> <source>Transaction too large</source> <translation>Transactie te groot</translation> </message> <message> + <source>Unable to bind to %s on this computer (bind returned error %s)</source> + <translation>Niet in staat om aan %s te binden op deze computer (bind gaf error %s)</translation> + </message> + <message> <source>Use UPnP to map the listening port (default: 1 when listening)</source> <translation>Gebruik UPnP om de luisterende poort te mappen (standaard: 1 als er wordt geluisterd)</translation> </message> @@ -3093,12 +3112,20 @@ bijvoorbeeld: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo.com</tran <translation>Gebruikersnaam voor JSON-RPC-verbindingen</translation> </message> <message> + <source>Wallet needed to be rewritten: restart Bitcoin Core to complete</source> + <translation>Portemonnee moest herschreven worden: Herstart Bitcoin Core om te voltooien</translation> + </message> + <message> <source>Warning</source> <translation>Waarschuwing</translation> </message> <message> - <source>Warning: This version is obsolete, upgrade required!</source> - <translation>Waarschuwing: Deze versie is verouderd, een upgrade is vereist!</translation> + <source>Warning: Unsupported argument -benchmark ignored, use -debug=bench.</source> + <translation>Waarschuwing: Niet ondersteund argument -benchmark genegeerd, gebruik -debug=bench.</translation> + </message> + <message> + <source>Warning: Unsupported argument -debugnet ignored, use -debug=net.</source> + <translation>Waarschuwing: Niet ondersteund argument -debugnet genegeerd, gebruik -debug=net.</translation> </message> <message> <source>Zapping all transactions from wallet...</source> @@ -3149,6 +3176,22 @@ bijvoorbeeld: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo.com</tran <translation>Fout bij laden wallet.dat: Portemonnee corrupt</translation> </message> <message> + <source>(1 = keep tx meta data e.g. account owner and payment request information, 2 = drop tx meta data)</source> + <translation>(1 = behoudt tx meta data bijv. account eigenaar en betalingsverzoek informatie, 2. sla tx meta data niet op)</translation> + </message> + <message> + <source>Flush database activity from memory pool to disk log every <n> megabytes (default: %u)</source> + <translation>Leeg database-activiteit uit de geheugen pool naar schijf log elke <n> megabytes (standaard: %u) </translation> + </message> + <message> + <source>How thorough the block verification of -checkblocks is (0-4, default: %u)</source> + <translation>Hoe grondig de blokverificatie van -checkblocks is (0-4, standaard: %u)</translation> + </message> + <message> + <source>Log transaction priority and fee per kB when mining blocks (default: %u)</source> + <translation>Log transactieprioriteit en -kosten per kB bij het mijnen van blokken (standaard: %u)</translation> + </message> + <message> <source>Maintain a full transaction index, used by the getrawtransaction rpc call (default: %u)</source> <translation>Onderhoud een volledige transactieindex, gebruikt door de getrawtransaction rpc call (standaard: %u)</translation> </message> @@ -3165,6 +3208,10 @@ bijvoorbeeld: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo.com</tran <translation>Gebruik een aparte SOCKS5 proxy om 'Tor hidden services' te bereiken (standaard: %s)</translation> </message> <message> + <source>Acceptable ciphers (default: %s)</source> + <translation>Geaccepteerde versleutelingen (standaard: %s)</translation> + </message> + <message> <source>Always query for peer addresses via DNS lookup (default: %u)</source> <translation>Vind anderen door middel van een DNS-naslag (standaard: %u)</translation> </message> @@ -3189,6 +3236,10 @@ bijvoorbeeld: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo.com</tran <translation>Aantal te checken blokken bij het opstarten (standaard: %u, 0 = allemaal)</translation> </message> <message> + <source>Include IP addresses in debug output (default: %u)</source> + <translation>IP-adressen toevoegen in de debuguitvoer (standaard: %u)</translation> + </message> + <message> <source>Invalid -proxy address: '%s'</source> <translation>Ongeldig -proxy adres: '%s'</translation> </message> @@ -3225,8 +3276,12 @@ bijvoorbeeld: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo.com</tran <translation>Prepend debug output met tijdstempel (standaard: %u)</translation> </message> <message> - <source>Print block tree on startup (default: %u)</source> - <translation>Toon block structuur bij opstarten (default: %u)</translation> + <source>Relay and mine data carrier transactions (default: %u)</source> + <translation>Gegevensdrager transacties relay en de mijnen (default: %u)</translation> + </message> + <message> + <source>Relay non-P2SH multisig (default: %u)</source> + <translation>Relay non-P2SH multisig (default: %u)</translation> </message> <message> <source>Run a thread to flush wallet periodically (default: %u)</source> @@ -3273,6 +3328,10 @@ bijvoorbeeld: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo.com</tran <translation>Besteed onbevestigd wisselgeld bij het versturen van transacties (standaard: %u)</translation> </message> <message> + <source>Stop running after importing blocks from disk (default: %u)</source> + <translation>Stop uitvoeren na het importeren van blokken van de schijf (standaard: %u)</translation> + </message> + <message> <source>Threshold for disconnecting misbehaving peers (default: %u)</source> <translation>Drempel om verbinding te verbreken naar zich misdragende peers (standaard: %u)</translation> </message> @@ -3293,10 +3352,6 @@ bijvoorbeeld: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo.com</tran <translation>Ongeldig bedrag voor -paytxfee=<bedrag>: '%s'</translation> </message> <message> - <source>Invalid amount</source> - <translation>Ongeldig bedrag</translation> - </message> - <message> <source>Insufficient funds</source> <translation>Ontoereikend saldo</translation> </message> @@ -3329,10 +3384,6 @@ bijvoorbeeld: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo.com</tran <translation>Klaar met laden</translation> </message> <message> - <source>To use the %s option</source> - <translation>Om de %s optie te gebruiken</translation> - </message> - <message> <source>Error</source> <translation>Fout</translation> </message> diff --git a/src/qt/locale/bitcoin_pam.ts b/src/qt/locale/bitcoin_pam.ts index b0a92a1578..503528f4a7 100644 --- a/src/qt/locale/bitcoin_pam.ts +++ b/src/qt/locale/bitcoin_pam.ts @@ -1,11 +1,7 @@ -<TS language="pam" version="2.0"> +<TS language="pam" version="2.1"> <context> <name>AddressBookPage</name> <message> - <source>Double-click to edit address or label</source> - <translation>Pindutan meng makatidduang besis ban ayalilan me ing address o label</translation> - </message> - <message> <source>Create a new address</source> <translation>Maglalang kang bayung address</translation> </message> @@ -51,7 +47,7 @@ </message> <message> <source>Sending addresses</source> - <translation>Address king pamag-Padala</translation> + <translation>Address king pamag-Send</translation> </message> <message> <source>Receiving addresses</source> @@ -136,10 +132,6 @@ <translation>Alilan ya ing passphrase</translation> </message> <message> - <source>Enter the old and new passphrase to the wallet.</source> - <translation>Palub ye ing luma ampo ing bayung passphrase king wallet.</translation> - </message> - <message> <source>Confirm wallet encryption</source> <translation>Kumpirman ya ing wallet encryption</translation> </message> @@ -164,10 +156,6 @@ <translation>Me-encrypt ne ing wallet</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>Ing Bitcoin ngeni magsara ya ban ayari ing proseso ning pamag-encrypt. Tandanan yu king pamag-encrypt wallet, ali nala aprotektan king kabuuan reng bitcoins yu kareng malware a kasalunsungan atiu kareng computer yu.</translation> - </message> - <message> <source>Wallet encryption failed</source> <translation>Memali ya ing pamag-encrypt king wallet </translation> </message> @@ -259,10 +247,6 @@ <translation>Magpadalang barya king Bitcoin address</translation> </message> <message> - <source>Modify configuration options for Bitcoin</source> - <translation>Alilan ing pipamilian konpigurasion para keng Bitcoin</translation> - </message> - <message> <source>Backup wallet to another location</source> <translation>I-backup ing wallet king aliwang lugal</translation> </message> @@ -355,18 +339,6 @@ <translation>Paparatang a transaksion</translation> </message> <message> - <source>Date: %1 -Amount: %2 -Type: %3 -Address: %4 -</source> - <translation>Aldo: %1 -Alaga: %2 -Type: %3 -Address: %4 -</translation> - </message> - <message> <source>Wallet is <b>encrypted</b> and currently <b>unlocked</b></source> <translation>Maka-<b>encrypt</b> ya ing wallet at kasalukuyan yang maka-<b>unlocked</b></translation> </message> @@ -485,23 +457,7 @@ Address: %4 <source>command-line options</source> <translation>pipamilian command-line</translation> </message> - <message> - <source>UI options</source> - <translation>Pipamilian ning UI</translation> - </message> - <message> - <source>Set language, for example "de_DE" (default: system locale)</source> - <translation>Mamiling Amanu, alimbawa "de_DE"(default: system locale)</translation> - </message> - <message> - <source>Start minimized</source> - <translation>Umpisan ing pamaglati</translation> - </message> - <message> - <source>Show splash screen on startup (default: 1)</source> - <translation>Ipalto ing splash screen keng umpisa (default: 1)</translation> - </message> - </context> +</context> <context> <name>Intro</name> <message> @@ -531,14 +487,6 @@ Address: %4 <translation>&Pun</translation> </message> <message> - <source>Automatically start Bitcoin after logging in to the system.</source> - <translation>Umpisan yang antimu ing Bitcoin kaibat mekapag-log in king sistema.</translation> - </message> - <message> - <source>&Start Bitcoin on system login</source> - <translation>&Umpisan ya ing Bitcoin king pamag-log-in na ning sistema.</translation> - </message> - <message> <source>&Network</source> <translation>&Network</translation> </message> @@ -575,10 +523,6 @@ Address: %4 <translation>&Latian ya ing tray kesa king taskbar</translation> </message> <message> - <source>Minimize instead of exit the application when the window is closed. When this option is enabled, the application will be closed only after selecting Quit in the menu.</source> - <translation>Palatian namu kesa king iluwal ya ing aplikasion istung makasara ya ing awang. Istung ing pipamilian a ini atiu king "magsilbi", ing aplikasion misara yamu kaibat meng pinili ing "Tuknangan" king menu.</translation> - </message> - <message> <source>M&inimize on close</source> <translation>P&alatian istung isara</translation> </message> @@ -591,10 +535,6 @@ Address: %4 <translation>Amanu na ning user interface:</translation> </message> <message> - <source>The user interface language can be set here. This setting will take effect after restarting Bitcoin.</source> - <translation>Ing amanu na ning user interface maliari yang i-ayus o ilage keni. Ing ayus a ini magsilbi yamu istung pesibayuan meng pasibayu ing Bitcoin.</translation> - </message> - <message> <source>&Unit to show amounts in:</source> <translation>Ing &Unit a ipakit king alaga ning:</translation> </message> @@ -745,18 +685,10 @@ Address: %4 <translation>Debug log file</translation> </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>Ibuklat ing Bitcoin debug log file menibat king kasalungsungan data directory. Magluat ya ining pilan segundu para kareng mamaragul a log files.</translation> - </message> - <message> <source>Clear console</source> <translation>I-Clear ing console</translation> </message> <message> - <source>Welcome to the Bitcoin RPC console.</source> - <translation>Malaus kayu king Bitcoin RPC console.</translation> - </message> - <message> <source>Use up and down arrows to navigate history, and <b>Ctrl-L</b> to clear screen.</source> <translation>Gamitan me ing patas at pababang arrow para alibut me ing kasalesayan, at <b>Ctrl-L</b> ban I-clear ya ing screen.</translation> </message> @@ -861,10 +793,6 @@ Address: %4 <translation>Kopyan ing alaga</translation> </message> <message> - <source>The recipient address is not valid, please recheck.</source> - <translation>Ing address na ning tumanggap ali ya katanggap-tanggap, maliari pung pakilaue pasibayu.</translation> - </message> - <message> <source>The amount to pay must be larger than 0.</source> <translation>Ing alaga na ning bayaran dapat mung mas matas ya king 0.</translation> </message> @@ -877,10 +805,6 @@ Address: %4 <translation>Ing kabuuan mipasobra ya king kekang balanse istung inabe ya ing %1 a bayad king transaksion </translation> </message> <message> - <source>Duplicate address found, can only send to each address once per send operation.</source> - <translation>Atin meakit a milupang address, maliari kamung magpadalang misan king metung a address king misan a pamagpadalang transaksion.</translation> - </message> - <message> <source>(no label)</source> <translation>(alang label)</translation> </message> @@ -930,10 +854,6 @@ Address: %4 <translation>&Pirman ing Mensayi</translation> </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>Maliari kang mamirmang mensayi king kekang address bilang patune na keka ya ini. Mimingat mu king pamag-pirmang e malino uling mapalyari kang mabiktimang phishing attack a manloku keka na pirman me ing sarili mu para king karela. Only sign fully-detailed statements you agree to.</translation> - </message> - <message> <source>Alt+A</source> <translation>Alt+A</translation> </message> @@ -1189,10 +1109,6 @@ Address: %4 <translation>Klase</translation> </message> <message> - <source>Address</source> - <translation>Address</translation> - </message> - <message> <source>Open until %1</source> <translation>Makabuklat anggang %1</translation> </message> @@ -1209,6 +1125,10 @@ Address: %4 <translation>Me-generate ya oneng ali ya metanggap</translation> </message> <message> + <source>Label</source> + <translation>Label</translation> + </message> + <message> <source>Received with</source> <translation>Atanggap kayabe ning</translation> </message> @@ -1245,10 +1165,6 @@ Address: %4 <translation>Klase ning transaksion</translation> </message> <message> - <source>Destination address of transaction.</source> - <translation>Kepuntalan a address ning transaksion</translation> - </message> - <message> <source>Amount removed from or added to balance.</source> <translation>Alagang milako o miragdag king balanse.</translation> </message> @@ -1435,10 +1351,6 @@ Address: %4 <translation>Mekapansin lang me-corrupt a block database</translation> </message> <message> - <source>Discover own IP address (default: 1 when listening and no -externalip)</source> - <translation>I-discover ing sariling IP address (default: 1 istung makiramdam at -externalip)</translation> - </message> - <message> <source>Do you want to rebuild the block database now?</source> <translation>Buri meng buuan pasibayu ing block database ngene?</translation> </message> @@ -1467,6 +1379,18 @@ Address: %4 <translation>Magpadalang trace/debug info okeng console kesa keng debug.log file</translation> </message> <message> + <source>Set language, for example "de_DE" (default: system locale)</source> + <translation>Mamiling Amanu, alimbawa "de_DE"(default: system locale)</translation> + </message> + <message> + <source>Show splash screen on startup (default: 1)</source> + <translation>Ipalto ing splash screen keng umpisa (default: 1)</translation> + </message> + <message> + <source>Start minimized</source> + <translation>Umpisan ing pamaglati</translation> + </message> + <message> <source>Transaction too large</source> <translation>Maragul yang masiadu ing transaksion</translation> </message> @@ -1479,10 +1403,6 @@ Address: %4 <translation>Kapabaluan</translation> </message> <message> - <source>Warning: This version is obsolete, upgrade required!</source> - <translation>Kapabaluan: Ing bersioin a ini laus ne, kailangan nang mag-upgrade!</translation> - </message> - <message> <source>Password for JSON-RPC connections</source> <translation>Password para king JSON-RPC koneksion</translation> </message> @@ -1543,10 +1463,6 @@ Address: %4 <translation>Eya maliari ing alaga keng -paytxfee=<amount>: '%s'</translation> </message> <message> - <source>Invalid amount</source> - <translation>Ing alaga e ya katanggap-tanggap</translation> - </message> - <message> <source>Insufficient funds</source> <translation>Kulang a pondo</translation> </message> @@ -1579,10 +1495,6 @@ Address: %4 <translation>Yari ne ing pamag-load</translation> </message> <message> - <source>To use the %s option</source> - <translation>Para agamit ing %s a pimamilian</translation> - </message> - <message> <source>Error</source> <translation>Mali</translation> </message> diff --git a/src/qt/locale/bitcoin_pl.ts b/src/qt/locale/bitcoin_pl.ts index c53a9970ef..7a7285aa01 100644 --- a/src/qt/locale/bitcoin_pl.ts +++ b/src/qt/locale/bitcoin_pl.ts @@ -1,9 +1,9 @@ -<TS language="pl" version="2.0"> +<TS language="pl" version="2.1"> <context> <name>AddressBookPage</name> <message> - <source>Double-click to edit address or label</source> - <translation>Kliknij dwukrotnie, aby edytować adres lub etykietę</translation> + <source>Right-click to edit address or label</source> + <translation>Prawy klik żeby edytować adres lub etykietę</translation> </message> <message> <source>Create a new address</source> @@ -47,11 +47,11 @@ </message> <message> <source>Choose the address to send coins to</source> - <translation>Wybierz adres żeby wysłać bitcoins</translation> + <translation>Wybierz adres, na który chcesz wysłać monety</translation> </message> <message> <source>Choose the address to receive coins with</source> - <translation>Wybierz adres do otrzymania monet.</translation> + <translation>Wybierz adres, na który chcesz otrzymać monety</translation> </message> <message> <source>C&hoose</source> @@ -67,11 +67,11 @@ </message> <message> <source>These are your Bitcoin addresses for sending payments. Always check the amount and the receiving address before sending coins.</source> - <translation>Tutaj znajdują się Twoje adresy Bitcoin do wysyłania płatności. Zawsze sprawdzaj ilość i adres odbiorcy przed wysyłką monet.</translation> + <translation>Tutaj znajdują się adresy Bitcoin na które wysyłasz płatności. Zawsze sprawdzaj ilość i adres odbiorcy przed wysyłką monet.</translation> </message> <message> <source>These are your Bitcoin addresses for receiving payments. It is recommended to use a new receiving address for each transaction.</source> - <translation>To twoje adresy bitcoin do odbierania płatności. Zaleca się używanie nowych adresów odbiorczych dla każdej tranzakcji.</translation> + <translation>To twoje adresy Bitcoin, na które otrzymujesz płatności. Zaleca się używanie nowych adresów odbiorczych dla każdej transakcji.</translation> </message> <message> <source>Copy &Label</source> @@ -87,7 +87,7 @@ </message> <message> <source>Comma separated file (*.csv)</source> - <translation>Plik *.CSV (rozdzielany przecinkami)</translation> + <translation>CSV (rozdzielany przecinkami)</translation> </message> <message> <source>Exporting Failed</source> @@ -95,7 +95,7 @@ </message> <message> <source>There was an error trying to save the address list to %1. Please try again.</source> - <translation>Wystąpił błąd podczas próby zapisu listy adresów %1. Proszę spróbować ponownie</translation> + <translation>Wystąpił błąd podczas próby zapisu listy adresów %1. Proszę spróbować ponownie.</translation> </message> </context> <context> @@ -110,7 +110,7 @@ </message> <message> <source>(no label)</source> - <translation>(bez etykiety)</translation> + <translation>(brak etykiety)</translation> </message> </context> <context> @@ -156,10 +156,6 @@ <translation>Zmień hasło</translation> </message> <message> - <source>Enter the old and new passphrase to the wallet.</source> - <translation>Podaj stare i nowe hasło do portfela.</translation> - </message> - <message> <source>Confirm wallet encryption</source> <translation>Potwierdź szyfrowanie portfela</translation> </message> @@ -177,15 +173,15 @@ </message> <message> <source>Warning: The Caps Lock key is on!</source> - <translation>Uwaga: Klawisz Caps Lock jest włączony</translation> + <translation>Uwaga: Klawisz Caps Lock jest włączony!</translation> </message> <message> <source>Wallet encrypted</source> <translation>Portfel zaszyfrowany</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>Program Bitcoin zamknie się aby dokończyć proces szyfrowania. Pamiętaj, że szyfrowanie portfela nie zabezpiecza w pełni Twoich bitcoinów przed kradzieżą przez wirusy lub trojany mogące zainfekować Twój komputer.</translation> + <source>Enter the new passphrase to the wallet.<br/>Please use a passphrase of <b>ten or more random characters</b>, or <b>eight or more words</b>.</source> + <translation>Wprowadź nowe hasło do portfela.<br/>Proszę używać hasła złożonego z <b>10 lub więcej losowych znaków</b> lub <b>ośmiu lub więcej słów.</b></translation> </message> <message> <source>Wallet encryption failed</source> @@ -236,7 +232,7 @@ </message> <message> <source>Show general overview of wallet</source> - <translation>Pokazuje ogólny zarys portfela</translation> + <translation>Pokazuje ogólny widok portfela</translation> </message> <message> <source>&Transactions</source> @@ -280,11 +276,11 @@ </message> <message> <source>&Sending addresses...</source> - <translation>Adres wysyłania</translation> + <translation>Adresy wysyłania...</translation> </message> <message> <source>&Receiving addresses...</source> - <translation>Adres odbiorczy</translation> + <translation>Adresy odbioru...</translation> </message> <message> <source>Open &URI...</source> @@ -307,10 +303,6 @@ <translation>Wyślij monety na adres Bitcoin</translation> </message> <message> - <source>Modify configuration options for Bitcoin</source> - <translation>Zmienia opcje konfiguracji bitcoina</translation> - </message> - <message> <source>Backup wallet to another location</source> <translation>Zapasowy portfel w innej lokalizacji</translation> </message> @@ -360,7 +352,7 @@ </message> <message> <source>Encrypt the private keys that belong to your wallet</source> - <translation>Szyfruj klucze prywatne, które są powiązane z twoim portfelem</translation> + <translation>Szyfruj klucze prywatne, które są w Twoim portfelu</translation> </message> <message> <source>Sign messages with your Bitcoin addresses to prove you own them</source> @@ -368,7 +360,7 @@ </message> <message> <source>Verify messages to ensure they were signed with specified Bitcoin addresses</source> - <translation>Zweryfikuj wiadomość, aby upewnić się, że została podpisana odpowiednim adresem Bitcoin.</translation> + <translation>Zweryfikuj wiadomość, aby upewnić się, że została podpisana podanym adresem Bitcoin.</translation> </message> <message> <source>&File</source> @@ -388,7 +380,7 @@ </message> <message> <source>Bitcoin Core</source> - <translation>Rdzeń BitCoin</translation> + <translation>Rdzeń Bitcoin</translation> </message> <message> <source>Request payments (generates QR codes and bitcoin: URIs)</source> @@ -400,48 +392,32 @@ </message> <message> <source>Show the list of used sending addresses and labels</source> - <translation>Pokaż listę użytych adresów wysyłających i etykiety</translation> + <translation>Pokaż listę adresów i etykiet użytych do wysyłania</translation> </message> <message> <source>Show the list of used receiving addresses and labels</source> - <translation>Pokaż listę użytych adresów odbiorczych i etykiety</translation> + <translation>Pokaż listę adresów i etykiet użytych do odbierania</translation> + </message> + <message> + <source>Open a bitcoin: URI or payment request</source> + <translation>Otwórz URI bitcoin: lub żądanie zapłaty</translation> </message> <message> <source>&Command-line options</source> - <translation>&Opcje konsoli</translation> + <translation>&Opcje linii komend</translation> </message> <message> <source>Show the Bitcoin Core help message to get a list with possible Bitcoin command-line options</source> <translation>Pokaż pomoc Rdzenia Bitcoin, aby zobaczyć listę wszystkich opcji linii poleceń</translation> </message> - <message numerus="yes"> - <source>%n active connection(s) to Bitcoin network</source> - <translation><numerusform>%n aktywne połączenie do sieci Bitcoin</numerusform><numerusform>%n aktywne połączenia do sieci Bitcoin</numerusform><numerusform>%n aktywnych połączeń do sieci Bitcoin</numerusform></translation> - </message> <message> <source>No block source available...</source> <translation>Brak dostępnych źródeł bloków...</translation> </message> - <message numerus="yes"> - <source>%n hour(s)</source> - <translation><numerusform>%n godzina</numerusform><numerusform>%n godzin</numerusform><numerusform>%n godzin</numerusform></translation> - </message> - <message numerus="yes"> - <source>%n day(s)</source> - <translation><numerusform>%n dzień</numerusform><numerusform>%n dni</numerusform><numerusform>%n dni</numerusform></translation> - </message> - <message numerus="yes"> - <source>%n week(s)</source> - <translation><numerusform>%n tydzień</numerusform><numerusform>%n tygodni</numerusform><numerusform>%n tygodni</numerusform></translation> - </message> <message> <source>%1 and %2</source> <translation>%1 i %2</translation> </message> - <message numerus="yes"> - <source>%n year(s)</source> - <translation><numerusform>%n rok</numerusform><numerusform>%n lata</numerusform><numerusform>%n lat</numerusform></translation> - </message> <message> <source>%1 behind</source> <translation>%1 wstecz</translation> @@ -472,7 +448,7 @@ </message> <message> <source>Catching up...</source> - <translation>Łapanie bloków...</translation> + <translation>Synchronizuję się...</translation> </message> <message> <source>Sent transaction</source> @@ -483,20 +459,8 @@ <translation>Transakcja przychodząca</translation> </message> <message> - <source>Date: %1 -Amount: %2 -Type: %3 -Address: %4 -</source> - <translation>Data: %1 -Kwota: %2 -Typ: %3 -Adres: %4 -</translation> - </message> - <message> <source>Wallet is <b>encrypted</b> and currently <b>unlocked</b></source> - <translation>Portfel jest <b>zaszyfrowany</b> i obecnie <b>niezablokowany</b></translation> + <translation>Portfel jest <b>zaszyfrowany</b> i obecnie <b>odblokowany</b></translation> </message> <message> <source>Wallet is <b>encrypted</b> and currently <b>locked</b></source> @@ -507,12 +471,16 @@ Adres: %4 <name>ClientModel</name> <message> <source>Network Alert</source> - <translation>Sieć Alert</translation> + <translation>Komunikat Sieci</translation> </message> </context> <context> <name>CoinControlDialog</name> <message> + <source>Coin Selection</source> + <translation>Wybór monet</translation> + </message> + <message> <source>Quantity:</source> <translation>Ilość:</translation> </message> @@ -533,6 +501,10 @@ Adres: %4 <translation>Opłata:</translation> </message> <message> + <source>Dust:</source> + <translation>Pył:</translation> + </message> + <message> <source>After Fee:</source> <translation>Po opłacie:</translation> </message> @@ -557,6 +529,14 @@ Adres: %4 <translation>Kwota</translation> </message> <message> + <source>Received with label</source> + <translation>Otrzymano z opisem</translation> + </message> + <message> + <source>Received with address</source> + <translation>Otrzymano z adresem</translation> + </message> + <message> <source>Date</source> <translation>Data</translation> </message> @@ -590,11 +570,11 @@ Adres: %4 </message> <message> <source>Lock unspent</source> - <translation>Zablokuj</translation> + <translation>Zablokuj niewydane</translation> </message> <message> <source>Unlock unspent</source> - <translation>Odblokuj</translation> + <translation>Odblokuj niewydane</translation> </message> <message> <source>Copy quantity</source> @@ -617,6 +597,10 @@ Adres: %4 <translation>Skopiuj priorytet</translation> </message> <message> + <source>Copy dust</source> + <translation>Kopiuj kurz</translation> + </message> + <message> <source>Copy change</source> <translation>Skopiuj resztę</translation> </message> @@ -665,6 +649,10 @@ Adres: %4 <translation>żaden</translation> </message> <message> + <source>Can vary +/- %1 satoshi(s) per input.</source> + <translation>Waha się +/- %1 satoshi na wejście.</translation> + </message> + <message> <source>yes</source> <translation>tak</translation> </message> @@ -673,10 +661,6 @@ Adres: %4 <translation>nie</translation> </message> <message> - <source>This label turns red, if the transaction size is greater than 1000 bytes.</source> - <translation>Etykieta staje się czerwona kiedy transakcja jest większa niż 1000 bajtów.</translation> - </message> - <message> <source>This means a fee of at least %1 per kB is required.</source> <translation>Oznacza to wymaganą opłatę minimum %1 na kB.</translation> </message> @@ -686,19 +670,11 @@ Adres: %4 </message> <message> <source>Transactions with higher priority are more likely to get included into a block.</source> - <translation>Transakcje o wyższym priorytecie zostają szybciej dołączone do bloku.</translation> - </message> - <message> - <source>This label turns red, if the priority is smaller than "medium".</source> - <translation>Ta etykieta jest czerwona, jeżeli priorytet jest mniejszy niż "średni"</translation> - </message> - <message> - <source>This label turns red, if any recipient receives an amount smaller than %1.</source> - <translation>Etykieta staje się czerwona kiedy którykolwiek odbiorca otrzymuje kwotę mniejszą niż %1.</translation> + <translation>Transakcje o wyższym priorytecie zwykle szybciej zostają dołączone do bloku.</translation> </message> <message> <source>(no label)</source> - <translation>(bez etykiety)</translation> + <translation>(brak etykiety)</translation> </message> <message> <source>change from %1 (%2)</source> @@ -733,7 +709,7 @@ Adres: %4 </message> <message> <source>New receiving address</source> - <translation>Nowy adres odbiorczy</translation> + <translation>Nowy adres otrzymywania</translation> </message> <message> <source>New sending address</source> @@ -768,7 +744,7 @@ Adres: %4 <name>FreespaceChecker</name> <message> <source>A new data directory will be created.</source> - <translation>Utworzono nowy folder danych.</translation> + <translation>Będzie utworzony nowy folder danych.</translation> </message> <message> <source>name</source> @@ -780,7 +756,7 @@ Adres: %4 </message> <message> <source>Path already exists, and is not a directory.</source> - <translation>Ścieżka już istnieje i nie wskazuje na folder.</translation> + <translation>Ścieżka już istnieje i nie jest katalogiem.</translation> </message> <message> <source>Cannot create data directory here.</source> @@ -791,7 +767,7 @@ Adres: %4 <name>HelpMessageDialog</name> <message> <source>Bitcoin Core</source> - <translation>Rdzeń BitCoin</translation> + <translation>Rdzeń Bitcoin</translation> </message> <message> <source>version</source> @@ -817,26 +793,6 @@ Adres: %4 <source>command-line options</source> <translation>opcje konsoli</translation> </message> - <message> - <source>UI options</source> - <translation>UI opcje</translation> - </message> - <message> - <source>Set language, for example "de_DE" (default: system locale)</source> - <translation>Ustaw Język, na przykład "pl_PL" (domyślnie: systemowy)</translation> - </message> - <message> - <source>Start minimized</source> - <translation>Uruchom zminimalizowany</translation> - </message> - <message> - <source>Show splash screen on startup (default: 1)</source> - <translation>Pokazuj okno powitalne przy starcie (domyślnie: 1)</translation> - </message> - <message> - <source>Choose data directory on startup (default: 0)</source> - <translation>Wybierz folder danych przy starcie (domyślnie: 0)</translation> - </message> </context> <context> <name>Intro</name> @@ -850,11 +806,11 @@ Adres: %4 </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>Ponieważ jest to pierwsze uruchomienie programu, możesz wybrać gdzie będą przechowywane informacje.</translation> + <translation>Ponieważ jest to pierwsze uruchomienie programu, możesz wybrać gdzie Bitcoin Core będzie przechowywał swoje dane.</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>Program pobierze i będzie przechowywał kopię łańcucha bloków Bitcoin. W wybranym katalogu musi być przynajmniej %1GB miejsca, a z czasem wielkość danych będzie rosła. Portfel będzie przechowywany w tym samym katalogu.</translation> + <translation>Program pobierze i będzie przechowywał kopię łańcucha bloków Bitcoin. W wybranym katalogu musi być przynajmniej %1GB miejsca, a z czasem ilość danych będzie rosła. Portfel będzie przechowywany w tym samym katalogu.</translation> </message> <message> <source>Use the default data directory</source> @@ -866,7 +822,7 @@ Adres: %4 </message> <message> <source>Bitcoin Core</source> - <translation>Rdzeń BitCoin</translation> + <translation>Rdzeń Bitcoin</translation> </message> <message> <source>Error: Specified data directory "%1" cannot be created.</source> @@ -881,7 +837,7 @@ Adres: %4 <name>OpenURIDialog</name> <message> <source>Open URI</source> - <translation>Otwórz URI:</translation> + <translation>Otwórz URI</translation> </message> <message> <source>Open payment request from URI or file</source> @@ -911,12 +867,8 @@ Adres: %4 <translation>Główne</translation> </message> <message> - <source>Automatically start Bitcoin after logging in to the system.</source> - <translation>Automatycznie uruchamia Bitcoin po zalogowaniu do systemu.</translation> - </message> - <message> - <source>&Start Bitcoin on system login</source> - <translation>Uruchamiaj Bitcoin wraz z zalogowaniem do &systemu</translation> + <source>Size of &database cache</source> + <translation>Wielkość bufora bazy &danych</translation> </message> <message> <source>MB</source> @@ -944,7 +896,7 @@ Adres: %4 </message> <message> <source>Reset all client options to default.</source> - <translation>Przywróć domyślne wszystkie ustawienia klienta.</translation> + <translation>Przywróć wszystkie domyślne ustawienia klienta.</translation> </message> <message> <source>&Reset Options</source> @@ -955,6 +907,10 @@ Adres: %4 <translation>&Sieć</translation> </message> <message> + <source>(0 = auto, <0 = leave that many cores free)</source> + <translation>(0 = automatycznie, <0 = zostaw tyle wolnych rdzeni)</translation> + </message> + <message> <source>W&allet</source> <translation>Portfel</translation> </message> @@ -963,6 +919,14 @@ Adres: %4 <translation>Ekspert</translation> </message> <message> + <source>Enable coin &control features</source> + <translation>Włącz funk&cje kontoli monet</translation> + </message> + <message> + <source>&Spend unconfirmed change</source> + <translation>Wydaj niepotwierdzoną re&sztę</translation> + </message> + <message> <source>Automatically open the Bitcoin client port on the router. This only works when your router supports UPnP and it is enabled.</source> <translation>Automatycznie otwiera port klienta Bitcoin na routerze. Ta opcja dzieła tylko jeśli twój router wspiera UPnP i jest ono włączone.</translation> </message> @@ -971,6 +935,14 @@ Adres: %4 <translation>Mapuj port używając &UPnP</translation> </message> <message> + <source>Connect to the Bitcoin network through a SOCKS5 proxy.</source> + <translation>Połącz się z siecią Bitcoin poprzez proxy SOCKS5.</translation> + </message> + <message> + <source>&Connect through SOCKS5 proxy (default proxy):</source> + <translation>Połącz przez proxy SO&CKS5 (domyślne proxy):</translation> + </message> + <message> <source>Proxy &IP:</source> <translation>Proxy &IP: </translation> </message> @@ -995,10 +967,6 @@ Adres: %4 <translation>&Minimalizuj do paska przy zegarku zamiast do paska zadań</translation> </message> <message> - <source>Minimize instead of exit the application when the window is closed. When this option is enabled, the application will be closed only after selecting Quit in the menu.</source> - <translation>Minimalizuje zamiast zakończyć działanie programu przy zamykaniu okna. Kiedy ta opcja jest włączona, program zakończy działanie po wybieraniu Zamknij w menu.</translation> - </message> - <message> <source>M&inimize on close</source> <translation>M&inimalizuj przy zamknięciu</translation> </message> @@ -1011,10 +979,6 @@ Adres: %4 <translation>Język &Użytkownika:</translation> </message> <message> - <source>The user interface language can be set here. This setting will take effect after restarting Bitcoin.</source> - <translation>Można tu ustawić język interfejsu uzytkownika. Żeby ustawienie przyniosło skutek trzeba uruchomić ponownie Bitcoin.</translation> - </message> - <message> <source>&Unit to show amounts in:</source> <translation>&Jednostka pokazywana przy kwocie:</translation> </message> @@ -1023,6 +987,10 @@ Adres: %4 <translation>Wybierz podział jednostki pokazywany w interfejsie oraz podczas wysyłania monet</translation> </message> <message> + <source>Whether to show coin control features or not.</source> + <translation>Wybierz pokazywanie lub nie funkcji kontroli monet.</translation> + </message> + <message> <source>&OK</source> <translation>&OK</translation> </message> @@ -1047,10 +1015,6 @@ Adres: %4 <translation>Wymagany restart programu, aby uaktywnić zmiany.</translation> </message> <message> - <source>Client will be shutdown, do you want to proceed?</source> - <translation>Program zostanie wyłączony. Czy chcesz kontynuować?</translation> - </message> - <message> <source>This change would require a client restart.</source> <translation>Ta zmiana może wymagać ponownego uruchomienia klienta.</translation> </message> @@ -1070,6 +1034,10 @@ Adres: %4 <translation>Wyświetlana informacja może być nieaktualna. Twój portfel synchronizuje się automatycznie z siecią bitcoin, zaraz po tym jak uzyskano połączenie, ale proces ten nie został jeszcze ukończony.</translation> </message> <message> + <source>Watch-only:</source> + <translation>Tylko podglądaj:</translation> + </message> + <message> <source>Available:</source> <translation>Dostępne:</translation> </message> @@ -1091,7 +1059,11 @@ Adres: %4 </message> <message> <source>Mined balance that has not yet matured</source> - <translation>Balans wydobycia, który jeszcze nie dojrzał</translation> + <translation>Balans wydobytych monet, które jeszcze nie dojrzały</translation> + </message> + <message> + <source>Balances</source> + <translation>Salda</translation> </message> <message> <source>Total:</source> @@ -1102,8 +1074,32 @@ Adres: %4 <translation>Twoje obecne saldo</translation> </message> <message> + <source>Your current balance in watch-only addresses</source> + <translation>Twoje obecne saldo na podglądanym adresie </translation> + </message> + <message> + <source>Spendable:</source> + <translation>Możliwe do wydania:</translation> + </message> + <message> + <source>Recent transactions</source> + <translation>Ostatnie transakcje</translation> + </message> + <message> + <source>Unconfirmed transactions to watch-only addresses</source> + <translation>Niepotwierdzone transakcje na podglądanych adresach</translation> + </message> + <message> + <source>Mined balance in watch-only addresses that has not yet matured</source> + <translation>Wykopane monety na podglądanych adresach które jeszcze nie dojrzały</translation> + </message> + <message> + <source>Current total balance in watch-only addresses</source> + <translation>Łączna kwota na podglądanych adresach</translation> + </message> + <message> <source>out of sync</source> - <translation>desynchronizacja</translation> + <translation>nie zsynchronizowany</translation> </message> </context> <context> @@ -1117,6 +1113,18 @@ Adres: %4 <translation>błędny adres płatności %1</translation> </message> <message> + <source>Payment request rejected</source> + <translation>Żądanie płatności odrzucone</translation> + </message> + <message> + <source>Payment request network doesn't match client network.</source> + <translation>Sieć żądania płatności nie odpowiada sieci klienta.</translation> + </message> + <message> + <source>Payment request is not initialized.</source> + <translation>Żądanie płatności nie jest zainicjowane.</translation> + </message> + <message> <source>Requested payment amount of %1 is too small (considered dust).</source> <translation>Żądana kwota %1 jest za niska (uznano za kurz).</translation> </message> @@ -1126,7 +1134,11 @@ Adres: %4 </message> <message> <source>Cannot start bitcoin: click-to-pay handler</source> - <translation>Nie można rozpocząć bitcoin: kliknij-by-zapłacić opiekunowi</translation> + <translation>Nie można uruchomić protokołu bitcoin: kliknij-by-zapłacić</translation> + </message> + <message> + <source>Payment request fetch URL is invalid: %1</source> + <translation>URL pobrania żądania zapłaty jest nieprawidłowe: %1</translation> </message> <message> <source>Refund from %1</source> @@ -1151,7 +1163,11 @@ Adres: %4 </context> <context> <name>PeerTableModel</name> - </context> + <message> + <source>Ping Time</source> + <translation>Czas odpowiedzi</translation> + </message> +</context> <context> <name>QObject</name> <message> @@ -1159,6 +1175,14 @@ Adres: %4 <translation>Kwota</translation> </message> <message> + <source>Enter a Bitcoin address (e.g. %1)</source> + <translation>Wprowadź adres Bitcoin (np. %1)</translation> + </message> + <message> + <source>%1 d</source> + <translation>%1 d</translation> + </message> + <message> <source>%1 h</source> <translation>%1 h</translation> </message> @@ -1167,10 +1191,22 @@ Adres: %4 <translation>%1 m</translation> </message> <message> + <source>%1 s</source> + <translation>%1 s</translation> + </message> + <message> + <source>None</source> + <translation>Żaden</translation> + </message> + <message> <source>N/A</source> <translation>NIEDOSTĘPNE</translation> </message> - </context> + <message> + <source>%1 ms</source> + <translation>%1 ms</translation> + </message> +</context> <context> <name>QRImageWidget</name> <message> @@ -1221,6 +1257,10 @@ Adres: %4 <translation>Używana wersja OpenSSL</translation> </message> <message> + <source>Using BerkeleyDB version</source> + <translation>Używana wersja BerkeleyDB </translation> + </message> + <message> <source>Startup time</source> <translation>Czas uruchomienia</translation> </message> @@ -1238,13 +1278,57 @@ Adres: %4 </message> <message> <source>Block chain</source> - <translation>Ciąg bloków</translation> + <translation>Łańcuch bloków</translation> </message> <message> <source>Current number of blocks</source> <translation>Aktualna liczba bloków</translation> </message> <message> + <source>Received</source> + <translation>Otrzymane</translation> + </message> + <message> + <source>Sent</source> + <translation>Wysłane</translation> + </message> + <message> + <source>Select a peer to view detailed information.</source> + <translation>Wybierz węzeł żeby zobaczyć szczegóły.</translation> + </message> + <message> + <source>Direction</source> + <translation>Kierunek</translation> + </message> + <message> + <source>Version</source> + <translation>Wersja</translation> + </message> + <message> + <source>Services</source> + <translation>Usługi</translation> + </message> + <message> + <source>Starting Height</source> + <translation>Początkowa wysokość</translation> + </message> + <message> + <source>Connection Time</source> + <translation>Czas połączenia</translation> + </message> + <message> + <source>Bytes Sent</source> + <translation>Bajtów wysłano</translation> + </message> + <message> + <source>Bytes Received</source> + <translation>Bajtów pobrano</translation> + </message> + <message> + <source>Ping Time</source> + <translation>Czas odpowiedzi</translation> + </message> + <message> <source>Last block time</source> <translation>Czas ostatniego bloku</translation> </message> @@ -1285,18 +1369,10 @@ Adres: %4 <translation>Plik logowania debugowania</translation> </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>Otwórz plik logowania debugowania Bitcoin z obecnego katalogu z danymi. Może to potrwać kilka sekund przy większych plikach.</translation> - </message> - <message> <source>Clear console</source> <translation>Wyczyść konsolę</translation> </message> <message> - <source>Welcome to the Bitcoin RPC console.</source> - <translation>Witam w konsoli Bitcoin RPC</translation> - </message> - <message> <source>Use up and down arrows to navigate history, and <b>Ctrl-L</b> to clear screen.</source> <translation>Użyj strzałek do przewijania historii i <b>Ctrl-L</b> aby wyczyścić ekran</translation> </message> @@ -1320,7 +1396,31 @@ Adres: %4 <source>%1 GB</source> <translation>%1 GB</translation> </message> - </context> + <message> + <source>via %1</source> + <translation>przez %1</translation> + </message> + <message> + <source>never</source> + <translation>nigdy</translation> + </message> + <message> + <source>Inbound</source> + <translation>Wejściowy</translation> + </message> + <message> + <source>Outbound</source> + <translation>Wyjściowy</translation> + </message> + <message> + <source>Unknown</source> + <translation>Nieznany</translation> + </message> + <message> + <source>Fetching...</source> + <translation>Pobieram...</translation> + </message> +</context> <context> <name>ReceiveCoinsDialog</name> <message> @@ -1337,7 +1437,7 @@ Adres: %4 </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>Użyj jeden z poprzednio użytych adresów odbiorczych. Podczas ponownego używania adresów występują problemy z bezpieczeństwem i prywatnością. Nie korzystaj z tej opcji, chyba że odtwarzasz żądanie płatności wykonane już wcześniej.</translation> + <translation>Użyj jednego z poprzednio użytych adresów odbiorczych. Podczas ponownego używania adresów występują problemy z bezpieczeństwem i prywatnością. Nie korzystaj z tej opcji, chyba że odtwarzasz żądanie płatności wykonane już wcześniej.</translation> </message> <message> <source>An optional label to associate with the new receiving address.</source> @@ -1348,8 +1448,12 @@ Adres: %4 <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> + <translation>Opcjonalna kwota by zażądać. Zostaw puste lub zero by nie zażądać konkretnej kwoty.</translation> + </message> + <message> <source>Clear all fields of the form.</source> - <translation>Wyczyść pola formularza</translation> + <translation>Wyczyść wszystkie pola formularza.</translation> </message> <message> <source>Clear</source> @@ -1364,6 +1468,10 @@ Adres: %4 <translation>&Żądaj płatności</translation> </message> <message> + <source>Show the selected request (does the same as double clicking an entry)</source> + <translation>Pokaż wybrane żądanie (robi to samo co dwukrotne kliknięcie pozycji)</translation> + </message> + <message> <source>Show</source> <translation>Pokaż</translation> </message> @@ -1408,7 +1516,7 @@ Adres: %4 </message> <message> <source>Request payment to %1</source> - <translation>Żądaj płatności do %1</translation> + <translation>Zażądaj płatności do %1</translation> </message> <message> <source>Payment information</source> @@ -1463,7 +1571,7 @@ Adres: %4 </message> <message> <source>(no label)</source> - <translation>(bez etykiety)</translation> + <translation>(brak etykiety)</translation> </message> <message> <source>(no message)</source> @@ -1478,7 +1586,11 @@ Adres: %4 <name>SendCoinsDialog</name> <message> <source>Send Coins</source> - <translation>Wyślij Monety</translation> + <translation>Wyślij monety</translation> + </message> + <message> + <source>Coin Control Features</source> + <translation>Funkcje kontroli monet</translation> </message> <message> <source>Inputs...</source> @@ -1490,7 +1602,7 @@ Adres: %4 </message> <message> <source>Insufficient funds!</source> - <translation>Niewystarczające środki</translation> + <translation>Niewystarczające środki!</translation> </message> <message> <source>Quantity:</source> @@ -1522,7 +1634,59 @@ Adres: %4 </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>Kiedy ta opcja jest wybrana, ale adres reszty jest pusty lub nieprawidłowy to reszta będzie wysyłana na adres nowo-wygenerowany.</translation> + <translation>Kiedy ta opcja jest wybrana, to jeżeli adres reszty jest pusty lub nieprawidłowy, to reszta będzie wysyłana na nowo wygenerowany adres, </translation> + </message> + <message> + <source>Custom change address</source> + <translation>Niestandardowe zmiany adresu</translation> + </message> + <message> + <source>Transaction Fee:</source> + <translation>Opłata transakcyjna:</translation> + </message> + <message> + <source>Choose...</source> + <translation>Wybierz...</translation> + </message> + <message> + <source>collapse fee-settings</source> + <translation>zwiń opcje opłaty</translation> + </message> + <message> + <source>per kilobyte</source> + <translation>za kilobajt</translation> + </message> + <message> + <source>(read the tooltip)</source> + <translation>(przeczytaj podpowiedź)</translation> + </message> + <message> + <source>Recommended:</source> + <translation>Zalecane:</translation> + </message> + <message> + <source>(Smart fee not initialized yet. This usually takes a few blocks...)</source> + <translation>(Sprytne opłaty nie są jeszcze zainicjowane. Trwa to zwykle kilka bloków...)</translation> + </message> + <message> + <source>Confirmation time:</source> + <translation>Czas potwierdzenia:</translation> + </message> + <message> + <source>normal</source> + <translation>normalnie</translation> + </message> + <message> + <source>fast</source> + <translation>szybko</translation> + </message> + <message> + <source>Send as zero-fee transaction if possible</source> + <translation>Wyślij bez opłaty jeżeli to możliwe</translation> + </message> + <message> + <source>(confirmation may take longer)</source> + <translation>(potwierdzenie może potrwać dłużej)</translation> </message> <message> <source>Send to multiple recipients at once</source> @@ -1530,11 +1694,15 @@ Adres: %4 </message> <message> <source>Add &Recipient</source> - <translation>Dodaj Odbio&rce</translation> + <translation>Dodaj Odbio&rcę</translation> </message> <message> <source>Clear all fields of the form.</source> - <translation>Wyczyść wszystkie pola formularza</translation> + <translation>Wyczyść wszystkie pola formularza.</translation> + </message> + <message> + <source>Dust:</source> + <translation>Pył:</translation> </message> <message> <source>Clear &All</source> @@ -1597,10 +1765,6 @@ Adres: %4 <translation>lub</translation> </message> <message> - <source>The recipient address is not valid, please recheck.</source> - <translation>Adres odbiorcy jest nieprawidłowy, proszę poprawić</translation> - </message> - <message> <source>The amount to pay must be larger than 0.</source> <translation>Kwota do zapłacenia musi być większa od 0.</translation> </message> @@ -1613,10 +1777,6 @@ Adres: %4 <translation>Suma przekracza twoje saldo, gdy doliczymy %1 prowizji transakcyjnej.</translation> </message> <message> - <source>Duplicate address found, can only send to each address once per send operation.</source> - <translation>Znaleziono powtórzony adres, można wysłać tylko raz na każdy adres podczas operacji wysyłania.</translation> - </message> - <message> <source>Transaction creation failed!</source> <translation>Utworzenie transakcji nie powiodło się!</translation> </message> @@ -1625,16 +1785,24 @@ Adres: %4 <translation>Transakcja została odrzucona! Może się to zdarzyć jeśli część monet z portfela została już wydana używając kopii pliku wallet.dat i nie zostało to tutaj uwzględnione.</translation> </message> <message> + <source>Pay only the minimum fee of %1</source> + <translation>Płac tylko minimalna opłatę %1</translation> + </message> + <message> <source>Warning: Invalid Bitcoin address</source> <translation>Ostrzeżenie: nieprawidłowy adres Bitcoin</translation> </message> <message> <source>(no label)</source> - <translation>(bez etykiety)</translation> + <translation>(brak etykiety)</translation> </message> <message> <source>Warning: Unknown change address</source> - <translation>Ostrzeżenie: Nieznany adres</translation> + <translation>Ostrzeżenie: Nieznany adres reszty</translation> + </message> + <message> + <source>Copy dust</source> + <translation>Kopiuj kurz</translation> </message> <message> <source>Are you sure you want to send?</source> @@ -1665,7 +1833,7 @@ Adres: %4 </message> <message> <source>Choose previously used address</source> - <translation>Wybierz wcześniej użyty adres </translation> + <translation>Wybierz wcześniej użyty adres</translation> </message> <message> <source>This is a normal payment.</source> @@ -1692,18 +1860,10 @@ Adres: %4 <translation>Wiadomość:</translation> </message> <message> - <source>This is a verified payment request.</source> - <translation>Zweryfikowano żądanie zapłaty.</translation> - </message> - <message> <source>Enter a label for this address to add it to the list of used addresses</source> <translation>Wprowadź etykietę dla tego adresu by dodać go do listy użytych adresów</translation> </message> <message> - <source>This is an unverified payment request.</source> - <translation>To żądanie zapłaty nie zostało zweryfikowane.</translation> - </message> - <message> <source>Pay To:</source> <translation>Wpłać do:</translation> </message> @@ -1734,10 +1894,6 @@ Adres: %4 <translation>Podpi&sz Wiadomość</translation> </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>Możesz podpisywać wiadomości swoimi adresami aby udowodnić, że jesteś ich właścicielem. Uważaj, aby nie podpisywać niczego co wzbudza Twoje podejrzenia, ponieważ ktoś może stosować phishing próbując nakłonić Cię do ich podpisania. Akceptuj i podpisuj tylko w pełni zrozumiałe komunikaty i wiadomości.</translation> - </message> - <message> <source>Choose previously used address</source> <translation>Wybierz wcześniej użyty adres</translation> </message> @@ -1755,7 +1911,7 @@ Adres: %4 </message> <message> <source>Enter the message you want to sign here</source> - <translation>Wprowadź wiadomość, którą chcesz podpisać, tutaj</translation> + <translation>Tutaj wprowadź wiadomość, którą chcesz podpisać</translation> </message> <message> <source>Signature</source> @@ -1786,10 +1942,6 @@ Adres: %4 <translation>&Zweryfikuj wiadomość</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>Wpisz adres podpisu, wiadomość (upewnij się, że dokładnie skopiujesz wszystkie zakończenia linii, spacje, tabulacje itp.) oraz podpis poniżej by sprawdzić wiadomość. Uważaj by nie dodać więcej do podpisu niż do samej podpisywanej wiadomości by uniknąć ataku man-in-the-middle (człowiek pośrodku)</translation> - </message> - <message> <source>Verify the message to ensure it was signed with the specified Bitcoin address</source> <translation>Zweryfikuj wiadomość, aby upewnić się, że została podpisana odpowiednim adresem Bitcoin.</translation> </message> @@ -1823,11 +1975,11 @@ Adres: %4 </message> <message> <source>Private key for the entered address is not available.</source> - <translation>Klucz prywatny dla podanego adresu nie jest dostępny</translation> + <translation>Klucz prywatny dla podanego adresu nie jest dostępny.</translation> </message> <message> <source>Message signing failed.</source> - <translation>Podpisanie wiadomości nie powiodło się</translation> + <translation>Podpisanie wiadomości nie powiodło się.</translation> </message> <message> <source>Message signed.</source> @@ -1843,7 +1995,7 @@ Adres: %4 </message> <message> <source>The signature did not match the message digest.</source> - <translation>Podpis nie odpowiadał streszczeniu wiadomości</translation> + <translation>Podpis nie odpowiada skrótowi wiadomości.</translation> </message> <message> <source>Message verification failed.</source> @@ -1858,7 +2010,7 @@ Adres: %4 <name>SplashScreen</name> <message> <source>Bitcoin Core</source> - <translation>Rdzeń BitCoin</translation> + <translation>Rdzeń Bitcoin</translation> </message> <message> <source>The Bitcoin Core developers</source> @@ -1883,6 +2035,10 @@ Adres: %4 <translation>Otwórz do %1</translation> </message> <message> + <source>conflicted</source> + <translation>konflikt</translation> + </message> + <message> <source>%1/offline</source> <translation>%1/offline</translation> </message> @@ -1898,10 +2054,6 @@ Adres: %4 <source>Status</source> <translation>Status</translation> </message> - <message numerus="yes"> - <source>, broadcast through %n node(s)</source> - <translation><numerusform>, emitowany przez %n węzeł</numerusform><numerusform>, emitowany przez %n węzły</numerusform><numerusform>, emitowany przez %n węzłów</numerusform></translation> - </message> <message> <source>Date</source> <translation>Data</translation> @@ -1934,10 +2086,6 @@ Adres: %4 <source>Credit</source> <translation>Przypisy</translation> </message> - <message numerus="yes"> - <source>matures in %n more block(s)</source> - <translation><numerusform>potwierdzona przy %n bloku więcej</numerusform><numerusform>potwierdzona przy %n blokach więcej</numerusform><numerusform>potwierdzona przy %n blokach więcej</numerusform></translation> - </message> <message> <source>not accepted</source> <translation>niezaakceptowane</translation> @@ -1948,7 +2096,7 @@ Adres: %4 </message> <message> <source>Transaction fee</source> - <translation>Prowizja transakcji</translation> + <translation>Opłata transakcyjna</translation> </message> <message> <source>Net amount</source> @@ -1972,7 +2120,7 @@ Adres: %4 </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>Wygenerowane monety muszą dojrzeć przez %1 bloków zanim będzie można je wysłać. Gdy wygenerowałeś ten blok został on ogłoszony w sieci i dodany do łańcucha bloków. Jeżeli nie uda mu się wejść do łańcucha jego status zostanie zmieniony na "nie zaakceptowano" i nie będzie można go wydać. To czasem zdarza się gdy inny węzeł wygeneruje blok w kilka sekund od twojego.</translation> + <translation>Wygenerowane monety muszą dojrzeć przez %1 bloków zanim będzie można je wydać. Gdy wygenerowałeś ten blok został on ogłoszony w sieci i dodany do łańcucha bloków. Jeżeli nie uda mu się wejść do łańcucha jego status zostanie zmieniony na "nie zaakceptowano" i nie będzie można go wydać. To czasem zdarza się gdy inny węzeł wygeneruje blok w kilka sekund od twojego.</translation> </message> <message> <source>Debug information</source> @@ -2000,11 +2148,7 @@ Adres: %4 </message> <message> <source>, has not been successfully broadcast yet</source> - <translation>, nie został jeszcze pomyślnie wyemitowany</translation> - </message> - <message numerus="yes"> - <source>Open for %n more block(s)</source> - <translation><numerusform>Otwórz dla %n bloku</numerusform><numerusform>Otwórz dla %n następnych bloków</numerusform><numerusform>Otwórz dla %n następnych bloków</numerusform></translation> + <translation>, nie został jeszcze pomyślnie rozesłany</translation> </message> <message> <source>unknown</source> @@ -2033,8 +2177,8 @@ Adres: %4 <translation>Typ</translation> </message> <message> - <source>Address</source> - <translation>Adres</translation> + <source>Immature (%1 confirmations, will be available after %2)</source> + <translation>Niedojrzała (%1 potwierdzeń, będzie dostępna po %2)</translation> </message> <message> <source>Open until %1</source> @@ -2057,6 +2201,10 @@ Adres: %4 <translation>Offline</translation> </message> <message> + <source>Label</source> + <translation>Etykieta</translation> + </message> + <message> <source>Unconfirmed</source> <translation>Niepotwierdzone:</translation> </message> @@ -2065,6 +2213,10 @@ Adres: %4 <translation>Potwierdzanie (%1 z %2 rekomendowanych potwierdzeń)</translation> </message> <message> + <source>Conflicted</source> + <translation>Konflikt</translation> + </message> + <message> <source>Received with</source> <translation>Otrzymane przez</translation> </message> @@ -2101,10 +2253,6 @@ Adres: %4 <translation>Rodzaj transakcji.</translation> </message> <message> - <source>Destination address of transaction.</source> - <translation>Adres docelowy transakcji.</translation> - </message> - <message> <source>Amount removed from or added to balance.</source> <translation>Kwota usunięta z lub dodana do konta.</translation> </message> @@ -2250,7 +2398,11 @@ Adres: %4 </context> <context> <name>UnitDisplayStatusBarControl</name> - </context> + <message> + <source>Unit to show amounts in. Click to select another unit.</source> + <translation>Jednostka w jakiej pokazywane są kwoty. Kliknij aby wybrać inną.</translation> + </message> +</context> <context> <name>WalletFrame</name> <message> @@ -2262,7 +2414,7 @@ Adres: %4 <name>WalletModel</name> <message> <source>Send Coins</source> - <translation>Wyślij płatność</translation> + <translation>Wyślij monety</translation> </message> </context> <context> @@ -2335,51 +2487,28 @@ Adres: %4 <translation>Akceptuj połączenia z zewnątrz (domyślnie: 1 jeśli nie ustawiono -proxy lub -connect)</translation> </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>%s, musisz ustawić rpcpassword w pliku konfiguracyjnym:⏎ -%s⏎ -Zalecane jest użycie losowego hasła:⏎ -rpcuser=bitcoinrpc⏎ -rpcpassword=%s⏎ -(nie musisz pamiętać tego hasła)⏎ -Użytkownik i hasło nie mogą być takie same.⏎ -Jeśli plik nie istnieje, utwórz go z uprawnieniami tylko-do-odczytu dla właściciela.⏎ -Zalecane jest ustawienie alertnotify aby poinformować o problemach:⏎ -na przykład: alertnotify=echo %%s | mail -s "Alarm Bitcoin" admin@foo.com⏎</translation> - </message> - <message> <source>Bind to given address and always listen on it. Use [host]:port notation for IPv6</source> - <translation>Skojarz z podanym adresem. Użyj formatu [host]:port dla IPv6 </translation> - </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>Błąd: transakcja została odrzucona. Może się to zdarzyć, gdy monety z Twojego portfela zostały już wydane, na przykład gdy używałeś kopii wallet.dat i bitcoiny które tam wydałeś nie zostały jeszcze odjęte z portfela z którego teraz korzystasz.</translation> - </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>Transakcja przekracza limit. Możesz wysłać ją płacąc prowizję %s, która zostaje przekazana do węzłów, które ją prześlą i pomoże wspierać sieć Bitcoin. Czy chcesz zapłacić prowizję?</translation> + <translation>Skojarz z podanym adresem i nasłuchuj na nim. Użyj formatu [host]:port dla IPv6</translation> </message> <message> <source>Execute command when a wallet transaction changes (%s in cmd is replaced by TxID)</source> <translation>Wykonaj polecenie, kiedy transakcja portfela ulegnie zmianie (%s w poleceniu zostanie zastąpione przez TxID)</translation> </message> <message> + <source>Set the number of script verification threads (%u to %d, 0 = auto, <0 = leave that many cores free, default: %d)</source> + <translation>Ustaw liczbę wątków skryptu weryfikacyjnego (%u do %d, 0 = auto, <0 = zostaw tyle rdzeni wolnych, domyślnie: %d)</translation> + </message> + <message> <source>This is a pre-release test build - use at your own risk - do not use for mining or merchant applications</source> <translation>To jest testowa wersja - używaj na własne ryzyko - nie używaj do wykopywania oraz przy aplikacjach kupieckich</translation> </message> <message> + <source>Unable to bind to %s on this computer. Bitcoin Core is probably already running.</source> + <translation>Nie można przywiązać z portem %s na tym komputerze. Bitcoin Core prawdopodobnie już działa.</translation> + </message> + <message> <source>Warning: -paytxfee is set very high! This is the transaction fee you will pay if you send a transaction.</source> - <translation>Ostrzeżenie: -paytxfee jest bardzo duży. To jest prowizja za transakcje, którą płacisz, gdy wysyłasz monety.</translation> + <translation>Ostrzeżenie: -paytxfee jest bardzo duże! Jest to prowizja za transakcje, którą płacisz, gdy wysyłasz monety.</translation> </message> <message> <source>Warning: The network does not appear to fully agree! Some miners appear to be experiencing issues.</source> @@ -2402,6 +2531,10 @@ na przykład: alertnotify=echo %%s | mail -s "Alarm Bitcoin" admin@foo.com⏎</t <translation>(domyślnie: 1)</translation> </message> <message> + <source><category> can be:</source> + <translation><category> mogą być:</translation> + </message> + <message> <source>Attempt to recover private keys from a corrupt wallet.dat</source> <translation>Próbuj odzyskać klucze prywatne z uszkodzonego wallet.dat</translation> </message> @@ -2411,7 +2544,7 @@ na przykład: alertnotify=echo %%s | mail -s "Alarm Bitcoin" admin@foo.com⏎</t </message> <message> <source>Connect only to the specified node(s)</source> - <translation>Łącz tylko do wskazanego węzła</translation> + <translation>Łącz się tylko do wskazanego węzła/węzłów</translation> </message> <message> <source>Connection options:</source> @@ -2426,12 +2559,8 @@ na przykład: alertnotify=echo %%s | mail -s "Alarm Bitcoin" admin@foo.com⏎</t <translation>Opcje debugowania/testowania:</translation> </message> <message> - <source>Discover own IP address (default: 1 when listening and no -externalip)</source> - <translation>Odkryj własny adres IP (domyślnie: 1 kiedy w trybie nasłuchu i brak -externalip )</translation> - </message> - <message> <source>Do not load the wallet and disable wallet RPC calls</source> - <translation>Nie ładuj portfela i wyłącz odwołania RPC</translation> + <translation>Nie ładuj portfela i wyłącz wywołania RPC portfela</translation> </message> <message> <source>Do you want to rebuild the block database now?</source> @@ -2439,7 +2568,7 @@ na przykład: alertnotify=echo %%s | mail -s "Alarm Bitcoin" admin@foo.com⏎</t </message> <message> <source>Error initializing block database</source> - <translation>Błąd inicjowania bloku bazy danych</translation> + <translation>Błąd inicjowania bazy danych bloków</translation> </message> <message> <source>Error initializing wallet database environment %s!</source> @@ -2451,19 +2580,19 @@ na przykład: alertnotify=echo %%s | mail -s "Alarm Bitcoin" admin@foo.com⏎</t </message> <message> <source>Error opening block database</source> - <translation>Błąd ładowania bazy bloków</translation> + <translation>Błąd otwierania bazy bloków</translation> </message> <message> - <source>Error: Disk space is low!</source> - <translation>Błąd: Mało miejsca na dysku!</translation> + <source>Error: A fatal internal error occured, see debug.log for details</source> + <translation>Błąd: Wystąpił krytyczny błąd wewnętrzny, sprawdź w debug.log</translation> </message> <message> - <source>Error: Wallet locked, unable to create transaction!</source> - <translation>Błąd: Zablokowany portfel, nie można utworzyć transakcji!</translation> + <source>Error: Disk space is low!</source> + <translation>Błąd: Mało miejsca na dysku!</translation> </message> <message> <source>Failed to listen on any port. Use -listen=0 if you want this.</source> - <translation>Próba otwarcia jakiegokolwiek portu nie powiodła się. Użyj -listen=0 jeśli tego chcesz.</translation> + <translation>Próba nasłuchiwania na jakimkolwiek porcie nie powiodła się. Użyj -listen=0 jeśli tego chcesz.</translation> </message> <message> <source>Importing...</source> @@ -2482,8 +2611,8 @@ na przykład: alertnotify=echo %%s | mail -s "Alarm Bitcoin" admin@foo.com⏎</t <translation>Brak wystarczającej liczby deskryptorów plików. </translation> </message> <message> - <source>Rebuild block chain index from current blk000??.dat files</source> - <translation>Odbuduj indeks łańcucha bloków z obecnych plików blk000??.dat</translation> + <source>Only connect to nodes in network <net> (ipv4, ipv6 or onion)</source> + <translation>Łącz z węzłami tylko w sieci <net> (ipv4, piv6 lub onion)</translation> </message> <message> <source>Set database cache size in megabytes (%d to %d, default: %d)</source> @@ -2498,6 +2627,14 @@ na przykład: alertnotify=echo %%s | mail -s "Alarm Bitcoin" admin@foo.com⏎</t <translation>Określ plik portfela (w obrębie folderu danych)</translation> </message> <message> + <source>This is intended for regression testing tools and app development.</source> + <translation>Jest to przeznaczone dla narzędzi testowania regresji i rozwoju aplikacji.</translation> + </message> + <message> + <source>Use UPnP to map the listening port (default: %u)</source> + <translation>Użyj UPnP do przekazania portu nasłuchu (domyślnie : %u)</translation> + </message> + <message> <source>Verifying blocks...</source> <translation>Weryfikacja bloków...</translation> </message> @@ -2522,18 +2659,94 @@ na przykład: alertnotify=echo %%s | mail -s "Alarm Bitcoin" admin@foo.com⏎</t <translation>Importuj bloki z zewnętrznego pliku blk000??.dat</translation> </message> <message> + <source>Allow JSON-RPC connections from specified source. Valid for <ip> are a single IP (e.g. 1.2.3.4), a network/netmask (e.g. 1.2.3.4/255.255.255.0) or a network/CIDR (e.g. 1.2.3.4/24). This option can be specified multiple times</source> + <translation>Pozwól na połączenia JSON-RPC z podanego źródła. Jako <ip> prawidłowe jest pojedyncze IP (np. 1.2.3.4), podsieć/maska (np. 1.2.3.4/255.255.255.0) lub sieć/CIDR (np. 1.2.3.4/24). Opcja ta może być użyta wiele razy.</translation> + </message> + <message> + <source>An error occurred while setting up the RPC address %s port %u for listening: %s</source> + <translation>Napotkano błąd podczas ustawiania adres RPC %s port %u dla nasłuchiwania: %s</translation> + </message> + <message> <source>Cannot obtain a lock on data directory %s. Bitcoin Core is probably already running.</source> <translation>Nie można uzyskać blokady na katalogu z danymi %s. Rdzeń Bitcoin najprawdopodobniej jest już uruchomiony.</translation> </message> <message> + <source>Error: Listening for incoming connections failed (listen returned error %s)</source> + <translation>Błąd: Nasłuchiwanie połączeń przychodzących nie powiodło się (nasłuch zwrócił błąd %s)</translation> + </message> + <message> + <source>Error: Unsupported argument -socks found. Setting SOCKS version isn't possible anymore, only SOCKS5 proxies are supported.</source> + <translation>Błąd: Znaleziono niewspierany argument -socks . Ustawienie wersji SOCKS nie jest już możliwe, tylko serwery proxy SOCKS5 są wspierane.</translation> + </message> + <message> <source>Execute command when a relevant alert is received or we see a really long fork (%s in cmd is replaced by message)</source> <translation>Uruchom polecenie przy otrzymaniu odpowiedniego powiadomienia lub gdy zobaczymy naprawdę długie rozgałęzienie (%s w poleceniu jest podstawiane za komunikat)</translation> </message> <message> + <source>Maximum size of data in data carrier transactions we relay and mine (default: %u)</source> + <translation>Maksymalny rozmiar danych w transakcji przekazującej dane które przekazujemy i wydobywamy (domyślnie: %u)</translation> + </message> + <message> + <source>Query for peer addresses via DNS lookup, if low on addresses (default: 1 unless -connect)</source> + <translation>Wyszukaj adresy węzłów wykorzystując zapytanie DNS, jeżeli masz mało adresów (domyślnie: 1 jeśli nie użyto -connect)</translation> + </message> + <message> + <source>Set maximum size of high-priority/low-fee transactions in bytes (default: %d)</source> + <translation>Ustaw maksymalny rozmiar transakcji o wysokim priorytecie/niskiej prowizji w bajtach (domyślnie: %d)</translation> + </message> + <message> + <source>Set the number of threads for coin generation if enabled (-1 = all cores, default: %d)</source> + <translation>Ustaw liczbę wątków dla generowania monet (-1 = wszystkie rdzenie, domyślnie: %d)</translation> + </message> + <message> + <source>This product includes software developed by the OpenSSL Project for use in the OpenSSL Toolkit <https://www.openssl.org/> and cryptographic software written by Eric Young and UPnP software written by Thomas Bernard.</source> + <translation>Program ten zawiera oprogramowanie stworzone przez OpenSSL Project do użycia w OpensSSL Toolkit <https://www.openssl.org/>, oprogramowanie kryptograficzne napisane przez Eric Young oraz oprogramowanie UPnP napisane przez Thomas Bernard.</translation> + </message> + <message> + <source>Warning: -maxtxfee is set very high! Fees this large could be paid on a single transaction.</source> + <translation>Ostrzeżenie: -matxfee jest ustawione bardzo wysokie! Tak wysokie opłaty mogą być zapłacone w jednej transakcji.</translation> + </message> + <message> + <source>Choose data directory on startup (default: 0)</source> + <translation>Wybierz folder danych przy starcie (domyślnie: 0)</translation> + </message> + <message> + <source>Connect through SOCKS5 proxy</source> + <translation>Połącz przez SOCKS5 proxy</translation> + </message> + <message> + <source>Copyright (C) 2009-%i The Bitcoin Core Developers</source> + <translation>Copyright (C) 2009-%i The Bitcoin Core Developers</translation> + </message> + <message> + <source>Error loading wallet.dat: Wallet requires newer version of Bitcoin Core</source> + <translation>Błąd ładowania wallet.dat: Portfel wymaga nowszej wersji Bitcoin Core</translation> + </message> + <message> + <source>Error reading from database, shutting down.</source> + <translation>Błąd odczytu z bazy danych, wyłączam się.</translation> + </message> + <message> + <source>Error: Unsupported argument -tor found, use -onion.</source> + <translation>Błąd: Znaleziono nieprawidłowy argument -tor, użyj -onion.</translation> + </message> + <message> + <source>Fee (in BTC/kB) to add to transactions you send (default: %s)</source> + <translation>Prowizja (w BTC za kB) dodawana do wysyłanej transakcji (domyślnie: %s)</translation> + </message> + <message> <source>Information</source> <translation>Informacja</translation> </message> <message> + <source>Initialization sanity check failed. Bitcoin Core is shutting down.</source> + <translation>Wstępna kontrola poprawności nie powiodła się. Bitcoin Core wyłącza się.</translation> + </message> + <message> + <source>Invalid amount for -maxtxfee=<amount>: '%s'</source> + <translation>Nieprawidłowa kwota dla -maxtxfee=<amount>: '%s'</translation> + </message> + <message> <source>Invalid amount for -minrelaytxfee=<amount>: '%s'</source> <translation>Nieprawidłowa kwota dla -minrelaytxfee=<amount>: '%s'</translation> </message> @@ -2542,12 +2755,12 @@ na przykład: alertnotify=echo %%s | mail -s "Alarm Bitcoin" admin@foo.com⏎</t <translation>Nieprawidłowa kwota dla -mintxfee=<amount>: '%s'</translation> </message> <message> - <source>Node relay options:</source> - <translation>Opcje przekaźnikowe węzła:</translation> + <source>Invalid amount for -paytxfee=<amount>: '%s' (must be at least %s)</source> + <translation>Nieprawidłowa kwota dla -paytxfee=<amount>: '%s' (musi być co najmniej %s)</translation> </message> <message> - <source>Print block on startup, if found in block index</source> - <translation>Wyświetlaj blok podczas uruchamiania, jeżeli znaleziono indeks bloków</translation> + <source>Node relay options:</source> + <translation>Opcje przekaźnikowe węzła:</translation> </message> <message> <source>RPC SSL options: (see the Bitcoin Wiki for SSL setup instructions)</source> @@ -2563,17 +2776,33 @@ na przykład: alertnotify=echo %%s | mail -s "Alarm Bitcoin" admin@foo.com⏎</t </message> <message> <source>Randomly fuzz 1 of every <n> network messages</source> - <translation>Losowo ignoruje 1 z wszystkich <n> wiadomości sieciowych.</translation> + <translation>Losowo miesza 1 z wszystkich <n> wiadomości sieciowych.</translation> </message> <message> <source>Send trace/debug info to console instead of debug.log file</source> <translation>Wyślij informację/raport do konsoli zamiast do pliku debug.log.</translation> </message> <message> + <source>Send transactions as zero-fee transactions if possible (default: %u)</source> + <translation>Wyślij bez opłaty jeżeli to możliwe (domyślnie: %u)</translation> + </message> + <message> + <source>Set SSL root certificates for payment request (default: -system-)</source> + <translation>Ustaw certyfikaty główne SSL dla żądań płatności (domyślnie: -system-)</translation> + </message> + <message> + <source>Set language, for example "de_DE" (default: system locale)</source> + <translation>Ustaw Język, na przykład "pl_PL" (domyślnie: systemowy)</translation> + </message> + <message> <source>Show all debugging options (usage: --help -help-debug)</source> <translation>Pokaż wszystkie opcje odpluskwiania (użycie: --help -help-debug)</translation> </message> <message> + <source>Show splash screen on startup (default: 1)</source> + <translation>Pokazuj okno powitalne przy starcie (domyślnie: 1)</translation> + </message> + <message> <source>Shrink debug.log file on client startup (default: 1 when no -debug)</source> <translation>Zmniejsz plik debug.log przy starcie programu (domyślnie: 1 jeśli nie użyto -debug)</translation> </message> @@ -2582,6 +2811,10 @@ na przykład: alertnotify=echo %%s | mail -s "Alarm Bitcoin" admin@foo.com⏎</t <translation>Podpisywanie transakcji nie powiodło się</translation> </message> <message> + <source>Start minimized</source> + <translation>Uruchom zminimalizowany</translation> + </message> + <message> <source>This is experimental software.</source> <translation>To oprogramowanie eksperymentalne.</translation> </message> @@ -2594,10 +2827,18 @@ na przykład: alertnotify=echo %%s | mail -s "Alarm Bitcoin" admin@foo.com⏎</t <translation>Kwota transakcji musi być dodatnia</translation> </message> <message> + <source>Transaction too large for fee policy</source> + <translation>Transakcja jest zbyt duża dla tej opłaty</translation> + </message> + <message> <source>Transaction too large</source> <translation>Transakcja zbyt duża</translation> </message> <message> + <source>Unable to bind to %s on this computer (bind returned error %s)</source> + <translation>Nie można przywiązać do %s na tym komputerze (bind zwrócił błąd %s)</translation> + </message> + <message> <source>Use UPnP to map the listening port (default: 1 when listening)</source> <translation>Używaj UPnP do mapowania portu nasłuchu (domyślnie: 1 gdy nasłuchuje)</translation> </message> @@ -2607,15 +2848,23 @@ na przykład: alertnotify=echo %%s | mail -s "Alarm Bitcoin" admin@foo.com⏎</t </message> <message> <source>Wallet needed to be rewritten: restart Bitcoin Core to complete</source> - <translation>Portfel wymaga przepisania: zresetuj Bitcoina aby ukończyć</translation> + <translation>Portfel wymaga przepisania: zrestartuj Bitcoina aby ukończyć</translation> </message> <message> <source>Warning</source> <translation>Ostrzeżenie</translation> </message> <message> - <source>Warning: This version is obsolete, upgrade required!</source> - <translation>Uwaga: Ta wersja jest przestarzała, aktualizacja wymagana!</translation> + <source>Warning: Unsupported argument -benchmark ignored, use -debug=bench.</source> + <translation>Uwaga: Zignorowano nieprawidłowy argument -benchmark, użyj -debug=bench.</translation> + </message> + <message> + <source>Warning: Unsupported argument -debugnet ignored, use -debug=net.</source> + <translation>Uwaga: Zignorowano nieprawidłowy argument -debugnet , użyj -debug=net.</translation> + </message> + <message> + <source>Zapping all transactions from wallet...</source> + <translation>Usuwam wszystkie transakcje z portfela...</translation> </message> <message> <source>on startup</source> @@ -2639,7 +2888,7 @@ na przykład: alertnotify=echo %%s | mail -s "Alarm Bitcoin" admin@foo.com⏎</t </message> <message> <source>Rescan the block chain for missing wallet transactions</source> - <translation>Przeskanuj blok łańcuchów żeby znaleźć zaginione transakcje portfela</translation> + <translation>Przeskanuj łańcuch bloków w poszukiwaniu zaginionych transakcji portfela</translation> </message> <message> <source>Use OpenSSL (https) for JSON-RPC connections</source> @@ -2662,14 +2911,146 @@ na przykład: alertnotify=echo %%s | mail -s "Alarm Bitcoin" admin@foo.com⏎</t <translation>Błąd ładowania wallet.dat: Uszkodzony portfel</translation> </message> <message> + <source>(1 = keep tx meta data e.g. account owner and payment request information, 2 = drop tx meta data)</source> + <translation>(1 = zachowaj wysłane metadane np. właściciel konta i informacje o żądaniach płatności, 2 = porzuć wysłane metadane)</translation> + </message> + <message> + <source>How thorough the block verification of -checkblocks is (0-4, default: %u)</source> + <translation>Jak dokładna jest weryfikacja bloków przy -checkblocks (0-4, domyślnie: %u)</translation> + </message> + <message> + <source>Log transaction priority and fee per kB when mining blocks (default: %u)</source> + <translation>Loguj priorytety transakcji i opłaty na kB podczas kopania bloków (domyślnie: %u)</translation> + </message> + <message> + <source>Maintain a full transaction index, used by the getrawtransaction rpc call (default: %u)</source> + <translation>Utrzymuj pełny indeks transakcji, używany przy wywołaniu RPC getrawtransaction (domyślnie: %u)</translation> + </message> + <message> + <source>Number of seconds to keep misbehaving peers from reconnecting (default: %u)</source> + <translation>Czas w sekundach, przez jaki nietrzymające się zasad węzły nie będą mogły ponownie się podłączyć (domyślnie: %u)</translation> + </message> + <message> + <source>(default: %s)</source> + <translation>(domyślnie: %s)</translation> + </message> + <message> <source>Error loading wallet.dat</source> <translation>Błąd ładowania wallet.dat</translation> </message> <message> + <source>Force safe mode (default: %u)</source> + <translation>Wymuś tryb bezpieczny (domyślnie: %u)</translation> + </message> + <message> + <source>Generate coins (default: %u)</source> + <translation>Generuj monety (domyślnie: %u)</translation> + </message> + <message> + <source>How many blocks to check at startup (default: %u, 0 = all)</source> + <translation>Ile bloków sprawdzić przy starcie (domyślnie: %u, 0 = wszystkie)</translation> + </message> + <message> + <source>Include IP addresses in debug output (default: %u)</source> + <translation>Dołącz adresy IP do logowania (domyślnie: %u)</translation> + </message> + <message> <source>Invalid -proxy address: '%s'</source> <translation>Nieprawidłowy adres -proxy: '%s'</translation> </message> <message> + <source>Limit size of signature cache to <n> entries (default: %u)</source> + <translation>Ogranicz rozmiar pamięci podręcznej sygnatur do <n> wpisów (domyślnie: %u)</translation> + </message> + <message> + <source>Listen for JSON-RPC connections on <port> (default: %u or testnet: %u)</source> + <translation>Nasłuchuj połączeń JSON-RPC na <port> (domyślnie: %u lub testnet: %u)</translation> + </message> + <message> + <source>Listen for connections on <port> (default: %u or testnet: %u)</source> + <translation>Nasłuchuj połączeń na <port> (domyślnie: %u lub testnet: %u)</translation> + </message> + <message> + <source>Maintain at most <n> connections to peers (default: %u)</source> + <translation>Utrzymuj maksymalnie <n> połączeń z węzłami (domyślnie: %u)</translation> + </message> + <message> + <source>Maximum per-connection receive buffer, <n>*1000 bytes (default: %u)</source> + <translation>Maksymalny bufor odbioru na połączenie, <n>*1000 bajtów (domyślnie: %u)</translation> + </message> + <message> + <source>Maximum per-connection send buffer, <n>*1000 bytes (default: %u)</source> + <translation>Maksymalny bufor wysyłania na połączenie, <n>*1000 bajtów (domyślnie: %u)</translation> + </message> + <message> + <source>Only accept block chain matching built-in checkpoints (default: %u)</source> + <translation>Akceptuj tylko łańcuch bloków zgodny z wbudowanymi punktami kontrolnymi (domyślnie: %u)</translation> + </message> + <message> + <source>Prepend debug output with timestamp (default: %u)</source> + <translation>Dołączaj znacznik czasu do logowania (domyślnie: %u)</translation> + </message> + <message> + <source>Relay and mine data carrier transactions (default: %u)</source> + <translation>Przekazuj i wydobywaj transakcje zawierające dane (domyślnie: %u)</translation> + </message> + <message> + <source>Relay non-P2SH multisig (default: %u)</source> + <translation>Przekazuj transakcje multisig inne niż P2SH (domyślnie: %u)</translation> + </message> + <message> + <source>Run a thread to flush wallet periodically (default: %u)</source> + <translation>Uruchom wątek do okresowego zapisywania portfela (domyślnie: %u)</translation> + </message> + <message> + <source>Server certificate file (default: %s)</source> + <translation>Plik certyfikatu serwera (domyślnie: %s)</translation> + </message> + <message> + <source>Server private key (default: %s)</source> + <translation>Klucz prywatny serwera (domyślnie: %s)</translation> + </message> + <message> + <source>Set key pool size to <n> (default: %u)</source> + <translation>Ustaw rozmiar puli kluczy na <n> (domyślnie: %u)</translation> + </message> + <message> + <source>Set minimum block size in bytes (default: %u)</source> + <translation>Ustaw minimalny rozmiar bloku w bajtach (domyślnie: %u)</translation> + </message> + <message> + <source>Set the number of threads to service RPC calls (default: %d)</source> + <translation>Ustaw liczbę wątków do obsługi RPC (domyślnie: %d)</translation> + </message> + <message> + <source>Sets the DB_PRIVATE flag in the wallet db environment (default: %u)</source> + <translation>Ustaw flagę DB_PRIVATE w środowisku wallet db (domyślnie: %u)</translation> + </message> + <message> + <source>Specify configuration file (default: %s)</source> + <translation>Wskaż plik konfiguracyjny (domyślnie: %s)</translation> + </message> + <message> + <source>Specify connection timeout in milliseconds (minimum: 1, default: %d)</source> + <translation>Wskaż czas oczekiwania na połączenie w milisekundach (minimum: 1, domyślnie: %d)</translation> + </message> + <message> + <source>Specify pid file (default: %s)</source> + <translation>Wskaż plik pid (domyślnie: %s)</translation> + </message> + <message> + <source>Spend unconfirmed change when sending transactions (default: %u)</source> + <translation>Wydawaj niepotwierdzoną resztę podczas wysyłania transakcji (domyślnie: %u)</translation> + </message> + <message> + <source>Stop running after importing blocks from disk (default: %u)</source> + <translation>Zatrzymaj po zaimportowaniu bloków z dysku (domyślnie: %u)</translation> + </message> + <message> + <source>Threshold for disconnecting misbehaving peers (default: %u)</source> + <translation>Próg, po którym nastąpi rozłączenie węzłów nietrzymających się zasad (domyślnie: %u)</translation> + </message> + <message> <source>Unknown network specified in -onlynet: '%s'</source> <translation>Nieznana sieć w -onlynet: '%s'</translation> </message> @@ -2686,10 +3067,6 @@ na przykład: alertnotify=echo %%s | mail -s "Alarm Bitcoin" admin@foo.com⏎</t <translation>Nieprawidłowa kwota dla -paytxfee=<amount>: '%s'</translation> </message> <message> - <source>Invalid amount</source> - <translation>Nieprawidłowa kwota</translation> - </message> - <message> <source>Insufficient funds</source> <translation>Niewystarczające środki</translation> </message> @@ -2699,7 +3076,7 @@ na przykład: alertnotify=echo %%s | mail -s "Alarm Bitcoin" admin@foo.com⏎</t </message> <message> <source>Add a node to connect to and attempt to keep the connection open</source> - <translation>Dodaj węzeł do łączenia się and attempt to keep the connection open</translation> + <translation>Dodaj węzeł do podłączenia się i próbuj utrzymać to połączenie</translation> </message> <message> <source>Loading wallet...</source> @@ -2722,10 +3099,6 @@ na przykład: alertnotify=echo %%s | mail -s "Alarm Bitcoin" admin@foo.com⏎</t <translation>Wczytywanie zakończone</translation> </message> <message> - <source>To use the %s option</source> - <translation>Aby użyć opcji %s</translation> - </message> - <message> <source>Error</source> <translation>Błąd</translation> </message> diff --git a/src/qt/locale/bitcoin_pt_BR.ts b/src/qt/locale/bitcoin_pt_BR.ts index 65f07ca59c..d4d1d83e54 100644 --- a/src/qt/locale/bitcoin_pt_BR.ts +++ b/src/qt/locale/bitcoin_pt_BR.ts @@ -1,13 +1,13 @@ -<TS language="pt_BR" version="2.0"> +<TS language="pt_BR" version="2.1"> <context> <name>AddressBookPage</name> <message> - <source>Double-click to edit address or label</source> - <translation>Duplo-clique para editar o endereço ou o rótulo</translation> + <source>Right-click to edit address or label</source> + <translation>Clique com o botão direito para editar o endereço ou rótulo </translation> </message> <message> <source>Create a new address</source> - <translation>Criar um novo endereço</translation> + <translation>Criar novo endereço</translation> </message> <message> <source>&New</source> @@ -59,11 +59,11 @@ </message> <message> <source>Sending addresses</source> - <translation>Enviando endereços</translation> + <translation>Endereços para envios</translation> </message> <message> <source>Receiving addresses</source> - <translation>Recebendo endereços</translation> + <translation>Endereços para receber</translation> </message> <message> <source>These are your Bitcoin addresses for sending payments. Always check the amount and the receiving address before sending coins.</source> @@ -156,22 +156,22 @@ <translation>Alterar frase de segurança</translation> </message> <message> - <source>Enter the old and new passphrase to the wallet.</source> - <translation>Digite a frase de segurança antiga e nova para a carteira.</translation> - </message> - <message> <source>Confirm wallet encryption</source> <translation>Confirmar criptografia da carteira</translation> </message> <message> <source>Warning: If you encrypt your wallet and lose your passphrase, you will <b>LOSE ALL OF YOUR BITCOINS</b>!</source> - <translation>Atenção: Se você criptografar sua carteira e perder sua senha, você vai <b>perder todos os seus BITCOINS!</b></translation> + <translation>Atenção: Se você criptografar sua carteira e perder sua frase, você vai <b>perder todos os seus BITCOINS!</b></translation> </message> <message> <source>Are you sure you wish to encrypt your wallet?</source> <translation>Tem certeza de que deseja criptografar sua carteira?</translation> </message> <message> + <source>Bitcoin Core will close now to finish the encryption process. Remember that encrypting your wallet cannot fully protect your bitcoins from being stolen by malware infecting your computer.</source> + <translation>O Bitcoin irá fechar agora para terminar o processo de criptografia. Lembre-se que criptografando sua carteira não te protege totalmente de ter seus bitcoins roubados por um malware que infectar seu computador.</translation> + </message> + <message> <source>IMPORTANT: Any previous backups you have made of your wallet file should be replaced with the newly generated, encrypted wallet file. For security reasons, previous backups of the unencrypted wallet file will become useless as soon as you start using the new, encrypted wallet.</source> <translation>IMPORTANTE: Qualquer backup prévio que você tenha feito do seu arquivo wallet deve ser substituído pelo novo e encriptado arquivo wallet gerado. Por razões de segurança, qualquer backup do arquivo wallet não criptografado se tornará inútil assim que você começar a usar uma nova carteira criptografada.</translation> </message> @@ -185,11 +185,11 @@ </message> <message> <source>Enter the new passphrase to the wallet.<br/>Please use a passphrase of <b>ten or more random characters</b>, or <b>eight or more words</b>.</source> - <translation>Digite a nova senha da carteira. <br/>Por favor utilize uma senha com <b>dez ou mais caracteres aleartórios</b>, ou <b>oito ou mais palavras</b>.</translation> + <translation>Digite a nova frase da carteira. <br/>Por favor utilize uma senha com <b>dez ou mais caracteres aleartórios</b>, ou <b>oito ou mais palavras</b>.</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>O Bitcoin irá fechar agora para finalizar o processo de encriptação. Lembre-se de que encriptar sua carteira não protege totalmente suas bitcoins de serem roubadas por malwares que tenham infectado o seu computador.</translation> + <source>Enter the old passphrase and new passphrase to the wallet.</source> + <translation>Insira a frase antiga e a nova da carteira.</translation> </message> <message> <source>Wallet encryption failed</source> @@ -296,7 +296,7 @@ </message> <message> <source>Bitcoin Core client</source> - <translation>Cliente Bitcoin Core</translation> + <translation>Cliente Bitcoin</translation> </message> <message> <source>Importing blocks from disk...</source> @@ -311,10 +311,6 @@ <translation>Enviar moedas para um endereço bitcoin</translation> </message> <message> - <source>Modify configuration options for Bitcoin</source> - <translation>Modificar opções de configuração para bitcoin</translation> - </message> - <message> <source>Backup wallet to another location</source> <translation>Fazer cópia de segurança da carteira para uma outra localização</translation> </message> @@ -352,7 +348,7 @@ </message> <message> <source>Show information about Bitcoin Core</source> - <translation>Mostrar informações sobre Bitcoin Core</translation> + <translation>Mostrar informações sobre Bitcoin</translation> </message> <message> <source>&Show / Hide</source> @@ -368,7 +364,7 @@ </message> <message> <source>Sign messages with your Bitcoin addresses to prove you own them</source> - <translation>Assine mensagems com seus endereços Bitcoin para provar que você é dono deles</translation> + <translation>Assine mensagens com seus endereços Bitcoin para provar que você é dono delas</translation> </message> <message> <source>Verify messages to ensure they were signed with specified Bitcoin addresses</source> @@ -392,7 +388,7 @@ </message> <message> <source>Bitcoin Core</source> - <translation>Núcleo Bitcoin</translation> + <translation>Bitcoin</translation> </message> <message> <source>Request payments (generates QR codes and bitcoin: URIs)</source> @@ -400,7 +396,11 @@ </message> <message> <source>&About Bitcoin Core</source> - <translation>&A respeito do Bitcoin Core</translation> + <translation>&Sobre Bitcoin</translation> + </message> + <message> + <source>Modify configuration options for Bitcoin Core</source> + <translation>Modificar opções de configuração do Bitcoin</translation> </message> <message> <source>Show the list of used sending addresses and labels</source> @@ -420,7 +420,7 @@ </message> <message> <source>Show the Bitcoin Core help message to get a list with possible Bitcoin command-line options</source> - <translation>Mostra a mensagem de ajuda do Bitcoin Core para pegar a lista com os comandos possíveis</translation> + <translation>Mostra a mensagem de ajuda do Bitcoin para pegar a lista com os comandos possíveis</translation> </message> <message numerus="yes"> <source>%n active connection(s) to Bitcoin network</source> @@ -483,6 +483,36 @@ <translation>Recuperando o atraso ...</translation> </message> <message> + <source>Date: %1 +</source> + <translation>Data: %1 +</translation> + </message> + <message> + <source>Amount: %1 +</source> + <translation>Quantidade: %1 +</translation> + </message> + <message> + <source>Type: %1 +</source> + <translation>Tipo: %1 +</translation> + </message> + <message> + <source>Label: %1 +</source> + <translation>Rótulo: %1 +</translation> + </message> + <message> + <source>Address: %1 +</source> + <translation>Endereço: %1 +</translation> + </message> + <message> <source>Sent transaction</source> <translation>Transação enviada</translation> </message> @@ -491,17 +521,6 @@ <translation>Transação recebida</translation> </message> <message> - <source>Date: %1 -Amount: %2 -Type: %3 -Address: %4 -</source> - <translation>Data: %1 -Quantidade: %2 -Tipo: %3 -Endereço: %4</translation> - </message> - <message> <source>Wallet is <b>encrypted</b> and currently <b>unlocked</b></source> <translation>Carteira está <b>criptografada</b> e atualmente <b>desbloqueada</b></translation> </message> @@ -520,6 +539,10 @@ Endereço: %4</translation> <context> <name>CoinControlDialog</name> <message> + <source>Coin Selection</source> + <translation>Selecionar Moeda</translation> + </message> + <message> <source>Quantity:</source> <translation>Quantidade:</translation> </message> @@ -568,6 +591,14 @@ Endereço: %4</translation> <translation>Quantidade</translation> </message> <message> + <source>Received with label</source> + <translation>Recebido com rótulo</translation> + </message> + <message> + <source>Received with address</source> + <translation>Recebido com endereço </translation> + </message> + <message> <source>Date</source> <translation>Data</translation> </message> @@ -680,6 +711,18 @@ Endereço: %4</translation> <translation>nenhum</translation> </message> <message> + <source>This label turns red if the transaction size is greater than 1000 bytes.</source> + <translation>Este texto fica vermelho se o tamanho da transação for maior que 1000 bytes.</translation> + </message> + <message> + <source>This label turns red if the priority is smaller than "medium".</source> + <translation>Este texto fica vermelho se a prioridade é menor que "medio".</translation> + </message> + <message> + <source>This label turns red if any recipient receives an amount smaller than %1.</source> + <translation>Este texto fica vermelho se qualquer destinatário receber uma quantidade menor que %1.</translation> + </message> + <message> <source>Can vary +/- %1 satoshi(s) per input.</source> <translation>Pode variar +/- %1 satoshi(s) por entrada.</translation> </message> @@ -692,10 +735,6 @@ Endereço: %4</translation> <translation>não</translation> </message> <message> - <source>This label turns red, if the transaction size is greater than 1000 bytes.</source> - <translation>Esse marcador fica vermelho se a transação ultrapassar 1000 bytes.</translation> - </message> - <message> <source>This means a fee of at least %1 per kB is required.</source> <translation>Isso significa que uma taxa de pelo menos %1 por kB é necessária.</translation> </message> @@ -708,14 +747,6 @@ Endereço: %4</translation> <translation>Transações de alta prioridade são mais propensas a serem incluídas em um bloco.</translation> </message> <message> - <source>This label turns red, if the priority is smaller than "medium".</source> - <translation>Esse marcador fica vermelho se a prioridade for menor que "média".</translation> - </message> - <message> - <source>This label turns red, if any recipient receives an amount smaller than %1.</source> - <translation>Esse marcador fica vermelho se qualquer destinatário receber uma quantia menor que %1</translation> - </message> - <message> <source>(no label)</source> <translation>(Sem rótulo)</translation> </message> @@ -810,7 +841,7 @@ Endereço: %4</translation> <name>HelpMessageDialog</name> <message> <source>Bitcoin Core</source> - <translation>Núcleo Bitcoin</translation> + <translation>Bitcoin</translation> </message> <message> <source>version</source> @@ -822,7 +853,7 @@ Endereço: %4</translation> </message> <message> <source>About Bitcoin Core</source> - <translation>Sobre o Bitcoin Core</translation> + <translation>Sobre o Bitcoin</translation> </message> <message> <source>Command-line options</source> @@ -836,30 +867,6 @@ Endereço: %4</translation> <source>command-line options</source> <translation>opções da linha de comando</translation> </message> - <message> - <source>UI options</source> - <translation>opções da UI</translation> - </message> - <message> - <source>Set language, for example "de_DE" (default: system locale)</source> - <translation>Escolher língua, por exemplo "de_DE" (padrão: localização do sistema)</translation> - </message> - <message> - <source>Start minimized</source> - <translation>Inicializar minimizado</translation> - </message> - <message> - <source>Set SSL root certificates for payment request (default: -system-)</source> - <translation>Define certificados SSL root para requisição de pagamento (padrão: -system-)</translation> - </message> - <message> - <source>Show splash screen on startup (default: 1)</source> - <translation>Mostrar tela inicial ao ligar (padrão: 1)</translation> - </message> - <message> - <source>Choose data directory on startup (default: 0)</source> - <translation>Escolha o diretório de dados na inicialização (padrão: 0)</translation> - </message> </context> <context> <name>Intro</name> @@ -869,15 +876,15 @@ Endereço: %4</translation> </message> <message> <source>Welcome to Bitcoin Core.</source> - <translation>Bem vindo ao Bitcoin Core.</translation> + <translation>Bem vindo ao Bitcoin.</translation> </message> <message> <source>As this is the first time the program is launched, you can choose where Bitcoin Core will store its data.</source> - <translation>A primeira vez que o programa é aberto você pode escolher onde o Bitcoin Core vai guardar os dados.</translation> + <translation>A primeira vez que o programa é aberto você pode escolher onde o Bitcoin vai guardar os dados.</translation> </message> <message> <source>Bitcoin Core will download and store a copy of the Bitcoin block chain. At least %1GB of data will be stored in this directory, and it will grow over time. The wallet will also be stored in this directory.</source> - <translation>Bitcoin Core vai fazer download e guardar uma cópia da longa e única cadeia de blocos do Bitcoin: Blockchain. Pelo menos %1 GB de dados serão armazenados nesse diretório e isso aumentará ao longo do tempo. Sua carteira também será armazenada nesse diretório.</translation> + <translation>O Bitcoin vai fazer download e salvar uma cópia da cadeia de blocos do Bitcoin: Blockchain. Pelo menos %1 GB de dados serão armazenados nesse diretório e isso aumentará ao longo do tempo. Sua carteira também será armazenada nesse diretório.</translation> </message> <message> <source>Use the default data directory</source> @@ -889,7 +896,7 @@ Endereço: %4</translation> </message> <message> <source>Bitcoin Core</source> - <translation>Núcleo Bitcoin</translation> + <translation>Bitcoin</translation> </message> <message> <source>Error: Specified data directory "%1" cannot be created.</source> @@ -942,14 +949,6 @@ Endereço: %4</translation> <translation>Principal</translation> </message> <message> - <source>Automatically start Bitcoin after logging in to the system.</source> - <translation>Iniciar Bitcoin automaticamente após se logar no sistema.</translation> - </message> - <message> - <source>&Start Bitcoin on system login</source> - <translation>Iniciar Bitcoin no login do sistema</translation> - </message> - <message> <source>Size of &database cache</source> <translation>Tamanho do banco de &dados do cache</translation> </message> @@ -974,12 +973,16 @@ Endereço: %4</translation> <translation>Endereço de IP do proxy (e.g. IPv4: 127.0.0.1 / IPv6: ::1)</translation> </message> <message> + <source>Minimize instead of exit the application when the window is closed. When this option is enabled, the application will be closed only after selecting Exit in the menu.</source> + <translation>Minimizar em vez de fechar o programa quando a janela for fechada. Quando essa opção estiver ativa, o programa só será fechado somente pela opção Sair no menu Arquivo.</translation> + </message> + <message> <source>Third party URLs (e.g. a block explorer) that appear in the transactions tab as context menu items. %s in the URL is replaced by transaction hash. Multiple URLs are separated by vertical bar |.</source> <translation>URLs de terceiros (exemplo: explorador de blocos) que aparecem na aba de transações como itens do menu de contexto. %s na URL é substituido pela hash da transação. Múltiplas URLs são separadas pela barra vertical |.</translation> </message> <message> <source>Third party transaction URLs</source> - <translation>URLs da transação de terceiros</translation> + <translation>URLs de transação de terceiros:</translation> </message> <message> <source>Active command-line options that override above options:</source> @@ -998,6 +1001,14 @@ Endereço: %4</translation> <translation>Rede</translation> </message> <message> + <source>Automatically start Bitcoin Core after logging in to the system.</source> + <translation>Inicar automaticamente o Bitcoin ao logar no sistema.</translation> + </message> + <message> + <source>&Start Bitcoin Core on system login</source> + <translation>&Iniciar Bitcoin no login do sistema</translation> + </message> + <message> <source>(0 = auto, <0 = leave that many cores free)</source> <translation>(0 = automático, <0 = número de cores deixados livres)</translation> </message> @@ -1030,6 +1041,14 @@ Endereço: %4</translation> <translation>Mapear porta usando &UPnP</translation> </message> <message> + <source>Connect to the Bitcoin network through a SOCKS5 proxy.</source> + <translation>Conectar na rede Bitcoin através de um proxy SOCKS5.</translation> + </message> + <message> + <source>&Connect through SOCKS5 proxy (default proxy):</source> + <translation>&Conectar usando proxy SOCKS5 (proxy pradrão):</translation> + </message> + <message> <source>Proxy &IP:</source> <translation>&IP do proxy:</translation> </message> @@ -1054,10 +1073,6 @@ Endereço: %4</translation> <translation>&Minimizar para a bandeja em vez da barra de tarefas.</translation> </message> <message> - <source>Minimize instead of exit the application when the window is closed. When this option is enabled, the application will be closed only after selecting Quit in the menu.</source> - <translation>Minimizar em vez de sair do aplicativo quando a janela for fechada. Quando esta opção é escolhida, o aplicativo só será fechado selecionando Sair no menu Arquivo.</translation> - </message> - <message> <source>M&inimize on close</source> <translation>M&inimizar ao sair</translation> </message> @@ -1067,11 +1082,7 @@ Endereço: %4</translation> </message> <message> <source>User Interface &language:</source> - <translation>&Língua da interface com usuário:</translation> - </message> - <message> - <source>The user interface language can be set here. This setting will take effect after restarting Bitcoin.</source> - <translation>A língua da interface com usuário pode ser escolhida aqui. Esta configuração só surtirá efeito após reiniciar o Bitcoin.</translation> + <translation>&Linguagem da interface:</translation> </message> <message> <source>&Unit to show amounts in:</source> @@ -1110,8 +1121,8 @@ Endereço: %4</translation> <translation>Reinicialização do aplicativo necessária para efetivar alterações.</translation> </message> <message> - <source>Client will be shutdown, do you want to proceed?</source> - <translation>O aplicativo vai desligar, deseja continuar?</translation> + <source>Client will be shut down. Do you want to proceed?</source> + <translation>O programa será encerrado. Deseja continuar?</translation> </message> <message> <source>This change would require a client restart.</source> @@ -1134,7 +1145,7 @@ Endereço: %4</translation> </message> <message> <source>Watch-only:</source> - <translation>Apenas visualizar:</translation> + <translation>Monitorados:</translation> </message> <message> <source>Available:</source> @@ -1177,10 +1188,26 @@ Endereço: %4</translation> <translation>Sua balança atual em endereços apenas visualizados</translation> </message> <message> + <source>Spendable:</source> + <translation>Disponível: </translation> + </message> + <message> <source>Recent transactions</source> <translation>Transações recentes</translation> </message> <message> + <source>Unconfirmed transactions to watch-only addresses</source> + <translation>Transações não confirmadas de um endereço monitorado</translation> + </message> + <message> + <source>Mined balance in watch-only addresses that has not yet matured</source> + <translation>Saldo minerado de endereço monitorado ainda não foi implementado</translation> + </message> + <message> + <source>Current total balance in watch-only addresses</source> + <translation>Balanço total em endereços monitorados</translation> + </message> + <message> <source>out of sync</source> <translation>fora de sincronia</translation> </message> @@ -1200,8 +1227,8 @@ Endereço: %4</translation> <translation>Solicitação de pagamento rejeitada</translation> </message> <message> - <source>Payment request has expired.</source> - <translation>Solicitação de pagamento expirou.</translation> + <source>Payment request is not initialized.</source> + <translation>Pedido de pagamento não é inicializado.</translation> </message> <message> <source>Requested payment amount of %1 is too small (considered dust).</source> @@ -1224,18 +1251,38 @@ Endereço: %4</translation> <translation>Manipulação de arquivo de cobrança</translation> </message> <message> + <source>Payment request expired.</source> + <translation>Pedido de pagamento expirado.</translation> + </message> + <message> <source>Unverified payment requests to custom payment scripts are unsupported.</source> <translation>Cobrança não verificada para scripts de pagamento personalizados não é suportado.</translation> </message> <message> + <source>Invalid payment request.</source> + <translation>Pedido de pagamento inválido.</translation> + </message> + <message> <source>Refund from %1</source> <translation>Reembolso de %1</translation> </message> <message> + <source>Payment request %1 is too large (%2 bytes, allowed %3 bytes).</source> + <translation>Pedido de pagamento %1 é muito grande (%2 bytes, permitido %3 bytes).</translation> + </message> + <message> + <source>Payment request DoS protection</source> + <translation>Pagamento requer proteção DoS</translation> + </message> + <message> <source>Error communicating with %1: %2</source> <translation>Erro na comunicação com %1: %2</translation> </message> <message> + <source>Payment request cannot be parsed!</source> + <translation>Requisição de pagamento não pode ser analisado!</translation> + </message> + <message> <source>Bad response from server %1</source> <translation>Resposta incorreta do servidor %1</translation> </message> @@ -1251,8 +1298,16 @@ Endereço: %4</translation> <context> <name>PeerTableModel</name> <message> + <source>User Agent</source> + <translation>User Agent</translation> + </message> + <message> + <source>Node/Service</source> + <translation>Nó/Serviço</translation> + </message> + <message> <source>Ping Time</source> - <translation>Tempo de Ping</translation> + <translation>Ping</translation> </message> </context> <context> @@ -1282,14 +1337,6 @@ Endereço: %4</translation> <translation>%1 s</translation> </message> <message> - <source>NETWORK</source> - <translation>REDE</translation> - </message> - <message> - <source>UNKNOWN</source> - <translation>DESCONHECIDO</translation> - </message> - <message> <source>None</source> <translation>Nenhum</translation> </message> @@ -1349,7 +1396,11 @@ Endereço: %4</translation> </message> <message> <source>Using OpenSSL version</source> - <translation>Usando OpenSSL versão</translation> + <translation>Versão do OpenSSL</translation> + </message> + <message> + <source>Using BerkeleyDB version</source> + <translation>Versão do BerkeleyDB</translation> </message> <message> <source>Startup time</source> @@ -1376,6 +1427,10 @@ Endereço: %4</translation> <translation>Quantidade atual de blocos</translation> </message> <message> + <source>Open the Bitcoin Core debug log file from the current data directory. This can take a few seconds for large log files.</source> + <translation>Abrir o arquivo de log de depuração do Bitcoin na pasta de dados atual. Isso pode demorar para arquivos grandes.</translation> + </message> + <message> <source>Received</source> <translation>Recebido</translation> </message> @@ -1388,6 +1443,10 @@ Endereço: %4</translation> <translation>&Pares</translation> </message> <message> + <source>Select a peer to view detailed information.</source> + <translation>Selecione um cliente para ver informações detalhadas.</translation> + </message> + <message> <source>Direction</source> <translation>Direção</translation> </message> @@ -1396,14 +1455,30 @@ Endereço: %4</translation> <translation>Versão</translation> </message> <message> + <source>User Agent</source> + <translation>User Agent</translation> + </message> + <message> <source>Services</source> <translation>Serviços</translation> </message> <message> + <source>Starting Height</source> + <translation>Altura inicial</translation> + </message> + <message> + <source>Sync Height</source> + <translation>Altura sincronizada</translation> + </message> + <message> <source>Ban Score</source> <translation>Banir pontuação</translation> </message> <message> + <source>Connection Time</source> + <translation>Tempo de conexão </translation> + </message> + <message> <source>Last Send</source> <translation>Ultimo Envio</translation> </message> @@ -1417,11 +1492,11 @@ Endereço: %4</translation> </message> <message> <source>Bytes Received</source> - <translation>bytes Recebidos</translation> + <translation>Bytes recebidos</translation> </message> <message> <source>Ping Time</source> - <translation>Tempo de Ping</translation> + <translation>Ping</translation> </message> <message> <source>Last block time</source> @@ -1464,16 +1539,12 @@ Endereço: %4</translation> <translation>Arquivo de log de Depuração</translation> </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>Abrir o arquivo de log de depuração do Bitcoin do diretório atual de dados. Isso pode levar alguns segundos para arquivos de log grandes.</translation> - </message> - <message> <source>Clear console</source> <translation>Limpar console</translation> </message> <message> - <source>Welcome to the Bitcoin RPC console.</source> - <translation>Bem-vindo ao console Bitcoin RPC.</translation> + <source>Welcome to the Bitcoin Core RPC console.</source> + <translation>Bem vindo ao console de RPC do Bitcoin.</translation> </message> <message> <source>Use up and down arrows to navigate history, and <b>Ctrl-L</b> to clear screen.</source> @@ -1519,7 +1590,11 @@ Endereço: %4</translation> <source>Unknown</source> <translation>Desconhecido</translation> </message> - </context> + <message> + <source>Fetching...</source> + <translation>Buscando...</translation> + </message> +</context> <context> <name>ReceiveCoinsDialog</name> <message> @@ -1693,11 +1768,11 @@ Endereço: %4</translation> <name>SendCoinsDialog</name> <message> <source>Send Coins</source> - <translation>Enviar dinheiro</translation> + <translation>Enviar moedas</translation> </message> <message> <source>Coin Control Features</source> - <translation>Opções de Controle da Moeda</translation> + <translation>Opções de controle de moeda</translation> </message> <message> <source>Inputs...</source> @@ -1737,7 +1812,7 @@ Endereço: %4</translation> </message> <message> <source>Change:</source> - <translation>trocar</translation> + <translation>troco</translation> </message> <message> <source>If this is activated, but the change address is empty or invalid, change will be sent to a newly generated address.</source> @@ -1748,6 +1823,70 @@ Endereço: %4</translation> <translation>Endereço específico de troco</translation> </message> <message> + <source>Transaction Fee:</source> + <translation>Taxa de transação: </translation> + </message> + <message> + <source>Choose...</source> + <translation>Escolher</translation> + </message> + <message> + <source>per kilobyte</source> + <translation>por kilobyte</translation> + </message> + <message> + <source>If the custom fee is set to 1000 satoshis and the transaction is only 250 bytes, then "per kilobyte" only pays 250 satoshis in fee, while "total at least" pays 1000 satoshis. For transactions bigger than a kilobyte both pay by kilobyte.</source> + <translation>Se a taxa personalizada for definida em 1000 satoshis e a transação tiver somente 250 bytes, então "por kilobyte" somente paga 250 satoshis de taxa, enquanto "pelo menos" paga 1000 satoshis. Se a transação for maior que 1 kilobyte, ambos pagam por kilobyte.</translation> + </message> + <message> + <source>Hide</source> + <translation>Ocultar</translation> + </message> + <message> + <source>total at least</source> + <translation>pelo menos</translation> + </message> + <message> + <source>Paying only the minimum fee is just fine as long as there is less transaction volume than space in the blocks. But be aware that this can end up in a never confirming transaction once there is more demand for bitcoin transactions than the network can process.</source> + <translation>Pagando apenas a taxa mínima é bom, desde que haja pouco volume de transações. Mas esteja ciente de que isso pode acabar em uma transação nunca confirmanda uma vez que há mais demanda por transações do que a rede pode processar.</translation> + </message> + <message> + <source>(read the tooltip)</source> + <translation>(Leia o popup)</translation> + </message> + <message> + <source>Recommended:</source> + <translation>Recomendado:</translation> + </message> + <message> + <source>Custom:</source> + <translation>Personalizado:</translation> + </message> + <message> + <source>(Smart fee not initialized yet. This usually takes a few blocks...)</source> + <translation>(Smart fee não iniciado. Isso requer alguns blocos...)</translation> + </message> + <message> + <source>Confirmation time:</source> + <translation>Tempo de confirmação:</translation> + </message> + <message> + <source>normal</source> + <translation>normal</translation> + </message> + <message> + <source>fast</source> + <translation>rápido </translation> + </message> + <message> + <source>Send as zero-fee transaction if possible</source> + <translation>Enviar sem taxa de transação se possível </translation> + </message> + <message> + <source>(confirmation may take longer)</source> + <translation>(confirmação pode demorar)</translation> + </message> + <message> <source>Send to multiple recipients at once</source> <translation>Enviar para vários destinatários de uma só vez</translation> </message> @@ -1781,7 +1920,7 @@ Endereço: %4</translation> </message> <message> <source>Confirm send coins</source> - <translation>Confirmar envio de dinheiro</translation> + <translation>Confirmar envio de moedas</translation> </message> <message> <source>%1 to %2</source> @@ -1824,10 +1963,6 @@ Endereço: %4</translation> <translation>ou</translation> </message> <message> - <source>The recipient address is not valid, please recheck.</source> - <translation>O endereço do destinatário não é válido, favor verificar.</translation> - </message> - <message> <source>The amount to pay must be larger than 0.</source> <translation>A quantidade a ser paga precisa ser maior que 0.</translation> </message> @@ -1840,10 +1975,6 @@ Endereço: %4</translation> <translation>O total excede seu saldo quando uma taxa de transação de %1 é incluída.</translation> </message> <message> - <source>Duplicate address found, can only send to each address once per send operation.</source> - <translation>Endereço duplicado: pode-se enviar para cada endereço apenas uma vez por transação.</translation> - </message> - <message> <source>Transaction creation failed!</source> <translation>A criação de transação falhou!</translation> </message> @@ -1852,6 +1983,30 @@ Endereço: %4</translation> <translation>A transação foi rejeitada! Isso pode acontecer se alguns bitcoins na sua carteira já foram gastos em outro local, por exemplo se você tiver uma cópia do wallet.dat e os bitcoins tiverem sido gastos na cópia mas não marcados como gastos aqui ainda.</translation> </message> <message> + <source>A fee higher than %1 is considered an absurdly high fee.</source> + <translation>Uma taxa maior que %1 é considerada uma taxa absurdamente alto.</translation> + </message> + <message> + <source>Payment request expired.</source> + <translation>Pedido de pagamento expirado.</translation> + </message> + <message numerus="yes"> + <source>Estimated to begin confirmation within %n block(s).</source> + <translation><numerusform>Confirmação estimada em %n bloco.</numerusform><numerusform>Confirmação estimada em %n blocos.</numerusform></translation> + </message> + <message> + <source>Pay only the minimum fee of %1</source> + <translation>Pagar somente a taxa mínima de %1</translation> + </message> + <message> + <source>The recipient address is not valid. Please recheck.</source> + <translation>O endereço do destinatário é inválido. Favor confirmar.</translation> + </message> + <message> + <source>Duplicate address found: addresses should only be used once each.</source> + <translation>Endereço duplicado encontrado: Endereços devem ser usados somente uma vez cada.</translation> + </message> + <message> <source>Warning: Invalid Bitcoin address</source> <translation>Atenção: endereço de Bitcoin inválido</translation> </message> @@ -1904,7 +2059,7 @@ Endereço: %4</translation> </message> <message> <source>The Bitcoin address to send the payment to</source> - <translation>O enderesso Bitcoin que enviarár o pagamento</translation> + <translation>Endereço que enviará o pagamento</translation> </message> <message> <source>Alt+A</source> @@ -1923,12 +2078,12 @@ Endereço: %4</translation> <translation>Remover esta entrada</translation> </message> <message> - <source>Message:</source> - <translation>Mensagem:</translation> + <source>S&ubtract fee from amount</source> + <translation>&Retirar taxa da quantia</translation> </message> <message> - <source>This is a verified payment request.</source> - <translation>Essa é cobrança verificada.</translation> + <source>Message:</source> + <translation>Mensagem:</translation> </message> <message> <source>Enter a label for this address to add it to the list of used addresses</source> @@ -1939,10 +2094,6 @@ Endereço: %4</translation> <translation>A mensagem que foi anexada ao bitcoin: URI na qual será gravada na transação para sua referência. Nota: Essa mensagem não será gravada publicamente na rede Bitcoin.</translation> </message> <message> - <source>This is an unverified payment request.</source> - <translation>Essa é uma cobrança não verificada.</translation> - </message> - <message> <source>Pay To:</source> <translation>Pague Para:</translation> </message> @@ -1955,11 +2106,11 @@ Endereço: %4</translation> <name>ShutdownWindow</name> <message> <source>Bitcoin Core is shutting down...</source> - <translation>Bitcoin Core está desligando...</translation> + <translation>Bitcoin está desligando...</translation> </message> <message> <source>Do not shut down the computer until this window disappears.</source> - <translation>Não desligue o computador até esta janela desaparece.</translation> + <translation>Não desligue o computador até esta janela desapareça.</translation> </message> </context> <context> @@ -1973,10 +2124,6 @@ Endereço: %4</translation> <translation>&Assinar Mensagem</translation> </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>Você pode assinar mensagens com seus endereços para provar que você é o dono deles. Seja cuidadoso para não assinar algo vago, pois ataques de pishing podem tentar te enganar para dar sua assinatura de identidade para eles. Apenas assine afirmações completamente detalhadas com as quais você concorda.</translation> - </message> - <message> <source>The Bitcoin address to sign the message with</source> <translation>O enderesso Bitcoin que assinará a mensagem</translation> </message> @@ -2029,10 +2176,6 @@ Endereço: %4</translation> <translation>&Verificar Mensagem</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>Forneça o endereço da assinatura, a mensagem (se assegure que você copiou quebras de linha, espaços, tabs, etc. exatamente) e a assinatura abaixo para verificar a mensagem. Cuidado para não ler mais na assinatura do que está escrito na mensagem propriamente, para evitar ser vítima de uma ataque do tipo "man-in-the-middle".</translation> - </message> - <message> <source>The Bitcoin address the message was signed with</source> <translation>O enderesso Bitcoin que assionou a mesnagem</translation> </message> @@ -2105,11 +2248,11 @@ Endereço: %4</translation> <name>SplashScreen</name> <message> <source>Bitcoin Core</source> - <translation>Núcleo Bitcoin</translation> + <translation>Bitcoin</translation> </message> <message> <source>The Bitcoin Core developers</source> - <translation>Programadores do Bitcoin Core</translation> + <translation>Programadores do Bitcoin</translation> </message> <message> <source>[testnet]</source> @@ -2179,7 +2322,7 @@ Endereço: %4</translation> </message> <message> <source>watch-only</source> - <translation>Vizualização apenas</translation> + <translation>monitorado</translation> </message> <message> <source>label</source> @@ -2235,7 +2378,7 @@ Endereço: %4</translation> </message> <message> <source>Generated coins must mature %1 blocks before they can be spent. When you generated this block, it was broadcast to the network to be added to the block chain. If it fails to get into the chain, its state will change to "not accepted" and it won't be spendable. This may occasionally happen if another node generates a block within a few seconds of yours.</source> - <translation>Bitcoins recém minerados precisam aguardar %1 blocos antes de serem gastos. Quando o bloco foi gerado, ele foi disseminado pela rede para ser adicionado à cadeia de blocos: blockchain. Se ele falhar em ser inserido na cadeia, seu estado será modificado para "não aceito" e ele não poderá ser gasto. Isso pode acontecer eventualmente quando blocos são gerados quase que simultaneamente.</translation> + <translation>Bitcoins recém minerados precisam aguardar %1 blocos antes de serem gastos. Quando o bloco foi gerado, ele foi disseminado pela rede para ser adicionado à blockchain. Se ele falhar em ser inserido na cadeia, seu estado será modificado para "não aceito" e ele não poderá ser gasto. Isso pode acontecer eventualmente quando blocos são gerados quase que simultaneamente.</translation> </message> <message> <source>Debug information</source> @@ -2296,10 +2439,6 @@ Endereço: %4</translation> <translation>Tipo</translation> </message> <message> - <source>Address</source> - <translation>Endereço</translation> - </message> - <message> <source>Immature (%1 confirmations, will be available after %2)</source> <translation>Recém-criado (%1 confirmações, disponível somente após %2)</translation> </message> @@ -2328,6 +2467,10 @@ Endereço: %4</translation> <translation>Offline</translation> </message> <message> + <source>Label</source> + <translation>Rótulo</translation> + </message> + <message> <source>Unconfirmed</source> <translation>Não confirmado</translation> </message> @@ -2341,15 +2484,15 @@ Endereço: %4</translation> </message> <message> <source>Received with</source> - <translation>Recebido por</translation> + <translation>Recebido</translation> </message> <message> <source>Received from</source> - <translation>Recebido de</translation> + <translation>Recebido</translation> </message> <message> <source>Sent to</source> - <translation>Enviado para</translation> + <translation>Enviado</translation> </message> <message> <source>Payment to yourself</source> @@ -2361,7 +2504,7 @@ Endereço: %4</translation> </message> <message> <source>watch-only</source> - <translation>Vizualização apenas</translation> + <translation>monitorado</translation> </message> <message> <source>(n/a)</source> @@ -2380,10 +2523,6 @@ Endereço: %4</translation> <translation>Tipo de transação.</translation> </message> <message> - <source>Destination address of transaction.</source> - <translation>Endereço de destino da transação.</translation> - </message> - <message> <source>Amount removed from or added to balance.</source> <translation>Quantidade debitada ou creditada ao saldo.</translation> </message> @@ -2420,11 +2559,11 @@ Endereço: %4</translation> </message> <message> <source>Received with</source> - <translation>Recebido por</translation> + <translation>Recebido</translation> </message> <message> <source>Sent to</source> - <translation>Enviado para</translation> + <translation>Enviado</translation> </message> <message> <source>To yourself</source> @@ -2476,7 +2615,7 @@ Endereço: %4</translation> </message> <message> <source>Watch-only</source> - <translation>Vizualização apenas</translation> + <translation>Monitorado</translation> </message> <message> <source>Exporting Failed</source> @@ -2533,7 +2672,11 @@ Endereço: %4</translation> </context> <context> <name>UnitDisplayStatusBarControl</name> - </context> + <message> + <source>Unit to show amounts in. Click to select another unit.</source> + <translation>Unidade para mostrar. Clique para selecionar outra unidade.</translation> + </message> +</context> <context> <name>WalletFrame</name> <message> @@ -2618,44 +2761,20 @@ Endereço: %4</translation> <translation>Aceitar conexões externas (padrão: 1 se opções -proxy ou -connect não estiverem presentes)</translation> </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>%s, você deve especificar uma senha rpcpassword no arquivo de configuração:⏎ -%s⏎ -É recomendado que você use a seguinte senha aleatória:⏎ -rpcuser=bitcoinrpc⏎ -rpcpassword=%s⏎ -(você não precisa lembrar esta senha)⏎ -O nome de usuário e a senha NÃO PODEM ser os mesmos.⏎ -Se o arquivo não existir, crie um com permissão de leitura apenas para o dono.⏎ -É recomendado também definir um alertnotify para que você seja notificado de problemas;⏎ -por exemplo: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo.com⏎ -</translation> - </message> - <message> <source>Bind to given address and always listen on it. Use [host]:port notation for IPv6</source> <translation>Vincular ao endereço fornecido e sempre escutar nele. Use a notação [host]:port para IPv6</translation> </message> <message> - <source>Enter regression test mode, which uses a special chain in which blocks can be solved instantly.</source> - <translation>Entra no modo de teste de regressão, que usa uma cadeia especial onde os blocos podem ser resolvidos instantaneamente.</translation> + <source>Delete all wallet transactions and only recover those parts of the blockchain through -rescan on startup</source> + <translation>Apaga todas as transações da carteira e somente recupera essas partes da blockchain usando o comando -rescan na inicialização</translation> </message> <message> - <source>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>Erro: A transação foi rejeitada. Isso pode acontecer se alguns dos bitcoins de sua carteira já haviam sido gastos, por exemplo se você usou uma cópia do arquivo wallet.dat e alguns bitcoins foram gastos na cópia mas não foram marcados como gastos aqui.</translation> + <source>Distributed under the MIT software license, see the accompanying file COPYING or <http://www.opensource.org/licenses/mit-license.php>.</source> + <translation>Distribuido sob a licença MIT software license. Veja os termos em <http://www.opensource.org/licenses/mit-license.php>.</translation> </message> <message> - <source>Error: This transaction requires a transaction fee of at least %s because of its amount, complexity, or use of recently received funds!</source> - <translation>Erro: Esta transação requer uma taxa de transação de pelo menos %s, por causa sua quantidade, complexidade ou uso de dinheiro recebido recentemente.</translation> + <source>Enter regression test mode, which uses a special chain in which blocks can be solved instantly.</source> + <translation>Entra no modo de teste de regressão, que usa uma cadeia especial onde os blocos podem ser resolvidos instantaneamente.</translation> </message> <message> <source>Execute command when a wallet transaction changes (%s in cmd is replaced by TxID)</source> @@ -2675,7 +2794,7 @@ por exemplo: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo.com⏎ </message> <message> <source>Unable to bind to %s on this computer. Bitcoin Core is probably already running.</source> - <translation>Impossível ouvir em %s neste computador. Bitcoin Core já está sendo executado provavelmente.</translation> + <translation>Impossível ouvir em %s neste computador. Provavelmente o Bitcoin já está sendo executado.</translation> </message> <message> <source>Warning: -paytxfee is set very high! This is the transaction fee you will pay if you send a transaction.</source> @@ -2730,10 +2849,6 @@ por exemplo: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo.com⏎ <translation>Opções de Debug/Teste:</translation> </message> <message> - <source>Discover own IP address (default: 1 when listening and no -externalip)</source> - <translation>Descobrir os próprios endereços IP (padrão: 1 quando no modo listening e opção -externalip não estiver presente)</translation> - </message> - <message> <source>Do not load the wallet and disable wallet RPC calls</source> <translation>Não carrega a carteira e desabilita as chamadas RPC para a carteira</translation> </message> @@ -2766,10 +2881,6 @@ por exemplo: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo.com⏎ <translation>Erro: Espaço em disco insuficiente!</translation> </message> <message> - <source>Error: Wallet locked, unable to create transaction!</source> - <translation>Erro: Carteira bloqueada, impossível criar transação!</translation> - </message> - <message> <source>Failed to listen on any port. Use -listen=0 if you want this.</source> <translation>Falha ao escutar em qualquer porta. Use -listen=0 se você quiser isso.</translation> </message> @@ -2794,8 +2905,8 @@ por exemplo: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo.com⏎ <translation>Decriptadores de arquivos disponíveis insuficientes.</translation> </message> <message> - <source>Rebuild block chain index from current blk000??.dat files</source> - <translation>Reconstruir índice de blockchain a partir dos arquivos atuais blk000??.dat</translation> + <source>Only connect to nodes in network <net> (ipv4, ipv6 or onion)</source> + <translation>Somente conectar a clientes na rede <net> (ipv4, ipv6 ou onion)</translation> </message> <message> <source>Set database cache size in megabytes (%d to %d, default: %d)</source> @@ -2814,6 +2925,10 @@ por exemplo: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo.com⏎ <translation>Isso é usado para testes de regressão e ferramentas de desenvolvimento.</translation> </message> <message> + <source>Use UPnP to map the listening port (default: %u)</source> + <translation>Use UPnP para mapear a porta de entrada (padrão: %u)</translation> + </message> + <message> <source>Verifying blocks...</source> <translation>Verificando blocos...</translation> </message> @@ -2827,27 +2942,31 @@ por exemplo: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo.com⏎ </message> <message> <source>Wallet options:</source> - <translation>Opções da Carteira:</translation> + <translation>Opções da carteira:</translation> </message> <message> <source>You need to rebuild the database using -reindex to change -txindex</source> - <translation>Você precisa reconstruir o banco de dados utilizando-reindexar a mudar-txindex</translation> + <translation>Você precisa reconstruir o banco de dados utilizando -reindex</translation> </message> <message> <source>Imports blocks from external blk000??.dat file</source> <translation>Importar blocos de um arquivo externo blk000??.dat</translation> </message> <message> + <source>Allow JSON-RPC connections from specified source. Valid for <ip> are a single IP (e.g. 1.2.3.4), a network/netmask (e.g. 1.2.3.4/255.255.255.0) or a network/CIDR (e.g. 1.2.3.4/24). This option can be specified multiple times</source> + <translation>Permitir conexões JSON-RPC de uma fonte específica. Válido para um único ip (ex. 1.2.3.4), até uma rede/máscara (ex. 1.2.3.4/255.255.255.0) ou uma rede/CIDR (ex. 1.2.3.4/24). Esta opção pode ser usada múltiplas vezes</translation> + </message> + <message> <source>An error occurred while setting up the RPC address %s port %u for listening: %s</source> <translation>Um erro ocorreu enquanto configurando o endereço RPC %s porta %u para escuta: %s</translation> </message> <message> <source>Cannot obtain a lock on data directory %s. Bitcoin Core is probably already running.</source> - <translation>Não foi possível obter proteção exclusiva ao diretório de dados %s. Bitcoin Core já está sendo executado provavelmente.</translation> + <translation>Não foi possível obter acesso exclusivo ao diretório de dados %s. Provavelmente Bitcoin já está sendo executado.</translation> </message> <message> <source>Error: Listening for incoming connections failed (listen returned error %s)</source> - <translation>Erro: Escutar por conexões de entrada falhou (escutar retornou erro %s)</translation> + <translation>Erro: Aceitar conexões de entrada falhou (retornou erro %s)</translation> </message> <message> <source>Execute command when a relevant alert is received or we see a really long fork (%s in cmd is replaced by message)</source> @@ -2866,10 +2985,42 @@ por exemplo: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo.com⏎ <translation>Define o tamanho máximo de alta-prioridade por taxa baixa nas transações em bytes (padrão: %d)</translation> </message> <message> + <source>To use bitcoind, or the -server option to bitcoin-qt, you must set an 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>Para usar o bitcoind, ou a opção -server do bitcoin-qt, você deve definir rpcpassword no arquivo de configuração: +%s +É recomendado que use a seguinte senha randômica: +rpcuser=bitcoinrpc +rpcpassword=%s +(você não precisa lembrar esta senha) +O usuário e senha NÃO DEVEM ser os mesmos. +Se o arquivo não existir, crie com permissão de proprietário criador somente. +É também recomendado definir a opção alertnotify se deseja ser notificado de problemas; +por exemplo: alertnotify=echo %%s | mail -s "Alerta do Bitcoin" admin@foo.com.br +</translation> + </message> + <message> + <source>(default: %u)</source> + <translation>(padrão: %u)</translation> + </message> + <message> <source>Cannot resolve -whitebind address: '%s'</source> <translation>Impossível resolver endereço -whitebind: '%s'</translation> </message> <message> + <source>Choose data directory on startup (default: 0)</source> + <translation>Escolha o diretório de dados na inicialização (padrão: 0)</translation> + </message> + <message> <source>Connect through SOCKS5 proxy</source> <translation>Connecte-se através de um proxy SOCKS5</translation> </message> @@ -2882,6 +3033,18 @@ por exemplo: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo.com⏎ <translation>Impossível interpretar o valor -rpcbind %s como um endereço da rede</translation> </message> <message> + <source>Error loading wallet.dat: Wallet requires newer version of Bitcoin Core</source> + <translation>Erro ao carregar wallet.dat: A carteira requer a nova versão do Bitcoin</translation> + </message> + <message> + <source>Error reading from database, shutting down.</source> + <translation>Erro ao ler o banco de dados. Finalizando.</translation> + </message> + <message> + <source>Error: Unsupported argument -tor found, use -onion.</source> + <translation>Erro: Argumento não suportado -tor, use -onion.</translation> + </message> + <message> <source>Fee (in BTC/kB) to add to transactions you send (default: %s)</source> <translation>Taxa (em BTC/kB) a adicionar nas transações que você envia (padrão: %s)</translation> </message> @@ -2890,6 +3053,10 @@ por exemplo: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo.com⏎ <translation>Informação</translation> </message> <message> + <source>Invalid amount for -maxtxfee=<amount>: '%s'</source> + <translation>Quantidade inválida para -maxtxfee=<quantidade>: '%s'</translation> + </message> + <message> <source>Invalid amount for -minrelaytxfee=<amount>: '%s'</source> <translation>Quantidade inválida para -minrelaytxfee=<amount>: '%s'</translation> </message> @@ -2906,18 +3073,10 @@ por exemplo: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo.com⏎ <translation>Máscara de rede especificada em -whitelist: '%s' é inválida</translation> </message> <message> - <source>Keep at most <n> unconnectable blocks in memory (default: %u)</source> - <translation>Manter no máximo <n> blocos pendentes em memória (padrão: %u)</translation> - </message> - <message> <source>Need to specify a port with -whitebind: '%s'</source> <translation>Necessário informar uma porta com -whitebind: '%s'</translation> </message> <message> - <source>Print block on startup, if found in block index</source> - <translation>Imprime bloco ao iniciar, se encontrado no índice de blocos</translation> - </message> - <message> <source>RPC SSL options: (see the Bitcoin Wiki for SSL setup instructions)</source> <translation>Opções RPC SSL: (veja o Bitcoin Wiki para instruções de configuração SSL)</translation> </message> @@ -2938,10 +3097,26 @@ por exemplo: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo.com⏎ <translation>Mandar informação de trace/debug para o console em vez de para o arquivo debug.log</translation> </message> <message> + <source>Send transactions as zero-fee transactions if possible (default: %u)</source> + <translation>Enviar transação sem taxa, se possível (padrão: %u)</translation> + </message> + <message> + <source>Set SSL root certificates for payment request (default: -system-)</source> + <translation>Define certificados SSL root para requisição de pagamento (padrão: -system-)</translation> + </message> + <message> + <source>Set language, for example "de_DE" (default: system locale)</source> + <translation>Escolher língua, por exemplo "de_DE" (padrão: localização do sistema)</translation> + </message> + <message> <source>Show all debugging options (usage: --help -help-debug)</source> <translation>Exibir todas opções de debug (uso: --help -help-debug)</translation> </message> <message> + <source>Show splash screen on startup (default: 1)</source> + <translation>Mostrar tela inicial ao ligar (padrão: 1)</translation> + </message> + <message> <source>Shrink debug.log file on client startup (default: 1 when no -debug)</source> <translation>Encolher arquivo debug.log ao iniciar o cliente (padrão 1 se opção -debug não estiver presente)</translation> </message> @@ -2950,6 +3125,10 @@ por exemplo: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo.com⏎ <translation>Assinatura de transação falhou</translation> </message> <message> + <source>Start minimized</source> + <translation>Inicializar minimizado</translation> + </message> + <message> <source>This is experimental software.</source> <translation>Este é um software experimental.</translation> </message> @@ -2962,10 +3141,18 @@ por exemplo: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo.com⏎ <translation>As quantidades das transações devem ser positivas.</translation> </message> <message> + <source>Transaction too large for fee policy</source> + <translation>Transação muito grande para enviar sem taxa</translation> + </message> + <message> <source>Transaction too large</source> <translation>Transação muito larga</translation> </message> <message> + <source>UI Options:</source> + <translation>Opções da interface:</translation> + </message> + <message> <source>Unable to bind to %s on this computer (bind returned error %s)</source> <translation>Impossível se ligar a %s neste computador (bind retornou erro %s)</translation> </message> @@ -2986,10 +3173,6 @@ por exemplo: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo.com⏎ <translation>Atenção</translation> </message> <message> - <source>Warning: This version is obsolete, upgrade required!</source> - <translation>Atenção: Esta versão está obsoleta, atualização exigida!</translation> - </message> - <message> <source>Zapping all transactions from wallet...</source> <translation>Aniquilando todas as transações da carteira...</translation> </message> @@ -3038,14 +3221,46 @@ por exemplo: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo.com⏎ <translation>Erro ao carregar wallet.dat: Carteira corrompida</translation> </message> <message> + <source>(default: %s)</source> + <translation>(padrão: %s)</translation> + </message> + <message> <source>Error loading wallet.dat</source> <translation>Erro ao carregar wallet.dat</translation> </message> <message> + <source>Force safe mode (default: %u)</source> + <translation>Forçar modo seguro (default: %u)</translation> + </message> + <message> + <source>Generate coins (default: %u)</source> + <translation>Gerar moedas (padrão: %u)</translation> + </message> + <message> + <source>Include IP addresses in debug output (default: %u)</source> + <translation>Incluir endereço IP na saída de debug (padrão: %u)</translation> + </message> + <message> <source>Invalid -proxy address: '%s'</source> <translation>Endereço -proxy inválido: '%s'</translation> </message> <message> + <source>Limit size of signature cache to <n> entries (default: %u)</source> + <translation>Tamanho limite do cache de assinaturas de <n> entradas (padrão: %u)</translation> + </message> + <message> + <source>Listen for connections on <port> (default: %u or testnet: %u)</source> + <translation>Aguardar por conexões na porta <port> (padrão: %u ou testnet: %u)</translation> + </message> + <message> + <source>Server certificate file (default: %s)</source> + <translation>Arquivo de certificado do servidor (padrão: %s)</translation> + </message> + <message> + <source>Server private key (default: %s)</source> + <translation>Chave privada do servidor (padrão: %s)</translation> + </message> + <message> <source>Specify pid file (default: %s)</source> <translation>Especificar aqrquivo pid (default: %s)</translation> </message> @@ -3066,10 +3281,6 @@ por exemplo: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo.com⏎ <translation>Quantidade inválida para -paytxfee=<quantidade>: '%s'</translation> </message> <message> - <source>Invalid amount</source> - <translation>Quantidade inválida</translation> - </message> - <message> <source>Insufficient funds</source> <translation>Saldo insuficiente</translation> </message> @@ -3102,10 +3313,6 @@ por exemplo: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo.com⏎ <translation>Carregamento terminado</translation> </message> <message> - <source>To use the %s option</source> - <translation>Para usar a opção %s</translation> - </message> - <message> <source>Error</source> <translation>Erro</translation> </message> diff --git a/src/qt/locale/bitcoin_pt_PT.ts b/src/qt/locale/bitcoin_pt_PT.ts index dc016623e4..30ac9fdf31 100644 --- a/src/qt/locale/bitcoin_pt_PT.ts +++ b/src/qt/locale/bitcoin_pt_PT.ts @@ -1,9 +1,9 @@ -<TS language="pt_PT" version="2.0"> +<TS language="pt_PT" version="2.1"> <context> <name>AddressBookPage</name> <message> - <source>Double-click to edit address or label</source> - <translation>Clique duas vezes para editar o endereço ou o rótulo</translation> + <source>Right-click to edit address or label</source> + <translation>Clique á direita para editar endereço ou rótulo</translation> </message> <message> <source>Create a new address</source> @@ -43,7 +43,7 @@ </message> <message> <source>&Delete</source> - <translation>E&liminar\</translation> + <translation>&Eliminar\</translation> </message> <message> <source>Choose the address to send coins to</source> @@ -93,7 +93,11 @@ <source>Exporting Failed</source> <translation>A Exportação Falhou</translation> </message> - </context> + <message> + <source>There was an error trying to save the address list to %1. Please try again.</source> + <translation>Houve um erro ao tentar a guardar a lista de endereços em %1. Por favor tente novamente.</translation> + </message> +</context> <context> <name>AddressTableModel</name> <message> @@ -152,10 +156,6 @@ <translation>Alterar frase de segurança</translation> </message> <message> - <source>Enter the old and new passphrase to the wallet.</source> - <translation>Escreva a antiga frase de segurança da carteira, seguida da nova.</translation> - </message> - <message> <source>Confirm wallet encryption</source> <translation>Confirmar encriptação da carteira</translation> </message> @@ -184,10 +184,6 @@ <translation>Escreva a nova frase de seguraça da sua carteira. <br/> Por favor, use uma frase de <b>10 ou mais caracteres aleatórios,</b> ou <b>oito ou mais palavras</b>.</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>O cliente Bitcoin irá agora ser fechado para terminar o processo de encriptação. Recorde que a encriptação da sua carteira não protegerá totalmente os seus bitcoins de serem roubados por programas maliciosos que infectem o seu computador.</translation> - </message> - <message> <source>Wallet encryption failed</source> <translation>A encriptação da carteira falhou</translation> </message> @@ -291,6 +287,10 @@ <translation>Abrir &URI...</translation> </message> <message> + <source>Bitcoin Core client</source> + <translation>Cliente Bitcoin Core</translation> + </message> + <message> <source>Importing blocks from disk...</source> <translation>A importar blocos do disco...</translation> </message> @@ -303,10 +303,6 @@ <translation>Enviar moedas para um endereço bitcoin</translation> </message> <message> - <source>Modify configuration options for Bitcoin</source> - <translation>Modificar opções de configuração para bitcoin</translation> - </message> - <message> <source>Backup wallet to another location</source> <translation>Faça uma cópia de segurança da carteira para outra localização</translation> </message> @@ -343,6 +339,10 @@ <translation>&Receber</translation> </message> <message> + <source>Show information about Bitcoin Core</source> + <translation>Mostrar informação sobre Bitcoin Core</translation> + </message> + <message> <source>&Show / Hide</source> <translation>Mo&strar / Ocultar</translation> </message> @@ -368,11 +368,11 @@ </message> <message> <source>&Settings</source> - <translation>Con&figurações</translation> + <translation>&Configurações</translation> </message> <message> <source>&Help</source> - <translation>A&juda</translation> + <translation>&Ajuda</translation> </message> <message> <source>Tabs toolbar</source> @@ -404,7 +404,7 @@ </message> <message> <source>&Command-line options</source> - <translation>Opções da linha de &comandos</translation> + <translation>&Opções da linha de &comandos</translation> </message> <message> <source>Show the Bitcoin Core help message to get a list with possible Bitcoin command-line options</source> @@ -479,17 +479,6 @@ <translation>Transação recebida</translation> </message> <message> - <source>Date: %1 -Amount: %2 -Type: %3 -Address: %4 -</source> - <translation>Data: %1 -Quantia: %2 -Tipo: %3 -Endereço: %4</translation> - </message> - <message> <source>Wallet is <b>encrypted</b> and currently <b>unlocked</b></source> <translation>A carteira está <b>encriptada</b> e atualmente <b>desbloqueada</b></translation> </message> @@ -508,6 +497,10 @@ Endereço: %4</translation> <context> <name>CoinControlDialog</name> <message> + <source>Coin Selection</source> + <translation>Seleção de moeda</translation> + </message> + <message> <source>Quantity:</source> <translation>Quantidade:</translation> </message> @@ -528,6 +521,10 @@ Endereço: %4</translation> <translation>Taxa:</translation> </message> <message> + <source>Dust:</source> + <translation>Lixo:</translation> + </message> + <message> <source>After Fee:</source> <translation>Depois da Taxa:</translation> </message> @@ -552,6 +549,14 @@ Endereço: %4</translation> <translation>Quantia</translation> </message> <message> + <source>Received with label</source> + <translation>Recebido com rótulo</translation> + </message> + <message> + <source>Received with address</source> + <translation>Recebido com endereço</translation> + </message> + <message> <source>Date</source> <translation>Data</translation> </message> @@ -612,6 +617,10 @@ Endereço: %4</translation> <translation>Copiar prioridade</translation> </message> <message> + <source>Copy dust</source> + <translation>Copiar lixo</translation> + </message> + <message> <source>Copy change</source> <translation>Copiar alteração</translation> </message> @@ -660,6 +669,10 @@ Endereço: %4</translation> <translation>nenhum</translation> </message> <message> + <source>Can vary +/- %1 satoshi(s) per input.</source> + <translation>Pode variar +/- %1 satoshi(s) por entrada</translation> + </message> + <message> <source>yes</source> <translation>sim</translation> </message> @@ -668,10 +681,6 @@ Endereço: %4</translation> <translation>não</translation> </message> <message> - <source>This label turns red, if the transaction size is greater than 1000 bytes.</source> - <translation>Este rótulo fica vermelha se o tamanho da transacção exceder os 1000 bytes.</translation> - </message> - <message> <source>This means a fee of at least %1 per kB is required.</source> <translation>Isto significa que uma taxa de pelo menos %1 por kB é necessária.</translation> </message> @@ -684,14 +693,6 @@ Endereço: %4</translation> <translation>Transacções com uma prioridade mais alta têm uma maior probabilidade de serem incluídas num bloco.</translation> </message> <message> - <source>This label turns red, if the priority is smaller than "medium".</source> - <translation>Esta legenda fica vermelha, se a prioridade for menor que "média".</translation> - </message> - <message> - <source>This label turns red, if any recipient receives an amount smaller than %1.</source> - <translation>Este rótulo fica vermelho se algum recipiente receber uma quantia menor que %1.</translation> - </message> - <message> <source>(no label)</source> <translation>(sem rótulo)</translation> </message> @@ -793,6 +794,10 @@ Endereço: %4</translation> <translation>versão</translation> </message> <message> + <source>(%1-bit)</source> + <translation>(%1-bit)</translation> + </message> + <message> <source>About Bitcoin Core</source> <translation>Sobre o Bitcoin Core</translation> </message> @@ -808,26 +813,6 @@ Endereço: %4</translation> <source>command-line options</source> <translation>opções da linha de comandos</translation> </message> - <message> - <source>UI options</source> - <translation>Opções de Interface</translation> - </message> - <message> - <source>Set language, for example "de_DE" (default: system locale)</source> - <translation>Definir linguagem, por exemplo "pt_PT" (por defeito: linguagem do sistema)</translation> - </message> - <message> - <source>Start minimized</source> - <translation>Iniciar minimizado</translation> - </message> - <message> - <source>Show splash screen on startup (default: 1)</source> - <translation>Mostrar imagem ao iniciar (por defeito: 1)</translation> - </message> - <message> - <source>Choose data directory on startup (default: 0)</source> - <translation>Escolha a pasta de dados ao iniciar (por defeito: 0)</translation> - </message> </context> <context> <name>Intro</name> @@ -860,10 +845,22 @@ Endereço: %4</translation> <translation>Bitcoin Core</translation> </message> <message> + <source>Error: Specified data directory "%1" cannot be created.</source> + <translation>Erro: Pasta de dados especificada como "%1, não pode ser criada.</translation> + </message> + <message> <source>Error</source> <translation>Erro</translation> </message> - </context> + <message numerus="yes"> + <source>%n GB of free space available</source> + <translation><numerusform>%n GB de espaço livre disponível </numerusform><numerusform>%n GB de espaço livre disponível </numerusform></translation> + </message> + <message numerus="yes"> + <source>(of %n GB needed)</source> + <translation><numerusform>(de %n GB necessários)</numerusform><numerusform>(de %n GB necessário)</numerusform></translation> + </message> +</context> <context> <name>OpenURIDialog</name> <message> @@ -898,14 +895,6 @@ Endereço: %4</translation> <translation>&Principal</translation> </message> <message> - <source>Automatically start Bitcoin after logging in to the system.</source> - <translation>Começar o Bitcoin automaticamente ao iniciar sessão no sistema.</translation> - </message> - <message> - <source>&Start Bitcoin on system login</source> - <translation>&Começar o Bitcoin ao iniciar o sistema</translation> - </message> - <message> <source>Size of &database cache</source> <translation>Tamanho da cache da base de &dados</translation> </message> @@ -918,10 +907,27 @@ Endereço: %4</translation> <translation>Número de processos de &verificação de scripts</translation> </message> <message> + <source>Accept connections from outside</source> + <translation>Aceitar conceções externas</translation> + </message> + <message> + <source>Allow incoming connections</source> + <translation>Permitir conexão</translation> + </message> + <message> <source>IP address of the proxy (e.g. IPv4: 127.0.0.1 / IPv6: ::1)</source> <translation>Endereço IP do proxy (p.ex. IPv4: 127.0.0.1 / IPv6: ::1)</translation> </message> <message> + <source>Third party URLs (e.g. a block explorer) that appear in the transactions tab as context menu items. %s in the URL is replaced by transaction hash. Multiple URLs are separated by vertical bar |.</source> + <translation>URLs de outrem (ex. um explorador de blocos) que aparece no separador de transações como itens do menu de contexto. +%s do URL é substituído por hash de transação. Vários URLs são separados por barra vertical |.</translation> + </message> + <message> + <source>Third party transaction URLs</source> + <translation>URLs de transação de outrem</translation> + </message> + <message> <source>Active command-line options that override above options:</source> <translation>Opções de linha de comandos ativas que se sobrepõem ás opções anteriores:</translation> </message> @@ -938,6 +944,10 @@ Endereço: %4</translation> <translation>&Rede</translation> </message> <message> + <source>(0 = auto, <0 = leave that many cores free)</source> + <translation>(0 = auto, <0 = Deixar essa quantidade de núcleos livre)</translation> + </message> + <message> <source>W&allet</source> <translation>C&arteira</translation> </message> @@ -966,16 +976,24 @@ Endereço: %4</translation> <translation>Mapear porta usando &UPnP</translation> </message> <message> + <source>Connect to the Bitcoin network through a SOCKS5 proxy.</source> + <translation>Conectar à rede da Bitcoin através dum proxy SOCLS5.</translation> + </message> + <message> + <source>&Connect through SOCKS5 proxy (default proxy):</source> + <translation>&Ligar através dum proxy SOCKS5 (proxy por defeito):</translation> + </message> + <message> <source>Proxy &IP:</source> <translation>&IP do proxy:</translation> </message> <message> <source>&Port:</source> - <translation>&Porta:</translation> + <translation>&Porto:</translation> </message> <message> <source>Port of the proxy (e.g. 9050)</source> - <translation>Porta do proxy (p.ex. 9050)</translation> + <translation>Porto do proxy (p.ex. 9050)</translation> </message> <message> <source>&Window</source> @@ -990,26 +1008,18 @@ Endereço: %4</translation> <translation>&Minimizar para a bandeja de sistema e não para a barra de ferramentas</translation> </message> <message> - <source>Minimize instead of exit the application when the window is closed. When this option is enabled, the application will be closed only after selecting Quit in the menu.</source> - <translation>Minimize ao invés de sair da aplicação quando a janela é fechada. Com esta opção selecionada, a aplicação apenas será encerrada só quando escolher Sair da aplicação no menu.</translation> - </message> - <message> <source>M&inimize on close</source> <translation>M&inimizar ao fechar</translation> </message> <message> <source>&Display</source> - <translation>Vis&ualização</translation> + <translation>&Visualização</translation> </message> <message> <source>User Interface &language:</source> <translation>&Linguagem da interface de utilizador:</translation> </message> <message> - <source>The user interface language can be set here. This setting will take effect after restarting Bitcoin.</source> - <translation>A linguagem da interface do utilizador pode ser definida aqui. Esta definição entrará em efeito após reiniciar o Bitcoin.</translation> - </message> - <message> <source>&Unit to show amounts in:</source> <translation>&Unidade para mostrar quantias:</translation> </message> @@ -1046,10 +1056,6 @@ Endereço: %4</translation> <translation>É necessário reiniciar o cliente para ativar as alterações.</translation> </message> <message> - <source>Client will be shutdown, do you want to proceed?</source> - <translation>O cliente será desligado, deseja continuar?</translation> - </message> - <message> <source>This change would require a client restart.</source> <translation>Esta alteração requer um reinício do cliente.</translation> </message> @@ -1069,6 +1075,10 @@ Endereço: %4</translation> <translation>A informação mostrada poderá estar desatualizada. A sua carteira sincroniza automaticamente com a rede Bitcoin depois de estabelecer ligação, mas este processo ainda não está completo.</translation> </message> <message> + <source>Watch-only:</source> + <translation>Modo-verificação:</translation> + </message> + <message> <source>Available:</source> <translation>Disponível:</translation> </message> @@ -1093,6 +1103,10 @@ Endereço: %4</translation> <translation>O saldo minado ainda não amadureceu</translation> </message> <message> + <source>Balances</source> + <translation>Balanços</translation> + </message> + <message> <source>Total:</source> <translation>Total:</translation> </message> @@ -1101,6 +1115,30 @@ Endereço: %4</translation> <translation>O seu saldo total actual</translation> </message> <message> + <source>Your current balance in watch-only addresses</source> + <translation>O seu balanço atual em endereços de apenas observação</translation> + </message> + <message> + <source>Spendable:</source> + <translation>Dispensável:</translation> + </message> + <message> + <source>Recent transactions</source> + <translation>transações recentes</translation> + </message> + <message> + <source>Unconfirmed transactions to watch-only addresses</source> + <translation>Transações não confirmadas para endereços modo-verificação</translation> + </message> + <message> + <source>Mined balance in watch-only addresses that has not yet matured</source> + <translation>Saldo minado ainda não disponivél de endereços modo-verificação</translation> + </message> + <message> + <source>Current total balance in watch-only addresses</source> + <translation>Saldo disponivél em enderços modo-verificação</translation> + </message> + <message> <source>out of sync</source> <translation>fora de sincronia</translation> </message> @@ -1120,6 +1158,14 @@ Endereço: %4</translation> <translation>Pedido de pagamento rejeitado</translation> </message> <message> + <source>Payment request network doesn't match client network.</source> + <translation>Rede de requisição de pagamento não corresponde com a rede do cliente.</translation> + </message> + <message> + <source>Payment request is not initialized.</source> + <translation>Requisição de pagamento não iniciou.</translation> + </message> + <message> <source>Requested payment amount of %1 is too small (considered dust).</source> <translation>Quantia solicitada para pagamento de %1 é muito pequena (considerada "pó").</translation> </message> @@ -1136,10 +1182,18 @@ Endereço: %4</translation> <translation>O URL de pedido de pagamento é inválido: %1</translation> </message> <message> + <source>URI cannot be parsed! This can be caused by an invalid Bitcoin address or malformed URI parameters.</source> + <translation>URI não foi lido correctamente! Isto pode ser causado por um endereço Bitcoin inválido ou por parâmetros URI malformados.</translation> + </message> + <message> <source>Payment request file handling</source> <translation>Controlo de pedidos de pagamento.</translation> </message> <message> + <source>Payment request file cannot be read! This can be caused by an invalid payment request file.</source> + <translation>O ficheiro de pedido de pagamento não pôde ser lido! Isto pode ter sido causado por um ficheiro de pedido de pagamento inválido.</translation> + </message> + <message> <source>Unverified payment requests to custom payment scripts are unsupported.</source> <translation>Pedidos de pagamento não-verificados para scripts de pagamento personalizados não são suportados.</translation> </message> @@ -1148,10 +1202,22 @@ Endereço: %4</translation> <translation>Reembolsar de %1</translation> </message> <message> + <source>Payment request %1 is too large (%2 bytes, allowed %3 bytes).</source> + <translation>Pedido de pagamento %1 excede o tamanho (%2 bytes, permitido %3 bytes).</translation> + </message> + <message> + <source>Payment request DoS protection</source> + <translation>Pedido de pagamento proteção DdS</translation> + </message> + <message> <source>Error communicating with %1: %2</source> <translation>Erro ao comunicar com %1: %2</translation> </message> <message> + <source>Payment request cannot be parsed!</source> + <translation>O pedido de pagamento não pode ser lido ou processado!</translation> + </message> + <message> <source>Bad response from server %1</source> <translation>Má resposta do servidor %1</translation> </message> @@ -1166,7 +1232,15 @@ Endereço: %4</translation> </context> <context> <name>PeerTableModel</name> - </context> + <message> + <source>User Agent</source> + <translation>Agente Usuário</translation> + </message> + <message> + <source>Ping Time</source> + <translation>Tempo de Latência</translation> + </message> +</context> <context> <name>QObject</name> <message> @@ -1174,6 +1248,14 @@ Endereço: %4</translation> <translation>Quantia</translation> </message> <message> + <source>Enter a Bitcoin address (e.g. %1)</source> + <translation>Entre um endereço Bitcoin (ex. %1)</translation> + </message> + <message> + <source>%1 d</source> + <translation>%1 d</translation> + </message> + <message> <source>%1 h</source> <translation>%1 h</translation> </message> @@ -1182,10 +1264,22 @@ Endereço: %4</translation> <translation>%1 m</translation> </message> <message> + <source>%1 s</source> + <translation>%1 s</translation> + </message> + <message> + <source>None</source> + <translation>Nenhum</translation> + </message> + <message> <source>N/A</source> <translation>N/D</translation> </message> - </context> + <message> + <source>%1 ms</source> + <translation>%1 ms</translation> + </message> +</context> <context> <name>QRImageWidget</name> <message> @@ -1236,6 +1330,10 @@ Endereço: %4</translation> <translation>Usando versão OpenSSL</translation> </message> <message> + <source>Using BerkeleyDB version</source> + <translation>Versão BerkeleyDB em uso</translation> + </message> + <message> <source>Startup time</source> <translation>Hora de inicialização</translation> </message> @@ -1260,6 +1358,74 @@ Endereço: %4</translation> <translation>Número actual de blocos</translation> </message> <message> + <source>Received</source> + <translation>Recebido</translation> + </message> + <message> + <source>Sent</source> + <translation>Enviado</translation> + </message> + <message> + <source>&Peers</source> + <translation>&Conexção</translation> + </message> + <message> + <source>Select a peer to view detailed information.</source> + <translation>Selecione uma conexação para ver informação em detalhe.</translation> + </message> + <message> + <source>Direction</source> + <translation>Direcção</translation> + </message> + <message> + <source>Version</source> + <translation>Versão</translation> + </message> + <message> + <source>User Agent</source> + <translation>Agente Usuário</translation> + </message> + <message> + <source>Services</source> + <translation>Serviços</translation> + </message> + <message> + <source>Starting Height</source> + <translation>Iniciando Altura</translation> + </message> + <message> + <source>Sync Height</source> + <translation>Sincronização da Altura</translation> + </message> + <message> + <source>Ban Score</source> + <translation>Resultado da Suspensão</translation> + </message> + <message> + <source>Connection Time</source> + <translation>Tempo de Conexção</translation> + </message> + <message> + <source>Last Send</source> + <translation>Ultimo Envio</translation> + </message> + <message> + <source>Last Receive</source> + <translation>Ultimo Recebimento</translation> + </message> + <message> + <source>Bytes Sent</source> + <translation>Bytes Enviados</translation> + </message> + <message> + <source>Bytes Received</source> + <translation>Bytes Recebidos</translation> + </message> + <message> + <source>Ping Time</source> + <translation>Tempo de Latência</translation> + </message> + <message> <source>Last block time</source> <translation>Data do último bloco</translation> </message> @@ -1300,18 +1466,10 @@ Endereço: %4</translation> <translation>Ficheiro de registo de depuração</translation> </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>Abrir o ficheiro de registo de depuração da pasta de dados actual. Isto pode demorar alguns segundos para ficheiros de registo maiores.</translation> - </message> - <message> <source>Clear console</source> <translation>Limpar consola</translation> </message> <message> - <source>Welcome to the Bitcoin RPC console.</source> - <translation>Bem-vindo à consola RPC Bitcoin.</translation> - </message> - <message> <source>Use up and down arrows to navigate history, and <b>Ctrl-L</b> to clear screen.</source> <translation>Use as setas para cima e para baixo para navegar no histórico e <b>Ctrl-L</b> para limpar o ecrã.</translation> </message> @@ -1335,7 +1493,31 @@ Endereço: %4</translation> <source>%1 GB</source> <translation>%1 GB</translation> </message> - </context> + <message> + <source>via %1</source> + <translation>via %1</translation> + </message> + <message> + <source>never</source> + <translation>nunca</translation> + </message> + <message> + <source>Inbound</source> + <translation>Entrada</translation> + </message> + <message> + <source>Outbound</source> + <translation>Saída</translation> + </message> + <message> + <source>Unknown</source> + <translation>Desconhecido</translation> + </message> + <message> + <source>Fetching...</source> + <translation>Em busca...</translation> + </message> +</context> <context> <name>ReceiveCoinsDialog</name> <message> @@ -1344,7 +1526,7 @@ Endereço: %4</translation> </message> <message> <source>&Label:</source> - <translation>Rótu&lo:</translation> + <translation>&Rótulo:</translation> </message> <message> <source>&Message:</source> @@ -1564,6 +1746,70 @@ Endereço: %4</translation> <translation>Endereço de troco personalizado</translation> </message> <message> + <source>Transaction Fee:</source> + <translation>Custo da Transação:</translation> + </message> + <message> + <source>Choose...</source> + <translation>Escolha...</translation> + </message> + <message> + <source>collapse fee-settings</source> + <translation>fechar definições-de custos</translation> + </message> + <message> + <source>per kilobyte</source> + <translation>por kilobyte</translation> + </message> + <message> + <source>If the custom fee is set to 1000 satoshis and the transaction is only 250 bytes, then "per kilobyte" only pays 250 satoshis in fee, while "total at least" pays 1000 satoshis. For transactions bigger than a kilobyte both pay by kilobyte.</source> + <translation>Se a taxa fixa for 1000 satoshis e a transação for somente 250 bytes, pagará somente 250 satoshis "por kilobyte" em custos se trasacionar "pelo menos" 1000 satoshis. Transações superiores a um kilobyte são cobradas por kilobyte.</translation> + </message> + <message> + <source>total at least</source> + <translation>total minimo</translation> + </message> + <message> + <source>Paying only the minimum fee is just fine as long as there is less transaction volume than space in the blocks. But be aware that this can end up in a never confirming transaction once there is more demand for bitcoin transactions than the network can process.</source> + <translation>Pode pagar somente a taxa minima desde que haja um volume de transações inferior ao espaço nos blocos. No entanto tenha em atenção que esta opção poderá acabar em uma transação nunca confirmada assim que os pedidos de transações excedam a capacidade de processamento da rede.</translation> + </message> + <message> + <source>(read the tooltip)</source> + <translation>(leia a dica)</translation> + </message> + <message> + <source>Recommended:</source> + <translation>Recomendado:</translation> + </message> + <message> + <source>Custom:</source> + <translation>Uso:</translation> + </message> + <message> + <source>(Smart fee not initialized yet. This usually takes a few blocks...)</source> + <translation>(Taxa inteligente ainda não foi acionada. Normalmente demora alguns blocos...)</translation> + </message> + <message> + <source>Confirmation time:</source> + <translation>Tempo de confirmação:</translation> + </message> + <message> + <source>normal</source> + <translation>normal</translation> + </message> + <message> + <source>fast</source> + <translation>rapido</translation> + </message> + <message> + <source>Send as zero-fee transaction if possible</source> + <translation>Enviar como uma transação a custo zero se possivél</translation> + </message> + <message> + <source>(confirmation may take longer)</source> + <translation>(confirmação poderá demorar mais)</translation> + </message> + <message> <source>Send to multiple recipients at once</source> <translation>Enviar para múltiplos destinatários de uma vez</translation> </message> @@ -1576,8 +1822,12 @@ Endereço: %4</translation> <translation>Limpar todos os campos do formulário.</translation> </message> <message> + <source>Dust:</source> + <translation>Lixo:</translation> + </message> + <message> <source>Clear &All</source> - <translation>&Limpar Tudo</translation> + <translation>Limpar &Tudo</translation> </message> <message> <source>Balance:</source> @@ -1589,7 +1839,7 @@ Endereço: %4</translation> </message> <message> <source>S&end</source> - <translation>&Enviar</translation> + <translation>E&nviar</translation> </message> <message> <source>Confirm send coins</source> @@ -1636,10 +1886,6 @@ Endereço: %4</translation> <translation>ou</translation> </message> <message> - <source>The recipient address is not valid, please recheck.</source> - <translation>O endereço de destino não é válido, por favor verifique.</translation> - </message> - <message> <source>The amount to pay must be larger than 0.</source> <translation>A quantia a pagar deverá ser maior que 0.</translation> </message> @@ -1652,10 +1898,6 @@ Endereço: %4</translation> <translation>O total excede o seu saldo quando a taxa de transação de %1 for incluída.</translation> </message> <message> - <source>Duplicate address found, can only send to each address once per send operation.</source> - <translation>Endereço duplicado encontrado, apenas poderá enviar uma vez para cada endereço por cada operação de envio.</translation> - </message> - <message> <source>Transaction creation failed!</source> <translation>Erro: A criação da transação falhou! </translation> </message> @@ -1664,6 +1906,10 @@ Endereço: %4</translation> <translation>A transação foi rejeitada! Isto poderá acontecer se algumas das moedas na sua carteira já tiverem sido gastas, se por exemplo tiver usado uma cópia do ficheiro wallet.dat e as moedas tiverem sido gastas na cópia mas não tiverem sido marcadas como gastas aqui.</translation> </message> <message> + <source>Pay only the minimum fee of %1</source> + <translation>Pagar somente a taxa minima de %1</translation> + </message> + <message> <source>Warning: Invalid Bitcoin address</source> <translation>Aviso: Endereço Bitcoin inválido</translation> </message> @@ -1676,6 +1922,10 @@ Endereço: %4</translation> <translation>Aviso: Endereço de troco desconhecido</translation> </message> <message> + <source>Copy dust</source> + <translation>Copiar lixo</translation> + </message> + <message> <source>Are you sure you want to send?</source> <translation>Tem a certeza que deseja enviar?</translation> </message> @@ -1711,6 +1961,10 @@ Endereço: %4</translation> <translation>Este é um pagamento normal.</translation> </message> <message> + <source>The Bitcoin address to send the payment to</source> + <translation>O endereço Bitcoin para enviar o pagamento</translation> + </message> + <message> <source>Alt+A</source> <translation>Alt+A</translation> </message> @@ -1731,10 +1985,6 @@ Endereço: %4</translation> <translation>Mensagem:</translation> </message> <message> - <source>This is a verified payment request.</source> - <translation>Este é um pedido de pagamento verificado.</translation> - </message> - <message> <source>Enter a label for this address to add it to the list of used addresses</source> <translation>Introduza um rótulo para este endereço para o adicionar à sua lista de endereços usados</translation> </message> @@ -1743,12 +1993,8 @@ Endereço: %4</translation> <translation>Uma mensagem que estava anexada ao URI bitcoin: que será armazenada com a transação para sua referência. Nota: Esta mensagem não será enviada através da rede Bitcoin.</translation> </message> <message> - <source>This is an unverified payment request.</source> - <translation>Este é um pedido de pagamento não-verificado.</translation> - </message> - <message> <source>Pay To:</source> - <translation>Pagar A:</translation> + <translation>Pagar a:</translation> </message> <message> <source>Memo:</source> @@ -1774,11 +2020,11 @@ Endereço: %4</translation> </message> <message> <source>&Sign Message</source> - <translation>A&ssinar Mensagem</translation> + <translation>&Assinar Mensagem</translation> </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>Pode assinar mensagens com os seus endereços para provar que são seus. Tenha atenção ao assinar mensagens ambíguas, pois ataques de phishing podem tentar enganá-lo de modo a assinar a sua identidade para os atacantes. Apenas assine declarações detalhadas com as quais concorde.</translation> + <source>The Bitcoin address to sign the message with</source> + <translation>O endereço Bitcoin para designar a mensagem</translation> </message> <message> <source>Choose previously used address</source> @@ -1829,8 +2075,8 @@ Endereço: %4</translation> <translation>&Verificar Mensagem</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>Introduza o endereço de assinatura, mensagem (assegure-se que copia quebras de linha, espaços, tabulações, etc. exactamente) e assinatura abaixo para verificar a mensagem. Tenha atenção para não ler mais na assinatura do que o que estiver na mensagem assinada, para evitar ser enganado por um atacante que se encontre entre si e quem assinou a mensagem.</translation> + <source>The Bitcoin address the message was signed with</source> + <translation>O endereço Bitcoin com que a mensagem foi designada</translation> </message> <message> <source>Verify the message to ensure it was signed with the specified Bitcoin address</source> @@ -1974,6 +2220,10 @@ Endereço: %4</translation> <translation>endereço próprio</translation> </message> <message> + <source>watch-only</source> + <translation>modo-verificação</translation> + </message> + <message> <source>label</source> <translation>rótulo</translation> </message> @@ -1994,6 +2244,14 @@ Endereço: %4</translation> <translation>Débito</translation> </message> <message> + <source>Total debit</source> + <translation>Total a debitar</translation> + </message> + <message> + <source>Total credit</source> + <translation>Total a creditar</translation> + </message> + <message> <source>Transaction fee</source> <translation>Taxa de transação</translation> </message> @@ -2080,10 +2338,6 @@ Endereço: %4</translation> <translation>Tipo</translation> </message> <message> - <source>Address</source> - <translation>Endereço</translation> - </message> - <message> <source>Immature (%1 confirmations, will be available after %2)</source> <translation>Imaturo (%1 confirmações, estará disponível após %2)</translation> </message> @@ -2112,6 +2366,10 @@ Endereço: %4</translation> <translation>Offline</translation> </message> <message> + <source>Label</source> + <translation>Rótulo</translation> + </message> + <message> <source>Unconfirmed</source> <translation>Não confirmado:</translation> </message> @@ -2144,6 +2402,10 @@ Endereço: %4</translation> <translation>Minadas</translation> </message> <message> + <source>watch-only</source> + <translation>modo-verificação</translation> + </message> + <message> <source>(n/a)</source> <translation>(n/d)</translation> </message> @@ -2160,8 +2422,8 @@ Endereço: %4</translation> <translation>Tipo de transação.</translation> </message> <message> - <source>Destination address of transaction.</source> - <translation>Endereço de destino da transação.</translation> + <source>Whether or not a watch-only address is involved in this transaction.</source> + <translation>Desde que um endereço de modo-verificação faça parte ou não desta transação</translation> </message> <message> <source>Amount removed from or added to balance.</source> @@ -2255,6 +2517,10 @@ Endereço: %4</translation> <translation>Exportar Histórico de Transacções</translation> </message> <message> + <source>Watch-only</source> + <translation>Modo-verificação</translation> + </message> + <message> <source>Exporting Failed</source> <translation>A Exportação Falhou</translation> </message> @@ -2309,7 +2575,11 @@ Endereço: %4</translation> </context> <context> <name>UnitDisplayStatusBarControl</name> - </context> + <message> + <source>Unit to show amounts in. Click to select another unit.</source> + <translation>Unidade de valores recebidos. Clique para selecionar outra unidade.</translation> + </message> +</context> <context> <name>WalletFrame</name> <message> @@ -2394,49 +2664,34 @@ Endereço: %4</translation> <translation>Aceitar ligações externas (padrão: 1 sem -proxy ou -connect)</translation> </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>%s, deverá definir uma rpcpassword no ficheiro de configuração: -%s -É recomendado que use a seguinte palavra-passe aleatória: -rpcuser=bitcoinrpc -rpcpassword=%s -(não é necessário lembrar esta palavra-passe) -O nome de utilizador e palavra-passe NÃO PODEM ser iguais. -Se o ficheiro não existir, crie-o com permissões de leitura apenas para o dono. -Também é recomendado definir um alertnotify para que seja alertado sobre problemas; -por exemplo: alertnotify=echo %%s | mail -s "Alerta Bitcoin" admin@foo.com</translation> - </message> - <message> <source>Bind to given address and always listen on it. Use [host]:port notation for IPv6</source> <translation>Associar a endereço específico e escutar sempre nele. Use a notação [anfitrião]:porta para IPv6</translation> </message> <message> - <source>Enter regression test mode, which uses a special chain in which blocks can be solved instantly.</source> - <translation>Entre no modo de teste de regressão, que usa uma cadeia especial cujos blocos podem ser resolvidos instantaneamente.</translation> + <source>Delete all wallet transactions and only recover those parts of the blockchain through -rescan on startup</source> + <translation>Apague todas as transações da carteira e somente restore aquelas que façam parte do blockchain através de re-scan ao reiniciar o programa</translation> </message> <message> - <source>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>Erro: A transação foi rejeitada! Isso poderá acontecer se algumas das moedas na sua carteira já tiverem sido gastas, se por exemplo tiver usado uma cópia do ficheiro wallet.dat e as moedas tiverem sido gastas na cópia mas não tiverem sido marcadas como gastas aqui.</translation> + <source>Distributed under the MIT software license, see the accompanying file COPYING or <http://www.opensource.org/licenses/mit-license.php>.</source> + <translation>Distribuido através da licença de software MIT, verifique o ficheiro anexado COPYING ou <http://www.opensource.org/licenses/mit-license.php>.</translation> </message> <message> - <source>Error: This transaction requires a transaction fee of at least %s because of its amount, complexity, or use of recently received funds!</source> - <translation>Erro: Esta transação requer uma taxa de transação mínima de %s devido á sua quantia, complexidade, ou uso de fundos recebidos recentemente!</translation> + <source>Enter regression test mode, which uses a special chain in which blocks can be solved instantly.</source> + <translation>Entre no modo de teste de regressão, que usa uma cadeia especial cujos blocos podem ser resolvidos instantaneamente.</translation> </message> <message> <source>Execute command when a wallet transaction changes (%s in cmd is replaced by TxID)</source> <translation>Executar comando quando uma das transações na carteira mudar (no comando, %s é substituído pelo ID da Transação)</translation> </message> <message> + <source>In this mode -genproclimit controls how many blocks are generated immediately.</source> + <translation>O modo -genproclimit controla quantos blocos são generados imediatamente.</translation> + </message> + <message> + <source>Set the number of script verification threads (%u to %d, 0 = auto, <0 = leave that many cores free, default: %d)</source> + <translation>Defina o número de processos de verificação (%u até %d, 0 = automático, <0 = ldisponibiliza esse número de núcleos livres, por defeito: %d)</translation> + </message> + <message> <source>This is a pre-release test build - use at your own risk - do not use for mining or merchant applications</source> <translation>Esta é uma versão de testes pré-lançamento - use à sua responsabilidade - não usar para minar ou aplicações comerciais</translation> </message> @@ -2465,6 +2720,14 @@ por exemplo: alertnotify=echo %%s | mail -s "Alerta Bitcoin" admin@foo.com</tran <translation>Atenção: wallet.dat corrompido, dados recuperados! wallet.dat original salvo como wallet.{timestamp}.bak em %s; se o seu saldo ou transações estiverem incorrectos deverá recuperar uma cópia de segurança.</translation> </message> <message> + <source>Whitelist peers connecting from the given netmask or IP address. Can be specified multiple times.</source> + <translation>Ligações na lista branca conectam desde a seguinte netmask ou endereço IP. Posse ser especificado varias vezes.</translation> + </message> + <message> + <source>(default: 1)</source> + <translation>(padrão: 1)</translation> + </message> + <message> <source><category> can be:</source> <translation><categoria> pode ser:</translation> </message> @@ -2481,12 +2744,16 @@ por exemplo: alertnotify=echo %%s | mail -s "Alerta Bitcoin" admin@foo.com</tran <translation>Apenas ligar ao(s) nó(s) especificado(s)</translation> </message> <message> + <source>Connection options:</source> + <translation>Opcões de conexção:</translation> + </message> + <message> <source>Corrupted block database detected</source> <translation>Cadeia de blocos corrompida detectada</translation> </message> <message> - <source>Discover own IP address (default: 1 when listening and no -externalip)</source> - <translation>Descobrir endereço IP próprio (padrão: 1 ao escutar sem -externalip)</translation> + <source>Debugging/Testing options:</source> + <translation>Depuração/Opções teste:</translation> </message> <message> <source>Do not load the wallet and disable wallet RPC calls</source> @@ -2513,12 +2780,12 @@ por exemplo: alertnotify=echo %%s | mail -s "Alerta Bitcoin" admin@foo.com</tran <translation>Erro ao abrir a base de dados de blocos</translation> </message> <message> - <source>Error: Disk space is low!</source> - <translation>Erro: Pouco espaço em disco!</translation> + <source>Error: A fatal internal error occured, see debug.log for details</source> + <translation>Erro: Um erro fatal interno ocorreu, verificar debug.log para mais informação</translation> </message> <message> - <source>Error: Wallet locked, unable to create transaction!</source> - <translation>Erro: Carteira bloqueada, incapaz de criar transação! </translation> + <source>Error: Disk space is low!</source> + <translation>Erro: Pouco espaço em disco!</translation> </message> <message> <source>Failed to listen on any port. Use -listen=0 if you want this.</source> @@ -2529,6 +2796,10 @@ por exemplo: alertnotify=echo %%s | mail -s "Alerta Bitcoin" admin@foo.com</tran <translation>Se uma <categoria> não é fornecida, imprimir toda a informação de depuração.</translation> </message> <message> + <source>Importing...</source> + <translation>A importar...</translation> + </message> + <message> <source>Incorrect or no genesis block found. Wrong datadir for network?</source> <translation>Bloco génese incorreto ou nenhum bloco génese encontrado. Pasta de dados errada para a rede?</translation> </message> @@ -2541,8 +2812,8 @@ por exemplo: alertnotify=echo %%s | mail -s "Alerta Bitcoin" admin@foo.com</tran <translation>Os descritores de ficheiros disponíveis são insuficientes.</translation> </message> <message> - <source>Rebuild block chain index from current blk000??.dat files</source> - <translation>Reconstruir a cadeia de blocos a partir dos ficheiros blk000??.dat atuais</translation> + <source>Only connect to nodes in network <net> (ipv4, ipv6 or onion)</source> + <translation>Somente conectar aos nodes na rede <net> (ipv4, ipv6 ou onion)</translation> </message> <message> <source>Set database cache size in megabytes (%d to %d, default: %d)</source> @@ -2561,6 +2832,10 @@ por exemplo: alertnotify=echo %%s | mail -s "Alerta Bitcoin" admin@foo.com</tran <translation>Isto têm como fim a realização de testes de regressão para pools e desenvolvimento de aplicações.</translation> </message> <message> + <source>Use UPnP to map the listening port (default: %u)</source> + <translation>Use UPnP para mapear a porto de escuta (default: %u)</translation> + </message> + <message> <source>Verifying blocks...</source> <translation>A verificar blocos...</translation> </message> @@ -2585,6 +2860,18 @@ por exemplo: alertnotify=echo %%s | mail -s "Alerta Bitcoin" admin@foo.com</tran <translation>Importar blocos de um ficheiro blk000??.dat externo</translation> </message> <message> + <source>Allow JSON-RPC connections from specified source. Valid for <ip> are a single IP (e.g. 1.2.3.4), a network/netmask (e.g. 1.2.3.4/255.255.255.0) or a network/CIDR (e.g. 1.2.3.4/24). This option can be specified multiple times</source> + <translation>Permitir conexções JSON-RPC de fontes especificas. Valido para <ip> um unico IP (ex. 1.2.3.4), uma rede/netmask (ex. 1.2.3.4/255.255.255.0) ou uma rede/CIDR (ex. 1.2.3.4/24). Esta opção pode ser especificada varias vezes</translation> + </message> + <message> + <source>An error occurred while setting up the RPC address %s port %u for listening: %s</source> + <translation>Um erro ocorreu durante a definição do endereço RPC %s porto %u para escutar: %s</translation> + </message> + <message> + <source>Bind to given address and whitelist peers connecting to it. Use [host]:port notation for IPv6</source> + <translation>Vincualar o endereço dado e listar as ligações conectadas ao mesmo na lista branca. Use a notação [anfitrião]:porta para IPv6</translation> + </message> + <message> <source>Cannot obtain a lock on data directory %s. Bitcoin Core is probably already running.</source> <translation>Impossível trancar a pasta de dados %s. Provavelmente o Bitcoin Core já está a ser executado.</translation> </message> @@ -2597,6 +2884,10 @@ por exemplo: alertnotify=echo %%s | mail -s "Alerta Bitcoin" admin@foo.com</tran <translation>Definir tamanho máximo de transações com alta-prioridade/baixa-taxa em bytes (por defeito: %d)</translation> </message> <message> + <source>Choose data directory on startup (default: 0)</source> + <translation>Escolha a pasta de dados ao iniciar (por defeito: 0)</translation> + </message> + <message> <source>Information</source> <translation>Informação</translation> </message> @@ -2613,6 +2904,18 @@ por exemplo: alertnotify=echo %%s | mail -s "Alerta Bitcoin" admin@foo.com</tran <translation>Enviar informação de rastreio/depuração para a consola e não para o ficheiro debug.log</translation> </message> <message> + <source>Set SSL root certificates for payment request (default: -system-)</source> + <translation>Configurar certificados SSL root para pedido de pagamento (default: -system-)</translation> + </message> + <message> + <source>Set language, for example "de_DE" (default: system locale)</source> + <translation>Definir linguagem, por exemplo "pt_PT" (por defeito: linguagem do sistema)</translation> + </message> + <message> + <source>Show splash screen on startup (default: 1)</source> + <translation>Mostrar imagem ao iniciar (por defeito: 1)</translation> + </message> + <message> <source>Shrink debug.log file on client startup (default: 1 when no -debug)</source> <translation>Encolher ficheiro debug.log ao iniciar o cliente (por defeito: 1 sem -debug definido)</translation> </message> @@ -2621,6 +2924,10 @@ por exemplo: alertnotify=echo %%s | mail -s "Alerta Bitcoin" admin@foo.com</tran <translation>Falhou assinatura da transação</translation> </message> <message> + <source>Start minimized</source> + <translation>Iniciar minimizado</translation> + </message> + <message> <source>Transaction amount too small</source> <translation>Quantia da transação é muito baixa</translation> </message> @@ -2645,10 +2952,6 @@ por exemplo: alertnotify=echo %%s | mail -s "Alerta Bitcoin" admin@foo.com</tran <translation>Aviso</translation> </message> <message> - <source>Warning: This version is obsolete, upgrade required!</source> - <translation>Atenção: Esta versão está obsoleta, é necessário actualizar!</translation> - </message> - <message> <source>Zapping all transactions from wallet...</source> <translation>A limpar todas as transações da carteira...</translation> </message> @@ -2717,10 +3020,6 @@ por exemplo: alertnotify=echo %%s | mail -s "Alerta Bitcoin" admin@foo.com</tran <translation>Quantia inválida para -paytxfee=<amount>: '%s'</translation> </message> <message> - <source>Invalid amount</source> - <translation>Quantia inválida</translation> - </message> - <message> <source>Insufficient funds</source> <translation>Fundos insuficientes</translation> </message> @@ -2753,10 +3052,6 @@ por exemplo: alertnotify=echo %%s | mail -s "Alerta Bitcoin" admin@foo.com</tran <translation>Carregamento completo</translation> </message> <message> - <source>To use the %s option</source> - <translation>Para usar a opção %s</translation> - </message> - <message> <source>Error</source> <translation>Erro</translation> </message> diff --git a/src/qt/locale/bitcoin_ro_RO.ts b/src/qt/locale/bitcoin_ro_RO.ts index 81342c5dbc..8b029eeca1 100644 --- a/src/qt/locale/bitcoin_ro_RO.ts +++ b/src/qt/locale/bitcoin_ro_RO.ts @@ -1,9 +1,9 @@ -<TS language="ro_RO" version="2.0"> +<TS language="ro_RO" version="2.1"> <context> <name>AddressBookPage</name> <message> - <source>Double-click to edit address or label</source> - <translation>Dublu-click pentru a edita adresa sau eticheta</translation> + <source>Right-click to edit address or label</source> + <translation>Click-dreapta pentru a edita adresa sau eticheta</translation> </message> <message> <source>Create a new address</source> @@ -19,11 +19,11 @@ </message> <message> <source>&Copy</source> - <translation>&Copiere</translation> + <translation>&Copiază</translation> </message> <message> <source>C&lose</source> - <translation>&Inchidere</translation> + <translation>Închide</translation> </message> <message> <source>&Copy Address</source> @@ -31,11 +31,11 @@ </message> <message> <source>Delete the currently selected address from the list</source> - <translation>Sterge adresele curent selectate din lista</translation> + <translation>Şterge adresele curent selectate din listă</translation> </message> <message> <source>Export the data in the current tab to a file</source> - <translation>Exporta datele din tab-ul curent într-un fișier</translation> + <translation>Exportă datele din tab-ul curent într-un fişier</translation> </message> <message> <source>&Export</source> @@ -43,35 +43,35 @@ </message> <message> <source>&Delete</source> - <translation>Ște&rge</translation> + <translation>Şterge</translation> </message> <message> <source>Choose the address to send coins to</source> - <translation>Alegeti adresa unde vreti sa trimiteti monezile</translation> + <translation>Alegeţi adresa unde vreţi să trimiteţi monezile</translation> </message> <message> <source>Choose the address to receive coins with</source> - <translation>Alegeti adresa unde vreti sa primiti monezile</translation> + <translation>Alegeţi adresa unde vreţi să primiţi monezile</translation> </message> <message> <source>C&hoose</source> - <translation>&Alege</translation> + <translation>&Alegeţi</translation> </message> <message> <source>Sending addresses</source> - <translation>Adresa Destinatarului</translation> + <translation>Adresa destinatarului</translation> </message> <message> <source>Receiving addresses</source> - <translation>Adresa pe care primiti</translation> + <translation>Adresa de primire</translation> </message> <message> <source>These are your Bitcoin addresses for sending payments. Always check the amount and the receiving address before sending coins.</source> - <translation>Acestea sunt adresele dumneavoastra Bitcoin care pot fi folosite la trimiterea platilor. Verificati totdeauna cantitatea si adresa de primire inainte de a trimite monezi.</translation> + <translation>Acestea sînt adresele dumneavoastră Bitcoin pentru efectuarea plăţilor. Verificaţi întotdeauna cantitatea şi adresa de primire înainte de a trimite monezi.</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>Acestea sunt adresele dumneavoastra Bitcoin folosite pentru a primi plati. Este recomandat sa folositi cate o adresa noua de primire pentru fiecare tranzactie in parte.</translation> + <translation>Acestea sînt adresele dumneavoastră Bitcoin folosite pentru a primi plati. Este recomandat să folosiţi o adresă nouă de primire pentru fiecare tranzacţie în parte.</translation> </message> <message> <source>Copy &Label</source> @@ -79,21 +79,25 @@ </message> <message> <source>&Edit</source> - <translation>&Editează</translation> + <translation>&Editare</translation> </message> <message> <source>Export Address List</source> - <translation>Exportati Agenda</translation> + <translation>Exportă listă de adrese</translation> </message> <message> <source>Comma separated file (*.csv)</source> - <translation>Valori separate prin virgulă (*.csv)</translation> + <translation>Fişier text cu valori separate prin virgulă (*.csv)</translation> </message> <message> <source>Exporting Failed</source> - <translation>Exportare esuata</translation> + <translation>Export nereuşit</translation> </message> - </context> + <message> + <source>There was an error trying to save the address list to %1. Please try again.</source> + <translation>A apărut o eroare la salvarea listei de adrese la %1. Vă rugăm să încercaţi din nou.</translation> + </message> +</context> <context> <name>AddressTableModel</name> <message> @@ -117,7 +121,7 @@ </message> <message> <source>Enter passphrase</source> - <translation>Introdu fraza de acces</translation> + <translation>Introduceţi fraza de acces</translation> </message> <message> <source>New passphrase</source> @@ -125,71 +129,67 @@ </message> <message> <source>Repeat new passphrase</source> - <translation>Repetă noua frază de acces</translation> + <translation>Repetaţi noua frază de acces</translation> </message> <message> <source>Encrypt wallet</source> - <translation>Criptează portofelul</translation> + <translation>Criptare portofel</translation> </message> <message> <source>This operation needs your wallet passphrase to unlock the wallet.</source> - <translation>Această acțiune necesită fraza ta de acces pentru deblocarea portofelului.</translation> + <translation>Această acţiune necesită fraza dvs. de acces pentru deblocarea portofelului.</translation> </message> <message> <source>Unlock wallet</source> - <translation>Deblochează portofelul</translation> + <translation>Deblocare portofel</translation> </message> <message> <source>This operation needs your wallet passphrase to decrypt the wallet.</source> - <translation>Această acțiune necesită fraza ta de acces pentru decriptarea portofelului.</translation> + <translation>Această acţiune necesită fraza dvs. de acces pentru decriptarea portofelului.</translation> </message> <message> <source>Decrypt wallet</source> - <translation>Decriptează portofelul.</translation> + <translation>Decriptare portofel</translation> </message> <message> <source>Change passphrase</source> - <translation>Schimbă fraza de acces</translation> - </message> - <message> - <source>Enter the old and new passphrase to the wallet.</source> - <translation>Introdu vechea și noua parolă pentru portofel.</translation> + <translation>Schimbare frază de acces</translation> </message> <message> <source>Confirm wallet encryption</source> - <translation>Confirmă criptarea portofelului</translation> + <translation>Confirmaţi criptarea portofelului</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>Atenție: Dacă pierdeţi parola portofelului electronic dupa criptare, <b>VEŢI PIERDE ÎNTREAGA SUMĂ DE BITCOIN ACUMULATĂ</b>!</translation> + <translation>Atenţie: Dacă pierdeţi parola portofelului electronic după criptare, <b>VEŢI PIERDE ÎNTREAGA SUMĂ DE BITCOIN ACUMULATĂ</b>!</translation> </message> <message> <source>Are you sure you wish to encrypt your wallet?</source> - <translation>Sunteţi sigur că doriţi să criptaţi portofelul electronic?</translation> + <translation>Sigur doriţi să criptaţi portofelul dvs.?</translation> </message> <message> <source>IMPORTANT: Any previous backups you have made of your wallet file should be replaced with the newly generated, encrypted wallet file. For security reasons, previous backups of the unencrypted wallet file will become useless as soon as you start using the new, encrypted wallet.</source> - <translation>IMPORTANT: Orice copie de siguranta facuta in prealabil portofelului dumneavoastra ar trebui inlocuita cu cea generata cel mai recent fisier criptat al portofelului. Pentru siguranta, copiile de siguranta vechi ale portofelului ne-criptat vor deveni inutile de indata ce veti incepe folosirea noului fisier criptat al portofelului.</translation> + <translation>IMPORTANT: Orice copie de siguranţă făcută anterior portofelului dumneavoastră ar trebui înlocuită cu cea generată cel mai recent, fişier criptat al portofelului. Pentru siguranţă, copiile de siguranţă vechi ale portofelului ne-criptat vor deveni inutile imediat ce veţi începe folosirea noului fişier criptat al portofelului.</translation> </message> <message> <source>Warning: The Caps Lock key is on!</source> - <translation>Atentie! Caps Lock este pornit</translation> + <translation>Atenţie! Caps Lock este pornit!</translation> </message> <message> <source>Wallet encrypted</source> <translation>Portofel criptat</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>Bitcoin se va închide acum pentru a termina procesul de criptare. Ține minte că criptarea portofelului nu te poate proteja în totalitate de furtul monedelor de către programe dăunătoare care îți infectează calculatorul.</translation> + <source>Enter the new passphrase to the wallet.<br/>Please use a passphrase of <b>ten or more random characters</b>, or <b>eight or more words</b>.</source> + <translation>Introduceţi noua parolă a portofelului electronic.<br/>Vă rugăm să folosiţi o parolă de<b>minimum 10 caractere aleatoare</b>, sau <b>minimum 8 cuvinte</b>.</translation> </message> <message> <source>Wallet encryption failed</source> - <translation>Criptarea portofelului a eșuat</translation> + <translation>Criptarea portofelului nu a reuşit</translation> </message> <message> <source>Wallet encryption failed due to an internal error. Your wallet was not encrypted.</source> - <translation>Criptarea portofelului a eșuat din cauza unei erori interne. Portofelul tău nu a fost criptat.</translation> + <translation>Criptarea portofelului nu a reuşit din cauza unei erori interne. Portofelul dvs. nu a fost criptat.</translation> </message> <message> <source>The supplied passphrases do not match.</source> @@ -197,7 +197,7 @@ </message> <message> <source>Wallet unlock failed</source> - <translation>Deblocarea portofelului a eșuat</translation> + <translation>Deblocarea portofelului nu a reuşit</translation> </message> <message> <source>The passphrase entered for the wallet decryption was incorrect.</source> @@ -205,7 +205,7 @@ </message> <message> <source>Wallet decryption failed</source> - <translation>Decriptarea portofelului a eșuat</translation> + <translation>Decriptarea portofelului nu a reuşit</translation> </message> <message> <source>Wallet passphrase was successfully changed.</source> @@ -220,7 +220,7 @@ </message> <message> <source>Synchronizing with network...</source> - <translation>Se sincronizează cu rețeaua...</translation> + <translation>Se sincronizează cu reţeaua...</translation> </message> <message> <source>&Overview</source> @@ -236,19 +236,19 @@ </message> <message> <source>&Transactions</source> - <translation>&Tranzacții</translation> + <translation>&Tranzacţii</translation> </message> <message> <source>Browse transaction history</source> - <translation>Răsfoiește istoricul tranzacțiilor</translation> + <translation>Răsfoire istoric tranzacţii</translation> </message> <message> <source>E&xit</source> - <translation>&Ieșire</translation> + <translation>Ieşire</translation> </message> <message> <source>Quit application</source> - <translation>Închide aplicația</translation> + <translation>Închide aplicaţia</translation> </message> <message> <source>About &Qt</source> @@ -256,19 +256,19 @@ </message> <message> <source>Show information about Qt</source> - <translation>Arată informații despre Qt</translation> + <translation>Arată informaţii despre Qt</translation> </message> <message> <source>&Options...</source> - <translation>&Setări...</translation> + <translation>&Opţiuni...</translation> </message> <message> <source>&Encrypt Wallet...</source> - <translation>Criptează portofelul electronic...</translation> + <translation>Cript&ează portofelul...</translation> </message> <message> <source>&Backup Wallet...</source> - <translation>&Fă o copie de siguranță a portofelului...</translation> + <translation>Face o copie de siguranţă a portofelului...</translation> </message> <message> <source>&Change Passphrase...</source> @@ -276,19 +276,23 @@ </message> <message> <source>&Sending addresses...</source> - <translation>&Trimitere adrese...</translation> + <translation>Adrese de trimitere...</translation> </message> <message> <source>&Receiving addresses...</source> - <translation>&Primire adrese...</translation> + <translation>Adrese de p&rimire...</translation> </message> <message> <source>Open &URI...</source> - <translation>Vizitaţi &URI...</translation> + <translation>Deschide &URI...</translation> + </message> + <message> + <source>Bitcoin Core client</source> + <translation>Clientul Bitcoin Core</translation> </message> <message> <source>Importing blocks from disk...</source> - <translation>Importare blocks de pe disk...</translation> + <translation>Import blocuri de pe disk...</translation> </message> <message> <source>Reindexing blocks on disk...</source> @@ -299,12 +303,8 @@ <translation>Trimite monede către o adresă Bitcoin</translation> </message> <message> - <source>Modify configuration options for Bitcoin</source> - <translation>Modifică opțiunile de configurare pentru Bitcoin</translation> - </message> - <message> <source>Backup wallet to another location</source> - <translation>Creează o copie de rezervă a portofelului într-o locație diferită</translation> + <translation>Creează o copie de rezervă a portofelului într-o locaţie diferită</translation> </message> <message> <source>Change the passphrase used for wallet encryption</source> @@ -312,15 +312,15 @@ </message> <message> <source>&Debug window</source> - <translation>Fereastră &debug</translation> + <translation>Fereastra de &depanare</translation> </message> <message> <source>Open debugging and diagnostic console</source> - <translation>Deschide consola de debug și diagnosticare</translation> + <translation>Deschide consola de depanare şi diagnosticare</translation> </message> <message> <source>&Verify message...</source> - <translation>&Verifică mesajul...</translation> + <translation>&Verifică mesaj...</translation> </message> <message> <source>Bitcoin</source> @@ -328,19 +328,23 @@ </message> <message> <source>Wallet</source> - <translation>Portofelul</translation> + <translation>Portofel</translation> </message> <message> <source>&Send</source> - <translation>&Trimite</translation> + <translation>Trimite</translation> </message> <message> <source>&Receive</source> - <translation>&Primește</translation> + <translation>P&rimeşte</translation> + </message> + <message> + <source>Show information about Bitcoin Core</source> + <translation>Arată informaţii despre Bitcoin Core</translation> </message> <message> <source>&Show / Hide</source> - <translation>Arata/Ascunde</translation> + <translation>Arată/Ascunde</translation> </message> <message> <source>Show or hide the main Window</source> @@ -348,19 +352,19 @@ </message> <message> <source>Encrypt the private keys that belong to your wallet</source> - <translation>Criptează cheile private ale portofelului tău</translation> + <translation>Criptează cheile private ale portofelului dvs.</translation> </message> <message> <source>Sign messages with your Bitcoin addresses to prove you own them</source> - <translation>Semnează mesaje cu adresa ta Bitcoin pentru a dovedi că îți aparțin</translation> + <translation>Semnaţi mesaje cu adresa dvs. Bitcoin pentru a dovedi că vă aparţin</translation> </message> <message> <source>Verify messages to ensure they were signed with specified Bitcoin addresses</source> - <translation>Verifică mesaje pentru a te asigura că au fost semnate cu adresa Bitcoin specificată</translation> + <translation>Verificaţi mesaje pentru a vă asigura că au fost semnate cu adresa Bitcoin specificată</translation> </message> <message> <source>&File</source> - <translation>&Fișier</translation> + <translation>&Fişier</translation> </message> <message> <source>&Settings</source> @@ -372,15 +376,15 @@ </message> <message> <source>Tabs toolbar</source> - <translation>Bara de file</translation> + <translation>Bara de unelte</translation> </message> <message> <source>Bitcoin Core</source> - <translation>Bitcoin Core</translation> + <translation>Nucleul Bitcoin</translation> </message> <message> <source>Request payments (generates QR codes and bitcoin: URIs)</source> - <translation>Cereti plati (genereaza coduri QR si bitcoin-uri: URls)</translation> + <translation>Cereţi plăţi (generează coduri QR şi bitcoin-uri: URls)</translation> </message> <message> <source>&About Bitcoin Core</source> @@ -388,31 +392,31 @@ </message> <message> <source>Show the list of used sending addresses and labels</source> - <translation>Aratati lista de adrese trimise si etichete folosite.</translation> + <translation>Arată lista de adrese trimise şi etichetele folosite.</translation> </message> <message> <source>Show the list of used receiving addresses and labels</source> - <translation>Aratati lista de adrese pentru primire si etichete </translation> + <translation>Arată lista de adrese pentru primire şi etichetele</translation> </message> <message> <source>Open a bitcoin: URI or payment request</source> - <translation>Deschideti un bitcoin: o adresa URI sau o cerere de plata</translation> + <translation>Deschidere bitcoin: o adresa URI sau o cerere de plată</translation> </message> <message> <source>&Command-line options</source> - <translation>Command-line setări</translation> + <translation>Opţiuni linie de &comandă</translation> </message> <message> <source>Show the Bitcoin Core help message to get a list with possible Bitcoin command-line options</source> - <translation>Arată mesajul de ajutor Bitcoin Core pentru a obține o listă cu opțiunile posibile de linii de comandă Bitcoin</translation> + <translation>Arată mesajul de ajutor Bitcoin Core pentru a obţine o listă cu opţiunile posibile de linii de comandă Bitcoin</translation> </message> <message numerus="yes"> <source>%n active connection(s) to Bitcoin network</source> - <translation><numerusform>%n conexiune activă către rețeaua Bitcoin</numerusform><numerusform>%n conexiuni active către rețeaua Bitcoin</numerusform><numerusform>%n de conexiuni active către rețeaua Bitcoin</numerusform></translation> + <translation><numerusform>%n conexiune activă către reţeaua Bitcoin</numerusform><numerusform>%n conexiuni active către reţeaua Bitcoin</numerusform><numerusform>%n de conexiuni active către reţeaua Bitcoin</numerusform></translation> </message> <message> <source>No block source available...</source> - <translation>Nici o sursă de bloc disponibil ...</translation> + <translation>Nici o sursă de bloc disponibilă...</translation> </message> <message numerus="yes"> <source>%n hour(s)</source> @@ -420,7 +424,7 @@ </message> <message numerus="yes"> <source>%n day(s)</source> - <translation><numerusform>%n zi</numerusform><numerusform>%n zile</numerusform><numerusform>%n zile</numerusform></translation> + <translation><numerusform>%n zi</numerusform><numerusform>%n zile</numerusform><numerusform>%n de zile</numerusform></translation> </message> <message numerus="yes"> <source>%n week(s)</source> @@ -428,7 +432,11 @@ </message> <message> <source>%1 and %2</source> - <translation>%1 si %2</translation> + <translation>%1 şi %2</translation> + </message> + <message numerus="yes"> + <source>%n year(s)</source> + <translation><numerusform>%n an</numerusform><numerusform>%n ani</numerusform><numerusform>%n de ani</numerusform></translation> </message> <message> <source>%1 behind</source> @@ -436,11 +444,11 @@ </message> <message> <source>Last received block was generated %1 ago.</source> - <translation>Ultimul bloc recepționat a fost generat acum %1.</translation> + <translation>Ultimul bloc recepţionat a fost generat acum %1.</translation> </message> <message> <source>Transactions after this will not yet be visible.</source> - <translation>Tranzacții după aceasta nu va fi încă disponibile.</translation> + <translation>Tranzacţiile după aceasta nu vor fi vizibile încă.</translation> </message> <message> <source>Error</source> @@ -448,11 +456,11 @@ </message> <message> <source>Warning</source> - <translation>Avertizare</translation> + <translation>Avertisment</translation> </message> <message> <source>Information</source> - <translation>Informație</translation> + <translation>Informaţie</translation> </message> <message> <source>Up to date</source> @@ -464,43 +472,35 @@ </message> <message> <source>Sent transaction</source> - <translation>Tranzacție expediată</translation> + <translation>Tranzacţie expediată</translation> </message> <message> <source>Incoming transaction</source> - <translation>Tranzacție recepționată</translation> - </message> - <message> - <source>Date: %1 -Amount: %2 -Type: %3 -Address: %4 -</source> - <translation>Data: %1 -Suma: %2 -Tipul: %3 -Adresa: %4 -</translation> + <translation>Tranzacţie recepţionată</translation> </message> <message> <source>Wallet is <b>encrypted</b> and currently <b>unlocked</b></source> - <translation>Portofelul este <b>criptat</b> iar în momentul de față este <b>deblocat</b></translation> + <translation>Portofelul este <b>criptat</b> iar în momentul de faţă este <b>deblocat</b></translation> </message> <message> <source>Wallet is <b>encrypted</b> and currently <b>locked</b></source> - <translation>Portofelul este <b>criptat</b> iar în momentul de față este <b>blocat</b></translation> + <translation>Portofelul este <b>criptat</b> iar în momentul de faţă este <b>blocat</b></translation> </message> </context> <context> <name>ClientModel</name> <message> <source>Network Alert</source> - <translation>Alertă rețea</translation> + <translation>Alertă reţea</translation> </message> </context> <context> <name>CoinControlDialog</name> <message> + <source>Coin Selection</source> + <translation>Selectarea monezii</translation> + </message> + <message> <source>Quantity:</source> <translation>Cantitate:</translation> </message> @@ -518,11 +518,15 @@ Adresa: %4 </message> <message> <source>Fee:</source> - <translation>Taxa:</translation> + <translation>Taxă:</translation> + </message> + <message> + <source>Dust:</source> + <translation>Praf:</translation> </message> <message> <source>After Fee:</source> - <translation>După taxe:</translation> + <translation>După taxă:</translation> </message> <message> <source>Change:</source> @@ -530,21 +534,29 @@ Adresa: %4 </message> <message> <source>(un)select all</source> - <translation>(de)selectaţi tot</translation> + <translation>(de)selectare tot</translation> </message> <message> <source>Tree mode</source> - <translation>Modul arborescent</translation> + <translation>Mod arbore</translation> </message> <message> <source>List mode</source> - <translation>Modul lista</translation> + <translation>Mod listă</translation> </message> <message> <source>Amount</source> <translation>Sumă</translation> </message> <message> + <source>Received with label</source> + <translation>Primite cu eticheta</translation> + </message> + <message> + <source>Received with address</source> + <translation>Primite cu adresa</translation> + </message> + <message> <source>Date</source> <translation>Data</translation> </message> @@ -574,43 +586,47 @@ Adresa: %4 </message> <message> <source>Copy transaction ID</source> - <translation>Copiază ID tranzacție</translation> + <translation>Copiază ID tranzacţie</translation> </message> <message> <source>Lock unspent</source> - <translation>Blocaţi necheltuite</translation> + <translation>Blocare necheltuiţi</translation> </message> <message> <source>Unlock unspent</source> - <translation>Deblocaţi necheltuite</translation> + <translation>Deblocare necheltuiţi</translation> </message> <message> <source>Copy quantity</source> - <translation>Copiaţi quantitea</translation> + <translation>Copiază cantitea</translation> </message> <message> <source>Copy fee</source> - <translation>Copiaţi taxele</translation> + <translation>Copiază taxa</translation> </message> <message> <source>Copy after fee</source> - <translation>Copiaţi după taxe</translation> + <translation>Copiază după taxă</translation> </message> <message> <source>Copy bytes</source> - <translation>Copiaţi octeţi</translation> + <translation>Copiază octeţi</translation> </message> <message> <source>Copy priority</source> - <translation>Copiaţi prioritatea</translation> + <translation>Copiază prioritatea</translation> + </message> + <message> + <source>Copy dust</source> + <translation>Copiază praf</translation> </message> <message> <source>Copy change</source> - <translation>Copiaţi schimb</translation> + <translation>Copiază rest</translation> </message> <message> <source>highest</source> - <translation>cel mai mare</translation> + <translation>cea mai mare</translation> </message> <message> <source>higher</source> @@ -622,33 +638,37 @@ Adresa: %4 </message> <message> <source>medium-high</source> - <translation>marime medie</translation> + <translation>medie-mare</translation> </message> <message> <source>medium</source> - <translation>mediu</translation> + <translation>medie</translation> </message> <message> <source>low-medium</source> - <translation>mediu-scazut</translation> + <translation>medie-scăzută</translation> </message> <message> <source>low</source> - <translation>scazut</translation> + <translation>scazută</translation> </message> <message> <source>lower</source> - <translation>mai scazut</translation> + <translation>mai scăzută</translation> </message> <message> <source>lowest</source> - <translation>cel mai scazut</translation> + <translation>cea mai scăzută</translation> </message> <message> <source>none</source> <translation>nimic</translation> </message> <message> + <source>Can vary +/- %1 satoshi(s) per input.</source> + <translation>Poate varia +/- %1 satoshi pentru fiecare intrare.</translation> + </message> + <message> <source>yes</source> <translation>da</translation> </message> @@ -657,20 +677,12 @@ Adresa: %4 <translation>nu</translation> </message> <message> - <source>This label turns red, if the transaction size is greater than 1000 bytes.</source> - <translation>Această etichetă devine roşie, în cazul în care dimensiunea tranzacţiei este mai mare de 1000 de octeţi. </translation> - </message> - <message> <source>Can vary +/- 1 byte per input.</source> - <translation>Poate varia +/- 1 octet pentru fiecare intrare. </translation> + <translation>Poate varia +/- 1 octet pentru fiecare intrare.</translation> </message> <message> <source>Transactions with higher priority are more likely to get included into a block.</source> - <translation>Tranzacţiile cu prioritate mai mare sunt mai susceptibile de fi incluse într-un bloc. </translation> - </message> - <message> - <source>This label turns red, if the priority is smaller than "medium".</source> - <translation>Aceasta eticheta se face rosie daca prioritatea e mai mica decat media</translation> + <translation>Tranzacţiile cu prioritate mai mare sînt mai susceptibile de fi incluse într-un bloc.</translation> </message> <message> <source>(no label)</source> @@ -682,7 +694,7 @@ Adresa: %4 </message> <message> <source>(change)</source> - <translation>(schimb)</translation> + <translation>(rest)</translation> </message> </context> <context> @@ -697,11 +709,11 @@ Adresa: %4 </message> <message> <source>The label associated with this address list entry</source> - <translation>Etichetele asociate cu aceasta intrare din lista.</translation> + <translation>Eticheta asociată cu această intrare din listă.</translation> </message> <message> <source>The address associated with this address list entry. This can only be modified for sending addresses.</source> - <translation>Adresa asociata cu aceasta adresa din lista. Aceasta poate fi modificata doar pentru Destinatari.</translation> + <translation>Adresa asociată cu această adresă din listă. Aceasta poate fi modificată doar pentru adresele de trimitere.</translation> </message> <message> <source>&Address</source> @@ -737,7 +749,7 @@ Adresa: %4 </message> <message> <source>New key generation failed.</source> - <translation>Generarea noii chei a eșuat.</translation> + <translation>Generarea noii chei nu a reuşit.</translation> </message> </context> <context> @@ -752,11 +764,11 @@ Adresa: %4 </message> <message> <source>Directory already exists. Add %1 if you intend to create a new directory here.</source> - <translation>Dosarul deja există. Adaugă %1 dacă intenționezi să creezi un nou dosar aici.</translation> + <translation>Dosarul deja există. Adaugă %1 dacă intenţionaţi să creaţi un nou dosar aici.</translation> </message> <message> <source>Path already exists, and is not a directory.</source> - <translation>Calea deja există și nu este un dosar.</translation> + <translation>Calea deja există şi nu este un dosar.</translation> </message> <message> <source>Cannot create data directory here.</source> @@ -767,7 +779,7 @@ Adresa: %4 <name>HelpMessageDialog</name> <message> <source>Bitcoin Core</source> - <translation>Bitcoin Core</translation> + <translation>Nucleul Bitcoin</translation> </message> <message> <source>version</source> @@ -783,7 +795,7 @@ Adresa: %4 </message> <message> <source>Command-line options</source> - <translation>Command-line setări</translation> + <translation>Opţiuni linie de comandă</translation> </message> <message> <source>Usage:</source> @@ -791,27 +803,7 @@ Adresa: %4 </message> <message> <source>command-line options</source> - <translation>command-line setări</translation> - </message> - <message> - <source>UI options</source> - <translation>UI setări</translation> - </message> - <message> - <source>Set language, for example "de_DE" (default: system locale)</source> - <translation>Seteaza limba, de exemplu: "de_DE" (initialt: system locale)</translation> - </message> - <message> - <source>Start minimized</source> - <translation>Incepe miniaturizare</translation> - </message> - <message> - <source>Show splash screen on startup (default: 1)</source> - <translation>Afișează pe ecran splash la pornire (implicit: 1)</translation> - </message> - <message> - <source>Choose data directory on startup (default: 0)</source> - <translation>Alege dosarul de date la pornire (implicit: 0)</translation> + <translation>Opţiuni linie de comandă</translation> </message> </context> <context> @@ -822,34 +814,46 @@ Adresa: %4 </message> <message> <source>Welcome to Bitcoin Core.</source> - <translation>Bine Aţi Venit la Nucleul Bitcoin.</translation> + <translation>Bine aţi venit la Nucleul Bitcoin.</translation> </message> <message> <source>As this is the first time the program is launched, you can choose where Bitcoin Core will store its data.</source> - <translation>Dacă aceasta este prima dată când programul este lansat, puteţi alege unde Nucleul Bitcoin va stoca datele. </translation> + <translation>Dacă aceasta este prima dată cînd programul este lansat, puteţi alege unde Nucleul Bitcoin va stoca datele.</translation> </message> <message> <source>Use the default data directory</source> - <translation>Folosește dosarul de date implicit</translation> + <translation>Foloseşte dosarul de date implicit</translation> </message> <message> <source>Use a custom data directory:</source> - <translation>Folosește un dosar de date personalizat:</translation> + <translation>Foloseşte un dosar de date personalizat:</translation> </message> <message> <source>Bitcoin Core</source> - <translation>Bitcoin Core</translation> + <translation>Nucleul Bitcoin</translation> + </message> + <message> + <source>Error: Specified data directory "%1" cannot be created.</source> + <translation>Eroare: Directorul datelor specificate "%1" nu poate fi creat.</translation> </message> <message> <source>Error</source> <translation>Eroare</translation> </message> - </context> + <message numerus="yes"> + <source>%n GB of free space available</source> + <translation><numerusform>%n GB de spaţiu liber disponibil</numerusform><numerusform>%n GB de spaţiu liber disponibil</numerusform><numerusform>%n GB de spaţiu liber disponibil</numerusform></translation> + </message> + <message numerus="yes"> + <source>(of %n GB needed)</source> + <translation><numerusform>(din %n GB necesar)</numerusform><numerusform>(din %n GB necesari)</numerusform><numerusform>(din %n GB necesari)</numerusform></translation> + </message> +</context> <context> <name>OpenURIDialog</name> <message> <source>Open URI</source> - <translation>Deschideti adresa URI</translation> + <translation>Deschide URI</translation> </message> <message> <source>Open payment request from URI or file</source> @@ -857,62 +861,114 @@ Adresa: %4 </message> <message> <source>URI:</source> - <translation>adresa URI:</translation> + <translation>URI:</translation> </message> <message> <source>Select payment request file</source> - <translation>Selectaţi fişierul de cerere de plată</translation> + <translation>Selectaţi fişierul cerere de plată</translation> </message> <message> <source>Select payment request file to open</source> - <translation>Selectaţi fişierul de cerere de plată de deschis</translation> + <translation>Selectaţi fişierul cerere de plată pentru deschidere</translation> </message> </context> <context> <name>OptionsDialog</name> <message> <source>Options</source> - <translation>Setări</translation> + <translation>Opţiuni</translation> </message> <message> <source>&Main</source> - <translation>&Principal</translation> - </message> - <message> - <source>Automatically start Bitcoin after logging in to the system.</source> - <translation>Porneşte automat programul Bitcoin la pornirea computerului.</translation> + <translation>Principal</translation> </message> <message> - <source>&Start Bitcoin on system login</source> - <translation>&S Porneşte Bitcoin la pornirea sistemului</translation> + <source>Size of &database cache</source> + <translation>Mărimea bazei de &date cache</translation> </message> <message> <source>MB</source> <translation>MB</translation> </message> <message> + <source>Number of script &verification threads</source> + <translation>Numărul de thread-uri de &verificare</translation> + </message> + <message> + <source>Accept connections from outside</source> + <translation>Acceptă conexiuni din exterior</translation> + </message> + <message> + <source>Allow incoming connections</source> + <translation>Permite conexiuni de intrare</translation> + </message> + <message> + <source>IP address of the proxy (e.g. IPv4: 127.0.0.1 / IPv6: ::1)</source> + <translation>Adresa IP a serverului proxy (de exemplu: 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-uri terţe părţi (de exemplu, un explorator de bloc), care apar în tab-ul tranzacţiilor ca elemente de meniu contextual. %s în URL este înlocuit cu hash de tranzacţie. URL-urile multiple sînt separate prin bară verticală |.</translation> + </message> + <message> + <source>Third party transaction URLs</source> + <translation>URL-uri tranzacţii terţe părţi</translation> + </message> + <message> + <source>Active command-line options that override above options:</source> + <translation>Opţiuni linie de comandă active care oprimă opţiunile de mai sus:</translation> + </message> + <message> <source>Reset all client options to default.</source> <translation>Resetează toate setările clientului la valorile implicite.</translation> </message> <message> <source>&Reset Options</source> - <translation>&Resetează opțiunile</translation> + <translation>&Resetează opţiunile</translation> </message> <message> <source>&Network</source> - <translation>&Retea</translation> + <translation>Reţea</translation> + </message> + <message> + <source>(0 = auto, <0 = leave that many cores free)</source> + <translation>(0 = automat, <0 = lasă atîtea nuclee libere)</translation> + </message> + <message> + <source>W&allet</source> + <translation>Portofel</translation> </message> <message> <source>Expert</source> - <translation>expert</translation> + <translation>Expert</translation> + </message> + <message> + <source>Enable coin &control features</source> + <translation>Activare caracteristici de control ale monedei</translation> + </message> + <message> + <source>If you disable the spending of unconfirmed change, the change from a transaction cannot be used until that transaction has at least one confirmation. This also affects how your balance is computed.</source> + <translation>Dacă dezactivaţi cheltuirea restului neconfirmat, restul dintr-o tranzacţie nu poate fi folosit pînă cînd tranzacţia are cel puţin o confirmare. Aceasta afectează de asemenea calcularea soldului.</translation> + </message> + <message> + <source>&Spend unconfirmed change</source> + <translation>Cheltuire rest neconfirmat</translation> </message> <message> <source>Automatically open the Bitcoin client port on the router. This only works when your router supports UPnP and it is enabled.</source> - <translation>Deschide automat în router portul aferent clientului Bitcoin. Funcţionează doar în cazul în care routerul e compatibil UPnP şi opţiunea e activată.</translation> + <translation>Deschide automat în router portul aferent clientului Bitcoin. Funcţionează doar dacă routerul duportă UPnP şi e activat.</translation> </message> <message> <source>Map port using &UPnP</source> - <translation>Mapeaza portul folosind &UPnP</translation> + <translation>Mapare port folosind &UPnP</translation> + </message> + <message> + <source>Connect to the Bitcoin network through a SOCKS5 proxy.</source> + <translation>Conectare la reţeaua Bitcoin printr-un proxy SOCKS.</translation> + </message> + <message> + <source>&Connect through SOCKS5 proxy (default proxy):</source> + <translation>&Conectare printr-un proxy SOCKS (implicit proxy):</translation> </message> <message> <source>Proxy &IP:</source> @@ -924,27 +980,23 @@ Adresa: %4 </message> <message> <source>Port of the proxy (e.g. 9050)</source> - <translation>Portul pe care se concetează proxy serverul (de exemplu: 9050)</translation> + <translation>Portul proxy (de exemplu: 9050)</translation> </message> <message> <source>&Window</source> - <translation>&Fereastra</translation> + <translation>&Fereastră</translation> </message> <message> <source>Show only a tray icon after minimizing the window.</source> - <translation>Afişează doar un icon in tray la ascunderea ferestrei</translation> + <translation>Arată doar un icon în tray la ascunderea ferestrei</translation> </message> <message> <source>&Minimize to the tray instead of the taskbar</source> - <translation>&M Ascunde în tray în loc de taskbar</translation> - </message> - <message> - <source>Minimize instead of exit the application when the window is closed. When this option is enabled, the application will be closed only after selecting Quit in the menu.</source> - <translation>Ascunde fereastra în locul părăsirii programului în momentul închiderii ferestrei. Când acestă opţiune e activă, aplicaţia se va opri doar în momentul selectării comenzii Quit din menu.</translation> + <translation>&Minimizare în tray în loc de taskbar</translation> </message> <message> <source>M&inimize on close</source> - <translation>&i Ascunde fereastra în locul închiderii programului</translation> + <translation>M&inimizare fereastră în locul închiderii programului</translation> </message> <message> <source>&Display</source> @@ -952,11 +1004,7 @@ Adresa: %4 </message> <message> <source>User Interface &language:</source> - <translation>Interfata & limba userului</translation> - </message> - <message> - <source>The user interface language can be set here. This setting will take effect after restarting Bitcoin.</source> - <translation>Limba interfeței utilizatorului poate fi setat aici. Această setare va avea efect după repornirea Bitcoin.</translation> + <translation>&Limbă interfaţă utilizator</translation> </message> <message> <source>&Unit to show amounts in:</source> @@ -964,23 +1012,23 @@ Adresa: %4 </message> <message> <source>Choose the default subdivision unit to show in the interface and when sending coins.</source> - <translation>Alege subdiviziunea folosită la afişarea interfeţei şi la trimiterea de bitcoin.</translation> + <translation>Alegeţi subdiviziunea folosită la afişarea interfeţei şi la trimiterea de bitcoin.</translation> </message> <message> <source>Whether to show coin control features or not.</source> - <translation>Dacă să se afişeze controlul caracteristicilor monedei sau nu.</translation> + <translation>Arată controlul caracteristicilor monedei sau nu.</translation> </message> <message> <source>&OK</source> - <translation>& OK</translation> + <translation>&OK</translation> </message> <message> <source>&Cancel</source> - <translation>& Renunta</translation> + <translation>Renunţă</translation> </message> <message> <source>default</source> - <translation>Initial</translation> + <translation>iniţial</translation> </message> <message> <source>none</source> @@ -988,23 +1036,19 @@ Adresa: %4 </message> <message> <source>Confirm options reset</source> - <translation>Confirmă resetarea opțiunilor</translation> + <translation>Confirmă resetarea opţiunilor</translation> </message> <message> <source>Client restart required to activate changes.</source> - <translation>Este necesar un restart al clientului pentru a activa schimbările.</translation> - </message> - <message> - <source>Client will be shutdown, do you want to proceed?</source> - <translation>Clientul va fi închis, doriţi să continuaţi?</translation> + <translation>Este necesară repornirea clientului pentru a activa schimbările.</translation> </message> <message> <source>This change would require a client restart.</source> - <translation>Această schimbare va necesita un restart al clientului.</translation> + <translation>Această schimbare necesită o repornire a clientului.</translation> </message> <message> <source>The supplied proxy address is invalid.</source> - <translation>Adresa bitcoin pe care a-ti specificat-o este invalida</translation> + <translation>Adresa bitcoin pe care aţi specificat-o nu este validă.</translation> </message> </context> <context> @@ -1015,7 +1059,11 @@ 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>Informațiile afișate pot neactualizate. Portofelul tău se sincronizează automat cu rețeaua Bitcoin după ce o conexiune este stabilită, dar acest proces nu a fost finalizat încă.</translation> + <translation>Informaţiile afişate pot fi neactualizate. Portofelul dvs. se sincronizează automat cu reţeaua Bitcoin după ce o conexiune este stabilită, dar acest proces nu a fost finalizat încă.</translation> + </message> + <message> + <source>Watch-only:</source> + <translation>Doar-supraveghere:</translation> </message> <message> <source>Available:</source> @@ -1023,7 +1071,7 @@ Adresa: %4 </message> <message> <source>Your current spendable balance</source> - <translation>Balanța ta curentă de cheltuieli</translation> + <translation>Balanţa dvs. curentă de cheltuieli</translation> </message> <message> <source>Pending:</source> @@ -1031,7 +1079,7 @@ Adresa: %4 </message> <message> <source>Total of transactions that have yet to be confirmed, and do not yet count toward the spendable balance</source> - <translation>Totalul tranzacțiilor care nu sunt confirmate încă și care nu sunt încă adunate la balanța de cheltuieli</translation> + <translation>Totalul tranzacţiilor care nu sunt confirmate încă şi care nu sunt încă adunate la balanţa de cheltuieli</translation> </message> <message> <source>Immature:</source> @@ -1039,7 +1087,11 @@ Adresa: %4 </message> <message> <source>Mined balance that has not yet matured</source> - <translation>Balanta minata care nu s-a maturizat inca</translation> + <translation>Balanţa minertită care nu s-a maturizat încă</translation> + </message> + <message> + <source>Balances</source> + <translation>Balanţă</translation> </message> <message> <source>Total:</source> @@ -1047,11 +1099,35 @@ Adresa: %4 </message> <message> <source>Your current total balance</source> - <translation>Balanța totală curentă</translation> + <translation>Balanţa totală curentă</translation> + </message> + <message> + <source>Your current balance in watch-only addresses</source> + <translation>Soldul dvs. curent în adresele doar-supraveghere</translation> + </message> + <message> + <source>Spendable:</source> + <translation>Cheltuibil:</translation> + </message> + <message> + <source>Recent transactions</source> + <translation>Tranzacţii recente</translation> + </message> + <message> + <source>Unconfirmed transactions to watch-only addresses</source> + <translation>Tranzacţii neconfirmate la adresele doar-supraveghere</translation> + </message> + <message> + <source>Mined balance in watch-only addresses that has not yet matured</source> + <translation>Balanţă minată în adresele doar-supraveghere care nu s-a maturizat încă</translation> + </message> + <message> + <source>Current total balance in watch-only addresses</source> + <translation>Soldul dvs. total în adresele doar-supraveghere</translation> </message> <message> <source>out of sync</source> - <translation>Nu este sincronizat</translation> + <translation>nesincronizat</translation> </message> </context> <context> @@ -1065,8 +1141,20 @@ Adresa: %4 <translation>Adresă pentru plată nevalidă %1</translation> </message> <message> + <source>Payment request rejected</source> + <translation>Cerere de plată refuzată</translation> + </message> + <message> + <source>Payment request network doesn't match client network.</source> + <translation>Cererea de plată din reţea nu se potriveşte cu clientul din reţea</translation> + </message> + <message> + <source>Payment request is not initialized.</source> + <translation>Cererea de plată nu este iniţializată.</translation> + </message> + <message> <source>Requested payment amount of %1 is too small (considered dust).</source> - <translation>Cereti plata cu suma de %1 este prea mica (considerata praf)</translation> + <translation>Suma cerută de plată de %1 este prea mică (considerată praf).</translation> </message> <message> <source>Payment request error</source> @@ -1074,23 +1162,47 @@ Adresa: %4 </message> <message> <source>Cannot start bitcoin: click-to-pay handler</source> - <translation>Nu poate porni bitcoin: regula clic-pentru-plata</translation> + <translation>Nu poate porni bitcoin: manipulator clic-pentru-plată</translation> + </message> + <message> + <source>Payment request fetch URL is invalid: %1</source> + <translation>URL-ul cererii de plată preluat nu este valid: %1</translation> + </message> + <message> + <source>Payment request file handling</source> + <translation>Manipulare fişier cerere de plată</translation> + </message> + <message> + <source>Payment request file cannot be read! This can be caused by an invalid payment request file.</source> + <translation>Fişierul cerere de plată nu poate fi citit! Cauza poate fi un fişier cerere de plată nevalid.</translation> </message> <message> <source>Unverified payment requests to custom payment scripts are unsupported.</source> - <translation>Cereri de plată neverificate prin script-uri personalizate de plată nu sunt suportate.</translation> + <translation>Cererile de plată neverificate prin script-uri personalizate de plată nu sînt suportate.</translation> </message> <message> <source>Refund from %1</source> - <translation>rambursare de la %1</translation> + <translation>Rambursare de la %1</translation> + </message> + <message> + <source>Payment request %1 is too large (%2 bytes, allowed %3 bytes).</source> + <translation>Cererea de plată %1 este prea mare (%2 octeţi, permis %3 octeţi).</translation> + </message> + <message> + <source>Payment request DoS protection</source> + <translation>Protecţie DoS cerere de plată</translation> </message> <message> <source>Error communicating with %1: %2</source> <translation>Eroare la comunicarea cu %1: %2</translation> </message> <message> + <source>Payment request cannot be parsed!</source> + <translation>Cererea de plată nu poate fi analizată!</translation> + </message> + <message> <source>Bad response from server %1</source> - <translation>Răspuns greșit de la server %1</translation> + <translation>Răspuns greşit de la server %1</translation> </message> <message> <source>Payment acknowledged</source> @@ -1098,17 +1210,33 @@ Adresa: %4 </message> <message> <source>Network request error</source> - <translation>Eroare în cererea de rețea</translation> + <translation>Eroare în cererea de reţea</translation> </message> </context> <context> <name>PeerTableModel</name> - </context> + <message> + <source>User Agent</source> + <translation>Agent utilizator</translation> + </message> + <message> + <source>Ping Time</source> + <translation>Timp ping</translation> + </message> +</context> <context> <name>QObject</name> <message> <source>Amount</source> - <translation>Sumă</translation> + <translation>Cantitate</translation> + </message> + <message> + <source>Enter a Bitcoin address (e.g. %1)</source> + <translation>Introduceţi o adresă Bitcoin (de exemplu %1)</translation> + </message> + <message> + <source>%1 d</source> + <translation>%1 z</translation> </message> <message> <source>%1 h</source> @@ -1119,19 +1247,31 @@ Adresa: %4 <translation>%1 m</translation> </message> <message> + <source>%1 s</source> + <translation>%1 s</translation> + </message> + <message> + <source>None</source> + <translation>Niciuna</translation> + </message> + <message> <source>N/A</source> <translation>N/A</translation> </message> - </context> + <message> + <source>%1 ms</source> + <translation>%1 ms</translation> + </message> +</context> <context> <name>QRImageWidget</name> <message> <source>&Save Image...</source> - <translation>Salvarea imaginii ...</translation> + <translation>&Salvează imagine...</translation> </message> <message> <source>&Copy Image</source> - <translation>Copierea imaginii</translation> + <translation>&Copiază imaginea</translation> </message> <message> <source>Save QR Code</source> @@ -1150,7 +1290,7 @@ Adresa: %4 </message> <message> <source>N/A</source> - <translation>N/A</translation> + <translation>indisponibil</translation> </message> <message> <source>Client version</source> @@ -1158,7 +1298,7 @@ Adresa: %4 </message> <message> <source>&Information</source> - <translation>&Informație</translation> + <translation>&Informaţii</translation> </message> <message> <source>Debug window</source> @@ -1170,7 +1310,11 @@ Adresa: %4 </message> <message> <source>Using OpenSSL version</source> - <translation>Foloseste versiunea OpenSSL</translation> + <translation>Foloseşte OpenSSL versiunea</translation> + </message> + <message> + <source>Using BerkeleyDB version</source> + <translation>Foloseşte BerkeleyDB versiunea</translation> </message> <message> <source>Startup time</source> @@ -1178,11 +1322,11 @@ Adresa: %4 </message> <message> <source>Network</source> - <translation>Rețea</translation> + <translation>Reţea</translation> </message> <message> <source>Name</source> - <translation>Numele</translation> + <translation>Nume</translation> </message> <message> <source>Number of connections</source> @@ -1190,13 +1334,69 @@ Adresa: %4 </message> <message> <source>Block chain</source> - <translation>Lanț de blocuri</translation> + <translation>Lanţ de blocuri</translation> </message> <message> <source>Current number of blocks</source> <translation>Numărul curent de blocuri</translation> </message> <message> + <source>Received</source> + <translation>Recepţionat</translation> + </message> + <message> + <source>Sent</source> + <translation>Trimis</translation> + </message> + <message> + <source>&Peers</source> + <translation>&Parteneri</translation> + </message> + <message> + <source>Select a peer to view detailed information.</source> + <translation>Selectaţi un partener pentru a vedea informaţiile detaliate.</translation> + </message> + <message> + <source>Direction</source> + <translation>Direcţie</translation> + </message> + <message> + <source>Version</source> + <translation>Versiune</translation> + </message> + <message> + <source>User Agent</source> + <translation>Agent utilizator</translation> + </message> + <message> + <source>Services</source> + <translation>Servicii</translation> + </message> + <message> + <source>Connection Time</source> + <translation>Timp conexiune</translation> + </message> + <message> + <source>Last Send</source> + <translation>Ultima trimitere</translation> + </message> + <message> + <source>Last Receive</source> + <translation>Ultima primire</translation> + </message> + <message> + <source>Bytes Sent</source> + <translation>Octeţi trimişi</translation> + </message> + <message> + <source>Bytes Received</source> + <translation>Octeţi primiţi</translation> + </message> + <message> + <source>Ping Time</source> + <translation>Timp ping</translation> + </message> + <message> <source>Last block time</source> <translation>Data ultimului bloc</translation> </message> @@ -1210,11 +1410,11 @@ Adresa: %4 </message> <message> <source>&Network Traffic</source> - <translation>Traficul in rețea</translation> + <translation>Trafic reţea</translation> </message> <message> <source>&Clear</source> - <translation>&Ştergeţi</translation> + <translation>&Curăţă</translation> </message> <message> <source>Totals</source> @@ -1222,11 +1422,11 @@ Adresa: %4 </message> <message> <source>In:</source> - <translation>în:</translation> + <translation>Intrare:</translation> </message> <message> <source>Out:</source> - <translation>Ieșire.</translation> + <translation>Ieşire:</translation> </message> <message> <source>Build date</source> @@ -1234,27 +1434,19 @@ Adresa: %4 </message> <message> <source>Debug log file</source> - <translation>Loguri debug</translation> - </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>Deschide logurile debug din directorul curent. Aceasta poate dura cateva secunde pentru fisierele mai mari</translation> + <translation>Fişier jurnal depanare</translation> </message> <message> <source>Clear console</source> - <translation>Curăță consola</translation> - </message> - <message> - <source>Welcome to the Bitcoin RPC console.</source> - <translation>Bun venit la consola bitcoin RPC</translation> + <translation>Curăţă consola</translation> </message> <message> <source>Use up and down arrows to navigate history, and <b>Ctrl-L</b> to clear screen.</source> - <translation>Foloseste sagetile sus si jos pentru a naviga in istoric si <b>Ctrl-L</b> pentru a curata.</translation> + <translation>Folosiţi săgetile sus şi jos pentru a naviga în istoric şi <b>Ctrl-L</b> pentru a curăţa.</translation> </message> <message> <source>Type <b>help</b> for an overview of available commands.</source> - <translation>Scrie <b>help</b> pentru a vedea comenzile disponibile</translation> + <translation>Scrieţi <b>help</b> pentru a vedea comenzile disponibile.</translation> </message> <message> <source>%1 B</source> @@ -1272,12 +1464,36 @@ Adresa: %4 <source>%1 GB</source> <translation>%1 GB</translation> </message> - </context> + <message> + <source>via %1</source> + <translation>via %1</translation> + </message> + <message> + <source>never</source> + <translation>niciodată</translation> + </message> + <message> + <source>Inbound</source> + <translation>Intrare</translation> + </message> + <message> + <source>Outbound</source> + <translation>Ieşire</translation> + </message> + <message> + <source>Unknown</source> + <translation>Necunoscut</translation> + </message> + <message> + <source>Fetching...</source> + <translation>Preluare...</translation> + </message> +</context> <context> <name>ReceiveCoinsDialog</name> <message> <source>&Amount:</source> - <translation>& suma:</translation> + <translation>Sum&a:</translation> </message> <message> <source>&Label:</source> @@ -1285,47 +1501,63 @@ Adresa: %4 </message> <message> <source>&Message:</source> - <translation>& mesaj:</translation> + <translation>&Mesaj:</translation> </message> <message> <source>Reuse one of the previously used receiving addresses. Reusing addresses has security and privacy issues. Do not use this unless re-generating a payment request made before.</source> - <translation>Refolositi una din adresele de primire folosite in prealabil. Refolosirea adreselor poate crea probleme de securitate si confidentialitate. Nu folositi aceasta optiune decat daca o cerere de regenerare a platii a fost facuta in prealabil.</translation> + <translation>Refoloseşte una din adresele de primire folosite anterior. Refolosirea adreselor poate crea probleme de securitate şi confidenţialitate. Nu folosiţi această opţiune decît dacă o cerere de regenerare a plăţii a fost făcută anterior.</translation> </message> <message> <source>R&euse an existing receiving address (not recommended)</source> - <translation>&Refolosirea unei adrese de primire (nu este recomandat)</translation> + <translation>R&efoloseşte o adresă de primire (nu este recomandat)</translation> + </message> + <message> + <source>An optional message to attach to the payment request, which will be displayed when the request is opened. Note: The message will not be sent with the payment over the Bitcoin network.</source> + <translation>Un mesaj opţional de ataşat la cererea de plată, care va fi afişat cînd cererea este deschisă. Notă: Acest mesaj nu va fi trimis cu plata către reţeaua Bitcoin.</translation> + </message> + <message> + <source>An optional label to associate with the new receiving address.</source> + <translation>O etichetă opţională de asociat cu adresa de primire.</translation> </message> <message> <source>Use this form to request payments. All fields are <b>optional</b>.</source> - <translation>Folosește acest formular pentru a solicita plăți. Toate câmpurile sunt <b>opționale</b>.</translation> + <translation>Foloseşte acest formular pentru a solicita plăţi. Toate cîmpurile sînt <b>opţionale</b>.</translation> + </message> + <message> + <source>An optional amount to request. Leave this empty or zero to not request a specific amount.</source> + <translation>O sumă opţională de cerut. Lăsaţi gol sau zero pentru a nu cere o sumă anume.</translation> </message> <message> <source>Clear all fields of the form.</source> - <translation>Stergeti toate campurile formularului</translation> + <translation>Curăţă toate cîmpurile formularului.</translation> </message> <message> <source>Clear</source> - <translation>Stergeti</translation> + <translation>Curăţă</translation> </message> <message> <source>Requested payments history</source> - <translation>Istoricul platilor a fost cerut</translation> + <translation>Istoricul plăţilor cerute</translation> </message> <message> <source>&Request payment</source> - <translation>&Cereti plata</translation> + <translation>&Cerere plată</translation> </message> <message> <source>Show the selected request (does the same as double clicking an entry)</source> - <translation>Arata cererea selectata (acelas lucru ca si dublu-click pe o inregistrare)</translation> + <translation>Arată cererea selectată (acelaşi lucru ca şi dublu-clic pe o înregistrare)</translation> </message> <message> <source>Show</source> <translation>Arată</translation> </message> <message> + <source>Remove the selected entries from the list</source> + <translation>Înlătură intrările selectate din listă</translation> + </message> + <message> <source>Remove</source> - <translation>Elimină</translation> + <translation>Înlătură</translation> </message> <message> <source>Copy label</source> @@ -1333,7 +1565,7 @@ Adresa: %4 </message> <message> <source>Copy message</source> - <translation>Copiaţi mesajul</translation> + <translation>Copiază mesajul</translation> </message> <message> <source>Copy amount</source> @@ -1348,27 +1580,27 @@ Adresa: %4 </message> <message> <source>Copy &URI</source> - <translation>Copiati &URl</translation> + <translation>Copiază &URl</translation> </message> <message> <source>Copy &Address</source> - <translation>Copiati &Adresa</translation> + <translation>Copiază &adresa</translation> </message> <message> <source>&Save Image...</source> - <translation>Salvarea imaginii ...</translation> + <translation>&Salvează imaginea...</translation> </message> <message> <source>Request payment to %1</source> - <translation>Cereti plata pentru %1</translation> + <translation>Cere plata pentru %1</translation> </message> <message> <source>Payment information</source> - <translation>Informatiile platii</translation> + <translation>Informaţiile plăţii</translation> </message> <message> <source>URI</source> - <translation>Identificator uniform de resurse</translation> + <translation>URI</translation> </message> <message> <source>Address</source> @@ -1388,7 +1620,7 @@ Adresa: %4 </message> <message> <source>Resulting URI too long, try to reduce the text for label / message.</source> - <translation>URI rezultat este prea lung, încearcă să reduci textul pentru etichetă / mesaj.</translation> + <translation>URI rezultat este prea lung, încearcaţi să reduceţi textul pentru etichetă / mesaj.</translation> </message> <message> <source>Error encoding URI into QR Code.</source> @@ -1423,7 +1655,7 @@ Adresa: %4 </message> <message> <source>(no amount)</source> - <translation>(suma nulă)</translation> + <translation>(sumă nulă)</translation> </message> </context> <context> @@ -1433,12 +1665,16 @@ Adresa: %4 <translation>Trimite monede</translation> </message> <message> + <source>Coin Control Features</source> + <translation>Caracteristici de control ale monedei</translation> + </message> + <message> <source>Inputs...</source> - <translation>Intrări</translation> + <translation>Intrări...</translation> </message> <message> <source>automatically selected</source> - <translation>Selectie automatică</translation> + <translation>selecţie automată</translation> </message> <message> <source>Insufficient funds!</source> @@ -1462,43 +1698,99 @@ Adresa: %4 </message> <message> <source>Fee:</source> - <translation>Taxa:</translation> + <translation>Taxă:</translation> </message> <message> <source>After Fee:</source> - <translation>După taxe:</translation> + <translation>După taxă:</translation> </message> <message> <source>Change:</source> - <translation>Schimbaţi:</translation> + <translation>Rest:</translation> + </message> + <message> + <source>If this is activated, but the change address is empty or invalid, change will be sent to a newly generated address.</source> + <translation>Dacă este activat, dar adresa de rest este goală sau nevalidă, restul va fi trimis la o adresă nou generată.</translation> + </message> + <message> + <source>Custom change address</source> + <translation>Adresă personalizată de rest</translation> + </message> + <message> + <source>Transaction Fee:</source> + <translation>Taxă tranzacţie:</translation> + </message> + <message> + <source>Choose...</source> + <translation>Alegeţi...</translation> + </message> + <message> + <source>per kilobyte</source> + <translation>per kilooctet</translation> + </message> + <message> + <source>total at least</source> + <translation>total cel puţin</translation> + </message> + <message> + <source>Recommended:</source> + <translation>Recomandat:</translation> + </message> + <message> + <source>Custom:</source> + <translation>Personalizat:</translation> + </message> + <message> + <source>Confirmation time:</source> + <translation>Timp confirmare:</translation> + </message> + <message> + <source>normal</source> + <translation>normal</translation> + </message> + <message> + <source>fast</source> + <translation>rapid</translation> + </message> + <message> + <source>Send as zero-fee transaction if possible</source> + <translation>Trimite ca taxă zero dacă este posibil</translation> + </message> + <message> + <source>(confirmation may take longer)</source> + <translation>(confirmarea poate dura mai mult)</translation> </message> <message> <source>Send to multiple recipients at once</source> - <translation>Trimite simultan către mai mulți destinatari</translation> + <translation>Trimite simultan către mai mulţi destinatari</translation> </message> <message> <source>Add &Recipient</source> - <translation>&Adaugă destinatar</translation> + <translation>Adaugă destinata&r</translation> </message> <message> <source>Clear all fields of the form.</source> - <translation>Stergeti toate campurile formularului</translation> + <translation>Şterge toate cîmpurile formularului.</translation> + </message> + <message> + <source>Dust:</source> + <translation>Praf:</translation> </message> <message> <source>Clear &All</source> - <translation>Șterge &tot</translation> + <translation>Curăţă to&ate</translation> </message> <message> <source>Balance:</source> - <translation>Balanță:</translation> + <translation>Balanţă:</translation> </message> <message> <source>Confirm the send action</source> - <translation>Confirmă operațiunea de trimitere</translation> + <translation>Confirmă operaţiunea de trimitere</translation> </message> <message> <source>S&end</source> - <translation>&S Trimite</translation> + <translation>Trimit&e</translation> </message> <message> <source>Confirm send coins</source> @@ -1510,7 +1802,7 @@ Adresa: %4 </message> <message> <source>Copy quantity</source> - <translation>Copiaţi quantitea</translation> + <translation>Copiază cantitea</translation> </message> <message> <source>Copy amount</source> @@ -1518,23 +1810,23 @@ Adresa: %4 </message> <message> <source>Copy fee</source> - <translation>Copiaţi taxele</translation> + <translation>Copiază taxa</translation> </message> <message> <source>Copy after fee</source> - <translation>Copiaţi după taxe</translation> + <translation>Copiază după taxă</translation> </message> <message> <source>Copy bytes</source> - <translation>Copiaţi octeţi</translation> + <translation>Copiază octeţi</translation> </message> <message> <source>Copy priority</source> - <translation>Copiaţi prioritatea</translation> + <translation>Copiază prioritatea</translation> </message> <message> <source>Copy change</source> - <translation>Copiaţi schimb</translation> + <translation>Copiază rest</translation> </message> <message> <source>Total Amount %1 (= %2)</source> @@ -1545,36 +1837,32 @@ Adresa: %4 <translation>sau</translation> </message> <message> - <source>The recipient address is not valid, please recheck.</source> - <translation>Adresa destinatarului nu este validă, vă rugăm să o verificaţi.</translation> - </message> - <message> <source>The amount to pay must be larger than 0.</source> - <translation>Suma de plată trebuie să fie mai mare decât 0.</translation> + <translation>Suma de plată trebuie să fie mai mare decît 0.</translation> </message> <message> <source>The amount exceeds your balance.</source> - <translation>Suma depășește soldul contului.</translation> + <translation>Suma depăşeşte soldul contului.</translation> </message> <message> <source>The total exceeds your balance when the %1 transaction fee is included.</source> - <translation>Totalul depășește soldul contului dacă se include și plata comisionului de %1.</translation> - </message> - <message> - <source>Duplicate address found, can only send to each address once per send operation.</source> - <translation>S-a descoperit o adresă care figurează de două ori. Expedierea se poate realiza către fiecare adresă doar o singură dată pe operațiune.</translation> + <translation>Totalul depăşeşte soldul contului dacă se include şi plata taxei de %1.</translation> </message> <message> <source>Transaction creation failed!</source> - <translation>Creare de tranzactie nereusita!</translation> + <translation>Creare tranzacţie nereuşită!</translation> </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>Tranzactia a fost respinsa! Acest lucru se poate intampla daca o parte din monedele tale din portofel au fost deja cheltuite, la fel ca si cum ai fi folosit o copie a wallet.dat si monedele au fost cheltuite in copie, dar nu au fost marcate si si cheltuite si aici.</translation> + <translation>Tranzacţia a fost respinsă! Acest lucru se poate întîmpla dacă o parte din monedele tale din portofel au fost deja cheltuite, la fel ca şi cum aţi fi folosit o copie a wallet.dat şi monedele au fost cheltuite în copie, dar nu au fost marcate ca şi cheltuite şi aici.</translation> + </message> + <message> + <source>Pay only the minimum fee of %1</source> + <translation>Plăteşte doar taxa minimă de %1</translation> </message> <message> <source>Warning: Invalid Bitcoin address</source> - <translation>Atentie: Adresa Bitcoin invalida!</translation> + <translation>Atenţie: Adresa bitcoin nevalidă!</translation> </message> <message> <source>(no label)</source> @@ -1582,15 +1870,19 @@ Adresa: %4 </message> <message> <source>Warning: Unknown change address</source> - <translation>Atentie: Schimbare de adresa necunoscuta</translation> + <translation>Atenţie: Adresă de rest necunoscută</translation> + </message> + <message> + <source>Copy dust</source> + <translation>Copiază praf</translation> </message> <message> <source>Are you sure you want to send?</source> - <translation>Ești sigur că vrei să trimiți?</translation> + <translation>Sigur doriţi să trimiteţi?</translation> </message> <message> <source>added as transaction fee</source> - <translation>adăugat ca taxă de tranzacție</translation> + <translation>adăugat ca taxă de tranzacţie</translation> </message> </context> <context> @@ -1601,11 +1893,11 @@ Adresa: %4 </message> <message> <source>Pay &To:</source> - <translation>Plătește că&tre:</translation> + <translation>Plăteşte că&tre:</translation> </message> <message> <source>Enter a label for this address to add it to your address book</source> - <translation>Introdu o etichetă pentru această adresă pentru a fi adăugată în lista ta de adrese</translation> + <translation>Introduceţi o etichetă pentru această adresă pentru a fi adăugată în lista dvs. de adrese</translation> </message> <message> <source>&Label:</source> @@ -1613,19 +1905,23 @@ Adresa: %4 </message> <message> <source>Choose previously used address</source> - <translation>Alegeti adrese folosite in prealabil.</translation> + <translation>Alegeţi adrese folosite anterior</translation> </message> <message> <source>This is a normal payment.</source> <translation>Aceasta este o tranzacţie normală.</translation> </message> <message> + <source>The Bitcoin address to send the payment to</source> + <translation>Adresa bitcoin către care se face plata</translation> + </message> + <message> <source>Alt+A</source> <translation>Alt+A</translation> </message> <message> <source>Paste address from clipboard</source> - <translation>Lipește adresa din clipboard</translation> + <translation>Lipeşte adresa din clipboard</translation> </message> <message> <source>Alt+P</source> @@ -1633,27 +1929,23 @@ Adresa: %4 </message> <message> <source>Remove this entry</source> - <translation>Scoate aceasta introducere</translation> + <translation>Înlătură această intrare</translation> </message> <message> <source>Message:</source> <translation>Mesaj:</translation> </message> <message> - <source>This is a verified payment request.</source> - <translation>Aceasta este o cerere de plata verificata</translation> - </message> - <message> <source>Enter a label for this address to add it to the list of used addresses</source> - <translation>Introduceti eticheta pentru ca aceasta adresa sa fie introdusa in lista de adrese folosite</translation> + <translation>Introduceţi eticheta pentru ca această adresa să fie introdusă în lista de adrese folosite</translation> </message> <message> - <source>This is an unverified payment request.</source> - <translation>Aceasta este o cerere de plata neverificata</translation> + <source>A message that was attached to the bitcoin: URI which will be stored with the transaction for your reference. Note: This message will not be sent over the Bitcoin network.</source> + <translation>un mesaj a fost ataşat la bitcoin: URI care va fi stocat cu tranzacţia pentru referinţa dvs. Notă: Acest mesaj nu va fi trimis către reţeaua bitcoin.</translation> </message> <message> <source>Pay To:</source> - <translation>Plateste catre:</translation> + <translation>Plăteşte către:</translation> </message> <message> <source>Memo:</source> @@ -1664,30 +1956,30 @@ Adresa: %4 <name>ShutdownWindow</name> <message> <source>Bitcoin Core is shutting down...</source> - <translation>Bitcoin Core se închide...</translation> + <translation>Nucleul Bitcoin se închide...</translation> </message> <message> <source>Do not shut down the computer until this window disappears.</source> - <translation>Nu închide calculatorul până ce această fereastră nu dispare.</translation> + <translation>Nu închide calculatorul pînă ce această fereastră nu dispare.</translation> </message> </context> <context> <name>SignVerifyMessageDialog</name> <message> <source>Signatures - Sign / Verify a Message</source> - <translation>Semnatura- Semneaza/verifica un mesaj</translation> + <translation>Semnaturi - Semnează/verifică un mesaj</translation> </message> <message> <source>&Sign Message</source> - <translation>Semneaza Mesajul</translation> + <translation>&Semnează mesaj</translation> </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>Puteti semna mesaje cu adresa dumneavoastra pentru a demostra ca sunteti proprietarul lor. Aveti grija sa nu semnati nimic vag, deoarece atacurile de tip phishing va pot pacali sa le transferati identitatea. Semnati numai declaratiile detaliate cu care sunteti deacord.</translation> + <source>The Bitcoin address to sign the message with</source> + <translation>Adresa cu care semnaţi mesajul</translation> </message> <message> <source>Choose previously used address</source> - <translation>Alegeti adrese folosite in prealabil</translation> + <translation>Alegeţi adrese folosite anterior</translation> </message> <message> <source>Alt+A</source> @@ -1695,7 +1987,7 @@ Adresa: %4 </message> <message> <source>Paste address from clipboard</source> - <translation>Lipiţi adresa copiată in clipboard.</translation> + <translation>Lipeşte adresa copiată din clipboard</translation> </message> <message> <source>Alt+P</source> @@ -1703,7 +1995,7 @@ Adresa: %4 </message> <message> <source>Enter the message you want to sign here</source> - <translation>Introduce mesajul pe care vrei sa il semnezi, aici.</translation> + <translation>Introduceţi mesajul pe care vreţi să-l semnaţi, aici</translation> </message> <message> <source>Signature</source> @@ -1711,106 +2003,106 @@ Adresa: %4 </message> <message> <source>Copy the current signature to the system clipboard</source> - <translation>Copiaza semnatura curenta in clipboard-ul sistemului</translation> + <translation>Copiază semnatura curentă în clipboard-ul sistemului</translation> </message> <message> <source>Sign the message to prove you own this Bitcoin address</source> - <translation>Semneaza mesajul pentru a dovedi ca detii acesta adresa Bitcoin</translation> + <translation>Semnează mesajul pentru a dovedi ca deţineţi acestă adresă Bitcoin</translation> </message> <message> <source>Sign &Message</source> - <translation>Semnează &Message</translation> + <translation>Semnează &mesaj</translation> </message> <message> <source>Reset all sign message fields</source> - <translation>Reseteaza toate spatiile mesajelor semnate.</translation> + <translation>Resetează toate cîmpurile mesajelor semnate</translation> </message> <message> <source>Clear &All</source> - <translation>Şterge &tot</translation> + <translation>Curăţă to&ate</translation> </message> <message> <source>&Verify Message</source> - <translation>Verifica mesajul</translation> + <translation>&Verifică mesaj</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>Introduceti adresa de semnatura, mesajul (asigurati-va ca ati copiat spatiile, taburile etc. exact) si semnatura dedesubt pentru a verifica mesajul. Aveti grija sa nu cititi mai mult in semnatura decat mesajul in sine, pentru a evita sa fiti pacaliti de un atac de tip man-in-the-middle.</translation> + <source>The Bitcoin address the message was signed with</source> + <translation>Introduceţi o adresă Bitcoin</translation> </message> <message> <source>Verify the message to ensure it was signed with the specified Bitcoin address</source> - <translation>Verifica mesajul pentru a fi sigur ca a fost semnat cu adresa Bitcoin specifica</translation> + <translation>Verificaţi mesajul pentru a vă asigura că a fost semnat cu adresa Bitcoin specificată</translation> </message> <message> <source>Verify &Message</source> - <translation>Verifică &Message</translation> + <translation>Verifică &mesaj</translation> </message> <message> <source>Reset all verify message fields</source> - <translation>Reseteaza toate spatiile mesajelor semnate.</translation> + <translation>Resetează toate cîmpurile mesajelor semnate</translation> </message> <message> <source>Click "Sign Message" to generate signature</source> - <translation>Click "Semneaza msajul" pentru a genera semnatura</translation> + <translation>Faceţi clic pe "Semneaza msaj" pentru a genera semnătura</translation> </message> <message> <source>The entered address is invalid.</source> - <translation>Adresa introdusa nu este valida</translation> + <translation>Adresa introdusă nu este validă</translation> </message> <message> <source>Please check the address and try again.</source> - <translation>Te rugam verifica adresa si introduce-o din nou</translation> + <translation>Vă rugăm verificaţi adresa şi încercaţi din nou.</translation> </message> <message> <source>The entered address does not refer to a key.</source> - <translation>Adresa introdusa nu se refera la o cheie.</translation> + <translation>Adresa introdusă nu se referă la o cheie.</translation> </message> <message> <source>Wallet unlock was cancelled.</source> - <translation>Blocarea portofelului a fost intrerupta</translation> + <translation>Blocarea portofelului a fost întreruptă.</translation> </message> <message> <source>Private key for the entered address is not available.</source> - <translation>Cheia privata pentru adresa introdusa nu este valida.</translation> + <translation>Cheia privată pentru adresa introdusă nu este validă.</translation> </message> <message> <source>Message signing failed.</source> - <translation>Semnarea mesajului a esuat</translation> + <translation>Semnarea mesajului nu a reuşit.</translation> </message> <message> <source>Message signed.</source> - <translation>Mesaj Semnat!</translation> + <translation>Mesaj semnat.</translation> </message> <message> <source>The signature could not be decoded.</source> - <translation>Aceasta semnatura nu a putut fi decodata</translation> + <translation>Această semnatură nu a putut fi decodată.</translation> </message> <message> <source>Please check the signature and try again.</source> - <translation>Verifica semnatura si incearca din nou</translation> + <translation>Vă rugăm verificaţi semnătura şi încercaţi din nou.</translation> </message> <message> <source>The signature did not match the message digest.</source> - <translation>Semnatura nu seamana!</translation> + <translation>Semnatura nu se potriveşte cu mesajul.</translation> </message> <message> <source>Message verification failed.</source> - <translation>Verificarea mesajului a esuat</translation> + <translation>Verificarea mesajului nu a reuşit.</translation> </message> <message> <source>Message verified.</source> - <translation>Mesaj verificat</translation> + <translation>Mesaj verificat.</translation> </message> </context> <context> <name>SplashScreen</name> <message> <source>Bitcoin Core</source> - <translation>Bitcoin Core</translation> + <translation>Nucleul Bitcoin</translation> </message> <message> <source>The Bitcoin Core developers</source> - <translation>Dezvoltatorii Bitcoin Core</translation> + <translation>Dezvoltatorii Nucleului Bitcoin</translation> </message> <message> <source>[testnet]</source> @@ -1828,7 +2120,11 @@ Adresa: %4 <name>TransactionDesc</name> <message> <source>Open until %1</source> - <translation>Deschis până la %1</translation> + <translation>Deschis pînă la %1</translation> + </message> + <message> + <source>conflicted</source> + <translation>în conflict</translation> </message> <message> <source>%1/offline</source> @@ -1872,7 +2168,11 @@ Adresa: %4 </message> <message> <source>own address</source> - <translation>Adresa posedata</translation> + <translation>adresa proprie</translation> + </message> + <message> + <source>watch-only</source> + <translation>doar-supraveghere</translation> </message> <message> <source>label</source> @@ -1888,15 +2188,23 @@ Adresa: %4 </message> <message> <source>not accepted</source> - <translation>nu este acceptat</translation> + <translation>neacceptat</translation> </message> <message> <source>Debit</source> <translation>Debit</translation> </message> <message> + <source>Total debit</source> + <translation>Total debit</translation> + </message> + <message> + <source>Total credit</source> + <translation>Total credit</translation> + </message> + <message> <source>Transaction fee</source> - <translation>Comisionul tranzacţiei</translation> + <translation>Taxă tranzacţie</translation> </message> <message> <source>Net amount</source> @@ -1908,11 +2216,11 @@ Adresa: %4 </message> <message> <source>Comment</source> - <translation>Comentarii</translation> + <translation>Comentariu</translation> </message> <message> <source>Transaction ID</source> - <translation>ID-ul tranzactiei</translation> + <translation>ID-ul tranzacţie</translation> </message> <message> <source>Merchant</source> @@ -1920,11 +2228,11 @@ Adresa: %4 </message> <message> <source>Generated coins must mature %1 blocks before they can be spent. When you generated this block, it was broadcast to the network to be added to the block chain. If it fails to get into the chain, its state will change to "not accepted" and it won't be spendable. This may occasionally happen if another node generates a block within a few seconds of yours.</source> - <translation>Monezile generate trebuie sa creasca %1 block-uri inainte sa poata fi cheltuite. Cand ati generat acest block, a fost transmis retelei pentru a fi adaugat la lantul de block-uri. Aceasta se poate intampla ocazional daca alt nod genereaza un block la numai cateva secunde de al tau.</translation> + <translation>Monezile generate trebuie să crească %1 blocuri înainte să poată fi cheltuite. Cînd aţi generat acest bloc, a fost transmis reţelei pentru a fi adaugat la lanţul de blocuri. Aceasta se poate întîmpla ocazional dacă alt nod generează un bloc la numai cîteva secunde de al dvs.</translation> </message> <message> <source>Debug information</source> - <translation>Informatii pentru debug</translation> + <translation>Informaţii pentru depanare</translation> </message> <message> <source>Transaction</source> @@ -1932,7 +2240,7 @@ Adresa: %4 </message> <message> <source>Inputs</source> - <translation>Intrari</translation> + <translation>Intrări</translation> </message> <message> <source>Amount</source> @@ -1940,11 +2248,11 @@ Adresa: %4 </message> <message> <source>true</source> - <translation>Adevarat!</translation> + <translation>adevărat</translation> </message> <message> <source>false</source> - <translation>Fals!</translation> + <translation>fals</translation> </message> <message> <source>, has not been successfully broadcast yet</source> @@ -1959,11 +2267,11 @@ Adresa: %4 <name>TransactionDescDialog</name> <message> <source>Transaction details</source> - <translation>Detaliile tranzacției</translation> + <translation>Detaliile tranzacţiei</translation> </message> <message> <source>This pane shows a detailed description of the transaction</source> - <translation>Acest panou afișează o descriere detaliată a tranzacției</translation> + <translation>Acest panou arată o descriere detaliată a tranzacţiei</translation> </message> </context> <context> @@ -1974,11 +2282,11 @@ Adresa: %4 </message> <message> <source>Type</source> - <translation>Tipul</translation> + <translation>Tip</translation> </message> <message> - <source>Address</source> - <translation>Adresa</translation> + <source>Immature (%1 confirmations, will be available after %2)</source> + <translation>Imatur (%1 confirmări, va fi disponibil după %2)</translation> </message> <message> <source>Open until %1</source> @@ -1990,7 +2298,7 @@ Adresa: %4 </message> <message> <source>This block was not received by any other nodes and will probably not be accepted!</source> - <translation>Acest bloc nu a fost recepționat de niciun alt nod și probabil nu va fi acceptat!</translation> + <translation>Acest bloc nu a fost recepţionat de nici un alt nod şi probabil nu va fi acceptat!</translation> </message> <message> <source>Generated but not accepted</source> @@ -2001,16 +2309,24 @@ Adresa: %4 <translation>Deconectat</translation> </message> <message> + <source>Label</source> + <translation>Etichetă</translation> + </message> + <message> <source>Unconfirmed</source> <translation>Neconfirmat</translation> </message> <message> <source>Confirming (%1 of %2 recommended confirmations)</source> - <translation>Confirmare (%1 dintre %2 confirmări recomandate)</translation> + <translation>Confirmare (%1 din %2 confirmări recomandate)</translation> + </message> + <message> + <source>Conflicted</source> + <translation>În conflict</translation> </message> <message> <source>Received with</source> - <translation>Recepționat cu</translation> + <translation>Recepţionat cu</translation> </message> <message> <source>Received from</source> @@ -2022,31 +2338,35 @@ Adresa: %4 </message> <message> <source>Payment to yourself</source> - <translation>Plată către tine</translation> + <translation>Plată către dvs.</translation> </message> <message> <source>Mined</source> - <translation>Produs</translation> + <translation>Minerit</translation> + </message> + <message> + <source>watch-only</source> + <translation>doar-supraveghere</translation> </message> <message> <source>(n/a)</source> - <translation>(n/a)</translation> + <translation>indisponibil</translation> </message> <message> <source>Transaction status. Hover over this field to show number of confirmations.</source> - <translation>Starea tranzacției. Treci cu mausul peste acest câmp pentru afișarea numărului de confirmări.</translation> + <translation>Starea tranzacţiei. Treceţi cu mouse-ul peste acest cîmp pentru afişarea numărului de confirmări.</translation> </message> <message> <source>Date and time that the transaction was received.</source> - <translation>Data și ora la care a fost recepționată tranzacția.</translation> + <translation>Data şi ora la care a fost recepţionată tranzacţia.</translation> </message> <message> <source>Type of transaction.</source> - <translation>Tipul tranzacției.</translation> + <translation>Tipul tranzacţiei.</translation> </message> <message> - <source>Destination address of transaction.</source> - <translation>Adresa de destinație a tranzacției.</translation> + <source>Whether or not a watch-only address is involved in this transaction.</source> + <translation>Indiferent dacă sau nu o adresă doar-suăpraveghere este implicată în această tranzacţie.</translation> </message> <message> <source>Amount removed from or added to balance.</source> @@ -2065,7 +2385,7 @@ Adresa: %4 </message> <message> <source>This week</source> - <translation>Săptămâna aceasta</translation> + <translation>Săptămîna aceasta</translation> </message> <message> <source>This month</source> @@ -2081,11 +2401,11 @@ Adresa: %4 </message> <message> <source>Range...</source> - <translation>Între...</translation> + <translation>Interval...</translation> </message> <message> <source>Received with</source> - <translation>Recepționat cu</translation> + <translation>Recepţionat cu</translation> </message> <message> <source>Sent to</source> @@ -2093,11 +2413,11 @@ Adresa: %4 </message> <message> <source>To yourself</source> - <translation>Către tine</translation> + <translation>Către dvs.</translation> </message> <message> <source>Mined</source> - <translation>Produs</translation> + <translation>Minerit</translation> </message> <message> <source>Other</source> @@ -2105,11 +2425,11 @@ Adresa: %4 </message> <message> <source>Enter address or label to search</source> - <translation>Introdu adresa sau eticheta pentru căutare</translation> + <translation>Introduceţi adresa sau eticheta pentru căutare</translation> </message> <message> <source>Min amount</source> - <translation>Cantitatea minimă</translation> + <translation>Suma minimă</translation> </message> <message> <source>Copy address</source> @@ -2125,7 +2445,7 @@ Adresa: %4 </message> <message> <source>Copy transaction ID</source> - <translation>Copiază ID tranzacție</translation> + <translation>Copiază ID tranzacţie</translation> </message> <message> <source>Edit label</source> @@ -2133,23 +2453,27 @@ Adresa: %4 </message> <message> <source>Show transaction details</source> - <translation>Arată detaliile tranzacției</translation> + <translation>Arată detaliile tranzacţiei</translation> </message> <message> <source>Export Transaction History</source> - <translation>Exportare Istoric Tranzacţii</translation> + <translation>Export istoric tranzacţii</translation> + </message> + <message> + <source>Watch-only</source> + <translation>Doar-supraveghere</translation> </message> <message> <source>Exporting Failed</source> - <translation>Exportare Eşuată</translation> + <translation>Export nereuşit</translation> </message> <message> <source>There was an error trying to save the transaction history to %1.</source> - <translation>S-a produs o eroare încercând să se salveze istoricul tranzacţiilor la %1.</translation> + <translation>S-a produs o eroare la salvarea istoricului tranzacţiilor la %1.</translation> </message> <message> <source>Exporting Successful</source> - <translation>Exportare Reuşită</translation> + <translation>Export reuşit</translation> </message> <message> <source>The transaction history was successfully saved to %1.</source> @@ -2157,7 +2481,7 @@ Adresa: %4 </message> <message> <source>Comma separated file (*.csv)</source> - <translation>Fișier text cu valori separate prin virgulă (*.csv)</translation> + <translation>Fişier text cu valori separate prin virgulă (*.csv)</translation> </message> <message> <source>Confirmed</source> @@ -2169,7 +2493,7 @@ Adresa: %4 </message> <message> <source>Type</source> - <translation>Tipul</translation> + <translation>Tip</translation> </message> <message> <source>Label</source> @@ -2194,34 +2518,38 @@ Adresa: %4 </context> <context> <name>UnitDisplayStatusBarControl</name> - </context> + <message> + <source>Unit to show amounts in. Click to select another unit.</source> + <translation>Unitatea în care sînt arătate sumele. Faceţi clic pentru a selecta o altă unitate.</translation> + </message> +</context> <context> <name>WalletFrame</name> <message> <source>No wallet has been loaded.</source> - <translation>Nu a fost încărcat niciun portofel.</translation> + <translation>Nu a fost încărcat nici un portofel.</translation> </message> </context> <context> <name>WalletModel</name> <message> <source>Send Coins</source> - <translation>Trimite Bitcoin</translation> + <translation>Trimitere bitcoin</translation> </message> </context> <context> <name>WalletView</name> <message> <source>&Export</source> - <translation>&Exportă</translation> + <translation>&Export</translation> </message> <message> <source>Export the data in the current tab to a file</source> - <translation>Exporta datele din tab-ul curent într-un fișier</translation> + <translation>Exportă datele din tab-ul curent într-un fişier</translation> </message> <message> <source>Backup Wallet</source> - <translation>Fă o copie de siguranță a portofelului</translation> + <translation>Copie de siguranţă portofel</translation> </message> <message> <source>Wallet Data (*.dat)</source> @@ -2229,11 +2557,11 @@ Adresa: %4 </message> <message> <source>Backup Failed</source> - <translation>Copia de rezerva a esuat</translation> + <translation>Copierea de siguranţă nu a reuşit</translation> </message> <message> <source>There was an error trying to save the wallet data to %1.</source> - <translation>S-a produs o eroare încercând să se salveze datele portofelului la %1.</translation> + <translation>S-a produs o eroare la salvarea datelor portofelului la %1.</translation> </message> <message> <source>The wallet data was successfully saved to %1.</source> @@ -2241,107 +2569,98 @@ Adresa: %4 </message> <message> <source>Backup Successful</source> - <translation>Copia de siguranță efectuată cu succes</translation> + <translation>Copie de siguranţă efectuată cu succes</translation> </message> </context> <context> <name>bitcoin-core</name> <message> <source>Options:</source> - <translation>Setări:</translation> + <translation>Opţiuni:</translation> </message> <message> <source>Specify data directory</source> - <translation>Specifică dosarul de date</translation> + <translation>Specificaţi dosarul de date</translation> </message> <message> <source>Connect to a node to retrieve peer addresses, and disconnect</source> - <translation>Conectează-te la nod pentru a obține adresele partenerilor, și apoi deconectează-te</translation> + <translation>Se conectează la un nod pentru a obţine adresele partenerilor, şi apoi se deconectează</translation> </message> <message> <source>Specify your own public address</source> - <translation>Specifică adresa ta publică</translation> + <translation>Specificaţi adresa dvs. publică</translation> </message> <message> <source>Accept command line and JSON-RPC commands</source> - <translation>Se acceptă comenzi din linia de comandă și comenzi JSON-RPC</translation> + <translation>Acceptă comenzi din linia de comandă şi comenzi JSON-RPC</translation> </message> <message> <source>Run in the background as a daemon and accept commands</source> - <translation>Rulează în fundal ca un demon și acceptă comenzi</translation> + <translation>Rulează în fundal ca un demon şi acceptă comenzi</translation> </message> <message> <source>Use the test network</source> - <translation>Utilizează rețeaua de test</translation> + <translation>Utilizează reţeaua de test</translation> </message> <message> <source>Accept connections from outside (default: 1 if no -proxy or -connect)</source> - <translation>Acceptă conexiuni din afară (implicit: 1 dacă nu se folosește -proxy sau -connect)</translation> - </message> - <message> - <source>%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>%s trebuie sa setezi o parola rpc in fisierul de configurare -%s -Este recomandat sa folosesti aceasta parola aleatorie: -rpcuser=bitcoinrpc -parola rpc=%s -(nu este necesar ca sa iti amintesti aceasta parola) -Numele de utilizator si parola NU trebuie sa fie la fel. -Daca fisierul nu exista, creaza-l cu fisier de citit permis doar proprietarului. -Este de asemenea recomandat sa setezi alerta de notificare ca sa primesti notificari ale problemelor; -spre exemplu: alertnotify=echo %%s | mail -s "Alerta Bitcoin" admin@foo.com - -</translation> + <translation>Acceptă conexiuni din afară (implicit: 1 dacă nu se foloseşte -proxy sau -connect)</translation> </message> <message> <source>Bind to given address and always listen on it. Use [host]:port notation for IPv6</source> - <translation>Atasati adresei date si ascultati totdeauna pe ea. Folositi [host]:port notatia pentru IPv6</translation> + <translation>Ataşaţi adresei date şi ascultaţi totdeauna pe ea. Folosiţi notaţia [host]:port pentru IPv6</translation> </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>Eroare: Tranzactia a fost respinsa! Acest lucru se poate intampla daca anumite monezi din portofelul dumneavoastra au fost deja cheltuite, deasemenea daca ati folosit o copie a fisierului wallet.dat si monezile au fost folosite in acea copie dar nu au fost marcate ca fiind folosite acolo.</translation> + <source>Distributed under the MIT software license, see the accompanying file COPYING or <http://www.opensource.org/licenses/mit-license.php>.</source> + <translation>Distribuit sub licenţa de programe MIT/X11, vezi fişierul însoţitor COPYING sau <http://www.opensource.org/licenses/mit-license.php>.</translation> </message> <message> - <source>Error: This transaction requires a transaction fee of at least %s because of its amount, complexity, or use of recently received funds!</source> - <translation>Eroare: Aceasta tranzactie necesita o taxa de cel putin %s din cauza sumei, complexitatii sau folosirii fondurilor recent primite!</translation> + <source>Enter regression test mode, which uses a special chain in which blocks can be solved instantly.</source> + <translation>Iniţiază modul de test regresie, care foloseşte un lanţ special în care blocurile pot fi rezolvate instantaneu.</translation> </message> <message> <source>Execute command when a wallet transaction changes (%s in cmd is replaced by TxID)</source> - <translation>Executati comanda cand o tranzactie a portofelului se schimba (%s in cmd este inlocuit de TxID)</translation> + <translation>Execută comanda cînd o tranzacţie a portofelului se schimbă (%s în cmd este înlocuit de TxID)</translation> + </message> + <message> + <source>In this mode -genproclimit controls how many blocks are generated immediately.</source> + <translation>În acest mod -genproclimit controlează cîte blocuri sînt generate imediat.</translation> + </message> + <message> + <source>Set the number of script verification threads (%u to %d, 0 = auto, <0 = leave that many cores free, default: %d)</source> + <translation>Setează numărul de thread-uri de verificare a script-urilor (%u la %d, 0 = auto, <0 = lasă atîtea nuclee libere, implicit: %d)</translation> </message> <message> <source>This is a pre-release test build - use at your own risk - do not use for mining or merchant applications</source> - <translation>Aceasta este o versiune de test preliminara - va asumati riscul folosind-o - nu folositi pentru minerit sau aplicatiile comerciantilor.</translation> + <translation>Aceasta este o versiune de test preliminară - vă asumaţi riscul folosind-o - nu folosiţi pentru minerit sau aplicaţiile comercianţilor</translation> + </message> + <message> + <source>Unable to bind to %s on this computer. Bitcoin Core is probably already running.</source> + <translation>Nu se poate lega la %s pe acest calculator. Nucleul Bitcoin probabil deja rulează.</translation> </message> <message> <source>Warning: -paytxfee is set very high! This is the transaction fee you will pay if you send a transaction.</source> - <translation>Atentie: setarea -paytxfee este foarte ridicata! Aceasta este taxa tranzactiei pe care o vei plati daca trimiti o tranzactie.</translation> + <translation>Atenţie: setarea -paytxfee este foarte mare! Aceasta este taxa tranzacţiei pe care o veţi plăti dacă trimiteţi o tranzacţie.</translation> </message> <message> <source>Warning: The network does not appear to fully agree! Some miners appear to be experiencing issues.</source> - <translation>Atentie: Reteaua nu pare sa fie deacord in totalitate! Aparent niste mineri au probleme. </translation> + <translation>Atenţie: Reţeaua nu pare să fie de acord în totalitate! Aparent nişte mineri au probleme.</translation> </message> <message> <source>Warning: We do not appear to fully agree with our peers! You may need to upgrade, or other nodes may need to upgrade.</source> - <translation>Atentie: Aparent, nu suntem deacord cu toti membrii nostri! Va trebui sa faci un upgrade, sau alte noduri ar necesita upgrade. </translation> + <translation>Atenţie: Aparent, nu sîntem de acord cu toţi partenerii noştri! Va trebui să faceţi o actualizare, sau alte noduri necesită actualizare.</translation> </message> <message> <source>Warning: error reading wallet.dat! All keys read correctly, but transaction data or address book entries might be missing or incorrect.</source> - <translation>Atentie: eroare la citirea fisierului wallet.dat! Toate cheile sunt citite corect, dar datele tranzactiei sau anumite intrari din agenda sunt incorecte sau lipsesc.</translation> + <translation>Atenţie: eroare la citirea fişierului wallet.dat! Toate cheile sînt citite corect, dar datele tranzactiei sau anumite intrări din agenda sînt incorecte sau lipsesc.</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> - <translation>Atentie: fisierul wallet.dat este corupt, date salvate! Fisierul original wallet.dat a fost salvat ca wallet.{timestamp}.bak in %s; daca balansul sau tranzactiile sunt incorecte ar trebui sa restaurati dintr-o copie de siguranta. </translation> + <translation>Atenţie: fişierul wallet.dat este corupt, date salvate! Fişierul original wallet.dat a fost salvat ca wallet.{timestamp}.bak in %s; dacă balansul sau tranzactiile sînt incorecte ar trebui să restauraţi dintr-o copie de siguranţă.</translation> + </message> + <message> + <source>(default: 1)</source> + <translation>(iniţial: 1)</translation> </message> <message> <source><category> can be:</source> @@ -2349,35 +2668,43 @@ spre exemplu: alertnotify=echo %%s | mail -s "Alerta Bitcoin" admin@foo.com </message> <message> <source>Attempt to recover private keys from a corrupt wallet.dat</source> - <translation>Încearcă recuperarea cheilor private dintr-un wallet.dat corupt</translation> + <translation>Încercare de recuperare a cheilor private dintr-un wallet.dat corupt</translation> </message> <message> <source>Block creation options:</source> - <translation>Optiuni creare block</translation> + <translation>Opţiuni creare bloc:</translation> </message> <message> <source>Connect only to the specified node(s)</source> - <translation>Conecteaza-te doar la nod(urile) specifice</translation> + <translation>Conectare doar la nod(urile) specificate</translation> + </message> + <message> + <source>Connection options:</source> + <translation>Opţiuni conexiune:</translation> </message> <message> <source>Corrupted block database detected</source> - <translation>Baza de date 'bloc' defectată a fost detectată</translation> + <translation>Bloc defect din baza de date detectat</translation> + </message> + <message> + <source>Debugging/Testing options:</source> + <translation>Opţiuni Depanare/Test:</translation> </message> <message> - <source>Discover own IP address (default: 1 when listening and no -externalip)</source> - <translation>Descopera propria ta adresa IP (intial: 1)</translation> + <source>Do not load the wallet and disable wallet RPC calls</source> + <translation>Nu încarcă portofelul şi dezactivează solicitările portofel RPC</translation> </message> <message> <source>Do you want to rebuild the block database now?</source> - <translation>Doriți să reconstruiți baza de date 'bloc' acum?</translation> + <translation>Doriţi să reconstruiţi baza de date blocuri acum?</translation> </message> <message> <source>Error initializing block database</source> - <translation>Eroare la inițializarea bazei de date de blocuri</translation> + <translation>Eroare la iniţializarea bazei de date de blocuri</translation> </message> <message> <source>Error initializing wallet database environment %s!</source> - <translation>Eroare la initializarea mediului de baza de date a portofelului %s!</translation> + <translation>Eroare la iniţializarea mediului de bază de date a portofelului %s!</translation> </message> <message> <source>Error loading block database</source> @@ -2389,43 +2716,55 @@ spre exemplu: alertnotify=echo %%s | mail -s "Alerta Bitcoin" admin@foo.com </message> <message> <source>Error: Disk space is low!</source> - <translation>Eroare: Spațiu pe disc redus!</translation> + <translation>Eroare: Spaţiu pe disc redus!</translation> </message> <message> - <source>Error: Wallet locked, unable to create transaction!</source> - <translation>Eroare: Portofel blocat, nu se poate crea o tranzacție!</translation> + <source>Failed to listen on any port. Use -listen=0 if you want this.</source> + <translation>Nu s-a reuşit ascultarea pe orice port. Folosiţi -listen=0 dacă vreţi asta.</translation> </message> <message> - <source>Failed to listen on any port. Use -listen=0 if you want this.</source> - <translation>Am esuat ascultarea pe orice port. Folositi -listen=0 daca vreti asta.</translation> + <source>If <category> is not supplied, output all debugging information.</source> + <translation>Dacă <category> nu este furnizat, produce toate informaţiile de depanare.</translation> + </message> + <message> + <source>Importing...</source> + <translation>Import...</translation> </message> <message> <source>Incorrect or no genesis block found. Wrong datadir for network?</source> - <translation>Incorect sau nici un bloc de Geneza găsite. Directorul de retea greşit?</translation> + <translation>Incorect sau nici un bloc de geneza găsit. Directorul de retea greşit?</translation> </message> <message> <source>Invalid -onion address: '%s'</source> - <translation>Adresa -onion invalidă: '%s'</translation> + <translation>Adresa -onion nevalidă: '%s'</translation> </message> <message> <source>Not enough file descriptors available.</source> - <translation>Nu sunt destule descriptoare disponibile.</translation> + <translation>Nu sînt destule descriptoare disponibile.</translation> + </message> + <message> + <source>Only connect to nodes in network <net> (ipv4, ipv6 or onion)</source> + <translation>Se conectează doar la noduri în reţeaua <net> (ipv4, ipv6 sau onion)</translation> </message> <message> - <source>Rebuild block chain index from current blk000??.dat files</source> - <translation>Reconstruirea indexului lantului de block-uri din fisierele actuale blk000???.dat</translation> + <source>Set database cache size in megabytes (%d to %d, default: %d)</source> + <translation>Setează mărimea bazei de date cache în megaocteţi (%d la %d, implicit: %d)</translation> </message> <message> <source>Set maximum block size in bytes (default: %d)</source> - <translation>Setaţi dimensiunea maximă a unui block în bytes (implicit: %d)</translation> + <translation>Setaţi dimensiunea maximă a unui bloc în bytes (implicit: %d)</translation> </message> <message> <source>Specify wallet file (within data directory)</source> - <translation>Specifică fișierul wallet (în dosarul de date)</translation> + <translation>Specifică fişierul portofel (în dosarul de date)</translation> </message> <message> <source>This is intended for regression testing tools and app development.</source> - <translation>Este folosita pentru programe de testare a regresiei in algoritmi si dezvoltare de alte aplicatii. </translation> + <translation>Este folosită pentru programe de testare a regresiei în algoritmi şi dezvoltare de alte aplicaţii.</translation> + </message> + <message> + <source>Use UPnP to map the listening port (default: %u)</source> + <translation>Foloseşte mapare UPnP pentru asculatere port (implicit: %u)</translation> </message> <message> <source>Verifying blocks...</source> @@ -2441,83 +2780,215 @@ spre exemplu: alertnotify=echo %%s | mail -s "Alerta Bitcoin" admin@foo.com </message> <message> <source>Wallet options:</source> - <translation>Optiuni de portofel</translation> + <translation>Opţiuni portofel:</translation> </message> <message> <source>You need to rebuild the database using -reindex to change -txindex</source> - <translation>Trebuie să reconstruiești baza de date folosind -reindex pentru a schimba -txindex</translation> + <translation>Trebuie să reconstruiţi baza de date folosind -reindex pentru a schimba -txindex</translation> </message> <message> <source>Imports blocks from external blk000??.dat file</source> - <translation>Importă blocuri dintr-un fișier extern blk000??.dat</translation> + <translation>Importă blocuri dintr-un fişier extern blk000??.dat</translation> + </message> + <message> + <source>Allow JSON-RPC connections from specified source. Valid for <ip> are a single IP (e.g. 1.2.3.4), a network/netmask (e.g. 1.2.3.4/255.255.255.0) or a network/CIDR (e.g. 1.2.3.4/24). This option can be specified multiple times</source> + <translation>Permite conexiunile JSON-RPC din sursa specificată. Valid pentru <ip> sînt IP singulare (ex. 1.2.3.4), o reţea/mască-reţea (ex. 1.2.3.4/255.255.255.0) sau o reţea/CIDR (ex. 1.2.3.4/24). Această opţiune poate fi specificată de mai multe ori</translation> + </message> + <message> + <source>An error occurred while setting up the RPC address %s port %u for listening: %s</source> + <translation>A apărut o eroare la setarea adresei RPC %s portul %u pentru ascultare: %s</translation> + </message> + <message> + <source>Cannot obtain a lock on data directory %s. Bitcoin Core is probably already running.</source> + <translation>Nu se poate obţine blocarea folderului cu date %s. Nucleul Bitcoin probabil deja rulează.</translation> </message> <message> <source>Execute command when a relevant alert is received or we see a really long fork (%s in cmd is replaced by message)</source> - <translation>Executati comanda cand o alerta relevanta este primita sau vedem o bifurcatie foarte lunga (%s in cmd este inlocuti de mesaj)</translation> + <translation>Execută comanda cînd o alertă relevantă este primită sau vedem o bifurcaţie foarte lungă (%s în cmd este înlocuit de mesaj)</translation> + </message> + <message> + <source>Set maximum size of high-priority/low-fee transactions in bytes (default: %d)</source> + <translation>Setează mărimea pentru tranzacţiile prioritare/taxe mici în octeţi (implicit: %d)</translation> + </message> + <message> + <source>This product includes software developed by the OpenSSL Project for use in the OpenSSL Toolkit <https://www.openssl.org/> and cryptographic software written by Eric Young and UPnP software written by Thomas Bernard.</source> + <translation>Acest produs include programe dezvoltate de către Proiectul OpenSSL pentru a fi folosite în OpenSSL Toolkit <https://www.openssl.org/> şi programe criptografice scrise de către Eric Young şi programe UPnP scrise de către Thomas Bernard.</translation> + </message> + <message> + <source>Accept public REST requests (default: %u)</source> + <translation>Acceptă cererile publice REST (implicit: %u)</translation> + </message> + <message> + <source>Choose data directory on startup (default: 0)</source> + <translation>Alege dosarul de date la pornire (implicit: 0)</translation> + </message> + <message> + <source>Connect through SOCKS5 proxy</source> + <translation>Conectare prin proxy SOCKS5</translation> + </message> + <message> + <source>Copyright (C) 2009-%i The Bitcoin Core Developers</source> + <translation>Copyright (C) 2009-%i Dezvoltatorii Bitcoin</translation> + </message> + <message> + <source>Error reading from database, shutting down.</source> + <translation>Eroare la citirea bazei de date. Oprire.</translation> + </message> + <message> + <source>Error: Unsupported argument -tor found, use -onion.</source> + <translation>Eroare: Argument nesuportat -tor găsit, folosiţi -onion.</translation> + </message> + <message> + <source>Fee (in BTC/kB) to add to transactions you send (default: %s)</source> + <translation>Taxa (în BTC/kB) de adăugat la tranzacţiile pe care le trimiteţi(implicit: %s)</translation> </message> <message> <source>Information</source> - <translation>Informație</translation> + <translation>Informaţie</translation> + </message> + <message> + <source>Initialization sanity check failed. Bitcoin Core is shutting down.</source> + <translation>Nu s-a reuşit iniţierea verificării sănătăţii. Nucleul Bitcoin se opreşte.</translation> + </message> + <message> + <source>Invalid amount for -maxtxfee=<amount>: '%s'</source> + <translation>Sumă nevalidă pentru -maxtxfee=<suma>: '%s'</translation> </message> <message> <source>Invalid amount for -minrelaytxfee=<amount>: '%s'</source> - <translation>Suma invalida pentru -minrelaytxfee=<suma>:'%s'</translation> + <translation>Sumă nevalidă pentru -minrelaytxfee=<suma>:'%s'</translation> </message> <message> <source>Invalid amount for -mintxfee=<amount>: '%s'</source> - <translation>Suma invalida pentru -mintxfee=<suma>: '%s'</translation> + <translation>Sumă nevalidă pentru -mintxfee=<suma>: '%s'</translation> + </message> + <message> + <source>Invalid amount for -paytxfee=<amount>: '%s' (must be at least %s)</source> + <translation>Sumă nevalidă pentru -paytxfee=<suma>: '%s' (trebuie să fie cel puţin %s)</translation> + </message> + <message> + <source>Invalid netmask specified in -whitelist: '%s'</source> + <translation>Mască reţea nevalidă specificată în -whitelist: '%s'</translation> + </message> + <message> + <source>Need to specify a port with -whitebind: '%s'</source> + <translation>Trebuie să specificaţi un port cu -whitebind: '%s'</translation> + </message> + <message> + <source>RPC SSL options: (see the Bitcoin Wiki for SSL setup instructions)</source> + <translation>Opţiuni RPC SSL: (vedeţi Wiki Bitcoin pentru intrucţiunile de setare SSL)</translation> + </message> + <message> + <source>RPC server options:</source> + <translation>Opţiuni server RPC:</translation> </message> <message> - <source>Print block on startup, if found in block index</source> - <translation>Publica bloc la pornire daca exista in index-ul de blocuri. </translation> + <source>RPC support for HTTP persistent connections (default: %d)</source> + <translation>RPC suportă pentru HTTP conexiuni persistente (implicit: %d)</translation> + </message> + <message> + <source>Randomly drop 1 of every <n> network messages</source> + <translation>Aleator sccapă 1 din fiecare <n> mesaje ale reţelei</translation> + </message> + <message> + <source>Randomly fuzz 1 of every <n> network messages</source> + <translation>Aleator aproximează 1 din fiecare <n> mesaje ale reţelei</translation> </message> <message> <source>Send trace/debug info to console instead of debug.log file</source> - <translation>Trimite informațiile trace/debug la consolă în locul fișierului debug.log</translation> + <translation>Trimite informaţiile trace/debug la consolă în locul fişierului debug.log</translation> + </message> + <message> + <source>Send transactions as zero-fee transactions if possible (default: %u)</source> + <translation>Trimitere tranzacţii ca tranzacţii taxă-zero dacă este posibil (implicit: %u)</translation> + </message> + <message> + <source>Set SSL root certificates for payment request (default: -system-)</source> + <translation>Setare rădăcină certificat SSL pentru cerere de plată (implicit: -sistem- )</translation> + </message> + <message> + <source>Set language, for example "de_DE" (default: system locale)</source> + <translation>Setează limba, de exemplu: "de_DE" (implicit: sistem local)</translation> + </message> + <message> + <source>Show all debugging options (usage: --help -help-debug)</source> + <translation>Arată toate opţiunile de depanare (uz: --help -help-debug)</translation> + </message> + <message> + <source>Show splash screen on startup (default: 1)</source> + <translation>Afişează pe ecran splash la pornire (implicit: 1)</translation> </message> <message> <source>Shrink debug.log file on client startup (default: 1 when no -debug)</source> - <translation>Micsorati fisierul debug.log la inceperea clientului (implicit: 1 cand nu -debug)</translation> + <translation>Micşorează fişierul debug.log la pornirea clientului (implicit: 1 cînd nu se foloseşte -debug)</translation> </message> <message> <source>Signing transaction failed</source> - <translation>Semnarea tranzacției a eșuat</translation> + <translation>Nu s-a reuşit semnarea tranzacţiei</translation> + </message> + <message> + <source>Start minimized</source> + <translation>Începe minimizat</translation> + </message> + <message> + <source>This is experimental software.</source> + <translation>Acesta este un program experimental.</translation> </message> <message> <source>Transaction amount too small</source> - <translation>Suma tranzacționată este prea mică</translation> + <translation>Suma tranzacţionată este prea mică</translation> </message> <message> <source>Transaction amounts must be positive</source> - <translation>Sumele tranzacționate trebuie să fie pozitive</translation> + <translation>Sumele tranzacţionate trebuie să fie pozitive</translation> + </message> + <message> + <source>Transaction too large for fee policy</source> + <translation>Tranzacţie prea mare pentru politică gratis</translation> </message> <message> <source>Transaction too large</source> - <translation>Tranzacția este prea mare</translation> + <translation>Tranzacţie prea mare</translation> + </message> + <message> + <source>Unable to bind to %s on this computer (bind returned error %s)</source> + <translation>Nu se poate lega la %s pe acest calculator. (Legarea a întors eroarea %s)</translation> </message> <message> <source>Use UPnP to map the listening port (default: 1 when listening)</source> - <translation>Foloseste UPnP pentru a vedea porturile (initial: 1 cand listezi)</translation> + <translation>Foloseşte UPnP pentru a vedea porturile (implicit: 1 cînd ascultă)</translation> </message> <message> <source>Username for JSON-RPC connections</source> <translation>Utilizator pentru conexiunile JSON-RPC</translation> </message> <message> + <source>Wallet needed to be rewritten: restart Bitcoin Core to complete</source> + <translation>Portofelul necesită rescrierea: reporniţi Nucleul Bitcoin pentru completare</translation> + </message> + <message> <source>Warning</source> - <translation>Avertizare</translation> + <translation>Avertisment</translation> + </message> + <message> + <source>Warning: Unsupported argument -benchmark ignored, use -debug=bench.</source> + <translation>Avertisment: Argument nesuportat -benchmark ignorat, folosiţi -debug=bench.</translation> + </message> + <message> + <source>Warning: Unsupported argument -debugnet ignored, use -debug=net.</source> + <translation>Avertisment: Argument nesuportat -debugnet ignorat, folosiţi -debug=net.</translation> </message> <message> - <source>Warning: This version is obsolete, upgrade required!</source> - <translation>Atenție: această versiune este depășită, este necesară actualizarea!</translation> + <source>Zapping all transactions from wallet...</source> + <translation>Şterge toate tranzacţiile din portofel...</translation> </message> <message> <source>on startup</source> - <translation>in timpul pornirii</translation> + <translation>la pornire</translation> </message> <message> <source>wallet.dat corrupt, salvage failed</source> - <translation>wallet.dat corupt, recuperare eșuată</translation> + <translation>wallet.dat corupt, salvare nereuşită</translation> </message> <message> <source>Password for JSON-RPC connections</source> @@ -2525,7 +2996,7 @@ spre exemplu: alertnotify=echo %%s | mail -s "Alerta Bitcoin" admin@foo.com </message> <message> <source>Execute command when the best block changes (%s in cmd is replaced by block hash)</source> - <translation>Execută comanda când cel mai bun bloc se modifică (%s în cmd este înlocuit cu hash-ul blocului)</translation> + <translation>Execută comanda cînd cel mai bun bloc se modifică (%s în cmd este înlocuit cu hash-ul blocului)</translation> </message> <message> <source>Upgrade wallet to latest format</source> @@ -2533,11 +3004,11 @@ spre exemplu: alertnotify=echo %%s | mail -s "Alerta Bitcoin" admin@foo.com </message> <message> <source>Rescan the block chain for missing wallet transactions</source> - <translation>Rescanează lanțul de bloc pentru tranzacțiile portofel lipsă</translation> + <translation>Rescanează lanţul de bloc pentru tranzacţiile portofel lipsă</translation> </message> <message> <source>Use OpenSSL (https) for JSON-RPC connections</source> - <translation>Folosește OpenSSL (https) pentru conexiunile JSON-RPC</translation> + <translation>Foloseşte OpenSSL (https) pentru conexiunile JSON-RPC</translation> </message> <message> <source>This help message</source> @@ -2545,27 +3016,75 @@ spre exemplu: alertnotify=echo %%s | mail -s "Alerta Bitcoin" admin@foo.com </message> <message> <source>Allow DNS lookups for -addnode, -seednode and -connect</source> - <translation>Permite căutări DNS pentru -addnode, -seednode și -connect</translation> + <translation>Permite căutări DNS pentru -addnode, -seednode şi -connect</translation> </message> <message> <source>Loading addresses...</source> - <translation>Încarc adrese...</translation> + <translation>Încărcare adrese...</translation> </message> <message> <source>Error loading wallet.dat: Wallet corrupted</source> <translation>Eroare la încărcarea wallet.dat: Portofel corupt</translation> </message> <message> + <source>Flush database activity from memory pool to disk log every <n> megabytes (default: %u)</source> + <translation>Goleşte baza de date a activităţii din memoria pool în jurnal pe disc la fiecare <n> megaocteţi (implicit: %u)</translation> + </message> + <message> + <source>Output debugging information (default: %u, supplying <category> is optional)</source> + <translation>Produce toate informaţiile de depanare (implicit: %u <category> furnizată este opţională)</translation> + </message> + <message> + <source>(default: %s)</source> + <translation>(implicit: %s)</translation> + </message> + <message> + <source>Acceptable ciphers (default: %s)</source> + <translation>Cifruri acceptabile (implicit: %s)</translation> + </message> + <message> <source>Error loading wallet.dat</source> <translation>Eroare la încărcarea wallet.dat</translation> </message> <message> + <source>Force safe mode (default: %u)</source> + <translation>Forţează mod sigur (implicit: %u)</translation> + </message> + <message> + <source>Generate coins (default: %u)</source> + <translation>Generează monede (implicit: %u)</translation> + </message> + <message> + <source>How many blocks to check at startup (default: %u, 0 = all)</source> + <translation>Cîte blocuri verifică la pornire (implicit: %u, 0 = toate)</translation> + </message> + <message> <source>Invalid -proxy address: '%s'</source> <translation>Adresa -proxy nevalidă: '%s'</translation> </message> <message> + <source>Server certificate file (default: %s)</source> + <translation>Fişierul certificat al serverului (implicit: %s)</translation> + </message> + <message> + <source>Server private key (default: %s)</source> + <translation>Cheia privată a serverului (implicit: %s)</translation> + </message> + <message> + <source>Set minimum block size in bytes (default: %u)</source> + <translation>Setare mărime minimă bloc în octeţi (implicit: %u)</translation> + </message> + <message> + <source>Specify configuration file (default: %s)</source> + <translation>Specificaţi fişierul configuraţie (implicit: %s)</translation> + </message> + <message> + <source>Specify pid file (default: %s)</source> + <translation>Specifică fişierul pid (implicit: %s)</translation> + </message> + <message> <source>Unknown network specified in -onlynet: '%s'</source> - <translation>Rețeaua specificată în -onlynet este necunoscută: '%s'</translation> + <translation>Reţeaua specificată în -onlynet este necunoscută: '%s'</translation> </message> <message> <source>Cannot resolve -bind address: '%s'</source> @@ -2580,24 +3099,20 @@ spre exemplu: alertnotify=echo %%s | mail -s "Alerta Bitcoin" admin@foo.com <translation>Suma nevalidă pentru -paytxfee=<amount>: '%s'</translation> </message> <message> - <source>Invalid amount</source> - <translation>Sumă nevalidă</translation> - </message> - <message> <source>Insufficient funds</source> <translation>Fonduri insuficiente</translation> </message> <message> <source>Loading block index...</source> - <translation>Încarc indice bloc...</translation> + <translation>Încărcare index bloc...</translation> </message> <message> <source>Add a node to connect to and attempt to keep the connection open</source> - <translation>Adaugă un nod la care te poți conecta pentru a menține conexiunea deschisă</translation> + <translation>Adaugă un nod la care te poţi conecta pentru a menţine conexiunea deschisă</translation> </message> <message> <source>Loading wallet...</source> - <translation>Încarc portofel...</translation> + <translation>Încărcare portofel...</translation> </message> <message> <source>Cannot downgrade wallet</source> @@ -2609,17 +3124,13 @@ spre exemplu: alertnotify=echo %%s | mail -s "Alerta Bitcoin" admin@foo.com </message> <message> <source>Rescanning...</source> - <translation>Rescanez...</translation> + <translation>Rescanare...</translation> </message> <message> <source>Done loading</source> <translation>Încărcare terminată</translation> </message> <message> - <source>To use the %s option</source> - <translation>Pentru a folosi opțiunea %s</translation> - </message> - <message> <source>Error</source> <translation>Eroare</translation> </message> diff --git a/src/qt/locale/bitcoin_ru.ts b/src/qt/locale/bitcoin_ru.ts index 55986d4092..30d44b090f 100644 --- a/src/qt/locale/bitcoin_ru.ts +++ b/src/qt/locale/bitcoin_ru.ts @@ -1,9 +1,9 @@ -<TS language="ru" version="2.0"> +<TS language="ru" version="2.1"> <context> <name>AddressBookPage</name> <message> - <source>Double-click to edit address or label</source> - <translation>Для того, чтобы изменить адрес или метку, дважды кликните по изменяемому объекту</translation> + <source>Right-click to edit address or label</source> + <translation>Клик правой кнопкой для редактирования адреса или метки</translation> </message> <message> <source>Create a new address</source> @@ -152,10 +152,6 @@ <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> @@ -184,10 +180,6 @@ <translation>Введите новый пароль бумажника.<br/>Используйте пароль, состоящий из <b>десяти или более случайных символов</b>, или <b>восьми или более слов</b>.</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> @@ -307,10 +299,6 @@ <translation>Отправить монеты на указанный адрес Bitcoin</translation> </message> <message> - <source>Modify configuration options for Bitcoin</source> - <translation>Изменить параметры конфигурации Bitcoin</translation> - </message> - <message> <source>Backup wallet to another location</source> <translation>Сделать резервную копию бумажника в другом месте</translation> </message> @@ -412,40 +400,20 @@ </message> <message> <source>&Command-line options</source> - <translation>&Пармаетры командной строки</translation> + <translation>&Параметры командной строки</translation> </message> <message> <source>Show the Bitcoin Core help message to get a list with possible Bitcoin command-line options</source> <translation>Показать помощь по Bitcoin Core и получить список доступных параметров командной строки.</translation> </message> - <message numerus="yes"> - <source>%n active connection(s) to Bitcoin network</source> - <translation><numerusform>%n активное соединение с сетью</numerusform><numerusform>%n активных соединений с сетью</numerusform><numerusform>%n активных соединений с сетью Bitcoin</numerusform></translation> - </message> <message> <source>No block source available...</source> <translation>Источник блоков недоступен...</translation> </message> - <message numerus="yes"> - <source>%n hour(s)</source> - <translation><numerusform>%n час</numerusform><numerusform>%n часа</numerusform><numerusform>%n часов</numerusform></translation> - </message> - <message numerus="yes"> - <source>%n day(s)</source> - <translation><numerusform>%n день</numerusform><numerusform>%n дня</numerusform><numerusform>%n дней</numerusform></translation> - </message> - <message numerus="yes"> - <source>%n week(s)</source> - <translation><numerusform>%n неделя</numerusform><numerusform>%n недели</numerusform><numerusform>%n недель</numerusform></translation> - </message> <message> <source>%1 and %2</source> <translation>%1 и %2</translation> </message> - <message numerus="yes"> - <source>%n year(s)</source> - <translation><numerusform>%n год</numerusform><numerusform>%n лет</numerusform><numerusform>%n года</numerusform></translation> - </message> <message> <source>%1 behind</source> <translation>%1 позади</translation> @@ -474,10 +442,6 @@ <source>Up to date</source> <translation>Синхронизировано</translation> </message> - <message numerus="yes"> - <source>Processed %n blocks of transaction history.</source> - <translation><numerusform>Обработан %n блок истории транзакций.</numerusform><numerusform>Обработано %n блока истории транзакций.</numerusform><numerusform>Обработано %n блоков истории транзакций.</numerusform></translation> - </message> <message> <source>Catching up...</source> <translation>Синхронизируется...</translation> @@ -491,18 +455,6 @@ <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> @@ -705,10 +657,6 @@ Address: %4 <translation>нет</translation> </message> <message> - <source>This label turns red, if the transaction size is greater than 1000 bytes.</source> - <translation>Эта пометка становится красной, если размер транзакции больше 1000 байт.</translation> - </message> - <message> <source>This means a fee of at least %1 per kB is required.</source> <translation>Это значит, что требуется комиссия как минимум %1 на КБ.</translation> </message> @@ -721,14 +669,6 @@ Address: %4 <translation>Транзакции с более высоким приоритетом будут вероятнее других включены в блок.</translation> </message> <message> - <source>This label turns red, if the priority is smaller than "medium".</source> - <translation>Эта пометка становится красной, если приоритет ниже, чем "средний".</translation> - </message> - <message> - <source>This label turns red, if any recipient receives an amount smaller than %1.</source> - <translation>Эта пометка становится красной, если какой-либо из адресатов получает сумму менее %1.</translation> - </message> - <message> <source>(no label)</source> <translation>[нет метки]</translation> </message> @@ -849,30 +789,6 @@ Address: %4 <source>command-line options</source> <translation>параметры командной строки</translation> </message> - <message> - <source>UI options</source> - <translation>Настройки интерфейса</translation> - </message> - <message> - <source>Set language, for example "de_DE" (default: system locale)</source> - <translation>Выберите язык, например "de_DE" (по умолчанию: как в системе)</translation> - </message> - <message> - <source>Start minimized</source> - <translation>Запускать свёрнутым</translation> - </message> - <message> - <source>Set SSL root certificates for payment request (default: -system-)</source> - <translation>Указать корневые SSL-сертификаты для запроса платежа (по умолчанию: -system-)</translation> - </message> - <message> - <source>Show splash screen on startup (default: 1)</source> - <translation>Показывать сплэш при запуске (по умолчанию: 1)</translation> - </message> - <message> - <source>Choose data directory on startup (default: 0)</source> - <translation>Выбрать каталог данных при запуске (по умолчанию: 0)</translation> - </message> </context> <context> <name>Intro</name> @@ -912,15 +828,7 @@ Address: %4 <source>Error</source> <translation>Ошибка</translation> </message> - <message numerus="yes"> - <source>%n GB of free space available</source> - <translation><numerusform>%nГБ свободного места доступно</numerusform><numerusform>%nГБ свободного места доступно</numerusform><numerusform>%nГБ свободного места доступно</numerusform></translation> - </message> - <message numerus="yes"> - <source>(of %n GB needed)</source> - <translation><numerusform>(из необходимых %nГБ)</numerusform><numerusform>(из необходимых %nГБ)</numerusform><numerusform>(из необходимых %nГБ)</numerusform></translation> - </message> -</context> + </context> <context> <name>OpenURIDialog</name> <message> @@ -955,14 +863,6 @@ Address: %4 <translation>&Главная</translation> </message> <message> - <source>Automatically start Bitcoin after logging in to the system.</source> - <translation>Автоматически запускать Bitcoin после входа в систему</translation> - </message> - <message> - <source>&Start Bitcoin on system login</source> - <translation>&Запускать Bitcoin при входе в систему</translation> - </message> - <message> <source>Size of &database cache</source> <translation>Размер кэша &БД</translation> </message> @@ -1075,10 +975,6 @@ Address: %4 <translation>&Cворачивать в системный лоток вместо панели задач</translation> </message> <message> - <source>Minimize instead of exit the application when the window is closed. When this option is enabled, the application will be closed only after selecting Quit in the menu.</source> - <translation>Сворачивать вместо закрытия. Если данная опция будет выбрана — приложение закроется только после выбора соответствующего пункта в меню.</translation> - </message> - <message> <source>M&inimize on close</source> <translation>С&ворачивать при закрытии</translation> </message> @@ -1091,10 +987,6 @@ Address: %4 <translation>&Язык интерфейса:</translation> </message> <message> - <source>The user interface language can be set here. This setting will take effect after restarting Bitcoin.</source> - <translation>Здесь можно выбрать язык интерфейса. Настройки вступят в силу после перезапуска Bitcoin.</translation> - </message> - <message> <source>&Unit to show amounts in:</source> <translation>&Отображать суммы в единицах: </translation> </message> @@ -1131,10 +1023,6 @@ Address: %4 <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>Это изменение потребует перезапуска клиента.</translation> </message> @@ -1241,10 +1129,6 @@ Address: %4 <translation>Сеть запроса платежа не совпадает с сетью клиента.</translation> </message> <message> - <source>Payment request has expired.</source> - <translation>Запрос платежа просрочен.</translation> - </message> - <message> <source>Payment request is not initialized.</source> <translation>Запрос платежа не инициализирован.</translation> </message> @@ -1285,6 +1169,14 @@ Address: %4 <translation>Возврат от %1</translation> </message> <message> + <source>Payment request %1 is too large (%2 bytes, allowed %3 bytes).</source> + <translation>Запрос платежа %1 слишком большой (%2 байтов, разрешено %3 байтов).</translation> + </message> + <message> + <source>Payment request DoS protection</source> + <translation>DoS-защита запроса платежа</translation> + </message> + <message> <source>Error communicating with %1: %2</source> <translation>Ошибка связи с %1: %2</translation> </message> @@ -1312,10 +1204,6 @@ Address: %4 <translation>Юзер-агент</translation> </message> <message> - <source>Address/Hostname</source> - <translation>Адрес/имя хоста</translation> - </message> - <message> <source>Ping Time</source> <translation>Время задержки</translation> </message> @@ -1347,14 +1235,6 @@ Address: %4 <translation>%1 с</translation> </message> <message> - <source>NETWORK</source> - <translation>СЕТЬ</translation> - </message> - <message> - <source>UNKNOWN</source> - <translation>НЕИЗВЕСТНЫЙ</translation> - </message> - <message> <source>None</source> <translation>Ничего</translation> </message> @@ -1450,7 +1330,7 @@ Address: %4 </message> <message> <source>Sent</source> - <translation>посланный</translation> + <translation>Отправлено</translation> </message> <message> <source>&Peers</source> @@ -1553,18 +1433,10 @@ Address: %4 <translation>Отладочный лог-файл</translation> </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>Открыть отладочный лог-файл Bitcoin из текущего каталога данных. Это может занять несколько секунд для больших лог-файлов.</translation> - </message> - <message> <source>Clear console</source> <translation>Очистить консоль</translation> </message> <message> - <source>Welcome to the Bitcoin RPC console.</source> - <translation>Добро пожаловать в RPC-консоль Bitcoin.</translation> - </message> - <message> <source>Use up and down arrows to navigate history, and <b>Ctrl-L</b> to clear screen.</source> <translation>Используйте стрелки вверх и вниз для просмотра истории и <b>Ctrl-L</b> для очистки экрана.</translation> </message> @@ -1853,14 +1725,6 @@ Address: %4 <translation>Свернуть настройки комиссии</translation> </message> <message> - <source>Minimize</source> - <translation>Сворачивать</translation> - </message> - <message> - <source>If the custom fee is set to 1000 satoshis and the transaction is only 250 bytes, then "per kilobyte" only pays 250 satoshis in fee, while "at least" pays 1000 satoshis. For transactions bigger than a kilobyte both pay by kilobyte.</source> - <translation>Если комиссия установлена в 1000 сатоши, а транзакция составляет лишь 250 байт, тогда комиссия "на килобайт" составит 250 сатоши, а "как минимум" — 1000 сатоши. Для транзакций крупнее килобайта в обоих случаях будет использоваться платёж "на килобайт".</translation> - </message> - <message> <source>per kilobyte</source> <translation>за килобайт</translation> </message> @@ -1989,10 +1853,6 @@ Address: %4 <translation>или</translation> </message> <message> - <source>The recipient address is not valid, please recheck.</source> - <translation>Адрес получателя неверный, пожалуйста, перепроверьте.</translation> - </message> - <message> <source>The amount to pay must be larger than 0.</source> <translation>Сумма для отправки должно быть больше 0.</translation> </message> @@ -2005,10 +1865,6 @@ Address: %4 <translation>Сумма превысит Ваш баланс, если комиссия в размере %1 будет добавлена к транзакции</translation> </message> <message> - <source>Duplicate address found, can only send to each address once per send operation.</source> - <translation>Обнаружен дублирующийся адрес. Отправка на один и тот же адрес возможна только один раз за одну операцию отправки</translation> - </message> - <message> <source>Transaction creation failed!</source> <translation>Не удалось создать транзакцию!</translation> </message> @@ -2017,14 +1873,10 @@ Address: %4 <translation>Транзакция была отклонена! Такое может произойти, если некоторые монеты уже были потрачены, например, если Вы используете одну копию бумажника (wallet.dat), а монеты были потрачены из другой копии, но не были отмечены как потраченные в этой.</translation> </message> <message> - <source>A fee higher than %1 is considered an insanely high fee.</source> + <source>A fee higher than %1 is considered an absurdly high fee.</source> <translation>Комиссия больше, чем %1, считается невероятно большой.</translation> </message> <message> - <source>Estimated to begin confirmation within %1 block(s).</source> - <translation>Начало подтверждения ожидается через %1 блок(ов).</translation> - </message> - <message> <source>Warning: Invalid Bitcoin address</source> <translation>Внимание: неверный адрес Bitcoin</translation> </message> @@ -2100,10 +1952,6 @@ Address: %4 <translation>Сообщение:</translation> </message> <message> - <source>This is a verified payment request.</source> - <translation>Это проверенный запрос платежа.</translation> - </message> - <message> <source>Enter a label for this address to add it to the list of used addresses</source> <translation>Введите метку для этого адреса, чтобы добавить его в список использованных</translation> </message> @@ -2112,10 +1960,6 @@ Address: %4 <translation>К bitcoin: URI было прикреплено сообщение, которое будет сохранено вместе с транзакцией для вашего сведения. Заметьте: сообщение не будет отправлено через сеть Bitcoin.</translation> </message> <message> - <source>This is an unverified payment request.</source> - <translation>Это непроверенный запрос платежа.</translation> - </message> - <message> <source>Pay To:</source> <translation>Получатель:</translation> </message> @@ -2146,10 +1990,6 @@ Address: %4 <translation>&Подписать сообщение</translation> </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>Вы можете подписывать сообщения своими адресами, чтобы доказать владение ими. Будьте осторожны, не подписывайте что-то неопределённое, так как фишинговые атаки могут обманным путём заставить вас подписать нежелательные сообщения. Подписывайте только те сообщения, с которыми вы согласны вплоть до мелочей.</translation> - </message> - <message> <source>The Bitcoin address to sign the message with</source> <translation>Адрес Bitcoin, которым подписать сообщение</translation> </message> @@ -2202,10 +2042,6 @@ Address: %4 <translation>&Проверить сообщение</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>Введите ниже адрес для подписи, сообщение (убедитесь, что переводы строк, пробелы, табы и т.п. в точности скопированы) и подпись, чтобы проверить сообщение. Убедитесь, что не скопировали лишнего в подпись, по сравнению с самим подписываемым сообщением, чтобы не стать жертвой атаки "man-in-the-middle".</translation> - </message> - <message> <source>The Bitcoin address the message was signed with</source> <translation>Адрес Bitcoin, которым было подписано сообщение</translation> </message> @@ -2322,10 +2158,6 @@ Address: %4 <source>Status</source> <translation>Статус</translation> </message> - <message numerus="yes"> - <source>, broadcast through %n node(s)</source> - <translation><numerusform>, разослано через %n узел</numerusform><numerusform>, разослано через %n узла</numerusform><numerusform>, разослано через %n узлов</numerusform></translation> - </message> <message> <source>Date</source> <translation>Дата</translation> @@ -2362,10 +2194,6 @@ Address: %4 <source>Credit</source> <translation>Кредит</translation> </message> - <message numerus="yes"> - <source>matures in %n more block(s)</source> - <translation><numerusform>будет доступно через %n блок</numerusform><numerusform>будет доступно через %n блока</numerusform><numerusform>будет доступно через %n блоков</numerusform></translation> - </message> <message> <source>not accepted</source> <translation>не принято</translation> @@ -2438,10 +2266,6 @@ Address: %4 <source>, has not been successfully broadcast yet</source> <translation>, ещё не было успешно разослано</translation> </message> - <message numerus="yes"> - <source>Open for %n more block(s)</source> - <translation><numerusform>Открыто для ещё %n блока</numerusform><numerusform>Открыто для ещё %n блоков</numerusform><numerusform>Открыто для ещё %n блоков</numerusform></translation> - </message> <message> <source>unknown</source> <translation>неизвестно</translation> @@ -2469,17 +2293,9 @@ Address: %4 <translation>Тип</translation> </message> <message> - <source>Address</source> - <translation>Адрес</translation> - </message> - <message> <source>Immature (%1 confirmations, will be available after %2)</source> <translation>Незрелый (%1 подтверждений, будет доступен после %2)</translation> </message> - <message numerus="yes"> - <source>Open for %n more block(s)</source> - <translation><numerusform>Открыто для ещё %n блока</numerusform><numerusform>Открыто для ещё %n блоков</numerusform><numerusform>Открыто для ещё %n блоков</numerusform></translation> - </message> <message> <source>Open until %1</source> <translation>Открыто до %1</translation> @@ -2501,6 +2317,10 @@ Address: %4 <translation>Нет активных соединений с сетью</translation> </message> <message> + <source>Label</source> + <translation>Метка</translation> + </message> + <message> <source>Unconfirmed</source> <translation>Неподтверждено</translation> </message> @@ -2553,10 +2373,6 @@ Address: %4 <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> @@ -2795,30 +2611,6 @@ Address: %4 <translation>Принимать подключения извне (по умолчанию: 1, если не используется -proxy или -connect)</translation> </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>%s, вы должны установить опцию rpcpassword в конфигурационном файле: - %s -Рекомендуется использовать следующий случайный пароль: -rpcuser=bitcoinrpc -rpcpassword=%s -(вам не нужно запоминать этот пароль) -Имя и пароль ДОЛЖНЫ различаться. -Если файл не существует, создайте его и установите права доступа только для владельца, только для чтения. -Также рекомендуется включить alertnotify для оповещения о проблемах; -Например: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo.com -</translation> - </message> - <message> <source>Bind to given address and always listen on it. Use [host]:port notation for IPv6</source> <translation>Привязаться к указанному адресу и всегда прослушивать только его. Используйте [хост]:порт для IPv6</translation> </message> @@ -2835,14 +2627,6 @@ rpcpassword=%s <translation>Войти в режим тестирования на регрессии, в котором используется специальная цепь, где блоки находятся мгновенно.</translation> </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>Ошибка: транзакция была отклонена! Это могло произойти в случае, если некоторые монеты в вашем бумажнике уже были потрачены, например, если вы используете копию wallet.dat, и монеты были использованы в копии, но не отмечены как потраченные здесь.</translation> - </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>Ошибка: эта транзакция требует комиссию как минимум %s из-за суммы, сложности или использования недавно полученных средств!</translation> - </message> - <message> <source>Execute command when a wallet transaction changes (%s in cmd is replaced by TxID)</source> <translation>Выполнить команду, когда меняется транзакция в бумажнике (%s в команде заменяется на TxID)</translation> </message> @@ -2919,10 +2703,6 @@ rpcpassword=%s <translation>Параметры отладки/тестирования:</translation> </message> <message> - <source>Discover own IP address (default: 1 when listening and no -externalip)</source> - <translation>Определить свой IP (по умолчанию: 1 при прослушивании и если не используется -externalip)</translation> - </message> - <message> <source>Do not load the wallet and disable wallet RPC calls</source> <translation>Не загружать бумажник и запретить обращения к нему через RPC</translation> </message> @@ -2955,10 +2735,6 @@ rpcpassword=%s <translation>Ошибка: мало места на диске!</translation> </message> <message> - <source>Error: Wallet locked, unable to create transaction!</source> - <translation>Ошибка: бумажник заблокирован, невозможно создать транзакцию!</translation> - </message> - <message> <source>Failed to listen on any port. Use -listen=0 if you want this.</source> <translation>Не удалось начать прослушивание на порту. Используйте -listen=0 если вас это устраивает.</translation> </message> @@ -2987,10 +2763,6 @@ rpcpassword=%s <translation>Соединяться только по сети <net> (ipv4, ipv6 или onion)</translation> </message> <message> - <source>Rebuild block chain index from current blk000??.dat files</source> - <translation>Перестроить индекс цепи блоков из текущих файлов blk000??.dat</translation> - </message> - <message> <source>Set database cache size in megabytes (%d to %d, default: %d)</source> <translation>Установить размер кэша БД в мегабайтах(от %d до %d, по умолчанию: %d)</translation> </message> @@ -3055,10 +2827,6 @@ rpcpassword=%s <translation>Не удалось установить блокировку на каталог данных %s. Возможно, Bitcoin Core уже запущен.</translation> </message> <message> - <source>Continuously rate-limit free transactions to <n>*1000 bytes per minute (default:%u)</source> - <translation>Ограничить скорость передачи бесплатных транзакций до <n>*1000 байт в минуту (по умолчанию: %u)</translation> - </message> - <message> <source>Create new files with system default permissions, instead of umask 077 (only effective with disabled wallet functionality)</source> <translation>Создавать новые файлы с системными правами по умолчанию вместо umask 077 (эффективно только при отключенном бумажнике)</translation> </message> @@ -3083,6 +2851,14 @@ rpcpassword=%s <translation>Комиссии (в BTC/Кб) меньшие этого значения считаются нулевыми для создания транзакции (по умолчанию: %s)</translation> </message> <message> + <source>If paytxfee is not set, include enough fee so transactions begin confirmation on average within n blocks (default: %u)</source> + <translation>Если paytxfee не задан, включить достаточную комиссию для подтверждения транзакции в среднем за n блоков (по умолчанию: %u)</translation> + </message> + <message> + <source>Invalid amount for -maxtxfee=<amount>: '%s' (must be at least the minrelay fee of %s to prevent stuck transactions)</source> + <translation>Неверное значение для -maxtxfee=<amount>: '%s' (минимальная комиссия трансляции %s для предотвращения зависания транзакций)</translation> + </message> + <message> <source>Maximum size of data in data carrier transactions we relay and mine (default: %u)</source> <translation>Наибольший размер данных в носителе данных транзакций, которые мы передаем и генерируем (по умолчанию: %u)</translation> </message> @@ -3103,6 +2879,34 @@ rpcpassword=%s <translation>Этот продукт включает ПО, разработанное OpenSSL Project для использования в OpenSSL Toolkit <https://www.openssl.org/> и криптографическое ПО, написанное Eric Young и ПО для работы с UPnP, написанное Thomas Bernard.</translation> </message> <message> + <source>To use bitcoind, or the -server option to bitcoin-qt, you must set an 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>Для использования bitcoind или опции bitcoin-qt -server, вы должны установить опцию rpcpassword в конфигурационном файле: + %s +Рекомендуется использовать следующий случайный пароль: +rpcuser=bitcoinrpc +rpcpassword=%s +(вам не нужно запоминать этот пароль) +Имя и пароль ДОЛЖНЫ различаться. +Если файл не существует, создайте его и установите право доступа только для чтения только для владельца. +Также рекомендуется включить alertnotify для оповещения о проблемах; +Например: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo.com +</translation> + </message> + <message> + <source>Warning: -maxtxfee is set very high! Fees this large could be paid on a single transaction.</source> + <translation>Внимание: установлено очень большое значение -paytxfee. Такие большие комиссии могут быть уплачены в отдельной транзакции.</translation> + </message> + <message> <source>Warning: Please check that your computer's date and time are correct! If your clock is wrong Bitcoin Core will not work properly.</source> <translation>Внимание: убедитесь, что дата и время на Вашем компьютере выставлены верно. Если Ваши часы идут неправильно, Bitcoin Core будет работать некорректно.</translation> </message> @@ -3111,10 +2915,18 @@ rpcpassword=%s <translation>Участники из белого списка не могуть быть забанены за DoS, и их транзакции всегда транслируются, даже если они уже содержатся в памяти. Полезно, например, для шлюза.</translation> </message> <message> + <source>Accept public REST requests (default: %u)</source> + <translation>Принимать публичные REST-запросы (по умолчанию: %u)</translation> + </message> + <message> <source>Cannot resolve -whitebind address: '%s'</source> <translation>Не удаётся разрешить адрес в параметре -whitebind: '%s'</translation> </message> <message> + <source>Choose data directory on startup (default: 0)</source> + <translation>Выбрать каталог данных при запуске (по умолчанию: 0)</translation> + </message> + <message> <source>Connect through SOCKS5 proxy</source> <translation>Подключаться через SOCKS5 прокси</translation> </message> @@ -3131,6 +2943,10 @@ rpcpassword=%s <translation>Ошибка загрузки wallet.dat: бумажник требует более новую версию Bitcoin Core</translation> </message> <message> + <source>Error reading from database, shutting down.</source> + <translation>Ошибка чтения базы данных, работа завершается.</translation> + </message> + <message> <source>Error: Unsupported argument -tor found, use -onion.</source> <translation>Ошибка: обнаружен неподдерживаемый параметр -tor, используйте -onion.</translation> </message> @@ -3147,6 +2963,10 @@ rpcpassword=%s <translation>Не удалось проверить чистоту. Bitcoin Core выключается.</translation> </message> <message> + <source>Invalid amount for -maxtxfee=<amount>: '%s'</source> + <translation>Неверное значение -maxtxfee=<amount>: '%s'</translation> + </message> + <message> <source>Invalid amount for -minrelaytxfee=<amount>: '%s'</source> <translation>Неверная сумма в параметре -minrelaytxfee=<кол-во>: '%s'</translation> </message> @@ -3163,10 +2983,6 @@ rpcpassword=%s <translation>Указана неверная сетевая маска в -whitelist: '%s'</translation> </message> <message> - <source>Keep at most <n> unconnectable blocks in memory (default: %u)</source> - <translation>Хранить максимум <n> несоединённых блоков в памяти (по умолчанию: %u)</translation> - </message> - <message> <source>Keep at most <n> unconnectable transactions in memory (default: %u)</source> <translation>Держать в памяти до <n> несвязных транзакций (по умолчанию: %u)</translation> </message> @@ -3179,10 +2995,6 @@ rpcpassword=%s <translation>Параметры трансляции узла:</translation> </message> <message> - <source>Print block on startup, if found in block index</source> - <translation>Печатать блок при запуске, если он найден в индексе блоков</translation> - </message> - <message> <source>RPC SSL options: (see the Bitcoin Wiki for SSL setup instructions)</source> <translation>Параметры RPC SSL: (см. Bitcoin вики для инструкций по настройке SSL)</translation> </message> @@ -3191,6 +3003,10 @@ rpcpassword=%s <translation>Параметры сервера RPC:</translation> </message> <message> + <source>RPC support for HTTP persistent connections (default: %d)</source> + <translation>Поддержка RPC постоянных HTTP подключений (по умолчанию: %d)</translation> + </message> + <message> <source>Randomly drop 1 of every <n> network messages</source> <translation>Случайно отбрасывать 1 из каждых <n> сетевых сообщений</translation> </message> @@ -3207,10 +3023,22 @@ rpcpassword=%s <translation>Осуществить транзакцию бесплатно, если возможно (по умолчанию: %u)</translation> </message> <message> + <source>Set SSL root certificates for payment request (default: -system-)</source> + <translation>Указать корневые SSL-сертификаты для запроса платежа (по умолчанию: -system-)</translation> + </message> + <message> + <source>Set language, for example "de_DE" (default: system locale)</source> + <translation>Выберите язык, например "de_DE" (по умолчанию: как в системе)</translation> + </message> + <message> <source>Show all debugging options (usage: --help -help-debug)</source> <translation>Показать все отладочные параметры (использование: --help -help-debug)</translation> </message> <message> + <source>Show splash screen on startup (default: 1)</source> + <translation>Показывать сплэш при запуске (по умолчанию: 1)</translation> + </message> + <message> <source>Shrink debug.log file on client startup (default: 1 when no -debug)</source> <translation>Сжимать файл debug.log при запуске клиента (по умолчанию: 1, если нет -debug)</translation> </message> @@ -3219,6 +3047,10 @@ rpcpassword=%s <translation>Не удалось подписать транзакцию</translation> </message> <message> + <source>Start minimized</source> + <translation>Запускать свёрнутым</translation> + </message> + <message> <source>This is experimental software.</source> <translation>Это экспериментальное ПО.</translation> </message> @@ -3231,6 +3063,10 @@ rpcpassword=%s <translation>Сумма транзакции должна быть положительна</translation> </message> <message> + <source>Transaction too large for fee policy</source> + <translation>Транзакция слишком большая для правил комиссии.</translation> + </message> + <message> <source>Transaction too large</source> <translation>Транзакция слишком большая</translation> </message> @@ -3255,10 +3091,6 @@ rpcpassword=%s <translation>Внимание</translation> </message> <message> - <source>Warning: This version is obsolete, upgrade required!</source> - <translation>Внимание: эта версия устарела, требуется обновление!</translation> - </message> - <message> <source>Warning: Unsupported argument -benchmark ignored, use -debug=bench.</source> <translation>Внимание: неподдерживаемый аргумент -benchmark проигнорирован, используйте -debug=bench.</translation> </message> @@ -3327,10 +3159,6 @@ rpcpassword=%s <translation>Насколько тщательна проверка контрольных блоков -checkblocks (0-4, по умолчанию: %u)</translation> </message> <message> - <source>If paytxfee is not set, include enough fee so transactions are confirmed on average within n blocks (default: %u)</source> - <translation>Если paytxfee не задан, включить достаточную комиссию для подтверждения транзакции в среднем за n блоков (по умолчанию: %u)</translation> - </message> - <message> <source>Log transaction priority and fee per kB when mining blocks (default: %u)</source> <translation>Записывать в лог приоритет транзакции и комиссию на килобайт во время добычи блоков (по умолчанию: %u)</translation> </message> @@ -3423,10 +3251,6 @@ rpcpassword=%s <translation>Дописывать отметки времени к отладочному выводу (по умолчанию: %u)</translation> </message> <message> - <source>Print block tree on startup (default: %u)</source> - <translation>Печатать дерево блоков при запуске (по умолчанию: %u)</translation> - </message> - <message> <source>Relay and mine data carrier transactions (default: %u)</source> <translation>Транслировать и генерировать транзакции носителей данных (по умолчанию: %u)</translation> </message> @@ -3499,10 +3323,6 @@ rpcpassword=%s <translation>Неверная сумма в параметре -paytxfee=<кол-во>: '%s'</translation> </message> <message> - <source>Invalid amount</source> - <translation>Неверная сумма</translation> - </message> - <message> <source>Insufficient funds</source> <translation>Недостаточно монет</translation> </message> @@ -3535,10 +3355,6 @@ rpcpassword=%s <translation>Загрузка завершена</translation> </message> <message> - <source>To use the %s option</source> - <translation>Чтобы использовать опцию %s</translation> - </message> - <message> <source>Error</source> <translation>Ошибка</translation> </message> diff --git a/src/qt/locale/bitcoin_sah.ts b/src/qt/locale/bitcoin_sah.ts index 84b973bf92..6cc17f480a 100644 --- a/src/qt/locale/bitcoin_sah.ts +++ b/src/qt/locale/bitcoin_sah.ts @@ -1,10 +1,6 @@ -<TS language="sah" version="2.0"> +<TS language="sah" version="2.1"> <context> <name>AddressBookPage</name> - <message> - <source>Double-click to edit address or label</source> - <translation>Аадырыскын уларытаргар иккитэ баттаа</translation> - </message> </context> <context> <name>AddressTableModel</name> diff --git a/src/qt/locale/bitcoin_sk.ts b/src/qt/locale/bitcoin_sk.ts index fe7c62cd60..294eca4127 100644 --- a/src/qt/locale/bitcoin_sk.ts +++ b/src/qt/locale/bitcoin_sk.ts @@ -1,9 +1,9 @@ -<TS language="sk" version="2.0"> +<TS language="sk" version="2.1"> <context> <name>AddressBookPage</name> <message> - <source>Double-click to edit address or label</source> - <translation>Dvojklikom editovať adresu alebo popis</translation> + <source>Right-click to edit address or label</source> + <translation>Kliknutím pravým tlačidlom upravte adresu alebo popis</translation> </message> <message> <source>Create a new address</source> @@ -156,10 +156,6 @@ <translation>Zmena hesla</translation> </message> <message> - <source>Enter the old and new passphrase to the wallet.</source> - <translation>Zadajte staré a nové heslo k peňaženke.</translation> - </message> - <message> <source>Confirm wallet encryption</source> <translation>Potvrďte šifrovanie peňaženky</translation> </message> @@ -188,10 +184,6 @@ <translation>Zadajte nové heslo k peňaženke.<br/>Prosím použite heslo s dĺžkou aspoň <b>10 alebo viac náhodných znakov</b>, alebo <b>8 alebo viac slov</b>.</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>Bitcoin sa teraz ukončí pre dokončenie procesu šifrovania. Pamätaj že šifrovanie peňaženky Ťa nemôže úplne ochrániť pred kráďežou bitcoinov pomocou škodlivého software.</translation> - </message> - <message> <source>Wallet encryption failed</source> <translation>Šifrovanie peňaženky zlyhalo</translation> </message> @@ -284,11 +276,11 @@ </message> <message> <source>&Sending addresses...</source> - <translation>Posielajúca adresa ...</translation> + <translation>&Odosielajúce adresy ...</translation> </message> <message> <source>&Receiving addresses...</source> - <translation>Prijímajúca adresa...</translation> + <translation>&Prijímajúce adresy...</translation> </message> <message> <source>Open &URI...</source> @@ -311,10 +303,6 @@ <translation>Poslať bitcoins na adresu</translation> </message> <message> - <source>Modify configuration options for Bitcoin</source> - <translation>Upraviť možnosti nastavenia pre bitcoin</translation> - </message> - <message> <source>Backup wallet to another location</source> <translation>Zálohovať peňaženku na iné miesto</translation> </message> @@ -422,34 +410,14 @@ <source>Show the Bitcoin Core help message to get a list with possible Bitcoin command-line options</source> <translation>Zobraziť pomocnú správu od Bitcoin Jadra pre získanie zoznamu dostupných možností príkazového riadku</translation> </message> - <message numerus="yes"> - <source>%n active connection(s) to Bitcoin network</source> - <translation><numerusform>%n aktívne pripojenie do siete Bitcoin</numerusform><numerusform>%n aktívne pripojenia do siete Bitcoin</numerusform><numerusform>%n aktívnych pripojení do siete Bitcoin</numerusform></translation> - </message> <message> <source>No block source available...</source> <translation>Nedostupný zdroj blokov...</translation> </message> - <message numerus="yes"> - <source>%n hour(s)</source> - <translation><numerusform>%n hodina</numerusform><numerusform>%n hodiny</numerusform><numerusform>%n hodín</numerusform></translation> - </message> - <message numerus="yes"> - <source>%n day(s)</source> - <translation><numerusform>%n deň</numerusform><numerusform>%n dni</numerusform><numerusform>%n dní</numerusform></translation> - </message> - <message numerus="yes"> - <source>%n week(s)</source> - <translation><numerusform>%n týždeň</numerusform><numerusform>%n týždne</numerusform><numerusform>%n týždňov</numerusform></translation> - </message> <message> <source>%1 and %2</source> <translation> %1 a %2</translation> </message> - <message numerus="yes"> - <source>%n year(s)</source> - <translation><numerusform>%n rok</numerusform><numerusform>%n roky</numerusform><numerusform>%n rokov</numerusform></translation> - </message> <message> <source>%1 behind</source> <translation>%1 pozadu</translation> @@ -460,7 +428,7 @@ </message> <message> <source>Transactions after this will not yet be visible.</source> - <translation>Transakcie potom nebudú ešte viditeľné.</translation> + <translation>Transakcie po tomto čase ešte nebudú viditeľné.</translation> </message> <message> <source>Error</source> @@ -491,17 +459,6 @@ <translation>Prijaté transakcie</translation> </message> <message> - <source>Date: %1 -Amount: %2 -Type: %3 -Address: %4 -</source> - <translation>Dátum: %1 -Suma: %2 -Typ: %3 -Adresa: %4</translation> - </message> - <message> <source>Wallet is <b>encrypted</b> and currently <b>unlocked</b></source> <translation>Peňaženka je <b>zašifrovaná</b> a momentálne <b>odomknutá</b></translation> </message> @@ -520,6 +477,10 @@ Adresa: %4</translation> <context> <name>CoinControlDialog</name> <message> + <source>Coin Selection</source> + <translation>Výber mince</translation> + </message> + <message> <source>Quantity:</source> <translation>Množstvo:</translation> </message> @@ -540,6 +501,10 @@ Adresa: %4</translation> <translation>Poplatok:</translation> </message> <message> + <source>Dust:</source> + <translation>Prach:</translation> + </message> + <message> <source>After Fee:</source> <translation>Po poplatku:</translation> </message> @@ -564,6 +529,14 @@ Adresa: %4</translation> <translation>Suma</translation> </message> <message> + <source>Received with label</source> + <translation>Prijaté s označením</translation> + </message> + <message> + <source>Received with address</source> + <translation>Prijaté s adresou</translation> + </message> + <message> <source>Date</source> <translation>Dátum</translation> </message> @@ -624,6 +597,10 @@ Adresa: %4</translation> <translation>Kopírovať prioritu</translation> </message> <message> + <source>Copy dust</source> + <translation>Kopírovať prach</translation> + </message> + <message> <source>Copy change</source> <translation>Kopírovať zmenu</translation> </message> @@ -672,6 +649,10 @@ Adresa: %4</translation> <translation>žiadne</translation> </message> <message> + <source>Can vary +/- %1 satoshi(s) per input.</source> + <translation>Môže sa líšiť o +/- %1 satoshi pre každý vstup</translation> + </message> + <message> <source>yes</source> <translation>áno</translation> </message> @@ -680,10 +661,6 @@ Adresa: %4</translation> <translation>nie</translation> </message> <message> - <source>This label turns red, if the transaction size is greater than 1000 bytes.</source> - <translation>Tento popis zčervená ak veľkosť transakcie presiahne 1000 bytov.</translation> - </message> - <message> <source>This means a fee of at least %1 per kB is required.</source> <translation>To znamená že požadovaný poplatok je aspoň %1 za kB.</translation> </message> @@ -696,14 +673,6 @@ Adresa: %4</translation> <translation>Transakcie s vysokou prioritou sa pravdepodobnejsie dostanú do bloku.</translation> </message> <message> - <source>This label turns red, if the priority is smaller than "medium".</source> - <translation>Tento popis zčervenie ak je priorita nižčia ako "medium".</translation> - </message> - <message> - <source>This label turns red, if any recipient receives an amount smaller than %1.</source> - <translation>Tento popis zčervenie ak ktorýkoľvek príjemca dostane sumu menšiu ako %1.</translation> - </message> - <message> <source>(no label)</source> <translation>(bez popisu)</translation> </message> @@ -824,30 +793,6 @@ Adresa: %4</translation> <source>command-line options</source> <translation>voľby príkazového riadku</translation> </message> - <message> - <source>UI options</source> - <translation>UI možnosti</translation> - </message> - <message> - <source>Set language, for example "de_DE" (default: system locale)</source> - <translation>Nastaviť jazyk, napríklad "sk_SK" (predvolené: systémový)</translation> - </message> - <message> - <source>Start minimized</source> - <translation>Spustiť minimalizované</translation> - </message> - <message> - <source>Set SSL root certificates for payment request (default: -system-)</source> - <translation>Nastaviť koreňový certifikát pre výzvy na platbu (prednastavené: -system-)</translation> - </message> - <message> - <source>Show splash screen on startup (default: 1)</source> - <translation>Zobraziť splash screen pri spustení (predvolené: 1)</translation> - </message> - <message> - <source>Choose data directory on startup (default: 0)</source> - <translation>Zvoľte dátový priečinok pri štarte (prednastavené: 0)</translation> - </message> </context> <context> <name>Intro</name> @@ -918,16 +863,8 @@ Adresa: %4</translation> <translation>&Hlavné</translation> </message> <message> - <source>Automatically start Bitcoin after logging in to the system.</source> - <translation>Automaticky spustiť Bitcoin po zapnutí počítača</translation> - </message> - <message> - <source>&Start Bitcoin on system login</source> - <translation>&Spustiť Bitcoin pri spustení systému správy okien</translation> - </message> - <message> <source>Size of &database cache</source> - <translation>Veľkosť vyrovnávacej pamäti databázy</translation> + <translation>Veľkosť vyrovnávacej pamäti &databázy</translation> </message> <message> <source>MB</source> @@ -935,7 +872,15 @@ Adresa: %4</translation> </message> <message> <source>Number of script &verification threads</source> - <translation>Počet skript overujucich vlákien</translation> + <translation>Počet &vlákien overujúcich skript</translation> + </message> + <message> + <source>Accept connections from outside</source> + <translation>Prijať spojenia zvonku</translation> + </message> + <message> + <source>Allow incoming connections</source> + <translation>Povoliť prichádzajúce spojenia</translation> </message> <message> <source>IP address of the proxy (e.g. IPv4: 127.0.0.1 / IPv6: ::1)</source> @@ -979,7 +924,7 @@ Adresa: %4</translation> </message> <message> <source>Enable coin &control features</source> - <translation>Povoliť možnosti coin control</translation> + <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> @@ -998,6 +943,14 @@ Adresa: %4</translation> <translation>Mapovať port pomocou &UPnP</translation> </message> <message> + <source>Connect to the Bitcoin network through a SOCKS5 proxy.</source> + <translation>Pripojiť do siete Bitcoin cez proxy server SOCKS5.</translation> + </message> + <message> + <source>&Connect through SOCKS5 proxy (default proxy):</source> + <translation>&Pripojiť cez proxy server SOCKS5 (predvolený proxy).</translation> + </message> + <message> <source>Proxy &IP:</source> <translation>Proxy &IP:</translation> </message> @@ -1022,10 +975,6 @@ Adresa: %4</translation> <translation>Zobraziť len ikonu na lište po minimalizovaní okna.</translation> </message> <message> - <source>Minimize instead of exit the application when the window is closed. When this option is enabled, the application will be closed only after selecting Quit in the menu.</source> - <translation>Minimalizovat namiesto ukončenia aplikácie keď sa okno zavrie. Keď je zvolená táto možnosť, aplikácia sa zavrie len po zvolení Ukončiť v menu.</translation> - </message> - <message> <source>M&inimize on close</source> <translation>M&inimalizovať pri zavretí</translation> </message> @@ -1038,10 +987,6 @@ Adresa: %4</translation> <translation>Jazyk užívateľského rozhrania:</translation> </message> <message> - <source>The user interface language can be set here. This setting will take effect after restarting Bitcoin.</source> - <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> <translation>&Zobrazovať hodnoty v jednotkách:</translation> </message> @@ -1078,10 +1023,6 @@ Adresa: %4</translation> <translation>Reštart klienta potrebný pre aktivovanie zmien.</translation> </message> <message> - <source>Client will be shutdown, do you want to proceed?</source> - <translation>Klient bude vypnutý, chcete pokračovať?</translation> - </message> - <message> <source>This change would require a client restart.</source> <translation>Táto zmena by vyžadovala reštart klienta.</translation> </message> @@ -1098,7 +1039,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>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> + <translation>Zobrazené informácie môžu byť neaktuálne. Vaša peňaženka sa automaticky synchronizuje so sieťou Bitcoin po nadviazaní spojenia, ale tento proces ešte nie je ukončený.</translation> </message> <message> <source>Available:</source> @@ -1110,7 +1051,7 @@ Adresa: %4</translation> </message> <message> <source>Pending:</source> - <translation>Čakajúce potvrdenie</translation> + <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> @@ -1125,6 +1066,10 @@ Adresa: %4</translation> <translation>Vytvorený zostatok ktorý ešte nedosiahol zrelosť</translation> </message> <message> + <source>Balances</source> + <translation>Stav účtu</translation> + </message> + <message> <source>Total:</source> <translation>Celkovo:</translation> </message> @@ -1133,6 +1078,10 @@ Adresa: %4</translation> <translation>Váš súčasný celkový zostatok</translation> </message> <message> + <source>Recent transactions</source> + <translation>Nedávne transakcie</translation> + </message> + <message> <source>out of sync</source> <translation>nesynchronizované</translation> </message> @@ -1194,7 +1143,15 @@ Adresa: %4</translation> </context> <context> <name>PeerTableModel</name> - </context> + <message> + <source>User Agent</source> + <translation>Aplikácia</translation> + </message> + <message> + <source>Ping Time</source> + <translation>Čas odozvy</translation> + </message> +</context> <context> <name>QObject</name> <message> @@ -1202,6 +1159,10 @@ Adresa: %4</translation> <translation>Suma</translation> </message> <message> + <source>Enter a Bitcoin address (e.g. %1)</source> + <translation>Zadajte bitcoin adresu (napr. %1)</translation> + </message> + <message> <source>%1 h</source> <translation>%1 h</translation> </message> @@ -1213,7 +1174,11 @@ Adresa: %4</translation> <source>N/A</source> <translation>nie je k dispozícii</translation> </message> - </context> + <message> + <source>%1 ms</source> + <translation>%1 ms</translation> + </message> +</context> <context> <name>QRImageWidget</name> <message> @@ -1264,6 +1229,10 @@ Adresa: %4</translation> <translation>Používa OpenSSL verziu</translation> </message> <message> + <source>Using BerkeleyDB version</source> + <translation>Používa BerkeleyDB verziu</translation> + </message> + <message> <source>Startup time</source> <translation>Čas spustenia</translation> </message> @@ -1288,6 +1257,54 @@ Adresa: %4</translation> <translation>Aktuálny počet blokov</translation> </message> <message> + <source>Received</source> + <translation>Prijaté</translation> + </message> + <message> + <source>Sent</source> + <translation>Odoslané</translation> + </message> + <message> + <source>Select a peer to view detailed information.</source> + <translation>Vyberte počítač pre zobrazenie podrobností.</translation> + </message> + <message> + <source>Direction</source> + <translation>Smer</translation> + </message> + <message> + <source>Version</source> + <translation>Verzia</translation> + </message> + <message> + <source>User Agent</source> + <translation>Aplikácia</translation> + </message> + <message> + <source>Services</source> + <translation>Služby</translation> + </message> + <message> + <source>Starting Height</source> + <translation>Počiatočná výška</translation> + </message> + <message> + <source>Connection Time</source> + <translation>Dĺžka spojenia</translation> + </message> + <message> + <source>Bytes Sent</source> + <translation>Odoslaných bajtov</translation> + </message> + <message> + <source>Bytes Received</source> + <translation>Prijatých bajtov</translation> + </message> + <message> + <source>Ping Time</source> + <translation>Čas odozvy</translation> + </message> + <message> <source>Last block time</source> <translation>Čas posledného bloku</translation> </message> @@ -1301,7 +1318,7 @@ Adresa: %4</translation> </message> <message> <source>&Network Traffic</source> - <translation>Sieťová prevádzka</translation> + <translation>&Sieťová prevádzka</translation> </message> <message> <source>&Clear</source> @@ -1328,20 +1345,12 @@ Adresa: %4</translation> <translation>Súbor záznamu ladenia</translation> </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>Otvoriť Bitcoin log súbor pre ladenie z aktuálneho dátového adresára. Toto môže trvať niekoľko sekúnd pre veľké súbory.</translation> - </message> - <message> <source>Clear console</source> <translation>Vymazať konzolu</translation> </message> <message> - <source>Welcome to the Bitcoin RPC console.</source> - <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>Použi šipky hore a dolu pre navigáciu históriou a <b>Ctrl-L</b> pre vyčistenie obrazovky.</translation> + <translation>Použi šípky 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> @@ -1363,7 +1372,19 @@ Adresa: %4</translation> <source>%1 GB</source> <translation>%1 GB</translation> </message> - </context> + <message> + <source>Inbound</source> + <translation>Prichádzajúce</translation> + </message> + <message> + <source>Outbound</source> + <translation>Odchádzajúce</translation> + </message> + <message> + <source>Fetching...</source> + <translation>Získava sa...</translation> + </message> +</context> <context> <name>ReceiveCoinsDialog</name> <message> @@ -1592,6 +1613,66 @@ Adresa: %4</translation> <translation>Vlastná adresa zmeny</translation> </message> <message> + <source>Transaction Fee:</source> + <translation>Poplatok za transakciu:</translation> + </message> + <message> + <source>collapse fee-settings</source> + <translation>zbaliť nastavenia poplatkov</translation> + </message> + <message> + <source>per kilobyte</source> + <translation>za kilobajt</translation> + </message> + <message> + <source>If the custom fee is set to 1000 satoshis and the transaction is only 250 bytes, then "per kilobyte" only pays 250 satoshis in fee, while "total at least" pays 1000 satoshis. For transactions bigger than a kilobyte both pay by kilobyte.</source> + <translation>Ak je poplatok nastavený na 1000 satoshi a transakcia je veľká len 250 bajtov, potom "za kilobajt" zaplatí poplatok 250 satoshi, ale "spolu aspoň" zaplatí 1000 satoshi. Pre transakcie väčšie ako kilobajt platia oba spôsoby za každý kilobajt.</translation> + </message> + <message> + <source>total at least</source> + <translation>spolu aspoň</translation> + </message> + <message> + <source>Paying only the minimum fee is just fine as long as there is less transaction volume than space in the blocks. But be aware that this can end up in a never confirming transaction once there is more demand for bitcoin transactions than the network can process.</source> + <translation>Zaplatenie len minimálneho poplatku je v poriadku, pokiaľ existuje menej transakcií ako miesta v blokoch. Uvedomte si však, že ak bude vyšší dopyt po transakciách ako dokáže sieť spracovať, môže byť vaša transakcia odsúvaná a nepotvrdená donekonečna.</translation> + </message> + <message> + <source>(read the tooltip)</source> + <translation>(prečítajte si nápovedu pod kurzorom)</translation> + </message> + <message> + <source>Recommended:</source> + <translation>Odporúčaný:</translation> + </message> + <message> + <source>Custom:</source> + <translation>Vlastný:</translation> + </message> + <message> + <source>(Smart fee not initialized yet. This usually takes a few blocks...)</source> + <translation>(Automatický poplatok ešte nebol aktivovaný. Toto zvyčajne trvá niekoľko blokov...)</translation> + </message> + <message> + <source>Confirmation time:</source> + <translation>Čas potvrdenia:</translation> + </message> + <message> + <source>normal</source> + <translation>normálne</translation> + </message> + <message> + <source>fast</source> + <translation>rýchle</translation> + </message> + <message> + <source>Send as zero-fee transaction if possible</source> + <translation>Poslať ako transakciu bez poplatku, ak je to možné</translation> + </message> + <message> + <source>(confirmation may take longer)</source> + <translation>(potvrdenie môže trvať dlhšie)</translation> + </message> + <message> <source>Send to multiple recipients at once</source> <translation>Poslať viacerým príjemcom naraz</translation> </message> @@ -1604,6 +1685,10 @@ Adresa: %4</translation> <translation>Vyčistiť všetky polia formulára.</translation> </message> <message> + <source>Dust:</source> + <translation>Prach:</translation> + </message> + <message> <source>Clear &All</source> <translation>Zmazať &všetko</translation> </message> @@ -1664,10 +1749,6 @@ Adresa: %4</translation> <translation>alebo</translation> </message> <message> - <source>The recipient address is not valid, please recheck.</source> - <translation>Adresa príjemcu je neplatná, prosím, overte ju.</translation> - </message> - <message> <source>The amount to pay must be larger than 0.</source> <translation>Suma na úhradu musí byť väčšia ako 0.</translation> </message> @@ -1680,10 +1761,6 @@ Adresa: %4</translation> <translation>Suma celkom prevyšuje Váš zostatok ak sú započítané %1 transakčné poplatky.</translation> </message> <message> - <source>Duplicate address found, can only send to each address once per send operation.</source> - <translation>Duplikát adresy objavený, je možné poslať na každú adresu len raz v jednej odchádzajúcej transakcii.</translation> - </message> - <message> <source>Transaction creation failed!</source> <translation>Vytvorenie transakcie zlyhalo!</translation> </message> @@ -1692,6 +1769,10 @@ Adresa: %4</translation> <translation>Transakcia bola zamietnutá! Toto sa môže stať ak niektoré coins vo vašej peňaženke už boli minuté, ako keď použijete kópiu wallet.dat a coins boli minuté z kópie ale neoznačené ako minuté tu.</translation> </message> <message> + <source>Pay only the minimum fee of %1</source> + <translation>Zaplatiť minimálny poplatok %1</translation> + </message> + <message> <source>Warning: Invalid Bitcoin address</source> <translation>Varovanie: Nesprávna Bitcoin adresa</translation> </message> @@ -1704,6 +1785,10 @@ Adresa: %4</translation> <translation>Varovanie: Neznáma adresa pre výdavok</translation> </message> <message> + <source>Copy dust</source> + <translation>Kopírovať prach</translation> + </message> + <message> <source>Are you sure you want to send?</source> <translation>Určite to chcete odoslať?</translation> </message> @@ -1759,10 +1844,6 @@ Adresa: %4</translation> <translation>Správa:</translation> </message> <message> - <source>This is a verified payment request.</source> - <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> <translation>Vložte popis pre túto adresu aby sa uložila do zoznamu použitých adries</translation> </message> @@ -1771,10 +1852,6 @@ Adresa: %4</translation> <translation>Správa ktorá bola pripojená k bitcoin: URI a ktorá bude uložená s transakcou pre Vaše potreby. Poznámka: Táto správa nebude poslaná cez sieť Bitcoin.</translation> </message> <message> - <source>This is an unverified payment request.</source> - <translation>Toto je neoverená výzva k platbe.</translation> - </message> - <message> <source>Pay To:</source> <translation>Platba pre:</translation> </message> @@ -1805,10 +1882,6 @@ Adresa: %4</translation> <translation>&Podpísať Správu</translation> </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>Môžete podpísať správy svojou adresou a dokázať, že ju vlastníte. Buďte opatrní a podpíšte len prehlásenia s ktorými plne súhlasíte, nakoľko útoky typu "phishing" Vás môžu lákať k ich podpísaniu.</translation> - </message> - <message> <source>Choose previously used address</source> <translation>Vybrať predtým použitú adresu</translation> </message> @@ -1857,10 +1930,6 @@ Adresa: %4</translation> <translation>Overiť správu...</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>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>Verify the message to ensure it was signed with the specified Bitcoin address</source> <translation>Overím správy sa uistiť že bola podpísaná označenou Bitcoin adresou</translation> </message> @@ -2096,10 +2165,6 @@ Adresa: %4</translation> <translation>Typ</translation> </message> <message> - <source>Address</source> - <translation>Adresa</translation> - </message> - <message> <source>Immature (%1 confirmations, will be available after %2)</source> <translation>Nezrelé (%1 potvrdení, bude k dispozícii po %2)</translation> </message> @@ -2124,6 +2189,10 @@ Adresa: %4</translation> <translation>Offline</translation> </message> <message> + <source>Label</source> + <translation>Popis</translation> + </message> + <message> <source>Unconfirmed</source> <translation>Nepotvrdené</translation> </message> @@ -2172,10 +2241,6 @@ Adresa: %4</translation> <translation>Typ transakcie.</translation> </message> <message> - <source>Destination address of transaction.</source> - <translation>Cieľová adresa transakcie.</translation> - </message> - <message> <source>Amount removed from or added to balance.</source> <translation>Suma pridaná alebo odobraná k zostatku.</translation> </message> @@ -2383,7 +2448,7 @@ Adresa: %4</translation> </message> <message> <source>Connect to a node to retrieve peer addresses, and disconnect</source> - <translation>Pripojiť sa k nóde, získať adresy ďaľších počítačov v sieti a odpojit sa.</translation> + <translation>Pripojiť sa k uzlu, získať adresy ďalších počítačov v sieti a odpojiť sa</translation> </message> <message> <source>Specify your own public address</source> @@ -2406,30 +2471,6 @@ Adresa: %4</translation> <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: -%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>%s, musíte nastaviť rpcpassword heslo v súbore nastavení: -%s -Odporúča sa používať nasledujúce náhodné heslo: -rpcuser=bitcoinrpc -rpcpassword=%s -(nemusíte si pamätať toto heslo) -Užívateľské meno a heslo NESMÚ byť rovnaké. -Ak súbor neexistuje, vytvorte ho s prístupovým právom owner-readable-only čitateľné len pre majiteľa. -Tiež sa odporúča nastaviť alertnotify aby ste boli upozorňovaní na problémy; -napríklad: alertnotify=echo %%s | mail -s "Bitcoin Výstraha" admin@foo.com -</translation> - </message> - <message> <source>Bind to given address and always listen on it. Use [host]:port notation for IPv6</source> <translation>Spojiť s danou adresou a vždy na nej počúvať. Použite zápis [host]:port pre IPv6</translation> </message> @@ -2438,14 +2479,6 @@ napríklad: alertnotify=echo %%s | mail -s "Bitcoin Výstraha" admin@foo.com <translation>Vojsť do režimu regresného testovania, ktorý používa špeciálnu reťaz v ktorej môžu byť bloky v okamihu vyriešené.</translation> </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>Transakcia bola zamietnutá! Toto sa môže stať ak niektoré coins vo vašej peňaženke už boli minuté, ako keď použijete kópiu wallet.dat a coins boli minuté z kópie ale neoznačené ako minuté tu.</translation> - </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>Chyba: Táto transakcia vyžaduje transakčný poplatok aspoň %s kvôli svojej sume, komplexite alebo použitiu nedávno prijatých prostriedkov.</translation> - </message> - <message> <source>Execute command when a wallet transaction changes (%s in cmd is replaced by TxID)</source> <translation>Vykonaj príkaz keď sa zmení transakcia peňaženky (%s v príkaze je nahradená TxID)</translation> </message> @@ -2477,7 +2510,7 @@ The network does not appear to fully agree! Some miners appear to be experiencin </message> <message> <source>Warning: We do not appear to fully agree with our peers! You may need to upgrade, or other nodes may need to upgrade.</source> - <translation>Varovanie: Zjavne sa úplne nezhodujeme s našimi peer-mi! Možno potrebujete prejsť na novšiu verziu alebo ostatné nódy potrebujú vyššiu verziu.</translation> + <translation>Varovanie: Zjavne sa úplne nezhodujeme s našimi peer-mi! Možno potrebujete prejsť na novšiu verziu alebo ostatné uzly potrebujú vyššiu verziu.</translation> </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> @@ -2520,10 +2553,6 @@ The network does not appear to fully agree! Some miners appear to be experiencin <translation>Možnosti ladenia/testovania:</translation> </message> <message> - <source>Discover own IP address (default: 1 when listening and no -externalip)</source> - <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> <translation>Nenahrat peňaženku a zablokovať volania RPC.</translation> </message> @@ -2552,10 +2581,6 @@ The network does not appear to fully agree! Some miners appear to be experiencin <translation>Chyba: Málo miesta na disku!</translation> </message> <message> - <source>Error: Wallet locked, unable to create transaction!</source> - <translation>Chyba: Peňaženka je zamknutá, nemôžem vytvoriť transakciu!</translation> - </message> - <message> <source>Failed to listen on any port. Use -listen=0 if you want this.</source> <translation>Chyba počúvania na ktoromkoľvek porte. Použi -listen=0 ak toto chcete.</translation> </message> @@ -2580,12 +2605,8 @@ The network does not appear to fully agree! Some miners appear to be experiencin <translation>Nedostatok kľúčových slov súboru.</translation> </message> <message> - <source>Rebuild block chain index from current blk000??.dat files</source> - <translation>Znovu vytvoriť zoznam blokov zo súčasných blk000??.dat súborov</translation> - </message> - <message> <source>Set database cache size in megabytes (%d to %d, default: %d)</source> - <translation>Nastaviť veľkosť pomocnej pamäti databázy v megabajtoch (%d na %d, prednatavené: %d)</translation> + <translation>Nastaviť veľkosť pomocnej pamäti databázy v megabajtoch (%d do %d, prednastavené: %d)</translation> </message> <message> <source>Set maximum block size in bytes (default: %d)</source> @@ -2628,14 +2649,42 @@ The network does not appear to fully agree! Some miners appear to be experiencin <translation>Neviem uzamknúť data adresár %s. Jadro Bitcoin je pravdepodobne už spustené.</translation> </message> <message> + <source>Error: Listening for incoming connections failed (listen returned error %s)</source> + <translation>Chyba: Počúvanie prichádzajúcich spojení zlyhalo (vrátená chyba je %s)</translation> + </message> + <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>Vykonať príkaz keď po prijatí patričné varovanie alebo vidíme veľmi dlhé rozdvojenie siete (%s v cmd je nahradené správou)</translation> + <translation>Vykonať príkaz po prijatí patričného varovania alebo uvidíme veľmi dlhé rozdvojenie siete (%s v cmd je nahradené správou)</translation> + </message> + <message> + <source>Fees (in BTC/Kb) smaller than this are considered zero fee for relaying (default: %s)</source> + <translation>Poplatky (v BTC/Kb) nižšie ako toľkoto sa považujú za nulové pri postupovaní transakcií (predvolené: %s)</translation> + </message> + <message> + <source>Fees (in BTC/Kb) smaller than this are considered zero fee for transaction creation (default: %s)</source> + <translation>Poplatky (v BTC/Kb) nižšie ako toľkoto sa považujú za nulové pri vytváraní transakcií (predvolené: %s)</translation> </message> <message> <source>Set maximum size of high-priority/low-fee transactions in bytes (default: %d)</source> <translation>Nastaviť najväčšiu veľkosť vysoká-dôležitosť/nízke-poplatky transakcií v bajtoch (prednastavené: %d)</translation> </message> <message> + <source>Choose data directory on startup (default: 0)</source> + <translation>Zvoľte dátový priečinok pri štarte (prednastavené: 0)</translation> + </message> + <message> + <source>Connect through SOCKS5 proxy</source> + <translation>Pripojiť cez proxy server SOCKS5</translation> + </message> + <message> + <source>Error loading wallet.dat: Wallet requires newer version of Bitcoin Core</source> + <translation>Chyba pri čítaní wallet.dat: Peňaženka vyžaduje vyššiu verziu Jadra Bitcoin</translation> + </message> + <message> + <source>Fee (in BTC/kB) to add to transactions you send (default: %s)</source> + <translation>Poplatok (v BTC/kB), ktorý sa pridá k transakciám, ktoré odosielate (predvolený: %s)</translation> + </message> + <message> <source>Information</source> <translation>Informácia</translation> </message> @@ -2648,10 +2697,6 @@ The network does not appear to fully agree! Some miners appear to be experiencin <translation>Neplatná suma pre -mintxfee=<amount>: '%s'</translation> </message> <message> - <source>Print block on startup, if found in block index</source> - <translation>Vytlač blok pri spustení, ak nájdený v zozname blokov</translation> - </message> - <message> <source>RPC SSL options: (see the Bitcoin Wiki for SSL setup instructions)</source> <translation>Možnosti RPC SSL: (Pozri v Bitcoin Wiki pokyny pre SSL nastavenie)</translation> </message> @@ -2672,10 +2717,26 @@ The network does not appear to fully agree! Some miners appear to be experiencin <translation>Odoslať trace/debug informácie na konzolu namiesto debug.info žurnálu</translation> </message> <message> + <source>Send transactions as zero-fee transactions if possible (default: %u)</source> + <translation>Poslať ako transakcie bez poplatku, ak je to možné (predvolené: %u)</translation> + </message> + <message> + <source>Set SSL root certificates for payment request (default: -system-)</source> + <translation>Nastaviť koreňový certifikát pre výzvy na platbu (prednastavené: -system-)</translation> + </message> + <message> + <source>Set language, for example "de_DE" (default: system locale)</source> + <translation>Nastaviť jazyk, napríklad "sk_SK" (predvolené: systémový)</translation> + </message> + <message> <source>Show all debugging options (usage: --help -help-debug)</source> <translation>Zobraziť všetky možnosti ladenia (použitie: --help --help-debug)</translation> </message> <message> + <source>Show splash screen on startup (default: 1)</source> + <translation>Zobraziť splash screen pri spustení (predvolené: 1)</translation> + </message> + <message> <source>Shrink debug.log file on client startup (default: 1 when no -debug)</source> <translation>Zmenšiť debug.log pri spustení klienta (predvolené: 1 ak bez -debug)</translation> </message> @@ -2684,6 +2745,14 @@ The network does not appear to fully agree! Some miners appear to be experiencin <translation>Podpísanie správy zlyhalo</translation> </message> <message> + <source>Start minimized</source> + <translation>Spustiť minimalizované</translation> + </message> + <message> + <source>This is experimental software.</source> + <translation>Toto je experimentálny softvér.</translation> + </message> + <message> <source>Transaction amount too small</source> <translation>Suma transakcie príliš malá</translation> </message> @@ -2692,6 +2761,10 @@ The network does not appear to fully agree! Some miners appear to be experiencin <translation>Hodnoty transakcie musia byť väčšie ako nula (pozitívne)</translation> </message> <message> + <source>Transaction too large for fee policy</source> + <translation>Transakcia je príliš veľká pre aktuálne podmienky poplatkov</translation> + </message> + <message> <source>Transaction too large</source> <translation>Transakcia príliš veľká</translation> </message> @@ -2708,10 +2781,6 @@ The network does not appear to fully agree! Some miners appear to be experiencin <translation>Upozornenie</translation> </message> <message> - <source>Warning: This version is obsolete, upgrade required!</source> - <translation>Upozornenie: Táto verzia je zastaraná, vyžaduje sa aktualizácia!</translation> - </message> - <message> <source>Zapping all transactions from wallet...</source> <translation>Zmazať všetky transakcie z peňaženky...</translation> </message> @@ -2760,6 +2829,14 @@ The network does not appear to fully agree! Some miners appear to be experiencin <translation>Chyba načítania wallet.dat: Peňaženka je poškodená</translation> </message> <message> + <source>Log transaction priority and fee per kB when mining blocks (default: %u)</source> + <translation>Zaznamenať prioritu transakcie a poplatok za kB pri ťažení blokov (predvolené: %u)</translation> + </message> + <message> + <source>Use separate SOCKS5 proxy to reach peers via Tor hidden services (default: %s)</source> + <translation>Použiť samostatný SOCKS5 proxy server na dosiahnutie počítačov cez skryté služby Tor (predvolené: %s)</translation> + </message> + <message> <source>Error loading wallet.dat</source> <translation>Chyba načítania wallet.dat</translation> </message> @@ -2768,6 +2845,10 @@ The network does not appear to fully agree! Some miners appear to be experiencin <translation>Neplatná adresa proxy: '%s'</translation> </message> <message> + <source>Maintain at most <n> connections to peers (default: %u)</source> + <translation>Udržiavať najviac <n> spojení s inými počítačmi (predvolené: %u)</translation> + </message> + <message> <source>Unknown network specified in -onlynet: '%s'</source> <translation>Neznáma sieť upresnená v -onlynet: '%s'</translation> </message> @@ -2784,10 +2865,6 @@ The network does not appear to fully agree! Some miners appear to be experiencin <translation>Neplatná suma pre -paytxfee=<amount>: '%s'</translation> </message> <message> - <source>Invalid amount</source> - <translation>Neplatná suma</translation> - </message> - <message> <source>Insufficient funds</source> <translation>Nedostatok prostriedkov</translation> </message> @@ -2820,10 +2897,6 @@ The network does not appear to fully agree! Some miners appear to be experiencin <translation>Dokončené načítavanie</translation> </message> <message> - <source>To use the %s option</source> - <translation>Použiť %s možnosť.</translation> - </message> - <message> <source>Error</source> <translation>Chyba</translation> </message> diff --git a/src/qt/locale/bitcoin_sl_SI.ts b/src/qt/locale/bitcoin_sl_SI.ts index 60fc4a93e5..7a283bcca1 100644 --- a/src/qt/locale/bitcoin_sl_SI.ts +++ b/src/qt/locale/bitcoin_sl_SI.ts @@ -1,11 +1,7 @@ -<TS language="sl_SI" version="2.0"> +<TS language="sl_SI" version="2.1"> <context> <name>AddressBookPage</name> <message> - <source>Double-click to edit address or label</source> - <translation>Dvakrat klikni za urejanje naslovov ali oznak</translation> - </message> - <message> <source>Create a new address</source> <translation>Ustvari nov naslov</translation> </message> @@ -152,10 +148,6 @@ <translation>Zamenjaj geslo</translation> </message> <message> - <source>Enter the old and new passphrase to the wallet.</source> - <translation>Vnesite staro in novo geslo denarnice.</translation> - </message> - <message> <source>Confirm wallet encryption</source> <translation>Potrdi šifriranje denarnice</translation> </message> @@ -176,10 +168,6 @@ <translation>Denarnica šifrirana</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>Bitcoin se bo zaprl, da bi dokončal proces šifriranja. Zapomnite si, da šifriranje vaše denarnice ne more popolnoma zaščititi pred krajami zlonamernih programov, ki bi lahko bili nameščeni na vašem računalniku.</translation> - </message> - <message> <source>Wallet encryption failed</source> <translation>Šifriranje denarnice spodletelo</translation> </message> @@ -295,10 +283,6 @@ <translation>Pošlji kovance na Bitcoin naslov</translation> </message> <message> - <source>Modify configuration options for Bitcoin</source> - <translation>Spremeni konfiguracijo nastavitev za Bitcoin</translation> - </message> - <message> <source>Backup wallet to another location</source> <translation>Napravi varnostno kopijo denarnice na drugo lokacijo</translation> </message> @@ -386,30 +370,10 @@ <source>Open a bitcoin: URI or payment request</source> <translation>Odpri Bitcoin: URI ali zahteva o plačilu</translation> </message> - <message numerus="yes"> - <source>%n active connection(s) to Bitcoin network</source> - <translation><numerusform>%n aktivna povezava v bitcoin omrežje</numerusform><numerusform>%n aktivni povezavi v bitcoin omrežje</numerusform><numerusform>%n aktivnih povezav v bitcoin omrežje</numerusform><numerusform>%n aktivnih povezav v bitcoin omrežje</numerusform></translation> - </message> - <message numerus="yes"> - <source>%n hour(s)</source> - <translation><numerusform>%n ura</numerusform><numerusform>%n uri</numerusform><numerusform>%n ure</numerusform><numerusform>%n ura</numerusform></translation> - </message> - <message numerus="yes"> - <source>%n day(s)</source> - <translation><numerusform>%n dan</numerusform><numerusform>%n dneva</numerusform><numerusform>%n dnevi</numerusform><numerusform>%n dni</numerusform></translation> - </message> - <message numerus="yes"> - <source>%n week(s)</source> - <translation><numerusform>%n teden</numerusform><numerusform>%n tedna</numerusform><numerusform>%n tedni</numerusform><numerusform>%n tednov</numerusform></translation> - </message> <message> <source>%1 and %2</source> <translation>%1 in %2</translation> </message> - <message numerus="yes"> - <source>%n year(s)</source> - <translation><numerusform>%n leto</numerusform><numerusform>%n leti</numerusform><numerusform>%n leta</numerusform><numerusform>%n let</numerusform></translation> - </message> <message> <source>%1 behind</source> <translation>%1 odzadaj</translation> @@ -447,18 +411,6 @@ <translation>Prilivi</translation> </message> <message> - <source>Date: %1 -Amount: %2 -Type: %3 -Address: %4 -</source> - <translation>Datum: %1 -Količina: %2 -Vrsta: %3 -Naslov: %4 -</translation> - </message> - <message> <source>Wallet is <b>encrypted</b> and currently <b>unlocked</b></source> <translation>Denarnica je <b>šifrirana</b> in trenutno <b>odklenjena</b></translation> </message> @@ -486,7 +438,7 @@ Naslov: %4 </message> <message> <source>Amount:</source> - <translation>Količina:</translation> + <translation>Znesek:</translation> </message> <message> <source>Priority:</source> @@ -641,10 +593,6 @@ Naslov: %4 <translation>ne</translation> </message> <message> - <source>This label turns red, if the transaction size is greater than 1000 bytes.</source> - <translation>V primeru, da je velikost transakcije večja od 1000 bitov, se ta oznaka se obarva rdeče.</translation> - </message> - <message> <source>Can vary +/- 1 byte per input.</source> <translation>Se lahko razlikuje +/- 1 byte na vnos.</translation> </message> @@ -653,10 +601,6 @@ Naslov: %4 <translation>Transakcije z višjo prioriteto imajo boljše možnosti za vključitev v blok.</translation> </message> <message> - <source>This label turns red, if the priority is smaller than "medium".</source> - <translation>Oznaka se obarva rdeče, kadar je prioriteta manjša od "srednje".</translation> - </message> - <message> <source>(no label)</source> <translation>(ni oznake)</translation> </message> @@ -773,30 +717,6 @@ Naslov: %4 <source>command-line options</source> <translation>možnosti ukazne vrstice</translation> </message> - <message> - <source>UI options</source> - <translation>možnosti uporabniškega vmesnika</translation> - </message> - <message> - <source>Set language, for example "de_DE" (default: system locale)</source> - <translation>Nastavi jezik, npr. "sl_SI" (privzeto: jezikovna oznaka sistema)</translation> - </message> - <message> - <source>Start minimized</source> - <translation>Zaženi pomanjšano</translation> - </message> - <message> - <source>Set SSL root certificates for payment request (default: -system-)</source> - <translation>Nastavi korenske SSL certifikate za plačilni zahtevek (privzeto: -system-)</translation> - </message> - <message> - <source>Show splash screen on startup (default: 1)</source> - <translation>Ob zagonu prikaži uvodni zaslon (privzeto: 1)</translation> - </message> - <message> - <source>Choose data directory on startup (default: 0)</source> - <translation>Ob zagonu izberi mapo za shranjevanje podatkov (privzeto: 0)</translation> - </message> </context> <context> <name>Intro</name> @@ -871,14 +791,6 @@ Naslov: %4 <translation>&Glavno</translation> </message> <message> - <source>Automatically start Bitcoin after logging in to the system.</source> - <translation>Po prijavi v sistem samodejno zaženite Bitcoin.</translation> - </message> - <message> - <source>&Start Bitcoin on system login</source> - <translation>&Zaženi Bitcoin ob prijavi v sistem</translation> - </message> - <message> <source>Size of &database cache</source> <translation>Velikost lokalne zbirke &podatkovne baze</translation> </message> @@ -951,10 +863,6 @@ Naslov: %4 <translation>&Minimiraj na pladenj namesto na opravilno vrstico</translation> </message> <message> - <source>Minimize instead of exit the application when the window is closed. When this option is enabled, the application will be closed only after selecting Quit in the menu.</source> - <translation>Minimiziraj namesto izhoda iz programa, ko je okno zaprto. Ko je ta opcija omogočena se bo aplikacija zaprla z izbiro opcije Zapri iz menija. </translation> - </message> - <message> <source>M&inimize on close</source> <translation>&Minimiziraj na ukaz zapri</translation> </message> @@ -967,10 +875,6 @@ Naslov: %4 <translation>Vmesnik uporabnika &jezik:</translation> </message> <message> - <source>The user interface language can be set here. This setting will take effect after restarting Bitcoin.</source> - <translation>Tukaj je mogoče nastaviti uporabniški vmesnik za jezike. Ta nastavitev bo prikazana šele, ko boste znova zagnali Bitcoin.</translation> - </message> - <message> <source>&Unit to show amounts in:</source> <translation>&</translation> </message> @@ -1091,7 +995,7 @@ Naslov: %4 <name>QRImageWidget</name> <message> <source>&Save Image...</source> - <translation>&Shrani sliko...</translation> + <translation>&Shrani sliko..</translation> </message> <message> <source>&Copy Image</source> @@ -1209,10 +1113,6 @@ Naslov: %4 <translation>Počisti konzolo</translation> </message> <message> - <source>Welcome to the Bitcoin RPC console.</source> - <translation>Dobrodošli na Bitcoin RPC konzoli.</translation> - </message> - <message> <source>Use up and down arrows to navigate history, and <b>Ctrl-L</b> to clear screen.</source> <translation>Uporabi puščice za gor in dol za navigacijo po zgodovini in <b>Ctrl-L</b> za izbris izpisa na ekranu.</translation> </message> @@ -1438,7 +1338,7 @@ Naslov: %4 </message> <message> <source>Clear &All</source> - <translation>Počisti &vse</translation> + <translation>Počisti &vse </translation> </message> <message> <source>Balance:</source> @@ -1493,10 +1393,6 @@ Naslov: %4 <translation>Količina presega vaše dobroimetje</translation> </message> <message> - <source>Duplicate address found, can only send to each address once per send operation.</source> - <translation>Najdena kopija naslova, možnost pošiljanja na vsakega izmed naslov le enkrat ob pošiljanju.</translation> - </message> - <message> <source>Warning: Invalid Bitcoin address</source> <translation>Opozorilo: Neveljaven Bitcoin naslov</translation> </message> @@ -1805,10 +1701,6 @@ Naslov: %4 <translation>Vrsta</translation> </message> <message> - <source>Address</source> - <translation>Naslov</translation> - </message> - <message> <source>Open until %1</source> <translation>Odpri enoto %1</translation> </message> @@ -1825,6 +1717,10 @@ Naslov: %4 <translation>Generirano, toda ne sprejeto</translation> </message> <message> + <source>Label</source> + <translation>Oznaka</translation> + </message> + <message> <source>Unconfirmed</source> <translation>Nepotrjeno</translation> </message> @@ -1865,10 +1761,6 @@ Naslov: %4 <translation>Vrsta transakcije.</translation> </message> <message> - <source>Destination address of transaction.</source> - <translation>Naslov prejemnika transakcije.</translation> - </message> - <message> <source>Amount removed from or added to balance.</source> <translation>Količina odlita ali prilita dobroimetju.</translation> </message> @@ -2083,14 +1975,6 @@ Naslov: %4 <translation>Uporabi testno omrežje</translation> </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>Napaka: Transakcija ni bila sprejeta! To se je morebiti zgodilo, ker so nekateri kovanci v vaši denarnici bili že porabljeni, na primer če ste uporabili kopijo wallet.dat in so tako kovanci bili porabljeni v kopiji, ostali pa označeni kot neporabljeni.</translation> - </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>Napaka: Ta transakcija potrebuje povizijo, ki je najmanj %s zaradi svoje količine, kompliciranosti, ali zaradi uporabe prejetih sredstev.</translation> - </message> - <message> <source>Execute command when a wallet transaction changes (%s in cmd is replaced by TxID)</source> <translation>Izvedi ukaz, ko bo transakcija denarnice se spremenila (V cmd je bil TxID zamenjan za %s)</translation> </message> @@ -2119,14 +2003,14 @@ Naslov: %4 <translation>Opozorilo: Premalo prostora na disku!</translation> </message> <message> - <source>Error: Wallet locked, unable to create transaction!</source> - <translation>Opozorilo: Denarnica je zaklenjena, ni mogoče opraviti transkacijo! </translation> - </message> - <message> <source>Importing...</source> <translation>Uvažam...</translation> </message> <message> + <source>Choose data directory on startup (default: 0)</source> + <translation>Ob zagonu izberi mapo za shranjevanje podatkov (privzeto: 0)</translation> + </message> + <message> <source>Information</source> <translation>Informacije</translation> </message> @@ -2135,10 +2019,26 @@ Naslov: %4 <translation>Pošlji sledilne/razhroščevalne informacije v konzolo namesto jih shraniti v debug.log datoteko</translation> </message> <message> + <source>Set SSL root certificates for payment request (default: -system-)</source> + <translation>Nastavi korenske SSL certifikate za plačilni zahtevek (privzeto: -system-)</translation> + </message> + <message> + <source>Set language, for example "de_DE" (default: system locale)</source> + <translation>Nastavi jezik, npr. "sl_SI" (privzeto: jezikovna oznaka sistema)</translation> + </message> + <message> + <source>Show splash screen on startup (default: 1)</source> + <translation>Ob zagonu prikaži uvodni zaslon (privzeto: 1)</translation> + </message> + <message> <source>Signing transaction failed</source> <translation>Podpisovanje transakcije spodletelo</translation> </message> <message> + <source>Start minimized</source> + <translation>Zaženi pomanjšano</translation> + </message> + <message> <source>Transaction amount too small</source> <translation>Količina transakcije je pramajhna</translation> </message> @@ -2159,10 +2059,6 @@ Naslov: %4 <translation>Opozorilo</translation> </message> <message> - <source>Warning: This version is obsolete, upgrade required!</source> - <translation>Opozorilo: ta različica je zastarela, potrebna je nadgradnja!</translation> - </message> - <message> <source>wallet.dat corrupt, salvage failed</source> <translation>wallet.dat poškodovana, neuspešna obnova</translation> </message> @@ -2227,10 +2123,6 @@ Naslov: %4 <translation>Neveljavna količina za -paytxfee=<amount>: '%s'</translation> </message> <message> - <source>Invalid amount</source> - <translation>Neveljavna količina</translation> - </message> - <message> <source>Insufficient funds</source> <translation>Premalo sredstev</translation> </message> @@ -2263,10 +2155,6 @@ Naslov: %4 <translation>Nalaganje končano</translation> </message> <message> - <source>To use the %s option</source> - <translation>Za uporabo %s opcije</translation> - </message> - <message> <source>Error</source> <translation>Napaka</translation> </message> diff --git a/src/qt/locale/bitcoin_sq.ts b/src/qt/locale/bitcoin_sq.ts index 7e63f239ca..2e345e85cb 100644 --- a/src/qt/locale/bitcoin_sq.ts +++ b/src/qt/locale/bitcoin_sq.ts @@ -1,23 +1,55 @@ -<TS language="sq" version="2.0"> +<TS language="sq" version="2.1"> <context> <name>AddressBookPage</name> <message> - <source>Double-click to edit address or label</source> - <translation>Klikoni 2 herë për të ndryshuar adressën ose etiketën</translation> + <source>Right-click to edit address or label</source> + <translation>Kliko me të djathtën për të ndryshuar adresën ose etiketen.</translation> </message> <message> <source>Create a new address</source> <translation>Krijo një adresë të re</translation> </message> <message> + <source>&New</source> + <translation>&E re</translation> + </message> + <message> <source>Copy the currently selected address to the system clipboard</source> <translation>Kopjo adresën e zgjedhur në memorjen e sistemit </translation> </message> <message> + <source>&Copy</source> + <translation>&Kopjo</translation> + </message> + <message> + <source>&Copy Address</source> + <translation>&Kopjo adresen</translation> + </message> + <message> + <source>Delete the currently selected address from the list</source> + <translation>Fshi adresen e selektuar nga lista</translation> + </message> + <message> <source>&Delete</source> <translation>&Fshi</translation> </message> <message> + <source>Choose the address to send coins to</source> + <translation>Zgjidh adresen ku do te dergoni monedhat</translation> + </message> + <message> + <source>Sending addresses</source> + <translation>Duke derguar adresen</translation> + </message> + <message> + <source>Receiving addresses</source> + <translation>Duke marr adresen</translation> + </message> + <message> + <source>&Edit</source> + <translation>&Ndrysho</translation> + </message> + <message> <source>Comma separated file (*.csv)</source> <translation>Skedar i ndarë me pikëpresje(*.csv)</translation> </message> @@ -53,7 +85,7 @@ </message> <message> <source>Encrypt wallet</source> - <translation>Enkripto portofolin</translation> + <translation>Kripto portofolin</translation> </message> <message> <source>This operation needs your wallet passphrase to unlock the wallet.</source> @@ -76,14 +108,14 @@ <translation>Ndrysho frazkalimin</translation> </message> <message> - <source>Enter the old and new passphrase to the wallet.</source> - <translation>Futni frazkalimin e vjetër dhe të ri në portofol. </translation> - </message> - <message> <source>Confirm wallet encryption</source> <translation>Konfirmoni enkriptimin e portofolit</translation> </message> <message> + <source>Are you sure you wish to encrypt your wallet?</source> + <translation>Jeni te sigurt te enkriptoni portofolin tuaj?</translation> + </message> + <message> <source>Wallet encrypted</source> <translation>Portofoli u enkriptua</translation> </message> @@ -147,6 +179,26 @@ <translation>Ndrysho frazkalimin e përdorur per enkriptimin e portofolit</translation> </message> <message> + <source>Bitcoin</source> + <translation>Bitcoin</translation> + </message> + <message> + <source>Wallet</source> + <translation>Portofol</translation> + </message> + <message> + <source>&Send</source> + <translation>&Dergo</translation> + </message> + <message> + <source>&Receive</source> + <translation>&Merr</translation> + </message> + <message> + <source>&Show / Hide</source> + <translation>&Shfaq / Fsheh</translation> + </message> + <message> <source>&File</source> <translation>&Skedar</translation> </message> @@ -163,6 +215,30 @@ <translation>Shiriti i mjeteve</translation> </message> <message> + <source>Bitcoin Core</source> + <translation>Berthama Bitcoin</translation> + </message> + <message> + <source>&About Bitcoin Core</source> + <translation>Rreth Berthames Bitkoin</translation> + </message> + <message> + <source>%1 and %2</source> + <translation>%1 dhe %2</translation> + </message> + <message> + <source>%1 behind</source> + <translation>%1 Pas</translation> + </message> + <message> + <source>Error</source> + <translation>Problem</translation> + </message> + <message> + <source>Information</source> + <translation>Informacion</translation> + </message> + <message> <source>Up to date</source> <translation>I azhornuar</translation> </message> @@ -193,6 +269,14 @@ <context> <name>CoinControlDialog</name> <message> + <source>Coin Selection</source> + <translation>Zgjedhja e monedhes</translation> + </message> + <message> + <source>Amount:</source> + <translation>Shuma:</translation> + </message> + <message> <source>Amount</source> <translation>Sasia</translation> </message> @@ -201,6 +285,18 @@ <translation>Data</translation> </message> <message> + <source>Copy address</source> + <translation>Kopjo adresën</translation> + </message> + <message> + <source>yes</source> + <translation>po</translation> + </message> + <message> + <source>no</source> + <translation>jo</translation> + </message> + <message> <source>(no label)</source> <translation>(pa etiketë)</translation> </message> @@ -250,12 +346,44 @@ </context> <context> <name>FreespaceChecker</name> + <message> + <source>name</source> + <translation>emri</translation> + </message> </context> <context> <name>HelpMessageDialog</name> + <message> + <source>Bitcoin Core</source> + <translation>Berthama Bitcoin</translation> + </message> + <message> + <source>version</source> + <translation>versioni</translation> + </message> + <message> + <source>About Bitcoin Core</source> + <translation>Rreth Berthames Bitkoin</translation> + </message> </context> <context> <name>Intro</name> + <message> + <source>Welcome</source> + <translation>Miresevini</translation> + </message> + <message> + <source>Welcome to Bitcoin Core.</source> + <translation>Miresevini ne Berthamen Bitcoin</translation> + </message> + <message> + <source>Bitcoin Core</source> + <translation>Berthama Bitcoin</translation> + </message> + <message> + <source>Error</source> + <translation>Problem</translation> + </message> </context> <context> <name>OpenURIDialog</name> @@ -292,6 +420,22 @@ </context> <context> <name>RPCConsole</name> + <message> + <source>&Open</source> + <translation>&Hap</translation> + </message> + <message> + <source>&Clear</source> + <translation>&Pastro</translation> + </message> + <message> + <source>never</source> + <translation>asnjehere</translation> + </message> + <message> + <source>Unknown</source> + <translation>i/e panjohur</translation> + </message> </context> <context> <name>ReceiveCoinsDialog</name> @@ -341,6 +485,10 @@ <translation>Dërgo Monedha</translation> </message> <message> + <source>Amount:</source> + <translation>Shuma:</translation> + </message> + <message> <source>Send to multiple recipients at once</source> <translation>Dërgo marrësve të ndryshëm njëkohësisht</translation> </message> @@ -417,6 +565,10 @@ <context> <name>SplashScreen</name> <message> + <source>Bitcoin Core</source> + <translation>Berthama Bitcoin</translation> + </message> + <message> <source>[testnet]</source> <translation>[testo rrjetin]</translation> </message> @@ -477,10 +629,6 @@ <translation>Lloji</translation> </message> <message> - <source>Address</source> - <translation>Adresë</translation> - </message> - <message> <source>Open until %1</source> <translation>Hapur deri më %1</translation> </message> @@ -497,6 +645,10 @@ <translation>I krijuar por i papranuar</translation> </message> <message> + <source>Label</source> + <translation>Etiketë</translation> + </message> + <message> <source>Received with</source> <translation>Marrë me</translation> </message> @@ -532,6 +684,10 @@ <translation>Minuar</translation> </message> <message> + <source>Copy address</source> + <translation>Kopjo adresën</translation> + </message> + <message> <source>Comma separated file (*.csv)</source> <translation>Skedar i ndarë me pikëpresje(*.csv)</translation> </message> @@ -570,5 +726,21 @@ </context> <context> <name>bitcoin-core</name> - </context> + <message> + <source>Information</source> + <translation>Informacion</translation> + </message> + <message> + <source>Insufficient funds</source> + <translation>Fonde te pamjaftueshme</translation> + </message> + <message> + <source>Rescanning...</source> + <translation>Rikerkim</translation> + </message> + <message> + <source>Error</source> + <translation>Problem</translation> + </message> +</context> </TS>
\ No newline at end of file diff --git a/src/qt/locale/bitcoin_sr.ts b/src/qt/locale/bitcoin_sr.ts index b005ce23ad..83e6e2f29e 100644 --- a/src/qt/locale/bitcoin_sr.ts +++ b/src/qt/locale/bitcoin_sr.ts @@ -1,11 +1,7 @@ -<TS language="sr" version="2.0"> +<TS language="sr" version="2.1"> <context> <name>AddressBookPage</name> <message> - <source>Double-click to edit address or label</source> - <translation>Kliknite dva puta da izmenite adresu ili etiketu</translation> - </message> - <message> <source>Create a new address</source> <translation>Napravite novu adresu</translation> </message> @@ -92,10 +88,6 @@ <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> @@ -112,10 +104,6 @@ <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>Bitcoin će se sad zatvoriti da bi završio proces enkripcije. Zapamti da enkripcija tvog novčanika ne može u potpunosti da zaštiti tvoje bitcoine da ne budu ukradeni od malawarea koji bi inficirao tvoj kompjuter.</translation> - </message> - <message> <source>Wallet encryption failed</source> <translation>Неуспело шифровање новчаника</translation> </message> @@ -203,10 +191,6 @@ <translation>Пошаљите новац на bitcoin адресу</translation> </message> <message> - <source>Modify configuration options for Bitcoin</source> - <translation>Изаберите могућности bitcoin-а</translation> - </message> - <message> <source>Change the passphrase used for wallet encryption</source> <translation>Мењање лозинке којом се шифрује новчаник</translation> </message> @@ -251,14 +235,6 @@ <translation>Придошла трансакција</translation> </message> <message> - <source>Date: %1 -Amount: %2 -Type: %3 -Address: %4 -</source> - <translation>Datum: %1⏎ Iznos: %2⏎ Tip: %3⏎ Adresa: %4⏎</translation> - </message> - <message> <source>Wallet is <b>encrypted</b> and currently <b>unlocked</b></source> <translation>Новчаник јс <b>шифрован</b> и тренутно <b>откључан</b></translation> </message> @@ -569,10 +545,6 @@ Address: %4 <translation>tip</translation> </message> <message> - <source>Address</source> - <translation>Адреса</translation> - </message> - <message> <source>Open until %1</source> <translation>Otvoreno do %1</translation> </message> @@ -589,6 +561,10 @@ Address: %4 <translation>Generisan ali nije prihvaćen</translation> </message> <message> + <source>Label</source> + <translation>Етикета</translation> + </message> + <message> <source>Received with</source> <translation>Primljen sa</translation> </message> @@ -625,10 +601,6 @@ Address: %4 <translation>Tip transakcije</translation> </message> <message> - <source>Destination address of transaction.</source> - <translation>Destinacija i adresa transakcije</translation> - </message> - <message> <source>Amount removed from or added to balance.</source> <translation>Iznos odbijen ili dodat balansu.</translation> </message> diff --git a/src/qt/locale/bitcoin_sv.ts b/src/qt/locale/bitcoin_sv.ts index 551f6976cf..8a46ae8470 100644 --- a/src/qt/locale/bitcoin_sv.ts +++ b/src/qt/locale/bitcoin_sv.ts @@ -1,9 +1,9 @@ -<TS language="sv" version="2.0"> +<TS language="sv" version="2.1"> <context> <name>AddressBookPage</name> <message> - <source>Double-click to edit address or label</source> - <translation>Dubbelklicka för att ändra adressen eller etiketten</translation> + <source>Right-click to edit address or label</source> + <translation>Högerklicka för att ändra adressen eller etiketten.</translation> </message> <message> <source>Create a new address</source> @@ -79,7 +79,7 @@ </message> <message> <source>&Edit</source> - <translation>&Editera</translation> + <translation>&Ändra</translation> </message> <message> <source>Export Address List</source> @@ -157,10 +157,6 @@ Var vänlig och försök igen.</translation> <translation>Ändra lösenord</translation> </message> <message> - <source>Enter the old and new passphrase to the wallet.</source> - <translation>Ange plånbokens gamla och nya lösenord.</translation> - </message> - <message> <source>Confirm wallet encryption</source> <translation>Bekräfta kryptering av plånbok</translation> </message> @@ -173,6 +169,10 @@ Var vänlig och försök igen.</translation> <translation>Är du säker på att du vill kryptera din plånbok?</translation> </message> <message> + <source>Bitcoin Core will close now to finish the encryption process. Remember that encrypting your wallet cannot fully protect your bitcoins from being stolen by malware infecting your computer.</source> + <translation>Bitcoin Core kommer att stängas för att slutföra krypteringsprocessen. Kom ihåg att plånbokskryptering inte garanterar fullt skydd mot skadlig kod på din dator.</translation> + </message> + <message> <source>IMPORTANT: Any previous backups you have made of your wallet file should be replaced with the newly generated, encrypted wallet file. For security reasons, previous backups of the unencrypted wallet file will become useless as soon as you start using the new, encrypted wallet.</source> <translation>VIKTIGT: Alla tidigare säkerhetskopior du har gjort av plånbokens fil ska ersättas med den nya genererade, krypterade plånboks filen. Av säkerhetsskäl kommer tidigare säkerhetskopior av den okrypterade plånboks filen blir oanvändbara när du börjar använda en ny, krypterad plånbok.</translation> </message> @@ -189,8 +189,8 @@ Var vänlig och försök igen.</translation> <translation>Ange plånbokens nya lösenord. <br/> Använd ett lösenord på <b>tio eller fler slumpmässiga tecken,</b> eller <b>åtta eller fler ord.</b>.</translation> </message> <message> - <source>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>Programmet kommer nu att stänga ner för att färdigställa krypteringen. Tänk på att en krypterad plånbok inte skyddar mot stöld om din dator är infekterad med en keylogger.</translation> + <source>Enter the old passphrase and new passphrase to the wallet.</source> + <translation>Ge det gamla lösenordet och det nya lösenordet för plånboken.</translation> </message> <message> <source>Wallet encryption failed</source> @@ -312,10 +312,6 @@ Var vänlig och försök igen.</translation> <translation>Skicka bitcoins till en Bitcoin-adress</translation> </message> <message> - <source>Modify configuration options for Bitcoin</source> - <translation>Ändra konfigurationsalternativ för Bitcoin</translation> - </message> - <message> <source>Backup wallet to another location</source> <translation>Säkerhetskopiera plånboken till en annan plats</translation> </message> @@ -404,6 +400,10 @@ Var vänlig och försök igen.</translation> <translation>&Om Bitcoin Core</translation> </message> <message> + <source>Modify configuration options for Bitcoin Core</source> + <translation>Ändra konfigurationsalternativ för Bitcoin Core</translation> + </message> + <message> <source>Show the list of used sending addresses and labels</source> <translation>Visa listan av använda avsändaradresser och etiketter</translation> </message> @@ -432,6 +432,10 @@ Var vänlig och försök igen.</translation> <translation>Ingen block-källa tillgänglig...</translation> </message> <message numerus="yes"> + <source>Processed %n block(s) of transaction history.</source> + <translation><numerusform>Bearbetade %n block av transaktionshistoriken.</numerusform><numerusform>Bearbetade %n block av transaktionshistoriken.</numerusform></translation> + </message> + <message numerus="yes"> <source>%n hour(s)</source> <translation><numerusform>%n timme</numerusform><numerusform>%n timmar</numerusform></translation> </message> @@ -479,35 +483,49 @@ Var vänlig och försök igen.</translation> <source>Up to date</source> <translation>Uppdaterad</translation> </message> - <message numerus="yes"> - <source>Processed %n blocks of transaction history.</source> - <translation><numerusform>Bearbetat %n block av transaktionshistoriken.</numerusform><numerusform>Bearbetat %n block av transaktionshistoriken.</numerusform></translation> - </message> <message> <source>Catching up...</source> <translation>Hämtar senaste...</translation> </message> <message> - <source>Sent transaction</source> - <translation>Transaktion skickad</translation> + <source>Date: %1 +</source> + <translation>Datum: %1 +</translation> </message> <message> - <source>Incoming transaction</source> - <translation>Inkommande transaktion</translation> + <source>Amount: %1 +</source> + <translation>Belopp: %1 +</translation> </message> <message> - <source>Date: %1 -Amount: %2 -Type: %3 -Address: %4 + <source>Type: %1 </source> - <translation>Datum: %1 -Belopp: %2 -Typ: %3 -Adress: %4 + <translation>Typ: %1 </translation> </message> <message> + <source>Label: %1 +</source> + <translation>Etikett: %1 +</translation> + </message> + <message> + <source>Address: %1 +</source> + <translation>Adress: %1 +</translation> + </message> + <message> + <source>Sent transaction</source> + <translation>Transaktion skickad</translation> + </message> + <message> + <source>Incoming transaction</source> + <translation>Inkommande transaktion</translation> + </message> + <message> <source>Wallet is <b>encrypted</b> and currently <b>unlocked</b></source> <translation>Denna plånbok är <b>krypterad</b> och för närvarande <b>olåst</b></translation> </message> @@ -698,6 +716,18 @@ Adress: %4 <translation>ingen</translation> </message> <message> + <source>This label turns red if the transaction size is greater than 1000 bytes.</source> + <translation>Denna etikett blir röd om transaktionens storlek är större än 1000 bytes.</translation> + </message> + <message> + <source>This label turns red if the priority is smaller than "medium".</source> + <translation>Denna etikett blir röd om prioriteten är lägre än "medium".</translation> + </message> + <message> + <source>This label turns red if any recipient receives an amount smaller than %1.</source> + <translation>Denna etikett blir röd om någon mottagare får ett belopp mindre än %1.</translation> + </message> + <message> <source>yes</source> <translation>ja</translation> </message> @@ -706,10 +736,6 @@ Adress: %4 <translation>nej</translation> </message> <message> - <source>This label turns red, if the transaction size is greater than 1000 bytes.</source> - <translation>Denna etikett blir röd om transaktionen överstiger 1000 byte.</translation> - </message> - <message> <source>This means a fee of at least %1 per kB is required.</source> <translation>Detta betyder att en avgift på minst %1 per kB behövs.</translation> </message> @@ -722,14 +748,6 @@ Adress: %4 <translation>Transaktioner med högre prioritet har större sannolikhet att inkluderas i ett block.</translation> </message> <message> - <source>This label turns red, if the priority is smaller than "medium".</source> - <translation>Denna etikett blir röd om prioriteten är mindre än "medium".</translation> - </message> - <message> - <source>This label turns red, if any recipient receives an amount smaller than %1.</source> - <translation>Denna etikett blir röd om någon mottagare får en betalning som är mindre än %1.</translation> - </message> - <message> <source>(no label)</source> <translation>(Ingen etikett)</translation> </message> @@ -850,30 +868,6 @@ Adress: %4 <source>command-line options</source> <translation>kommandoradsalternativ</translation> </message> - <message> - <source>UI options</source> - <translation>UI alternativ</translation> - </message> - <message> - <source>Set language, for example "de_DE" (default: system locale)</source> - <translation>Ändra språk, till exempel "de_DE" (förvalt: systemets språk)</translation> - </message> - <message> - <source>Start minimized</source> - <translation>Starta som minimerad</translation> - </message> - <message> - <source>Set SSL root certificates for payment request (default: -system-)</source> - <translation>Sätt SSL root-certifikat för betalningsbegäran (förvalt: -system-)</translation> - </message> - <message> - <source>Show splash screen on startup (default: 1)</source> - <translation>Visa startbilden vid uppstart (förvalt: 1)</translation> - </message> - <message> - <source>Choose data directory on startup (default: 0)</source> - <translation>Välj datakatalog vid uppstart (förvalt: 0)</translation> - </message> </context> <context> <name>Intro</name> @@ -956,14 +950,6 @@ Adress: %4 <translation>&Allmänt</translation> </message> <message> - <source>Automatically start Bitcoin after logging in to the system.</source> - <translation>Starta Bitcoin automatiskt efter inloggning.</translation> - </message> - <message> - <source>&Start Bitcoin on system login</source> - <translation>&Starta Bitcoin vid systemstart</translation> - </message> - <message> <source>Size of &database cache</source> <translation>Storleken på &databascache</translation> </message> @@ -988,6 +974,14 @@ Adress: %4 <translation>Proxyns IP-adress (t.ex. IPv4: 127.0.0.1 / IPv6: ::1)</translation> </message> <message> + <source>Minimize instead of exit the application when the window is closed. When this option is enabled, the application will be closed only after selecting Exit in the menu.</source> + <translation>Minimera istället för att stänga programmet när fönstret stängs. När detta alternativ är aktiverat stängs programmet endast genom att välja Stäng i menyn.</translation> + </message> + <message> + <source>The user interface language can be set here. This setting will take effect after restarting Bitcoin Core.</source> + <translation>Gränssnittets språk kan väljas här. Denna inställning träder i kraft efter omstart av Bitcoin Core.</translation> + </message> + <message> <source>Third party URLs (e.g. a block explorer) that appear in the transactions tab as context menu items. %s in the URL is replaced by transaction hash. Multiple URLs are separated by vertical bar |.</source> <translation>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> @@ -1012,6 +1006,14 @@ Adress: %4 <translation>&Nätverk</translation> </message> <message> + <source>Automatically start Bitcoin Core after logging in to the system.</source> + <translation>Kör Bitcoin Core automatiskt vid systeminloggning.</translation> + </message> + <message> + <source>&Start Bitcoin Core on system login</source> + <translation>&Kör Bitcoin Core vid systeminloggning</translation> + </message> + <message> <source>(0 = auto, <0 = leave that many cores free)</source> <translation>(0 = auto, <0 = lämna så många kärnor lediga)</translation> </message> @@ -1076,10 +1078,6 @@ Adress: %4 <translation>&Minimera till systemfältet istället för aktivitetsfältet</translation> </message> <message> - <source>Minimize instead of exit the application when the window is closed. When this option is enabled, the application will be closed only after selecting Quit in the menu.</source> - <translation>Minimera applikationen istället för att stänga ner den när fönstret stängs. Detta innebär att programmet fotrsätter att köras tills du väljer Avsluta i menyn.</translation> - </message> - <message> <source>M&inimize on close</source> <translation>M&inimera vid stängning</translation> </message> @@ -1092,10 +1090,6 @@ Adress: %4 <translation>Användargränssnittets &språk: </translation> </message> <message> - <source>The user interface language can be set here. This setting will take effect after restarting Bitcoin.</source> - <translation>Användargränssnittets språk kan ställas in här. Denna inställning träder i kraft efter en omstart av Bitcoin.</translation> - </message> - <message> <source>&Unit to show amounts in:</source> <translation>&Måttenhet att visa belopp i: </translation> </message> @@ -1132,8 +1126,8 @@ Adress: %4 <translation>Klientomstart är nödvändig för att aktivera ändringarna.</translation> </message> <message> - <source>Client will be shutdown, do you want to proceed?</source> - <translation>Klienten skall stängas av, vill du fortsätta?</translation> + <source>Client will be shut down. Do you want to proceed?</source> + <translation>Programmet kommer att stängas. Vill du fortsätta?</translation> </message> <message> <source>This change would require a client restart.</source> @@ -1242,10 +1236,6 @@ Adress: %4 <translation>Betalningsbegärans nätverk matchar inte klientens nätverk.</translation> </message> <message> - <source>Payment request has expired.</source> - <translation>Tiden för betalningsbegäran gick ut</translation> - </message> - <message> <source>Payment request is not initialized.</source> <translation>Betalningsbegäran är inte initierad.</translation> </message> @@ -1278,14 +1268,30 @@ Adress: %4 <translation>Betalningsbegäransfilen kan inte läsas! Detta kan orsakas av en felaktig betalningsbegäransfil.</translation> </message> <message> + <source>Payment request expired.</source> + <translation>Betalningsbegäran löpte ut.</translation> + </message> + <message> <source>Unverified payment requests to custom payment scripts are unsupported.</source> <translation>Overifierade betalningsbegärningar till specialbetalningsskript stöds inte.</translation> </message> <message> + <source>Invalid payment request.</source> + <translation>Ogiltig betalningsbegäran.</translation> + </message> + <message> <source>Refund from %1</source> <translation>Återbetalning från %1</translation> </message> <message> + <source>Payment request %1 is too large (%2 bytes, allowed %3 bytes).</source> + <translation>Betalningsbegäran %1 är för stor (%2 bytes, tillåten %3 bytes)</translation> + </message> + <message> + <source>Payment request DoS protection</source> + <translation>Betalningsbegäran begär DoS-skydd</translation> + </message> + <message> <source>Error communicating with %1: %2</source> <translation>Kommunikationsfel med %1: %2</translation> </message> @@ -1313,8 +1319,8 @@ Adress: %4 <translation>Användaragent</translation> </message> <message> - <source>Address/Hostname</source> - <translation>Adress/Värdnamn</translation> + <source>Node/Service</source> + <translation>Nod/Tjänst</translation> </message> <message> <source>Ping Time</source> @@ -1348,14 +1354,6 @@ Adress: %4 <translation>%1 s</translation> </message> <message> - <source>NETWORK</source> - <translation>NÄTVERK</translation> - </message> - <message> - <source>UNKNOWN</source> - <translation>OKÄND</translation> - </message> - <message> <source>None</source> <translation>Ingen</translation> </message> @@ -1446,6 +1444,10 @@ Adress: %4 <translation>Aktuellt antal block</translation> </message> <message> + <source>Open the Bitcoin Core debug log file from the current data directory. This can take a few seconds for large log files.</source> + <translation>Öppna felsökningsloggfilen för Bitcoin Core från den nuvarande datakatalogen. Detta kan ta några sekunder om loggfilen är stor.</translation> + </message> + <message> <source>Received</source> <translation>Mottagen</translation> </message> @@ -1514,6 +1516,10 @@ Adress: %4 <translation>Pingtid</translation> </message> <message> + <source>Time Offset</source> + <translation>Tidsförskjutning</translation> + </message> + <message> <source>Last block time</source> <translation>Sista blocktid</translation> </message> @@ -1554,16 +1560,12 @@ Adress: %4 <translation>Debugloggfil</translation> </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>Öppna Bitcoin debug-loggfilen som finns i datakatalogen. Detta kan ta några sekunder för stora loggfiler.</translation> - </message> - <message> <source>Clear console</source> <translation>Rensa konsollen</translation> </message> <message> - <source>Welcome to the Bitcoin RPC console.</source> - <translation>Välkommen till Bitcoin RPC-konsollen.</translation> + <source>Welcome to the Bitcoin Core RPC console.</source> + <translation>Välkommen till RPC-konsolen för Bitcoin Core.</translation> </message> <message> <source>Use up and down arrows to navigate history, and <b>Ctrl-L</b> to clear screen.</source> @@ -1850,14 +1852,6 @@ Adress: %4 <translation>Fäll ihop avgiftsinställningarna</translation> </message> <message> - <source>Minimize</source> - <translation>Minimera</translation> - </message> - <message> - <source>If the custom fee is set to 1000 satoshis and the transaction is only 250 bytes, then "per kilobyte" only pays 250 satoshis in fee, while "at least" pays 1000 satoshis. For transactions bigger than a kilobyte both pay by kilobyte.</source> - <translation>Om den anpassad avgiften är satt till 1000 satoshi och transaktionen bara är 250 byte, betalar "per kilobyte" bara 250 satoshi i avgift, medans "minst" betalar 1000 satoshi. För transaktioner större än en kilobyte betalar både per kilobyte.</translation> - </message> - <message> <source>per kilobyte</source> <translation>per kilobyte</translation> </message> @@ -1866,6 +1860,10 @@ Adress: %4 <translation>Om den anpassad avgiften är satt till 1000 satoshi och transaktionen bara är 250 byte, betalar "per kilobyte" bara 250 satoshi i avgift, medans "totalt minst" betalar 1000 satoshi. För transaktioner större än en kilobyte betalar både per kilobyte.</translation> </message> <message> + <source>Hide</source> + <translation>Göm</translation> + </message> + <message> <source>total at least</source> <translation>totalt minst</translation> </message> @@ -1986,10 +1984,6 @@ Adress: %4 <translation>eller</translation> </message> <message> - <source>The recipient address is not valid, please recheck.</source> - <translation>Mottagarens adress är inte giltig, vänligen kontrollera igen.</translation> - </message> - <message> <source>The amount to pay must be larger than 0.</source> <translation>Det betalade beloppet måste vara större än 0.</translation> </message> @@ -2002,10 +1996,6 @@ Adress: %4 <translation>Totalvärdet överstiger ditt saldo när transaktionsavgiften %1 är pålagd.</translation> </message> <message> - <source>Duplicate address found, can only send to each address once per send operation.</source> - <translation>Dubblett av adress funnen, kan bara skicka till varje adress en gång per sändning.</translation> - </message> - <message> <source>Transaction creation failed!</source> <translation>Transaktionen gick inte att skapa!</translation> </message> @@ -2014,16 +2004,28 @@ Adress: %4 <translation>Transaktionen avslogs! Detta kan hända om några av mynten i plånboken redan spenderats, t.ex om du använt en kopia av wallet.dat och mynt spenderades i kopian men inte markerats som spenderade här.</translation> </message> <message> - <source>A fee higher than %1 is considered an insanely high fee.</source> - <translation>En avgift högre än %1 anses som en onormalt hög avgift.</translation> + <source>A fee higher than %1 is considered an absurdly high fee.</source> + <translation>En avgift som är högre än %1 anses vara en orimligt hög avgift.</translation> + </message> + <message> + <source>Payment request expired.</source> + <translation>Betalningsbegäran löpte ut.</translation> + </message> + <message numerus="yes"> + <source>Estimated to begin confirmation within %n block(s).</source> + <translation><numerusform>Uppskattas till att påbörja bekräftelse inom %n block.</numerusform><numerusform>Uppskattas till att påbörja bekräftelse inom %n block.</numerusform></translation> </message> <message> <source>Pay only the minimum fee of %1</source> <translation>Betala endast den minimala avgiften på %1</translation> </message> <message> - <source>Estimated to begin confirmation within %1 block(s).</source> - <translation>Bekräftelsen beräknas börja inom %1 block.</translation> + <source>The recipient address is not valid. Please recheck.</source> + <translation>Mottagarens adress är ogiltig. Kontrollera igen.</translation> + </message> + <message> + <source>Duplicate address found: addresses should only be used once each.</source> + <translation>Duplicerad adress upptäckt: adresser skall endast användas en gång var.</translation> </message> <message> <source>Warning: Invalid Bitcoin address</source> @@ -2097,12 +2099,20 @@ Adress: %4 <translation>Radera denna post</translation> </message> <message> + <source>The fee will be deducted from the amount being sent. The recipient will receive less bitcoins than you enter in the amount field. If multiple recipients are selected, the fee is split equally.</source> + <translation>Avgiften dras från beloppet som skickas. Mottagaren kommer att få mindre bitcoins än du angivit i belopp-fältet. Om flera mottagare valts kommer avgiften delas jämt.</translation> + </message> + <message> <source>Message:</source> <translation>Meddelande:</translation> </message> <message> - <source>This is a verified payment request.</source> - <translation>Detta är en verifierad betalningsbegäran.</translation> + <source>This is an unauthenticated payment request.</source> + <translation>Detta är en oautentiserad betalningsbegäran.</translation> + </message> + <message> + <source>This is an authenticated payment request.</source> + <translation>Detta är en autentiserad betalningsbegäran.</translation> </message> <message> <source>Enter a label for this address to add it to the list of used addresses</source> @@ -2113,10 +2123,6 @@ Adress: %4 <translation>Ett meddelande som bifogades bitcoin-URI, vilket lagras med transaktionen som referens. NB: Meddelandet kommer inte att sändas över Bitcoinnätverket.</translation> </message> <message> - <source>This is an unverified payment request.</source> - <translation>Detta är en overifierad betalningsbegäran.</translation> - </message> - <message> <source>Pay To:</source> <translation>Betala Till:</translation> </message> @@ -2147,8 +2153,8 @@ Adress: %4 <translation>&Signera Meddelande</translation> </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>Du kan signera meddelanden med dina adresser för att bevisa att du äger dem. Var försiktig med vad du signerar eftersom phising-attacker kan försöka få dig att skriva över din identitet till någon annan. Signera bara väldetaljerade påståenden du kan gå i god för.</translation> + <source>You can sign messages/agreements with your addresses to prove you can receive bitcoins sent to them. Be careful not to sign anything vague or random, as phishing attacks may try to trick you into signing your identity over to them. Only sign fully-detailed statements you agree to.</source> + <translation>Du kan underteckna meddelanden/avtal med dina adresser för att bevisa att du kan ta emot bitcoins som skickats till dem. Var försiktig så du inte undertecknar något oklart eller konstigt, eftersom phishing-angrepp kan försöka få dig att underteckna din identitet till dem. Underteckna endast väldetaljerade meddelanden som du godkänner.</translation> </message> <message> <source>The Bitcoin address to sign the message with</source> @@ -2203,8 +2209,8 @@ Adress: %4 <translation>&Verifiera Meddelande</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>Skriv in din adress, meddelande (se till att du kopierar radbrytningar, mellanslag, tabbar, osv. exakt) och signatur nedan för att verifiera meddelandet. Var noga med att inte läsa in mer i signaturen än vad som finns i det signerade meddelandet, för att undvika att luras av en man-in-the-middle attack.</translation> + <source>Enter the receiver's address, message (ensure you copy line breaks, spaces, tabs, etc. exactly) and signature below to verify the message. Be careful not to read more into the signature than what is in the signed message itself, to avoid being tricked by a man-in-the-middle attack. Note that this only proves the signing party receives with the address, it cannot prove sendership of any transaction!</source> + <translation>Ange mottagarens adress, meddelande (kopiera radbrytningar, mellanrum, flikar, etc. exakt) och signatur nedan för att verifiera meddelandet. Undvik att läsa in mera information i signaturen än vad som stod i själva undertecknade meddelandet, för att undvika ett man-in-the-middle-angrepp. Notera att detta endast bevisar att undertecknad tar emot med adressen, det bevisar inte vem som skickat transaktionen!</translation> </message> <message> <source>The Bitcoin address the message was signed with</source> @@ -2470,10 +2476,6 @@ Adress: %4 <translation>Typ</translation> </message> <message> - <source>Address</source> - <translation>Adress</translation> - </message> - <message> <source>Immature (%1 confirmations, will be available after %2)</source> <translation>Omogen (%1 konfirmeringar, blir tillgänglig efter %2)</translation> </message> @@ -2502,6 +2504,10 @@ Adress: %4 <translation>Nerkopplad</translation> </message> <message> + <source>Label</source> + <translation>Etikett</translation> + </message> + <message> <source>Unconfirmed</source> <translation>Okonfirmerade</translation> </message> @@ -2558,8 +2564,8 @@ Adress: %4 <translation>Anger om granska-bara--adresser är involverade i denna transaktion.</translation> </message> <message> - <source>Destination address of transaction.</source> - <translation>Transaktionens destinationsadress.</translation> + <source>User-defined intent/purpose of the transaction.</source> + <translation>Användardefinierat syfte/ändamål för transaktionen.</translation> </message> <message> <source>Amount removed from or added to balance.</source> @@ -2800,34 +2806,14 @@ Adress: %4 <translation>Acceptera anslutningar utifrån (förvalt: 1 om ingen -proxy eller -connect)</translation> </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>%s, du behöver sätta ett rpclösensord i konfigurationsfilen: -%s -Det är rekommenderat att använda följande slumpade lösenord: -rpcuser=bitcoinrpc -rpcpassword=%s -(du behöver inte komma ihåg lösenordet) -Användarnamnet och lösenordet FÅR INTE bara detsamma. -Om filen inte existerar, skapa den med enbart ägarläsbara filrättigheter. -Det är också rekommenderat att sätta alertnotify så du meddelas om problem; -till exempel: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo.com -</translation> - </message> - <message> <source>Bind to given address and always listen on it. Use [host]:port notation for IPv6</source> <translation>Bind till given adress och lyssna alltid på den. Använd [värd]:port notation för IPv6</translation> </message> <message> + <source>Continuously rate-limit free transactions to <n>*1000 bytes per minute (default: %u)</source> + <translation>Hastighetsbegränsa avgiftsfria transaktionerna till <n>*1000 bytes per minut (förvalt: %u)</translation> + </message> + <message> <source>Delete all wallet transactions and only recover those parts of the blockchain through -rescan on startup</source> <translation>Ta bort alla plånbokstransaktioner och återskapa bara dom som är en del av blockkedjan genom att ange -rescan vid uppstart</translation> </message> @@ -2840,14 +2826,6 @@ till exempel: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo.com <translation>Ange regressiontestläge, som använder en speciell kedja i vilka block kan lösas omedelbart.</translation> </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>Fel: Transaktionen avslogs! Detta kan hända om några av mynten i plånboken redan spenderats, t.ex om du använt en kopia av wallet.dat och mynt spenderades i kopian men inte markerats som spenderas här.</translation> - </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>Fel: Denna transaktion kräver en transaktionsavgift på minst %s på grund av dess storlek, komplexitet, eller användning av senast mottagna bitcoins!</translation> - </message> - <message> <source>Execute command when a wallet transaction changes (%s in cmd is replaced by TxID)</source> <translation>Exekvera kommando när en plånbokstransaktion ändras (%s i cmd är ersatt av TxID)</translation> </message> @@ -2856,6 +2834,14 @@ till exempel: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo.com <translation>I denna mode kontrollerar -genproclimit hur många block som genereras på en gång.</translation> </message> <message> + <source>Maximum total fees to use in a single wallet transaction; setting this too low may abort large transactions (default: %s)</source> + <translation>Maximal total avgift att använda i en plånbokstransaktion. Sätts denna för lågt kommer stora transaktioner att avbrytas (förvalt: %s)</translation> + </message> + <message> + <source>Reduce storage requirements by pruning (deleting) old blocks. This mode disables wallet support and is incompatible with -txindex. Warning: Reverting this setting requires re-downloading the entire blockchain. (default: 0 = disable pruning blocks, >%u = target size in MiB to use for block files)</source> + <translation>Reducera lagringsbehovet genom att beskära (ta bort) gamla block. Detta läge avaktiverar plånbokssupport och är inkompatibel med -txindex. Varning: Ändras denna inställning måste hela blockkedjan laddas ner igen. 0 = avaktivera beskärning av blocks, >%u = målstorlek i MiB att använda för blockfiler)</translation> + </message> + <message> <source>Set the number of script verification threads (%u to %d, 0 = auto, <0 = leave that many cores free, default: %d)</source> <translation>Ange antalet skriptkontrolltrådar (%u till %d, 0 = auto, <0 = lämna så många kärnor lediga, förval: %d)</translation> </message> @@ -2924,10 +2910,6 @@ till exempel: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo.com <translation>Avlusnings/Testnings optioner:</translation> </message> <message> - <source>Discover own IP address (default: 1 when listening and no -externalip)</source> - <translation>Hitta egen IP-adress (förvalt: 1 under lyssning och utan -externalip)</translation> - </message> - <message> <source>Do not load the wallet and disable wallet RPC calls</source> <translation>Ladda inte plånboken och stäng av RPC-anrop till plånboken</translation> </message> @@ -2960,10 +2942,6 @@ till exempel: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo.com <translation>Fel: Hårddiskutrymme är lågt!</translation> </message> <message> - <source>Error: Wallet locked, unable to create transaction!</source> - <translation>Fel: Plånboken är låst, det går ej att skapa en transaktion!</translation> - </message> - <message> <source>Failed to listen on any port. Use -listen=0 if you want this.</source> <translation>Misslyckades att lyssna på någon port. Använd -listen=0 om du vill detta.</translation> </message> @@ -2992,8 +2970,12 @@ till exempel: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo.com <translation>Anslut enbart till noder i nätverket <net> (IPv4, IPv6 eller onion)</translation> </message> <message> - <source>Rebuild block chain index from current blk000??.dat files</source> - <translation>Återskapa blockkedjans index från nuvarande blk000??.dat filer</translation> + <source>Prune cannot be configured with a negative value.</source> + <translation>Beskärning kan inte konfigureras med ett negativt värde.</translation> + </message> + <message> + <source>Prune mode is incompatible with -txindex.</source> + <translation>Beskärningsläge är inkompatibel med -txindex.</translation> </message> <message> <source>Set database cache size in megabytes (%d to %d, default: %d)</source> @@ -3032,6 +3014,10 @@ till exempel: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo.com <translation>Plånboksinställningar:</translation> </message> <message> + <source>Warning: This version is obsolete; upgrade required!</source> + <translation>Varning: Denna version är föråldrad; uppgradering krävs!</translation> + </message> + <message> <source>You need to rebuild the database using -reindex to change -txindex</source> <translation>Du måste återskapa databasen med -reindex för att ändra -txindex</translation> </message> @@ -3060,14 +3046,14 @@ till exempel: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo.com <translation>Kan inte låsa data-mappen %s. Bitcoin Core körs förmodligen redan.</translation> </message> <message> - <source>Continuously rate-limit free transactions to <n>*1000 bytes per minute (default:%u)</source> - <translation>Antalsbegränsa kontinuerligt fria transaktioner till <n>*1000 bytes per minut (förvalt:%u)</translation> - </message> - <message> <source>Create new files with system default permissions, instead of umask 077 (only effective with disabled wallet functionality)</source> <translation>Skapa nya filer med systemets förvalda rättigheter, istället för umask 077 (bara effektivt med avaktiverad plånboks funktionalitet)</translation> </message> <message> + <source>Discover own IP addresses (default: 1 when listening and no -externalip or -proxy)</source> + <translation>Upptäck egna IP adresser (standard: 1 vid lyssning ingen -externalip eller -proxy)</translation> + </message> + <message> <source>Error: Listening for incoming connections failed (listen returned error %s)</source> <translation>Fel: Avlyssning av inkommande anslutningar misslyckades (Avlyssningen returnerade felkod %s)</translation> </message> @@ -3088,22 +3074,74 @@ till exempel: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo.com <translation>Avgifter (i BTC/Kb) mindre än detta betraktas som nollavgift för transaktionsskapande (förvalt: %s)</translation> </message> <message> + <source>If paytxfee is not set, include enough fee so transactions begin confirmation on average within n blocks (default: %u)</source> + <translation>Om paytxfee inte är satt, inkludera tillräcklig avgift så att transaktionen börjar att konfirmeras inom n blocks (förvalt: %u)</translation> + </message> + <message> + <source>Invalid amount for -maxtxfee=<amount>: '%s' (must be at least the minrelay fee of %s to prevent stuck transactions)</source> + <translation>Otillåtet belopp för -maxtxfee=<belopp>: '%s' (måste åtminstånde vara minrelay avgift %s för att förhindra stoppade transkationer)</translation> + </message> + <message> <source>Maximum size of data in data carrier transactions we relay and mine (default: %u)</source> <translation>Maximal storlek på data i databärartransaktioner som vi reläar och bryter (förvalt: %u) </translation> </message> <message> + <source>Prune configured below the minimum of %d MB. Please use a higher number.</source> + <translation>Beskärning konfigurerad under miniminivån %d MB. Var vänlig använd ett högre värde.</translation> + </message> + <message> <source>Query for peer addresses via DNS lookup, if low on addresses (default: 1 unless -connect)</source> <translation>Sök efter klientadresser med DNS sökningen, om det finns otillräckligt med adresser (förvalt: 1 om inte -connect)</translation> </message> <message> + <source>Randomize credentials for every proxy connection. This enables Tor stream isolation (default: %u)</source> + <translation>Slumpa autentiseringen för varje proxyanslutning. Detta möjliggör Tor ström-isolering (förvalt: %u)</translation> + </message> + <message> + <source>Require high priority for relaying free or low-fee transactions (default: %u)</source> + <translation>Begär hög prioritet för att vidarebefodra lågavgiftstransaktioner (förvalt: %u)</translation> + </message> + <message> <source>Set maximum size of high-priority/low-fee transactions in bytes (default: %d)</source> <translation>Sätt den maximala storleken av hög-prioriterade/låg-avgifts transaktioner i byte (förvalt: %d)</translation> </message> <message> + <source>The transaction amount is too small to send after the fee has been deducted</source> + <translation>Transaktionen är för liten att skicka efter det att avgiften har dragits</translation> + </message> + <message> <source>This product includes software developed by the OpenSSL Project for use in the OpenSSL Toolkit <https://www.openssl.org/> and cryptographic software written by Eric Young and UPnP software written by Thomas Bernard.</source> <translation>Denna produkten innehåller mjukvara utvecklad av OpenSSL Project för användning i OpenSSL Toolkit <https://www.openssl.org/> och kryptografisk mjukvara utvecklad av Eric Young samt UPnP-mjukvara skriven av Thomas Bernard.</translation> </message> <message> + <source>To use bitcoind, or the -server option to bitcoin-qt, you must set an 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>För att använda bitconid,eller -server optionen till bitcoin-qt så mäste du sätta ett rpclösensord i konfigurationsfilen: +%s +Det är rekommenderat att använda följande slumpade lösenord: +rpcuser=bitcoinrpc +rpcpassword=%s +(du behöver inte komma ihåg lösenordet) +Användarnamnet och lösenordet FÅR INTE vara detsamma. +Om filen inte existerar, skapa den med enbart ägarläsbara filrättigheter. +Det är också rekommenderat att sätta alertnotify så du meddelas om problem; +till exempel: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo.com +</translation> + </message> + <message> + <source>Warning: -maxtxfee is set very high! Fees this large could be paid on a single transaction.</source> + <translation>Varning: -maxtxfee är satt väldigt hög! Så höga avgifter kan betalas för en enstaka transaktion.</translation> + </message> + <message> <source>Warning: Please check that your computer's date and time are correct! If your clock is wrong Bitcoin Core will not work properly.</source> <translation>Varning: Vänligen kolla så att din dators datum och tid är korrekt! Om din klocka går fel kommer Bitcoin Core inte att fungera korrekt.</translation> </message> @@ -3112,10 +3150,38 @@ till exempel: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo.com <translation>Vitlistade klienter kan inte bli DoS bannade och deras transaktioner reläas alltid, även om dom redan är i mempoolen, användbart för t.ex en gateway </translation> </message> <message> + <source>You need to rebuild the database using -reindex to go back to unpruned mode. This will redownload the entire blockchain</source> + <translation>Du måste bygga om databasen genom att använda -reindex för att återgå till obeskärt läge. Detta kommer att ladda ner hela blockkedjan.</translation> + </message> + <message> + <source>(default: %u)</source> + <translation>(förvalt: %u)</translation> + </message> + <message> + <source>Accept public REST requests (default: %u)</source> + <translation>Acceptera publika REST förfrågningar (förvalt: %u)</translation> + </message> + <message> + <source>Activating best chain...</source> + <translation>Aktiverar bästa kedjan...</translation> + </message> + <message> + <source>Allow self signed root certificates (default: 0)</source> + <translation>Tillåt självsignerade root-certifikat (förvalt: 0)</translation> + </message> + <message> + <source>Can't run with a wallet in prune mode.</source> + <translation>Kan inte köra med en plånbok i beskärningsläge.</translation> + </message> + <message> <source>Cannot resolve -whitebind address: '%s'</source> <translation>Kan inte matcha -whitebind adress: '%s'</translation> </message> <message> + <source>Choose data directory on startup (default: 0)</source> + <translation>Välj datakatalog vid uppstart (förvalt: 0)</translation> + </message> + <message> <source>Connect through SOCKS5 proxy</source> <translation>Anslut genom SOCKS5 proxy</translation> </message> @@ -3132,6 +3198,10 @@ till exempel: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo.com <translation>Fel vid inläsningen av wallet.dat: Kontofilen kräver en senare version av Bitcoin Core</translation> </message> <message> + <source>Error reading from database, shutting down.</source> + <translation>Fel vid läsning från databas, avslutar.</translation> + </message> + <message> <source>Error: Unsupported argument -tor found, use -onion.</source> <translation>Fel: Argumentet -tor stöds inte, använd -onion.</translation> </message> @@ -3148,6 +3218,10 @@ till exempel: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo.com <translation>Initieringschecken fallerade. Bitcoin Core stängs av...</translation> </message> <message> + <source>Invalid amount for -maxtxfee=<amount>: '%s'</source> + <translation>Otillåtet belopp för -maxtxfee=<belopp>: '%s'</translation> + </message> + <message> <source>Invalid amount for -minrelaytxfee=<amount>: '%s'</source> <translation>Ogiltigt belopp för -minrelaytxfee=<belopp>: '%s'</translation> </message> @@ -3164,10 +3238,6 @@ till exempel: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo.com <translation>Ogiltig nätmask angiven i -whitelist: '%s'</translation> </message> <message> - <source>Keep at most <n> unconnectable blocks in memory (default: %u)</source> - <translation>Håll som mest <n> oanslutningsbara block i minnet (förvalt: %u)</translation> - </message> - <message> <source>Keep at most <n> unconnectable transactions in memory (default: %u)</source> <translation>Håll som mest <n> oanslutningsbara transaktioner i minnet (förvalt: %u)</translation> </message> @@ -3180,10 +3250,6 @@ till exempel: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo.com <translation>Nodreläoptioner:</translation> </message> <message> - <source>Print block on startup, if found in block index</source> - <translation>Skriv ut block vid uppstart, om det hittas i blockindexet</translation> - </message> - <message> <source>RPC SSL options: (see the Bitcoin Wiki for SSL setup instructions)</source> <translation>RPC SSL optioner: (se Bitcoin Wiki för SSL inställningsinstruktioner)</translation> </message> @@ -3192,6 +3258,10 @@ till exempel: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo.com <translation>RPC serveroptioner:</translation> </message> <message> + <source>RPC support for HTTP persistent connections (default: %d)</source> + <translation>RPC support för HTTP permanent anslutning (förvalt: %d)</translation> + </message> + <message> <source>Randomly drop 1 of every <n> network messages</source> <translation>Slumpmässigt tappa 1 av varje <n> nåtverksmeddelande</translation> </message> @@ -3208,10 +3278,22 @@ till exempel: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo.com <translation>Sänd transaktioner som nollavgiftstransaktioner om möjligt (förvalt: %u)</translation> </message> <message> + <source>Set SSL root certificates for payment request (default: -system-)</source> + <translation>Sätt SSL root-certifikat för betalningsbegäran (förvalt: -system-)</translation> + </message> + <message> + <source>Set language, for example "de_DE" (default: system locale)</source> + <translation>Ändra språk, till exempel "de_DE" (förvalt: systemets språk)</translation> + </message> + <message> <source>Show all debugging options (usage: --help -help-debug)</source> <translation>Visa alla avlusningsoptioner (använd: --help -help-debug)</translation> </message> <message> + <source>Show splash screen on startup (default: 1)</source> + <translation>Visa startbilden vid uppstart (förvalt: 1)</translation> + </message> + <message> <source>Shrink debug.log file on client startup (default: 1 when no -debug)</source> <translation>Krymp debug.log filen vid klient start (förvalt: 1 vid ingen -debug)</translation> </message> @@ -3220,6 +3302,14 @@ till exempel: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo.com <translation>Signering av transaktion misslyckades</translation> </message> <message> + <source>Start minimized</source> + <translation>Starta som minimerad</translation> + </message> + <message> + <source>The transaction amount is too small to pay the fee</source> + <translation>Transaktionen är för liten för att betala avgiften</translation> + </message> + <message> <source>This is experimental software.</source> <translation>Detta är experimentmjukvara.</translation> </message> @@ -3232,10 +3322,18 @@ till exempel: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo.com <translation>Transaktionens belopp måste vara positiva</translation> </message> <message> + <source>Transaction too large for fee policy</source> + <translation>Transaktionen är för stor för avgiftspolicyn</translation> + </message> + <message> <source>Transaction too large</source> <translation>Transaktionen är för stor</translation> </message> <message> + <source>UI Options:</source> + <translation>UI Alternativ:</translation> + </message> + <message> <source>Unable to bind to %s on this computer (bind returned error %s)</source> <translation>Det går inte att binda till %s på den här datorn (bind returnerade felmeddelande %s)</translation> </message> @@ -3256,10 +3354,6 @@ till exempel: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo.com <translation>Varning</translation> </message> <message> - <source>Warning: This version is obsolete, upgrade required!</source> - <translation>Varning: denna version är föråldrad, uppgradering krävs!</translation> - </message> - <message> <source>Warning: Unsupported argument -benchmark ignored, use -debug=bench.</source> <translation>Varning: Argument -benchmark stöds inte och ignoreras, använd -debug=bench.</translation> </message> @@ -3328,10 +3422,6 @@ till exempel: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo.com <translation>Hur grundlig blockverifikationen vid -checkblocks är (0-4, förvalt: %u)</translation> </message> <message> - <source>If paytxfee is not set, include enough fee so transactions are confirmed on average within n blocks (default: %u)</source> - <translation>Om paytxfee inte är satt, inkludera tillräcklig avgift så att transaktionen konfirmeras inom n blocks (förvalt: %u)</translation> - </message> - <message> <source>Log transaction priority and fee per kB when mining blocks (default: %u)</source> <translation>Logga transaktionsprioritet och avgift per kB vid blockbrytning (förvalt: %u)</translation> </message> @@ -3408,6 +3498,10 @@ till exempel: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo.com <translation>Ha som mest <n> anslutningar till andra klienter (förvalt: %u)</translation> </message> <message> + <source>Make the wallet broadcast transactions</source> + <translation>Gör så att plånboken sänder ut transaktionerna</translation> + </message> + <message> <source>Maximum per-connection receive buffer, <n>*1000 bytes (default: %u)</source> <translation>Maximal mottagningsbuffert per anslutning, <n>*1000 byte (förvalt: %u)</translation> </message> @@ -3424,10 +3518,6 @@ till exempel: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo.com <translation>Skriv ut tidsstämpel i avlusningsinformationen (förvalt: %u)</translation> </message> <message> - <source>Print block tree on startup (default: %u)</source> - <translation>Skriv ut blockträdet vid uppstart (förvalt: %u)</translation> - </message> - <message> <source>Relay and mine data carrier transactions (default: %u)</source> <translation>Reläa och bearbeta databärartransaktioner (förvalt: %u) </translation> </message> @@ -3504,10 +3594,6 @@ till exempel: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo.com <translation>Ogiltigt belopp för -paytxfee=<belopp>:'%s'</translation> </message> <message> - <source>Invalid amount</source> - <translation>Ogiltig mängd</translation> - </message> - <message> <source>Insufficient funds</source> <translation>Otillräckligt med bitcoins</translation> </message> @@ -3540,10 +3626,6 @@ till exempel: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo.com <translation>Klar med laddning</translation> </message> <message> - <source>To use the %s option</source> - <translation>Att använda %s alternativet</translation> - </message> - <message> <source>Error</source> <translation>Fel</translation> </message> diff --git a/src/qt/locale/bitcoin_th_TH.ts b/src/qt/locale/bitcoin_th_TH.ts index 174816aaef..7b5d1ae01c 100644 --- a/src/qt/locale/bitcoin_th_TH.ts +++ b/src/qt/locale/bitcoin_th_TH.ts @@ -1,11 +1,7 @@ -<TS language="th_TH" version="2.0"> +<TS language="th_TH" version="2.1"> <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> @@ -76,10 +72,6 @@ <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> @@ -349,8 +341,8 @@ <context> <name>TransactionTableModel</name> <message> - <source>Address</source> - <translation>ที่อยู่</translation> + <source>Label</source> + <translation>ชื่อ</translation> </message> </context> <context> diff --git a/src/qt/locale/bitcoin_tr.ts b/src/qt/locale/bitcoin_tr.ts index ab02cc92a6..66902a515b 100644 --- a/src/qt/locale/bitcoin_tr.ts +++ b/src/qt/locale/bitcoin_tr.ts @@ -1,9 +1,9 @@ -<TS language="tr" version="2.0"> +<TS language="tr" version="2.1"> <context> <name>AddressBookPage</name> <message> - <source>Double-click to edit address or label</source> - <translation>Adresi ya da etiketi düzenlemek için çift tıklayınız</translation> + <source>Right-click to edit address or label</source> + <translation>Adresi ya da etiketi düzenlemek için sağ düğme ile tıklayınız.</translation> </message> <message> <source>Create a new address</source> @@ -27,7 +27,7 @@ </message> <message> <source>&Copy Address</source> - <translation>Adresi &kopyala</translation> + <translation>&Adresi Kopyala</translation> </message> <message> <source>Delete the currently selected address from the list</source> @@ -59,7 +59,7 @@ </message> <message> <source>Sending addresses</source> - <translation>Yollama adresleri</translation> + <translation>&Gönderme adresleri...</translation> </message> <message> <source>Receiving addresses</source> @@ -156,10 +156,6 @@ <translation>Parolayı değiştir</translation> </message> <message> - <source>Enter the old and new passphrase to the wallet.</source> - <translation>Cüzdan için eski ve yeni parolaları giriniz.</translation> - </message> - <message> <source>Confirm wallet encryption</source> <translation>Cüzdan şifrelenmesini teyit eder</translation> </message> @@ -188,10 +184,6 @@ <translation>Cüzdan için yeni parolayı giriniz.<br/>Lütfen <b>on ya da daha fazla rastgele karakter</b> veya <b>sekiz ya da daha fazla kelime</b> içeren bir parola kullanınız.</translation> </message> <message> - <source>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>Şifreleme işlemini tamamlamak için Bitcoin şimdi kapanacaktır. Cüzdanınızı şifrelemenin, Bitcoinlerinizin bilgisayara bulaşan kötücül bir yazılım tarafından çalınmaya karşı tamamen koruyamayacağını unutmayınız.</translation> - </message> - <message> <source>Wallet encryption failed</source> <translation>Cüzdan şifrelemesi başarısız oldu</translation> </message> @@ -311,10 +303,6 @@ <translation>Bir Bitcoin adresine Bitcoin yolla</translation> </message> <message> - <source>Modify configuration options for Bitcoin</source> - <translation>Bitcoin seçeneklerinin yapılandırmasını değiştir</translation> - </message> - <message> <source>Backup wallet to another location</source> <translation>Cüzdanı diğer bir konumda yedekle</translation> </message> @@ -478,10 +466,6 @@ <source>Up to date</source> <translation>Güncel</translation> </message> - <message numerus="yes"> - <source>Processed %n blocks of transaction history.</source> - <translation><numerusform>Muamele tarihçesinden %n blok işlendi</numerusform><numerusform>Muamele tarihçesinden %n blok işlendi</numerusform></translation> - </message> <message> <source>Catching up...</source> <translation>Aralık kapatılıyor...</translation> @@ -495,18 +479,6 @@ <translation>Gelen muamele</translation> </message> <message> - <source>Date: %1 -Amount: %2 -Type: %3 -Address: %4 -</source> - <translation>Tarih: %1 -Meblağ: %2 -Tür: %3 -Adres: %4 -</translation> - </message> - <message> <source>Wallet is <b>encrypted</b> and currently <b>unlocked</b></source> <translation>Cüzdan <b>şifrelenmiştir</b> ve şu anda <b>kilidi açıktır</b></translation> </message> @@ -709,10 +681,6 @@ Adres: %4 <translation>hayır</translation> </message> <message> - <source>This label turns red, if the transaction size is greater than 1000 bytes.</source> - <translation>Eğer muamele boyutu 1000 bayttan büyükse bu etkiket kırmızı olur.</translation> - </message> - <message> <source>This means a fee of at least %1 per kB is required.</source> <translation>Bu, kB başına en az %1 ücret gerektiği anlamnına gelir.</translation> </message> @@ -725,14 +693,6 @@ Adres: %4 <translation>Yüksek öncelikli muamelelerin bir bloğa dahil olmaları daha olasıdır.</translation> </message> <message> - <source>This label turns red, if the priority is smaller than "medium".</source> - <translation>Eğer öncelik "ortadan" düşükse bu etiket kırmızı olur.</translation> - </message> - <message> - <source>This label turns red, if any recipient receives an amount smaller than %1.</source> - <translation>Eğer herhangi bir alıcı %1'den düşük bir meblağ alırsa bu etiket kırmızı olur.</translation> - </message> - <message> <source>(no label)</source> <translation>(boş etiket)</translation> </message> @@ -853,30 +813,6 @@ Adres: %4 <source>command-line options</source> <translation>komut satırı seçenekleri</translation> </message> - <message> - <source>UI options</source> - <translation>Kullanıcı arayüzü seçenekleri</translation> - </message> - <message> - <source>Set language, for example "de_DE" (default: system locale)</source> - <translation>Lisan belirt, mesela "de_De" (varsayılan: sistem dili)</translation> - </message> - <message> - <source>Start minimized</source> - <translation>Küçültülmüş olarak başlat</translation> - </message> - <message> - <source>Set SSL root certificates for payment request (default: -system-)</source> - <translation>Ödeme talebi için SSL kök sertifikalarını belirle (varsayılan: -system-)</translation> - </message> - <message> - <source>Show splash screen on startup (default: 1)</source> - <translation>Başlatıldığında başlangıç ekranını göster (varsayılan: 1)</translation> - </message> - <message> - <source>Choose data directory on startup (default: 0)</source> - <translation>Başlangıçta veri klasörü seç (varsayılan: 0)</translation> - </message> </context> <context> <name>Intro</name> @@ -959,14 +895,6 @@ Adres: %4 <translation>&Esas ayarlar</translation> </message> <message> - <source>Automatically start Bitcoin after logging in to the system.</source> - <translation>Sistemde oturum açıldığında Bitcoin'i otomatik olarak başlat.</translation> - </message> - <message> - <source>&Start Bitcoin on system login</source> - <translation>Bitcoin'i sistem oturumuyla &başlat</translation> - </message> - <message> <source>Size of &database cache</source> <translation>&Veritabanı tamponunun boyutu</translation> </message> @@ -1079,10 +1007,6 @@ Adres: %4 <translation>İşlem çubuğu yerine sistem çekmecesine &küçült</translation> </message> <message> - <source>Minimize instead of exit the application when the window is closed. When this option is enabled, the application will be closed only after selecting Quit in the menu.</source> - <translation>Pencere kapatıldığında uygulamadan çıkmak yerine uygulamayı küçültür. Bu seçenek etkinleştirildiğinde, uygulama sadece menüden çıkış seçildiğinde kapanacaktır.</translation> - </message> - <message> <source>M&inimize on close</source> <translation>Kapatma sırasında k&üçült</translation> </message> @@ -1095,10 +1019,6 @@ Adres: %4 <translation>Kullanıcı arayüzü &lisanı:</translation> </message> <message> - <source>The user interface language can be set here. This setting will take effect after restarting Bitcoin.</source> - <translation>Kullanıcı arayüzünün dili burada belirtilebilir. Bu ayar Bitcoin tekrar başlatıldığında etkinleşecektir.</translation> - </message> - <message> <source>&Unit to show amounts in:</source> <translation>Meblağları göstermek için &birim:</translation> </message> @@ -1135,10 +1055,6 @@ Adres: %4 <translation>Değişikliklerin uygulanması için istemcinin yeniden başlatılması lazımdır.</translation> </message> <message> - <source>Client will be shutdown, do you want to proceed?</source> - <translation>İstemci kapanacaktır, devam etmek istiyor musunuz?</translation> - </message> - <message> <source>This change would require a client restart.</source> <translation>Bu değişiklik istemcinin tekrar başlatılmasını gerektirir.</translation> </message> @@ -1245,10 +1161,6 @@ Adres: %4 <translation>Ödeme talebi şebekesi istemci şebekesine denk gelmiyor.</translation> </message> <message> - <source>Payment request has expired.</source> - <translation>Ödeme talebinin ömrü doldu.</translation> - </message> - <message> <source>Payment request is not initialized.</source> <translation>Ödeme talebi başlatılmamış.</translation> </message> @@ -1289,6 +1201,10 @@ Adres: %4 <translation>%1 öğesinden iade</translation> </message> <message> + <source>Payment request DoS protection</source> + <translation>Ödeme talebi DoS koruması</translation> + </message> + <message> <source>Error communicating with %1: %2</source> <translation>%1 ile iletişimde hata: %2</translation> </message> @@ -1316,10 +1232,6 @@ Adres: %4 <translation>Kullanıcı Yazılımı</translation> </message> <message> - <source>Address/Hostname</source> - <translation>Adres/Makine ismi</translation> - </message> - <message> <source>Ping Time</source> <translation>Ping Zamanı</translation> </message> @@ -1351,14 +1263,6 @@ Adres: %4 <translation>%1 s</translation> </message> <message> - <source>NETWORK</source> - <translation>ŞEBEKE</translation> - </message> - <message> - <source>UNKNOWN</source> - <translation>BİLİNMİYOR</translation> - </message> - <message> <source>None</source> <translation>Boş</translation> </message> @@ -1557,18 +1461,10 @@ Adres: %4 <translation>Hata ayıklama kütük dosyası</translation> </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>Güncel veri klasöründen Bitcoin hata ayıklama kütük dosyasını açar. Büyük kütük dosyaları için bu birkaç saniye alabilir.</translation> - </message> - <message> <source>Clear console</source> <translation>Konsolu temizle</translation> </message> <message> - <source>Welcome to the Bitcoin RPC console.</source> - <translation>Bitcoin RPC konsoluna hoş geldiniz.</translation> - </message> - <message> <source>Use up and down arrows to navigate history, and <b>Ctrl-L</b> to clear screen.</source> <translation>Tarihçede gezinmek için imleç tuşlarını kullanınız, <b>Ctrl-L</b> ile de ekranı temizleyebilirsiniz.</translation> </message> @@ -1857,14 +1753,6 @@ Adres: %4 <translation>ücret-ayarlarını-küçült</translation> </message> <message> - <source>Minimize</source> - <translation>Küçült</translation> - </message> - <message> - <source>If the custom fee is set to 1000 satoshis and the transaction is only 250 bytes, then "per kilobyte" only pays 250 satoshis in fee, while "at least" pays 1000 satoshis. For transactions bigger than a kilobyte both pay by kilobyte.</source> - <translation>Eğer özel ücret 1000 satoşi olarak ayarlandıysa ve muamele sadece 250 baytsa, "kilobayt başı" ücret olarak sadece 250 satoşi öder ve "asgari" 1000 satoşi öder. Bir kilobayttan yüksek muameleler için ikisi de kilobayt başı ödeme yapar.</translation> - </message> - <message> <source>per kilobyte</source> <translation>kilobayt başı</translation> </message> @@ -1993,10 +1881,6 @@ Adres: %4 <translation>veya</translation> </message> <message> - <source>The recipient address is not valid, please recheck.</source> - <translation>Alıcı adresi geçerli değildir, lütfen denetleyiniz.</translation> - </message> - <message> <source>The amount to pay must be larger than 0.</source> <translation>Ödeyeceğiniz tutarın sıfırdan yüksek olması gerekir.</translation> </message> @@ -2009,10 +1893,6 @@ Adres: %4 <translation>Toplam, %1 muamele ücreti ilâve edildiğinde bakiyenizi geçmektedir.</translation> </message> <message> - <source>Duplicate address found, can only send to each address once per send operation.</source> - <translation>Çift adres bulundu, belli bir gönderi sırasında her adrese sadece tek bir gönderide bulunulabilir.</translation> - </message> - <message> <source>Transaction creation failed!</source> <translation>Muamelenin oluşturulması başarısız oldu!</translation> </message> @@ -2021,18 +1901,10 @@ Adres: %4 <translation>Muamele reddedildi! Cüzdanınızdaki madenî paraların bazıları zaten harcanmış olduğunda bu meydana gelebilir. Örneğin wallet.dat dosyasının bir kopyasını kullandıysanız ve kopyada para harcandığında ancak burada harcandığı işaretlenmediğinde.</translation> </message> <message> - <source>A fee higher than %1 is considered an insanely high fee.</source> - <translation>%1 tutarından yüksek ücret delicesine aşırı yüksek bir ücret olarak kabul edilir.</translation> - </message> - <message> <source>Pay only the minimum fee of %1</source> <translation>Sadece asgari ücret olan %1 tutarını öde</translation> </message> <message> - <source>Estimated to begin confirmation within %1 block(s).</source> - <translation>Tahmini olarak %1 blok içinde teyide başlanacaktır.</translation> - </message> - <message> <source>Warning: Invalid Bitcoin address</source> <translation>Uyarı: geçersiz Bitcoin adresi</translation> </message> @@ -2108,10 +1980,6 @@ Adres: %4 <translation>Mesaj:</translation> </message> <message> - <source>This is a verified payment request.</source> - <translation>Bu, teyit edilmiş bir ödeme talebidir.</translation> - </message> - <message> <source>Enter a label for this address to add it to the list of used addresses</source> <translation>Kullanılmış adres listesine eklemek için bu adrese bir etiket girin</translation> </message> @@ -2120,10 +1988,6 @@ Adres: %4 <translation>Bitcoin: URI'siyle ilişkili ve bilginiz için muameleyle saklanacak bir mesaj. Not: Bu mesaj Bitcoin şebekesi üzerinden gönderilmeyecektir.</translation> </message> <message> - <source>This is an unverified payment request.</source> - <translation>Bu, teyit edilmemiş bir ödeme talebidir.</translation> - </message> - <message> <source>Pay To:</source> <translation>Şu adrese öde:</translation> </message> @@ -2154,10 +2018,6 @@ Adres: %4 <translation>Mesaj &imzala</translation> </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>Bir adresin sizin olduğunu ispatlamak için adresinizle mesaj imzalayabilirsiniz. Oltalama saldırılarının kimliğinizi imzanızla elde etmeyi deneyebilecekleri için belirsiz hiçbir şey imzalamamaya dikkat ediniz. Sadece ayrıntılı açıklaması olan ve tümüne katıldığınız ifadeleri imzalayınız.</translation> - </message> - <message> <source>The Bitcoin address to sign the message with</source> <translation>Mesajın imzalanmasında kullanılacak Bitcoin adresi</translation> </message> @@ -2210,10 +2070,6 @@ Adres: %4 <translation>Mesaj &kontrol et</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>İmza için kullanılan adresi, mesajı (satır sonları, boşluklar, sekmeler vs. karakterleri tam olarak kopyaladığınızdan emin olunuz) ve imzayı aşağıda giriniz. Bir ortadaki adam saldırısı tarafından kandırılmaya mâni olmak için imzadan, imzalı mesajın içeriğini aşan bir anlam çıkarmamaya dikkat ediniz.</translation> - </message> - <message> <source>The Bitcoin address the message was signed with</source> <translation>Mesajın imzalanmasında kullanılan Bitcoin adresi</translation> </message> @@ -2477,10 +2333,6 @@ Adres: %4 <translation>Tür</translation> </message> <message> - <source>Address</source> - <translation>Adres</translation> - </message> - <message> <source>Immature (%1 confirmations, will be available after %2)</source> <translation>Olgunlaşmamış (%1 teyit, %2 teyit ardından kullanılabilir olacaktır)</translation> </message> @@ -2509,6 +2361,10 @@ Adres: %4 <translation>Çevrim dışı</translation> </message> <message> + <source>Label</source> + <translation>Etiket</translation> + </message> + <message> <source>Unconfirmed</source> <translation>Teyit edilmemiş</translation> </message> @@ -2565,10 +2421,6 @@ Adres: %4 <translation>Bu muamelede sadece izlenen bir adresin bulunup bulunmadığı.</translation> </message> <message> - <source>Destination address of transaction.</source> - <translation>Muamelenin alıcı adresi.</translation> - </message> - <message> <source>Amount removed from or added to balance.</source> <translation>Bakiyeden alınan ya da bakiyeye eklenen meblağ.</translation> </message> @@ -2807,30 +2659,6 @@ Adres: %4 <translation>Dışarıdan gelen bağlantıları kabul et (varsayılan: -proxy veya -connect yoksa 1)</translation> </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>%s, şu yapılandırma dosyasında rpc parolası belirtmeniz gerekir: -%s -Aşağıdaki rastgele oluşturulan parolayı kullanmanız tavsiye edilir: -rpcuser=bitcoinrpc -rpcpassword=%s -(bu parolayı hatırlamanız gerekli değildir) -Kullanıcı ismi ile parolanın FARKLI olmaları gerekir. -Dosya mevcut değilse, sadece sahibi için okumayla sınırlı izin ile oluşturunuz. -Sorunlar hakkında bildiri almak için alertnotify unsurunu ayarlamanız tavsiye edilir; -mesela: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo.com -</translation> - </message> - <message> <source>Bind to given address and always listen on it. Use [host]:port notation for IPv6</source> <translation>Belirtilen adrese bağlan ve daima ondan dinle. IPv6 için [makine]:port yazımını kullanınız</translation> </message> @@ -2847,14 +2675,6 @@ mesela: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo.com <translation>Blokların anında çözülebileceği özel bir zincir kullanan regresyon deneme kipine gir.</translation> </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>Hata: Muamele reddedildi! Cüzdanınızdaki madenî paraların bazıları zaten harcanmış olduğunda bu meydana gelebilir. Örneğin wallet.dat dosyasının bir kopyasını kullandıysanız ve kopyada para harcandığında ancak burada harcandığı işaretlenmediğinde.</translation> - </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>Hata: Muamelenin meblağı, karmaşıklığı ya da yakın geçmişte alınan fonların kullanılması nedeniyle bu muamele en az %s tutarında ücret gerektirmektedir!</translation> - </message> - <message> <source>Execute command when a wallet transaction changes (%s in cmd is replaced by TxID)</source> <translation>Bir cüzdan muamelesi değiştiğinde komutu çalıştır (komuttaki %s muamele kimliği ile değiştirilecektir)</translation> </message> @@ -2931,10 +2751,6 @@ mesela: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo.com <translation>Hata ayıklama/deneme seçenekleri:</translation> </message> <message> - <source>Discover own IP address (default: 1 when listening and no -externalip)</source> - <translation>Kendi IP adresini keşfet (varsayılan: dinlenildiğinde ve -externalip yoksa 1)</translation> - </message> - <message> <source>Do not load the wallet and disable wallet RPC calls</source> <translation>Cüzdanı yükleme ve cüzdan RPC çağrılarını devre dışı bırak</translation> </message> @@ -2967,10 +2783,6 @@ mesela: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo.com <translation>Hata: Disk alanı düşük!</translation> </message> <message> - <source>Error: Wallet locked, unable to create transaction!</source> - <translation>Hata: Cüzdan kilitli, muamele oluşturulamadı!</translation> - </message> - <message> <source>Failed to listen on any port. Use -listen=0 if you want this.</source> <translation>Herhangi bir portun dinlenmesi başarısız oldu. Bunu istiyorsanız -listen=0 seçeneğini kullanınız.</translation> </message> @@ -2999,10 +2811,6 @@ mesela: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo.com <translation>Sadece <net> şebekesindeki düğümlere bağlan (ipv4, ipv6 veya onion)</translation> </message> <message> - <source>Rebuild block chain index from current blk000??.dat files</source> - <translation>Blok zinciri indeksini güncel blk000??.dat dosyalarından tekrar inşa et</translation> - </message> - <message> <source>Set database cache size in megabytes (%d to %d, default: %d)</source> <translation>Veritabanı önbellek boyutunu megabayt olarak belirt (%d ilâ %d, varsayılan: %d)</translation> </message> @@ -3067,10 +2875,6 @@ mesela: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo.com <translation>%s veri dizininde kilit elde edilemedi. Bitcoin Çekirdeği muhtemelen hâlihazırda çalışmaktadır.</translation> </message> <message> - <source>Continuously rate-limit free transactions to <n>*1000 bytes per minute (default:%u)</source> - <translation>Devamlı olarak ücretsiz muameleleri dakikada <n>*1000 bayt olarak sınırla (varsayılan: %u)</translation> - </message> - <message> <source>Create new files with system default permissions, instead of umask 077 (only effective with disabled wallet functionality)</source> <translation>Yeni dosyaları umask 077 yerine varsayılan izinlerle oluştur (sadece devre dışı cüzdan işlevselliği ile etkilidir)</translation> </message> @@ -3095,6 +2899,14 @@ mesela: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo.com <translation>Kb başına BTC olarak bundan düşük ücretler muamele oluşturulması için sıfır değerinde ücret olarak kabul edilir (varsayılan: %s)</translation> </message> <message> + <source>If paytxfee is not set, include enough fee so transactions begin confirmation on average within n blocks (default: %u)</source> + <translation>Eğer paytxfee ayarlanmadıysa kafi derecede ücret ekleyin ki muameleler teyite vasati n blok içinde başlasın (varsayılan: %u)</translation> + </message> + <message> + <source>Invalid amount for -maxtxfee=<amount>: '%s' (must be at least the minrelay fee of %s to prevent stuck transactions)</source> + <translation>-maxtxfee=<tutar> için geçersiz tutar: '%s' (Sıkışmış muameleleri önlemek için en az %s değerinde asgari aktarım ücretine eşit olmalıdır)</translation> + </message> + <message> <source>Maximum size of data in data carrier transactions we relay and mine (default: %u)</source> <translation>Aktardığımız ve oluşturduğumuz veri taşıyıcı muamelelerindeki azami veri boyutu (varsayılan: %u)</translation> </message> @@ -3115,6 +2927,34 @@ mesela: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo.com <translation>Bu ürün OpenSSL projesi tarafından OpenSSL araç takımı (http://www.openssl.org/) için geliştirilen yazılımlar, Eric Young (eay@cryptsoft.com) tarafından hazırlanmış şifreleme yazılımları ve Thomas Bernard tarafından programlanmış UPnP yazılımı içerir.</translation> </message> <message> + <source>To use bitcoind, or the -server option to bitcoin-qt, you must set an 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>bitcoind ya da bitcoin-qt ile -server seçeneğini kullanmak için yapılandırma dosyasında bir rpc parolası belirtmeniz gerekir: +%s +Aşağıdaki rastgele oluşturulan parolayı kullanmanız tavsiye edilir: +rpcuser=bitcoinrpc +rpcpassword=%s +(bu parolayı hatırlamanız gerekli değildir) +Kullanıcı ismi ile parolanın FARKLI olmaları gerekir. +Dosya mevcut değilse, sadece sahibi için okumayla sınırlı izin ile oluşturunuz. +Sorunlar hakkında bildiri almak için alertnotify unsurunu ayarlamanız tavsiye edilir; +mesela: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo.com +</translation> + </message> + <message> + <source>Warning: -maxtxfee is set very high! Fees this large could be paid on a single transaction.</source> + <translation>İkaz: -maxtxfee çok yüksek bir değere ayarlanmış! Bu denli yüksek ücretler tek bir muamelede ödenebilir.</translation> + </message> + <message> <source>Warning: Please check that your computer's date and time are correct! If your clock is wrong Bitcoin Core will not work properly.</source> <translation>Uyarı: Lütfen bilgisayarınızın saat ve tarihinin doğru olduğunu kontol ediniz! Saatinizde gecikme varsa Bitcoin Çekirdeği doğru şekilde çalışamaz.</translation> </message> @@ -3123,10 +2963,18 @@ mesela: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo.com <translation>Beyaz listeye alınan eşler DoS yasaklamasına uğramazlar ve muameleleri zaten mempool'da olsalar da daima aktarılır, bu mesela bir geçit için kullanışlıdır</translation> </message> <message> + <source>Accept public REST requests (default: %u)</source> + <translation>Herkese açık REST taleplerini kabul et (varsayılan: %u)</translation> + </message> + <message> <source>Cannot resolve -whitebind address: '%s'</source> <translation>-whitebind adresi çözümlenemedi: '%s'</translation> </message> <message> + <source>Choose data directory on startup (default: 0)</source> + <translation>Başlangıçta veri klasörü seç (varsayılan: 0)</translation> + </message> + <message> <source>Connect through SOCKS5 proxy</source> <translation>SOCKS5 vekil sunucusu vasıtasıyla bağlan</translation> </message> @@ -3159,6 +3007,10 @@ mesela: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo.com <translation>Başlatma sınaması başarısız oldu. Bitcoin Çekirdeği kapatılıyor.</translation> </message> <message> + <source>Invalid amount for -maxtxfee=<amount>: '%s'</source> + <translation>-maxtxfee=<tutar> için geçersiz tutar: '%s'</translation> + </message> + <message> <source>Invalid amount for -minrelaytxfee=<amount>: '%s'</source> <translation>-minrelaytxfee=<amount> için geçersiz meblağ: '%s'</translation> </message> @@ -3175,10 +3027,6 @@ mesela: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo.com <translation>-whitelist: '%s' unsurunda geçersiz bir ağ maskesi belirtildi</translation> </message> <message> - <source>Keep at most <n> unconnectable blocks in memory (default: %u)</source> - <translation>Hafızada en çok <n> bağlanılamaz blok tut (varsaylan: %u)</translation> - </message> - <message> <source>Keep at most <n> unconnectable transactions in memory (default: %u)</source> <translation>Hafızada en çok <n> bağlanılamaz muamele tut (varsayılan: %u)</translation> </message> @@ -3191,10 +3039,6 @@ mesela: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo.com <translation>Düğüm röle seçenekleri:</translation> </message> <message> - <source>Print block on startup, if found in block index</source> - <translation>Başlangıçta bloğu göster, blok indeksinde bulunduysa</translation> - </message> - <message> <source>RPC SSL options: (see the Bitcoin Wiki for SSL setup instructions)</source> <translation>RPC SSL seçenekleri: (SSL kurulumu yönergeleri için Bitcoin vikisine bakınız)</translation> </message> @@ -3219,10 +3063,22 @@ mesela: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo.com <translation>Muameleleri mümkünse ücretsiz olarak gönder (varsayılan: %u)</translation> </message> <message> + <source>Set SSL root certificates for payment request (default: -system-)</source> + <translation>Ödeme talebi için SSL kök sertifikalarını belirle (varsayılan: -system-)</translation> + </message> + <message> + <source>Set language, for example "de_DE" (default: system locale)</source> + <translation>Lisan belirt, mesela "de_De" (varsayılan: sistem dili)</translation> + </message> + <message> <source>Show all debugging options (usage: --help -help-debug)</source> <translation>Tüm hata ayıklama seçeneklerini göster (kullanımı: --help -help-debug)</translation> </message> <message> + <source>Show splash screen on startup (default: 1)</source> + <translation>Başlatıldığında başlangıç ekranını göster (varsayılan: 1)</translation> + </message> + <message> <source>Shrink debug.log file on client startup (default: 1 when no -debug)</source> <translation>İstemci başlatıldığında debug.log dosyasını küçült (varsayılan: -debug bulunmadığında 1)</translation> </message> @@ -3231,6 +3087,10 @@ mesela: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo.com <translation>Muamelenin imzalanması başarısız oldu</translation> </message> <message> + <source>Start minimized</source> + <translation>Küçültülmüş olarak başlat</translation> + </message> + <message> <source>This is experimental software.</source> <translation>Bu, deneysel bir yazılımdır.</translation> </message> @@ -3243,6 +3103,10 @@ mesela: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo.com <translation>Muamele tutarının pozitif olması lazımdır</translation> </message> <message> + <source>Transaction too large for fee policy</source> + <translation>Ücret politikası için çok büyük muamele</translation> + </message> + <message> <source>Transaction too large</source> <translation>Muamele çok büyük</translation> </message> @@ -3267,10 +3131,6 @@ mesela: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo.com <translation>Uyarı</translation> </message> <message> - <source>Warning: This version is obsolete, upgrade required!</source> - <translation>Uyarı: Bu sürüm çok eskidir, güncellemeniz gerekir!</translation> - </message> - <message> <source>Warning: Unsupported argument -benchmark ignored, use -debug=bench.</source> <translation>Uyarı: Deskteklenmeyen -benchmark argümanı görmezden gelindi, -debug=bench kullanınız.</translation> </message> @@ -3339,10 +3199,6 @@ mesela: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo.com <translation>-checkblocks'un blok kontrolünün ne kadar kapsamlı olacağı (0 ilâ 4, varsayılan: %u)</translation> </message> <message> - <source>If paytxfee is not set, include enough fee so transactions are confirmed on average within n blocks (default: %u)</source> - <translation>Eğer paytxfee ayarlanmadıysa, kafi derecede ücret ekleyin ki muameleler vasati n blok içinde teyit edilsin (varsayılan: %u)</translation> - </message> - <message> <source>Log transaction priority and fee per kB when mining blocks (default: %u)</source> <translation>Blok oluşturulduğunda muamele önceliğini ve kB başı ücreti kütüğe al (varsayılan: %u)</translation> </message> @@ -3435,10 +3291,6 @@ mesela: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo.com <translation>Hata ayıklama verilerinin önüne zaman damgası ekle (varsayılan: %u)</translation> </message> <message> - <source>Print block tree on startup (default: %u)</source> - <translation>Başlangıçta blok ağacını göster (varsayılan: %u)</translation> - </message> - <message> <source>Relay and mine data carrier transactions (default: %u)</source> <translation>Veri taşıyıcı muameleleri oluştur ve aktar (varsayılan: %u)</translation> </message> @@ -3515,10 +3367,6 @@ mesela: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo.com <translation>-paytxfee=<meblağ> için geçersiz meblağ: '%s'</translation> </message> <message> - <source>Invalid amount</source> - <translation>Geçersiz meblağ</translation> - </message> - <message> <source>Insufficient funds</source> <translation>Yetersiz bakiye</translation> </message> @@ -3551,10 +3399,6 @@ mesela: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo.com <translation>Yükleme tamamlandı</translation> </message> <message> - <source>To use the %s option</source> - <translation>%s seçeneğini kullanmak için</translation> - </message> - <message> <source>Error</source> <translation>Hata</translation> </message> diff --git a/src/qt/locale/bitcoin_uk.ts b/src/qt/locale/bitcoin_uk.ts index 9b5f4c9f4e..b2e67e296e 100644 --- a/src/qt/locale/bitcoin_uk.ts +++ b/src/qt/locale/bitcoin_uk.ts @@ -1,9 +1,9 @@ -<TS language="uk" version="2.0"> +<TS language="uk" version="2.1"> <context> <name>AddressBookPage</name> <message> - <source>Double-click to edit address or label</source> - <translation>Двічі клікніть на адресу чи назву для їх зміни</translation> + <source>Right-click to edit address or label</source> + <translation>Клік правою кнопкою для редагування адреси або мітки</translation> </message> <message> <source>Create a new address</source> @@ -156,10 +156,6 @@ <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> @@ -188,10 +184,6 @@ <translation>Введіть нову кодову фразу для гаманця.<br/>Будь ласка, використовуйте кодові фрази що містять <b> як мінімум десять випадкових символів </b> або <b> як мінімум вісім слів </b>.</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> @@ -311,10 +303,6 @@ <translation>Відправити монети на вказану адресу</translation> </message> <message> - <source>Modify configuration options for Bitcoin</source> - <translation>Редагувати параметри</translation> - </message> - <message> <source>Backup wallet to another location</source> <translation>Резервне копіювання гаманця в інше місце</translation> </message> @@ -478,10 +466,6 @@ <source>Up to date</source> <translation>Синхронізовано</translation> </message> - <message numerus="yes"> - <source>Processed %n blocks of transaction history.</source> - <translation><numerusform>Оброблено %n блок історії транзакцій.</numerusform><numerusform>Оброблено %n блоки історії транзакцій.</numerusform><numerusform>Оброблено %n блоків історії транзакцій.</numerusform></translation> - </message> <message> <source>Catching up...</source> <translation>Синхронізується...</translation> @@ -495,18 +479,6 @@ <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> @@ -709,10 +681,6 @@ Address: %4 <translation>ні</translation> </message> <message> - <source>This label turns red, if the transaction size is greater than 1000 bytes.</source> - <translation>Ця позначка буде червоною, якщо розмір транзакції вищий за 1000 байт.</translation> - </message> - <message> <source>This means a fee of at least %1 per kB is required.</source> <translation>Це означає, що необхідно внести комісію (щонайменше %1 за КБ).</translation> </message> @@ -725,14 +693,6 @@ Address: %4 <translation>Транзакції з вищим пріоритетом мають більше шансів бути включеними до блоку.</translation> </message> <message> - <source>This label turns red, if the priority is smaller than "medium".</source> - <translation>Ця позначка буде червоною, якщо пріоритет транзакції нижчий за «середній».</translation> - </message> - <message> - <source>This label turns red, if any recipient receives an amount smaller than %1.</source> - <translation>Ця позначка буде червоною, якщо будь хто з отримувачів отримає менше ніж %1.</translation> - </message> - <message> <source>(no label)</source> <translation>(немає назви)</translation> </message> @@ -853,30 +813,6 @@ Address: %4 <source>command-line options</source> <translation>параметри командного рядка</translation> </message> - <message> - <source>UI options</source> - <translation>Параметри інтерфейсу</translation> - </message> - <message> - <source>Set language, for example "de_DE" (default: system locale)</source> - <translation>Встановлення мови, наприклад "de_DE" (типово: системна)</translation> - </message> - <message> - <source>Start minimized</source> - <translation>Запускати згорнутим</translation> - </message> - <message> - <source>Set SSL root certificates for payment request (default: -system-)</source> - <translation>Вказати кореневі SSL-сертифікати для запиту платежу (типово: -системні-)</translation> - </message> - <message> - <source>Show splash screen on startup (default: 1)</source> - <translation>Показувати заставку під час запуску (типово: 1)</translation> - </message> - <message> - <source>Choose data directory on startup (default: 0)</source> - <translation>Обрати каталог даних під час запуску (типово: 0)</translation> - </message> </context> <context> <name>Intro</name> @@ -959,14 +895,6 @@ Address: %4 <translation>&Головні</translation> </message> <message> - <source>Automatically start Bitcoin after logging in to the system.</source> - <translation>Автоматично запускати гаманець при вході до системи.</translation> - </message> - <message> - <source>&Start Bitcoin on system login</source> - <translation>&Запускати гаманець при вході в систему</translation> - </message> - <message> <source>Size of &database cache</source> <translation>Розмір &кешу бази даних</translation> </message> @@ -1079,10 +1007,6 @@ Address: %4 <translation>Мінімізувати &у трей</translation> </message> <message> - <source>Minimize instead of exit the application when the window is closed. When this option is enabled, the application will be closed only after selecting Quit in the menu.</source> - <translation>Згортати замість закриття. Якщо ця опція включена, програма закриється лише після вибору відповідного пункту в меню.</translation> - </message> - <message> <source>M&inimize on close</source> <translation>Згортати замість закритт&я</translation> </message> @@ -1095,10 +1019,6 @@ Address: %4 <translation>Мов&а інтерфейсу користувача:</translation> </message> <message> - <source>The user interface language can be set here. This setting will take effect after restarting Bitcoin.</source> - <translation>Встановлює мову інтерфейсу. Зміни набудуть чинності після перезапуску Bitcoin.</translation> - </message> - <message> <source>&Unit to show amounts in:</source> <translation>В&имірювати монети в:</translation> </message> @@ -1135,10 +1055,6 @@ Address: %4 <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>Ця зміна вступить в силу після перезапуску клієнта</translation> </message> @@ -1245,10 +1161,6 @@ Address: %4 <translation>Мережа запиту платежу не є мережею клієнта.</translation> </message> <message> - <source>Payment request has expired.</source> - <translation>Запит платежу прострочено.</translation> - </message> - <message> <source>Payment request is not initialized.</source> <translation>Запит платежу не ініціалізовано.</translation> </message> @@ -1289,6 +1201,10 @@ Address: %4 <translation>Відшкодування з %1</translation> </message> <message> + <source>Payment request DoS protection</source> + <translation>Оплата потребує захисту DoS</translation> + </message> + <message> <source>Error communicating with %1: %2</source> <translation>Помилка зв'язку з %1: %2</translation> </message> @@ -1316,10 +1232,6 @@ Address: %4 <translation>Клієнт користувача</translation> </message> <message> - <source>Address/Hostname</source> - <translation>Адреса/Ім'я хоста</translation> - </message> - <message> <source>Ping Time</source> <translation>Затримка</translation> </message> @@ -1351,14 +1263,6 @@ Address: %4 <translation>%1 с</translation> </message> <message> - <source>NETWORK</source> - <translation>МЕРЕЖА</translation> - </message> - <message> - <source>UNKNOWN</source> - <translation>НЕВІДОМО</translation> - </message> - <message> <source>None</source> <translation>Відсутні</translation> </message> @@ -1557,18 +1461,10 @@ Address: %4 <translation>Файл звіту зневадження</translation> </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>Відкрийте файл журналу налагодження Bitcoin з поточного каталогу даних. Це може зайняти кілька секунд для великих файлів журналів.</translation> - </message> - <message> <source>Clear console</source> <translation>Очистити консоль</translation> </message> <message> - <source>Welcome to the Bitcoin RPC console.</source> - <translation>Вітаємо у консолі Bitcoin RPC.</translation> - </message> - <message> <source>Use up and down arrows to navigate history, and <b>Ctrl-L</b> to clear screen.</source> <translation>Використовуйте стрілки вгору вниз для навігації по історії, і <b>Ctrl-L</b> для очищення екрана.</translation> </message> @@ -1830,7 +1726,7 @@ Address: %4 </message> <message> <source>After Fee:</source> - <translation>Після комісії</translation> + <translation>Після комісії:</translation> </message> <message> <source>Change:</source> @@ -1857,14 +1753,6 @@ Address: %4 <translation>згорнути налаштування оплат</translation> </message> <message> - <source>Minimize</source> - <translation>Мінімізувати</translation> - </message> - <message> - <source>If the custom fee is set to 1000 satoshis and the transaction is only 250 bytes, then "per kilobyte" only pays 250 satoshis in fee, while "at least" pays 1000 satoshis. For transactions bigger than a kilobyte both pay by kilobyte.</source> - <translation>Якщо оплата користувача встановлюється в 1000 Satoshi і розмір передачі всього 250 байт, то "за кілобайт" платить тільки 250 Satoshi, в той час як "щонайменше" платить 1000 satoshis. Для передач більших, ніж кілобайт обоє платять за кілобайт.</translation> - </message> - <message> <source>per kilobyte</source> <translation>за кілобайт</translation> </message> @@ -1910,7 +1798,7 @@ Address: %4 </message> <message> <source>Send as zero-fee transaction if possible</source> - <translation>Надіслати як нульовий плата за передачу, якщо це можливо</translation> + <translation>Надіслати транзакцію без сплати комісії, якщо це можливо</translation> </message> <message> <source>(confirmation may take longer)</source> @@ -1993,10 +1881,6 @@ Address: %4 <translation>або</translation> </message> <message> - <source>The recipient address is not valid, please recheck.</source> - <translation>Адреса отримувача невірна, будь ласка перепровірте.</translation> - </message> - <message> <source>The amount to pay must be larger than 0.</source> <translation>Кількість монет для відправлення повинна бути більше 0.</translation> </message> @@ -2009,10 +1893,6 @@ Address: %4 <translation>Сума перевищить ваш баланс, якщо комісія %1 буде додана до вашої транзакції.</translation> </message> <message> - <source>Duplicate address found, can only send to each address once per send operation.</source> - <translation>Знайдено адресу що дублюється. Відправлення на кожну адресу дозволяється лише один раз на кожну операцію переказу.</translation> - </message> - <message> <source>Transaction creation failed!</source> <translation>Не вдалося створити транзакцію!</translation> </message> @@ -2021,7 +1901,7 @@ Address: %4 <translation>Транзакцію відхилено! Це може статись, якщо декілька монет з вашого гаманця вже використані, наприклад, якщо ви використовуєте одну копію гаманця (wallet.dat), а монети були використані з іншої копії, але не позначені як використані в цій.</translation> </message> <message> - <source>A fee higher than %1 is considered an insanely high fee.</source> + <source>A fee higher than %1 is considered an absurdly high fee.</source> <translation>Плата вища, ніж %1 вважається шалено високою.</translation> </message> <message> @@ -2029,10 +1909,6 @@ Address: %4 <translation>Платити тільки мінімальний збір у розмірі %1</translation> </message> <message> - <source>Estimated to begin confirmation within %1 block(s).</source> - <translation>Розрахунковий початок підтвердження протягом %1 блоку(ів).</translation> - </message> - <message> <source>Warning: Invalid Bitcoin address</source> <translation>Увага: Неправильна Bitcoin-адреса</translation> </message> @@ -2108,10 +1984,6 @@ Address: %4 <translation>Повідомлення:</translation> </message> <message> - <source>This is a verified payment request.</source> - <translation>Це перевірений запит платежу.</translation> - </message> - <message> <source>Enter a label for this address to add it to the list of used addresses</source> <translation>Введіть мітку для цієї адреси для додавання її в список використаних адрес</translation> </message> @@ -2120,10 +1992,6 @@ Address: %4 <translation>Повідомлення, що було додане до bitcoin:URI та буде збережено разом з транзакцією для довідки. Примітка: Це повідомлення не буде відправлено в мережу Bitcoin.</translation> </message> <message> - <source>This is an unverified payment request.</source> - <translation>Це неперевірений запит платежу.</translation> - </message> - <message> <source>Pay To:</source> <translation>Отримувач:</translation> </message> @@ -2154,10 +2022,6 @@ Address: %4 <translation>&Підписати повідомлення</translation> </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>Ви можете підписувати повідомлення зі своїми адресами, щоб довести, що ви є їх власником. Остерігайтеся підписувати будь-що незрозуміле, так як за допомогою фішинг-атаки вас можуть спробувати обдурити для отримання вашого підпису під чужими словами. Підписуйте тільки ті повідомлення, з якими ви повністю згодні.</translation> - </message> - <message> <source>The Bitcoin address to sign the message with</source> <translation>Адреса Bitcoin для підпису цього повідомлення</translation> </message> @@ -2210,10 +2074,6 @@ Address: %4 <translation>Перевірити повідомлення</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>Введіть нижче адресу підпису, повідомлення (впевніться, що ви точно скопіювали символи завершення рядку, табуляцію, пробіли тощо) та підпис для перевірки повідомлення. Впевніться, що в підпис не було додано зайвих символів: це допоможе уникнути атак типу «людина посередині».</translation> - </message> - <message> <source>The Bitcoin address the message was signed with</source> <translation>Адреса Bitcoin, якою було підписано це повідомлення</translation> </message> @@ -2477,10 +2337,6 @@ Address: %4 <translation>Тип</translation> </message> <message> - <source>Address</source> - <translation>Адреса</translation> - </message> - <message> <source>Immature (%1 confirmations, will be available after %2)</source> <translation>Незрілі (%1 підтверджень, будуть доступні після %2)</translation> </message> @@ -2509,6 +2365,10 @@ Address: %4 <translation>Поза мережею</translation> </message> <message> + <source>Label</source> + <translation>Назва</translation> + </message> + <message> <source>Unconfirmed</source> <translation>Не підтверджено</translation> </message> @@ -2565,10 +2425,6 @@ Address: %4 <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> @@ -2807,30 +2663,6 @@ Address: %4 <translation>Приймати підключення ззовні (типово: 1 за відсутності -proxy чи -connect)</translation> </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>%s, ви повинні встановити rpcpassword в файлі конфігурації: -%s -Рекомендується використати такий випадковий пароль: -rpcuser=bitcoinrpc -rpcpassword=%s -(ви не повинні пам'ятати цей пароль) -Ім’я користувача та пароль ПОВИННІ бути різними. -Якщо файлу не існує, створіть його, обмеживши доступ правом читання для власника. -Також рекомендується використовувати alertnotify для того, щоб отримувати сповіщення про проблеми; -наприклад: alertnotify=echo %%s | mail -s "Сповіщення Bitcoin" admin@foo.com -</translation> - </message> - <message> <source>Bind to given address and always listen on it. Use [host]:port notation for IPv6</source> <translation>Прив'язатися до даної адреси та прослуховувати її. Використовуйте запис виду [хост]:порт для IPv6</translation> </message> @@ -2847,14 +2679,6 @@ rpcpassword=%s <translation>Ввійти в режим регресивного тестування, що використовує спеціальний ланцюг з миттєвим знаходженням блоків.</translation> </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>Помилка: транзакцію було відхилено. Це може статись, якщо декілька монет з вашого гаманця вже використані, наприклад, якщо ви використовуєте одну копію гаманця (wallet.dat), а монети були використані з іншої копії, але не позначені як використані в цій.</translation> - </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>Помилка: Ця транзакція потребує додавання комісії щонайменше в %s через її розмір, складність, або внаслідок використання недавно отриманих коштів!</translation> - </message> - <message> <source>Execute command when a wallet transaction changes (%s in cmd is replaced by TxID)</source> <translation>Виконати команду, коли транзакція гаманця зміниться (замість %s в команді буде підставлено ідентифікатор транзакції)</translation> </message> @@ -2931,10 +2755,6 @@ rpcpassword=%s <translation>Параметри тестування/налагодження:</translation> </message> <message> - <source>Discover own IP address (default: 1 when listening and no -externalip)</source> - <translation>Визначити власну IP-адресу (типово: 1 при прослуховуванні та за відсутності -externalip)</translation> - </message> - <message> <source>Do not load the wallet and disable wallet RPC calls</source> <translation>Не завантажувати гаманець та вимкнути звернення до нього через RPC</translation> </message> @@ -2967,10 +2787,6 @@ rpcpassword=%s <translation>Помилка: Мало вільного місця на диску!</translation> </message> <message> - <source>Error: Wallet locked, unable to create transaction!</source> - <translation>Помилка: Гаманець заблокований, неможливо створити транзакцію!</translation> - </message> - <message> <source>Failed to listen on any port. Use -listen=0 if you want this.</source> <translation>Не вдалося слухати на жодному порту. Використовуйте -listen=0, якщо ви хочете цього.</translation> </message> @@ -2999,10 +2815,6 @@ rpcpassword=%s <translation>Підключити тільки до вузлів в мережі <net> (ipv4, ipv6 або onion)</translation> </message> <message> - <source>Rebuild block chain index from current blk000??.dat files</source> - <translation>Перебудувати індекс ланцюжка блоків з поточних файлів blk000??.dat</translation> - </message> - <message> <source>Set database cache size in megabytes (%d to %d, default: %d)</source> <translation>Встановити розмір кешу бази даних в мегабайтах (від %d до %d, типово: %d)</translation> </message> @@ -3067,10 +2879,6 @@ rpcpassword=%s <translation>Не вдалося встановити блокування на каталог даних %s. Bitcoin Core, ймовірно, вже запущений.</translation> </message> <message> - <source>Continuously rate-limit free transactions to <n>*1000 bytes per minute (default:%u)</source> - <translation>Обмежити швидкість передачі безкоштовних транзакцій до <n>*1000 байтів за хвилину (типово: %u)</translation> - </message> - <message> <source>Create new files with system default permissions, instead of umask 077 (only effective with disabled wallet functionality)</source> <translation>Створювати нові файли з типовими для системи атрибутами доступу замість маски 077 (діє тільки при вимкненому гаманці)</translation> </message> @@ -3095,6 +2903,10 @@ rpcpassword=%s <translation>Комісії (в BTC/КБ), що менші за вказану, вважатимуться нульовими (для створення транзакції) (типово: %s)</translation> </message> <message> + <source>If paytxfee is not set, include enough fee so transactions begin confirmation on average within n blocks (default: %u)</source> + <translation>Якщо параметр paytxfee не встановлено, включити комісію для отримання перших підтверджень транзакцій протягом n блоків (типово: %u)</translation> + </message> + <message> <source>Maximum size of data in data carrier transactions we relay and mine (default: %u)</source> <translation>Максимальний розмір даних в транзакціях носіїв даних, що ми передаємо і добуваємо (за замовчуванням: %u)</translation> </message> @@ -3115,6 +2927,34 @@ rpcpassword=%s <translation>Цей продукт включає в себе програмне забезпечення, розроблене в рамках проекту OpenSSL <https://www.openssl.org/>, криптографічне програмне забезпечення, написане Еріком Янгом, та функції для роботи з UPnP, написані Томасом Бернардом.</translation> </message> <message> + <source>To use bitcoind, or the -server option to bitcoin-qt, you must set an 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>Для використання bitcoind, або bitcoin-qt з параметром -server, ви повинні встановити rpcpassword в файлі конфігурації: +%s +Рекомендується використати такий випадковий пароль: +rpcuser=bitcoinrpc +rpcpassword=%s +(вам не треба запам'ятовувати цей пароль) +Ім'я користувача та пароль ПОВИННІ бути різними. +Якщо файлу не існує, створіть його, обмеживши доступ правом читання для власника. +Також рекомендується використовувати alertnotify для того, щоб отримувати сповіщення про проблеми; +наприклад: alertnotify=echo %%s | mail -s "Сповіщення Bitcoin" admin@foo.com +</translation> + </message> + <message> + <source>Warning: -maxtxfee is set very high! Fees this large could be paid on a single transaction.</source> + <translation>Увага: установлено дуже велике значення -maxtxfee! Такі великі комісії можуть бути сплачені в окремій транзакції.</translation> + </message> + <message> <source>Warning: Please check that your computer's date and time are correct! If your clock is wrong Bitcoin Core will not work properly.</source> <translation>Увага: будь ласка, перевірте дату і час на своєму комп'ютері! Якщо ваш годинник йде неправильно, Bitcoin Core може працювати некоректно.</translation> </message> @@ -3123,10 +2963,18 @@ rpcpassword=%s <translation>Учасники, що знаходяться в білому списку, не можуть бути заблоковані за DoS та їхні транзакції завжди ретранслюватимуться (навіть якщо вони є в пам'яті), що може бути корисним, наприклад, для шлюзу</translation> </message> <message> + <source>Accept public REST requests (default: %u)</source> + <translation>Приймати публічні REST-запити (типово: %u)</translation> + </message> + <message> <source>Cannot resolve -whitebind address: '%s'</source> <translation>Не вдалося розпізнати адресу для -whitebind: «%s»</translation> </message> <message> + <source>Choose data directory on startup (default: 0)</source> + <translation>Обрати каталог даних під час запуску (типово: 0)</translation> + </message> + <message> <source>Connect through SOCKS5 proxy</source> <translation>Підключитись через SOCKS5-проксі</translation> </message> @@ -3159,6 +3007,10 @@ rpcpassword=%s <translation>Не вдалося пройти базові перевірки під час ініціалізації. Bitcoin Core буде вимкнено.</translation> </message> <message> + <source>Invalid amount for -maxtxfee=<amount>: '%s'</source> + <translation>Неприпустима сума для -maxtxfee = <amount>: '%s'</translation> + </message> + <message> <source>Invalid amount for -minrelaytxfee=<amount>: '%s'</source> <translation>Вказано некоректну суму для параметру -minrelaytxfee: «%s»</translation> </message> @@ -3175,10 +3027,6 @@ rpcpassword=%s <translation>Вказано неправильну маску підмережі для -whitelist: «%s»</translation> </message> <message> - <source>Keep at most <n> unconnectable blocks in memory (default: %u)</source> - <translation>Утримувати в пам'яті щонайбільше <n> блоків, не під'єднаних до основного ланцюжка (типово: %u)</translation> - </message> - <message> <source>Keep at most <n> unconnectable transactions in memory (default: %u)</source> <translation>Утримувати в пам'яті щонайбільше <n> транзакцій, що споживають невідомі входи (типово: %u)</translation> </message> @@ -3191,10 +3039,6 @@ rpcpassword=%s <translation>Параметри вузла ретрансляції:</translation> </message> <message> - <source>Print block on startup, if found in block index</source> - <translation>Роздрукувати блок під час запуску (якщо він буде знайдений в індексі)</translation> - </message> - <message> <source>RPC SSL options: (see the Bitcoin Wiki for SSL setup instructions)</source> <translation>Параметри RPC SSL: (див. Bitcoin Wiki для налаштування SSL)</translation> </message> @@ -3216,13 +3060,25 @@ rpcpassword=%s </message> <message> <source>Send transactions as zero-fee transactions if possible (default: %u)</source> - <translation>Встановити операцію надсилання, як неоплатну операцію, якщо це можливо (за замовчуванням: %u)</translation> + <translation>Не сплачувати комісію за надсилання транзакцій, якщо це можливо (типово: %u)</translation> + </message> + <message> + <source>Set SSL root certificates for payment request (default: -system-)</source> + <translation>Вказати кореневі SSL-сертифікати для запиту платежу (типово: -системні-)</translation> + </message> + <message> + <source>Set language, for example "de_DE" (default: system locale)</source> + <translation>Встановлення мови, наприклад "de_DE" (типово: системна)</translation> </message> <message> <source>Show all debugging options (usage: --help -help-debug)</source> <translation>Показати всі налагоджувальні параметри (використання: --help -help-debug)</translation> </message> <message> + <source>Show splash screen on startup (default: 1)</source> + <translation>Показувати заставку під час запуску (типово: 1)</translation> + </message> + <message> <source>Shrink debug.log file on client startup (default: 1 when no -debug)</source> <translation>Стискати файл debug.log під час старту клієнта (типово: 1 коли відсутній параметр -debug)</translation> </message> @@ -3231,6 +3087,10 @@ rpcpassword=%s <translation>Підписання транзакції не вдалося</translation> </message> <message> + <source>Start minimized</source> + <translation>Запускати згорнутим</translation> + </message> + <message> <source>This is experimental software.</source> <translation>Це програмне забезпечення є експериментальним.</translation> </message> @@ -3243,6 +3103,10 @@ rpcpassword=%s <translation>Суми монет у транзакції мають бути позитивними</translation> </message> <message> + <source>Transaction too large for fee policy</source> + <translation>Транзакція занадто велика для правил комісії</translation> + </message> + <message> <source>Transaction too large</source> <translation>Транзакція занадто велика</translation> </message> @@ -3267,10 +3131,6 @@ rpcpassword=%s <translation>Попередження</translation> </message> <message> - <source>Warning: This version is obsolete, upgrade required!</source> - <translation>Увага: Поточна версія застаріла, необхідне оновлення!</translation> - </message> - <message> <source>Warning: Unsupported argument -benchmark ignored, use -debug=bench.</source> <translation>Увага: Параметр -benchmark не підтримується та буде проігнорований, використовуйте -debug=bench.</translation> </message> @@ -3339,10 +3199,6 @@ rpcpassword=%s <translation>Рівень ретельності перевірки блоків (0-4, типово: %u)</translation> </message> <message> - <source>If paytxfee is not set, include enough fee so transactions are confirmed on average within n blocks (default: %u)</source> - <translation>Якщо параметр paytxfee не встановлено, включити комісію, достатню для підтвердження транзакцій протягом n блоків (типово: %u)</translation> - </message> - <message> <source>Log transaction priority and fee per kB when mining blocks (default: %u)</source> <translation>Записувати в лог-файл пріоритет транзакції та комісію за кБ під час добування блоків (типово: %u)</translation> </message> @@ -3435,10 +3291,6 @@ rpcpassword=%s <translation>Доповнювати налагоджувальний вивід відміткою часу (типово: %u)</translation> </message> <message> - <source>Print block tree on startup (default: %u)</source> - <translation>Роздрукувати дерево блоків під час запуску (типово: %u)</translation> - </message> - <message> <source>Relay and mine data carrier transactions (default: %u)</source> <translation>Ретранслювати та створювати транзакції носіїв даних (типово: %u)</translation> </message> @@ -3515,10 +3367,6 @@ rpcpassword=%s <translation>Помилка у величині комісії -paytxfee=<amount>: «%s»</translation> </message> <message> - <source>Invalid amount</source> - <translation>Некоректна кількість</translation> - </message> - <message> <source>Insufficient funds</source> <translation>Недостатньо коштів</translation> </message> @@ -3551,10 +3399,6 @@ rpcpassword=%s <translation>Завантаження завершене</translation> </message> <message> - <source>To use the %s option</source> - <translation>Щоб використати опцію %s</translation> - </message> - <message> <source>Error</source> <translation>Помилка</translation> </message> diff --git a/src/qt/locale/bitcoin_ur_PK.ts b/src/qt/locale/bitcoin_ur_PK.ts index 86f3226269..9148626f57 100644 --- a/src/qt/locale/bitcoin_ur_PK.ts +++ b/src/qt/locale/bitcoin_ur_PK.ts @@ -1,11 +1,7 @@ -<TS language="ur_PK" version="2.0"> +<TS language="ur_PK" version="2.1"> <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> @@ -241,8 +237,8 @@ <translation>ٹائپ</translation> </message> <message> - <source>Address</source> - <translation> پتہ</translation> + <source>Label</source> + <translation>چٹ</translation> </message> <message> <source>Sent to</source> @@ -327,10 +323,6 @@ <translation>یہ مدد کا پیغام</translation> </message> <message> - <source>Invalid amount</source> - <translation>غلط رقم</translation> - </message> - <message> <source>Insufficient funds</source> <translation>ناکافی فنڈز</translation> </message> diff --git a/src/qt/locale/bitcoin_uz@Cyrl.ts b/src/qt/locale/bitcoin_uz@Cyrl.ts index 54e649aede..b8807afb13 100644 --- a/src/qt/locale/bitcoin_uz@Cyrl.ts +++ b/src/qt/locale/bitcoin_uz@Cyrl.ts @@ -1,11 +1,7 @@ -<TS language="uz@Cyrl" version="2.0"> +<TS language="uz@Cyrl" version="2.1"> <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> @@ -156,10 +152,6 @@ <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> @@ -188,10 +180,6 @@ <translation>Ҳамёнга янги махфий сўз киритинг.<br/>Илтимос, <b>ўнта ёки тасодифий белгили</b> махфий сўздан фойдаланинг ёки <b>саккизта ёки кўпроқ сўзлар</b>дан фойдаланинг.</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>Bitcoin кодлаш жараёнини тугатиш учун ёпилади. Ёдда сақланг: ҳамёнингизни кодлаш компьютерингизни зарарлаган зарарли дастурлар томонидан bitcoin тангаларингизни ўғирланишидан тўлиқ ҳимоя қила олмайди.</translation> - </message> - <message> <source>Wallet encryption failed</source> <translation>Ҳамённи кодлаш амалга ошмади</translation> </message> @@ -311,10 +299,6 @@ <translation>Тангаларни Bitcoin манзилига жўнатиш</translation> </message> <message> - <source>Modify configuration options for Bitcoin</source> - <translation>Bitcoin учун мослаш танловларини ўзгартириш</translation> - </message> - <message> <source>Backup wallet to another location</source> <translation>Ҳамённи бошқа манзилга заҳиралаш</translation> </message> @@ -491,18 +475,6 @@ <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> @@ -693,10 +665,6 @@ Address: %4 <translation>йўқ</translation> </message> <message> - <source>This label turns red, if the transaction size is greater than 1000 bytes.</source> - <translation>Агар ўтказманинг ҳажми 1000 байтдан ошса, ёрлиқ қизаради.</translation> - </message> - <message> <source>This means a fee of at least %1 per kB is required.</source> <translation>Бу дегани солиқ ҳар кб учун камида %1 талаб қилинади.</translation> </message> @@ -709,14 +677,6 @@ Address: %4 <translation>Юқори муҳимликка эга бўлган ўтказмалар тезда блокнинг ичига қўшимча олади.</translation> </message> <message> - <source>This label turns red, if the priority is smaller than "medium".</source> - <translation>Агар муҳимлиги "ўртача"дан паст бўлса, ушбу ёрлиқ қизил бўлиб ёнади.</translation> - </message> - <message> - <source>This label turns red, if any recipient receives an amount smaller than %1.</source> - <translation>Агар қабул қилувчи %1дан кичик миқдорни қабул қилса, ушбу ёрлиқ қизил бўлиб ёнади.</translation> - </message> - <message> <source>(no label)</source> <translation>(Ёрлик мавжуд эмас)</translation> </message> @@ -833,22 +793,6 @@ Address: %4 <source>command-line options</source> <translation>буйруқлар қатори орқали мослаш</translation> </message> - <message> - <source>UI options</source> - <translation>UI мосламалари</translation> - </message> - <message> - <source>Start minimized</source> - <translation>Йиғилганларни бошлаш</translation> - </message> - <message> - <source>Set SSL root certificates for payment request (default: -system-)</source> - <translation>Тўлов сўровлари учун SSL асос сертификатларини ўрнатиш (стандарт: -system-)</translation> - </message> - <message> - <source>Choose data directory on startup (default: 0)</source> - <translation>Ишга тушиш вақтида маълумотлар директориясини танлаш (стандарт: 0)</translation> - </message> </context> <context> <name>Intro</name> @@ -923,14 +867,6 @@ Address: %4 <translation>&Асосий</translation> </message> <message> - <source>Automatically start Bitcoin after logging in to the system.</source> - <translation>Тизимга киргандан сўнг Bitcoin дастури автоматик ишга туширилсин.</translation> - </message> - <message> - <source>&Start Bitcoin on system login</source> - <translation>Тизимга кирганда Bitcoin &ишга туширилсин</translation> - </message> - <message> <source>Size of &database cache</source> <translation>&Маълумотлар базаси кеши</translation> </message> @@ -995,10 +931,6 @@ Address: %4 <translation>Фойдаланувчи интерфейси &тили:</translation> </message> <message> - <source>The user interface language can be set here. This setting will take effect after restarting Bitcoin.</source> - <translation>Фойдаланувчи тили интерфесини шу ерда ўрнатиш мумкин. TУшбу созлама Bitcoin қайта ишга туширилганда кучга киради.</translation> - </message> - <message> <source>&Unit to show amounts in:</source> <translation>Миқдорларни кўрсатиш учун &қисм:</translation> </message> @@ -1027,10 +959,6 @@ Address: %4 <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>Ушбу ўзгариш мижозни қайтадан ишга туширишни талаб қилади.</translation> </message> @@ -1127,14 +1055,6 @@ Address: %4 <translation>%1 с</translation> </message> <message> - <source>NETWORK</source> - <translation>ТАРМОҚ</translation> - </message> - <message> - <source>UNKNOWN</source> - <translation>НОМАЪЛУМ</translation> - </message> - <message> <source>None</source> <translation>Йўқ</translation> </message> @@ -1297,18 +1217,10 @@ Address: %4 <translation>Тузатиш журнали файли</translation> </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>Жорий махлумотлар директориясидан Bitcoin тузатиш журнали файлини очинг. Бу катта журнал файллари учун бир неча сонияни олиши мумкин.</translation> - </message> - <message> <source>Clear console</source> <translation>Терминални тозалаш</translation> </message> <message> - <source>Welcome to the Bitcoin RPC console.</source> - <translation>Bitcoin RPC терминлга хуш келибсиз.</translation> - </message> - <message> <source>Use up and down arrows to navigate history, and <b>Ctrl-L</b> to clear screen.</source> <translation>Тарихни кўриш учун тепага ва пастга кўрсаткичларидан фойдаланинг, экранни тозалаш учун <b>Ctrl-L</b> тугмалар бирикмасидан фойдаланинг.</translation> </message> @@ -1392,6 +1304,26 @@ Address: %4 <translation>Сўралган тўлов тарихи</translation> </message> <message> + <source>&Request payment</source> + <translation>Тўловни &сўраш</translation> + </message> + <message> + <source>Show the selected request (does the same as double clicking an entry)</source> + <translation>Танланган сўровни кўрсатиш (икки марта босилганда ҳам бир хил амал бажарилсин)</translation> + </message> + <message> + <source>Show</source> + <translation>Кўрсатиш</translation> + </message> + <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> @@ -1693,10 +1625,6 @@ Address: %4 <translation>Тури</translation> </message> <message> - <source>Address</source> - <translation>Манзил</translation> - </message> - <message> <source>Open until %1</source> <translation>%1 гача очиш</translation> </message> @@ -1713,6 +1641,10 @@ Address: %4 <translation>Яратилди, аммо қабул қилинмади</translation> </message> <message> + <source>Label</source> + <translation>Ёрлиқ</translation> + </message> + <message> <source>Received with</source> <translation>Ёрдамида қабул қилиш</translation> </message> @@ -1745,10 +1677,6 @@ Address: %4 <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> @@ -1919,10 +1847,22 @@ Address: %4 <translation>Синов тармоғидан фойдаланинг</translation> </message> <message> + <source>Choose data directory on startup (default: 0)</source> + <translation>Ишга тушиш вақтида маълумотлар директориясини танлаш (стандарт: 0)</translation> + </message> + <message> <source>Information</source> <translation>Маълумот</translation> </message> <message> + <source>Set SSL root certificates for payment request (default: -system-)</source> + <translation>Тўлов сўровлари учун SSL асос сертификатларини ўрнатиш (стандарт: -system-)</translation> + </message> + <message> + <source>Start minimized</source> + <translation>Йиғилганларни бошлаш</translation> + </message> + <message> <source>Username for JSON-RPC connections</source> <translation>JSON-RPC уланишлари учун фойдаланувчи номи</translation> </message> diff --git a/src/qt/locale/bitcoin_vi.ts b/src/qt/locale/bitcoin_vi.ts index 3ca5605883..38ebd77b71 100644 --- a/src/qt/locale/bitcoin_vi.ts +++ b/src/qt/locale/bitcoin_vi.ts @@ -1,11 +1,7 @@ -<TS language="vi" version="2.0"> +<TS language="vi" version="2.1"> <context> <name>AddressBookPage</name> <message> - <source>Double-click to edit address or label</source> - <translation>Click đúp chuột để chỉnh sửa địa chỉ hoặc nhãn dữ liệu</translation> - </message> - <message> <source>Create a new address</source> <translation>Tạo một địa chỉ mới</translation> </message> @@ -165,8 +161,8 @@ <context> <name>TransactionTableModel</name> <message> - <source>Address</source> - <translation>Địa chỉ</translation> + <source>Label</source> + <translation>Nhãn dữ liệu</translation> </message> </context> <context> diff --git a/src/qt/locale/bitcoin_vi_VN.ts b/src/qt/locale/bitcoin_vi_VN.ts index bf76c8638a..18d1a252e7 100644 --- a/src/qt/locale/bitcoin_vi_VN.ts +++ b/src/qt/locale/bitcoin_vi_VN.ts @@ -1,73 +1,569 @@ -<TS language="vi_VN" version="2.0"> +<TS language="vi_VN" version="2.1"> <context> <name>AddressBookPage</name> <message> + <source>Right-click to edit address or label</source> + <translation>Nhấn chuột phải để sửa địa chỉ hoặc nhãn</translation> + </message> + <message> <source>Create a new address</source> <translation>Tạo một địa chỉ mới</translation> </message> + <message> + <source>&New</source> + <translation>&Mới</translation> + </message> + <message> + <source>Copy the currently selected address to the system clipboard</source> + <translation>Copy địa chỉ được chọn vào clipboard</translation> + </message> + <message> + <source>&Copy</source> + <translation>&Copy</translation> + </message> + <message> + <source>C&lose</source> + <translation>Đó&ng</translation> + </message> + <message> + <source>&Copy Address</source> + <translation>&Copy Địa Chỉ</translation> + </message> + <message> + <source>Delete the currently selected address from the list</source> + <translation>Xóa địa chỉ hiện tại từ danh sách</translation> + </message> + <message> + <source>Export the data in the current tab to a file</source> + <translation>Xuất dữ liệu trong mục hiện tại ra file</translation> + </message> + <message> + <source>&Export</source> + <translation>X&uất</translation> + </message> + <message> + <source>&Delete</source> + <translation>&Xó&a</translation> + </message> + <message> + <source>Choose the address to send coins to</source> + <translation>Chọn địa chỉ để gửi coin tới</translation> + </message> + <message> + <source>Choose the address to receive coins with</source> + <translation>Chọn địa chỉ để nhận coin</translation> + </message> + <message> + <source>C&hoose</source> + <translation>C&họn</translation> + </message> + <message> + <source>Sending addresses</source> + <translation>Địa chỉ gửi</translation> + </message> + <message> + <source>Receiving addresses</source> + <translation>Địa chỉ nhận</translation> + </message> + <message> + <source>Copy &Label</source> + <translation>Copy &Nhãn</translation> + </message> + <message> + <source>&Edit</source> + <translation>&Sửa</translation> + </message> + <message> + <source>Export Address List</source> + <translation>Xuất Danh Sách Địa Chỉ</translation> + </message> + <message> + <source>Comma separated file (*.csv)</source> + <translation>Comma separated file (*.csv)</translation> + </message> + <message> + <source>Exporting Failed</source> + <translation>Xuất Đã Thất Bại</translation> + </message> </context> <context> <name>AddressTableModel</name> - </context> + <message> + <source>Label</source> + <translation>Nhãn</translation> + </message> + <message> + <source>Address</source> + <translation>Địa chỉ</translation> + </message> + <message> + <source>(no label)</source> + <translation>(không nhãn)</translation> + </message> +</context> <context> <name>AskPassphraseDialog</name> + <message> + <source>Passphrase Dialog</source> + <translation>Hội thoại Passphrase</translation> + </message> + <message> + <source>Enter passphrase</source> + <translation>Điền passphrase</translation> + </message> + <message> + <source>New passphrase</source> + <translation>Passphrase mới</translation> + </message> + <message> + <source>Repeat new passphrase</source> + <translation>Điền lại passphrase</translation> + </message> + <message> + <source>Encrypt wallet</source> + <translation>Mã hóa ví</translation> + </message> + <message> + <source>Unlock wallet</source> + <translation>Mở khóa ví</translation> + </message> + <message> + <source>Decrypt wallet</source> + <translation>Giải mã ví</translation> + </message> + <message> + <source>Wallet encrypted</source> + <translation>Ví đã được mã hóa</translation> + </message> </context> <context> <name>BitcoinGUI</name> + <message> + <source>&Overview</source> + <translation>&Tổng quan</translation> + </message> + <message> + <source>Node</source> + <translation>Node</translation> + </message> + <message> + <source>E&xit</source> + <translation>T&hoát</translation> + </message> + <message> + <source>Quit application</source> + <translation>Thoát chương trình</translation> + </message> + <message> + <source>About &Qt</source> + <translation>Về &Qt</translation> + </message> + <message> + <source>Show information about Qt</source> + <translation>Xem thông tin về Qt</translation> + </message> + <message> + <source>Open &URI...</source> + <translation>Mở &URI...</translation> + </message> + <message> + <source>Bitcoin Core client</source> + <translation>Bitcoin Core client</translation> + </message> + <message> + <source>Bitcoin</source> + <translation>Bitcoin</translation> + </message> + <message> + <source>Wallet</source> + <translation>Ví</translation> + </message> + <message> + <source>&Send</source> + <translation>&Gửi</translation> + </message> + <message> + <source>&Receive</source> + <translation>&Nhận</translation> + </message> + <message> + <source>&Show / Hide</source> + <translation>Ẩn / H&iện</translation> + </message> + <message> + <source>Show or hide the main Window</source> + <translation>Hiện hoặc ẩn cửa sổ chính</translation> + </message> + <message> + <source>&File</source> + <translation>&File</translation> + </message> + <message> + <source>&Settings</source> + <translation>&Thiết lập</translation> + </message> + <message> + <source>&Help</source> + <translation>Trợ &giúp</translation> + </message> + <message> + <source>Bitcoin Core</source> + <translation>Bitcoin Core</translation> + </message> + <message> + <source>&About Bitcoin Core</source> + <translation>&Về Bitcoin Core</translation> + </message> + <message numerus="yes"> + <source>%n hour(s)</source> + <translation><numerusform>%n giờ</numerusform></translation> + </message> + <message numerus="yes"> + <source>%n day(s)</source> + <translation><numerusform>%n ngày</numerusform></translation> + </message> + <message numerus="yes"> + <source>%n week(s)</source> + <translation><numerusform>%n tuần</numerusform></translation> + </message> + <message> + <source>%1 and %2</source> + <translation>%1 và %2</translation> + </message> + <message numerus="yes"> + <source>%n year(s)</source> + <translation><numerusform>%n năm</numerusform></translation> + </message> + <message> + <source>Error</source> + <translation>Lỗi</translation> + </message> + <message> + <source>Warning</source> + <translation>Chú ý</translation> + </message> + <message> + <source>Information</source> + <translation>Thông tin</translation> + </message> + <message> + <source>Up to date</source> + <translation>Đã cập nhật</translation> + </message> + <message> + <source>Sent transaction</source> + <translation>Giao dịch đã gửi</translation> + </message> + <message> + <source>Incoming transaction</source> + <translation>Giao dịch đang tới</translation> + </message> </context> <context> <name>ClientModel</name> - </context> + <message> + <source>Network Alert</source> + <translation>Network Alert</translation> + </message> +</context> <context> <name>CoinControlDialog</name> + <message> + <source>Quantity:</source> + <translation>Lượng:</translation> + </message> + <message> + <source>Bytes:</source> + <translation>Bytes:</translation> + </message> + <message> + <source>Amount:</source> + <translation>Lượng:</translation> + </message> + <message> + <source>Priority:</source> + <translation>Tầm quan trọng:</translation> + </message> + <message> + <source>Fee:</source> + <translation>Phí:</translation> + </message> + <message> + <source>Change:</source> + <translation>Thay đổi:</translation> + </message> + <message> + <source>Amount</source> + <translation>Lượng</translation> + </message> + <message> + <source>Date</source> + <translation>Ngày tháng</translation> + </message> + <message> + <source>Confirmations</source> + <translation>Lần xác nhận</translation> + </message> + <message> + <source>Confirmed</source> + <translation>Đã xác nhận</translation> + </message> + <message> + <source>Priority</source> + <translation>Tầm quan trọng</translation> + </message> + <message> + <source>Copy address</source> + <translation>Copy địa chỉ</translation> + </message> + <message> + <source>Copy label</source> + <translation>Copy nhãn</translation> + </message> + <message> + <source>Copy amount</source> + <translation>Lượng copy</translation> + </message> + <message> + <source>low</source> + <translation>thấp</translation> + </message> + <message> + <source>lower</source> + <translation>thấp hơn</translation> + </message> + <message> + <source>lowest</source> + <translation>thấp nhất</translation> + </message> + <message> + <source>yes</source> + <translation>có</translation> + </message> + <message> + <source>no</source> + <translation>không</translation> + </message> + <message> + <source>(no label)</source> + <translation>(không nhãn)</translation> + </message> </context> <context> <name>EditAddressDialog</name> </context> <context> <name>FreespaceChecker</name> + <message> + <source>name</source> + <translation>tên</translation> + </message> </context> <context> <name>HelpMessageDialog</name> + <message> + <source>Bitcoin Core</source> + <translation>Bitcoin Core</translation> + </message> + <message> + <source>version</source> + <translation>version</translation> + </message> + <message> + <source>About Bitcoin Core</source> + <translation>Về Bitcoin Core</translation> + </message> </context> <context> <name>Intro</name> + <message> + <source>Welcome</source> + <translation>Chào mừng</translation> + </message> + <message> + <source>Bitcoin Core</source> + <translation>Bitcoin Core</translation> + </message> + <message> + <source>Error</source> + <translation>Lỗi</translation> + </message> </context> <context> <name>OpenURIDialog</name> + <message> + <source>Open URI</source> + <translation>Mở URI</translation> + </message> + <message> + <source>URI:</source> + <translation>URI:</translation> + </message> </context> <context> <name>OptionsDialog</name> + <message> + <source>Options</source> + <translation>Lựa chọn</translation> + </message> + <message> + <source>&Main</source> + <translation>&Chính</translation> + </message> + <message> + <source>MB</source> + <translation>MB</translation> + </message> + <message> + <source>&Display</source> + <translation>&Hiển thị</translation> + </message> + <message> + <source>&OK</source> + <translation>&OK</translation> + </message> + <message> + <source>&Cancel</source> + <translation>&Từ chối</translation> + </message> + <message> + <source>default</source> + <translation>mặc định</translation> + </message> </context> <context> <name>OverviewPage</name> + <message> + <source>Form</source> + <translation>Form</translation> + </message> + <message> + <source>Total:</source> + <translation>Tổng:</translation> + </message> </context> <context> <name>PaymentServer</name> </context> <context> <name>PeerTableModel</name> + <message> + <source>User Agent</source> + <translation>User Agent</translation> + </message> </context> <context> <name>QObject</name> + <message> + <source>Amount</source> + <translation>Lượng</translation> + </message> </context> <context> <name>QRImageWidget</name> </context> <context> <name>RPCConsole</name> + <message> + <source>General</source> + <translation>Nhìn Chung</translation> + </message> + <message> + <source>Name</source> + <translation>Tên</translation> + </message> + <message> + <source>Block chain</source> + <translation>Block chain</translation> + </message> + <message> + <source>Sent</source> + <translation>Đã gửi</translation> + </message> + <message> + <source>User Agent</source> + <translation>User Agent</translation> + </message> </context> <context> <name>ReceiveCoinsDialog</name> - </context> + <message> + <source>Copy label</source> + <translation>Copy nhãn</translation> + </message> + <message> + <source>Copy amount</source> + <translation>Lượng copy</translation> + </message> +</context> <context> <name>ReceiveRequestDialog</name> + <message> + <source>Address</source> + <translation>Địa chỉ</translation> + </message> + <message> + <source>Amount</source> + <translation>Lượng</translation> + </message> + <message> + <source>Label</source> + <translation>Nhãn</translation> + </message> </context> <context> <name>RecentRequestsTableModel</name> + <message> + <source>Date</source> + <translation>Ngày tháng</translation> + </message> + <message> + <source>Label</source> + <translation>Nhãn</translation> + </message> + <message> + <source>Amount</source> + <translation>Lượng</translation> + </message> + <message> + <source>(no label)</source> + <translation>(không nhãn)</translation> + </message> </context> <context> <name>SendCoinsDialog</name> + <message> + <source>Quantity:</source> + <translation>Lượng:</translation> + </message> + <message> + <source>Bytes:</source> + <translation>Bytes:</translation> + </message> + <message> + <source>Amount:</source> + <translation>Lượng:</translation> + </message> + <message> + <source>Priority:</source> + <translation>Tầm quan trọng:</translation> + </message> + <message> + <source>Fee:</source> + <translation>Phí:</translation> + </message> + <message> + <source>Change:</source> + <translation>Thay đổi:</translation> + </message> + <message> + <source>Copy amount</source> + <translation>Lượng copy</translation> + </message> + <message> + <source>(no label)</source> + <translation>(không nhãn)</translation> + </message> </context> <context> <name>SendCoinsEntry</name> @@ -80,21 +576,77 @@ </context> <context> <name>SplashScreen</name> + <message> + <source>Bitcoin Core</source> + <translation>Bitcoin Core</translation> + </message> </context> <context> <name>TrafficGraphWidget</name> </context> <context> <name>TransactionDesc</name> + <message> + <source>Date</source> + <translation>Ngày tháng</translation> + </message> + <message> + <source>Amount</source> + <translation>Lượng</translation> + </message> </context> <context> <name>TransactionDescDialog</name> </context> <context> <name>TransactionTableModel</name> + <message> + <source>Date</source> + <translation>Ngày tháng</translation> + </message> + <message> + <source>Label</source> + <translation>Nhãn</translation> + </message> </context> <context> <name>TransactionView</name> + <message> + <source>Copy address</source> + <translation>Copy địa chỉ</translation> + </message> + <message> + <source>Copy label</source> + <translation>Copy nhãn</translation> + </message> + <message> + <source>Copy amount</source> + <translation>Lượng copy</translation> + </message> + <message> + <source>Exporting Failed</source> + <translation>Xuất Đã Thất Bại</translation> + </message> + <message> + <source>Comma separated file (*.csv)</source> + <translation>Comma separated file (*.csv)</translation> + </message> + <message> + <source>Confirmed</source> + <translation>Đã xác nhận</translation> + </message> + <message> + <source>Date</source> + <translation>Ngày tháng</translation> + </message> + <message> + <source>Label</source> + <translation>Nhãn</translation> + </message> + <message> + <source>Address</source> + <translation>Địa chỉ</translation> + </message> </context> <context> <name>UnitDisplayStatusBarControl</name> @@ -107,8 +659,76 @@ </context> <context> <name>WalletView</name> + <message> + <source>&Export</source> + <translation>X&uất</translation> + </message> + <message> + <source>Export the data in the current tab to a file</source> + <translation>Xuất dữ liệu trong mục hiện tại ra file</translation> + </message> </context> <context> <name>bitcoin-core</name> - </context> + <message> + <source>Information</source> + <translation>Thông tin</translation> + </message> + <message> + <source>Transaction too large</source> + <translation>Giao dịch quá lớn</translation> + </message> + <message> + <source>Warning</source> + <translation>Chú ý</translation> + </message> + <message> + <source>on startup</source> + <translation>khi khởi động</translation> + </message> + <message> + <source>This help message</source> + <translation>Thông điệp trợ giúp này</translation> + </message> + <message> + <source>Loading addresses...</source> + <translation>Đang đọc các địa chỉ...</translation> + </message> + <message> + <source>(default: %s)</source> + <translation>(mặc định: %s)</translation> + </message> + <message> + <source>Insufficient funds</source> + <translation>Không đủ tiền</translation> + </message> + <message> + <source>Loading block index...</source> + <translation>Đang đọc block index...</translation> + </message> + <message> + <source>Loading wallet...</source> + <translation>Đang đọc ví...</translation> + </message> + <message> + <source>Cannot downgrade wallet</source> + <translation>Không downgrade được ví</translation> + </message> + <message> + <source>Cannot write default address</source> + <translation>Không ghi được địa chỉ mặc định</translation> + </message> + <message> + <source>Rescanning...</source> + <translation>Đang quét lại...</translation> + </message> + <message> + <source>Done loading</source> + <translation>Đã nạp xong</translation> + </message> + <message> + <source>Error</source> + <translation>Lỗi</translation> + </message> +</context> </TS>
\ No newline at end of file diff --git a/src/qt/locale/bitcoin_zh_CN.ts b/src/qt/locale/bitcoin_zh_CN.ts index 94d0675bfd..4c9f287e95 100644 --- a/src/qt/locale/bitcoin_zh_CN.ts +++ b/src/qt/locale/bitcoin_zh_CN.ts @@ -1,9 +1,9 @@ -<TS language="zh_CN" version="2.0"> +<TS language="zh_CN" version="2.1"> <context> <name>AddressBookPage</name> <message> - <source>Double-click to edit address or label</source> - <translation>双击编辑地址或标签</translation> + <source>Right-click to edit address or label</source> + <translation>鼠标右击编辑地址或标签</translation> </message> <message> <source>Create a new address</source> @@ -156,10 +156,6 @@ <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> @@ -172,6 +168,10 @@ <translation>您确定需要为钱包加密吗？</translation> </message> <message> + <source>Bitcoin Core will close now to finish the encryption process. Remember that encrypting your wallet cannot fully protect your bitcoins from being stolen by malware infecting your computer.</source> + <translation>比特币核心现在将关闭以完成加密过程。请记住，在您的计算机被恶意软件感染的情况下，加密不能完全保护您的比特币免于被盗。</translation> + </message> + <message> <source>IMPORTANT: Any previous backups you have made of your wallet file should be replaced with the newly generated, encrypted wallet file. For security reasons, previous backups of the unencrypted wallet file will become useless as soon as you start using the new, encrypted wallet.</source> <translation>重要提示：您以前备份的钱包文件应该替换成最新生成的加密钱包文件（重新备份）。从安全性上考虑，您以前备份的未加密的钱包文件，在您使用新的加密钱包后将无效，请重新备份。</translation> </message> @@ -184,8 +184,12 @@ <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> + <source>Enter the new passphrase to the wallet.<br/>Please use a passphrase of <b>ten or more random characters</b>, or <b>eight or more words</b>.</source> + <translation>请输入新的钱包密码. <br/>密码须包含<b>10个以上字符</b>,或<b>8个以上单词</b>.</translation> + </message> + <message> + <source>Enter the old passphrase and new passphrase to the wallet.</source> + <translation>请输入钱包的旧密码与新密码。</translation> </message> <message> <source>Wallet encryption failed</source> @@ -280,11 +284,11 @@ </message> <message> <source>&Sending addresses...</source> - <translation>&付款地址 </translation> + <translation>正在发送地址(&S)...</translation> </message> <message> <source>&Receiving addresses...</source> - <translation>&收款地址</translation> + <translation>正在接收地址(&R)...</translation> </message> <message> <source>Open &URI...</source> @@ -307,10 +311,6 @@ <translation>向一个比特币地址发送比特币</translation> </message> <message> - <source>Modify configuration options for Bitcoin</source> - <translation>设置选项</translation> - </message> - <message> <source>Backup wallet to another location</source> <translation>备份钱包到其他文件夹</translation> </message> @@ -399,6 +399,10 @@ <translation>关于比特币核心(&A)</translation> </message> <message> + <source>Modify configuration options for Bitcoin Core</source> + <translation>修改比特币核心的配置选项</translation> + </message> + <message> <source>Show the list of used sending addresses and labels</source> <translation>显示用过的发送地址和标签的列表</translation> </message> @@ -412,7 +416,7 @@ </message> <message> <source>&Command-line options</source> - <translation>&命令行 选项</translation> + <translation>命令行选项(&C)</translation> </message> <message> <source>Show the Bitcoin Core help message to get a list with possible Bitcoin command-line options</source> @@ -427,6 +431,10 @@ <translation>沒有可用的区块来源...</translation> </message> <message numerus="yes"> + <source>Processed %n block(s) of transaction history.</source> + <translation><numerusform>已处理 %n 个交易历史数据块。</numerusform></translation> + </message> + <message numerus="yes"> <source>%n hour(s)</source> <translation><numerusform>%n 小时</numerusform></translation> </message> @@ -479,26 +487,44 @@ <translation>更新中...</translation> </message> <message> - <source>Sent transaction</source> - <translation>发送交易</translation> + <source>Date: %1 +</source> + <translation>日期: %1 +</translation> </message> <message> - <source>Incoming transaction</source> - <translation>流入交易</translation> + <source>Amount: %1 +</source> + <translation>金额: %1 +</translation> </message> <message> - <source>Date: %1 -Amount: %2 -Type: %3 -Address: %4 + <source>Type: %1 </source> - <translation>日期: %1 -金额: %2 -类别: %3 -地址: %4 + <translation>类型: %1 +</translation> + </message> + <message> + <source>Label: %1 +</source> + <translation>标签: %1 +</translation> + </message> + <message> + <source>Address: %1 +</source> + <translation>地址: %1 </translation> </message> <message> + <source>Sent transaction</source> + <translation>发送交易</translation> + </message> + <message> + <source>Incoming transaction</source> + <translation>流入交易</translation> + </message> + <message> <source>Wallet is <b>encrypted</b> and currently <b>unlocked</b></source> <translation>钱包已被<b>加密</b>，当前为<b>解锁</b>状态</translation> </message> @@ -517,6 +543,10 @@ Address: %4 <context> <name>CoinControlDialog</name> <message> + <source>Coin Selection</source> + <translation>币源选择(Coin Selection)</translation> + </message> + <message> <source>Quantity:</source> <translation>总量：</translation> </message> @@ -565,6 +595,14 @@ Address: %4 <translation>金额</translation> </message> <message> + <source>Received with label</source> + <translation>按标签收款</translation> + </message> + <message> + <source>Received with address</source> + <translation>按地址收款</translation> + </message> + <message> <source>Date</source> <translation>日期</translation> </message> @@ -677,6 +715,22 @@ Address: %4 <translation>无</translation> </message> <message> + <source>This label turns red if the transaction size is greater than 1000 bytes.</source> + <translation>如果交易规模大于 1000 字节，此标签将变为红色。</translation> + </message> + <message> + <source>This label turns red if the priority is smaller than "medium".</source> + <translation>如果优先级小于“中等”，此标签将变为红色。</translation> + </message> + <message> + <source>This label turns red if any recipient receives an amount smaller than %1.</source> + <translation>如果任何接收人收到的金额小于 %1，此标签将变为红色。</translation> + </message> + <message> + <source>Can vary +/- %1 satoshi(s) per input.</source> + <translation>可能会有 正负 %1 聪(satoshi)的偏差 </translation> + </message> + <message> <source>yes</source> <translation>是</translation> </message> @@ -685,10 +739,6 @@ Address: %4 <translation>否</translation> </message> <message> - <source>This label turns red, if the transaction size is greater than 1000 bytes.</source> - <translation>如果这笔交易大于1000字节，标签会变成红色。</translation> - </message> - <message> <source>This means a fee of at least %1 per kB is required.</source> <translation>这意味着将对交易收取 %1/千字节 的交易费。</translation> </message> @@ -701,14 +751,6 @@ Address: %4 <translation>交易的优先级越高，被矿工收入数据块的速度也越快。</translation> </message> <message> - <source>This label turns red, if the priority is smaller than "medium".</source> - <translation>如果优先级小于"中位数" ，标签将变成红色。</translation> - </message> - <message> - <source>This label turns red, if any recipient receives an amount smaller than %1.</source> - <translation>如果收款地址收到小于%1的比特币，标签将变成红色。</translation> - </message> - <message> <source>(no label)</source> <translation>(没有标签)</translation> </message> @@ -829,31 +871,6 @@ Address: %4 <source>command-line options</source> <translation>命令行选项</translation> </message> - <message> - <source>UI options</source> - <translation>UI选项</translation> - </message> - <message> - <source>Set language, for example "de_DE" (default: system locale)</source> - <translation>设置语言, 例如“zh-TW”（默认为系统语言）</translation> - </message> - <message> - <source>Start minimized</source> - <translation>启动时最小化 -</translation> - </message> - <message> - <source>Set SSL root certificates for payment request (default: -system-)</source> - <translation>设置SSL根证书的付款请求(默认：-系统-)</translation> - </message> - <message> - <source>Show splash screen on startup (default: 1)</source> - <translation>启动时显示版权页 (缺省: 1)</translation> - </message> - <message> - <source>Choose data directory on startup (default: 0)</source> - <translation>在启动时选择数据目录（默认：0）</translation> - </message> </context> <context> <name>Intro</name> @@ -886,10 +903,22 @@ Address: %4 <translation>比特币核心</translation> </message> <message> + <source>Error: Specified data directory "%1" cannot be created.</source> + <translation>错误：无法创建 指定的数据目录 "%1" </translation> + </message> + <message> <source>Error</source> <translation>错误</translation> </message> - </context> + <message numerus="yes"> + <source>%n GB of free space available</source> + <translation><numerusform>有 %n GB 空闲空间</numerusform></translation> + </message> + <message numerus="yes"> + <source>(of %n GB needed)</source> + <translation><numerusform>(需要%n GB空间)</numerusform></translation> + </message> +</context> <context> <name>OpenURIDialog</name> <message> @@ -924,14 +953,6 @@ Address: %4 <translation>主要(&M)</translation> </message> <message> - <source>Automatically start Bitcoin after logging in to the system.</source> - <translation>登录系统后自动开启比特币客户端</translation> - </message> - <message> - <source>&Start Bitcoin on system login</source> - <translation>系统启动时运行(&S)</translation> - </message> - <message> <source>Size of &database cache</source> <translation>数据库缓存大小(&D)</translation> </message> @@ -941,7 +962,7 @@ Address: %4 </message> <message> <source>Number of script &verification threads</source> - <translation>脚本&验证 进程数 </translation> + <translation>脚本验证线程数(&V)</translation> </message> <message> <source>Accept connections from outside</source> @@ -956,6 +977,14 @@ Address: %4 <translation>代理的 IP 地址 (例如 IPv4: 127.0.0.1 / IPv6: ::1)</translation> </message> <message> + <source>Minimize instead of exit the application when the window is closed. When this option is enabled, the application will be closed only after selecting Exit in the menu.</source> + <translation>窗口被关闭时最小化而不是退出应用程序。当此选项启用时，应用程序只会在菜单中选择退出时退出。</translation> + </message> + <message> + <source>The user interface language can be set here. This setting will take effect after restarting Bitcoin Core.</source> + <translation>可以在这里设置用户界面语言。此设置将在重新启动比特币核心后生效。</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的URL被替换为交易哈希。多个的URL需要竖线 | 分隔。</translation> </message> @@ -980,12 +1009,20 @@ Address: %4 <translation>网络(&N)</translation> </message> <message> + <source>Automatically start Bitcoin Core after logging in to the system.</source> + <translation>登录到系统后自动启动比特币核心。</translation> + </message> + <message> + <source>&Start Bitcoin Core on system login</source> + <translation>系统登录时启动比特币核心(&S)</translation> + </message> + <message> <source>(0 = auto, <0 = leave that many cores free)</source> <translation>(0 = 自动, <0 = 离开很多免费的核心)</translation> </message> <message> <source>W&allet</source> - <translation>&钱包</translation> + <translation>钱包(&A)</translation> </message> <message> <source>Expert</source> @@ -993,7 +1030,7 @@ Address: %4 </message> <message> <source>Enable coin &control features</source> - <translation>启动货币 &控制功能</translation> + <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> @@ -1001,7 +1038,7 @@ Address: %4 </message> <message> <source>&Spend unconfirmed change</source> - <translation>&选择未经确认的花费</translation> + <translation>使用未经确认的零钱(&S)</translation> </message> <message> <source>Automatically open the Bitcoin client port on the router. This only works when your router supports UPnP and it is enabled.</source> @@ -1012,6 +1049,14 @@ Address: %4 <translation>使用 &UPnP 映射端口</translation> </message> <message> + <source>Connect to the Bitcoin network through a SOCKS5 proxy.</source> + <translation>通过 SOCKS5 代理连接比特币网络。</translation> + </message> + <message> + <source>&Connect through SOCKS5 proxy (default proxy):</source> + <translation>通过 SO&CKS5 代理连接(默认代理)：</translation> + </message> + <message> <source>Proxy &IP:</source> <translation>代理服务器 &IP：</translation> </message> @@ -1036,10 +1081,6 @@ Address: %4 <translation>最小化到托盘(&M)</translation> </message> <message> - <source>Minimize instead of exit the application when the window is closed. When this option is enabled, the application will be closed only after selecting Quit in the menu.</source> - <translation>当窗口关闭时程序最小化而不是退出。当使用该选项时，程序只能通过在菜单中选择退出来关闭</translation> - </message> - <message> <source>M&inimize on close</source> <translation>单击关闭按钮最小化(&I)</translation> </message> @@ -1052,10 +1093,6 @@ Address: %4 <translation>用户界面语言(&L)：</translation> </message> <message> - <source>The user interface language can be set here. This setting will take effect after restarting Bitcoin.</source> - <translation>在这里设置用户界面的语言。设置将在客户端重启后生效。</translation> - </message> - <message> <source>&Unit to show amounts in:</source> <translation>比特币金额单位(&U)：</translation> </message> @@ -1092,8 +1129,8 @@ Address: %4 <translation>更改生效需要重启客户端。</translation> </message> <message> - <source>Client will be shutdown, do you want to proceed?</source> - <translation>客户端即将关闭，确定继续吗？</translation> + <source>Client will be shut down. Do you want to proceed?</source> + <translation>客户端即将关闭，您想继续吗？</translation> </message> <message> <source>This change would require a client restart.</source> @@ -1143,6 +1180,10 @@ Address: %4 <translation>尚未成熟的挖矿收入余额</translation> </message> <message> + <source>Balances</source> + <translation>余额</translation> + </message> + <message> <source>Total:</source> <translation>总额：</translation> </message> @@ -1151,6 +1192,30 @@ Address: %4 <translation>您当前的总余额</translation> </message> <message> + <source>Your current balance in watch-only addresses</source> + <translation>您当前 观察地址(watch-only address)的余额 </translation> + </message> + <message> + <source>Spendable:</source> + <translation>可使用：</translation> + </message> + <message> + <source>Recent transactions</source> + <translation>最近交易记录</translation> + </message> + <message> + <source>Unconfirmed transactions to watch-only addresses</source> + <translation>观察地址(watch-only address)的未确认交易记录 </translation> + </message> + <message> + <source>Mined balance in watch-only addresses that has not yet matured</source> + <translation>观察地址(watch-only address)中尚未成熟(matured)的挖矿收入余额：</translation> + </message> + <message> + <source>Current total balance in watch-only addresses</source> + <translation>观察地址(watch-only address)中的当前总余额 </translation> + </message> + <message> <source>out of sync</source> <translation>数据同步中</translation> </message> @@ -1170,8 +1235,8 @@ Address: %4 <translation>支付请求被拒绝</translation> </message> <message> - <source>Payment request has expired.</source> - <translation>支付请求已超时</translation> + <source>Payment request network doesn't match client network.</source> + <translation>付款请求所在的网络与当前客户端所在的网络不匹配。</translation> </message> <message> <source>Payment request is not initialized.</source> @@ -1194,22 +1259,50 @@ Address: %4 <translation>付款请求URI链接非法: %1</translation> </message> <message> + <source>URI cannot be parsed! This can be caused by an invalid Bitcoin address or malformed URI parameters.</source> + <translation>URI无法解析！原因可能是比特币地址不正确，或者URI参数错误。</translation> + </message> + <message> <source>Payment request file handling</source> <translation>付款请求文件处理 </translation> </message> <message> + <source>Payment request file cannot be read! This can be caused by an invalid payment request file.</source> + <translation>付款请求文件无法读取！可能是付款请求文件不合格。</translation> + </message> + <message> + <source>Payment request expired.</source> + <translation>支付请求已过期。</translation> + </message> + <message> <source>Unverified payment requests to custom payment scripts are unsupported.</source> <translation>不支持到自定义付款脚本的未验证付款请求。</translation> </message> <message> + <source>Invalid payment request.</source> + <translation>无效的支付请求。</translation> + </message> + <message> <source>Refund from %1</source> <translation>退款来自 %1</translation> </message> <message> + <source>Payment request %1 is too large (%2 bytes, allowed %3 bytes).</source> + <translation>支付请求 %1 太大 (%2 字节。只允许 %3 字节)。</translation> + </message> + <message> + <source>Payment request DoS protection</source> + <translation>支付请求防滥用保护</translation> + </message> + <message> <source>Error communicating with %1: %2</source> <translation>%1: %2 通讯出错</translation> </message> <message> + <source>Payment request cannot be parsed!</source> + <translation>无法解析 付款请求！</translation> + </message> + <message> <source>Bad response from server %1</source> <translation>来自 %1 服务器的错误响应</translation> </message> @@ -1229,8 +1322,8 @@ Address: %4 <translation>用户代理</translation> </message> <message> - <source>Address/Hostname</source> - <translation>地址/主机名</translation> + <source>Node/Service</source> + <translation>节点/服务</translation> </message> <message> <source>Ping Time</source> @@ -1264,14 +1357,6 @@ Address: %4 <translation>%1 秒</translation> </message> <message> - <source>NETWORK</source> - <translation>网络</translation> - </message> - <message> - <source>UNKNOWN</source> - <translation>未知</translation> - </message> - <message> <source>None</source> <translation>无</translation> </message> @@ -1362,6 +1447,10 @@ Address: %4 <translation>当前数据块数量</translation> </message> <message> + <source>Open the Bitcoin Core debug log file from the current data directory. This can take a few seconds for large log files.</source> + <translation>从当前的数据目录打开比特币核心调试日志文件。对于较大的日志文件，这可能需要几秒钟。</translation> + </message> + <message> <source>Received</source> <translation>收到</translation> </message> @@ -1371,7 +1460,11 @@ Address: %4 </message> <message> <source>&Peers</source> - <translation>&同类</translation> + <translation>同伴(&P)</translation> + </message> + <message> + <source>Select a peer to view detailed information.</source> + <translation>选择节点查看详细信息。</translation> </message> <message> <source>Direction</source> @@ -1426,6 +1519,10 @@ Address: %4 <translation>Ping 时间</translation> </message> <message> + <source>Time Offset</source> + <translation>时间偏移</translation> + </message> + <message> <source>Last block time</source> <translation>上一数据块时间</translation> </message> @@ -1466,16 +1563,12 @@ Address: %4 <translation>调试日志文件</translation> </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>打开当前目录中的调试日志文件。日志文件大的话可能要等上几秒钟。</translation> - </message> - <message> <source>Clear console</source> <translation>清空控制台</translation> </message> <message> - <source>Welcome to the Bitcoin RPC console.</source> - <translation>欢迎来到 RPC 控制台。</translation> + <source>Welcome to the Bitcoin Core RPC console.</source> + <translation>欢迎使用 比特币核心 RPC 控制台。</translation> </message> <message> <source>Use up and down arrows to navigate history, and <b>Ctrl-L</b> to clear screen.</source> @@ -1754,6 +1847,74 @@ Address: %4 <translation>自定义零钱地址</translation> </message> <message> + <source>Transaction Fee:</source> + <translation>交易费用:</translation> + </message> + <message> + <source>Choose...</source> + <translation>选择... </translation> + </message> + <message> + <source>collapse fee-settings</source> + <translation>收起 费用设置 </translation> + </message> + <message> + <source>per kilobyte</source> + <translation>每kb</translation> + </message> + <message> + <source>If the custom fee is set to 1000 satoshis and the transaction is only 250 bytes, then "per kilobyte" only pays 250 satoshis in fee, while "total at least" pays 1000 satoshis. For transactions bigger than a kilobyte both pay by kilobyte.</source> + <translation>如果自定义交易费设置为 1000聪而交易大小只有250字节，则“每千字节" 模式只支付250聪交易费， 而"最少"模式则支付1000聪。 大于1000字节的交易按每千字节付费。</translation> + </message> + <message> + <source>Hide</source> + <translation>隐藏</translation> + </message> + <message> + <source>total at least</source> + <translation>最小额 </translation> + </message> + <message> + <source>Paying only the minimum fee is just fine as long as there is less transaction volume than space in the blocks. But be aware that this can end up in a never confirming transaction once there is more demand for bitcoin transactions than the network can process.</source> + <translation>交易量小时只支付最小交易费是可以的。但是请注意，当交易量大时您的交易可能永远无法确认。</translation> + </message> + <message> + <source>(read the tooltip)</source> + <translation>(请注意提示信息)</translation> + </message> + <message> + <source>Recommended:</source> + <translation>推荐：</translation> + </message> + <message> + <source>Custom:</source> + <translation>自定义：</translation> + </message> + <message> + <source>(Smart fee not initialized yet. This usually takes a few blocks...)</source> + <translation>(智能交易费用 尚未初始化。 需要再下载一些数据块...)</translation> + </message> + <message> + <source>Confirmation time:</source> + <translation>确认时间：</translation> + </message> + <message> + <source>normal</source> + <translation>一般</translation> + </message> + <message> + <source>fast</source> + <translation>快速</translation> + </message> + <message> + <source>Send as zero-fee transaction if possible</source> + <translation>发送时尽可能 不支付交易费用</translation> + </message> + <message> + <source>(confirmation may take longer)</source> + <translation>(确认时间更长) </translation> + </message> + <message> <source>Send to multiple recipients at once</source> <translation>一次发送给多个接收者</translation> </message> @@ -1830,10 +1991,6 @@ Address: %4 <translation>或</translation> </message> <message> - <source>The recipient address is not valid, please recheck.</source> - <translation>收款人地址不合法，请检查。</translation> - </message> - <message> <source>The amount to pay must be larger than 0.</source> <translation>支付金额必须大于0。</translation> </message> @@ -1846,10 +2003,6 @@ Address: %4 <translation>计入 %1 交易费后的金额超出您的账上余额。</translation> </message> <message> - <source>Duplicate address found, can only send to each address once per send operation.</source> - <translation>发现重复的地址, 每次只能对同一地址发送一次。</translation> - </message> - <message> <source>Transaction creation failed!</source> <translation>交易创建失败！</translation> </message> @@ -1858,6 +2011,26 @@ Address: %4 <translation>错误：该交易被拒绝！发生这种错误的原因可能是：钱包中的比特币已经被用掉，有可能您复制了wallet.dat钱包文件，然后用复制的钱包文件支付了比特币，但是这个钱包文件中没有记录。</translation> </message> <message> + <source>A fee higher than %1 is considered an absurdly high fee.</source> + <translation>超过 %1 的交易费被认为是荒谬的高费率。</translation> + </message> + <message> + <source>Payment request expired.</source> + <translation>支付请求已过期。</translation> + </message> + <message> + <source>Pay only the minimum fee of %1</source> + <translation>只支付最小费用 %1</translation> + </message> + <message> + <source>The recipient address is not valid. Please recheck.</source> + <translation>接收人地址无效。请重新检查。</translation> + </message> + <message> + <source>Duplicate address found: addresses should only be used once each.</source> + <translation>发现重复地址：每个地址应该只使用一次。</translation> + </message> + <message> <source>Warning: Invalid Bitcoin address</source> <translation>警告：无效的比特币地址</translation> </message> @@ -1909,6 +2082,10 @@ Address: %4 <translation>这是笔正常的支付。</translation> </message> <message> + <source>The Bitcoin address to send the payment to</source> + <translation>付款目的地址</translation> + </message> + <message> <source>Alt+A</source> <translation>Alt+A</translation> </message> @@ -1925,12 +2102,20 @@ Address: %4 <translation>移除此项</translation> </message> <message> + <source>S&ubtract fee from amount</source> + <translation>从金额中减去交易费(&U)</translation> + </message> + <message> <source>Message:</source> <translation>消息：</translation> </message> <message> - <source>This is a verified payment request.</source> - <translation>这是个有效的支付请求。</translation> + <source>This is an unauthenticated payment request.</source> + <translation>这是一个未经验证的支付请求。</translation> + </message> + <message> + <source>This is an authenticated payment request.</source> + <translation>这是一个已经验证的支付请求。</translation> </message> <message> <source>Enter a label for this address to add it to the list of used addresses</source> @@ -1941,10 +2126,6 @@ Address: %4 <translation>bitcoin:URI 附带的备注信息，将会和交易一起存储，备查。 注意：该消息不会通过比特币网络传输。</translation> </message> <message> - <source>This is an unverified payment request.</source> - <translation>这是个非有效的支付请求。</translation> - </message> - <message> <source>Pay To:</source> <translation>支付给:</translation> </message> @@ -1975,8 +2156,8 @@ Address: %4 <translation>签名消息(&S)</translation> </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>您可以用你的地址对消息进行签名，以证明您是该地址的所有人。注意不要对模棱两可的消息签名，以免遭受钓鱼式攻击。请确保消息内容准确的表达了您的真实意愿。</translation> + <source>The Bitcoin address to sign the message with</source> + <translation>用来对消息签名的地址 </translation> </message> <message> <source>Choose previously used address</source> @@ -2027,8 +2208,8 @@ Address: %4 <translation>验证消息(&V)</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>在下面输入签名地址，消息（请确保换行符、空格符、制表符等等一个不漏）和签名以验证消息。请确保签名信息准确，提防中间人攻击。</translation> + <source>The Bitcoin address the message was signed with</source> + <translation>消息使用的签名地址</translation> </message> <message> <source>Verify the message to ensure it was signed with the specified Bitcoin address</source> @@ -2143,6 +2324,10 @@ Address: %4 <source>Status</source> <translation>状态</translation> </message> + <message numerus="yes"> + <source>, broadcast through %n node(s)</source> + <translation><numerusform>, 通过 %n 个节点广播 </numerusform></translation> + </message> <message> <source>Date</source> <translation>日期</translation> @@ -2168,6 +2353,10 @@ Address: %4 <translation>自己的地址</translation> </message> <message> + <source>watch-only</source> + <translation>观察地址(watch-only) </translation> + </message> + <message> <source>label</source> <translation>标签</translation> </message> @@ -2175,6 +2364,10 @@ Address: %4 <source>Credit</source> <translation>收入</translation> </message> + <message numerus="yes"> + <source>matures in %n more block(s)</source> + <translation><numerusform>%n 个数据块后成熟(mature) </numerusform></translation> + </message> <message> <source>not accepted</source> <translation>未被接受</translation> @@ -2184,6 +2377,14 @@ Address: %4 <translation>支出</translation> </message> <message> + <source>Total debit</source> + <translation>总收入</translation> + </message> + <message> + <source>Total credit</source> + <translation>总支出</translation> + </message> + <message> <source>Transaction fee</source> <translation>交易费</translation> </message> @@ -2239,6 +2440,10 @@ Address: %4 <source>, has not been successfully broadcast yet</source> <translation>，未被成功广播</translation> </message> + <message numerus="yes"> + <source>Open for %n more block(s)</source> + <translation><numerusform>再打开 %n 个数据块</numerusform></translation> + </message> <message> <source>unknown</source> <translation>未知</translation> @@ -2266,13 +2471,13 @@ Address: %4 <translation>类别</translation> </message> <message> - <source>Address</source> - <translation>地址</translation> - </message> - <message> <source>Immature (%1 confirmations, will be available after %2)</source> <translation>未成熟 (%1 个确认，将在 %2 个后可用)</translation> </message> + <message numerus="yes"> + <source>Open for %n more block(s)</source> + <translation><numerusform>再打开 %n 个数据块</numerusform></translation> + </message> <message> <source>Open until %1</source> <translation>至 %1 个数据块时开启</translation> @@ -2294,6 +2499,10 @@ Address: %4 <translation>掉线</translation> </message> <message> + <source>Label</source> + <translation>标签</translation> + </message> + <message> <source>Unconfirmed</source> <translation>未确认的 </translation> </message> @@ -2326,6 +2535,10 @@ Address: %4 <translation>挖矿所得</translation> </message> <message> + <source>watch-only</source> + <translation>观察地址(watch-only) </translation> + </message> + <message> <source>(n/a)</source> <translation>（不可用）</translation> </message> @@ -2342,8 +2555,12 @@ Address: %4 <translation>交易类别。</translation> </message> <message> - <source>Destination address of transaction.</source> - <translation>交易目的地址。</translation> + <source>Whether or not a watch-only address is involved in this transaction.</source> + <translation>该交易中是否涉及 观察地址(watch-only address)。</translation> + </message> + <message> + <source>User-defined intent/purpose of the transaction.</source> + <translation>用户定义的该交易的意图/目的。</translation> </message> <message> <source>Amount removed from or added to balance.</source> @@ -2437,6 +2654,10 @@ Address: %4 <translation>导出交易历史</translation> </message> <message> + <source>Watch-only</source> + <translation>观察地址(Watch-only) </translation> + </message> + <message> <source>Exporting Failed</source> <translation>导出失败</translation> </message> @@ -2491,7 +2712,11 @@ Address: %4 </context> <context> <name>UnitDisplayStatusBarControl</name> - </context> + <message> + <source>Unit to show amounts in. Click to select another unit.</source> + <translation>金额单位。单击选择别的单位。</translation> + </message> +</context> <context> <name>WalletFrame</name> <message> @@ -2582,44 +2807,20 @@ Address: %4 <translation>接受来自外部的连接 (缺省: 如果不带 -proxy or -connect 参数设置为1)</translation> </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>%s, 您必须在配置文件设置rpcpassword: - %s -建议您使用下面的随机密码: -rpcuser=bitcoinrpc -rpcpassword=%s -(您无需记住此密码) -用户名和密码 必! 须! 不一样。 -如果配置文件不存在，请自行建立一个只有所有者拥有只读权限的文件。 -推荐您开启提示通知以便收到错误通知， -像这样: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo.com -</translation> - </message> - <message> <source>Bind to given address and always listen on it. Use [host]:port notation for IPv6</source> <translation>绑定指定的IP地址开始监听。IPv6地址请使用[host]:port 格式</translation> </message> <message> - <source>Enter regression test mode, which uses a special chain in which blocks can be solved instantly.</source> - <translation>进入回归测试模式，它采用一种特殊的可立即解决的区块链模拟情况。</translation> + <source>Delete all wallet transactions and only recover those parts of the blockchain through -rescan on startup</source> + <translation>删除钱包的所有交易记录，且只有用 -rescan参数启动客户端才能重新取回交易记录 </translation> </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>错误：该交易被拒绝！发生这种错误的原因可能是：钱包中的比特币已经被用掉，有可能您复制了wallet.dat钱包文件，然后用复制的钱包文件支付了比特币，但是这个钱包文件中没有记录。</translation> + <source>Distributed under the MIT software license, see the accompanying file COPYING or <http://www.opensource.org/licenses/mit-license.php>.</source> + <translation>Distributed under the MIT software license, see the accompanying file COPYING or <http://www.opensource.org/licenses/mit-license.php>.</translation> </message> <message> - <source>Error: This transaction requires a transaction fee of at least %s because of its amount, complexity, or use of recently received funds!</source> - <translation>错误：因为该交易的数量、复杂度或者动用了刚收到不久的资金，您需要支付不少于%s的交易费用。</translation> + <source>Enter regression test mode, which uses a special chain in which blocks can be solved instantly.</source> + <translation>进入回归测试模式，它采用一种特殊的可立即解决的区块链模拟情况。</translation> </message> <message> <source>Execute command when a wallet transaction changes (%s in cmd is replaced by TxID)</source> @@ -2630,6 +2831,14 @@ rpcpassword=%s <translation>在-genproclimit这种模式下控制产出多少区块</translation> </message> <message> + <source>Maximum total fees to use in a single wallet transaction; setting this too low may abort large transactions (default: %s)</source> + <translation>单次交易最多使用交易费；设置太低可能导致大宗交易中止 (默认: %s)</translation> + </message> + <message> + <source>Reduce storage requirements by pruning (deleting) old blocks. This mode disables wallet support and is incompatible with -txindex. Warning: Reverting this setting requires re-downloading the entire blockchain. (default: 0 = disable pruning blocks, >%u = target size in MiB to use for block files)</source> + <translation>通过修剪（删除）旧数据块减少存储需求。此模式将禁用钱包支持，并与 -txindex 不兼容。警告：还原此设置需要重新下载整个数据链。(默认: 0 = 禁用修剪数据块， >%u = 数据块文件目标大小，单位 MiB)</translation> + </message> + <message> <source>Set the number of script verification threads (%u to %d, 0 = auto, <0 = leave that many cores free, default: %d)</source> <translation>设置脚本验证的程序 (%u 到 %d, 0 = 自动, <0 = 保留自由的核心, 默认值: %d)</translation> </message> @@ -2662,6 +2871,10 @@ rpcpassword=%s <translation>警告：钱包文件wallet.dat损坏! 原始的钱包文件已经备份到%s目录下并重命名为{timestamp}.bak 。如果您的账户余额或者交易记录不正确，请使用您的钱包备份文件恢复。</translation> </message> <message> + <source>Whitelist peers connecting from the given netmask or IP address. Can be specified multiple times.</source> + <translation>节点白名单,网络掩码或IP址。可多次指定。</translation> + </message> + <message> <source>(default: 1)</source> <translation>(默认值: 1)</translation> </message> @@ -2694,10 +2907,6 @@ rpcpassword=%s <translation>调试/测试选项：</translation> </message> <message> - <source>Discover own IP address (default: 1 when listening and no -externalip)</source> - <translation>发现自己的IP地址(缺省:不带 -externalip 参数监听时设置为1)</translation> - </message> - <message> <source>Do not load the wallet and disable wallet RPC calls</source> <translation>不要加载钱包和禁用钱包的 RPC 调用</translation> </message> @@ -2722,12 +2931,12 @@ rpcpassword=%s <translation>导入数据块数据库出错</translation> </message> <message> - <source>Error: Disk space is low!</source> - <translation>错误：磁盘剩余空间低!</translation> + <source>Error: A fatal internal error occured, see debug.log for details</source> + <translation>错误：发生了致命的内部错误，请打开debug.log查看详细信息 </translation> </message> <message> - <source>Error: Wallet locked, unable to create transaction!</source> - <translation>错误：钱包被锁定，无法创建交易！</translation> + <source>Error: Disk space is low!</source> + <translation>错误：磁盘剩余空间低!</translation> </message> <message> <source>Failed to listen on any port. Use -listen=0 if you want this.</source> @@ -2754,8 +2963,16 @@ rpcpassword=%s <translation>没有足够的文件描述符可用。</translation> </message> <message> - <source>Rebuild block chain index from current blk000??.dat files</source> - <translation>重新为当前的blk000??.dat文件建立索引</translation> + <source>Only connect to nodes in network <net> (ipv4, ipv6 or onion)</source> + <translation>只连接 <net>网络中的节点 (ipv4, ipv6 或 onion) </translation> + </message> + <message> + <source>Prune cannot be configured with a negative value.</source> + <translation>修剪不能配置一个负数。</translation> + </message> + <message> + <source>Prune mode is incompatible with -txindex.</source> + <translation>修剪模式与 -txindex 不兼容。</translation> </message> <message> <source>Set database cache size in megabytes (%d to %d, default: %d)</source> @@ -2774,6 +2991,10 @@ rpcpassword=%s <translation>这是用于回归测试和应用开发目的。</translation> </message> <message> + <source>Use UPnP to map the listening port (default: %u)</source> + <translation>使用UPnp映射监听端口 (默认: %u) </translation> + </message> + <message> <source>Verifying blocks...</source> <translation>正在验证数据库的完整性...</translation> </message> @@ -2790,6 +3011,10 @@ rpcpassword=%s <translation>钱包选项:</translation> </message> <message> + <source>Warning: This version is obsolete; upgrade required!</source> + <translation>警告：此版本已过时，必须升级！</translation> + </message> + <message> <source>You need to rebuild the database using -reindex to change -txindex</source> <translation>您需要将 -reindex 改为 -txindex 以重建数据库</translation> </message> @@ -2798,26 +3023,166 @@ rpcpassword=%s <translation>从blk000??.dat文件导入数据块</translation> </message> <message> + <source>Allow JSON-RPC connections from specified source. Valid for <ip> are a single IP (e.g. 1.2.3.4), a network/netmask (e.g. 1.2.3.4/255.255.255.0) or a network/CIDR (e.g. 1.2.3.4/24). This option can be specified multiple times</source> + <translation>允许来自指定地址的 JSON-RPC 连接。 <ip>为单一IP (如: 1.2.3.4), 网络/掩码 (如: 1.2.3.4/255.255.255.0), 网络/CIDR (如: 1.2.3.4/24)。该选项可多次指定。</translation> + </message> + <message> + <source>An error occurred while setting up the RPC address %s port %u for listening: %s</source> + <translation>设置RPC监听端口 %s:%u 时发生错误: %s</translation> + </message> + <message> + <source>Bind to given address and whitelist peers connecting to it. Use [host]:port notation for IPv6</source> + <translation>绑定到指定地址和连接的白名单节点。 IPv6使用 [主机]:端口 格式 </translation> + </message> + <message> + <source>Bind to given address to listen for JSON-RPC connections. Use [host]:port notation for IPv6. This option can be specified multiple times (default: bind to all interfaces)</source> + <translation>绑定到指定地址监听 JSON-RPC连接。 IPv6使用[主机]:端口 格式。该选项可多次指定 (默认: 绑定到所有接口) </translation> + </message> + <message> <source>Cannot obtain a lock on data directory %s. Bitcoin Core is probably already running.</source> <translation>无法获取数据目录的 %s. 比特币核心钱包可能已经在运行.</translation> </message> <message> + <source>Create new files with system default permissions, instead of umask 077 (only effective with disabled wallet functionality)</source> + <translation>创建系统默认权限的文件，而不是 umask 077 (只在关闭钱包功能时有效) </translation> + </message> + <message> + <source>Discover own IP addresses (default: 1 when listening and no -externalip or -proxy)</source> + <translation>发现自己的 IP 地址（默认: 监听并且无 -externalip 或 -proxy 时为 1）</translation> + </message> + <message> + <source>Error: Listening for incoming connections failed (listen returned error %s)</source> + <translation>错误：监听外部连接失败 (监听返回错误 %s) </translation> + </message> + <message> + <source>Error: Unsupported argument -socks found. Setting SOCKS version isn't possible anymore, only SOCKS5 proxies are supported.</source> + <translation>错误：不支持的 -socks 参数。不再支持设置SOCKS版本，现在只支持 SOCKS5代理。</translation> + </message> + <message> <source>Execute command when a relevant alert is received or we see a really long fork (%s in cmd is replaced by message)</source> <translation>当收到相关提醒或者我们看到一个长分叉时执行命令（%s 将替换为消息）</translation> </message> <message> + <source>Fees (in BTC/Kb) smaller than this are considered zero fee for relaying (default: %s)</source> + <translation>交易费(BTC/kb)比这更小的交易在转发时将被视为零费交易 (默认: %s) </translation> + </message> + <message> + <source>Fees (in BTC/Kb) smaller than this are considered zero fee for transaction creation (default: %s)</source> + <translation>交易费(BTC/kb)比这更小的交易在生成交易时将被视为零费交易 (默认: %s) </translation> + </message> + <message> + <source>If paytxfee is not set, include enough fee so transactions begin confirmation on average within n blocks (default: %u)</source> + <translation>如果未设置交易费用，自动添加足够的交易费以确保交易在平均n个数据块内被确认 (默认: %u) </translation> + </message> + <message> + <source>Invalid amount for -maxtxfee=<amount>: '%s' (must be at least the minrelay fee of %s to prevent stuck transactions)</source> + <translation>-maxtxfee=<amount>: '%s' 的金额无效（交易费至少为 %s，以免交易滞留过久）</translation> + </message> + <message> + <source>Maximum size of data in data carrier transactions we relay and mine (default: %u)</source> + <translation>Maximum size of data in data carrier transactions we relay and mine (default: %u)</translation> + </message> + <message> + <source>Prune configured below the minimum of %d MB. Please use a higher number.</source> + <translation>修剪被配置为比最小值 %d MB 更低。请使用更大的数字。</translation> + </message> + <message> <source>Query for peer addresses via DNS lookup, if low on addresses (default: 1 unless -connect)</source> <translation>通过DNS查询每个地址，如果短地址 (默认值: 1 除非 -连接)</translation> </message> <message> + <source>Randomize credentials for every proxy connection. This enables Tor stream isolation (default: %u)</source> + <translation>为每个代理连接随机化凭据。这将启用 Tor 流隔离 (默认: %u)</translation> + </message> + <message> + <source>Require high priority for relaying free or low-fee transactions (default: %u)</source> + <translation>免费中继和低费率交易需要高优先级 (默认: %u)</translation> + </message> + <message> <source>Set maximum size of high-priority/low-fee transactions in bytes (default: %d)</source> <translation>设置 高优先级/低交易费 交易的最大字节 (缺省: %d)</translation> </message> <message> + <source>Set the number of threads for coin generation if enabled (-1 = all cores, default: %d)</source> + <translation>设置比特币生成线程数 ( -1=所有核, 默认: %d) </translation> + </message> + <message> + <source>The transaction amount is too small to send after the fee has been deducted</source> + <translation>在交易费被扣除后发送的交易金额太小</translation> + </message> + <message> + <source>This product includes software developed by the OpenSSL Project for use in the OpenSSL Toolkit <https://www.openssl.org/> and cryptographic software written by Eric Young and UPnP software written by Thomas Bernard.</source> + <translation>This product includes software developed by the OpenSSL Project for use in the OpenSSL Toolkit <https://www.openssl.org/> and cryptographic software written by Eric Young and UPnP software written by Thomas Bernard.</translation> + </message> + <message> + <source>To use bitcoind, or the -server option to bitcoin-qt, you must set an 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>要使用 bitcoind 或者 bitcoin-qt 中的 -server 选项，您必须在配置文件中设置一个密码： +%s +建议您使用下列随机密码： +rpcuser=bitcoinrpc +rpcpassword=%s +（您不需要记住这个密码） +用户名和密码不能相同。 +如果该文件不存在，创建一个文件并设置权限为仅创建者可读。 +此外，还建议您设置 alertnotify 以便您能注意到问题： +例如 alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo.com +</translation> + </message> + <message> + <source>Warning: -maxtxfee is set very high! Fees this large could be paid on a single transaction.</source> + <translation>警告：-maxtxfee 设置的太高了！每进行一笔交易时您都要花费这么多费用。</translation> + </message> + <message> + <source>Warning: Please check that your computer's date and time are correct! If your clock is wrong Bitcoin Core will not work properly.</source> + <translation>警告：请检查电脑的日期时间设置是否正确！时间错误可能会导致比特币客户端运行异常。</translation> + </message> + <message> + <source>Whitelisted peers cannot be DoS banned and their transactions are always relayed, even if they are already in the mempool, useful e.g. for a gateway</source> + <translation>白名单节点不能被DoS banned ，且转发所有来自他们的交易(即便这些交易已经存在于mempool中)，常用于网关 </translation> + </message> + <message> + <source>You need to rebuild the database using -reindex to go back to unpruned mode. This will redownload the entire blockchain</source> + <translation>您需要使用 -reindex 重新构建数据库以返回未修剪的模式。这将重新下载整个区块链</translation> + </message> + <message> + <source>(default: %u)</source> + <translation>(默认: %u)</translation> + </message> + <message> + <source>Accept public REST requests (default: %u)</source> + <translation>接受公共 REST 请求 (默认: %u)</translation> + </message> + <message> + <source>Activating best chain...</source> + <translation>正在激活最佳数据链...</translation> + </message> + <message> + <source>Allow self signed root certificates (default: 0)</source> + <translation>允许自签名根证书 (默认: 0)</translation> + </message> + <message> + <source>Can't run with a wallet in prune mode.</source> + <translation>不能在修剪模式下运行一个钱包。</translation> + </message> + <message> <source>Cannot resolve -whitebind address: '%s'</source> <translation>无法解析 -whitebind 地址: '%s'</translation> </message> <message> + <source>Choose data directory on startup (default: 0)</source> + <translation>在启动时选择数据目录（默认：0）</translation> + </message> + <message> <source>Connect through SOCKS5 proxy</source> <translation>通过 SOCKS5 代理连接</translation> </message> @@ -2834,10 +3199,18 @@ rpcpassword=%s <translation>加载wallet.dat错误：需要新版的比特币核心钱包</translation> </message> <message> + <source>Error reading from database, shutting down.</source> + <translation>读取数据库出错，关闭中。</translation> + </message> + <message> <source>Error: Unsupported argument -tor found, use -onion.</source> <translation>错误：发现了不支持的参数 -tor，请使用 -onion。</translation> </message> <message> + <source>Fee (in BTC/kB) to add to transactions you send (default: %s)</source> + <translation>为付款交易添加交易费 (BTC/kb) (默认: %s) </translation> + </message> + <message> <source>Information</source> <translation>信息</translation> </message> @@ -2846,6 +3219,10 @@ rpcpassword=%s <translation>初始化完整性检查失败。Bitcoin Core 即将关闭。</translation> </message> <message> + <source>Invalid amount for -maxtxfee=<amount>: '%s'</source> + <translation>-maxtxfee=<amount>: '%s' 的金额无效</translation> + </message> + <message> <source>Invalid amount for -minrelaytxfee=<amount>: '%s'</source> <translation>-minrelaytxfee=<amount>: '%s' 无效的金额</translation> </message> @@ -2870,10 +3247,6 @@ rpcpassword=%s <translation>节点中继选项:</translation> </message> <message> - <source>Print block on startup, if found in block index</source> - <translation>如果在搜索区块中找到，请启动打印区块</translation> - </message> - <message> <source>RPC SSL options: (see the Bitcoin Wiki for SSL setup instructions)</source> <translation>RPC SSL选项：(见有关比特币设置用于SSL说明的维基百科)</translation> </message> @@ -2882,6 +3255,10 @@ rpcpassword=%s <translation>RPC 服务器选项：</translation> </message> <message> + <source>RPC support for HTTP persistent connections (default: %d)</source> + <translation>RPC 支持 HTTP 持久连接 (默认: %d)</translation> + </message> + <message> <source>Randomly drop 1 of every <n> network messages</source> <translation>随机每1个丢失测试<n>网络信息</translation> </message> @@ -2894,10 +3271,26 @@ rpcpassword=%s <translation>跟踪/调试信息输出到控制台，不输出到 debug.log 文件</translation> </message> <message> + <source>Send transactions as zero-fee transactions if possible (default: %u)</source> + <translation>发送时尽可能 不支付交易费用 (默认: %u) </translation> + </message> + <message> + <source>Set SSL root certificates for payment request (default: -system-)</source> + <translation>设置SSL根证书的付款请求(默认：-系统-)</translation> + </message> + <message> + <source>Set language, for example "de_DE" (default: system locale)</source> + <translation>设置语言, 例如“zh-TW”（默认为系统语言）</translation> + </message> + <message> <source>Show all debugging options (usage: --help -help-debug)</source> <translation>显示所有调试选项 (用法: --帮助 -帮助调试)</translation> </message> <message> + <source>Show splash screen on startup (default: 1)</source> + <translation>启动时显示版权页 (缺省: 1)</translation> + </message> + <message> <source>Shrink debug.log file on client startup (default: 1 when no -debug)</source> <translation>客户端启动时压缩debug.log文件(缺省：no-debug模式时为1)</translation> </message> @@ -2906,6 +3299,15 @@ rpcpassword=%s <translation>签署交易失败</translation> </message> <message> + <source>Start minimized</source> + <translation>启动时最小化 +</translation> + </message> + <message> + <source>The transaction amount is too small to pay the fee</source> + <translation>交易金额太小，不足以支付交易费</translation> + </message> + <message> <source>This is experimental software.</source> <translation>这是实验性的软件。</translation> </message> @@ -2918,10 +3320,18 @@ rpcpassword=%s <translation>交易金额必须是积极的</translation> </message> <message> + <source>Transaction too large for fee policy</source> + <translation>费用策略的交易太大</translation> + </message> + <message> <source>Transaction too large</source> <translation>交易太大</translation> </message> <message> + <source>UI Options:</source> + <translation>界面选项：</translation> + </message> + <message> <source>Unable to bind to %s on this computer (bind returned error %s)</source> <translation>无法在此计算机上绑定 %s (绑定返回错误 %s)</translation> </message> @@ -2942,10 +3352,6 @@ rpcpassword=%s <translation>警告</translation> </message> <message> - <source>Warning: This version is obsolete, upgrade required!</source> - <translation>警告：该软件版本已过时，请升级！</translation> - </message> - <message> <source>Warning: Unsupported argument -benchmark ignored, use -debug=bench.</source> <translation>警告：不支持的参数 -benchmark 已忽略，请使用 -debug=bench。</translation> </message> @@ -3004,14 +3410,170 @@ rpcpassword=%s <translation>wallet.dat 钱包文件加载出错：钱包损坏</translation> </message> <message> + <source>(1 = keep tx meta data e.g. account owner and payment request information, 2 = drop tx meta data)</source> + <translation>(1 = 保留 tx meta data , 如 account owner 和 payment request information, 2 = 不保留 tx meta data) </translation> + </message> + <message> + <source>Flush database activity from memory pool to disk log every <n> megabytes (default: %u)</source> + <translation>Flush database activity from memory pool to disk log every <n> megabytes (default: %u)</translation> + </message> + <message> + <source>How thorough the block verification of -checkblocks is (0-4, default: %u)</source> + <translation>数据块验证 严密级别 -checkblocks (0-4, 默认: %u) </translation> + </message> + <message> + <source>Log transaction priority and fee per kB when mining blocks (default: %u)</source> + <translation>挖矿时，记录交易优先级 和 每kb交易费 (默认: %u) </translation> + </message> + <message> + <source>Maintain a full transaction index, used by the getrawtransaction rpc call (default: %u)</source> + <translation>维护一份完整的交易索引, 用于 getrawtransaction RPC调用 (默认: %u)</translation> + </message> + <message> + <source>Number of seconds to keep misbehaving peers from reconnecting (default: %u)</source> + <translation>限制 非礼节点 若干秒内不能连接 (默认: %u) </translation> + </message> + <message> + <source>Output debugging information (default: %u, supplying <category> is optional)</source> + <translation>输出调试信息 (默认: %u, 提供 <category> 是可选项)</translation> + </message> + <message> + <source>Use separate SOCKS5 proxy to reach peers via Tor hidden services (default: %s)</source> + <translation>通过Tor隐藏服务连接节点时 使用不同的SOCKS5代理 (默认: %s)</translation> + </message> + <message> + <source>(default: %s)</source> + <translation>(默认: %s) </translation> + </message> + <message> + <source>Acceptable ciphers (default: %s)</source> + <translation>可接受的密码算法 (默认: %s) </translation> + </message> + <message> + <source>Disable safemode, override a real safe mode event (default: %u)</source> + <translation>禁止使用安全模式，重新写入一个真正的安全模式日志(默认: %u)</translation> + </message> + <message> <source>Error loading wallet.dat</source> <translation>wallet.dat 钱包文件加载出错</translation> </message> <message> + <source>Force safe mode (default: %u)</source> + <translation>强制安全模式 (默认: %u)</translation> + </message> + <message> + <source>Generate coins (default: %u)</source> + <translation>生成比特币 (默认: %u)</translation> + </message> + <message> + <source>How many blocks to check at startup (default: %u, 0 = all)</source> + <translation>启动时检测多少个数据块(默认: %u, 0=所有)</translation> + </message> + <message> + <source>Include IP addresses in debug output (default: %u)</source> + <translation>在调试输出中包含IP地址 (默认: %u)</translation> + </message> + <message> <source>Invalid -proxy address: '%s'</source> <translation>无效的代理地址：%s</translation> </message> <message> + <source>Limit size of signature cache to <n> entries (default: %u)</source> + <translation>签名缓冲区大小限制最多 <n> 条 (默认: %u) </translation> + </message> + <message> + <source>Listen for JSON-RPC connections on <port> (default: %u or testnet: %u)</source> + <translation>使用 <port>端口监听 JSON-RPC 连接 (默认: %u ; testnet: %u) </translation> + </message> + <message> + <source>Listen for connections on <port> (default: %u or testnet: %u)</source> + <translation>使用端口 <port> 监听连接 (默认: %u ; testnet: %u) </translation> + </message> + <message> + <source>Maintain at most <n> connections to peers (default: %u)</source> + <translation>保留最多 <n> 条节点连接 (默认: %u) </translation> + </message> + <message> + <source>Make the wallet broadcast transactions</source> + <translation>钱包广播事务处理</translation> + </message> + <message> + <source>Maximum per-connection receive buffer, <n>*1000 bytes (default: %u)</source> + <translation>每个连接的最大接收缓存，<n>*1000 字节 (默认: %u)</translation> + </message> + <message> + <source>Maximum per-connection send buffer, <n>*1000 bytes (default: %u)</source> + <translation>每个连接的最大发送缓存，<n>*1000 字节 (默认: %u)</translation> + </message> + <message> + <source>Only accept block chain matching built-in checkpoints (default: %u)</source> + <translation>仅接受符合客户端检查点设置 的数据块链 (默认: %u) </translation> + </message> + <message> + <source>Prepend debug output with timestamp (default: %u)</source> + <translation>输出调试信息时，前面加上时间戳 (默认: %u)</translation> + </message> + <message> + <source>Relay and mine data carrier transactions (default: %u)</source> + <translation>Relay and mine data carrier transactions (default: %u)</translation> + </message> + <message> + <source>Relay non-P2SH multisig (default: %u)</source> + <translation>是否转发 非P2SH格式的多签名交易 (默认: %u) </translation> + </message> + <message> + <source>Run a thread to flush wallet periodically (default: %u)</source> + <translation>运行一个线程，定时清理钱包 (默认: %u)</translation> + </message> + <message> + <source>Server certificate file (default: %s)</source> + <translation>服务器证书文件 (默认: %s) </translation> + </message> + <message> + <source>Server private key (default: %s)</source> + <translation>服务器私钥 (默认: %s) </translation> + </message> + <message> + <source>Set key pool size to <n> (default: %u)</source> + <translation>设置私钥池大小为 <n> (默认：%u) </translation> + </message> + <message> + <source>Set minimum block size in bytes (default: %u)</source> + <translation>设置数据块 最小字节数 (默认: %u) </translation> + </message> + <message> + <source>Set the number of threads to service RPC calls (default: %d)</source> + <translation>设置RPC服务线程数 (默认: %d) </translation> + </message> + <message> + <source>Sets the DB_PRIVATE flag in the wallet db environment (default: %u)</source> + <translation>Sets the DB_PRIVATE flag in the wallet db environment (default: %u)</translation> + </message> + <message> + <source>Specify configuration file (default: %s)</source> + <translation>指定配置文件 (默认: %s) </translation> + </message> + <message> + <source>Specify connection timeout in milliseconds (minimum: 1, default: %d)</source> + <translation>指定连接超时毫秒数 (最小: 1, 默认: %d) </translation> + </message> + <message> + <source>Specify pid file (default: %s)</source> + <translation>指定 pid 文件 (默认: %s) </translation> + </message> + <message> + <source>Spend unconfirmed change when sending transactions (default: %u)</source> + <translation>付款时允许使用未确认的零钱 (默认: %u) </translation> + </message> + <message> + <source>Stop running after importing blocks from disk (default: %u)</source> + <translation>从磁盘导入数据块后退出 (默认: %u) </translation> + </message> + <message> + <source>Threshold for disconnecting misbehaving peers (default: %u)</source> + <translation>断开 非礼节点的阀值 (默认: %u) </translation> + </message> + <message> <source>Unknown network specified in -onlynet: '%s'</source> <translation>-onlynet 指定的是未知网络：%s</translation> </message> @@ -3028,10 +3590,6 @@ rpcpassword=%s <translation>非法金额 -paytxfee=<amount>: '%s'</translation> </message> <message> - <source>Invalid amount</source> - <translation>无效金额</translation> - </message> - <message> <source>Insufficient funds</source> <translation>金额不足</translation> </message> @@ -3064,10 +3622,6 @@ rpcpassword=%s <translation>加载完成</translation> </message> <message> - <source>To use the %s option</source> - <translation>使用 %s 选项</translation> - </message> - <message> <source>Error</source> <translation>错误</translation> </message> diff --git a/src/qt/locale/bitcoin_zh_HK.ts b/src/qt/locale/bitcoin_zh_HK.ts index 7062377f45..dfdbb7d1da 100644 --- a/src/qt/locale/bitcoin_zh_HK.ts +++ b/src/qt/locale/bitcoin_zh_HK.ts @@ -1,4 +1,4 @@ -<TS language="zh_HK" version="2.0"> +<TS language="zh_HK" version="2.1"> <context> <name>AddressBookPage</name> </context> diff --git a/src/qt/locale/bitcoin_zh_TW.ts b/src/qt/locale/bitcoin_zh_TW.ts index 56d598fc64..254b33d5a4 100644 --- a/src/qt/locale/bitcoin_zh_TW.ts +++ b/src/qt/locale/bitcoin_zh_TW.ts @@ -1,9 +1,9 @@ -<TS language="zh_TW" version="2.0"> +<TS language="zh_TW" version="2.1"> <context> <name>AddressBookPage</name> <message> - <source>Double-click to edit address or label</source> - <translation>按兩下來編輯位址或標記</translation> + <source>Right-click to edit address or label</source> + <translation>右鍵點一下來修改位址或標記</translation> </message> <message> <source>Create a new address</source> @@ -156,10 +156,6 @@ <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> @@ -188,10 +184,6 @@ <translation>輸入錢包的新密碼。<br/>密碼請用<b>10 個以上的字元</b>，或是<b>8 個以上的字詞</b>。</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> @@ -311,10 +303,6 @@ <translation>付錢給一個位元幣位址</translation> </message> <message> - <source>Modify configuration options for Bitcoin</source> - <translation>修改位元幣軟體的設定選項</translation> - </message> - <message> <source>Backup wallet to another location</source> <translation>把錢包備份到其它地方</translation> </message> @@ -344,11 +332,11 @@ </message> <message> <source>&Send</source> - <translation>付款</translation> + <translation>已傳送</translation> </message> <message> <source>&Receive</source> - <translation>收款</translation> + <translation>已接收</translation> </message> <message> <source>Show information about Bitcoin Core</source> @@ -478,10 +466,6 @@ <source>Up to date</source> <translation>最新狀態</translation> </message> - <message numerus="yes"> - <source>Processed %n blocks of transaction history.</source> - <translation><numerusform>已經處理了 %n 個區塊的交易紀錄。</numerusform></translation> - </message> <message> <source>Catching up...</source> <translation>正在趕進度...</translation> @@ -495,18 +479,6 @@ <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> @@ -577,6 +549,14 @@ Address: %4 <translation>金額</translation> </message> <message> + <source>Received with label</source> + <translation>收款標記</translation> + </message> + <message> + <source>Received with address</source> + <translation>收款位址</translation> + </message> + <message> <source>Date</source> <translation>日期</translation> </message> @@ -701,10 +681,6 @@ Address: %4 <translation>否</translation> </message> <message> - <source>This label turns red, if the transaction size is greater than 1000 bytes.</source> - <translation>當交易大小大於 1000 位元組時，文字會變紅色。</translation> - </message> - <message> <source>This means a fee of at least %1 per kB is required.</source> <translation>表示每一千位元組(kB)需要至少 %1 的手續費。</translation> </message> @@ -717,14 +693,6 @@ Address: %4 <translation>優先度較高的交易比較有可能被接受放進區塊中。</translation> </message> <message> - <source>This label turns red, if the priority is smaller than "medium".</source> - <translation>當優先度低於「中等」時，文字會變紅色。</translation> - </message> - <message> - <source>This label turns red, if any recipient receives an amount smaller than %1.</source> - <translation>當任何一個收款金額小於 %1 時，文字會變紅色。</translation> - </message> - <message> <source>(no label)</source> <translation>(無標記)</translation> </message> @@ -796,7 +764,7 @@ Address: %4 <name>FreespaceChecker</name> <message> <source>A new data directory will be created.</source> - <translation>就要造出新的資料目錄。</translation> + <translation>就要產生新的資料目錄。</translation> </message> <message> <source>name</source> @@ -845,30 +813,6 @@ Address: %4 <source>command-line options</source> <translation>命令列選項</translation> </message> - <message> - <source>UI options</source> - <translation>使用界面選項</translation> - </message> - <message> - <source>Set language, for example "de_DE" (default: system locale)</source> - <translation>設定語言，比如說 de_DE (預設值: 系統語系)</translation> - </message> - <message> - <source>Start minimized</source> - <translation>啓動時縮到最小</translation> - </message> - <message> - <source>Set SSL root certificates for payment request (default: -system-)</source> - <translation>設定付款請求時所使用的 SSL 根憑證 (預設值: 系統憑證庫)</translation> - </message> - <message> - <source>Show splash screen on startup (default: 1)</source> - <translation>顯示啓動畫面(預設值: 1)</translation> - </message> - <message> - <source>Choose data directory on startup (default: 0)</source> - <translation>啓動時選擇資料目錄(預設值: 0)</translation> - </message> </context> <context> <name>Intro</name> @@ -951,14 +895,6 @@ Address: %4 <translation>主要</translation> </message> <message> - <source>Automatically start Bitcoin after logging in to the system.</source> - <translation>在登入系統後自動啓動位元幣軟體。</translation> - </message> - <message> - <source>&Start Bitcoin on system login</source> - <translation>系統登入時啟動位元幣</translation> - </message> - <message> <source>Size of &database cache</source> <translation>資料庫快取大小</translation> </message> @@ -1071,10 +1007,6 @@ Address: %4 <translation>縮到最小到通知區域而不是工作列</translation> </message> <message> - <source>Minimize instead of exit the application when the window is closed. When this option is enabled, the application will be closed only after selecting Quit in the menu.</source> - <translation>當視窗關閉時，把應用程式縮到最小，而不是結束。當勾選這個選項時，只能夠用選單中的結束來關掉應用程式。</translation> - </message> - <message> <source>M&inimize on close</source> <translation>關閉時縮到最小</translation> </message> @@ -1087,10 +1019,6 @@ Address: %4 <translation>使用界面語言:</translation> </message> <message> - <source>The user interface language can be set here. This setting will take effect after restarting Bitcoin.</source> - <translation>可以在這裡設定使用者介面的語言。這個設定在重啓位元幣軟體後才會生效。</translation> - </message> - <message> <source>&Unit to show amounts in:</source> <translation>金額顯示單位:</translation> </message> @@ -1127,10 +1055,6 @@ Address: %4 <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>這項改變需要重新啟動客戶端軟體。</translation> </message> @@ -1237,10 +1161,6 @@ Address: %4 <translation>付款要求的網路類型跟客戶端不符。</translation> </message> <message> - <source>Payment request has expired.</source> - <translation>付款的要求已經過期了。</translation> - </message> - <message> <source>Payment request is not initialized.</source> <translation>付款的要求沒有完成初始化。</translation> </message> @@ -1281,6 +1201,14 @@ Address: %4 <translation>來自 %1 的退款</translation> </message> <message> + <source>Payment request %1 is too large (%2 bytes, allowed %3 bytes).</source> + <translation>付款要求 %1 過大 (%2 位元組, 上限 %3 位元組).</translation> + </message> + <message> + <source>Payment request DoS protection</source> + <translation>支付請求的分佈式阻斷服務攻擊DoS保護</translation> + </message> + <message> <source>Error communicating with %1: %2</source> <translation>跟 %1 通訊時發生錯誤: %2</translation> </message> @@ -1308,10 +1236,6 @@ Address: %4 <translation>使用者代理</translation> </message> <message> - <source>Address/Hostname</source> - <translation>位址/主機名稱</translation> - </message> - <message> <source>Ping Time</source> <translation>Ping 時間</translation> </message> @@ -1343,14 +1267,6 @@ Address: %4 <translation>%1 秒</translation> </message> <message> - <source>NETWORK</source> - <translation>網路</translation> - </message> - <message> - <source>UNKNOWN</source> - <translation>不明</translation> - </message> - <message> <source>None</source> <translation>無</translation> </message> @@ -1549,18 +1465,10 @@ Address: %4 <translation>除錯紀錄檔</translation> </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>從目前的資料目錄下開啓位元幣軟體的除錯紀錄檔。當紀錄檔很大時，可能會花好幾秒的時間。</translation> - </message> - <message> <source>Clear console</source> <translation>清主控台</translation> </message> <message> - <source>Welcome to the Bitcoin RPC console.</source> - <translation>歡迎使用位元幣 RPC 主控台。</translation> - </message> - <message> <source>Use up and down arrows to navigate history, and <b>Ctrl-L</b> to clear screen.</source> <translation>請用上下游標鍵來瀏覽先前指令的紀錄，並用 <b>Ctrl-L</b> 來清畫面。</translation> </message> @@ -1842,33 +1750,65 @@ Address: %4 </message> <message> <source>Choose...</source> - <translation>選擇...</translation> + <translation>選項...</translation> </message> <message> <source>collapse fee-settings</source> <translation>展開手續費設定</translation> </message> <message> - <source>Minimize</source> - <translation>最小化</translation> - </message> - <message> <source>per kilobyte</source> <translation>每千位元組</translation> </message> <message> + <source>If the custom fee is set to 1000 satoshis and the transaction is only 250 bytes, then "per kilobyte" only pays 250 satoshis in fee, while "total at least" pays 1000 satoshis. For transactions bigger than a kilobyte both pay by kilobyte.</source> + <translation>如果自訂手續費設定為 1000 satoshi, 而交易資料大小只有 250 個位元組的話，那麽選擇「每千位元組」就只會付 250 satoshi 的手續費，換做選「總共至少」就會付 1000 satoshi. 但是如果交易資料大小超過一千個位元組，那麽兩者都是每千位元組的費用。</translation> + </message> + <message> + <source>total at least</source> + <translation>總共最少</translation> + </message> + <message> + <source>Paying only the minimum fee is just fine as long as there is less transaction volume than space in the blocks. But be aware that this can end up in a never confirming transaction once there is more demand for bitcoin transactions than the network can process.</source> + <translation>當交易量少於區塊可容納的空間時，只付最低手續費不會有什麽問題。但是當交易量的需求成長到超過整體網路可以處理的量時，可能會造成一筆一直不會被確認的交易。</translation> + </message> + <message> <source>(read the tooltip)</source> <translation>(請看提示)</translation> </message> <message> + <source>Recommended:</source> + <translation>建議值:</translation> + </message> + <message> + <source>Custom:</source> + <translation>自訂:</translation> + </message> + <message> + <source>(Smart fee not initialized yet. This usually takes a few blocks...)</source> + <translation>(手續費智慧演算法還沒準備好。通常都要等幾個區塊才行...)</translation> + </message> + <message> <source>Confirmation time:</source> <translation>確認時間:</translation> </message> <message> + <source>normal</source> + <translation>正常</translation> + </message> + <message> + <source>fast</source> + <translation>快速</translation> + </message> + <message> <source>Send as zero-fee transaction if possible</source> <translation>盡可能送不用付手續費的交易</translation> </message> <message> + <source>(confirmation may take longer)</source> + <translation>(確認時間可能拉長)</translation> + </message> + <message> <source>Send to multiple recipients at once</source> <translation>一次付給多個收款人</translation> </message> @@ -1945,10 +1885,6 @@ Address: %4 <translation>或</translation> </message> <message> - <source>The recipient address is not valid, please recheck.</source> - <translation>收款位址無效，請再檢查看看。</translation> - </message> - <message> <source>The amount to pay must be larger than 0.</source> <translation>付款金額必須大於零。</translation> </message> @@ -1961,10 +1897,6 @@ Address: %4 <translation>包含 %1 的交易手續費後，總金額超過你的餘額了。</translation> </message> <message> - <source>Duplicate address found, can only send to each address once per send operation.</source> - <translation>發現有重複的位址。每個付款動作中，只能付給個別的位址一次。</translation> - </message> - <message> <source>Transaction creation failed!</source> <translation>製造交易失敗了！</translation> </message> @@ -1973,6 +1905,10 @@ Address: %4 <translation>交易被拒絕了！有時候會發生這種錯誤，是因為你錢包中的一些錢已經被花掉了。比如說你複製了錢包檔 wallet.dat, 然後用複製的錢包花掉了錢，你現在所用的原來的錢包中，卻沒有那筆錢已經花掉的紀錄。</translation> </message> <message> + <source>Pay only the minimum fee of %1</source> + <translation>只付最低手續費 %1</translation> + </message> + <message> <source>Warning: Invalid Bitcoin address</source> <translation>警告: 位元幣位址無效</translation> </message> @@ -2048,10 +1984,6 @@ Address: %4 <translation>訊息:</translation> </message> <message> - <source>This is a verified payment request.</source> - <translation>這是個已驗證的付款要求。</translation> - </message> - <message> <source>Enter a label for this address to add it to the list of used addresses</source> <translation>請輸入這個位址的標記，來把它加進去已使用過位址的清單。</translation> </message> @@ -2060,10 +1992,6 @@ Address: %4 <translation>附加在位元幣付款協議 URI 中的訊息，會和交易內容一起存起來，給你自己做參考。注意: 這個訊息不會送到位元幣網路上。</translation> </message> <message> - <source>This is an unverified payment request.</source> - <translation>這是個沒驗證過的付款要求。</translation> - </message> - <message> <source>Pay To:</source> <translation>付給:</translation> </message> @@ -2094,10 +2022,6 @@ Address: %4 <translation>簽署訊息</translation> </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>你可以用自己的位址簽署訊息，來證明你對位址的所有權。但是請小心，不要簽署語意含糊不清的內容，因為釣魚式詐騙可能會用騙你簽署的手法來冒充是你。只有在語句中的細節你都同意時才簽署。</translation> - </message> - <message> <source>The Bitcoin address to sign the message with</source> <translation>用來簽署訊息的位元幣位址</translation> </message> @@ -2150,10 +2074,6 @@ Address: %4 <translation>驗證訊息</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>請在下面輸入簽署的位址，訊息(請確定完整複製了所包含的換行，空格，跳位符號等等)，以及簽章，來驗證這個訊息。請小心，除了訊息內容以外，不要對簽章本身過度解讀，以避免被用「中間人攻擊法」詐騙。</translation> - </message> - <message> <source>The Bitcoin address the message was signed with</source> <translation>簽署這個訊息的位元幣位址</translation> </message> @@ -2417,10 +2337,6 @@ Address: %4 <translation>種類</translation> </message> <message> - <source>Address</source> - <translation>位址</translation> - </message> - <message> <source>Immature (%1 confirmations, will be available after %2)</source> <translation>未成熟(確認 %1 次，會在 %2 次後可用)</translation> </message> @@ -2449,6 +2365,10 @@ Address: %4 <translation>離線中</translation> </message> <message> + <source>Label</source> + <translation>標記</translation> + </message> + <message> <source>Unconfirmed</source> <translation>未確認</translation> </message> @@ -2505,10 +2425,6 @@ Address: %4 <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> @@ -2748,30 +2664,6 @@ Address: %4 <translation>是否接受外來連線(預設值: 當沒有 -proxy 或 -connect 時為 1)</translation> </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>%s, 你必須要在以下設定檔中設定 RPC 密碼(rpcpassword): -%s -建議你使用以下隨機產生的密碼: -rpcuser=bitcoinrpc -rpcpassword=%s -(你不用記住這個密碼) -使用者名稱(rpcuser)和密碼(rpcpassword)不可以相同！ -如果還沒有這個設定檔，請在造出來的時候，設定檔案權限成「只有主人才能讀取」。 -也建議你設定警示通知，發生問題時你才會被通知到； -比如說設定成: -alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo.com</translation> - </message> - <message> <source>Bind to given address and always listen on it. Use [host]:port notation for IPv6</source> <translation>和指定的位址繫結，並且一直在指定位址聽候連線。IPv6 請用 [主機]:通訊埠 這種格式</translation> </message> @@ -2788,14 +2680,6 @@ alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo.com</translation> <translation>進入回歸測試模式，使用可以立即解出區塊的特殊區塊鏈。</translation> </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>錯誤: 交易被拒絕了！有時候會發生這種錯誤，是因為你錢包中的一些錢已經被花掉了。比如說你複製了錢包檔 wallet.dat, 然後用複製的錢包花掉了錢，你現在所用的原來的錢包中，卻沒有那筆錢已經花掉的紀錄。</translation> - </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>錯誤: 這筆交易需要至少 %s 的手續費！因為它的金額太大，或複雜度太高，或是使用了最近才剛收到的款項。</translation> - </message> - <message> <source>Execute command when a wallet transaction changes (%s in cmd is replaced by TxID)</source> <translation>當錢包有交易改變時要執行的指令(指令中的 %s 會被取代成交易識別碼)</translation> </message> @@ -2872,10 +2756,6 @@ alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo.com</translation> <translation>除錯與測試選項</translation> </message> <message> - <source>Discover own IP address (default: 1 when listening and no -externalip)</source> - <translation>找出自己的網際網路位址(預設值: 當有聽候連線且沒有 -externalip 時為 1)</translation> - </message> - <message> <source>Do not load the wallet and disable wallet RPC calls</source> <translation>不要載入錢包，並且拿掉錢包相關的 RPC 功能請求。</translation> </message> @@ -2908,10 +2788,6 @@ alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo.com</translation> <translation>錯誤: 磁碟空間很少！</translation> </message> <message> - <source>Error: Wallet locked, unable to create transaction!</source> - <translation>錯誤: 錢包被上鎖了，沒辦法製造新的交易！</translation> - </message> - <message> <source>Failed to listen on any port. Use -listen=0 if you want this.</source> <translation>在任意的通訊埠聽候失敗。如果你希望這樣的話，可以設定 -listen=0.</translation> </message> @@ -2940,10 +2816,6 @@ alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo.com</translation> <translation>只有連接到網絡節點 <net> （IPv4，IPv6或onion）</translation> </message> <message> - <source>Rebuild block chain index from current blk000??.dat files</source> - <translation>從目前的區塊檔 blk000??.dat 重建區塊鏈的索引</translation> - </message> - <message> <source>Set database cache size in megabytes (%d to %d, default: %d)</source> <translation>設定資料庫快取大小是多少百萬位元組(MB，範圍: %d 到 %d，預設值: %d)</translation> </message> @@ -3004,10 +2876,6 @@ alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo.com</translation> <translation>沒辦法鎖定資料目錄 %s。位元幣核心可能已經在執行了。</translation> </message> <message> - <source>Continuously rate-limit free transactions to <n>*1000 bytes per minute (default:%u)</source> - <translation>對沒付手續費的交易持續限制每分鐘內最多只能有 <n>*1000 個位元組(預設值: %u)</translation> - </message> - <message> <source>Create new files with system default permissions, instead of umask 077 (only effective with disabled wallet functionality)</source> <translation>用系統預設權限來造出新的檔案，而不是用使用者權限罩遮(umask)值 077 (只有在關掉錢包功能時才有作用)。</translation> </message> @@ -3032,6 +2900,14 @@ alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo.com</translation> <translation>當製造交易時，如果每千位元組(Kb)的手續費比這個值低，就視為沒付手續費 (預設值: %s)</translation> </message> <message> + <source>If paytxfee is not set, include enough fee so transactions begin confirmation on average within n blocks (default: %u)</source> + <translation>當沒有設定 paytxfee 時，自動包含可以讓交易能在平均 n 個區塊內開始確認的手續費(預設值: %u)</translation> + </message> + <message> + <source>Invalid amount for -maxtxfee=<amount>: '%s' (must be at least the minrelay fee of %s to prevent stuck transactions)</source> + <translation>-maxtxfee=<amount>: '%s' 的金額無效 (必須大於最低轉發手續費 %s 以避免交易無法確認)</translation> + </message> + <message> <source>Maximum size of data in data carrier transactions we relay and mine (default: %u)</source> <translation>轉發和開採時，對只帶資料的交易的大小上限(預設值: %u)</translation> </message> @@ -3052,6 +2928,34 @@ alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo.com</translation> <translation>此產品也包含了由 OpenSSL Project 所開發的 OpenSSL Toolkit 軟體 <https://www.openssl.org/>, 和由 Eric Young 撰寫的加解密軟體，以及由 Thomas Bernard 所撰寫的 UPnP 軟體。</translation> </message> <message> + <source>To use bitcoind, or the -server option to bitcoin-qt, you must set an 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>要使用 bitcoind, 或是對 bitcoin-qt 指定 -server 選項，你必須要在以下設定檔中設定 RPC 密碼(選項: rpcpassword): +%s +建議你使用以下隨機產生的密碼: +rpcuser=bitcoinrpc +rpcpassword=%s +(你不用記住這個密碼) +注意使用者名稱(rpcuser)和密碼(rpcpassword)不可以相同！ +如果設定檔還不存在，請在新增時，設定檔案權限為"只有主人才能讀取"。 +也建議你設定警示通知，這樣發生問題時你才會被通知到； +比如說設定: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo.com +</translation> + </message> + <message> + <source>Warning: -maxtxfee is set very high! Fees this large could be paid on a single transaction.</source> + <translation>警告: -maxtxfee 設定了很高的金額！這可是一次交易就有可能付出的最高手續費。</translation> + </message> + <message> <source>Warning: Please check that your computer's date and time are correct! If your clock is wrong Bitcoin Core will not work properly.</source> <translation>警告: 請檢查電腦日期和時間是否正確！位元幣核心沒辦法在時鐘不準的情況下正常運作。</translation> </message> @@ -3060,10 +2964,18 @@ alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo.com</translation> <translation>在白名單中的節點不會因為偵測到阻斷服務攻擊而被停用。來自這些節點的交易也一定會被轉發，即使說交易本來就在記憶池裡了也一樣。適用於像是閘道伺服器。</translation> </message> <message> + <source>Accept public REST requests (default: %u)</source> + <translation>接受公開的REST請求 (預設值: %u)</translation> + </message> + <message> <source>Cannot resolve -whitebind address: '%s'</source> <translation>沒辦法解析 -whitebind 指定的位址: '%s'</translation> </message> <message> + <source>Choose data directory on startup (default: 0)</source> + <translation>啓動時選擇資料目錄(預設值: 0)</translation> + </message> + <message> <source>Connect through SOCKS5 proxy</source> <translation>透過 SOCKS5 代理伺服器連線</translation> </message> @@ -3080,6 +2992,10 @@ alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo.com</translation> <translation>載入 wallet.dat 檔案時發生錯誤: 這個錢包需要新版的位元幣核心</translation> </message> <message> + <source>Error reading from database, shutting down.</source> + <translation>讀取資料庫時發生錯誤，要關閉了。</translation> + </message> + <message> <source>Error: Unsupported argument -tor found, use -onion.</source> <translation>錯誤: 找到不再支援的 -tor 參數，請改用 -onion 參數。</translation> </message> @@ -3093,7 +3009,11 @@ alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo.com</translation> </message> <message> <source>Initialization sanity check failed. Bitcoin Core is shutting down.</source> - <translation>初始化時的基本檢查失敗了。位元幣核心將會關閉。</translation> + <translation>初始化時的基本檢查失敗了。位元幣核心就要關閉了。</translation> + </message> + <message> + <source>Invalid amount for -maxtxfee=<amount>: '%s'</source> + <translation>-maxtxfee=<amount>: '%s' 的金額無效</translation> </message> <message> <source>Invalid amount for -minrelaytxfee=<amount>: '%s'</source> @@ -3112,10 +3032,6 @@ alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo.com</translation> <translation>指定在 -whitelist 的網段無效: '%s'</translation> </message> <message> - <source>Keep at most <n> unconnectable blocks in memory (default: %u)</source> - <translation>在記憶體中保存最多 <n> 個不和其他區塊相連結的區塊(預設值 : %u)</translation> - </message> - <message> <source>Keep at most <n> unconnectable transactions in memory (default: %u)</source> <translation>保持最多 <n> 無法連結的交易在記憶體 (預設: %u)</translation> </message> @@ -3128,10 +3044,6 @@ alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo.com</translation> <translation>節點轉發選項:</translation> </message> <message> - <source>Print block on startup, if found in block index</source> - <translation>啟動時輸出指定的區塊內容，如果有在區塊索引中找到的話</translation> - </message> - <message> <source>RPC SSL options: (see the Bitcoin Wiki for SSL setup instructions)</source> <translation>RPC SSL 選項: (SSL 設定程序請見 Bitcoin Wiki)</translation> </message> @@ -3140,6 +3052,10 @@ alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo.com</translation> <translation>RPC 伺服器選項:</translation> </message> <message> + <source>RPC support for HTTP persistent connections (default: %d)</source> + <translation>RPC 是否支援 HTTP 持久連線(預設值: %d)</translation> + </message> + <message> <source>Randomly drop 1 of every <n> network messages</source> <translation>隨機丟掉 <n> 分之一的網路訊息</translation> </message> @@ -3156,10 +3072,22 @@ alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo.com</translation> <translation>盡可能送出不用付手續費的交易(預設值: %u)</translation> </message> <message> + <source>Set SSL root certificates for payment request (default: -system-)</source> + <translation>設定付款請求時所使用的 SSL 根憑證 (預設值: 系統憑證庫)</translation> + </message> + <message> + <source>Set language, for example "de_DE" (default: system locale)</source> + <translation>設定語言，比如說 de_DE (預設值: 系統語系)</translation> + </message> + <message> <source>Show all debugging options (usage: --help -help-debug)</source> <translation>顯示所有的除錯選項 (用法: --help --help-debug)</translation> </message> <message> + <source>Show splash screen on startup (default: 1)</source> + <translation>顯示啓動畫面(預設值: 1)</translation> + </message> + <message> <source>Shrink debug.log file on client startup (default: 1 when no -debug)</source> <translation>客戶端軟體啓動時把 debug.log 檔縮小(預設值: 當沒有 -debug 時為 1)</translation> </message> @@ -3168,6 +3096,10 @@ alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo.com</translation> <translation>簽署交易失敗</translation> </message> <message> + <source>Start minimized</source> + <translation>啓動時縮到最小</translation> + </message> + <message> <source>This is experimental software.</source> <translation>這套軟體屬於實驗性質。</translation> </message> @@ -3180,6 +3112,10 @@ alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo.com</translation> <translation>交易金額必須是正的</translation> </message> <message> + <source>Transaction too large for fee policy</source> + <translation>根據交易手續費準則，本交易的位元量過大</translation> + </message> + <message> <source>Transaction too large</source> <translation>交易位元量太大</translation> </message> @@ -3204,10 +3140,6 @@ alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo.com</translation> <translation>警告</translation> </message> <message> - <source>Warning: This version is obsolete, upgrade required!</source> - <translation>警告: 這個版本已經被淘汰了，必須要升級！</translation> - </message> - <message> <source>Warning: Unsupported argument -benchmark ignored, use -debug=bench.</source> <translation>警告: 忽略了不再支援的 -benchmark 參數，請改用 -debug=bench.</translation> </message> @@ -3276,10 +3208,6 @@ alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo.com</translation> <translation>使用 -checkblocks 檢查區塊的仔細程度(0 到 4，預設值: %u)</translation> </message> <message> - <source>If paytxfee is not set, include enough fee so transactions are confirmed on average within n blocks (default: %u)</source> - <translation>當沒有設定 paytxfee 時，自動包含可以讓交易能在平均 n 個區塊內確認的手續費(預設值: %u)</translation> - </message> - <message> <source>Log transaction priority and fee per kB when mining blocks (default: %u)</source> <translation>開採區塊的時候，紀錄交易的優先度以及每千位元組(kB)的手續費(預設值: %u)</translation> </message> @@ -3372,10 +3300,6 @@ alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo.com</translation> <translation>在除錯輸出內容前附加時間(預設值: %u)</translation> </message> <message> - <source>Print block tree on startup (default: %u)</source> - <translation>啟動時輸出區塊樹(預設值: %u)</translation> - </message> - <message> <source>Relay and mine data carrier transactions (default: %u)</source> <translation>允許轉發和開採只帶資料的交易(預設值: %u)</translation> </message> @@ -3452,10 +3376,6 @@ alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo.com</translation> <translation>設定 -paytxfee=<金額> 的金額無效: '%s'</translation> </message> <message> - <source>Invalid amount</source> - <translation>無效的金額</translation> - </message> - <message> <source>Insufficient funds</source> <translation>累積金額不足</translation> </message> @@ -3488,10 +3408,6 @@ alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo.com</translation> <translation>載入完成</translation> </message> <message> - <source>To use the %s option</source> - <translation>為了要使用 %s 選項</translation> - </message> - <message> <source>Error</source> <translation>錯誤</translation> </message> diff --git a/src/qt/optionsdialog.cpp b/src/qt/optionsdialog.cpp index a9e4b339e4..efb2bf4158 100644 --- a/src/qt/optionsdialog.cpp +++ b/src/qt/optionsdialog.cpp @@ -208,7 +208,7 @@ void OptionsDialog::on_resetButton_clicked() { // confirmation dialog QMessageBox::StandardButton btnRetVal = QMessageBox::question(this, tr("Confirm options reset"), - tr("Client restart required to activate changes.") + "<br><br>" + tr("Client will be shutdown, do you want to proceed?"), + tr("Client restart required to activate changes.") + "<br><br>" + tr("Client will be shut down. Do you want to proceed?"), QMessageBox::Yes | QMessageBox::Cancel, QMessageBox::Cancel); if(btnRetVal == QMessageBox::Cancel) diff --git a/src/qt/sendcoinsdialog.cpp b/src/qt/sendcoinsdialog.cpp index 0360f160d8..3d57711568 100644 --- a/src/qt/sendcoinsdialog.cpp +++ b/src/qt/sendcoinsdialog.cpp @@ -505,7 +505,7 @@ void SendCoinsDialog::processSendCoinsReturn(const WalletModel::SendCoinsReturn switch(sendCoinsReturn.status) { case WalletModel::InvalidAddress: - msgParams.first = tr("The recipient address is not valid, please recheck."); + msgParams.first = tr("The recipient address is not valid. Please recheck."); break; case WalletModel::InvalidAmount: msgParams.first = tr("The amount to pay must be larger than 0."); @@ -517,7 +517,7 @@ void SendCoinsDialog::processSendCoinsReturn(const WalletModel::SendCoinsReturn msgParams.first = tr("The total exceeds your balance when the %1 transaction fee is included.").arg(msgArg); break; case WalletModel::DuplicateAddress: - msgParams.first = tr("Duplicate address found, can only send to each address once per send operation."); + msgParams.first = tr("Duplicate address found: addresses should only be used once each."); break; case WalletModel::TransactionCreationFailed: msgParams.first = tr("Transaction creation failed!"); @@ -590,12 +590,12 @@ void SendCoinsDialog::updateGlobalFeeVariables() { if (ui->radioSmartFee->isChecked()) { - nTxConfirmTarget = (int)25 - (int)std::max(0, std::min(24, ui->sliderSmartFee->value())); + nTxConfirmTarget = defaultConfirmTarget - ui->sliderSmartFee->value(); payTxFee = CFeeRate(0); } else { - nTxConfirmTarget = 25; + nTxConfirmTarget = defaultConfirmTarget; payTxFee = CFeeRate(ui->customFee->value()); fPayAtLeastCustomFee = ui->radioCustomAtLeast->isChecked(); } @@ -629,7 +629,7 @@ void SendCoinsDialog::updateSmartFeeLabel() if(!model || !model->getOptionsModel()) return; - int nBlocksToConfirm = (int)25 - (int)std::max(0, std::min(24, ui->sliderSmartFee->value())); + int nBlocksToConfirm = defaultConfirmTarget - ui->sliderSmartFee->value(); CFeeRate feeRate = mempool.estimateFee(nBlocksToConfirm); if (feeRate <= CFeeRate(0)) // not enough data => minfee { diff --git a/src/qt/sendcoinsdialog.h b/src/qt/sendcoinsdialog.h index 14adb02573..fc513bf2ba 100644 --- a/src/qt/sendcoinsdialog.h +++ b/src/qt/sendcoinsdialog.h @@ -23,6 +23,8 @@ QT_BEGIN_NAMESPACE class QUrl; QT_END_NAMESPACE +const int defaultConfirmTarget = 25; + /** Dialog for sending bitcoins */ class SendCoinsDialog : public QDialog { diff --git a/src/qt/sendcoinsentry.cpp b/src/qt/sendcoinsentry.cpp index ea35ed1d53..6eec33ffd4 100644 --- a/src/qt/sendcoinsentry.cpp +++ b/src/qt/sendcoinsentry.cpp @@ -216,7 +216,7 @@ void SendCoinsEntry::setValue(const SendCoinsRecipient &value) ui->addAsLabel->clear(); ui->payTo->setText(recipient.address); // this may set a label from addressbook - if (!recipient.label.isEmpty()) // if a label had been set from the addressbook, dont overwrite with an empty label + if (!recipient.label.isEmpty()) // if a label had been set from the addressbook, don't overwrite with an empty label ui->addAsLabel->setText(recipient.label); ui->payAmount->setValue(recipient.amount); } diff --git a/src/qt/transactiondesc.cpp b/src/qt/transactiondesc.cpp index 4a2c51477e..4fffd03adf 100644 --- a/src/qt/transactiondesc.cpp +++ b/src/qt/transactiondesc.cpp @@ -10,11 +10,12 @@ #include "transactionrecord.h" #include "base58.h" +#include "consensus/consensus.h" #include "main.h" #include "script/script.h" #include "timedata.h" -#include "ui_interface.h" #include "util.h" +#include "wallet/db.h" #include "wallet/wallet.h" #include <stdint.h> diff --git a/src/qt/transactionrecord.cpp b/src/qt/transactionrecord.cpp index 9db5ad0fd4..7f1db58e5d 100644 --- a/src/qt/transactionrecord.cpp +++ b/src/qt/transactionrecord.cpp @@ -5,6 +5,7 @@ #include "transactionrecord.h" #include "base58.h" +#include "consensus/consensus.h" #include "main.h" #include "timedata.h" #include "wallet/wallet.h" diff --git a/src/rest.cpp b/src/rest.cpp index adc2d56284..1b7954bbf6 100644 --- a/src/rest.cpp +++ b/src/rest.cpp @@ -9,14 +9,18 @@ #include "rpcserver.h" #include "streams.h" #include "sync.h" +#include "txmempool.h" #include "utilstrencodings.h" #include "version.h" #include <boost/algorithm/string.hpp> +#include <boost/dynamic_bitset.hpp> using namespace std; using namespace json_spirit; +static const int MAX_GETUTXOS_OUTPOINTS = 100; //allow a max of 100 outpoints to be queried at once + enum RetFormat { RF_UNDEF, RF_BINARY, @@ -34,6 +38,22 @@ static const struct { {RF_JSON, "json"}, }; +struct CCoin { + uint32_t nTxVer; // Don't call this nVersion, that name has a special meaning inside IMPLEMENT_SERIALIZE + uint32_t nHeight; + CTxOut out; + + ADD_SERIALIZE_METHODS; + + template <typename Stream, typename Operation> + inline void SerializationOp(Stream& s, Operation ser_action, int nType, int nVersion) + { + READWRITE(nTxVer); + READWRITE(nHeight); + READWRITE(out); + } +}; + class RestErr { public: @@ -43,6 +63,7 @@ public: extern void TxToJSON(const CTransaction& tx, const uint256 hashBlock, Object& entry); extern Object blockToJSON(const CBlock& block, const CBlockIndex* blockindex, bool txDetails = false); +extern void ScriptPubKeyToJSON(const CScript& scriptPubKey, Object& out, bool fIncludeHex); static RestErr RESTERR(enum HTTPStatusCode status, string message) { @@ -90,12 +111,13 @@ static bool ParseHashStr(const string& strReq, uint256& v) } static bool rest_headers(AcceptedConnection* conn, - const std::string& strReq, + const std::string& strURIPart, + const std::string& strRequest, const std::map<std::string, std::string>& mapHeaders, bool fRun) { vector<string> params; - const RetFormat rf = ParseDataFormat(params, strReq); + const RetFormat rf = ParseDataFormat(params, strURIPart); vector<string> path; boost::split(path, params[0], boost::is_any_of("/")); @@ -153,13 +175,14 @@ static bool rest_headers(AcceptedConnection* conn, } static bool rest_block(AcceptedConnection* conn, - const std::string& strReq, + const std::string& strURIPart, + const std::string& strRequest, const std::map<std::string, std::string>& mapHeaders, bool fRun, bool showTxDetails) { vector<string> params; - const RetFormat rf = ParseDataFormat(params, strReq); + const RetFormat rf = ParseDataFormat(params, strURIPart); string hashStr = params[0]; uint256 hash; @@ -174,6 +197,9 @@ static bool rest_block(AcceptedConnection* conn, throw RESTERR(HTTP_NOT_FOUND, hashStr + " not found"); pblockindex = mapBlockIndex[hash]; + if (fHavePruned && !(pblockindex->nStatus & BLOCK_HAVE_DATA) && pblockindex->nTx > 0) + throw RESTERR(HTTP_NOT_FOUND, hashStr + " not available (pruned data)"); + if (!ReadBlockFromDisk(block, pblockindex)) throw RESTERR(HTTP_NOT_FOUND, hashStr + " not found"); } @@ -211,28 +237,31 @@ static bool rest_block(AcceptedConnection* conn, } static bool rest_block_extended(AcceptedConnection* conn, - const std::string& strReq, + const std::string& strURIPart, + const std::string& strRequest, const std::map<std::string, std::string>& mapHeaders, bool fRun) { - return rest_block(conn, strReq, mapHeaders, fRun, true); + return rest_block(conn, strURIPart, strRequest, mapHeaders, fRun, true); } static bool rest_block_notxdetails(AcceptedConnection* conn, - const std::string& strReq, + const std::string& strURIPart, + const std::string& strRequest, const std::map<std::string, std::string>& mapHeaders, bool fRun) { - return rest_block(conn, strReq, mapHeaders, fRun, false); + return rest_block(conn, strURIPart, strRequest, mapHeaders, fRun, false); } static bool rest_chaininfo(AcceptedConnection* conn, - const std::string& strReq, - const std::map<std::string, std::string>& mapHeaders, - bool fRun) + const std::string& strURIPart, + const std::string& strRequest, + const std::map<std::string, std::string>& mapHeaders, + bool fRun) { vector<string> params; - const RetFormat rf = ParseDataFormat(params, strReq); + const RetFormat rf = ParseDataFormat(params, strURIPart); switch (rf) { case RF_JSON: { @@ -253,12 +282,13 @@ static bool rest_chaininfo(AcceptedConnection* conn, } static bool rest_tx(AcceptedConnection* conn, - const std::string& strReq, + const std::string& strURIPart, + const std::string& strRequest, const std::map<std::string, std::string>& mapHeaders, bool fRun) { vector<string> params; - const RetFormat rf = ParseDataFormat(params, strReq); + const RetFormat rf = ParseDataFormat(params, strURIPart); string hashStr = params[0]; uint256 hash; @@ -303,10 +333,191 @@ static bool rest_tx(AcceptedConnection* conn, return true; // continue to process further HTTP reqs on this cxn } +static bool rest_getutxos(AcceptedConnection* conn, + const std::string& strURIPart, + const std::string& strRequest, + const std::map<std::string, std::string>& mapHeaders, + bool fRun) +{ + vector<string> params; + enum RetFormat rf = ParseDataFormat(params, strURIPart); + + // throw exception in case of a empty request + if (strRequest.length() == 0) + throw RESTERR(HTTP_INTERNAL_SERVER_ERROR, "Error: empty request"); + + bool fCheckMemPool = false; + vector<COutPoint> vOutPoints; + + // parse/deserialize input + // input-format = output-format, rest/getutxos/bin requires binary input, gives binary output, ... + + string strRequestMutable = strRequest; //convert const string to string for allowing hex to bin converting + + switch (rf) { + case RF_HEX: { + // convert hex to bin, continue then with bin part + std::vector<unsigned char> strRequestV = ParseHex(strRequest); + strRequestMutable.assign(strRequestV.begin(), strRequestV.end()); + } + + case RF_BINARY: { + try { + //deserialize + CDataStream oss(SER_NETWORK, PROTOCOL_VERSION); + oss << strRequestMutable; + oss >> fCheckMemPool; + oss >> vOutPoints; + } catch (const std::ios_base::failure& e) { + // abort in case of unreadable binary data + throw RESTERR(HTTP_INTERNAL_SERVER_ERROR, "Parse error"); + } + break; + } + + case RF_JSON: { + try { + // parse json request + Value valRequest; + if (!read_string(strRequest, valRequest)) + throw RESTERR(HTTP_INTERNAL_SERVER_ERROR, "Parse error"); + + Object jsonObject = valRequest.get_obj(); + const Value& checkMempoolValue = find_value(jsonObject, "checkmempool"); + + if (!checkMempoolValue.is_null()) { + fCheckMemPool = checkMempoolValue.get_bool(); + } + const Value& outpointsValue = find_value(jsonObject, "outpoints"); + if (!outpointsValue.is_null()) { + Array outPoints = outpointsValue.get_array(); + BOOST_FOREACH (const Value& outPoint, outPoints) { + Object outpointObject = outPoint.get_obj(); + uint256 txid = ParseHashO(outpointObject, "txid"); + Value nValue = find_value(outpointObject, "n"); + int nOutput = nValue.get_int(); + vOutPoints.push_back(COutPoint(txid, nOutput)); + } + } + } catch (...) { + // return HTTP 500 if there was a json parsing error + throw RESTERR(HTTP_INTERNAL_SERVER_ERROR, "Parse error"); + } + break; + } + default: { + throw RESTERR(HTTP_NOT_FOUND, "output format not found (available: " + AvailableDataFormatsString() + ")"); + } + } + + // limit max outpoints + if (vOutPoints.size() > MAX_GETUTXOS_OUTPOINTS) + throw RESTERR(HTTP_INTERNAL_SERVER_ERROR, strprintf("Error: max outpoints exceeded (max: %d, tried: %d)", MAX_GETUTXOS_OUTPOINTS, vOutPoints.size())); + + // check spentness and form a bitmap (as well as a JSON capable human-readble string representation) + vector<unsigned char> bitmap; + vector<CCoin> outs; + std::string bitmapStringRepresentation; + boost::dynamic_bitset<unsigned char> hits(vOutPoints.size()); + { + LOCK2(cs_main, mempool.cs); + + CCoinsView viewDummy; + CCoinsViewCache view(&viewDummy); + + CCoinsViewCache& viewChain = *pcoinsTip; + CCoinsViewMemPool viewMempool(&viewChain, mempool); + + if (fCheckMemPool) + view.SetBackend(viewMempool); // switch cache backend to db+mempool in case user likes to query mempool + + for (size_t i = 0; i < vOutPoints.size(); i++) { + CCoins coins; + uint256 hash = vOutPoints[i].hash; + if (view.GetCoins(hash, coins)) { + mempool.pruneSpent(hash, coins); + if (coins.IsAvailable(vOutPoints[i].n)) { + hits[i] = true; + // Safe to index into vout here because IsAvailable checked if it's off the end of the array, or if + // n is valid but points to an already spent output (IsNull). + CCoin coin; + coin.nTxVer = coins.nVersion; + coin.nHeight = coins.nHeight; + coin.out = coins.vout.at(vOutPoints[i].n); + assert(!coin.out.IsNull()); + outs.push_back(coin); + } + } + + bitmapStringRepresentation.append(hits[i] ? "1" : "0"); // form a binary string representation (human-readable for json output) + } + } + boost::to_block_range(hits, std::back_inserter(bitmap)); + + switch (rf) { + case RF_BINARY: { + // serialize data + // use exact same output as mentioned in Bip64 + CDataStream ssGetUTXOResponse(SER_NETWORK, PROTOCOL_VERSION); + ssGetUTXOResponse << chainActive.Height() << chainActive.Tip()->GetBlockHash() << bitmap << outs; + string ssGetUTXOResponseString = ssGetUTXOResponse.str(); + + conn->stream() << HTTPReplyHeader(HTTP_OK, fRun, ssGetUTXOResponseString.size(), "application/octet-stream") << ssGetUTXOResponseString << std::flush; + return true; + } + + case RF_HEX: { + CDataStream ssGetUTXOResponse(SER_NETWORK, PROTOCOL_VERSION); + ssGetUTXOResponse << chainActive.Height() << chainActive.Tip()->GetBlockHash() << bitmap << outs; + string strHex = HexStr(ssGetUTXOResponse.begin(), ssGetUTXOResponse.end()) + "\n"; + + conn->stream() << HTTPReply(HTTP_OK, strHex, fRun, false, "text/plain") << std::flush; + return true; + } + + case RF_JSON: { + Object objGetUTXOResponse; + + // pack in some essentials + // use more or less the same output as mentioned in Bip64 + objGetUTXOResponse.push_back(Pair("chainHeight", chainActive.Height())); + objGetUTXOResponse.push_back(Pair("chaintipHash", chainActive.Tip()->GetBlockHash().GetHex())); + objGetUTXOResponse.push_back(Pair("bitmap", bitmapStringRepresentation)); + + Array utxos; + BOOST_FOREACH (const CCoin& coin, outs) { + Object utxo; + utxo.push_back(Pair("txvers", (int32_t)coin.nTxVer)); + utxo.push_back(Pair("height", (int32_t)coin.nHeight)); + utxo.push_back(Pair("value", ValueFromAmount(coin.out.nValue))); + + // include the script in a json output + Object o; + ScriptPubKeyToJSON(coin.out.scriptPubKey, o, true); + utxo.push_back(Pair("scriptPubKey", o)); + utxos.push_back(utxo); + } + objGetUTXOResponse.push_back(Pair("utxos", utxos)); + + // return json string + string strJSON = write_string(Value(objGetUTXOResponse), false) + "\n"; + conn->stream() << HTTPReply(HTTP_OK, strJSON, fRun) << std::flush; + return true; + } + default: { + throw RESTERR(HTTP_NOT_FOUND, "output format not found (available: " + AvailableDataFormatsString() + ")"); + } + } + + // not reached + return true; // continue to process further HTTP reqs on this cxn +} + static const struct { const char* prefix; bool (*handler)(AcceptedConnection* conn, - const std::string& strURI, + const std::string& strURIPart, + const std::string& strRequest, const std::map<std::string, std::string>& mapHeaders, bool fRun); } uri_prefixes[] = { @@ -315,10 +526,12 @@ static const struct { {"/rest/block/", rest_block_extended}, {"/rest/chaininfo", rest_chaininfo}, {"/rest/headers/", rest_headers}, + {"/rest/getutxos", rest_getutxos}, }; bool HTTPReq_REST(AcceptedConnection* conn, const std::string& strURI, + const string& strRequest, const std::map<std::string, std::string>& mapHeaders, bool fRun) { @@ -330,8 +543,8 @@ bool HTTPReq_REST(AcceptedConnection* conn, for (unsigned int i = 0; i < ARRAYLEN(uri_prefixes); i++) { unsigned int plen = strlen(uri_prefixes[i].prefix); if (strURI.substr(0, plen) == uri_prefixes[i].prefix) { - string strReq = strURI.substr(plen); - return uri_prefixes[i].handler(conn, strReq, mapHeaders, fRun); + string strURIPart = strURI.substr(plen); + return uri_prefixes[i].handler(conn, strURIPart, strRequest, mapHeaders, fRun); } } } catch (const RestErr& re) { diff --git a/src/rpcblockchain.cpp b/src/rpcblockchain.cpp index 293d6d5619..ecf8e8bcc6 100644 --- a/src/rpcblockchain.cpp +++ b/src/rpcblockchain.cpp @@ -299,6 +299,9 @@ Value getblock(const Array& params, bool fHelp) CBlock block; CBlockIndex* pblockindex = mapBlockIndex[hash]; + if (fHavePruned && !(pblockindex->nStatus & BLOCK_HAVE_DATA) && pblockindex->nTx > 0) + throw JSONRPCError(RPC_INTERNAL_ERROR, "Block not available (pruned data)"); + if(!ReadBlockFromDisk(block, pblockindex)) throw JSONRPCError(RPC_INTERNAL_ERROR, "Can't read block from disk"); @@ -490,8 +493,17 @@ Value getblockchaininfo(const Array& params, bool fHelp) obj.push_back(Pair("headers", pindexBestHeader ? pindexBestHeader->nHeight : -1)); obj.push_back(Pair("bestblockhash", chainActive.Tip()->GetBlockHash().GetHex())); obj.push_back(Pair("difficulty", (double)GetDifficulty())); - obj.push_back(Pair("verificationprogress", Checkpoints::GuessVerificationProgress(chainActive.Tip()))); + obj.push_back(Pair("verificationprogress", Checkpoints::GuessVerificationProgress(Params().Checkpoints(), chainActive.Tip()))); obj.push_back(Pair("chainwork", chainActive.Tip()->nChainWork.GetHex())); + obj.push_back(Pair("pruned", fPruneMode)); + if (fPruneMode) + { + CBlockIndex *block = chainActive.Tip(); + while (block && block->pprev && (block->pprev->nStatus & BLOCK_HAVE_DATA)) + block = block->pprev; + + obj.push_back(Pair("pruneheight", block->nHeight)); + } return obj; } diff --git a/src/rpcclient.cpp b/src/rpcclient.cpp index 428e1049dc..4b576b3707 100644 --- a/src/rpcclient.cpp +++ b/src/rpcclient.cpp @@ -7,7 +7,6 @@ #include "rpcprotocol.h" #include "util.h" -#include "ui_interface.h" #include <set> #include <stdint.h> @@ -79,6 +78,7 @@ static const CRPCConvertParam vRPCConvertParams[] = { "sendrawtransaction", 1 }, { "gettxout", 1 }, { "gettxout", 2 }, + { "gettxoutproof", 0 }, { "lockunspent", 0 }, { "lockunspent", 1 }, { "importprivkey", 2 }, diff --git a/src/rpcmining.cpp b/src/rpcmining.cpp index 851d113f3b..24b865150a 100644 --- a/src/rpcmining.cpp +++ b/src/rpcmining.cpp @@ -5,11 +5,12 @@ #include "amount.h" #include "chainparams.h" +#include "consensus/consensus.h" #include "core_io.h" #include "init.h" -#include "net.h" #include "main.h" #include "miner.h" +#include "net.h" #include "pow.h" #include "rpcserver.h" #include "util.h" @@ -196,6 +197,8 @@ Value setgenerate(const Array& params, bool fHelp) if (pwalletMain == NULL) throw JSONRPCError(RPC_METHOD_NOT_FOUND, "Method not found (disabled)"); + if (Params().MineBlocksOnDemand()) + throw JSONRPCError(RPC_METHOD_NOT_FOUND, "Use the generate method instead of setgenerate on this network"); bool fGenerate = true; if (params.size() > 0) diff --git a/src/rpcrawtransaction.cpp b/src/rpcrawtransaction.cpp index 8393a8502e..e84d2693a2 100644 --- a/src/rpcrawtransaction.cpp +++ b/src/rpcrawtransaction.cpp @@ -1,5 +1,5 @@ // Copyright (c) 2010 Satoshi Nakamoto -// Copyright (c) 2009-2014 The Bitcoin Core developers +// Copyright (c) 2009-2015 The Bitcoin Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. @@ -9,9 +9,11 @@ #include "init.h" #include "keystore.h" #include "main.h" +#include "merkleblock.h" #include "net.h" #include "rpcserver.h" #include "script/script.h" +#include "script/script_error.h" #include "script/sign.h" #include "script/standard.h" #include "uint256.h" @@ -193,6 +195,119 @@ Value getrawtransaction(const Array& params, bool fHelp) return result; } +Value gettxoutproof(const Array& params, bool fHelp) +{ + if (fHelp || (params.size() != 1 && params.size() != 2)) + throw runtime_error( + "gettxoutproof [\"txid\",...] ( blockhash )\n" + "\nReturns a hex-encoded proof that \"txid\" was included in a block.\n" + "\nNOTE: By default this function only works sometimes. This is when there is an\n" + "unspent output in the utxo for this transaction. To make it always work,\n" + "you need to maintain a transaction index, using the -txindex command line option or\n" + "specify the block in which the transaction is included in manually (by blockhash).\n" + "\nReturn the raw transaction data.\n" + "\nArguments:\n" + "1. \"txids\" (string) A json array of txids to filter\n" + " [\n" + " \"txid\" (string) A transaction hash\n" + " ,...\n" + " ]\n" + "2. \"block hash\" (string, optional) If specified, looks for txid in the block with this hash\n" + "\nResult:\n" + "\"data\" (string) A string that is a serialized, hex-encoded data for the proof.\n" + ); + + set<uint256> setTxids; + uint256 oneTxid; + Array txids = params[0].get_array(); + BOOST_FOREACH(Value& txid, txids) { + if (txid.get_str().length() != 64 || !IsHex(txid.get_str())) + throw JSONRPCError(RPC_INVALID_PARAMETER, string("Invalid txid ")+txid.get_str()); + uint256 hash(uint256S(txid.get_str())); + if (setTxids.count(hash)) + throw JSONRPCError(RPC_INVALID_PARAMETER, string("Invalid parameter, duplicated txid: ")+txid.get_str()); + setTxids.insert(hash); + oneTxid = hash; + } + + LOCK(cs_main); + + CBlockIndex* pblockindex = NULL; + + uint256 hashBlock; + if (params.size() > 1) + { + hashBlock = uint256S(params[1].get_str()); + if (!mapBlockIndex.count(hashBlock)) + throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, "Block not found"); + pblockindex = mapBlockIndex[hashBlock]; + } else { + CCoins coins; + if (pcoinsTip->GetCoins(oneTxid, coins) && coins.nHeight > 0 && coins.nHeight <= chainActive.Height()) + pblockindex = chainActive[coins.nHeight]; + } + + if (pblockindex == NULL) + { + CTransaction tx; + if (!GetTransaction(oneTxid, tx, hashBlock, false) || hashBlock.IsNull()) + throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, "Transaction not yet in block"); + if (!mapBlockIndex.count(hashBlock)) + throw JSONRPCError(RPC_INTERNAL_ERROR, "Transaction index corrupt"); + pblockindex = mapBlockIndex[hashBlock]; + } + + CBlock block; + if(!ReadBlockFromDisk(block, pblockindex)) + throw JSONRPCError(RPC_INTERNAL_ERROR, "Can't read block from disk"); + + unsigned int ntxFound = 0; + BOOST_FOREACH(const CTransaction&tx, block.vtx) + if (setTxids.count(tx.GetHash())) + ntxFound++; + if (ntxFound != setTxids.size()) + throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, "(Not all) transactions not found in specified block"); + + CDataStream ssMB(SER_NETWORK, PROTOCOL_VERSION); + CMerkleBlock mb(block, setTxids); + ssMB << mb; + std::string strHex = HexStr(ssMB.begin(), ssMB.end()); + return strHex; +} + +Value verifytxoutproof(const Array& params, bool fHelp) +{ + if (fHelp || params.size() != 1) + throw runtime_error( + "verifytxoutproof \"proof\"\n" + "\nVerifies that a proof points to a transaction in a block, returning the transaction it commits to\n" + "and throwing an RPC error if the block is not in our best chain\n" + "\nArguments:\n" + "1. \"proof\" (string, required) The hex-encoded proof generated by gettxoutproof\n" + "\nResult:\n" + "[\"txid\"] (array, strings) The txid(s) which the proof commits to, or empty array if the proof is invalid\n" + ); + + CDataStream ssMB(ParseHexV(params[0], "proof"), SER_NETWORK, PROTOCOL_VERSION); + CMerkleBlock merkleBlock; + ssMB >> merkleBlock; + + Array res; + + vector<uint256> vMatch; + if (merkleBlock.txn.ExtractMatches(vMatch) != merkleBlock.header.hashMerkleRoot) + return res; + + LOCK(cs_main); + + if (!mapBlockIndex.count(merkleBlock.header.GetHash()) || !chainActive.Contains(mapBlockIndex[merkleBlock.header.GetHash()])) + throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, "Block not found in chain"); + + BOOST_FOREACH(const uint256& hash, vMatch) + res.push_back(hash.GetHex()); + return res; +} + Value createrawtransaction(const Array& params, bool fHelp) { if (fHelp || params.size() != 2) @@ -377,6 +492,18 @@ Value decodescript(const Array& params, bool fHelp) return r; } +/** Pushes a JSON object for script verification or signing errors to vErrorsRet. */ +static void TxInErrorToJSON(const CTxIn& txin, Array& vErrorsRet, const std::string& strMessage) +{ + Object entry; + entry.push_back(Pair("txid", txin.prevout.hash.ToString())); + entry.push_back(Pair("vout", (uint64_t)txin.prevout.n)); + entry.push_back(Pair("scriptSig", HexStr(txin.scriptSig.begin(), txin.scriptSig.end()))); + entry.push_back(Pair("sequence", (uint64_t)txin.nSequence)); + entry.push_back(Pair("error", strMessage)); + vErrorsRet.push_back(entry); +} + Value signrawtransaction(const Array& params, bool fHelp) { if (fHelp || params.size() < 1 || params.size() > 4) @@ -418,8 +545,18 @@ Value signrawtransaction(const Array& params, bool fHelp) "\nResult:\n" "{\n" - " \"hex\": \"value\", (string) The raw transaction with signature(s) (hex-encoded string)\n" - " \"complete\": true|false (boolean) if transaction has a complete set of signature\n" + " \"hex\" : \"value\", (string) The hex-encoded raw transaction with signature(s)\n" + " \"complete\" : true|false, (boolean) If the transaction has a complete set of signatures\n" + " \"errors\" : [ (json array of objects) Script verification errors (if there are any)\n" + " {\n" + " \"txid\" : \"hash\", (string) The hash of the referenced, previous transaction\n" + " \"vout\" : n, (numeric) The index of the output to spent and used as input\n" + " \"scriptSig\" : \"hex\", (string) The hex-encoded signature script\n" + " \"sequence\" : n, (numeric) Script sequence number\n" + " \"error\" : \"text\" (string) Verification or signing error related to the input\n" + " }\n" + " ,...\n" + " ]\n" "}\n" "\nExamples:\n" @@ -454,7 +591,6 @@ Value signrawtransaction(const Array& params, bool fHelp) // mergedTx will end up with all the signatures; it // starts as a clone of the rawtx: CMutableTransaction mergedTx(txVariants[0]); - bool fComplete = true; // Fetch previous transactions (inputs): CCoinsView viewDummy; @@ -569,12 +705,15 @@ Value signrawtransaction(const Array& params, bool fHelp) bool fHashSingle = ((nHashType & ~SIGHASH_ANYONECANPAY) == SIGHASH_SINGLE); + // Script verification errors + Array vErrors; + // Sign what we can: for (unsigned int i = 0; i < mergedTx.vin.size(); i++) { CTxIn& txin = mergedTx.vin[i]; const CCoins* coins = view.AccessCoins(txin.prevout.hash); if (coins == NULL || !coins->IsAvailable(txin.prevout.n)) { - fComplete = false; + TxInErrorToJSON(txin, vErrors, "Input not found or already spent"); continue; } const CScript& prevPubKey = coins->vout[txin.prevout.n].scriptPubKey; @@ -588,13 +727,19 @@ Value signrawtransaction(const Array& params, bool fHelp) BOOST_FOREACH(const CMutableTransaction& txv, txVariants) { txin.scriptSig = CombineSignatures(prevPubKey, mergedTx, i, txin.scriptSig, txv.vin[i].scriptSig); } - if (!VerifyScript(txin.scriptSig, prevPubKey, STANDARD_SCRIPT_VERIFY_FLAGS, MutableTransactionSignatureChecker(&mergedTx, i))) - fComplete = false; + ScriptError serror = SCRIPT_ERR_OK; + if (!VerifyScript(txin.scriptSig, prevPubKey, STANDARD_SCRIPT_VERIFY_FLAGS, MutableTransactionSignatureChecker(&mergedTx, i), &serror)) { + TxInErrorToJSON(txin, vErrors, ScriptErrorString(serror)); + } } + bool fComplete = vErrors.empty(); Object result; result.push_back(Pair("hex", EncodeHexTx(mergedTx))); result.push_back(Pair("complete", fComplete)); + if (!vErrors.empty()) { + result.push_back(Pair("errors", vErrors)); + } return result; } @@ -642,11 +787,16 @@ Value sendrawtransaction(const Array& params, bool fHelp) if (!fHaveMempool && !fHaveChain) { // push to local node and sync with wallets CValidationState state; - if (!AcceptToMemoryPool(mempool, state, tx, false, NULL, !fOverrideFees)) { - if(state.IsInvalid()) + bool fMissingInputs; + if (!AcceptToMemoryPool(mempool, state, tx, false, &fMissingInputs, !fOverrideFees)) { + if (state.IsInvalid()) { throw JSONRPCError(RPC_TRANSACTION_REJECTED, strprintf("%i: %s", state.GetRejectCode(), state.GetRejectReason())); - else + } else { + if (fMissingInputs) { + throw JSONRPCError(RPC_TRANSACTION_ERROR, "Missing inputs"); + } throw JSONRPCError(RPC_TRANSACTION_ERROR, state.GetRejectReason()); + } } } else if (fHaveChain) { throw JSONRPCError(RPC_TRANSACTION_ALREADY_IN_CHAIN, "transaction already in block chain"); diff --git a/src/rpcserver.cpp b/src/rpcserver.cpp index e2df41fe21..3f74517a67 100644 --- a/src/rpcserver.cpp +++ b/src/rpcserver.cpp @@ -293,6 +293,8 @@ static const CRPCCommand vRPCCommands[] = { "blockchain", "getmempoolinfo", &getmempoolinfo, true }, { "blockchain", "getrawmempool", &getrawmempool, true }, { "blockchain", "gettxout", &gettxout, true }, + { "blockchain", "gettxoutproof", &gettxoutproof, true }, + { "blockchain", "verifytxoutproof", &verifytxoutproof, true }, { "blockchain", "gettxoutsetinfo", &gettxoutsetinfo, true }, { "blockchain", "verifychain", &verifychain, true }, @@ -910,8 +912,8 @@ static bool HTTPReq_JSONRPC(AcceptedConnection *conn, { LogPrintf("ThreadRPCServer incorrect password attempt from %s\n", conn->peer_address_to_string()); /* Deter brute-forcing - If this results in a DoS the user really - shouldn't have their RPC port exposed. */ + We don't support exposing the RPC port, so this shouldn't result + in a DoS. */ MilliSleep(250); conn->stream() << HTTPError(HTTP_UNAUTHORIZED, false) << std::flush; @@ -992,7 +994,7 @@ void ServiceConnection(AcceptedConnection *conn) // Process via HTTP REST API } else if (strURI.substr(0, 6) == "/rest/" && GetBoolArg("-rest", false)) { - if (!HTTPReq_REST(conn, strURI, mapHeaders, fRun)) + if (!HTTPReq_REST(conn, strURI, strRequest, mapHeaders, fRun)) break; } else { diff --git a/src/rpcserver.h b/src/rpcserver.h index c3200d8c35..30a5b28db7 100644 --- a/src/rpcserver.h +++ b/src/rpcserver.h @@ -218,6 +218,8 @@ extern json_spirit::Value decoderawtransaction(const json_spirit::Array& params, extern json_spirit::Value decodescript(const json_spirit::Array& params, bool fHelp); extern json_spirit::Value signrawtransaction(const json_spirit::Array& params, bool fHelp); extern json_spirit::Value sendrawtransaction(const json_spirit::Array& params, bool fHelp); +extern json_spirit::Value gettxoutproof(const json_spirit::Array& params, bool fHelp); +extern json_spirit::Value verifytxoutproof(const json_spirit::Array& params, bool fHelp); extern json_spirit::Value getblockcount(const json_spirit::Array& params, bool fHelp); // in rpcblockchain.cpp extern json_spirit::Value getbestblockhash(const json_spirit::Array& params, bool fHelp); @@ -237,6 +239,7 @@ extern json_spirit::Value reconsiderblock(const json_spirit::Array& params, bool // in rest.cpp extern bool HTTPReq_REST(AcceptedConnection *conn, const std::string& strURI, + const std::string& strRequest, const std::map<std::string, std::string>& mapHeaders, bool fRun); diff --git a/src/secp256k1/.gitignore b/src/secp256k1/.gitignore index b9f7d243ec..076ff1295f 100644 --- a/src/secp256k1/.gitignore +++ b/src/secp256k1/.gitignore @@ -2,6 +2,7 @@ bench_inv bench_sign bench_verify bench_recover +bench_internal tests *.exe *.so diff --git a/src/secp256k1/.travis.yml b/src/secp256k1/.travis.yml index 40f8dae23f..0d8089cfe4 100644 --- a/src/secp256k1/.travis.yml +++ b/src/secp256k1/.travis.yml @@ -1,14 +1,14 @@ language: c +sudo: false +addons: + apt: + packages: libgmp-dev compiler: - clang - gcc -install: - - sudo apt-get install -qq libssl-dev - - if [ "$BIGNUM" = "gmp" -o "$BIGNUM" = "auto" ]; then sudo apt-get install --no-install-recommends --no-upgrade -qq libgmp-dev; fi - - if [ -n "$EXTRAPACKAGES" ]; then sudo apt-get update && sudo apt-get install --no-install-recommends --no-upgrade $EXTRAPACKAGES; fi env: global: - - FIELD=auto BIGNUM=auto SCALAR=auto ENDOMORPHISM=no ASM=no BUILD=check EXTRAFLAGS= HOST= EXTRAPACKAGES= + - FIELD=auto BIGNUM=auto SCALAR=auto ENDOMORPHISM=no ASM=no BUILD=check EXTRAFLAGS= HOST= matrix: - SCALAR=32bit - SCALAR=64bit @@ -22,8 +22,35 @@ env: - BIGNUM=no ENDOMORPHISM=yes - BUILD=distcheck - EXTRAFLAGS=CFLAGS=-DDETERMINISTIC - - HOST=i686-linux-gnu EXTRAPACKAGES="gcc-multilib" - - HOST=i686-linux-gnu EXTRAPACKAGES="gcc-multilib" ENDOMORPHISM=yes +matrix: + fast_finish: true + include: + - compiler: clang + env: HOST=i686-linux-gnu ENDOMORPHISM=yes + addons: + apt: + packages: + - gcc-multilib + - libgmp-dev:i386 + - compiler: clang + env: HOST=i686-linux-gnu + addons: + apt: + packages: + - gcc-multilib + - compiler: gcc + env: HOST=i686-linux-gnu ENDOMORPHISM=yes + addons: + apt: + packages: + - gcc-multilib + - compiler: gcc + env: HOST=i686-linux-gnu + addons: + apt: + packages: + - gcc-multilib + - libgmp-dev:i386 before_script: ./autogen.sh script: - if [ -n "$HOST" ]; then export USE_HOST="--host=$HOST"; fi diff --git a/src/secp256k1/include/secp256k1.h b/src/secp256k1/include/secp256k1.h index a6e39d13db..06afd4c65b 100644 --- a/src/secp256k1/include/secp256k1.h +++ b/src/secp256k1/include/secp256k1.h @@ -40,42 +40,60 @@ extern "C" { # define SECP256K1_ARG_NONNULL(_x) # endif +/** Opaque data structure that holds context information (precomputed tables etc.). + * Only functions that take a pointer to a non-const context require exclusive + * access to it. Multiple functions that take a pointer to a const context may + * run simultaneously. + */ +typedef struct secp256k1_context_struct secp256k1_context_t; + +/** Flags to pass to secp256k1_context_create. */ +# define SECP256K1_CONTEXT_VERIFY (1 << 0) +# define SECP256K1_CONTEXT_SIGN (1 << 1) -/** Flags to pass to secp256k1_start. */ -# define SECP256K1_START_VERIFY (1 << 0) -# define SECP256K1_START_SIGN (1 << 1) +/** Create a secp256k1 context object. + * Returns: a newly created context object. + * In: flags: which parts of the context to initialize. + */ +secp256k1_context_t* secp256k1_context_create( + int flags +) SECP256K1_WARN_UNUSED_RESULT; -/** Initialize the library. This may take some time (10-100 ms). - * You need to call this before calling any other function. - * It cannot run in parallel with any other functions, but once - * secp256k1_start() returns, all other functions are thread-safe. +/** Copies a secp256k1 context object. + * Returns: a newly created context object. + * In: ctx: an existing context to copy */ -void secp256k1_start(unsigned int flags); +secp256k1_context_t* secp256k1_context_clone( + const secp256k1_context_t* ctx +) SECP256K1_WARN_UNUSED_RESULT; -/** Free all memory associated with this library. After this, no - * functions can be called anymore, except secp256k1_start() +/** Destroy a secp256k1 context object. + * The context pointer may not be used afterwards. */ -void secp256k1_stop(void); +void secp256k1_context_destroy( + secp256k1_context_t* ctx +) SECP256K1_ARG_NONNULL(1); /** Verify an ECDSA signature. * Returns: 1: correct signature * 0: incorrect signature * -1: invalid public key * -2: invalid signature - * In: msg32: the 32-byte message hash being verified (cannot be NULL) + * In: ctx: a secp256k1 context object, initialized for verification. + * msg32: the 32-byte message hash being verified (cannot be NULL) * sig: the signature being verified (cannot be NULL) * siglen: the length of the signature * pubkey: the public key to verify with (cannot be NULL) * pubkeylen: the length of pubkey - * Requires starting using SECP256K1_START_VERIFY. */ SECP256K1_WARN_UNUSED_RESULT int secp256k1_ecdsa_verify( + const secp256k1_context_t* ctx, const unsigned char *msg32, const unsigned char *sig, int siglen, const unsigned char *pubkey, int pubkeylen -) SECP256K1_ARG_NONNULL(1) SECP256K1_ARG_NONNULL(2) SECP256K1_ARG_NONNULL(4); +) SECP256K1_ARG_NONNULL(1) SECP256K1_ARG_NONNULL(2) SECP256K1_ARG_NONNULL(3) SECP256K1_ARG_NONNULL(5); /** A pointer to a function to deterministically generate a nonce. * Returns: 1 if a nonce was successfully generated. 0 will cause signing to fail. @@ -111,15 +129,14 @@ extern const secp256k1_nonce_function_t secp256k1_nonce_function_default; * Returns: 1: signature created * 0: the nonce generation function failed, the private key was invalid, or there is not * enough space in the signature (as indicated by siglen). - * In: msg32: the 32-byte message hash being signed (cannot be NULL) + * In: ctx: pointer to a context object, initialized for signing (cannot be NULL) + * msg32: the 32-byte message hash being signed (cannot be NULL) * seckey: pointer to a 32-byte secret key (cannot be NULL) * noncefp:pointer to a nonce generation function. If NULL, secp256k1_nonce_function_default is used * ndata: pointer to arbitrary data used by the nonce generation function (can be NULL) * Out: sig: pointer to an array where the signature will be placed (cannot be NULL) * In/Out: siglen: pointer to an int with the length of sig, which will be updated - * to contain the actual signature length (<=72). If 0 is returned, this will be - * set to zero. - * Requires starting using SECP256K1_START_SIGN. + * to contain the actual signature length (<=72). * * The sig always has an s value in the lower half of the range (From 0x1 * to 0x7FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF5D576E7357A4501DDFE92F46681B20A0, @@ -148,145 +165,180 @@ extern const secp256k1_nonce_function_t secp256k1_nonce_function_default; * be taken when this property is required for an application. */ int secp256k1_ecdsa_sign( + const secp256k1_context_t* ctx, const unsigned char *msg32, unsigned char *sig, int *siglen, const unsigned char *seckey, secp256k1_nonce_function_t noncefp, const void *ndata -) SECP256K1_ARG_NONNULL(1) SECP256K1_ARG_NONNULL(2) SECP256K1_ARG_NONNULL(3) SECP256K1_ARG_NONNULL(4); +) SECP256K1_ARG_NONNULL(1) SECP256K1_ARG_NONNULL(2) SECP256K1_ARG_NONNULL(3) SECP256K1_ARG_NONNULL(4) SECP256K1_ARG_NONNULL(5); /** Create a compact ECDSA signature (64 byte + recovery id). * Returns: 1: signature created * 0: the nonce generation function failed, or the secret key was invalid. - * In: msg32: the 32-byte message hash being signed (cannot be NULL) + * In: ctx: pointer to a context object, initialized for signing (cannot be NULL) + * msg32: the 32-byte message hash being signed (cannot be NULL) * seckey: pointer to a 32-byte secret key (cannot be NULL) * noncefp:pointer to a nonce generation function. If NULL, secp256k1_nonce_function_default is used * ndata: pointer to arbitrary data used by the nonce generation function (can be NULL) * Out: sig: pointer to a 64-byte array where the signature will be placed (cannot be NULL) * In case 0 is returned, the returned signature length will be zero. * recid: pointer to an int, which will be updated to contain the recovery id (can be NULL) - * Requires starting using SECP256K1_START_SIGN. */ int secp256k1_ecdsa_sign_compact( + const secp256k1_context_t* ctx, const unsigned char *msg32, unsigned char *sig64, const unsigned char *seckey, secp256k1_nonce_function_t noncefp, const void *ndata, int *recid -) SECP256K1_ARG_NONNULL(1) SECP256K1_ARG_NONNULL(2) SECP256K1_ARG_NONNULL(3); +) SECP256K1_ARG_NONNULL(1) SECP256K1_ARG_NONNULL(2) SECP256K1_ARG_NONNULL(3) SECP256K1_ARG_NONNULL(4); /** Recover an ECDSA public key from a compact signature. * Returns: 1: public key successfully recovered (which guarantees a correct signature). * 0: otherwise. - * In: msg32: the 32-byte message hash assumed to be signed (cannot be NULL) + * In: ctx: pointer to a context object, initialized for verification (cannot be NULL) + * msg32: the 32-byte message hash assumed to be signed (cannot be NULL) * sig64: signature as 64 byte array (cannot be NULL) * compressed: whether to recover a compressed or uncompressed pubkey * recid: the recovery id (0-3, as returned by ecdsa_sign_compact) * Out: pubkey: pointer to a 33 or 65 byte array to put the pubkey (cannot be NULL) * pubkeylen: pointer to an int that will contain the pubkey length (cannot be NULL) - * Requires starting using SECP256K1_START_VERIFY. */ SECP256K1_WARN_UNUSED_RESULT int secp256k1_ecdsa_recover_compact( + const secp256k1_context_t* ctx, const unsigned char *msg32, const unsigned char *sig64, unsigned char *pubkey, int *pubkeylen, int compressed, int recid -) SECP256K1_ARG_NONNULL(1) SECP256K1_ARG_NONNULL(2) SECP256K1_ARG_NONNULL(3) SECP256K1_ARG_NONNULL(4); +) SECP256K1_ARG_NONNULL(1) SECP256K1_ARG_NONNULL(2) SECP256K1_ARG_NONNULL(3) SECP256K1_ARG_NONNULL(4) SECP256K1_ARG_NONNULL(5); /** Verify an ECDSA secret key. * Returns: 1: secret key is valid * 0: secret key is invalid - * In: seckey: pointer to a 32-byte secret key (cannot be NULL) + * In: ctx: pointer to a context object (cannot be NULL) + * seckey: pointer to a 32-byte secret key (cannot be NULL) */ -SECP256K1_WARN_UNUSED_RESULT int secp256k1_ec_seckey_verify(const unsigned char *seckey) SECP256K1_ARG_NONNULL(1); +SECP256K1_WARN_UNUSED_RESULT int secp256k1_ec_seckey_verify( + const secp256k1_context_t* ctx, + const unsigned char *seckey +) SECP256K1_ARG_NONNULL(1) SECP256K1_ARG_NONNULL(2); /** Just validate a public key. - * Returns: 1: valid public key - * 0: invalid public key - * In: pubkey: pointer to a 33-byte or 65-byte public key (cannot be NULL). + * Returns: 1: public key is valid + * 0: public key is invalid + * In: ctx: pointer to a context object (cannot be NULL) + * pubkey: pointer to a 33-byte or 65-byte public key (cannot be NULL). * pubkeylen: length of pubkey */ -SECP256K1_WARN_UNUSED_RESULT int secp256k1_ec_pubkey_verify(const unsigned char *pubkey, int pubkeylen) SECP256K1_ARG_NONNULL(1); +SECP256K1_WARN_UNUSED_RESULT int secp256k1_ec_pubkey_verify( + const secp256k1_context_t* ctx, + const unsigned char *pubkey, + int pubkeylen +) SECP256K1_ARG_NONNULL(1) SECP256K1_ARG_NONNULL(2); /** Compute the public key for a secret key. - * In: compressed: whether the computed public key should be compressed + * In: ctx: pointer to a context object, initialized for signing (cannot be NULL) + * compressed: whether the computed public key should be compressed * seckey: pointer to a 32-byte private key (cannot be NULL) * Out: pubkey: pointer to a 33-byte (if compressed) or 65-byte (if uncompressed) * area to store the public key (cannot be NULL) * pubkeylen: pointer to int that will be updated to contains the pubkey's * length (cannot be NULL) * Returns: 1: secret was valid, public key stores - * 0: secret was invalid, try again. - * Requires starting using SECP256K1_START_SIGN. + * 0: secret was invalid, try again */ SECP256K1_WARN_UNUSED_RESULT int secp256k1_ec_pubkey_create( + const secp256k1_context_t* ctx, unsigned char *pubkey, int *pubkeylen, const unsigned char *seckey, int compressed -) SECP256K1_ARG_NONNULL(1) SECP256K1_ARG_NONNULL(2) SECP256K1_ARG_NONNULL(3); +) SECP256K1_ARG_NONNULL(1) SECP256K1_ARG_NONNULL(2) SECP256K1_ARG_NONNULL(3) SECP256K1_ARG_NONNULL(4); /** Decompress a public key. + * In: ctx: pointer to a context object (cannot be NULL) * In/Out: pubkey: pointer to a 65-byte array to put the decompressed public key. - It must contain a 33-byte or 65-byte public key already (cannot be NULL) + * It must contain a 33-byte or 65-byte public key already (cannot be NULL) * pubkeylen: pointer to the size of the public key pointed to by pubkey (cannot be NULL) - It will be updated to reflect the new size. - * Returns: 0 if the passed public key was invalid, 1 otherwise. If 1 is returned, the - pubkey is replaced with its decompressed version. + * It will be updated to reflect the new size. + * Returns: 0: pubkey was invalid + * 1: pubkey was valid, and was replaced with its decompressed version */ SECP256K1_WARN_UNUSED_RESULT int secp256k1_ec_pubkey_decompress( + const secp256k1_context_t* ctx, unsigned char *pubkey, int *pubkeylen -) SECP256K1_ARG_NONNULL(1) SECP256K1_ARG_NONNULL(2); +) SECP256K1_ARG_NONNULL(1) SECP256K1_ARG_NONNULL(2) SECP256K1_ARG_NONNULL(3); -/** Export a private key in DER format. */ +/** Export a private key in DER format. + * In: ctx: pointer to a context object, initialized for signing (cannot be NULL) + */ SECP256K1_WARN_UNUSED_RESULT int secp256k1_ec_privkey_export( + const secp256k1_context_t* ctx, const unsigned char *seckey, unsigned char *privkey, int *privkeylen, int compressed -) SECP256K1_ARG_NONNULL(1) SECP256K1_ARG_NONNULL(2) SECP256K1_ARG_NONNULL(3); +) SECP256K1_ARG_NONNULL(1) SECP256K1_ARG_NONNULL(2) SECP256K1_ARG_NONNULL(3) SECP256K1_ARG_NONNULL(4); /** Import a private key in DER format. */ SECP256K1_WARN_UNUSED_RESULT int secp256k1_ec_privkey_import( + const secp256k1_context_t* ctx, unsigned char *seckey, const unsigned char *privkey, int privkeylen -) SECP256K1_ARG_NONNULL(1) SECP256K1_ARG_NONNULL(2); +) SECP256K1_ARG_NONNULL(1) SECP256K1_ARG_NONNULL(2) SECP256K1_ARG_NONNULL(3); /** Tweak a private key by adding tweak to it. */ SECP256K1_WARN_UNUSED_RESULT int secp256k1_ec_privkey_tweak_add( + const secp256k1_context_t* ctx, unsigned char *seckey, const unsigned char *tweak -) SECP256K1_ARG_NONNULL(1) SECP256K1_ARG_NONNULL(2); +) SECP256K1_ARG_NONNULL(1) SECP256K1_ARG_NONNULL(2) SECP256K1_ARG_NONNULL(3); /** Tweak a public key by adding tweak times the generator to it. - * Requires starting with SECP256K1_START_VERIFY. + * In: ctx: pointer to a context object, initialized for verification (cannot be NULL) */ SECP256K1_WARN_UNUSED_RESULT int secp256k1_ec_pubkey_tweak_add( + const secp256k1_context_t* ctx, unsigned char *pubkey, int pubkeylen, const unsigned char *tweak -) SECP256K1_ARG_NONNULL(1) SECP256K1_ARG_NONNULL(3); +) SECP256K1_ARG_NONNULL(1) SECP256K1_ARG_NONNULL(2) SECP256K1_ARG_NONNULL(4); /** Tweak a private key by multiplying it with tweak. */ SECP256K1_WARN_UNUSED_RESULT int secp256k1_ec_privkey_tweak_mul( + const secp256k1_context_t* ctx, unsigned char *seckey, const unsigned char *tweak -) SECP256K1_ARG_NONNULL(1) SECP256K1_ARG_NONNULL(2); +) SECP256K1_ARG_NONNULL(1) SECP256K1_ARG_NONNULL(2) SECP256K1_ARG_NONNULL(3); /** Tweak a public key by multiplying it with tweak. - * Requires starting with SECP256K1_START_VERIFY. + * In: ctx: pointer to a context object, initialized for verification (cannot be NULL) */ SECP256K1_WARN_UNUSED_RESULT int secp256k1_ec_pubkey_tweak_mul( + const secp256k1_context_t* ctx, unsigned char *pubkey, int pubkeylen, const unsigned char *tweak -) SECP256K1_ARG_NONNULL(1) SECP256K1_ARG_NONNULL(3); +) SECP256K1_ARG_NONNULL(1) SECP256K1_ARG_NONNULL(2) SECP256K1_ARG_NONNULL(4); + +/** Updates the context randomization. + * Returns: 1: randomization successfully updated + * 0: error + * In: ctx: pointer to a context object (cannot be NULL) + * seed32: pointer to a 32-byte random seed (NULL resets to initial state) + */ +SECP256K1_WARN_UNUSED_RESULT int secp256k1_context_randomize( + secp256k1_context_t* ctx, + const unsigned char *seed32 +) SECP256K1_ARG_NONNULL(1); + # ifdef __cplusplus } diff --git a/src/secp256k1/src/bench.h b/src/secp256k1/src/bench.h index 0559b3e853..db5f68cee1 100644 --- a/src/secp256k1/src/bench.h +++ b/src/secp256k1/src/bench.h @@ -48,7 +48,7 @@ void run_benchmark(char *name, void (*benchmark)(void*), void (*setup)(void*), v print_number(min * 1000000.0 / iter); printf("us / avg "); print_number((sum / count) * 1000000.0 / iter); - printf("us / avg "); + printf("us / max "); print_number(max * 1000000.0 / iter); printf("us\n"); } diff --git a/src/secp256k1/src/bench_recover.c b/src/secp256k1/src/bench_recover.c index 6991cc9d6c..56faed11a0 100644 --- a/src/secp256k1/src/bench_recover.c +++ b/src/secp256k1/src/bench_recover.c @@ -9,6 +9,7 @@ #include "bench.h" typedef struct { + secp256k1_context_t *ctx; unsigned char msg[32]; unsigned char sig[64]; } bench_recover_t; @@ -21,7 +22,7 @@ void bench_recover(void* arg) { for (i = 0; i < 20000; i++) { int j; int pubkeylen = 33; - CHECK(secp256k1_ecdsa_recover_compact(data->msg, data->sig, pubkey, &pubkeylen, 1, i % 2)); + CHECK(secp256k1_ecdsa_recover_compact(data->ctx, data->msg, data->sig, pubkey, &pubkeylen, 1, i % 2)); for (j = 0; j < 32; j++) { data->sig[j + 32] = data->msg[j]; /* Move former message to S. */ data->msg[j] = data->sig[j]; /* Move former R to message. */ @@ -40,10 +41,11 @@ void bench_recover_setup(void* arg) { int main(void) { bench_recover_t data; - secp256k1_start(SECP256K1_START_VERIFY); + + data.ctx = secp256k1_context_create(SECP256K1_CONTEXT_VERIFY); run_benchmark("ecdsa_recover", bench_recover, bench_recover_setup, NULL, &data, 10, 20000); - secp256k1_stop(); + secp256k1_context_destroy(data.ctx); return 0; } diff --git a/src/secp256k1/src/bench_sign.c b/src/secp256k1/src/bench_sign.c index c5b6829a84..072a37af51 100644 --- a/src/secp256k1/src/bench_sign.c +++ b/src/secp256k1/src/bench_sign.c @@ -9,6 +9,7 @@ #include "bench.h" typedef struct { + secp256k1_context_t* ctx; unsigned char msg[32]; unsigned char key[32]; } bench_sign_t; @@ -29,7 +30,7 @@ static void bench_sign(void* arg) { for (i = 0; i < 20000; i++) { int j; int recid = 0; - CHECK(secp256k1_ecdsa_sign_compact(data->msg, sig, data->key, NULL, NULL, &recid)); + CHECK(secp256k1_ecdsa_sign_compact(data->ctx, data->msg, sig, data->key, NULL, NULL, &recid)); for (j = 0; j < 32; j++) { data->msg[j] = sig[j]; /* Move former R to message. */ data->key[j] = sig[j + 32]; /* Move former S to key. */ @@ -39,10 +40,11 @@ static void bench_sign(void* arg) { int main(void) { bench_sign_t data; - secp256k1_start(SECP256K1_START_SIGN); + + data.ctx = secp256k1_context_create(SECP256K1_CONTEXT_SIGN); run_benchmark("ecdsa_sign", bench_sign, bench_sign_setup, NULL, &data, 10, 20000); - secp256k1_stop(); + secp256k1_context_destroy(data.ctx); return 0; } diff --git a/src/secp256k1/src/bench_verify.c b/src/secp256k1/src/bench_verify.c index c279305a0d..c8c82752ce 100644 --- a/src/secp256k1/src/bench_verify.c +++ b/src/secp256k1/src/bench_verify.c @@ -12,6 +12,7 @@ #include "bench.h" typedef struct { + secp256k1_context_t *ctx; unsigned char msg[32]; unsigned char key[32]; unsigned char sig[72]; @@ -28,7 +29,7 @@ static void benchmark_verify(void* arg) { data->sig[data->siglen - 1] ^= (i & 0xFF); data->sig[data->siglen - 2] ^= ((i >> 8) & 0xFF); data->sig[data->siglen - 3] ^= ((i >> 16) & 0xFF); - CHECK(secp256k1_ecdsa_verify(data->msg, data->sig, data->siglen, data->pubkey, data->pubkeylen) == (i == 0)); + CHECK(secp256k1_ecdsa_verify(data->ctx, data->msg, data->sig, data->siglen, data->pubkey, data->pubkeylen) == (i == 0)); data->sig[data->siglen - 1] ^= (i & 0xFF); data->sig[data->siglen - 2] ^= ((i >> 8) & 0xFF); data->sig[data->siglen - 3] ^= ((i >> 16) & 0xFF); @@ -39,17 +40,17 @@ int main(void) { int i; benchmark_verify_t data; - secp256k1_start(SECP256K1_START_VERIFY | SECP256K1_START_SIGN); + data.ctx = secp256k1_context_create(SECP256K1_CONTEXT_SIGN | SECP256K1_CONTEXT_VERIFY); for (i = 0; i < 32; i++) data.msg[i] = 1 + i; for (i = 0; i < 32; i++) data.key[i] = 33 + i; data.siglen = 72; - secp256k1_ecdsa_sign(data.msg, data.sig, &data.siglen, data.key, NULL, NULL); + secp256k1_ecdsa_sign(data.ctx, data.msg, data.sig, &data.siglen, data.key, NULL, NULL); data.pubkeylen = 33; - CHECK(secp256k1_ec_pubkey_create(data.pubkey, &data.pubkeylen, data.key, 1)); + CHECK(secp256k1_ec_pubkey_create(data.ctx, data.pubkey, &data.pubkeylen, data.key, 1)); run_benchmark("ecdsa_verify", benchmark_verify, NULL, NULL, &data, 10, 20000); - secp256k1_stop(); + secp256k1_context_destroy(data.ctx); return 0; } diff --git a/src/secp256k1/src/ecdsa.h b/src/secp256k1/src/ecdsa.h index c195e7afcb..4ef78e8afb 100644 --- a/src/secp256k1/src/ecdsa.h +++ b/src/secp256k1/src/ecdsa.h @@ -9,6 +9,7 @@ #include "scalar.h" #include "group.h" +#include "ecmult.h" typedef struct { secp256k1_scalar_t r, s; @@ -16,8 +17,8 @@ typedef struct { static int secp256k1_ecdsa_sig_parse(secp256k1_ecdsa_sig_t *r, const unsigned char *sig, int size); static int secp256k1_ecdsa_sig_serialize(unsigned char *sig, int *size, const secp256k1_ecdsa_sig_t *a); -static int secp256k1_ecdsa_sig_verify(const secp256k1_ecdsa_sig_t *sig, const secp256k1_ge_t *pubkey, const secp256k1_scalar_t *message); -static int secp256k1_ecdsa_sig_sign(secp256k1_ecdsa_sig_t *sig, const secp256k1_scalar_t *seckey, const secp256k1_scalar_t *message, const secp256k1_scalar_t *nonce, int *recid); -static int secp256k1_ecdsa_sig_recover(const secp256k1_ecdsa_sig_t *sig, secp256k1_ge_t *pubkey, const secp256k1_scalar_t *message, int recid); +static int secp256k1_ecdsa_sig_verify(const secp256k1_ecmult_context_t *ctx, const secp256k1_ecdsa_sig_t *sig, const secp256k1_ge_t *pubkey, const secp256k1_scalar_t *message); +static int secp256k1_ecdsa_sig_sign(const secp256k1_ecmult_gen_context_t *ctx, secp256k1_ecdsa_sig_t *sig, const secp256k1_scalar_t *seckey, const secp256k1_scalar_t *message, const secp256k1_scalar_t *nonce, int *recid); +static int secp256k1_ecdsa_sig_recover(const secp256k1_ecmult_context_t *ctx, const secp256k1_ecdsa_sig_t *sig, secp256k1_ge_t *pubkey, const secp256k1_scalar_t *message, int recid); #endif diff --git a/src/secp256k1/src/ecdsa_impl.h b/src/secp256k1/src/ecdsa_impl.h index 1a77649390..ed1d228189 100644 --- a/src/secp256k1/src/ecdsa_impl.h +++ b/src/secp256k1/src/ecdsa_impl.h @@ -53,35 +53,59 @@ static int secp256k1_ecdsa_sig_parse(secp256k1_ecdsa_sig_t *r, const unsigned ch int lenr; int lens; int overflow; - if (sig[0] != 0x30) return 0; + if (sig[0] != 0x30) { + return 0; + } lenr = sig[3]; - if (5+lenr >= size) return 0; + if (5+lenr >= size) { + return 0; + } lens = sig[lenr+5]; - if (sig[1] != lenr+lens+4) return 0; - if (lenr+lens+6 > size) return 0; - if (sig[2] != 0x02) return 0; - if (lenr == 0) return 0; - if (sig[lenr+4] != 0x02) return 0; - if (lens == 0) return 0; + if (sig[1] != lenr+lens+4) { + return 0; + } + if (lenr+lens+6 > size) { + return 0; + } + if (sig[2] != 0x02) { + return 0; + } + if (lenr == 0) { + return 0; + } + if (sig[lenr+4] != 0x02) { + return 0; + } + if (lens == 0) { + return 0; + } sp = sig + 6 + lenr; while (lens > 0 && sp[0] == 0) { lens--; sp++; } - if (lens > 32) return 0; + if (lens > 32) { + return 0; + } rp = sig + 4; while (lenr > 0 && rp[0] == 0) { lenr--; rp++; } - if (lenr > 32) return 0; + if (lenr > 32) { + return 0; + } memcpy(ra + 32 - lenr, rp, lenr); memcpy(sa + 32 - lens, sp, lens); overflow = 0; secp256k1_scalar_set_b32(&r->r, ra, &overflow); - if (overflow) return 0; + if (overflow) { + return 0; + } secp256k1_scalar_set_b32(&r->s, sa, &overflow); - if (overflow) return 0; + if (overflow) { + return 0; + } return 1; } @@ -93,8 +117,9 @@ static int secp256k1_ecdsa_sig_serialize(unsigned char *sig, int *size, const se secp256k1_scalar_get_b32(&s[1], &a->s); while (lenR > 1 && rp[0] == 0 && rp[1] < 0x80) { lenR--; rp++; } while (lenS > 1 && sp[0] == 0 && sp[1] < 0x80) { lenS--; sp++; } - if (*size < 6+lenS+lenR) + if (*size < 6+lenS+lenR) { return 0; + } *size = 6 + lenS + lenR; sig[0] = 0x30; sig[1] = 4 + lenS + lenR; @@ -107,21 +132,22 @@ static int secp256k1_ecdsa_sig_serialize(unsigned char *sig, int *size, const se return 1; } -static int secp256k1_ecdsa_sig_verify(const secp256k1_ecdsa_sig_t *sig, const secp256k1_ge_t *pubkey, const secp256k1_scalar_t *message) { +static int secp256k1_ecdsa_sig_verify(const secp256k1_ecmult_context_t *ctx, const secp256k1_ecdsa_sig_t *sig, const secp256k1_ge_t *pubkey, const secp256k1_scalar_t *message) { unsigned char c[32]; secp256k1_scalar_t sn, u1, u2; secp256k1_fe_t xr; secp256k1_gej_t pubkeyj; secp256k1_gej_t pr; - if (secp256k1_scalar_is_zero(&sig->r) || secp256k1_scalar_is_zero(&sig->s)) + if (secp256k1_scalar_is_zero(&sig->r) || secp256k1_scalar_is_zero(&sig->s)) { return 0; + } secp256k1_scalar_inverse_var(&sn, &sig->s); secp256k1_scalar_mul(&u1, &sn, message); secp256k1_scalar_mul(&u2, &sn, &sig->r); secp256k1_gej_set_ge(&pubkeyj, pubkey); - secp256k1_ecmult(&pr, &pubkeyj, &u2, &u1); + secp256k1_ecmult(ctx, &pr, &pubkeyj, &u2, &u1); if (secp256k1_gej_is_infinity(&pr)) { return 0; } @@ -160,7 +186,7 @@ static int secp256k1_ecdsa_sig_verify(const secp256k1_ecdsa_sig_t *sig, const se return 0; } -static int secp256k1_ecdsa_sig_recover(const secp256k1_ecdsa_sig_t *sig, secp256k1_ge_t *pubkey, const secp256k1_scalar_t *message, int recid) { +static int secp256k1_ecdsa_sig_recover(const secp256k1_ecmult_context_t *ctx, const secp256k1_ecdsa_sig_t *sig, secp256k1_ge_t *pubkey, const secp256k1_scalar_t *message, int recid) { unsigned char brx[32]; secp256k1_fe_t fx; secp256k1_ge_t x; @@ -168,36 +194,39 @@ static int secp256k1_ecdsa_sig_recover(const secp256k1_ecdsa_sig_t *sig, secp256 secp256k1_scalar_t rn, u1, u2; secp256k1_gej_t qj; - if (secp256k1_scalar_is_zero(&sig->r) || secp256k1_scalar_is_zero(&sig->s)) + if (secp256k1_scalar_is_zero(&sig->r) || secp256k1_scalar_is_zero(&sig->s)) { return 0; + } secp256k1_scalar_get_b32(brx, &sig->r); VERIFY_CHECK(secp256k1_fe_set_b32(&fx, brx)); /* brx comes from a scalar, so is less than the order; certainly less than p */ if (recid & 2) { - if (secp256k1_fe_cmp_var(&fx, &secp256k1_ecdsa_const_p_minus_order) >= 0) + if (secp256k1_fe_cmp_var(&fx, &secp256k1_ecdsa_const_p_minus_order) >= 0) { return 0; + } secp256k1_fe_add(&fx, &secp256k1_ecdsa_const_order_as_fe); } - if (!secp256k1_ge_set_xo_var(&x, &fx, recid & 1)) + if (!secp256k1_ge_set_xo_var(&x, &fx, recid & 1)) { return 0; + } secp256k1_gej_set_ge(&xj, &x); secp256k1_scalar_inverse_var(&rn, &sig->r); secp256k1_scalar_mul(&u1, &rn, message); secp256k1_scalar_negate(&u1, &u1); secp256k1_scalar_mul(&u2, &rn, &sig->s); - secp256k1_ecmult(&qj, &xj, &u2, &u1); + secp256k1_ecmult(ctx, &qj, &xj, &u2, &u1); secp256k1_ge_set_gej_var(pubkey, &qj); return !secp256k1_gej_is_infinity(&qj); } -static int secp256k1_ecdsa_sig_sign(secp256k1_ecdsa_sig_t *sig, const secp256k1_scalar_t *seckey, const secp256k1_scalar_t *message, const secp256k1_scalar_t *nonce, int *recid) { +static int secp256k1_ecdsa_sig_sign(const secp256k1_ecmult_gen_context_t *ctx, secp256k1_ecdsa_sig_t *sig, const secp256k1_scalar_t *seckey, const secp256k1_scalar_t *message, const secp256k1_scalar_t *nonce, int *recid) { unsigned char b[32]; secp256k1_gej_t rp; secp256k1_ge_t r; secp256k1_scalar_t n; int overflow = 0; - secp256k1_ecmult_gen(&rp, nonce); + secp256k1_ecmult_gen(ctx, &rp, nonce); secp256k1_ge_set_gej(&r, &rp); secp256k1_fe_normalize(&r.x); secp256k1_fe_normalize(&r.y); @@ -209,8 +238,9 @@ static int secp256k1_ecdsa_sig_sign(secp256k1_ecdsa_sig_t *sig, const secp256k1_ secp256k1_ge_clear(&r); return 0; } - if (recid) + if (recid) { *recid = (overflow ? 2 : 0) | (secp256k1_fe_is_odd(&r.y) ? 1 : 0); + } secp256k1_scalar_mul(&n, &sig->r, seckey); secp256k1_scalar_add(&n, &n, message); secp256k1_scalar_inverse(&sig->s, nonce); @@ -218,12 +248,14 @@ static int secp256k1_ecdsa_sig_sign(secp256k1_ecdsa_sig_t *sig, const secp256k1_ secp256k1_scalar_clear(&n); secp256k1_gej_clear(&rp); secp256k1_ge_clear(&r); - if (secp256k1_scalar_is_zero(&sig->s)) + if (secp256k1_scalar_is_zero(&sig->s)) { return 0; + } if (secp256k1_scalar_is_high(&sig->s)) { secp256k1_scalar_negate(&sig->s, &sig->s); - if (recid) + if (recid) { *recid ^= 1; + } } return 1; } diff --git a/src/secp256k1/src/eckey.h b/src/secp256k1/src/eckey.h index 6de5dc0a59..53b818485e 100644 --- a/src/secp256k1/src/eckey.h +++ b/src/secp256k1/src/eckey.h @@ -9,16 +9,18 @@ #include "group.h" #include "scalar.h" +#include "ecmult.h" +#include "ecmult_gen.h" static int secp256k1_eckey_pubkey_parse(secp256k1_ge_t *elem, const unsigned char *pub, int size); static int secp256k1_eckey_pubkey_serialize(secp256k1_ge_t *elem, unsigned char *pub, int *size, int compressed); static int secp256k1_eckey_privkey_parse(secp256k1_scalar_t *key, const unsigned char *privkey, int privkeylen); -static int secp256k1_eckey_privkey_serialize(unsigned char *privkey, int *privkeylen, const secp256k1_scalar_t *key, int compressed); +static int secp256k1_eckey_privkey_serialize(const secp256k1_ecmult_gen_context_t *ctx, unsigned char *privkey, int *privkeylen, const secp256k1_scalar_t *key, int compressed); static int secp256k1_eckey_privkey_tweak_add(secp256k1_scalar_t *key, const secp256k1_scalar_t *tweak); -static int secp256k1_eckey_pubkey_tweak_add(secp256k1_ge_t *key, const secp256k1_scalar_t *tweak); +static int secp256k1_eckey_pubkey_tweak_add(const secp256k1_ecmult_context_t *ctx, secp256k1_ge_t *key, const secp256k1_scalar_t *tweak); static int secp256k1_eckey_privkey_tweak_mul(secp256k1_scalar_t *key, const secp256k1_scalar_t *tweak); -static int secp256k1_eckey_pubkey_tweak_mul(secp256k1_ge_t *key, const secp256k1_scalar_t *tweak); +static int secp256k1_eckey_pubkey_tweak_mul(const secp256k1_ecmult_context_t *ctx, secp256k1_ge_t *key, const secp256k1_scalar_t *tweak); #endif diff --git a/src/secp256k1/src/eckey_impl.h b/src/secp256k1/src/eckey_impl.h index 3e06d05b47..a332bd34ec 100644 --- a/src/secp256k1/src/eckey_impl.h +++ b/src/secp256k1/src/eckey_impl.h @@ -24,8 +24,9 @@ static int secp256k1_eckey_pubkey_parse(secp256k1_ge_t *elem, const unsigned cha return 0; } secp256k1_ge_set_xy(elem, &x, &y); - if ((pub[0] == 0x06 || pub[0] == 0x07) && secp256k1_fe_is_odd(&y) != (pub[0] == 0x07)) + if ((pub[0] == 0x06 || pub[0] == 0x07) && secp256k1_fe_is_odd(&y) != (pub[0] == 0x07)) { return 0; + } return secp256k1_ge_is_valid_var(elem); } else { return 0; @@ -57,40 +58,47 @@ static int secp256k1_eckey_privkey_parse(secp256k1_scalar_t *key, const unsigned int len = 0; int overflow = 0; /* sequence header */ - if (end < privkey+1 || *privkey != 0x30) + if (end < privkey+1 || *privkey != 0x30) { return 0; + } privkey++; /* sequence length constructor */ - if (end < privkey+1 || !(*privkey & 0x80)) + if (end < privkey+1 || !(*privkey & 0x80)) { return 0; + } lenb = *privkey & ~0x80; privkey++; - if (lenb < 1 || lenb > 2) + if (lenb < 1 || lenb > 2) { return 0; - if (end < privkey+lenb) + } + if (end < privkey+lenb) { return 0; + } /* sequence length */ len = privkey[lenb-1] | (lenb > 1 ? privkey[lenb-2] << 8 : 0); privkey += lenb; - if (end < privkey+len) + if (end < privkey+len) { return 0; + } /* sequence element 0: version number (=1) */ - if (end < privkey+3 || privkey[0] != 0x02 || privkey[1] != 0x01 || privkey[2] != 0x01) + if (end < privkey+3 || privkey[0] != 0x02 || privkey[1] != 0x01 || privkey[2] != 0x01) { return 0; + } privkey += 3; /* sequence element 1: octet string, up to 32 bytes */ - if (end < privkey+2 || privkey[0] != 0x04 || privkey[1] > 0x20 || end < privkey+2+privkey[1]) + if (end < privkey+2 || privkey[0] != 0x04 || privkey[1] > 0x20 || end < privkey+2+privkey[1]) { return 0; + } memcpy(c + 32 - privkey[1], privkey + 2, privkey[1]); secp256k1_scalar_set_b32(key, c, &overflow); memset(c, 0, 32); return !overflow; } -static int secp256k1_eckey_privkey_serialize(unsigned char *privkey, int *privkeylen, const secp256k1_scalar_t *key, int compressed) { +static int secp256k1_eckey_privkey_serialize(const secp256k1_ecmult_gen_context_t *ctx, unsigned char *privkey, int *privkeylen, const secp256k1_scalar_t *key, int compressed) { secp256k1_gej_t rp; secp256k1_ge_t r; int pubkeylen = 0; - secp256k1_ecmult_gen(&rp, key); + secp256k1_ecmult_gen(ctx, &rp, key); secp256k1_ge_set_gej(&r, &rp); if (compressed) { static const unsigned char begin[] = { @@ -148,41 +156,45 @@ static int secp256k1_eckey_privkey_serialize(unsigned char *privkey, int *privke static int secp256k1_eckey_privkey_tweak_add(secp256k1_scalar_t *key, const secp256k1_scalar_t *tweak) { secp256k1_scalar_add(key, key, tweak); - if (secp256k1_scalar_is_zero(key)) + if (secp256k1_scalar_is_zero(key)) { return 0; + } return 1; } -static int secp256k1_eckey_pubkey_tweak_add(secp256k1_ge_t *key, const secp256k1_scalar_t *tweak) { +static int secp256k1_eckey_pubkey_tweak_add(const secp256k1_ecmult_context_t *ctx, secp256k1_ge_t *key, const secp256k1_scalar_t *tweak) { secp256k1_gej_t pt; secp256k1_scalar_t one; secp256k1_gej_set_ge(&pt, key); secp256k1_scalar_set_int(&one, 1); - secp256k1_ecmult(&pt, &pt, &one, tweak); + secp256k1_ecmult(ctx, &pt, &pt, &one, tweak); - if (secp256k1_gej_is_infinity(&pt)) + if (secp256k1_gej_is_infinity(&pt)) { return 0; + } secp256k1_ge_set_gej(key, &pt); return 1; } static int secp256k1_eckey_privkey_tweak_mul(secp256k1_scalar_t *key, const secp256k1_scalar_t *tweak) { - if (secp256k1_scalar_is_zero(tweak)) + if (secp256k1_scalar_is_zero(tweak)) { return 0; + } secp256k1_scalar_mul(key, key, tweak); return 1; } -static int secp256k1_eckey_pubkey_tweak_mul(secp256k1_ge_t *key, const secp256k1_scalar_t *tweak) { +static int secp256k1_eckey_pubkey_tweak_mul(const secp256k1_ecmult_context_t *ctx, secp256k1_ge_t *key, const secp256k1_scalar_t *tweak) { secp256k1_scalar_t zero; secp256k1_gej_t pt; - if (secp256k1_scalar_is_zero(tweak)) + if (secp256k1_scalar_is_zero(tweak)) { return 0; + } secp256k1_scalar_set_int(&zero, 0); secp256k1_gej_set_ge(&pt, key); - secp256k1_ecmult(&pt, &pt, tweak, &zero); + secp256k1_ecmult(ctx, &pt, &pt, tweak, &zero); secp256k1_ge_set_gej(key, &pt); return 1; } diff --git a/src/secp256k1/src/ecmult.h b/src/secp256k1/src/ecmult.h index 15a7100a4a..bab9e4ef52 100644 --- a/src/secp256k1/src/ecmult.h +++ b/src/secp256k1/src/ecmult.h @@ -10,10 +10,22 @@ #include "num.h" #include "group.h" -static void secp256k1_ecmult_start(void); -static void secp256k1_ecmult_stop(void); +typedef struct { + /* For accelerating the computation of a*P + b*G: */ + secp256k1_ge_storage_t (*pre_g)[]; /* odd multiples of the generator */ +#ifdef USE_ENDOMORPHISM + secp256k1_ge_storage_t (*pre_g_128)[]; /* odd multiples of 2^128*generator */ +#endif +} secp256k1_ecmult_context_t; + +static void secp256k1_ecmult_context_init(secp256k1_ecmult_context_t *ctx); +static void secp256k1_ecmult_context_build(secp256k1_ecmult_context_t *ctx); +static void secp256k1_ecmult_context_clone(secp256k1_ecmult_context_t *dst, + const secp256k1_ecmult_context_t *src); +static void secp256k1_ecmult_context_clear(secp256k1_ecmult_context_t *ctx); +static int secp256k1_ecmult_context_is_built(const secp256k1_ecmult_context_t *ctx); /** Double multiply: R = na*A + ng*G */ -static void secp256k1_ecmult(secp256k1_gej_t *r, const secp256k1_gej_t *a, const secp256k1_scalar_t *na, const secp256k1_scalar_t *ng); +static void secp256k1_ecmult(const secp256k1_ecmult_context_t *ctx, secp256k1_gej_t *r, const secp256k1_gej_t *a, const secp256k1_scalar_t *na, const secp256k1_scalar_t *ng); #endif diff --git a/src/secp256k1/src/ecmult_gen.h b/src/secp256k1/src/ecmult_gen.h index 42f822f9ce..3745633c47 100644 --- a/src/secp256k1/src/ecmult_gen.h +++ b/src/secp256k1/src/ecmult_gen.h @@ -10,10 +10,34 @@ #include "scalar.h" #include "group.h" -static void secp256k1_ecmult_gen_start(void); -static void secp256k1_ecmult_gen_stop(void); +typedef struct { + /* For accelerating the computation of a*G: + * To harden against timing attacks, use the following mechanism: + * * Break up the multiplicand into groups of 4 bits, called n_0, n_1, n_2, ..., n_63. + * * Compute sum(n_i * 16^i * G + U_i, i=0..63), where: + * * U_i = U * 2^i (for i=0..62) + * * U_i = U * (1-2^63) (for i=63) + * where U is a point with no known corresponding scalar. Note that sum(U_i, i=0..63) = 0. + * For each i, and each of the 16 possible values of n_i, (n_i * 16^i * G + U_i) is + * precomputed (call it prec(i, n_i)). The formula now becomes sum(prec(i, n_i), i=0..63). + * None of the resulting prec group elements have a known scalar, and neither do any of + * the intermediate sums while computing a*G. + */ + secp256k1_ge_storage_t (*prec)[64][16]; /* prec[j][i] = 16^j * i * G + U_i */ + secp256k1_scalar_t blind; + secp256k1_gej_t initial; +} secp256k1_ecmult_gen_context_t; + +static void secp256k1_ecmult_gen_context_init(secp256k1_ecmult_gen_context_t* ctx); +static void secp256k1_ecmult_gen_context_build(secp256k1_ecmult_gen_context_t* ctx); +static void secp256k1_ecmult_gen_context_clone(secp256k1_ecmult_gen_context_t *dst, + const secp256k1_ecmult_gen_context_t* src); +static void secp256k1_ecmult_gen_context_clear(secp256k1_ecmult_gen_context_t* ctx); +static int secp256k1_ecmult_gen_context_is_built(const secp256k1_ecmult_gen_context_t* ctx); /** Multiply with the generator: R = a*G */ -static void secp256k1_ecmult_gen(secp256k1_gej_t *r, const secp256k1_scalar_t *a); +static void secp256k1_ecmult_gen(const secp256k1_ecmult_gen_context_t* ctx, secp256k1_gej_t *r, const secp256k1_scalar_t *a); + +static void secp256k1_ecmult_gen_blind(secp256k1_ecmult_gen_context_t *ctx, const unsigned char *seed32); #endif diff --git a/src/secp256k1/src/ecmult_gen_impl.h b/src/secp256k1/src/ecmult_gen_impl.h index 849452c7a1..4697753ac8 100644 --- a/src/secp256k1/src/ecmult_gen_impl.h +++ b/src/secp256k1/src/ecmult_gen_impl.h @@ -1,5 +1,5 @@ /********************************************************************** - * Copyright (c) 2013, 2014 Pieter Wuille * + * Copyright (c) 2013, 2014, 2015 Pieter Wuille, Gregory Maxwell * * Distributed under the MIT software license, see the accompanying * * file COPYING or http://www.opensource.org/licenses/mit-license.php.* **********************************************************************/ @@ -10,36 +10,23 @@ #include "scalar.h" #include "group.h" #include "ecmult_gen.h" +#include "hash_impl.h" -typedef struct { - /* For accelerating the computation of a*G: - * To harden against timing attacks, use the following mechanism: - * * Break up the multiplicand into groups of 4 bits, called n_0, n_1, n_2, ..., n_63. - * * Compute sum(n_i * 16^i * G + U_i, i=0..63), where: - * * U_i = U * 2^i (for i=0..62) - * * U_i = U * (1-2^63) (for i=63) - * where U is a point with no known corresponding scalar. Note that sum(U_i, i=0..63) = 0. - * For each i, and each of the 16 possible values of n_i, (n_i * 16^i * G + U_i) is - * precomputed (call it prec(i, n_i)). The formula now becomes sum(prec(i, n_i), i=0..63). - * None of the resulting prec group elements have a known scalar, and neither do any of - * the intermediate sums while computing a*G. - */ - secp256k1_ge_storage_t prec[64][16]; /* prec[j][i] = 16^j * i * G + U_i */ -} secp256k1_ecmult_gen_consts_t; - -static const secp256k1_ecmult_gen_consts_t *secp256k1_ecmult_gen_consts = NULL; +static void secp256k1_ecmult_gen_context_init(secp256k1_ecmult_gen_context_t *ctx) { + ctx->prec = NULL; +} -static void secp256k1_ecmult_gen_start(void) { +static void secp256k1_ecmult_gen_context_build(secp256k1_ecmult_gen_context_t *ctx) { secp256k1_ge_t prec[1024]; secp256k1_gej_t gj; secp256k1_gej_t nums_gej; - secp256k1_ecmult_gen_consts_t *ret; int i, j; - if (secp256k1_ecmult_gen_consts != NULL) + + if (ctx->prec != NULL) { return; + } - /* Allocate the precomputation table. */ - ret = (secp256k1_ecmult_gen_consts_t*)checked_malloc(sizeof(secp256k1_ecmult_gen_consts_t)); + ctx->prec = (secp256k1_ge_storage_t (*)[64][16])checked_malloc(sizeof(*ctx->prec)); /* get the generator */ secp256k1_gej_set_ge(&gj, &secp256k1_ge_const_g); @@ -85,42 +72,113 @@ static void secp256k1_ecmult_gen_start(void) { } for (j = 0; j < 64; j++) { for (i = 0; i < 16; i++) { - secp256k1_ge_to_storage(&ret->prec[j][i], &prec[j*16 + i]); + secp256k1_ge_to_storage(&(*ctx->prec)[j][i], &prec[j*16 + i]); } } + secp256k1_ecmult_gen_blind(ctx, NULL); +} - /* Set the global pointer to the precomputation table. */ - secp256k1_ecmult_gen_consts = ret; +static int secp256k1_ecmult_gen_context_is_built(const secp256k1_ecmult_gen_context_t* ctx) { + return ctx->prec != NULL; } -static void secp256k1_ecmult_gen_stop(void) { - secp256k1_ecmult_gen_consts_t *c; - if (secp256k1_ecmult_gen_consts == NULL) - return; +static void secp256k1_ecmult_gen_context_clone(secp256k1_ecmult_gen_context_t *dst, + const secp256k1_ecmult_gen_context_t *src) { + if (src->prec == NULL) { + dst->prec = NULL; + } else { + dst->prec = (secp256k1_ge_storage_t (*)[64][16])checked_malloc(sizeof(*dst->prec)); + memcpy(dst->prec, src->prec, sizeof(*dst->prec)); + dst->initial = src->initial; + dst->blind = src->blind; + } +} - c = (secp256k1_ecmult_gen_consts_t*)secp256k1_ecmult_gen_consts; - secp256k1_ecmult_gen_consts = NULL; - free(c); +static void secp256k1_ecmult_gen_context_clear(secp256k1_ecmult_gen_context_t *ctx) { + free(ctx->prec); + secp256k1_scalar_clear(&ctx->blind); + secp256k1_gej_clear(&ctx->initial); + ctx->prec = NULL; } -static void secp256k1_ecmult_gen(secp256k1_gej_t *r, const secp256k1_scalar_t *gn) { - const secp256k1_ecmult_gen_consts_t *c = secp256k1_ecmult_gen_consts; +static void secp256k1_ecmult_gen(const secp256k1_ecmult_gen_context_t *ctx, secp256k1_gej_t *r, const secp256k1_scalar_t *gn) { secp256k1_ge_t add; secp256k1_ge_storage_t adds; + secp256k1_scalar_t gnb; int bits; int i, j; - secp256k1_gej_set_infinity(r); + memset(&adds, 0, sizeof(adds)); + *r = ctx->initial; + /* Blind scalar/point multiplication by computing (n-b)G + bG instead of nG. */ + secp256k1_scalar_add(&gnb, gn, &ctx->blind); add.infinity = 0; for (j = 0; j < 64; j++) { - bits = secp256k1_scalar_get_bits(gn, j * 4, 4); + bits = secp256k1_scalar_get_bits(&gnb, j * 4, 4); for (i = 0; i < 16; i++) { - secp256k1_ge_storage_cmov(&adds, &c->prec[j][i], i == bits); + /** This uses a conditional move to avoid any secret data in array indexes. + * _Any_ use of secret indexes has been demonstrated to result in timing + * sidechannels, even when the cache-line access patterns are uniform. + * See also: + * "A word of warning", CHES 2013 Rump Session, by Daniel J. Bernstein and Peter Schwabe + * (https://cryptojedi.org/peter/data/chesrump-20130822.pdf) and + * "Cache Attacks and Countermeasures: the Case of AES", RSA 2006, + * by Dag Arne Osvik, Adi Shamir, and Eran Tromer + * (http://www.tau.ac.il/~tromer/papers/cache.pdf) + */ + secp256k1_ge_storage_cmov(&adds, &(*ctx->prec)[j][i], i == bits); } secp256k1_ge_from_storage(&add, &adds); secp256k1_gej_add_ge(r, r, &add); } bits = 0; secp256k1_ge_clear(&add); + secp256k1_scalar_clear(&gnb); +} + +/* Setup blinding values for secp256k1_ecmult_gen. */ +static void secp256k1_ecmult_gen_blind(secp256k1_ecmult_gen_context_t *ctx, const unsigned char *seed32) { + secp256k1_scalar_t b; + secp256k1_gej_t gb; + secp256k1_fe_t s; + unsigned char nonce32[32]; + secp256k1_rfc6979_hmac_sha256_t rng; + int retry; + if (!seed32) { + /* When seed is NULL, reset the initial point and blinding value. */ + secp256k1_gej_set_ge(&ctx->initial, &secp256k1_ge_const_g); + secp256k1_gej_neg(&ctx->initial, &ctx->initial); + secp256k1_scalar_set_int(&ctx->blind, 1); + } + /* The prior blinding value (if not reset) is chained forward by including it in the hash. */ + secp256k1_scalar_get_b32(nonce32, &ctx->blind); + /** Using a CSPRNG allows a failure free interface, avoids needing large amounts of random data, + * and guards against weak or adversarial seeds. This is a simpler and safer interface than + * asking the caller for blinding values directly and expecting them to retry on failure. + */ + secp256k1_rfc6979_hmac_sha256_initialize(&rng, seed32 ? seed32 : nonce32, 32, nonce32, 32, NULL, 0); + /* Retry for out of range results to achieve uniformity. */ + do { + secp256k1_rfc6979_hmac_sha256_generate(&rng, nonce32, 32); + retry = !secp256k1_fe_set_b32(&s, nonce32); + retry |= secp256k1_fe_is_zero(&s); + } while (retry); + /* Randomize the projection to defend against multiplier sidechannels. */ + secp256k1_gej_rescale(&ctx->initial, &s); + secp256k1_fe_clear(&s); + do { + secp256k1_rfc6979_hmac_sha256_generate(&rng, nonce32, 32); + secp256k1_scalar_set_b32(&b, nonce32, &retry); + /* A blinding value of 0 works, but would undermine the projection hardening. */ + retry |= secp256k1_scalar_is_zero(&b); + } while (retry); + secp256k1_rfc6979_hmac_sha256_finalize(&rng); + memset(nonce32, 0, 32); + secp256k1_ecmult_gen(ctx, &gb, &b); + secp256k1_scalar_negate(&b, &b); + ctx->blind = b; + ctx->initial = gb; + secp256k1_scalar_clear(&b); + secp256k1_gej_clear(&gb); } #endif diff --git a/src/secp256k1/src/ecmult_impl.h b/src/secp256k1/src/ecmult_impl.h index ece0b0a459..1b2856f83d 100644 --- a/src/secp256k1/src/ecmult_impl.h +++ b/src/secp256k1/src/ecmult_impl.h @@ -41,16 +41,17 @@ static void secp256k1_ecmult_table_precomp_gej_var(secp256k1_gej_t *pre, const s int i; pre[0] = *a; secp256k1_gej_double_var(&d, &pre[0]); - for (i = 1; i < (1 << (w-2)); i++) + for (i = 1; i < (1 << (w-2)); i++) { secp256k1_gej_add_var(&pre[i], &d, &pre[i-1]); + } } static void secp256k1_ecmult_table_precomp_ge_storage_var(secp256k1_ge_storage_t *pre, const secp256k1_gej_t *a, int w) { secp256k1_gej_t d; int i; const int table_size = 1 << (w-2); - secp256k1_gej_t *prej = checked_malloc(sizeof(secp256k1_gej_t) * table_size); - secp256k1_ge_t *prea = checked_malloc(sizeof(secp256k1_ge_t) * table_size); + secp256k1_gej_t *prej = (secp256k1_gej_t *)checked_malloc(sizeof(secp256k1_gej_t) * table_size); + secp256k1_ge_t *prea = (secp256k1_ge_t *)checked_malloc(sizeof(secp256k1_ge_t) * table_size); prej[0] = *a; secp256k1_gej_double_var(&d, a); for (i = 1; i < table_size; i++) { @@ -73,73 +74,93 @@ static void secp256k1_ecmult_table_precomp_ge_storage_var(secp256k1_ge_storage_t VERIFY_CHECK(((n) & 1) == 1); \ VERIFY_CHECK((n) >= -((1 << ((w)-1)) - 1)); \ VERIFY_CHECK((n) <= ((1 << ((w)-1)) - 1)); \ - if ((n) > 0) \ + if ((n) > 0) { \ *(r) = (pre)[((n)-1)/2]; \ - else \ + } else { \ secp256k1_gej_neg((r), &(pre)[(-(n)-1)/2]); \ + } \ } while(0) #define ECMULT_TABLE_GET_GE_STORAGE(r,pre,n,w) do { \ VERIFY_CHECK(((n) & 1) == 1); \ VERIFY_CHECK((n) >= -((1 << ((w)-1)) - 1)); \ VERIFY_CHECK((n) <= ((1 << ((w)-1)) - 1)); \ - if ((n) > 0) \ + if ((n) > 0) { \ secp256k1_ge_from_storage((r), &(pre)[((n)-1)/2]); \ - else {\ + } else { \ secp256k1_ge_from_storage((r), &(pre)[(-(n)-1)/2]); \ secp256k1_ge_neg((r), (r)); \ } \ } while(0) -typedef struct { - /* For accelerating the computation of a*P + b*G: */ - secp256k1_ge_storage_t pre_g[ECMULT_TABLE_SIZE(WINDOW_G)]; /* odd multiples of the generator */ +static void secp256k1_ecmult_context_init(secp256k1_ecmult_context_t *ctx) { + ctx->pre_g = NULL; #ifdef USE_ENDOMORPHISM - secp256k1_ge_storage_t pre_g_128[ECMULT_TABLE_SIZE(WINDOW_G)]; /* odd multiples of 2^128*generator */ + ctx->pre_g_128 = NULL; #endif -} secp256k1_ecmult_consts_t; - -static const secp256k1_ecmult_consts_t *secp256k1_ecmult_consts = NULL; +} -static void secp256k1_ecmult_start(void) { +static void secp256k1_ecmult_context_build(secp256k1_ecmult_context_t *ctx) { secp256k1_gej_t gj; - secp256k1_ecmult_consts_t *ret; - if (secp256k1_ecmult_consts != NULL) - return; - /* Allocate the precomputation table. */ - ret = (secp256k1_ecmult_consts_t*)checked_malloc(sizeof(secp256k1_ecmult_consts_t)); + if (ctx->pre_g != NULL) { + return; + } /* get the generator */ secp256k1_gej_set_ge(&gj, &secp256k1_ge_const_g); + ctx->pre_g = (secp256k1_ge_storage_t (*)[])checked_malloc(sizeof((*ctx->pre_g)[0]) * ECMULT_TABLE_SIZE(WINDOW_G)); /* precompute the tables with odd multiples */ - secp256k1_ecmult_table_precomp_ge_storage_var(ret->pre_g, &gj, WINDOW_G); + secp256k1_ecmult_table_precomp_ge_storage_var(*ctx->pre_g, &gj, WINDOW_G); #ifdef USE_ENDOMORPHISM { secp256k1_gej_t g_128j; int i; + + ctx->pre_g_128 = (secp256k1_ge_storage_t (*)[])checked_malloc(sizeof((*ctx->pre_g_128)[0]) * ECMULT_TABLE_SIZE(WINDOW_G)); + /* calculate 2^128*generator */ g_128j = gj; - for (i = 0; i < 128; i++) + for (i = 0; i < 128; i++) { secp256k1_gej_double_var(&g_128j, &g_128j); - secp256k1_ecmult_table_precomp_ge_storage_var(ret->pre_g_128, &g_128j, WINDOW_G); + } + secp256k1_ecmult_table_precomp_ge_storage_var(*ctx->pre_g_128, &g_128j, WINDOW_G); } #endif +} - /* Set the global pointer to the precomputation table. */ - secp256k1_ecmult_consts = ret; +static void secp256k1_ecmult_context_clone(secp256k1_ecmult_context_t *dst, + const secp256k1_ecmult_context_t *src) { + if (src->pre_g == NULL) { + dst->pre_g = NULL; + } else { + size_t size = sizeof((*dst->pre_g)[0]) * ECMULT_TABLE_SIZE(WINDOW_G); + dst->pre_g = (secp256k1_ge_storage_t (*)[])checked_malloc(size); + memcpy(dst->pre_g, src->pre_g, size); + } +#ifdef USE_ENDOMORPHISM + if (src->pre_g_128 == NULL) { + dst->pre_g_128 = NULL; + } else { + size_t size = sizeof((*dst->pre_g_128)[0]) * ECMULT_TABLE_SIZE(WINDOW_G); + dst->pre_g_128 = (secp256k1_ge_storage_t (*)[])checked_malloc(size); + memcpy(dst->pre_g_128, src->pre_g_128, size); + } +#endif } -static void secp256k1_ecmult_stop(void) { - secp256k1_ecmult_consts_t *c; - if (secp256k1_ecmult_consts == NULL) - return; +static int secp256k1_ecmult_context_is_built(const secp256k1_ecmult_context_t *ctx) { + return ctx->pre_g != NULL; +} - c = (secp256k1_ecmult_consts_t*)secp256k1_ecmult_consts; - secp256k1_ecmult_consts = NULL; - free(c); +static void secp256k1_ecmult_context_clear(secp256k1_ecmult_context_t *ctx) { + free(ctx->pre_g); +#ifdef USE_ENDOMORPHISM + free(ctx->pre_g_128); +#endif + secp256k1_ecmult_context_init(ctx); } /** Convert a number to WNAF notation. The number becomes represented by sum(2^i * wnaf[i], i=0..bits), @@ -186,11 +207,10 @@ static int secp256k1_ecmult_wnaf(int *wnaf, const secp256k1_scalar_t *a, int w) return set_bits; } -static void secp256k1_ecmult(secp256k1_gej_t *r, const secp256k1_gej_t *a, const secp256k1_scalar_t *na, const secp256k1_scalar_t *ng) { +static void secp256k1_ecmult(const secp256k1_ecmult_context_t *ctx, secp256k1_gej_t *r, const secp256k1_gej_t *a, const secp256k1_scalar_t *na, const secp256k1_scalar_t *ng) { secp256k1_gej_t tmpj; secp256k1_gej_t pre_a[ECMULT_TABLE_SIZE(WINDOW_A)]; secp256k1_ge_t tmpa; - const secp256k1_ecmult_consts_t *c = secp256k1_ecmult_consts; #ifdef USE_ENDOMORPHISM secp256k1_gej_t pre_a_lam[ECMULT_TABLE_SIZE(WINDOW_A)]; secp256k1_scalar_t na_1, na_lam; @@ -223,7 +243,9 @@ static void secp256k1_ecmult(secp256k1_gej_t *r, const secp256k1_gej_t *a, const VERIFY_CHECK(bits_na_1 <= 130); VERIFY_CHECK(bits_na_lam <= 130); bits = bits_na_1; - if (bits_na_lam > bits) bits = bits_na_lam; + if (bits_na_lam > bits) { + bits = bits_na_lam; + } #else /* build wnaf representation for na. */ bits_na = secp256k1_ecmult_wnaf(wnaf_na, na, WINDOW_A); @@ -234,8 +256,9 @@ static void secp256k1_ecmult(secp256k1_gej_t *r, const secp256k1_gej_t *a, const secp256k1_ecmult_table_precomp_gej_var(pre_a, a, WINDOW_A); #ifdef USE_ENDOMORPHISM - for (i = 0; i < ECMULT_TABLE_SIZE(WINDOW_A); i++) + for (i = 0; i < ECMULT_TABLE_SIZE(WINDOW_A); i++) { secp256k1_gej_mul_lambda(&pre_a_lam[i], &pre_a[i]); + } /* split ng into ng_1 and ng_128 (where gn = gn_1 + gn_128*2^128, and gn_1 and gn_128 are ~128 bit) */ secp256k1_scalar_split_128(&ng_1, &ng_128, ng); @@ -243,11 +266,17 @@ static void secp256k1_ecmult(secp256k1_gej_t *r, const secp256k1_gej_t *a, const /* Build wnaf representation for ng_1 and ng_128 */ bits_ng_1 = secp256k1_ecmult_wnaf(wnaf_ng_1, &ng_1, WINDOW_G); bits_ng_128 = secp256k1_ecmult_wnaf(wnaf_ng_128, &ng_128, WINDOW_G); - if (bits_ng_1 > bits) bits = bits_ng_1; - if (bits_ng_128 > bits) bits = bits_ng_128; + if (bits_ng_1 > bits) { + bits = bits_ng_1; + } + if (bits_ng_128 > bits) { + bits = bits_ng_128; + } #else bits_ng = secp256k1_ecmult_wnaf(wnaf_ng, ng, WINDOW_G); - if (bits_ng > bits) bits = bits_ng; + if (bits_ng > bits) { + bits = bits_ng; + } #endif secp256k1_gej_set_infinity(r); @@ -265,11 +294,11 @@ static void secp256k1_ecmult(secp256k1_gej_t *r, const secp256k1_gej_t *a, const secp256k1_gej_add_var(r, r, &tmpj); } if (i < bits_ng_1 && (n = wnaf_ng_1[i])) { - ECMULT_TABLE_GET_GE_STORAGE(&tmpa, c->pre_g, n, WINDOW_G); + ECMULT_TABLE_GET_GE_STORAGE(&tmpa, *ctx->pre_g, n, WINDOW_G); secp256k1_gej_add_ge_var(r, r, &tmpa); } if (i < bits_ng_128 && (n = wnaf_ng_128[i])) { - ECMULT_TABLE_GET_GE_STORAGE(&tmpa, c->pre_g_128, n, WINDOW_G); + ECMULT_TABLE_GET_GE_STORAGE(&tmpa, *ctx->pre_g_128, n, WINDOW_G); secp256k1_gej_add_ge_var(r, r, &tmpa); } #else @@ -278,7 +307,7 @@ static void secp256k1_ecmult(secp256k1_gej_t *r, const secp256k1_gej_t *a, const secp256k1_gej_add_var(r, r, &tmpj); } if (i < bits_ng && (n = wnaf_ng[i])) { - ECMULT_TABLE_GET_GE_STORAGE(&tmpa, c->pre_g, n, WINDOW_G); + ECMULT_TABLE_GET_GE_STORAGE(&tmpa, *ctx->pre_g, n, WINDOW_G); secp256k1_gej_add_ge_var(r, r, &tmpa); } #endif diff --git a/src/secp256k1/src/field.h b/src/secp256k1/src/field.h index 9e6d7d3c04..41b280892d 100644 --- a/src/secp256k1/src/field.h +++ b/src/secp256k1/src/field.h @@ -113,4 +113,7 @@ static void secp256k1_fe_from_storage(secp256k1_fe_t *r, const secp256k1_fe_stor /** If flag is true, set *r equal to *a; otherwise leave it. Constant-time. */ static void secp256k1_fe_storage_cmov(secp256k1_fe_storage_t *r, const secp256k1_fe_storage_t *a, int flag); +/** If flag is true, set *r equal to *a; otherwise leave it. Constant-time. */ +static void secp256k1_fe_cmov(secp256k1_fe_t *r, const secp256k1_fe_t *a, int flag); + #endif diff --git a/src/secp256k1/src/field_10x26_impl.h b/src/secp256k1/src/field_10x26_impl.h index 0afbb18a4a..871b91f912 100644 --- a/src/secp256k1/src/field_10x26_impl.h +++ b/src/secp256k1/src/field_10x26_impl.h @@ -236,8 +236,9 @@ static int secp256k1_fe_normalizes_to_zero_var(secp256k1_fe_t *r) { z1 = z0 ^ 0x3D0UL; /* Fast return path should catch the majority of cases */ - if ((z0 != 0UL) & (z1 != 0x3FFFFFFUL)) + if ((z0 != 0UL) & (z1 != 0x3FFFFFFUL)) { return 0; + } t1 = r->n[1]; t2 = r->n[2]; @@ -315,8 +316,12 @@ static int secp256k1_fe_cmp_var(const secp256k1_fe_t *a, const secp256k1_fe_t *b secp256k1_fe_verify(b); #endif for (i = 9; i >= 0; i--) { - if (a->n[i] > b->n[i]) return 1; - if (a->n[i] < b->n[i]) return -1; + if (a->n[i] > b->n[i]) { + return 1; + } + if (a->n[i] < b->n[i]) { + return -1; + } } return 0; } @@ -1063,6 +1068,26 @@ static void secp256k1_fe_sqr(secp256k1_fe_t *r, const secp256k1_fe_t *a) { #endif } +static SECP256K1_INLINE void secp256k1_fe_cmov(secp256k1_fe_t *r, const secp256k1_fe_t *a, int flag) { + uint32_t mask0, mask1; + mask0 = flag + ~((uint32_t)0); + mask1 = ~mask0; + r->n[0] = (r->n[0] & mask0) | (a->n[0] & mask1); + r->n[1] = (r->n[1] & mask0) | (a->n[1] & mask1); + r->n[2] = (r->n[2] & mask0) | (a->n[2] & mask1); + r->n[3] = (r->n[3] & mask0) | (a->n[3] & mask1); + r->n[4] = (r->n[4] & mask0) | (a->n[4] & mask1); + r->n[5] = (r->n[5] & mask0) | (a->n[5] & mask1); + r->n[6] = (r->n[6] & mask0) | (a->n[6] & mask1); + r->n[7] = (r->n[7] & mask0) | (a->n[7] & mask1); + r->n[8] = (r->n[8] & mask0) | (a->n[8] & mask1); + r->n[9] = (r->n[9] & mask0) | (a->n[9] & mask1); +#ifdef VERIFY + r->magnitude = (r->magnitude & mask0) | (a->magnitude & mask1); + r->normalized = (r->normalized & mask0) | (a->normalized & mask1); +#endif +} + static SECP256K1_INLINE void secp256k1_fe_storage_cmov(secp256k1_fe_storage_t *r, const secp256k1_fe_storage_t *a, int flag) { uint32_t mask0, mask1; mask0 = flag + ~((uint32_t)0); diff --git a/src/secp256k1/src/field_5x52_impl.h b/src/secp256k1/src/field_5x52_impl.h index 2f9c8704a8..bda4c3dfc2 100644 --- a/src/secp256k1/src/field_5x52_impl.h +++ b/src/secp256k1/src/field_5x52_impl.h @@ -209,8 +209,9 @@ static int secp256k1_fe_normalizes_to_zero_var(secp256k1_fe_t *r) { z1 = z0 ^ 0x1000003D0ULL; /* Fast return path should catch the majority of cases */ - if ((z0 != 0ULL) & (z1 != 0xFFFFFFFFFFFFFULL)) + if ((z0 != 0ULL) & (z1 != 0xFFFFFFFFFFFFFULL)) { return 0; + } t1 = r->n[1]; t2 = r->n[2]; @@ -277,8 +278,12 @@ static int secp256k1_fe_cmp_var(const secp256k1_fe_t *a, const secp256k1_fe_t *b secp256k1_fe_verify(b); #endif for (i = 4; i >= 0; i--) { - if (a->n[i] > b->n[i]) return 1; - if (a->n[i] < b->n[i]) return -1; + if (a->n[i] > b->n[i]) { + return 1; + } + if (a->n[i] < b->n[i]) { + return -1; + } } return 0; } @@ -399,6 +404,21 @@ static void secp256k1_fe_sqr(secp256k1_fe_t *r, const secp256k1_fe_t *a) { #endif } +static SECP256K1_INLINE void secp256k1_fe_cmov(secp256k1_fe_t *r, const secp256k1_fe_t *a, int flag) { + uint64_t mask0, mask1; + mask0 = flag + ~((uint64_t)0); + mask1 = ~mask0; + r->n[0] = (r->n[0] & mask0) | (a->n[0] & mask1); + r->n[1] = (r->n[1] & mask0) | (a->n[1] & mask1); + r->n[2] = (r->n[2] & mask0) | (a->n[2] & mask1); + r->n[3] = (r->n[3] & mask0) | (a->n[3] & mask1); + r->n[4] = (r->n[4] & mask0) | (a->n[4] & mask1); +#ifdef VERIFY + r->magnitude = (r->magnitude & mask0) | (a->magnitude & mask1); + r->normalized = (r->normalized & mask0) | (a->normalized & mask1); +#endif +} + static SECP256K1_INLINE void secp256k1_fe_storage_cmov(secp256k1_fe_storage_t *r, const secp256k1_fe_storage_t *a, int flag) { uint64_t mask0, mask1; mask0 = flag + ~((uint64_t)0); diff --git a/src/secp256k1/src/field_impl.h b/src/secp256k1/src/field_impl.h index 047914cf28..e6ec11e8f2 100644 --- a/src/secp256k1/src/field_impl.h +++ b/src/secp256k1/src/field_impl.h @@ -44,47 +44,69 @@ static int secp256k1_fe_sqrt_var(secp256k1_fe_t *r, const secp256k1_fe_t *a) { secp256k1_fe_mul(&x3, &x3, a); x6 = x3; - for (j=0; j<3; j++) secp256k1_fe_sqr(&x6, &x6); + for (j=0; j<3; j++) { + secp256k1_fe_sqr(&x6, &x6); + } secp256k1_fe_mul(&x6, &x6, &x3); x9 = x6; - for (j=0; j<3; j++) secp256k1_fe_sqr(&x9, &x9); + for (j=0; j<3; j++) { + secp256k1_fe_sqr(&x9, &x9); + } secp256k1_fe_mul(&x9, &x9, &x3); x11 = x9; - for (j=0; j<2; j++) secp256k1_fe_sqr(&x11, &x11); + for (j=0; j<2; j++) { + secp256k1_fe_sqr(&x11, &x11); + } secp256k1_fe_mul(&x11, &x11, &x2); x22 = x11; - for (j=0; j<11; j++) secp256k1_fe_sqr(&x22, &x22); + for (j=0; j<11; j++) { + secp256k1_fe_sqr(&x22, &x22); + } secp256k1_fe_mul(&x22, &x22, &x11); x44 = x22; - for (j=0; j<22; j++) secp256k1_fe_sqr(&x44, &x44); + for (j=0; j<22; j++) { + secp256k1_fe_sqr(&x44, &x44); + } secp256k1_fe_mul(&x44, &x44, &x22); x88 = x44; - for (j=0; j<44; j++) secp256k1_fe_sqr(&x88, &x88); + for (j=0; j<44; j++) { + secp256k1_fe_sqr(&x88, &x88); + } secp256k1_fe_mul(&x88, &x88, &x44); x176 = x88; - for (j=0; j<88; j++) secp256k1_fe_sqr(&x176, &x176); + for (j=0; j<88; j++) { + secp256k1_fe_sqr(&x176, &x176); + } secp256k1_fe_mul(&x176, &x176, &x88); x220 = x176; - for (j=0; j<44; j++) secp256k1_fe_sqr(&x220, &x220); + for (j=0; j<44; j++) { + secp256k1_fe_sqr(&x220, &x220); + } secp256k1_fe_mul(&x220, &x220, &x44); x223 = x220; - for (j=0; j<3; j++) secp256k1_fe_sqr(&x223, &x223); + for (j=0; j<3; j++) { + secp256k1_fe_sqr(&x223, &x223); + } secp256k1_fe_mul(&x223, &x223, &x3); /* The final result is then assembled using a sliding window over the blocks. */ t1 = x223; - for (j=0; j<23; j++) secp256k1_fe_sqr(&t1, &t1); + for (j=0; j<23; j++) { + secp256k1_fe_sqr(&t1, &t1); + } secp256k1_fe_mul(&t1, &t1, &x22); - for (j=0; j<6; j++) secp256k1_fe_sqr(&t1, &t1); + for (j=0; j<6; j++) { + secp256k1_fe_sqr(&t1, &t1); + } secp256k1_fe_mul(&t1, &t1, &x2); secp256k1_fe_sqr(&t1, &t1); secp256k1_fe_sqr(r, &t1); @@ -111,51 +133,77 @@ static void secp256k1_fe_inv(secp256k1_fe_t *r, const secp256k1_fe_t *a) { secp256k1_fe_mul(&x3, &x3, a); x6 = x3; - for (j=0; j<3; j++) secp256k1_fe_sqr(&x6, &x6); + for (j=0; j<3; j++) { + secp256k1_fe_sqr(&x6, &x6); + } secp256k1_fe_mul(&x6, &x6, &x3); x9 = x6; - for (j=0; j<3; j++) secp256k1_fe_sqr(&x9, &x9); + for (j=0; j<3; j++) { + secp256k1_fe_sqr(&x9, &x9); + } secp256k1_fe_mul(&x9, &x9, &x3); x11 = x9; - for (j=0; j<2; j++) secp256k1_fe_sqr(&x11, &x11); + for (j=0; j<2; j++) { + secp256k1_fe_sqr(&x11, &x11); + } secp256k1_fe_mul(&x11, &x11, &x2); x22 = x11; - for (j=0; j<11; j++) secp256k1_fe_sqr(&x22, &x22); + for (j=0; j<11; j++) { + secp256k1_fe_sqr(&x22, &x22); + } secp256k1_fe_mul(&x22, &x22, &x11); x44 = x22; - for (j=0; j<22; j++) secp256k1_fe_sqr(&x44, &x44); + for (j=0; j<22; j++) { + secp256k1_fe_sqr(&x44, &x44); + } secp256k1_fe_mul(&x44, &x44, &x22); x88 = x44; - for (j=0; j<44; j++) secp256k1_fe_sqr(&x88, &x88); + for (j=0; j<44; j++) { + secp256k1_fe_sqr(&x88, &x88); + } secp256k1_fe_mul(&x88, &x88, &x44); x176 = x88; - for (j=0; j<88; j++) secp256k1_fe_sqr(&x176, &x176); + for (j=0; j<88; j++) { + secp256k1_fe_sqr(&x176, &x176); + } secp256k1_fe_mul(&x176, &x176, &x88); x220 = x176; - for (j=0; j<44; j++) secp256k1_fe_sqr(&x220, &x220); + for (j=0; j<44; j++) { + secp256k1_fe_sqr(&x220, &x220); + } secp256k1_fe_mul(&x220, &x220, &x44); x223 = x220; - for (j=0; j<3; j++) secp256k1_fe_sqr(&x223, &x223); + for (j=0; j<3; j++) { + secp256k1_fe_sqr(&x223, &x223); + } secp256k1_fe_mul(&x223, &x223, &x3); /* The final result is then assembled using a sliding window over the blocks. */ t1 = x223; - for (j=0; j<23; j++) secp256k1_fe_sqr(&t1, &t1); + for (j=0; j<23; j++) { + secp256k1_fe_sqr(&t1, &t1); + } secp256k1_fe_mul(&t1, &t1, &x22); - for (j=0; j<5; j++) secp256k1_fe_sqr(&t1, &t1); + for (j=0; j<5; j++) { + secp256k1_fe_sqr(&t1, &t1); + } secp256k1_fe_mul(&t1, &t1, a); - for (j=0; j<3; j++) secp256k1_fe_sqr(&t1, &t1); + for (j=0; j<3; j++) { + secp256k1_fe_sqr(&t1, &t1); + } secp256k1_fe_mul(&t1, &t1, &x2); - for (j=0; j<2; j++) secp256k1_fe_sqr(&t1, &t1); + for (j=0; j<2; j++) { + secp256k1_fe_sqr(&t1, &t1); + } secp256k1_fe_mul(r, a, &t1); } @@ -188,8 +236,9 @@ static void secp256k1_fe_inv_var(secp256k1_fe_t *r, const secp256k1_fe_t *a) { static void secp256k1_fe_inv_all_var(size_t len, secp256k1_fe_t *r, const secp256k1_fe_t *a) { secp256k1_fe_t u; size_t i; - if (len < 1) + if (len < 1) { return; + } VERIFY_CHECK((r + len <= a) || (a + len <= r)); diff --git a/src/secp256k1/src/group.h b/src/secp256k1/src/group.h index d1e5834909..0b08b3b991 100644 --- a/src/secp256k1/src/group.h +++ b/src/secp256k1/src/group.h @@ -115,4 +115,7 @@ static void secp256k1_ge_from_storage(secp256k1_ge_t *r, const secp256k1_ge_stor /** If flag is true, set *r equal to *a; otherwise leave it. Constant-time. */ static void secp256k1_ge_storage_cmov(secp256k1_ge_storage_t *r, const secp256k1_ge_storage_t *a, int flag); +/** Rescale a jacobian point by b which must be non-zero. Constant-time. */ +static void secp256k1_gej_rescale(secp256k1_gej_t *r, const secp256k1_fe_t *b); + #endif diff --git a/src/secp256k1/src/group_impl.h b/src/secp256k1/src/group_impl.h index 8d8c359c5a..0f64576fbb 100644 --- a/src/secp256k1/src/group_impl.h +++ b/src/secp256k1/src/group_impl.h @@ -77,14 +77,14 @@ static void secp256k1_ge_set_all_gej_var(size_t len, secp256k1_ge_t *r, const se secp256k1_fe_t *azi; size_t i; size_t count = 0; - az = checked_malloc(sizeof(secp256k1_fe_t) * len); + az = (secp256k1_fe_t *)checked_malloc(sizeof(secp256k1_fe_t) * len); for (i = 0; i < len; i++) { if (!a[i].infinity) { az[count++] = a[i].z; } } - azi = checked_malloc(sizeof(secp256k1_fe_t) * count); + azi = (secp256k1_fe_t *)checked_malloc(sizeof(secp256k1_fe_t) * count); secp256k1_fe_inv_all_var(count, azi, az); free(az); @@ -138,11 +138,13 @@ static int secp256k1_ge_set_xo_var(secp256k1_ge_t *r, const secp256k1_fe_t *x, i r->infinity = 0; secp256k1_fe_set_int(&c, 7); secp256k1_fe_add(&c, &x3); - if (!secp256k1_fe_sqrt_var(&r->y, &c)) + if (!secp256k1_fe_sqrt_var(&r->y, &c)) { return 0; + } secp256k1_fe_normalize_var(&r->y); - if (secp256k1_fe_is_odd(&r->y) != odd) + if (secp256k1_fe_is_odd(&r->y) != odd) { secp256k1_fe_negate(&r->y, &r->y, 1); + } return 1; } @@ -176,8 +178,9 @@ static int secp256k1_gej_is_infinity(const secp256k1_gej_t *a) { static int secp256k1_gej_is_valid_var(const secp256k1_gej_t *a) { secp256k1_fe_t y2, x3, z2, z6; - if (a->infinity) + if (a->infinity) { return 0; + } /** y^2 = x^3 + 7 * (Y/Z^3)^2 = (X/Z^2)^3 + 7 * Y^2 / Z^6 = X^3 / Z^6 + 7 @@ -195,8 +198,9 @@ static int secp256k1_gej_is_valid_var(const secp256k1_gej_t *a) { static int secp256k1_ge_is_valid_var(const secp256k1_ge_t *a) { secp256k1_fe_t y2, x3, c; - if (a->infinity) + if (a->infinity) { return 0; + } /* y^2 = x^3 + 7 */ secp256k1_fe_sqr(&y2, &a->y); secp256k1_fe_sqr(&x3, &a->x); secp256k1_fe_mul(&x3, &x3, &a->x); @@ -321,7 +325,8 @@ static void secp256k1_gej_add_ge_var(secp256k1_gej_t *r, const secp256k1_gej_t * } static void secp256k1_gej_add_ge(secp256k1_gej_t *r, const secp256k1_gej_t *a, const secp256k1_ge_t *b) { - /* Operations: 7 mul, 5 sqr, 5 normalize, 19 mul_int/add/negate */ + /* Operations: 7 mul, 5 sqr, 5 normalize, 17 mul_int/add/negate/cmov */ + static const secp256k1_fe_t fe_1 = SECP256K1_FE_CONST(0, 0, 0, 0, 0, 0, 0, 1); secp256k1_fe_t zz, u1, u2, s1, s2, z, t, m, n, q, rr; int infinity; VERIFY_CHECK(!b->infinity); @@ -383,17 +388,25 @@ static void secp256k1_gej_add_ge(secp256k1_gej_t *r, const secp256k1_gej_t *a, c secp256k1_fe_mul_int(&r->y, 4 * (1 - a->infinity)); /* r->y = Y3 = 4*R*(3*Q-2*R^2)-4*M^4 (4) */ /** In case a->infinity == 1, the above code results in r->x, r->y, and r->z all equal to 0. - * Add b->x to x, b->y to y, and 1 to z in that case. + * Replace r with b->x, b->y, 1 in that case. */ - t = b->x; secp256k1_fe_mul_int(&t, a->infinity); - secp256k1_fe_add(&r->x, &t); - t = b->y; secp256k1_fe_mul_int(&t, a->infinity); - secp256k1_fe_add(&r->y, &t); - secp256k1_fe_set_int(&t, a->infinity); - secp256k1_fe_add(&r->z, &t); + secp256k1_fe_cmov(&r->x, &b->x, a->infinity); + secp256k1_fe_cmov(&r->y, &b->y, a->infinity); + secp256k1_fe_cmov(&r->z, &fe_1, a->infinity); r->infinity = infinity; } +static void secp256k1_gej_rescale(secp256k1_gej_t *r, const secp256k1_fe_t *s) { + /* Operations: 4 mul, 1 sqr */ + secp256k1_fe_t zz; + VERIFY_CHECK(!secp256k1_fe_is_zero(s)); + secp256k1_fe_sqr(&zz, s); + secp256k1_fe_mul(&r->x, &r->x, &zz); /* r->x *= s^2 */ + secp256k1_fe_mul(&r->y, &r->y, &zz); + secp256k1_fe_mul(&r->y, &r->y, s); /* r->y *= s^3 */ + secp256k1_fe_mul(&r->z, &r->z, s); /* r->z *= s */ +} + static void secp256k1_ge_to_storage(secp256k1_ge_storage_t *r, const secp256k1_ge_t *a) { secp256k1_fe_t x, y; VERIFY_CHECK(!a->infinity); diff --git a/src/secp256k1/src/hash_impl.h b/src/secp256k1/src/hash_impl.h index 60fdbf7718..9828827bcd 100644 --- a/src/secp256k1/src/hash_impl.h +++ b/src/secp256k1/src/hash_impl.h @@ -176,13 +176,15 @@ static void secp256k1_hmac_sha256_initialize(secp256k1_hmac_sha256_t *hash, cons } secp256k1_sha256_initialize(&hash->outer); - for (n = 0; n < 64; n++) + for (n = 0; n < 64; n++) { rkey[n] ^= 0x5c; + } secp256k1_sha256_write(&hash->outer, rkey, 64); secp256k1_sha256_initialize(&hash->inner); - for (n = 0; n < 64; n++) + for (n = 0; n < 64; n++) { rkey[n] ^= 0x5c ^ 0x36; + } secp256k1_sha256_write(&hash->inner, rkey, 64); memset(rkey, 0, 64); } @@ -205,15 +207,17 @@ static void secp256k1_rfc6979_hmac_sha256_initialize(secp256k1_rfc6979_hmac_sha2 static const unsigned char zero[1] = {0x00}; static const unsigned char one[1] = {0x01}; - memset(rng->v, 0x01, 32); - memset(rng->k, 0x00, 32); + memset(rng->v, 0x01, 32); /* RFC6979 3.2.b. */ + memset(rng->k, 0x00, 32); /* RFC6979 3.2.c. */ + /* RFC6979 3.2.d. */ secp256k1_hmac_sha256_initialize(&hmac, rng->k, 32); secp256k1_hmac_sha256_write(&hmac, rng->v, 32); secp256k1_hmac_sha256_write(&hmac, zero, 1); secp256k1_hmac_sha256_write(&hmac, key, keylen); secp256k1_hmac_sha256_write(&hmac, msg, msglen); if (rnd && rndlen) { + /* RFC6979 3.6 "Additional data". */ secp256k1_hmac_sha256_write(&hmac, rnd, rndlen); } secp256k1_hmac_sha256_finalize(&hmac, rng->k); @@ -221,12 +225,14 @@ static void secp256k1_rfc6979_hmac_sha256_initialize(secp256k1_rfc6979_hmac_sha2 secp256k1_hmac_sha256_write(&hmac, rng->v, 32); secp256k1_hmac_sha256_finalize(&hmac, rng->v); + /* RFC6979 3.2.f. */ secp256k1_hmac_sha256_initialize(&hmac, rng->k, 32); secp256k1_hmac_sha256_write(&hmac, rng->v, 32); secp256k1_hmac_sha256_write(&hmac, one, 1); secp256k1_hmac_sha256_write(&hmac, key, keylen); secp256k1_hmac_sha256_write(&hmac, msg, msglen); if (rnd && rndlen) { + /* RFC6979 3.6 "Additional data". */ secp256k1_hmac_sha256_write(&hmac, rnd, rndlen); } secp256k1_hmac_sha256_finalize(&hmac, rng->k); @@ -237,6 +243,7 @@ static void secp256k1_rfc6979_hmac_sha256_initialize(secp256k1_rfc6979_hmac_sha2 } static void secp256k1_rfc6979_hmac_sha256_generate(secp256k1_rfc6979_hmac_sha256_t *rng, unsigned char *out, size_t outlen) { + /* RFC6979 3.2.h. */ static const unsigned char zero[1] = {0x00}; if (rng->retry) { secp256k1_hmac_sha256_t hmac; diff --git a/src/secp256k1/src/num_gmp_impl.h b/src/secp256k1/src/num_gmp_impl.h index 3e4b92d329..dbbc458d5d 100644 --- a/src/secp256k1/src/num_gmp_impl.h +++ b/src/secp256k1/src/num_gmp_impl.h @@ -54,7 +54,9 @@ static void secp256k1_num_set_bin(secp256k1_num_t *r, const unsigned char *a, un VERIFY_CHECK(len <= NUM_LIMBS*2); r->limbs = len; r->neg = 0; - while (r->limbs > 1 && r->data[r->limbs-1]==0) r->limbs--; + while (r->limbs > 1 && r->data[r->limbs-1]==0) { + r->limbs--; + } } static void secp256k1_num_add_abs(secp256k1_num_t *r, const secp256k1_num_t *a, const secp256k1_num_t *b) { @@ -70,7 +72,9 @@ static void secp256k1_num_sub_abs(secp256k1_num_t *r, const secp256k1_num_t *a, mp_limb_t c = mpn_sub(r->data, a->data, a->limbs, b->data, b->limbs); VERIFY_CHECK(c == 0); r->limbs = a->limbs; - while (r->limbs > 1 && r->data[r->limbs-1]==0) r->limbs--; + while (r->limbs > 1 && r->data[r->limbs-1]==0) { + r->limbs--; + } } static void secp256k1_num_mod(secp256k1_num_t *r, const secp256k1_num_t *m) { @@ -82,7 +86,9 @@ static void secp256k1_num_mod(secp256k1_num_t *r, const secp256k1_num_t *m) { mpn_tdiv_qr(t, r->data, 0, r->data, r->limbs, m->data, m->limbs); memset(t, 0, sizeof(t)); r->limbs = m->limbs; - while (r->limbs > 1 && r->data[r->limbs-1]==0) r->limbs--; + while (r->limbs > 1 && r->data[r->limbs-1]==0) { + r->limbs--; + } } if (r->neg && (r->limbs > 1 || r->data[0] != 0)) { @@ -125,7 +131,9 @@ static void secp256k1_num_mod_inverse(secp256k1_num_t *r, const secp256k1_num_t if (sn < 0) { mpn_sub(r->data, m->data, m->limbs, r->data, -sn); r->limbs = m->limbs; - while (r->limbs > 1 && r->data[r->limbs-1]==0) r->limbs--; + while (r->limbs > 1 && r->data[r->limbs-1]==0) { + r->limbs--; + } } else { r->limbs = sn; } @@ -143,15 +151,25 @@ static int secp256k1_num_is_neg(const secp256k1_num_t *a) { } static int secp256k1_num_cmp(const secp256k1_num_t *a, const secp256k1_num_t *b) { - if (a->limbs > b->limbs) return 1; - if (a->limbs < b->limbs) return -1; + if (a->limbs > b->limbs) { + return 1; + } + if (a->limbs < b->limbs) { + return -1; + } return mpn_cmp(a->data, b->data, a->limbs); } static int secp256k1_num_eq(const secp256k1_num_t *a, const secp256k1_num_t *b) { - if (a->limbs > b->limbs) return 0; - if (a->limbs < b->limbs) return 0; - if ((a->neg && !secp256k1_num_is_zero(a)) != (b->neg && !secp256k1_num_is_zero(b))) return 0; + if (a->limbs > b->limbs) { + return 0; + } + if (a->limbs < b->limbs) { + return 0; + } + if ((a->neg && !secp256k1_num_is_zero(a)) != (b->neg && !secp256k1_num_is_zero(b))) { + return 0; + } return mpn_cmp(a->data, b->data, a->limbs) == 0; } @@ -198,12 +216,15 @@ static void secp256k1_num_mul(secp256k1_num_t *r, const secp256k1_num_t *a, cons r->data[0] = 0; return; } - if (a->limbs >= b->limbs) + if (a->limbs >= b->limbs) { mpn_mul(tmp, a->data, a->limbs, b->data, b->limbs); - else + } else { mpn_mul(tmp, b->data, b->limbs, a->data, a->limbs); + } r->limbs = a->limbs + b->limbs; - if (r->limbs > 1 && tmp[r->limbs - 1]==0) r->limbs--; + if (r->limbs > 1 && tmp[r->limbs - 1]==0) { + r->limbs--; + } VERIFY_CHECK(r->limbs <= 2*NUM_LIMBS); mpn_copyi(r->data, tmp, r->limbs); r->neg = a->neg ^ b->neg; @@ -227,7 +248,9 @@ static void secp256k1_num_shift(secp256k1_num_t *r, int bits) { } } } - while (r->limbs>1 && r->data[r->limbs-1]==0) r->limbs--; + while (r->limbs>1 && r->data[r->limbs-1]==0) { + r->limbs--; + } } static void secp256k1_num_negate(secp256k1_num_t *r) { diff --git a/src/secp256k1/src/scalar_impl.h b/src/secp256k1/src/scalar_impl.h index 3acbe264ae..33824983e4 100644 --- a/src/secp256k1/src/scalar_impl.h +++ b/src/secp256k1/src/scalar_impl.h @@ -69,130 +69,168 @@ static void secp256k1_scalar_inverse(secp256k1_scalar_t *r, const secp256k1_scal secp256k1_scalar_mul(&x8, &x8, x); secp256k1_scalar_sqr(&x15, &x8); - for (i = 0; i < 6; i++) + for (i = 0; i < 6; i++) { secp256k1_scalar_sqr(&x15, &x15); + } secp256k1_scalar_mul(&x15, &x15, &x7); secp256k1_scalar_sqr(&x30, &x15); - for (i = 0; i < 14; i++) + for (i = 0; i < 14; i++) { secp256k1_scalar_sqr(&x30, &x30); + } secp256k1_scalar_mul(&x30, &x30, &x15); secp256k1_scalar_sqr(&x60, &x30); - for (i = 0; i < 29; i++) + for (i = 0; i < 29; i++) { secp256k1_scalar_sqr(&x60, &x60); + } secp256k1_scalar_mul(&x60, &x60, &x30); secp256k1_scalar_sqr(&x120, &x60); - for (i = 0; i < 59; i++) + for (i = 0; i < 59; i++) { secp256k1_scalar_sqr(&x120, &x120); + } secp256k1_scalar_mul(&x120, &x120, &x60); secp256k1_scalar_sqr(&x127, &x120); - for (i = 0; i < 6; i++) + for (i = 0; i < 6; i++) { secp256k1_scalar_sqr(&x127, &x127); + } secp256k1_scalar_mul(&x127, &x127, &x7); /* Then accumulate the final result (t starts at x127). */ t = &x127; - for (i = 0; i < 2; i++) /* 0 */ + for (i = 0; i < 2; i++) { /* 0 */ secp256k1_scalar_sqr(t, t); + } secp256k1_scalar_mul(t, t, x); /* 1 */ - for (i = 0; i < 4; i++) /* 0 */ + for (i = 0; i < 4; i++) { /* 0 */ secp256k1_scalar_sqr(t, t); + } secp256k1_scalar_mul(t, t, &x3); /* 111 */ - for (i = 0; i < 2; i++) /* 0 */ + for (i = 0; i < 2; i++) { /* 0 */ secp256k1_scalar_sqr(t, t); + } secp256k1_scalar_mul(t, t, x); /* 1 */ - for (i = 0; i < 2; i++) /* 0 */ + for (i = 0; i < 2; i++) { /* 0 */ secp256k1_scalar_sqr(t, t); + } secp256k1_scalar_mul(t, t, x); /* 1 */ - for (i = 0; i < 2; i++) /* 0 */ + for (i = 0; i < 2; i++) { /* 0 */ secp256k1_scalar_sqr(t, t); + } secp256k1_scalar_mul(t, t, x); /* 1 */ - for (i = 0; i < 4; i++) /* 0 */ + for (i = 0; i < 4; i++) { /* 0 */ secp256k1_scalar_sqr(t, t); + } secp256k1_scalar_mul(t, t, &x3); /* 111 */ - for (i = 0; i < 3; i++) /* 0 */ + for (i = 0; i < 3; i++) { /* 0 */ secp256k1_scalar_sqr(t, t); + } secp256k1_scalar_mul(t, t, &x2); /* 11 */ - for (i = 0; i < 4; i++) /* 0 */ + for (i = 0; i < 4; i++) { /* 0 */ secp256k1_scalar_sqr(t, t); + } secp256k1_scalar_mul(t, t, &x3); /* 111 */ - for (i = 0; i < 5; i++) /* 00 */ + for (i = 0; i < 5; i++) { /* 00 */ secp256k1_scalar_sqr(t, t); + } secp256k1_scalar_mul(t, t, &x3); /* 111 */ - for (i = 0; i < 4; i++) /* 00 */ + for (i = 0; i < 4; i++) { /* 00 */ secp256k1_scalar_sqr(t, t); + } secp256k1_scalar_mul(t, t, &x2); /* 11 */ - for (i = 0; i < 2; i++) /* 0 */ + for (i = 0; i < 2; i++) { /* 0 */ secp256k1_scalar_sqr(t, t); + } secp256k1_scalar_mul(t, t, x); /* 1 */ - for (i = 0; i < 2; i++) /* 0 */ + for (i = 0; i < 2; i++) { /* 0 */ secp256k1_scalar_sqr(t, t); + } secp256k1_scalar_mul(t, t, x); /* 1 */ - for (i = 0; i < 5; i++) /* 0 */ + for (i = 0; i < 5; i++) { /* 0 */ secp256k1_scalar_sqr(t, t); + } secp256k1_scalar_mul(t, t, &x4); /* 1111 */ - for (i = 0; i < 2; i++) /* 0 */ + for (i = 0; i < 2; i++) { /* 0 */ secp256k1_scalar_sqr(t, t); + } secp256k1_scalar_mul(t, t, x); /* 1 */ - for (i = 0; i < 3; i++) /* 00 */ + for (i = 0; i < 3; i++) { /* 00 */ secp256k1_scalar_sqr(t, t); + } secp256k1_scalar_mul(t, t, x); /* 1 */ - for (i = 0; i < 4; i++) /* 000 */ + for (i = 0; i < 4; i++) { /* 000 */ secp256k1_scalar_sqr(t, t); + } secp256k1_scalar_mul(t, t, x); /* 1 */ - for (i = 0; i < 2; i++) /* 0 */ + for (i = 0; i < 2; i++) { /* 0 */ secp256k1_scalar_sqr(t, t); + } secp256k1_scalar_mul(t, t, x); /* 1 */ - for (i = 0; i < 10; i++) /* 0000000 */ + for (i = 0; i < 10; i++) { /* 0000000 */ secp256k1_scalar_sqr(t, t); + } secp256k1_scalar_mul(t, t, &x3); /* 111 */ - for (i = 0; i < 4; i++) /* 0 */ + for (i = 0; i < 4; i++) { /* 0 */ secp256k1_scalar_sqr(t, t); + } secp256k1_scalar_mul(t, t, &x3); /* 111 */ - for (i = 0; i < 9; i++) /* 0 */ + for (i = 0; i < 9; i++) { /* 0 */ secp256k1_scalar_sqr(t, t); + } secp256k1_scalar_mul(t, t, &x8); /* 11111111 */ - for (i = 0; i < 2; i++) /* 0 */ + for (i = 0; i < 2; i++) { /* 0 */ secp256k1_scalar_sqr(t, t); + } secp256k1_scalar_mul(t, t, x); /* 1 */ - for (i = 0; i < 3; i++) /* 00 */ + for (i = 0; i < 3; i++) { /* 00 */ secp256k1_scalar_sqr(t, t); + } secp256k1_scalar_mul(t, t, x); /* 1 */ - for (i = 0; i < 3; i++) /* 00 */ + for (i = 0; i < 3; i++) { /* 00 */ secp256k1_scalar_sqr(t, t); + } secp256k1_scalar_mul(t, t, x); /* 1 */ - for (i = 0; i < 5; i++) /* 0 */ + for (i = 0; i < 5; i++) { /* 0 */ secp256k1_scalar_sqr(t, t); + } secp256k1_scalar_mul(t, t, &x4); /* 1111 */ - for (i = 0; i < 2; i++) /* 0 */ + for (i = 0; i < 2; i++) { /* 0 */ secp256k1_scalar_sqr(t, t); + } secp256k1_scalar_mul(t, t, x); /* 1 */ - for (i = 0; i < 5; i++) /* 000 */ + for (i = 0; i < 5; i++) { /* 000 */ secp256k1_scalar_sqr(t, t); + } secp256k1_scalar_mul(t, t, &x2); /* 11 */ - for (i = 0; i < 4; i++) /* 00 */ + for (i = 0; i < 4; i++) { /* 00 */ secp256k1_scalar_sqr(t, t); + } secp256k1_scalar_mul(t, t, &x2); /* 11 */ - for (i = 0; i < 2; i++) /* 0 */ + for (i = 0; i < 2; i++) { /* 0 */ secp256k1_scalar_sqr(t, t); + } secp256k1_scalar_mul(t, t, x); /* 1 */ - for (i = 0; i < 8; i++) /* 000000 */ + for (i = 0; i < 8; i++) { /* 000000 */ secp256k1_scalar_sqr(t, t); + } secp256k1_scalar_mul(t, t, &x2); /* 11 */ - for (i = 0; i < 3; i++) /* 0 */ + for (i = 0; i < 3; i++) { /* 0 */ secp256k1_scalar_sqr(t, t); + } secp256k1_scalar_mul(t, t, &x2); /* 11 */ - for (i = 0; i < 3; i++) /* 00 */ + for (i = 0; i < 3; i++) { /* 00 */ secp256k1_scalar_sqr(t, t); + } secp256k1_scalar_mul(t, t, x); /* 1 */ - for (i = 0; i < 6; i++) /* 00000 */ + for (i = 0; i < 6; i++) { /* 00000 */ secp256k1_scalar_sqr(t, t); + } secp256k1_scalar_mul(t, t, x); /* 1 */ - for (i = 0; i < 8; i++) /* 00 */ + for (i = 0; i < 8; i++) { /* 00 */ secp256k1_scalar_sqr(t, t); + } secp256k1_scalar_mul(r, t, &x6); /* 111111 */ } diff --git a/src/secp256k1/src/secp256k1.c b/src/secp256k1/src/secp256k1.c index 8c4eca4b62..d6192dc4ed 100644 --- a/src/secp256k1/src/secp256k1.c +++ b/src/secp256k1/src/secp256k1.c @@ -1,5 +1,5 @@ /********************************************************************** - * Copyright (c) 2013, 2014 Pieter Wuille * + * Copyright (c) 2013-2015 Pieter Wuille * * Distributed under the MIT software license, see the accompanying * * file COPYING or http://www.opensource.org/licenses/mit-license.php.* **********************************************************************/ @@ -19,26 +19,48 @@ #include "eckey_impl.h" #include "hash_impl.h" -void secp256k1_start(unsigned int flags) { - if (flags & SECP256K1_START_SIGN) { - secp256k1_ecmult_gen_start(); +struct secp256k1_context_struct { + secp256k1_ecmult_context_t ecmult_ctx; + secp256k1_ecmult_gen_context_t ecmult_gen_ctx; +}; + +secp256k1_context_t* secp256k1_context_create(int flags) { + secp256k1_context_t* ret = (secp256k1_context_t*)checked_malloc(sizeof(secp256k1_context_t)); + + secp256k1_ecmult_context_init(&ret->ecmult_ctx); + secp256k1_ecmult_gen_context_init(&ret->ecmult_gen_ctx); + + if (flags & SECP256K1_CONTEXT_SIGN) { + secp256k1_ecmult_gen_context_build(&ret->ecmult_gen_ctx); } - if (flags & SECP256K1_START_VERIFY) { - secp256k1_ecmult_start(); + if (flags & SECP256K1_CONTEXT_VERIFY) { + secp256k1_ecmult_context_build(&ret->ecmult_ctx); } + + return ret; } -void secp256k1_stop(void) { - secp256k1_ecmult_stop(); - secp256k1_ecmult_gen_stop(); +secp256k1_context_t* secp256k1_context_clone(const secp256k1_context_t* ctx) { + secp256k1_context_t* ret = (secp256k1_context_t*)checked_malloc(sizeof(secp256k1_context_t)); + secp256k1_ecmult_context_clone(&ret->ecmult_ctx, &ctx->ecmult_ctx); + secp256k1_ecmult_gen_context_clone(&ret->ecmult_gen_ctx, &ctx->ecmult_gen_ctx); + return ret; } -int secp256k1_ecdsa_verify(const unsigned char *msg32, const unsigned char *sig, int siglen, const unsigned char *pubkey, int pubkeylen) { +void secp256k1_context_destroy(secp256k1_context_t* ctx) { + secp256k1_ecmult_context_clear(&ctx->ecmult_ctx); + secp256k1_ecmult_gen_context_clear(&ctx->ecmult_gen_ctx); + + free(ctx); +} + +int secp256k1_ecdsa_verify(const secp256k1_context_t* ctx, const unsigned char *msg32, const unsigned char *sig, int siglen, const unsigned char *pubkey, int pubkeylen) { secp256k1_ge_t q; secp256k1_ecdsa_sig_t s; secp256k1_scalar_t m; int ret = -3; - DEBUG_CHECK(secp256k1_ecmult_consts != NULL); + DEBUG_CHECK(ctx != NULL); + DEBUG_CHECK(secp256k1_ecmult_context_is_built(&ctx->ecmult_ctx)); DEBUG_CHECK(msg32 != NULL); DEBUG_CHECK(sig != NULL); DEBUG_CHECK(pubkey != NULL); @@ -47,7 +69,7 @@ int secp256k1_ecdsa_verify(const unsigned char *msg32, const unsigned char *sig, if (secp256k1_eckey_pubkey_parse(&q, pubkey, pubkeylen)) { if (secp256k1_ecdsa_sig_parse(&s, sig, siglen)) { - if (secp256k1_ecdsa_sig_verify(&s, &q, &m)) { + if (secp256k1_ecdsa_sig_verify(&ctx->ecmult_ctx, &s, &q, &m)) { /* success is 1, all other values are fail */ ret = 1; } else { @@ -66,7 +88,7 @@ int secp256k1_ecdsa_verify(const unsigned char *msg32, const unsigned char *sig, static int nonce_function_rfc6979(unsigned char *nonce32, const unsigned char *msg32, const unsigned char *key32, unsigned int counter, const void *data) { secp256k1_rfc6979_hmac_sha256_t rng; unsigned int i; - secp256k1_rfc6979_hmac_sha256_initialize(&rng, key32, 32, msg32, 32, data, data != NULL ? 32 : 0); + secp256k1_rfc6979_hmac_sha256_initialize(&rng, key32, 32, msg32, 32, (const unsigned char*)data, data != NULL ? 32 : 0); for (i = 0; i <= counter; i++) { secp256k1_rfc6979_hmac_sha256_generate(&rng, nonce32, 32); } @@ -77,13 +99,14 @@ static int nonce_function_rfc6979(unsigned char *nonce32, const unsigned char *m const secp256k1_nonce_function_t secp256k1_nonce_function_rfc6979 = nonce_function_rfc6979; const secp256k1_nonce_function_t secp256k1_nonce_function_default = nonce_function_rfc6979; -int secp256k1_ecdsa_sign(const unsigned char *msg32, unsigned char *signature, int *signaturelen, const unsigned char *seckey, secp256k1_nonce_function_t noncefp, const void* noncedata) { +int secp256k1_ecdsa_sign(const secp256k1_context_t* ctx, const unsigned char *msg32, unsigned char *signature, int *signaturelen, const unsigned char *seckey, secp256k1_nonce_function_t noncefp, const void* noncedata) { secp256k1_ecdsa_sig_t sig; secp256k1_scalar_t sec, non, msg; int ret = 0; int overflow = 0; unsigned int count = 0; - DEBUG_CHECK(secp256k1_ecmult_gen_consts != NULL); + DEBUG_CHECK(ctx != NULL); + DEBUG_CHECK(secp256k1_ecmult_gen_context_is_built(&ctx->ecmult_gen_ctx)); DEBUG_CHECK(msg32 != NULL); DEBUG_CHECK(signature != NULL); DEBUG_CHECK(signaturelen != NULL); @@ -105,7 +128,7 @@ int secp256k1_ecdsa_sign(const unsigned char *msg32, unsigned char *signature, i secp256k1_scalar_set_b32(&non, nonce32, &overflow); memset(nonce32, 0, 32); if (!secp256k1_scalar_is_zero(&non) && !overflow) { - if (secp256k1_ecdsa_sig_sign(&sig, &sec, &msg, &non, NULL)) { + if (secp256k1_ecdsa_sig_sign(&ctx->ecmult_gen_ctx, &sig, &sec, &msg, &non, NULL)) { break; } } @@ -124,13 +147,14 @@ int secp256k1_ecdsa_sign(const unsigned char *msg32, unsigned char *signature, i return ret; } -int secp256k1_ecdsa_sign_compact(const unsigned char *msg32, unsigned char *sig64, const unsigned char *seckey, secp256k1_nonce_function_t noncefp, const void* noncedata, int *recid) { +int secp256k1_ecdsa_sign_compact(const secp256k1_context_t* ctx, const unsigned char *msg32, unsigned char *sig64, const unsigned char *seckey, secp256k1_nonce_function_t noncefp, const void* noncedata, int *recid) { secp256k1_ecdsa_sig_t sig; secp256k1_scalar_t sec, non, msg; int ret = 0; int overflow = 0; unsigned int count = 0; - DEBUG_CHECK(secp256k1_ecmult_gen_consts != NULL); + DEBUG_CHECK(ctx != NULL); + DEBUG_CHECK(secp256k1_ecmult_gen_context_is_built(&ctx->ecmult_gen_ctx)); DEBUG_CHECK(msg32 != NULL); DEBUG_CHECK(sig64 != NULL); DEBUG_CHECK(seckey != NULL); @@ -151,7 +175,7 @@ int secp256k1_ecdsa_sign_compact(const unsigned char *msg32, unsigned char *sig6 secp256k1_scalar_set_b32(&non, nonce32, &overflow); memset(nonce32, 0, 32); if (!secp256k1_scalar_is_zero(&non) && !overflow) { - if (secp256k1_ecdsa_sig_sign(&sig, &sec, &msg, &non, recid)) { + if (secp256k1_ecdsa_sig_sign(&ctx->ecmult_gen_ctx, &sig, &sec, &msg, &non, recid)) { break; } } @@ -171,13 +195,14 @@ int secp256k1_ecdsa_sign_compact(const unsigned char *msg32, unsigned char *sig6 return ret; } -int secp256k1_ecdsa_recover_compact(const unsigned char *msg32, const unsigned char *sig64, unsigned char *pubkey, int *pubkeylen, int compressed, int recid) { +int secp256k1_ecdsa_recover_compact(const secp256k1_context_t* ctx, const unsigned char *msg32, const unsigned char *sig64, unsigned char *pubkey, int *pubkeylen, int compressed, int recid) { secp256k1_ge_t q; secp256k1_ecdsa_sig_t sig; secp256k1_scalar_t m; int ret = 0; int overflow = 0; - DEBUG_CHECK(secp256k1_ecmult_consts != NULL); + DEBUG_CHECK(ctx != NULL); + DEBUG_CHECK(secp256k1_ecmult_context_is_built(&ctx->ecmult_ctx)); DEBUG_CHECK(msg32 != NULL); DEBUG_CHECK(sig64 != NULL); DEBUG_CHECK(pubkey != NULL); @@ -190,7 +215,7 @@ int secp256k1_ecdsa_recover_compact(const unsigned char *msg32, const unsigned c if (!overflow) { secp256k1_scalar_set_b32(&m, msg32, NULL); - if (secp256k1_ecdsa_sig_recover(&sig, &q, &m, recid)) { + if (secp256k1_ecdsa_sig_recover(&ctx->ecmult_ctx, &sig, &q, &m, recid)) { ret = secp256k1_eckey_pubkey_serialize(&q, pubkey, pubkeylen, compressed); } } @@ -198,11 +223,13 @@ int secp256k1_ecdsa_recover_compact(const unsigned char *msg32, const unsigned c return ret; } -int secp256k1_ec_seckey_verify(const unsigned char *seckey) { +int secp256k1_ec_seckey_verify(const secp256k1_context_t* ctx, const unsigned char *seckey) { secp256k1_scalar_t sec; int ret; int overflow; + DEBUG_CHECK(ctx != NULL); DEBUG_CHECK(seckey != NULL); + (void)ctx; secp256k1_scalar_set_b32(&sec, seckey, &overflow); ret = !secp256k1_scalar_is_zero(&sec) && !overflow; @@ -210,27 +237,30 @@ int secp256k1_ec_seckey_verify(const unsigned char *seckey) { return ret; } -int secp256k1_ec_pubkey_verify(const unsigned char *pubkey, int pubkeylen) { +int secp256k1_ec_pubkey_verify(const secp256k1_context_t* ctx, const unsigned char *pubkey, int pubkeylen) { secp256k1_ge_t q; + DEBUG_CHECK(ctx != NULL); DEBUG_CHECK(pubkey != NULL); + (void)ctx; return secp256k1_eckey_pubkey_parse(&q, pubkey, pubkeylen); } -int secp256k1_ec_pubkey_create(unsigned char *pubkey, int *pubkeylen, const unsigned char *seckey, int compressed) { +int secp256k1_ec_pubkey_create(const secp256k1_context_t* ctx, unsigned char *pubkey, int *pubkeylen, const unsigned char *seckey, int compressed) { secp256k1_gej_t pj; secp256k1_ge_t p; secp256k1_scalar_t sec; int overflow; int ret = 0; - DEBUG_CHECK(secp256k1_ecmult_gen_consts != NULL); + DEBUG_CHECK(ctx != NULL); + DEBUG_CHECK(secp256k1_ecmult_gen_context_is_built(&ctx->ecmult_gen_ctx)); DEBUG_CHECK(pubkey != NULL); DEBUG_CHECK(pubkeylen != NULL); DEBUG_CHECK(seckey != NULL); secp256k1_scalar_set_b32(&sec, seckey, &overflow); if (!overflow) { - secp256k1_ecmult_gen(&pj, &sec); + secp256k1_ecmult_gen(&ctx->ecmult_gen_ctx, &pj, &sec); secp256k1_scalar_clear(&sec); secp256k1_ge_set_gej(&p, &pj); ret = secp256k1_eckey_pubkey_serialize(&p, pubkey, pubkeylen, compressed); @@ -241,11 +271,12 @@ int secp256k1_ec_pubkey_create(unsigned char *pubkey, int *pubkeylen, const unsi return ret; } -int secp256k1_ec_pubkey_decompress(unsigned char *pubkey, int *pubkeylen) { +int secp256k1_ec_pubkey_decompress(const secp256k1_context_t* ctx, unsigned char *pubkey, int *pubkeylen) { secp256k1_ge_t p; int ret = 0; DEBUG_CHECK(pubkey != NULL); DEBUG_CHECK(pubkeylen != NULL); + (void)ctx; if (secp256k1_eckey_pubkey_parse(&p, pubkey, *pubkeylen)) { ret = secp256k1_eckey_pubkey_serialize(&p, pubkey, pubkeylen, 0); @@ -253,13 +284,15 @@ int secp256k1_ec_pubkey_decompress(unsigned char *pubkey, int *pubkeylen) { return ret; } -int secp256k1_ec_privkey_tweak_add(unsigned char *seckey, const unsigned char *tweak) { +int secp256k1_ec_privkey_tweak_add(const secp256k1_context_t* ctx, unsigned char *seckey, const unsigned char *tweak) { secp256k1_scalar_t term; secp256k1_scalar_t sec; int ret = 0; int overflow = 0; + DEBUG_CHECK(ctx != NULL); DEBUG_CHECK(seckey != NULL); DEBUG_CHECK(tweak != NULL); + (void)ctx; secp256k1_scalar_set_b32(&term, tweak, &overflow); secp256k1_scalar_set_b32(&sec, seckey, NULL); @@ -274,12 +307,13 @@ int secp256k1_ec_privkey_tweak_add(unsigned char *seckey, const unsigned char *t return ret; } -int secp256k1_ec_pubkey_tweak_add(unsigned char *pubkey, int pubkeylen, const unsigned char *tweak) { +int secp256k1_ec_pubkey_tweak_add(const secp256k1_context_t* ctx, unsigned char *pubkey, int pubkeylen, const unsigned char *tweak) { secp256k1_ge_t p; secp256k1_scalar_t term; int ret = 0; int overflow = 0; - DEBUG_CHECK(secp256k1_ecmult_consts != NULL); + DEBUG_CHECK(ctx != NULL); + DEBUG_CHECK(secp256k1_ecmult_context_is_built(&ctx->ecmult_ctx)); DEBUG_CHECK(pubkey != NULL); DEBUG_CHECK(tweak != NULL); @@ -287,7 +321,7 @@ int secp256k1_ec_pubkey_tweak_add(unsigned char *pubkey, int pubkeylen, const un if (!overflow) { ret = secp256k1_eckey_pubkey_parse(&p, pubkey, pubkeylen); if (ret) { - ret = secp256k1_eckey_pubkey_tweak_add(&p, &term); + ret = secp256k1_eckey_pubkey_tweak_add(&ctx->ecmult_ctx, &p, &term); } if (ret) { int oldlen = pubkeylen; @@ -299,13 +333,15 @@ int secp256k1_ec_pubkey_tweak_add(unsigned char *pubkey, int pubkeylen, const un return ret; } -int secp256k1_ec_privkey_tweak_mul(unsigned char *seckey, const unsigned char *tweak) { +int secp256k1_ec_privkey_tweak_mul(const secp256k1_context_t* ctx, unsigned char *seckey, const unsigned char *tweak) { secp256k1_scalar_t factor; secp256k1_scalar_t sec; int ret = 0; int overflow = 0; + DEBUG_CHECK(ctx != NULL); DEBUG_CHECK(seckey != NULL); DEBUG_CHECK(tweak != NULL); + (void)ctx; secp256k1_scalar_set_b32(&factor, tweak, &overflow); secp256k1_scalar_set_b32(&sec, seckey, NULL); @@ -319,12 +355,13 @@ int secp256k1_ec_privkey_tweak_mul(unsigned char *seckey, const unsigned char *t return ret; } -int secp256k1_ec_pubkey_tweak_mul(unsigned char *pubkey, int pubkeylen, const unsigned char *tweak) { +int secp256k1_ec_pubkey_tweak_mul(const secp256k1_context_t* ctx, unsigned char *pubkey, int pubkeylen, const unsigned char *tweak) { secp256k1_ge_t p; secp256k1_scalar_t factor; int ret = 0; int overflow = 0; - DEBUG_CHECK(secp256k1_ecmult_consts != NULL); + DEBUG_CHECK(ctx != NULL); + DEBUG_CHECK(secp256k1_ecmult_context_is_built(&ctx->ecmult_ctx)); DEBUG_CHECK(pubkey != NULL); DEBUG_CHECK(tweak != NULL); @@ -332,7 +369,7 @@ int secp256k1_ec_pubkey_tweak_mul(unsigned char *pubkey, int pubkeylen, const un if (!overflow) { ret = secp256k1_eckey_pubkey_parse(&p, pubkey, pubkeylen); if (ret) { - ret = secp256k1_eckey_pubkey_tweak_mul(&p, &factor); + ret = secp256k1_eckey_pubkey_tweak_mul(&ctx->ecmult_ctx, &p, &factor); } if (ret) { int oldlen = pubkeylen; @@ -344,24 +381,27 @@ int secp256k1_ec_pubkey_tweak_mul(unsigned char *pubkey, int pubkeylen, const un return ret; } -int secp256k1_ec_privkey_export(const unsigned char *seckey, unsigned char *privkey, int *privkeylen, int compressed) { +int secp256k1_ec_privkey_export(const secp256k1_context_t* ctx, const unsigned char *seckey, unsigned char *privkey, int *privkeylen, int compressed) { secp256k1_scalar_t key; int ret = 0; DEBUG_CHECK(seckey != NULL); DEBUG_CHECK(privkey != NULL); DEBUG_CHECK(privkeylen != NULL); + DEBUG_CHECK(ctx != NULL); + DEBUG_CHECK(secp256k1_ecmult_gen_context_is_built(&ctx->ecmult_gen_ctx)); secp256k1_scalar_set_b32(&key, seckey, NULL); - ret = secp256k1_eckey_privkey_serialize(privkey, privkeylen, &key, compressed); + ret = secp256k1_eckey_privkey_serialize(&ctx->ecmult_gen_ctx, privkey, privkeylen, &key, compressed); secp256k1_scalar_clear(&key); return ret; } -int secp256k1_ec_privkey_import(unsigned char *seckey, const unsigned char *privkey, int privkeylen) { +int secp256k1_ec_privkey_import(const secp256k1_context_t* ctx, unsigned char *seckey, const unsigned char *privkey, int privkeylen) { secp256k1_scalar_t key; int ret = 0; DEBUG_CHECK(seckey != NULL); DEBUG_CHECK(privkey != NULL); + (void)ctx; ret = secp256k1_eckey_privkey_parse(&key, privkey, privkeylen); if (ret) { @@ -370,3 +410,10 @@ int secp256k1_ec_privkey_import(unsigned char *seckey, const unsigned char *priv secp256k1_scalar_clear(&key); return ret; } + +int secp256k1_context_randomize(secp256k1_context_t* ctx, const unsigned char *seed32) { + DEBUG_CHECK(ctx != NULL); + DEBUG_CHECK(secp256k1_ecmult_gen_context_is_built(&ctx->ecmult_gen_ctx)); + secp256k1_ecmult_gen_blind(&ctx->ecmult_gen_ctx, seed32); + return 1; +} diff --git a/src/secp256k1/src/tests.c b/src/secp256k1/src/tests.c index f7f1acac64..d0e05057f2 100644 --- a/src/secp256k1/src/tests.c +++ b/src/secp256k1/src/tests.c @@ -1,5 +1,5 @@ /********************************************************************** - * Copyright (c) 2013, 2014 Pieter Wuille * + * Copyright (c) 2013, 2014, 2015 Pieter Wuille, Gregory Maxwell * * Distributed under the MIT software license, see the accompanying * * file COPYING or http://www.opensource.org/licenses/mit-license.php.* **********************************************************************/ @@ -24,6 +24,7 @@ #endif static int count = 64; +static secp256k1_context_t *ctx = NULL; void random_field_element_test(secp256k1_fe_t *fe) { do { @@ -55,8 +56,9 @@ void random_group_element_test(secp256k1_ge_t *ge) { secp256k1_fe_t fe; do { random_field_element_test(&fe); - if (secp256k1_ge_set_xo_var(ge, &fe, secp256k1_rand32() & 1)) + if (secp256k1_ge_set_xo_var(ge, &fe, secp256k1_rand32() & 1)) { break; + } } while(1); } @@ -81,8 +83,9 @@ void random_scalar_order_test(secp256k1_scalar_t *num) { int overflow = 0; secp256k1_rand256_test(b32); secp256k1_scalar_set_b32(num, b32, &overflow); - if (overflow || secp256k1_scalar_is_zero(num)) + if (overflow || secp256k1_scalar_is_zero(num)) { continue; + } break; } while(1); } @@ -93,12 +96,60 @@ void random_scalar_order(secp256k1_scalar_t *num) { int overflow = 0; secp256k1_rand256(b32); secp256k1_scalar_set_b32(num, b32, &overflow); - if (overflow || secp256k1_scalar_is_zero(num)) + if (overflow || secp256k1_scalar_is_zero(num)) { continue; + } break; } while(1); } +void run_context_tests(void) { + secp256k1_context_t *none = secp256k1_context_create(0); + secp256k1_context_t *sign = secp256k1_context_create(SECP256K1_CONTEXT_SIGN); + secp256k1_context_t *vrfy = secp256k1_context_create(SECP256K1_CONTEXT_VERIFY); + secp256k1_context_t *both = secp256k1_context_create(SECP256K1_CONTEXT_SIGN | SECP256K1_CONTEXT_VERIFY); + + secp256k1_gej_t pubj; + secp256k1_ge_t pub; + secp256k1_scalar_t msg, key, nonce; + secp256k1_ecdsa_sig_t sig; + + /*** clone and destroy all of them to make sure cloning was complete ***/ + { + secp256k1_context_t *ctx_tmp; + + ctx_tmp = none; none = secp256k1_context_clone(none); secp256k1_context_destroy(ctx_tmp); + ctx_tmp = sign; sign = secp256k1_context_clone(sign); secp256k1_context_destroy(ctx_tmp); + ctx_tmp = vrfy; vrfy = secp256k1_context_clone(vrfy); secp256k1_context_destroy(ctx_tmp); + ctx_tmp = both; both = secp256k1_context_clone(both); secp256k1_context_destroy(ctx_tmp); + } + + /*** attempt to use them ***/ + random_scalar_order_test(&msg); + random_scalar_order_test(&key); + secp256k1_ecmult_gen(&both->ecmult_gen_ctx, &pubj, &key); + secp256k1_ge_set_gej(&pub, &pubj); + + /* obtain a working nonce */ + do { + random_scalar_order_test(&nonce); + } while(!secp256k1_ecdsa_sig_sign(&both->ecmult_gen_ctx, &sig, &key, &msg, &nonce, NULL)); + + /* try signing */ + CHECK(secp256k1_ecdsa_sig_sign(&sign->ecmult_gen_ctx, &sig, &key, &msg, &nonce, NULL)); + CHECK(secp256k1_ecdsa_sig_sign(&both->ecmult_gen_ctx, &sig, &key, &msg, &nonce, NULL)); + + /* try verifying */ + CHECK(secp256k1_ecdsa_sig_verify(&vrfy->ecmult_ctx, &sig, &pub, &msg)); + CHECK(secp256k1_ecdsa_sig_verify(&both->ecmult_ctx, &sig, &pub, &msg)); + + /* cleanup */ + secp256k1_context_destroy(none); + secp256k1_context_destroy(sign); + secp256k1_context_destroy(vrfy); + secp256k1_context_destroy(both); +} + /***** HASH TESTS *****/ void run_sha256_tests(void) { @@ -229,8 +280,9 @@ void run_rfc6979_hmac_sha256_tests(void) { #ifndef USE_NUM_NONE void random_num_negate(secp256k1_num_t *num) { - if (secp256k1_rand32() & 1) + if (secp256k1_rand32() & 1) { secp256k1_num_negate(num); + } } void random_num_order_test(secp256k1_num_t *num) { @@ -624,8 +676,9 @@ void random_fe_non_zero(secp256k1_fe_t *nz) { while (--tries >= 0) { random_fe(nz); secp256k1_fe_normalize(nz); - if (!secp256k1_fe_is_zero(nz)) + if (!secp256k1_fe_is_zero(nz)) { break; + } } /* Infinitesimal probability of spurious failure here */ CHECK(tries >= 0); @@ -700,12 +753,22 @@ void run_field_misc(void) { CHECK(secp256k1_fe_equal_var(&x, &x)); z = x; secp256k1_fe_add(&z,&y); - secp256k1_fe_normalize(&z); + /* Test fe conditional move; z is not normalized here. */ + q = x; + secp256k1_fe_cmov(&x, &z, 0); + secp256k1_fe_cmov(&x, &x, 1); + CHECK(memcmp(&x, &z, sizeof(x)) != 0); + CHECK(memcmp(&x, &q, sizeof(x)) == 0); + secp256k1_fe_cmov(&q, &z, 1); + CHECK(memcmp(&q, &z, sizeof(q)) == 0); /* Test storage conversion and conditional moves. */ + secp256k1_fe_normalize(&z); + CHECK(!secp256k1_fe_equal_var(&x, &z)); secp256k1_fe_to_storage(&xs, &x); secp256k1_fe_to_storage(&ys, &y); secp256k1_fe_to_storage(&zs, &z); secp256k1_fe_storage_cmov(&zs, &xs, 0); + secp256k1_fe_storage_cmov(&zs, &zs, 1); CHECK(memcmp(&xs, &zs, sizeof(xs)) != 0); secp256k1_fe_storage_cmov(&ys, &xs, 1); CHECK(memcmp(&xs, &ys, sizeof(xs)) == 0); @@ -765,14 +828,17 @@ void run_field_inv_all_var(void) { for (i = 0; i < count; i++) { size_t j; size_t len = (secp256k1_rand32() & 15) + 1; - for (j = 0; j < len; j++) + for (j = 0; j < len; j++) { random_fe_non_zero(&x[j]); + } secp256k1_fe_inv_all_var(len, xi, x); - for (j = 0; j < len; j++) + for (j = 0; j < len; j++) { CHECK(check_fe_inverse(&x[j], &xi[j])); + } secp256k1_fe_inv_all_var(len, xii, xi); - for (j = 0; j < len; j++) + for (j = 0; j < len; j++) { CHECK(check_fe_equal(&x[j], &xii[j])); + } } } @@ -844,18 +910,42 @@ void run_sqrt(void) { void ge_equals_ge(const secp256k1_ge_t *a, const secp256k1_ge_t *b) { CHECK(a->infinity == b->infinity); - if (a->infinity) + if (a->infinity) { return; + } CHECK(secp256k1_fe_equal_var(&a->x, &b->x)); CHECK(secp256k1_fe_equal_var(&b->y, &b->y)); } +/* This compares jacobian points including their Z, not just their geometric meaning. */ +int gej_xyz_equals_gej(const secp256k1_gej_t *a, const secp256k1_gej_t *b) { + secp256k1_gej_t a2; + secp256k1_gej_t b2; + int ret = 1; + ret &= a->infinity == b->infinity; + if (ret && !a->infinity) { + a2 = *a; + b2 = *b; + secp256k1_fe_normalize(&a2.x); + secp256k1_fe_normalize(&a2.y); + secp256k1_fe_normalize(&a2.z); + secp256k1_fe_normalize(&b2.x); + secp256k1_fe_normalize(&b2.y); + secp256k1_fe_normalize(&b2.z); + ret &= secp256k1_fe_cmp_var(&a2.x, &b2.x) == 0; + ret &= secp256k1_fe_cmp_var(&a2.y, &b2.y) == 0; + ret &= secp256k1_fe_cmp_var(&a2.z, &b2.z) == 0; + } + return ret; +} + void ge_equals_gej(const secp256k1_ge_t *a, const secp256k1_gej_t *b) { secp256k1_fe_t z2s; secp256k1_fe_t u1, u2, s1, s2; CHECK(a->infinity == b->infinity); - if (a->infinity) + if (a->infinity) { return; + } /* Check a.x * b.z^2 == b.x && a.y * b.z^3 == b.y, to avoid inverses. */ secp256k1_fe_sqr(&z2s, &b->z); secp256k1_fe_mul(&u1, &a->x, &z2s); @@ -874,8 +964,8 @@ void test_ge(void) { * All magnitudes are randomized. * All 17*17 combinations of points are added to eachother, using all applicable methods. */ - secp256k1_ge_t *ge = malloc(sizeof(secp256k1_ge_t) * (1 + 4 * runs)); - secp256k1_gej_t *gej = malloc(sizeof(secp256k1_gej_t) * (1 + 4 * runs)); + secp256k1_ge_t *ge = (secp256k1_ge_t *)malloc(sizeof(secp256k1_ge_t) * (1 + 4 * runs)); + secp256k1_gej_t *gej = (secp256k1_gej_t *)malloc(sizeof(secp256k1_gej_t) * (1 + 4 * runs)); secp256k1_gej_set_infinity(&gej[0]); secp256k1_ge_clear(&ge[0]); secp256k1_ge_set_gej_var(&ge[0], &gej[0]); @@ -951,7 +1041,7 @@ void test_ge(void) { /* Test adding all points together in random order equals infinity. */ { secp256k1_gej_t sum = SECP256K1_GEJ_CONST_INFINITY; - secp256k1_gej_t *gej_shuffled = malloc((4 * runs + 1) * sizeof(secp256k1_gej_t)); + secp256k1_gej_t *gej_shuffled = (secp256k1_gej_t *)malloc((4 * runs + 1) * sizeof(secp256k1_gej_t)); for (i = 0; i < 4 * runs + 1; i++) { gej_shuffled[i] = gej[i]; } @@ -972,9 +1062,12 @@ void test_ge(void) { /* Test batch gej -> ge conversion. */ { - secp256k1_ge_t *ge_set_all = malloc((4 * runs + 1) * sizeof(secp256k1_ge_t)); + secp256k1_ge_t *ge_set_all = (secp256k1_ge_t *)malloc((4 * runs + 1) * sizeof(secp256k1_ge_t)); secp256k1_ge_set_all_gej_var(4 * runs + 1, ge_set_all, gej); for (i = 0; i < 4 * runs + 1; i++) { + secp256k1_fe_t s; + random_fe_non_zero(&s); + secp256k1_gej_rescale(&gej[i], &s); ge_equals_gej(&ge_set_all[i], &gej[i]); } free(ge_set_all); @@ -1025,7 +1118,7 @@ void run_ecmult_chain(void) { x = a; for (i = 0; i < 200*count; i++) { /* in each iteration, compute X = xn*X + gn*G; */ - secp256k1_ecmult(&x, &x, &xn, &gn); + secp256k1_ecmult(&ctx->ecmult_ctx, &x, &x, &xn, &gn); /* also compute ae and ge: the actual accumulated factors for A and G */ /* if X was (ae*A+ge*G), xn*X + gn*G results in (xn*ae*A + (xn*ge+gn)*G) */ secp256k1_scalar_mul(&ae, &ae, &xn); @@ -1051,7 +1144,7 @@ void run_ecmult_chain(void) { } } /* redo the computation, but directly with the resulting ae and ge coefficients: */ - secp256k1_ecmult(&x2, &a, &ae, &ge); + secp256k1_ecmult(&ctx->ecmult_ctx, &x2, &a, &ae, &ge); secp256k1_gej_neg(&x2, &x2); secp256k1_gej_add_var(&x2, &x2, &x); CHECK(secp256k1_gej_is_infinity(&x2)); @@ -1067,8 +1160,8 @@ void test_point_times_order(const secp256k1_gej_t *point) { int psize = 65; random_scalar_order_test(&x); secp256k1_scalar_negate(&nx, &x); - secp256k1_ecmult(&res1, point, &x, &x); /* calc res1 = x * point + x * G; */ - secp256k1_ecmult(&res2, point, &nx, &nx); /* calc res2 = (order - x) * point + (order - x) * G; */ + secp256k1_ecmult(&ctx->ecmult_ctx, &res1, point, &x, &x); /* calc res1 = x * point + x * G; */ + secp256k1_ecmult(&ctx->ecmult_ctx, &res2, point, &nx, &nx); /* calc res2 = (order - x) * point + (order - x) * G; */ secp256k1_gej_add_var(&res1, &res1, &res2); CHECK(secp256k1_gej_is_infinity(&res1)); CHECK(secp256k1_gej_is_valid_var(&res1) == 0); @@ -1141,17 +1234,96 @@ void run_wnaf(void) { secp256k1_scalar_t n; for (i = 0; i < count; i++) { random_scalar_order(&n); - if (i % 1) - secp256k1_scalar_negate(&n, &n); test_wnaf(&n, 4+(i%10)); } } +void test_ecmult_constants(void) { + /* Test ecmult_gen() for [0..36) and [order-36..0). */ + secp256k1_scalar_t x; + secp256k1_gej_t r; + secp256k1_ge_t ng; + int i; + int j; + secp256k1_ge_neg(&ng, &secp256k1_ge_const_g); + for (i = 0; i < 36; i++ ) { + secp256k1_scalar_set_int(&x, i); + secp256k1_ecmult_gen(&ctx->ecmult_gen_ctx, &r, &x); + for (j = 0; j < i; j++) { + if (j == i - 1) { + ge_equals_gej(&secp256k1_ge_const_g, &r); + } + secp256k1_gej_add_ge(&r, &r, &ng); + } + CHECK(secp256k1_gej_is_infinity(&r)); + } + for (i = 1; i <= 36; i++ ) { + secp256k1_scalar_set_int(&x, i); + secp256k1_scalar_negate(&x, &x); + secp256k1_ecmult_gen(&ctx->ecmult_gen_ctx, &r, &x); + for (j = 0; j < i; j++) { + if (j == i - 1) { + ge_equals_gej(&ng, &r); + } + secp256k1_gej_add_ge(&r, &r, &secp256k1_ge_const_g); + } + CHECK(secp256k1_gej_is_infinity(&r)); + } +} + +void run_ecmult_constants(void) { + test_ecmult_constants(); +} + +void test_ecmult_gen_blind(void) { + /* Test ecmult_gen() blinding and confirm that the blinding changes, the affline points match, and the z's don't match. */ + secp256k1_scalar_t key; + secp256k1_scalar_t b; + unsigned char seed32[32]; + secp256k1_gej_t pgej; + secp256k1_gej_t pgej2; + secp256k1_gej_t i; + secp256k1_ge_t pge; + random_scalar_order_test(&key); + secp256k1_ecmult_gen(&ctx->ecmult_gen_ctx, &pgej, &key); + secp256k1_rand256(seed32); + b = ctx->ecmult_gen_ctx.blind; + i = ctx->ecmult_gen_ctx.initial; + secp256k1_ecmult_gen_blind(&ctx->ecmult_gen_ctx, seed32); + CHECK(!secp256k1_scalar_eq(&b, &ctx->ecmult_gen_ctx.blind)); + secp256k1_ecmult_gen(&ctx->ecmult_gen_ctx, &pgej2, &key); + CHECK(!gej_xyz_equals_gej(&pgej, &pgej2)); + CHECK(!gej_xyz_equals_gej(&i, &ctx->ecmult_gen_ctx.initial)); + secp256k1_ge_set_gej(&pge, &pgej); + ge_equals_gej(&pge, &pgej2); +} + +void test_ecmult_gen_blind_reset(void) { + /* Test ecmult_gen() blinding reset and confirm that the blinding is consistent. */ + secp256k1_scalar_t b; + secp256k1_gej_t initial; + secp256k1_ecmult_gen_blind(&ctx->ecmult_gen_ctx, 0); + b = ctx->ecmult_gen_ctx.blind; + initial = ctx->ecmult_gen_ctx.initial; + secp256k1_ecmult_gen_blind(&ctx->ecmult_gen_ctx, 0); + CHECK(secp256k1_scalar_eq(&b, &ctx->ecmult_gen_ctx.blind)); + CHECK(gej_xyz_equals_gej(&initial, &ctx->ecmult_gen_ctx.initial)); +} + +void run_ecmult_gen_blind(void) { + int i; + test_ecmult_gen_blind_reset(); + for (i = 0; i < 10; i++) { + test_ecmult_gen_blind(); + } +} + + void random_sign(secp256k1_ecdsa_sig_t *sig, const secp256k1_scalar_t *key, const secp256k1_scalar_t *msg, int *recid) { secp256k1_scalar_t nonce; do { random_scalar_order_test(&nonce); - } while(!secp256k1_ecdsa_sig_sign(sig, key, msg, &nonce, recid)); + } while(!secp256k1_ecdsa_sig_sign(&ctx->ecmult_gen_ctx, sig, key, msg, &nonce, recid)); } void test_ecdsa_sign_verify(void) { @@ -1164,15 +1336,17 @@ void test_ecdsa_sign_verify(void) { int getrec; random_scalar_order_test(&msg); random_scalar_order_test(&key); - secp256k1_ecmult_gen(&pubj, &key); + secp256k1_ecmult_gen(&ctx->ecmult_gen_ctx, &pubj, &key); secp256k1_ge_set_gej(&pub, &pubj); getrec = secp256k1_rand32()&1; random_sign(&sig, &key, &msg, getrec?&recid:NULL); - if (getrec) CHECK(recid >= 0 && recid < 4); - CHECK(secp256k1_ecdsa_sig_verify(&sig, &pub, &msg)); + if (getrec) { + CHECK(recid >= 0 && recid < 4); + } + CHECK(secp256k1_ecdsa_sig_verify(&ctx->ecmult_ctx, &sig, &pub, &msg)); secp256k1_scalar_set_int(&one, 1); secp256k1_scalar_add(&msg, &msg, &one); - CHECK(!secp256k1_ecdsa_sig_verify(&sig, &pub, &msg)); + CHECK(!secp256k1_ecdsa_sig_verify(&ctx->ecmult_ctx, &sig, &pub, &msg)); } void run_ecdsa_sign_verify(void) { @@ -1192,7 +1366,9 @@ static int precomputed_nonce_function(unsigned char *nonce32, const unsigned cha static int nonce_function_test_fail(unsigned char *nonce32, const unsigned char *msg32, const unsigned char *key32, unsigned int counter, const void *data) { /* Dummy nonce generator that has a fatal error on the first counter value. */ - if (counter == 0) return 0; + if (counter == 0) { + return 0; + } return nonce_function_rfc6979(nonce32, msg32, key32, counter - 1, data); } @@ -1200,7 +1376,9 @@ static int nonce_function_test_retry(unsigned char *nonce32, const unsigned char /* Dummy nonce generator that produces unacceptable nonces for the first several counter values. */ if (counter < 3) { memset(nonce32, counter==0 ? 0 : 255, 32); - if (counter == 2) nonce32[31]--; + if (counter == 2) { + nonce32[31]--; + } return 1; } if (counter < 5) { @@ -1211,12 +1389,16 @@ static int nonce_function_test_retry(unsigned char *nonce32, const unsigned char 0xBF,0xD2,0x5E,0x8C,0xD0,0x36,0x41,0x41 }; memcpy(nonce32, order, 32); - if (counter == 4) nonce32[31]++; + if (counter == 4) { + nonce32[31]++; + } return 1; } /* Retry rate of 6979 is negligible esp. as we only call this in determinstic tests. */ /* If someone does fine a case where it retries for secp256k1, we'd like to know. */ - if (counter > 5) return 0; + if (counter > 5) { + return 0; + } return nonce_function_rfc6979(nonce32, msg32, key32, counter - 5, data); } @@ -1257,16 +1439,16 @@ void test_ecdsa_end_to_end(void) { } /* Construct and verify corresponding public key. */ - CHECK(secp256k1_ec_seckey_verify(privkey) == 1); - CHECK(secp256k1_ec_pubkey_create(pubkey, &pubkeylen, privkey, (secp256k1_rand32() & 3) != 0) == 1); + CHECK(secp256k1_ec_seckey_verify(ctx, privkey) == 1); + CHECK(secp256k1_ec_pubkey_create(ctx, pubkey, &pubkeylen, privkey, (secp256k1_rand32() & 3) != 0) == 1); if (secp256k1_rand32() & 1) { - CHECK(secp256k1_ec_pubkey_decompress(pubkey, &pubkeylen)); + CHECK(secp256k1_ec_pubkey_decompress(ctx, pubkey, &pubkeylen)); } - CHECK(secp256k1_ec_pubkey_verify(pubkey, pubkeylen)); + CHECK(secp256k1_ec_pubkey_verify(ctx, pubkey, pubkeylen)); /* Verify private key import and export. */ - CHECK(secp256k1_ec_privkey_export(privkey, seckey, &seckeylen, secp256k1_rand32() % 2) == 1); - CHECK(secp256k1_ec_privkey_import(privkey2, seckey, seckeylen) == 1); + CHECK(secp256k1_ec_privkey_export(ctx, privkey, seckey, &seckeylen, secp256k1_rand32() % 2) == 1); + CHECK(secp256k1_ec_privkey_import(ctx, privkey2, seckey, seckeylen) == 1); CHECK(memcmp(privkey, privkey2, 32) == 0); /* Optionally tweak the keys using addition. */ @@ -1277,11 +1459,13 @@ void test_ecdsa_end_to_end(void) { unsigned char pubkey2[65]; int pubkeylen2 = 65; secp256k1_rand256_test(rnd); - ret1 = secp256k1_ec_privkey_tweak_add(privkey, rnd); - ret2 = secp256k1_ec_pubkey_tweak_add(pubkey, pubkeylen, rnd); + ret1 = secp256k1_ec_privkey_tweak_add(ctx, privkey, rnd); + ret2 = secp256k1_ec_pubkey_tweak_add(ctx, pubkey, pubkeylen, rnd); CHECK(ret1 == ret2); - if (ret1 == 0) return; - CHECK(secp256k1_ec_pubkey_create(pubkey2, &pubkeylen2, privkey, pubkeylen == 33) == 1); + if (ret1 == 0) { + return; + } + CHECK(secp256k1_ec_pubkey_create(ctx, pubkey2, &pubkeylen2, privkey, pubkeylen == 33) == 1); CHECK(memcmp(pubkey, pubkey2, pubkeylen) == 0); } @@ -1293,25 +1477,27 @@ void test_ecdsa_end_to_end(void) { unsigned char pubkey2[65]; int pubkeylen2 = 65; secp256k1_rand256_test(rnd); - ret1 = secp256k1_ec_privkey_tweak_mul(privkey, rnd); - ret2 = secp256k1_ec_pubkey_tweak_mul(pubkey, pubkeylen, rnd); + ret1 = secp256k1_ec_privkey_tweak_mul(ctx, privkey, rnd); + ret2 = secp256k1_ec_pubkey_tweak_mul(ctx, pubkey, pubkeylen, rnd); CHECK(ret1 == ret2); - if (ret1 == 0) return; - CHECK(secp256k1_ec_pubkey_create(pubkey2, &pubkeylen2, privkey, pubkeylen == 33) == 1); + if (ret1 == 0) { + return; + } + CHECK(secp256k1_ec_pubkey_create(ctx, pubkey2, &pubkeylen2, privkey, pubkeylen == 33) == 1); CHECK(memcmp(pubkey, pubkey2, pubkeylen) == 0); } /* Sign. */ - CHECK(secp256k1_ecdsa_sign(message, signature, &signaturelen, privkey, NULL, NULL) == 1); + CHECK(secp256k1_ecdsa_sign(ctx, message, signature, &signaturelen, privkey, NULL, NULL) == 1); CHECK(signaturelen > 0); - CHECK(secp256k1_ecdsa_sign(message, signature2, &signaturelen2, privkey, NULL, extra) == 1); + CHECK(secp256k1_ecdsa_sign(ctx, message, signature2, &signaturelen2, privkey, NULL, extra) == 1); CHECK(signaturelen2 > 0); extra[31] = 1; - CHECK(secp256k1_ecdsa_sign(message, signature3, &signaturelen3, privkey, NULL, extra) == 1); + CHECK(secp256k1_ecdsa_sign(ctx, message, signature3, &signaturelen3, privkey, NULL, extra) == 1); CHECK(signaturelen3 > 0); extra[31] = 0; extra[0] = 1; - CHECK(secp256k1_ecdsa_sign(message, signature4, &signaturelen4, privkey, NULL, extra) == 1); + CHECK(secp256k1_ecdsa_sign(ctx, message, signature4, &signaturelen4, privkey, NULL, extra) == 1); CHECK(signaturelen3 > 0); CHECK((signaturelen != signaturelen2) || (memcmp(signature, signature2, signaturelen) != 0)); CHECK((signaturelen != signaturelen3) || (memcmp(signature, signature3, signaturelen) != 0)); @@ -1320,24 +1506,24 @@ void test_ecdsa_end_to_end(void) { CHECK((signaturelen4 != signaturelen2) || (memcmp(signature4, signature2, signaturelen4) != 0)); CHECK((signaturelen4 != signaturelen) || (memcmp(signature4, signature, signaturelen4) != 0)); /* Verify. */ - CHECK(secp256k1_ecdsa_verify(message, signature, signaturelen, pubkey, pubkeylen) == 1); - CHECK(secp256k1_ecdsa_verify(message, signature2, signaturelen2, pubkey, pubkeylen) == 1); - CHECK(secp256k1_ecdsa_verify(message, signature3, signaturelen3, pubkey, pubkeylen) == 1); - CHECK(secp256k1_ecdsa_verify(message, signature4, signaturelen4, pubkey, pubkeylen) == 1); + CHECK(secp256k1_ecdsa_verify(ctx, message, signature, signaturelen, pubkey, pubkeylen) == 1); + CHECK(secp256k1_ecdsa_verify(ctx, message, signature2, signaturelen2, pubkey, pubkeylen) == 1); + CHECK(secp256k1_ecdsa_verify(ctx, message, signature3, signaturelen3, pubkey, pubkeylen) == 1); + CHECK(secp256k1_ecdsa_verify(ctx, message, signature4, signaturelen4, pubkey, pubkeylen) == 1); /* Destroy signature and verify again. */ signature[signaturelen - 1 - secp256k1_rand32() % 20] += 1 + (secp256k1_rand32() % 255); - CHECK(secp256k1_ecdsa_verify(message, signature, signaturelen, pubkey, pubkeylen) != 1); + CHECK(secp256k1_ecdsa_verify(ctx, message, signature, signaturelen, pubkey, pubkeylen) != 1); /* Compact sign. */ - CHECK(secp256k1_ecdsa_sign_compact(message, csignature, privkey, NULL, NULL, &recid) == 1); + CHECK(secp256k1_ecdsa_sign_compact(ctx, message, csignature, privkey, NULL, NULL, &recid) == 1); CHECK(!is_empty_compact_signature(csignature)); /* Recover. */ - CHECK(secp256k1_ecdsa_recover_compact(message, csignature, recpubkey, &recpubkeylen, pubkeylen == 33, recid) == 1); + CHECK(secp256k1_ecdsa_recover_compact(ctx, message, csignature, recpubkey, &recpubkeylen, pubkeylen == 33, recid) == 1); CHECK(recpubkeylen == pubkeylen); CHECK(memcmp(pubkey, recpubkey, pubkeylen) == 0); /* Destroy signature and verify again. */ csignature[secp256k1_rand32() % 64] += 1 + (secp256k1_rand32() % 255); - CHECK(secp256k1_ecdsa_recover_compact(message, csignature, recpubkey, &recpubkeylen, pubkeylen == 33, recid) != 1 || + CHECK(secp256k1_ecdsa_recover_compact(ctx, message, csignature, recpubkey, &recpubkeylen, pubkeylen == 33, recid) != 1 || memcmp(pubkey, recpubkey, pubkeylen) != 0); CHECK(recpubkeylen == pubkeylen); @@ -1351,7 +1537,9 @@ void test_random_pubkeys(void) { uint32_t r = secp256k1_rand32(); int len = (r & 3) == 0 ? 65 : 33; r>>=2; - if ((r & 3) == 0) len = (r & 252) >> 3; + if ((r & 3) == 0) { + len = (r & 252) >> 3; + } r>>=8; if (len == 65) { in[0] = (r & 2) ? 4 : (r & 1? 6 : 7); @@ -1359,10 +1547,16 @@ void test_random_pubkeys(void) { in[0] = (r & 1) ? 2 : 3; } r>>=2; - if ((r & 7) == 0) in[0] = (r & 2040) >> 3; + if ((r & 7) == 0) { + in[0] = (r & 2040) >> 3; + } r>>=11; - if (len > 1) secp256k1_rand256(&in[1]); - if (len > 33) secp256k1_rand256(&in[33]); + if (len > 1) { + secp256k1_rand256(&in[1]); + } + if (len > 33) { + secp256k1_rand256(&in[33]); + } if (secp256k1_eckey_pubkey_parse(&elem, in, len)) { unsigned char out[65]; unsigned char firstb; @@ -1374,7 +1568,9 @@ void test_random_pubkeys(void) { CHECK(size == len); CHECK(memcmp(&in[1], &out[1], len-1) == 0); /* ... except for the type of hybrid inputs. */ - if ((in[0] != 6) && (in[0] != 7)) CHECK(in[0] == out[0]); + if ((in[0] != 6) && (in[0] != 7)) { + CHECK(in[0] == out[0]); + } size = 65; CHECK(secp256k1_eckey_pubkey_serialize(&elem, in, &size, 0)); CHECK(size == 65); @@ -1384,8 +1580,11 @@ void test_random_pubkeys(void) { in[0] = (r & 1) ? 6 : 7; res = secp256k1_eckey_pubkey_parse(&elem2, in, size); if (firstb == 2 || firstb == 3) { - if (in[0] == firstb + 4) CHECK(res); - else CHECK(!res); + if (in[0] == firstb + 4) { + CHECK(res); + } else { + CHECK(!res); + } } if (res) { ge_equals_ge(&elem,&elem2); @@ -1447,10 +1646,10 @@ void test_ecdsa_edge_cases(void) { int pubkeyblen = 33; int recid; - CHECK(!secp256k1_ecdsa_recover_compact(msg32, sig64, pubkey, &pubkeylen, 0, 0)); - CHECK(secp256k1_ecdsa_recover_compact(msg32, sig64, pubkey, &pubkeylen, 0, 1)); - CHECK(!secp256k1_ecdsa_recover_compact(msg32, sig64, pubkey, &pubkeylen, 0, 2)); - CHECK(!secp256k1_ecdsa_recover_compact(msg32, sig64, pubkey, &pubkeylen, 0, 3)); + CHECK(!secp256k1_ecdsa_recover_compact(ctx, msg32, sig64, pubkey, &pubkeylen, 0, 0)); + CHECK(secp256k1_ecdsa_recover_compact(ctx, msg32, sig64, pubkey, &pubkeylen, 0, 1)); + CHECK(!secp256k1_ecdsa_recover_compact(ctx, msg32, sig64, pubkey, &pubkeylen, 0, 2)); + CHECK(!secp256k1_ecdsa_recover_compact(ctx, msg32, sig64, pubkey, &pubkeylen, 0, 3)); for (recid = 0; recid < 4; recid++) { int i; @@ -1495,42 +1694,44 @@ void test_ecdsa_edge_cases(void) { 0xE6, 0xAF, 0x48, 0xA0, 0x3B, 0xBF, 0xD2, 0x5E, 0x8C, 0xD0, 0x36, 0x41, 0x45, 0x02, 0x01, 0x04 }; - CHECK(secp256k1_ecdsa_recover_compact(msg32, sigb64, pubkeyb, &pubkeyblen, 1, recid)); - CHECK(secp256k1_ecdsa_verify(msg32, sigbder, sizeof(sigbder), pubkeyb, pubkeyblen) == 1); + CHECK(secp256k1_ecdsa_recover_compact(ctx, msg32, sigb64, pubkeyb, &pubkeyblen, 1, recid)); + CHECK(secp256k1_ecdsa_verify(ctx, msg32, sigbder, sizeof(sigbder), pubkeyb, pubkeyblen) == 1); for (recid2 = 0; recid2 < 4; recid2++) { unsigned char pubkey2b[33]; int pubkey2blen = 33; - CHECK(secp256k1_ecdsa_recover_compact(msg32, sigb64, pubkey2b, &pubkey2blen, 1, recid2)); + CHECK(secp256k1_ecdsa_recover_compact(ctx, msg32, sigb64, pubkey2b, &pubkey2blen, 1, recid2)); /* Verifying with (order + r,4) should always fail. */ - CHECK(secp256k1_ecdsa_verify(msg32, sigbderlong, sizeof(sigbderlong), pubkey2b, pubkey2blen) != 1); + CHECK(secp256k1_ecdsa_verify(ctx, msg32, sigbderlong, sizeof(sigbderlong), pubkey2b, pubkey2blen) != 1); } /* DER parsing tests. */ /* Zero length r/s. */ - CHECK(secp256k1_ecdsa_verify(msg32, sigcder_zr, sizeof(sigcder_zr), pubkeyb, pubkeyblen) == -2); - CHECK(secp256k1_ecdsa_verify(msg32, sigcder_zs, sizeof(sigcder_zs), pubkeyb, pubkeyblen) == -2); + CHECK(secp256k1_ecdsa_verify(ctx, msg32, sigcder_zr, sizeof(sigcder_zr), pubkeyb, pubkeyblen) == -2); + CHECK(secp256k1_ecdsa_verify(ctx, msg32, sigcder_zs, sizeof(sigcder_zs), pubkeyb, pubkeyblen) == -2); /* Leading zeros. */ - CHECK(secp256k1_ecdsa_verify(msg32, sigbderalt1, sizeof(sigbderalt1), pubkeyb, pubkeyblen) == 1); - CHECK(secp256k1_ecdsa_verify(msg32, sigbderalt2, sizeof(sigbderalt2), pubkeyb, pubkeyblen) == 1); - CHECK(secp256k1_ecdsa_verify(msg32, sigbderalt3, sizeof(sigbderalt3), pubkeyb, pubkeyblen) == 1); - CHECK(secp256k1_ecdsa_verify(msg32, sigbderalt4, sizeof(sigbderalt4), pubkeyb, pubkeyblen) == 1); + CHECK(secp256k1_ecdsa_verify(ctx, msg32, sigbderalt1, sizeof(sigbderalt1), pubkeyb, pubkeyblen) == 1); + CHECK(secp256k1_ecdsa_verify(ctx, msg32, sigbderalt2, sizeof(sigbderalt2), pubkeyb, pubkeyblen) == 1); + CHECK(secp256k1_ecdsa_verify(ctx, msg32, sigbderalt3, sizeof(sigbderalt3), pubkeyb, pubkeyblen) == 1); + CHECK(secp256k1_ecdsa_verify(ctx, msg32, sigbderalt4, sizeof(sigbderalt4), pubkeyb, pubkeyblen) == 1); sigbderalt3[4] = 1; - CHECK(secp256k1_ecdsa_verify(msg32, sigbderalt3, sizeof(sigbderalt3), pubkeyb, pubkeyblen) == -2); + CHECK(secp256k1_ecdsa_verify(ctx, msg32, sigbderalt3, sizeof(sigbderalt3), pubkeyb, pubkeyblen) == -2); sigbderalt4[7] = 1; - CHECK(secp256k1_ecdsa_verify(msg32, sigbderalt4, sizeof(sigbderalt4), pubkeyb, pubkeyblen) == -2); + CHECK(secp256k1_ecdsa_verify(ctx, msg32, sigbderalt4, sizeof(sigbderalt4), pubkeyb, pubkeyblen) == -2); /* Damage signature. */ sigbder[7]++; - CHECK(secp256k1_ecdsa_verify(msg32, sigbder, sizeof(sigbder), pubkeyb, pubkeyblen) == 0); + CHECK(secp256k1_ecdsa_verify(ctx, msg32, sigbder, sizeof(sigbder), pubkeyb, pubkeyblen) == 0); sigbder[7]--; - CHECK(secp256k1_ecdsa_verify(msg32, sigbder, 6, pubkeyb, pubkeyblen) == -2); - CHECK(secp256k1_ecdsa_verify(msg32, sigbder, sizeof(sigbder)-1, pubkeyb, pubkeyblen) == -2); + CHECK(secp256k1_ecdsa_verify(ctx, msg32, sigbder, 6, pubkeyb, pubkeyblen) == -2); + CHECK(secp256k1_ecdsa_verify(ctx, msg32, sigbder, sizeof(sigbder)-1, pubkeyb, pubkeyblen) == -2); for(i = 0; i < 8; i++) { int c; unsigned char orig = sigbder[i]; /*Try every single-byte change.*/ for (c = 0; c < 256; c++) { - if (c == orig ) continue; + if (c == orig ) { + continue; + } sigbder[i] = c; - CHECK(secp256k1_ecdsa_verify(msg32, sigbder, sizeof(sigbder), pubkeyb, pubkeyblen) == + CHECK(secp256k1_ecdsa_verify(ctx, msg32, sigbder, sizeof(sigbder), pubkeyb, pubkeyblen) == (i==4 || i==7) ? 0 : -2 ); } sigbder[i] = orig; @@ -1547,10 +1748,10 @@ void test_ecdsa_edge_cases(void) { secp256k1_scalar_negate(&sig.s, &sig.s); secp256k1_scalar_inverse(&sig.s, &sig.s); secp256k1_scalar_set_int(&sig.r, 1); - secp256k1_ecmult_gen(&keyj, &sig.r); + secp256k1_ecmult_gen(&ctx->ecmult_gen_ctx, &keyj, &sig.r); secp256k1_ge_set_gej(&key, &keyj); msg = sig.s; - CHECK(secp256k1_ecdsa_sig_verify(&sig, &key, &msg) == 0); + CHECK(secp256k1_ecdsa_sig_verify(&ctx->ecmult_ctx, &sig, &key, &msg) == 0); } /* Test r/s equal to zero */ @@ -1569,18 +1770,18 @@ void test_ecdsa_edge_cases(void) { }; unsigned char pubkeyc[65]; int pubkeyclen = 65; - CHECK(secp256k1_ecdsa_recover_compact(msg32, sigc64, pubkeyc, &pubkeyclen, 0, 0) == 1); - CHECK(secp256k1_ecdsa_verify(msg32, sigcder, sizeof(sigcder), pubkeyc, pubkeyclen) == 1); + CHECK(secp256k1_ecdsa_recover_compact(ctx, msg32, sigc64, pubkeyc, &pubkeyclen, 0, 0) == 1); + CHECK(secp256k1_ecdsa_verify(ctx, msg32, sigcder, sizeof(sigcder), pubkeyc, pubkeyclen) == 1); sigcder[4] = 0; sigc64[31] = 0; - CHECK(secp256k1_ecdsa_recover_compact(msg32, sigc64, pubkeyb, &pubkeyblen, 1, 0) == 0); - CHECK(secp256k1_ecdsa_verify(msg32, sigcder, sizeof(sigcder), pubkeyc, pubkeyclen) == 0); + CHECK(secp256k1_ecdsa_recover_compact(ctx, msg32, sigc64, pubkeyb, &pubkeyblen, 1, 0) == 0); + CHECK(secp256k1_ecdsa_verify(ctx, msg32, sigcder, sizeof(sigcder), pubkeyc, pubkeyclen) == 0); sigcder[4] = 1; sigcder[7] = 0; sigc64[31] = 1; sigc64[63] = 0; - CHECK(secp256k1_ecdsa_recover_compact(msg32, sigc64, pubkeyb, &pubkeyblen, 1, 0) == 0); - CHECK(secp256k1_ecdsa_verify(msg32, sigcder, sizeof(sigcder), pubkeyc, pubkeyclen) == 0); + CHECK(secp256k1_ecdsa_recover_compact(ctx, msg32, sigc64, pubkeyb, &pubkeyblen, 1, 0) == 0); + CHECK(secp256k1_ecdsa_verify(ctx, msg32, sigcder, sizeof(sigcder), pubkeyc, pubkeyclen) == 0); } /*Signature where s would be zero.*/ @@ -1611,18 +1812,18 @@ void test_ecdsa_edge_cases(void) { }; unsigned char sig[72]; int siglen = 72; - CHECK(secp256k1_ecdsa_sign(msg, sig, &siglen, key, precomputed_nonce_function, nonce) == 0); + CHECK(secp256k1_ecdsa_sign(ctx, msg, sig, &siglen, key, precomputed_nonce_function, nonce) == 0); CHECK(siglen == 0); - CHECK(secp256k1_ecdsa_sign(msg, sig, &siglen, key, precomputed_nonce_function, nonce2) == 0); + CHECK(secp256k1_ecdsa_sign(ctx, msg, sig, &siglen, key, precomputed_nonce_function, nonce2) == 0); CHECK(siglen == 0); msg[31] = 0xaa; siglen = 72; - CHECK(secp256k1_ecdsa_sign(msg, sig, &siglen, key, precomputed_nonce_function, nonce) == 1); + CHECK(secp256k1_ecdsa_sign(ctx, msg, sig, &siglen, key, precomputed_nonce_function, nonce) == 1); CHECK(siglen > 0); - CHECK(secp256k1_ecdsa_sign(msg, sig, &siglen, key, precomputed_nonce_function, nonce2) == 1); + CHECK(secp256k1_ecdsa_sign(ctx, msg, sig, &siglen, key, precomputed_nonce_function, nonce2) == 1); CHECK(siglen > 0); siglen = 10; - CHECK(secp256k1_ecdsa_sign(msg, sig, &siglen, key, precomputed_nonce_function, nonce) != 1); + CHECK(secp256k1_ecdsa_sign(ctx, msg, sig, &siglen, key, precomputed_nonce_function, nonce) != 1); CHECK(siglen == 0); } @@ -1644,41 +1845,41 @@ void test_ecdsa_edge_cases(void) { msg[31] = 1; /* High key results in signature failure. */ memset(key, 0xFF, 32); - CHECK(secp256k1_ecdsa_sign(msg, sig, &siglen, key, NULL, extra) == 0); + CHECK(secp256k1_ecdsa_sign(ctx, msg, sig, &siglen, key, NULL, extra) == 0); CHECK(siglen == 0); /* Zero key results in signature failure. */ memset(key, 0, 32); - CHECK(secp256k1_ecdsa_sign(msg, sig, &siglen, key, NULL, extra) == 0); + CHECK(secp256k1_ecdsa_sign(ctx, msg, sig, &siglen, key, NULL, extra) == 0); CHECK(siglen == 0); /* Nonce function failure results in signature failure. */ key[31] = 1; - CHECK(secp256k1_ecdsa_sign(msg, sig, &siglen, key, nonce_function_test_fail, extra) == 0); + CHECK(secp256k1_ecdsa_sign(ctx, msg, sig, &siglen, key, nonce_function_test_fail, extra) == 0); CHECK(siglen == 0); - CHECK(secp256k1_ecdsa_sign_compact(msg, sig, key, nonce_function_test_fail, extra, &recid) == 0); + CHECK(secp256k1_ecdsa_sign_compact(ctx, msg, sig, key, nonce_function_test_fail, extra, &recid) == 0); CHECK(is_empty_compact_signature(sig)); /* The retry loop successfully makes its way to the first good value. */ siglen = 72; - CHECK(secp256k1_ecdsa_sign(msg, sig, &siglen, key, nonce_function_test_retry, extra) == 1); + CHECK(secp256k1_ecdsa_sign(ctx, msg, sig, &siglen, key, nonce_function_test_retry, extra) == 1); CHECK(siglen > 0); - CHECK(secp256k1_ecdsa_sign(msg, sig2, &siglen2, key, nonce_function_rfc6979, extra) == 1); + CHECK(secp256k1_ecdsa_sign(ctx, msg, sig2, &siglen2, key, nonce_function_rfc6979, extra) == 1); CHECK(siglen > 0); CHECK((siglen == siglen2) && (memcmp(sig, sig2, siglen) == 0)); - CHECK(secp256k1_ecdsa_sign_compact(msg, sig, key, nonce_function_test_retry, extra, &recid) == 1); + CHECK(secp256k1_ecdsa_sign_compact(ctx, msg, sig, key, nonce_function_test_retry, extra, &recid) == 1); CHECK(!is_empty_compact_signature(sig)); - CHECK(secp256k1_ecdsa_sign_compact(msg, sig2, key, nonce_function_rfc6979, extra, &recid2) == 1); + CHECK(secp256k1_ecdsa_sign_compact(ctx, msg, sig2, key, nonce_function_rfc6979, extra, &recid2) == 1); CHECK(!is_empty_compact_signature(sig2)); CHECK((recid == recid2) && (memcmp(sig, sig2, 64) == 0)); /* The default nonce function is determinstic. */ siglen = 72; siglen2 = 72; - CHECK(secp256k1_ecdsa_sign(msg, sig, &siglen, key, NULL, extra) == 1); + CHECK(secp256k1_ecdsa_sign(ctx, msg, sig, &siglen, key, NULL, extra) == 1); CHECK(siglen > 0); - CHECK(secp256k1_ecdsa_sign(msg, sig2, &siglen2, key, NULL, extra) == 1); + CHECK(secp256k1_ecdsa_sign(ctx, msg, sig2, &siglen2, key, NULL, extra) == 1); CHECK(siglen2 > 0); CHECK((siglen == siglen2) && (memcmp(sig, sig2, siglen) == 0)); - CHECK(secp256k1_ecdsa_sign_compact(msg, sig, key, NULL, extra, &recid) == 1); + CHECK(secp256k1_ecdsa_sign_compact(ctx, msg, sig, key, NULL, extra, &recid) == 1); CHECK(!is_empty_compact_signature(sig)); - CHECK(secp256k1_ecdsa_sign_compact(msg, sig2, key, NULL, extra, &recid2) == 1); + CHECK(secp256k1_ecdsa_sign_compact(ctx, msg, sig2, key, NULL, extra, &recid2) == 1); CHECK(!is_empty_compact_signature(sig)); CHECK((recid == recid2) && (memcmp(sig, sig2, 64) == 0)); /* The default nonce function changes output with different messages. */ @@ -1686,7 +1887,7 @@ void test_ecdsa_edge_cases(void) { int j; siglen2 = 72; msg[0] = i; - CHECK(secp256k1_ecdsa_sign(msg, sig2, &siglen2, key, NULL, extra) == 1); + CHECK(secp256k1_ecdsa_sign(ctx, msg, sig2, &siglen2, key, NULL, extra) == 1); CHECK(!is_empty_compact_signature(sig)); CHECK(secp256k1_ecdsa_sig_parse(&s[i], sig2, siglen2)); for (j = 0; j < i; j++) { @@ -1700,7 +1901,7 @@ void test_ecdsa_edge_cases(void) { int j; siglen2 = 72; key[0] = i - 256; - CHECK(secp256k1_ecdsa_sign(msg, sig2, &siglen2, key, NULL, extra) == 1); + CHECK(secp256k1_ecdsa_sign(ctx, msg, sig2, &siglen2, key, NULL, extra) == 1); CHECK(secp256k1_ecdsa_sig_parse(&s[i], sig2, siglen2)); for (j = 0; j < i; j++) { CHECK(!secp256k1_scalar_eq(&s[i].r, &s[j].r)); @@ -1719,8 +1920,8 @@ void test_ecdsa_edge_cases(void) { 0xbf, 0xd2, 0x5e, 0x8c, 0xd0, 0x36, 0x41, 0x41, }; int outlen = 300; - CHECK(!secp256k1_ec_privkey_export(seckey, privkey, &outlen, 0)); - CHECK(!secp256k1_ec_privkey_export(seckey, privkey, &outlen, 1)); + CHECK(!secp256k1_ec_privkey_export(ctx, seckey, privkey, &outlen, 0)); + CHECK(!secp256k1_ec_privkey_export(ctx, seckey, privkey, &outlen, 1)); } } @@ -1735,7 +1936,7 @@ EC_KEY *get_openssl_key(const secp256k1_scalar_t *key) { const unsigned char* pbegin = privkey; int compr = secp256k1_rand32() & 1; EC_KEY *ec_key = EC_KEY_new_by_curve_name(NID_secp256k1); - CHECK(secp256k1_eckey_privkey_serialize(privkey, &privkeylen, key, compr)); + CHECK(secp256k1_eckey_privkey_serialize(&ctx->ecmult_gen_ctx, privkey, &privkeylen, key, compr)); CHECK(d2i_ECPrivateKey(&ec_key, &pbegin, privkeylen)); CHECK(EC_KEY_check_key(ec_key)); return ec_key; @@ -1756,16 +1957,16 @@ void test_ecdsa_openssl(void) { secp256k1_rand256_test(message); secp256k1_scalar_set_b32(&msg, message, NULL); random_scalar_order_test(&key); - secp256k1_ecmult_gen(&qj, &key); + secp256k1_ecmult_gen(&ctx->ecmult_gen_ctx, &qj, &key); secp256k1_ge_set_gej(&q, &qj); ec_key = get_openssl_key(&key); CHECK(ec_key); CHECK(ECDSA_sign(0, message, sizeof(message), signature, &sigsize, ec_key)); CHECK(secp256k1_ecdsa_sig_parse(&sig, signature, sigsize)); - CHECK(secp256k1_ecdsa_sig_verify(&sig, &q, &msg)); + CHECK(secp256k1_ecdsa_sig_verify(&ctx->ecmult_ctx, &sig, &q, &msg)); secp256k1_scalar_set_int(&one, 1); secp256k1_scalar_add(&msg2, &msg, &one); - CHECK(!secp256k1_ecdsa_sig_verify(&sig, &q, &msg2)); + CHECK(!secp256k1_ecdsa_sig_verify(&ctx->ecmult_ctx, &sig, &q, &msg2)); random_sign(&sig, &key, &msg, NULL); CHECK(secp256k1_ecdsa_sig_serialize(signature, &secp_sigsize, &sig)); @@ -1825,10 +2026,13 @@ int main(int argc, char **argv) { printf("random seed = %02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x\n", seed16[0], seed16[1], seed16[2], seed16[3], seed16[4], seed16[5], seed16[6], seed16[7], seed16[8], seed16[9], seed16[10], seed16[11], seed16[12], seed16[13], seed16[14], seed16[15]); /* initialize */ - secp256k1_start(SECP256K1_START_SIGN | SECP256K1_START_VERIFY); + run_context_tests(); + ctx = secp256k1_context_create(SECP256K1_CONTEXT_SIGN | SECP256K1_CONTEXT_VERIFY); - /* initializing a second time shouldn't cause any harm or memory leaks. */ - secp256k1_start(SECP256K1_START_SIGN | SECP256K1_START_VERIFY); + if (secp256k1_rand32() & 1) { + secp256k1_rand256(run32); + CHECK(secp256k1_context_randomize(ctx, secp256k1_rand32() & 1 ? run32 : NULL)); + } run_sha256_tests(); run_hmac_sha256_tests(); @@ -1858,6 +2062,8 @@ int main(int argc, char **argv) { run_wnaf(); run_point_times_order(); run_ecmult_chain(); + run_ecmult_constants(); + run_ecmult_gen_blind(); /* ecdsa tests */ run_random_pubkeys(); @@ -1872,9 +2078,6 @@ int main(int argc, char **argv) { printf("random run = %02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x\n", run32[0], run32[1], run32[2], run32[3], run32[4], run32[5], run32[6], run32[7], run32[8], run32[9], run32[10], run32[11], run32[12], run32[13], run32[14], run32[15]); /* shutdown */ - secp256k1_stop(); - - /* shutting down twice shouldn't cause any double frees. */ - secp256k1_stop(); + secp256k1_context_destroy(ctx); return 0; } diff --git a/src/sync.cpp b/src/sync.cpp index e28caee8e7..a422939964 100644 --- a/src/sync.cpp +++ b/src/sync.cpp @@ -86,7 +86,6 @@ static void push_lock(void* c, const CLockLocation& locklocation, bool fTry) if (lockstack.get() == NULL) lockstack.reset(new LockStack); - LogPrint("lock", "Locking: %s\n", locklocation.ToString()); dd_mutex.lock(); (*lockstack).push_back(std::make_pair(c, locklocation)); @@ -113,10 +112,6 @@ static void push_lock(void* c, const CLockLocation& locklocation, bool fTry) static void pop_lock() { - if (fDebug) { - const CLockLocation& locklocation = (*lockstack).rbegin()->second; - LogPrint("lock", "Unlocked: %s\n", locklocation.ToString()); - } dd_mutex.lock(); (*lockstack).pop_back(); dd_mutex.unlock(); diff --git a/src/test/Checkpoints_tests.cpp b/src/test/Checkpoints_tests.cpp index c3125d76dc..642ce13bcd 100644 --- a/src/test/Checkpoints_tests.cpp +++ b/src/test/Checkpoints_tests.cpp @@ -10,6 +10,7 @@ #include "uint256.h" #include "test/test_bitcoin.h" +#include "chainparams.h" #include <boost/test/unit_test.hpp> @@ -19,21 +20,22 @@ BOOST_FIXTURE_TEST_SUITE(Checkpoints_tests, BasicTestingSetup) BOOST_AUTO_TEST_CASE(sanity) { + const Checkpoints::CCheckpointData& checkpoints = Params(CBaseChainParams::MAIN).Checkpoints(); uint256 p11111 = uint256S("0x0000000069e244f73d78e8fd29ba2fd2ed618bd6fa2ee92559f542fdb26e7c1d"); uint256 p134444 = uint256S("0x00000000000005b12ffd4cd315cd34ffd4a594f430ac814c91184a0d42d2b0fe"); - BOOST_CHECK(Checkpoints::CheckBlock(11111, p11111)); - BOOST_CHECK(Checkpoints::CheckBlock(134444, p134444)); + BOOST_CHECK(Checkpoints::CheckBlock(checkpoints, 11111, p11111)); + BOOST_CHECK(Checkpoints::CheckBlock(checkpoints, 134444, p134444)); // Wrong hashes at checkpoints should fail: - BOOST_CHECK(!Checkpoints::CheckBlock(11111, p134444)); - BOOST_CHECK(!Checkpoints::CheckBlock(134444, p11111)); + BOOST_CHECK(!Checkpoints::CheckBlock(checkpoints, 11111, p134444)); + BOOST_CHECK(!Checkpoints::CheckBlock(checkpoints, 134444, p11111)); // ... but any hash not at a checkpoint should succeed: - BOOST_CHECK(Checkpoints::CheckBlock(11111+1, p134444)); - BOOST_CHECK(Checkpoints::CheckBlock(134444+1, p11111)); + BOOST_CHECK(Checkpoints::CheckBlock(checkpoints, 11111+1, p134444)); + BOOST_CHECK(Checkpoints::CheckBlock(checkpoints, 134444+1, p11111)); - BOOST_CHECK(Checkpoints::GetTotalBlocksEstimate() >= 134444); + BOOST_CHECK(Checkpoints::GetTotalBlocksEstimate(checkpoints) >= 134444); } BOOST_AUTO_TEST_SUITE_END() diff --git a/src/test/bip32_tests.cpp b/src/test/bip32_tests.cpp index d738851c1f..0d815c27fd 100644 --- a/src/test/bip32_tests.cpp +++ b/src/test/bip32_tests.cpp @@ -8,6 +8,7 @@ #include "key.h" #include "uint256.h" #include "util.h" +#include "utilstrencodings.h" #include "test/test_bitcoin.h" #include <string> diff --git a/src/test/bloom_tests.cpp b/src/test/bloom_tests.cpp index 73a146f05c..1bda8a7ea1 100644 --- a/src/test/bloom_tests.cpp +++ b/src/test/bloom_tests.cpp @@ -8,6 +8,7 @@ #include "clientversion.h" #include "key.h" #include "merkleblock.h" +#include "random.h" #include "serialize.h" #include "streams.h" #include "uint256.h" @@ -459,4 +460,81 @@ BOOST_AUTO_TEST_CASE(merkle_block_4_test_update_none) BOOST_CHECK(!filter.contains(COutPoint(uint256S("0x02981fa052f0481dbc5868f4fc2166035a10f27a03cfd2de67326471df5bc041"), 0))); } +static std::vector<unsigned char> RandomData() +{ + uint256 r = GetRandHash(); + return std::vector<unsigned char>(r.begin(), r.end()); +} + +BOOST_AUTO_TEST_CASE(rolling_bloom) +{ + // last-100-entry, 1% false positive: + CRollingBloomFilter rb1(100, 0.01, 0); + + // Overfill: + static const int DATASIZE=399; + std::vector<unsigned char> data[DATASIZE]; + for (int i = 0; i < DATASIZE; i++) { + data[i] = RandomData(); + rb1.insert(data[i]); + } + // Last 100 guaranteed to be remembered: + for (int i = 299; i < DATASIZE; i++) { + BOOST_CHECK(rb1.contains(data[i])); + } + + // false positive rate is 1%, so we should get about 100 hits if + // testing 10,000 random keys. We get worst-case false positive + // behavior when the filter is as full as possible, which is + // when we've inserted one minus an integer multiple of nElement*2. + unsigned int nHits = 0; + for (int i = 0; i < 10000; i++) { + if (rb1.contains(RandomData())) + ++nHits; + } + // Run test_bitcoin with --log_level=message to see BOOST_TEST_MESSAGEs: + BOOST_TEST_MESSAGE("RollingBloomFilter got " << nHits << " false positives (~100 expected)"); + + // Insanely unlikely to get a fp count outside this range: + BOOST_CHECK(nHits > 25); + BOOST_CHECK(nHits < 175); + + BOOST_CHECK(rb1.contains(data[DATASIZE-1])); + rb1.clear(); + BOOST_CHECK(!rb1.contains(data[DATASIZE-1])); + + // Now roll through data, make sure last 100 entries + // are always remembered: + for (int i = 0; i < DATASIZE; i++) { + if (i >= 100) + BOOST_CHECK(rb1.contains(data[i-100])); + rb1.insert(data[i]); + } + + // Insert 999 more random entries: + for (int i = 0; i < 999; i++) { + rb1.insert(RandomData()); + } + // Sanity check to make sure the filter isn't just filling up: + nHits = 0; + for (int i = 0; i < DATASIZE; i++) { + if (rb1.contains(data[i])) + ++nHits; + } + // Expect about 5 false positives, more than 100 means + // something is definitely broken. + BOOST_TEST_MESSAGE("RollingBloomFilter got " << nHits << " false positives (~5 expected)"); + BOOST_CHECK(nHits < 100); + + // last-1000-entry, 0.01% false positive: + CRollingBloomFilter rb2(1000, 0.001, 0); + for (int i = 0; i < DATASIZE; i++) { + rb2.insert(data[i]); + } + // ... room for all of them: + for (int i = 0; i < DATASIZE; i++) { + BOOST_CHECK(rb2.contains(data[i])); + } +} + BOOST_AUTO_TEST_SUITE_END() diff --git a/src/test/data/script_invalid.json b/src/test/data/script_invalid.json index 271bc70f73..7afa2abf49 100644 --- a/src/test/data/script_invalid.json +++ b/src/test/data/script_invalid.json @@ -141,6 +141,8 @@ ["2 2 0 IF LSHIFT ELSE 1 ENDIF", "NOP", "P2SH,STRICTENC", "LSHIFT disabled"], ["2 2 0 IF RSHIFT ELSE 1 ENDIF", "NOP", "P2SH,STRICTENC", "RSHIFT disabled"], +["", "EQUAL NOT", "P2SH,STRICTENC", "EQUAL must error when there are no stack items"], +["0", "EQUAL NOT", "P2SH,STRICTENC", "EQUAL must error when there are not 2 stack items"], ["0 1","EQUAL", "P2SH,STRICTENC"], ["1 1 ADD", "0 EQUAL", "P2SH,STRICTENC"], ["11 1 ADD 12 SUB", "11 EQUAL", "P2SH,STRICTENC"], @@ -368,6 +370,16 @@ ["NOP", "HASH160 1", "P2SH,STRICTENC"], ["NOP", "HASH256 1", "P2SH,STRICTENC"], +["Increase CHECKSIG and CHECKMULTISIG negative test coverage"], +["", "CHECKSIG NOT", "STRICTENC", "CHECKSIG must error when there are no stack items"], +["0", "CHECKSIG NOT", "STRICTENC", "CHECKSIG must error when there are not 2 stack items"], +["", "CHECKMULTISIG NOT", "STRICTENC", "CHECKMULTISIG must error when there are no stack items"], +["", "-1 CHECKMULTISIG NOT", "STRICTENC", "CHECKMULTISIG must error when the specified number of pubkeys is negative"], +["", "1 CHECKMULTISIG NOT", "STRICTENC", "CHECKMULTISIG must error when there are not enough pubkeys on the stack"], +["", "-1 0 CHECKMULTISIG NOT", "STRICTENC", "CHECKMULTISIG must error when the specified number of signatures is negative"], +["", "1 'pk1' 1 CHECKMULTISIG NOT", "STRICTENC", "CHECKMULTISIG must error when there are not enough signatures on the stack"], +["", "'dummy' 'sig1' 1 'pk1' 1 CHECKMULTISIG IF 1 ENDIF", "", "CHECKMULTISIG must push false to stack when signature is invalid when NOT in strict enc mode"], + ["", "0 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG 0 0 CHECKMULTISIG", "P2SH,STRICTENC", @@ -426,7 +438,7 @@ ["0x4d 0xFF00 0x111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111", "DROP 1", "MINIMALDATA", "PUSHDATA2 of 255 bytes minimally represented by PUSHDATA1"], -["0x4f 0x00100000 0x11111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111", "DROP 1", "MINIMALDATA", +["0x4e 0x00010000 0x11111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111", "DROP 1", "MINIMALDATA", "PUSHDATA4 of 256 bytes minimally represented by PUSHDATA2"], @@ -780,6 +792,12 @@ "P2SH(P2PK) with non-push scriptSig" ], [ + "0 0x47 0x304402205451ce65ad844dbb978b8bdedf5082e33b43cae8279c30f2c74d9e9ee49a94f802203fe95a7ccf74da7a232ee523ef4a53cb4d14bdd16289680cdb97a63819b8f42f01 0x46 0x304402205451ce65ad844dbb978b8bdedf5082e33b43cae8279c30f2c74d9e9ee49a94f802203fe95a7ccf74da7a232ee523ef4a53cb4d14bdd16289680cdb97a63819b8f42f", + "2 0x21 0x02a673638cb9587cb68ea08dbef685c6f2d2a751a8b3c6f2a7e9a4999e6e4bfaf5 0x21 0x02a673638cb9587cb68ea08dbef685c6f2d2a751a8b3c6f2a7e9a4999e6e4bfaf5 0x21 0x02a673638cb9587cb68ea08dbef685c6f2d2a751a8b3c6f2a7e9a4999e6e4bfaf5 3 CHECKMULTISIG", + "P2SH,STRICTENC", + "2-of-3 with one valid and one invalid signature due to parse error, nSigs > validSigs" +], +[ "11 0x47 0x304402200a5c6163f07b8d3b013c4d1d6dba25e780b39658d79ba37af7057a3b7f15ffa102201fd9b4eaa9943f734928b99a83592c2e7bf342ea2680f6a2bb705167966b742001", "0x41 0x0479be667ef9dcbbac55a06295ce870b07029bfcdb2dce28d959f2815b16f81798483ada7726a3c4655da4fbfc0e1108a8fd17b448a68554199c47d08ffb10d4b8 CHECKSIG", "CLEANSTACK,P2SH", diff --git a/src/test/data/script_valid.json b/src/test/data/script_valid.json index 064dde8464..a4e15faeaf 100644 --- a/src/test/data/script_valid.json +++ b/src/test/data/script_valid.json @@ -74,12 +74,14 @@ ["1 1", "VERIFY", "P2SH,STRICTENC"], ["1 0x05 0x01 0x00 0x00 0x00 0x00", "VERIFY", "P2SH,STRICTENC", "values >4 bytes can be cast to boolean"], +["1 0x01 0x80", "IF 0 ENDIF", "P2SH,STRICTENC", "negative 0 is false"], ["10 0 11 TOALTSTACK DROP FROMALTSTACK", "ADD 21 EQUAL", "P2SH,STRICTENC"], ["'gavin_was_here' TOALTSTACK 11 FROMALTSTACK", "'gavin_was_here' EQUALVERIFY 11 EQUAL", "P2SH,STRICTENC"], ["0 IFDUP", "DEPTH 1 EQUALVERIFY 0 EQUAL", "P2SH,STRICTENC"], ["1 IFDUP", "DEPTH 2 EQUALVERIFY 1 EQUALVERIFY 1 EQUAL", "P2SH,STRICTENC"], +["0x05 0x0100000000 IFDUP", "DEPTH 2 EQUALVERIFY 0x05 0x0100000000 EQUAL", "P2SH,STRICTENC", "IFDUP dups non ints"], ["0 DROP", "DEPTH 0 EQUAL", "P2SH,STRICTENC"], ["0", "DUP 1 ADD 1 EQUALVERIFY 0 EQUAL", "P2SH,STRICTENC"], ["0 1", "NIP", "P2SH,STRICTENC"], @@ -408,6 +410,7 @@ ["0 0", "EQUAL", "P2SH,STRICTENC"], ["0 0", "EQUALVERIFY 1", "P2SH,STRICTENC"], +["0 0 1", "EQUAL EQUAL", "P2SH,STRICTENC", "OP_0 and bools must have identical byte representations"], ["0", "1ADD", "P2SH,STRICTENC"], ["2", "1SUB", "P2SH,STRICTENC"], diff --git a/src/test/data/tx_invalid.json b/src/test/data/tx_invalid.json index 456e0d2f7b..31d33c63fb 100644 --- a/src/test/data/tx_invalid.json +++ b/src/test/data/tx_invalid.json @@ -19,6 +19,12 @@ [[["0000000000000000000000000000000000000000000000000000000000000100", 0, "DUP HASH160 0x14 0x5b6462475454710f3c22f5fdf0b40704c92f25c3 EQUALVERIFY CHECKSIGVERIFY 1 0x4c 0x47 0x3044022067288ea50aa799543a536ff9306f8e1cba05b9c6b10951175b924f96732555ed022026d7b5265f38d21541519e4a1e55044d5b9e17e15cdbaf29ae3792e99e883e7a01"]], "01000000010001000000000000000000000000000000000000000000000000000000000000000000006b4c473044022067288ea50aa799543a536ff9306f8e1cba05b9c6b10951175b924f96732555ed022026d7b5265f38d21541519e4a1e55044d5b9e17e15cdbaf29ae3792e99e883e7a012103ba8c8b86dea131c22ab967e6dd99bdae8eff7a1f75a2c35f1f944109e3fe5e22ffffffff010000000000000000015100000000", "P2SH"], +["This is the nearly-standard transaction with CHECKSIGVERIFY 1 instead of CHECKSIG from tx_valid.json"], +["but with the signature duplicated in the scriptPubKey with a different hashtype suffix"], +["See FindAndDelete, which will only remove if the signature, including the hash type, matches"], +[[["0000000000000000000000000000000000000000000000000000000000000100", 0, "DUP HASH160 0x14 0x5b6462475454710f3c22f5fdf0b40704c92f25c3 EQUALVERIFY CHECKSIGVERIFY 1 0x47 0x3044022067288ea50aa799543a536ff9306f8e1cba05b9c6b10951175b924f96732555ed022026d7b5265f38d21541519e4a1e55044d5b9e17e15cdbaf29ae3792e99e883e7a81"]], +"01000000010001000000000000000000000000000000000000000000000000000000000000000000006a473044022067288ea50aa799543a536ff9306f8e1cba05b9c6b10951175b924f96732555ed022026d7b5265f38d21541519e4a1e55044d5b9e17e15cdbaf29ae3792e99e883e7a012103ba8c8b86dea131c22ab967e6dd99bdae8eff7a1f75a2c35f1f944109e3fe5e22ffffffff010000000000000000015100000000", "P2SH"], + ["An invalid P2SH Transaction"], [[["0000000000000000000000000000000000000000000000000000000000000100", 0, "HASH160 0x14 0x7a052c840ba73af26755de42cf01cc9e0a49fef0 EQUAL"]], "010000000100010000000000000000000000000000000000000000000000000000000000000000000009085768617420697320ffffffff010000000000000000015100000000", "P2SH"], diff --git a/src/test/miner_tests.cpp b/src/test/miner_tests.cpp index 6ab9cb8a44..d7ea91607c 100644 --- a/src/test/miner_tests.cpp +++ b/src/test/miner_tests.cpp @@ -59,7 +59,7 @@ BOOST_AUTO_TEST_CASE(CreateNewBlock_validity) uint256 hash; LOCK(cs_main); - Checkpoints::fEnabled = false; + fCheckpointsEnabled = false; // Simple block creation, nothing special yet: BOOST_CHECK(pblocktemplate = CreateNewBlock(scriptPubKey)); @@ -262,7 +262,7 @@ BOOST_AUTO_TEST_CASE(CreateNewBlock_validity) BOOST_FOREACH(CTransaction *tx, txFirst) delete tx; - Checkpoints::fEnabled = true; + fCheckpointsEnabled = true; } BOOST_AUTO_TEST_SUITE_END() diff --git a/src/test/mruset_tests.cpp b/src/test/mruset_tests.cpp index bd4e9c1d38..2b68f8899e 100644 --- a/src/test/mruset_tests.cpp +++ b/src/test/mruset_tests.cpp @@ -17,83 +17,65 @@ using namespace std; -class mrutester -{ -private: - mruset<int> mru; - std::set<int> set; - -public: - mrutester() { mru.max_size(MAX_SIZE); } - int size() const { return set.size(); } - - void insert(int n) - { - mru.insert(n); - set.insert(n); - BOOST_CHECK(mru == set); - } -}; - BOOST_FIXTURE_TEST_SUITE(mruset_tests, BasicTestingSetup) -// Test that an mruset behaves like a set, as long as no more than MAX_SIZE elements are in it -BOOST_AUTO_TEST_CASE(mruset_like_set) -{ - - for (int nTest=0; nTest<NUM_TESTS; nTest++) - { - mrutester tester; - while (tester.size() < MAX_SIZE) - tester.insert(GetRandInt(2 * MAX_SIZE)); - } - -} - -// Test that an mruset's size never exceeds its max_size -BOOST_AUTO_TEST_CASE(mruset_limited_size) +BOOST_AUTO_TEST_CASE(mruset_test) { - for (int nTest=0; nTest<NUM_TESTS; nTest++) - { - mruset<int> mru(MAX_SIZE); - for (int nAction=0; nAction<3*MAX_SIZE; nAction++) - { - int n = GetRandInt(2 * MAX_SIZE); - mru.insert(n); - BOOST_CHECK(mru.size() <= MAX_SIZE); + // The mruset being tested. + mruset<int> mru(5000); + + // Run the test 10 times. + for (int test = 0; test < 10; test++) { + // Reset mru. + mru.clear(); + + // A deque + set to simulate the mruset. + std::deque<int> rep; + std::set<int> all; + + // Insert 10000 random integers below 15000. + for (int j=0; j<10000; j++) { + int add = GetRandInt(15000); + mru.insert(add); + + // Add the number to rep/all as well. + if (all.count(add) == 0) { + all.insert(add); + rep.push_back(add); + if (all.size() == 5001) { + all.erase(rep.front()); + rep.pop_front(); + } + } + + // Do a full comparison between mru and the simulated mru every 1000 and every 5001 elements. + if (j % 1000 == 0 || j % 5001 == 0) { + mruset<int> mru2 = mru; // Also try making a copy + + // Check that all elements that should be in there, are in there. + BOOST_FOREACH(int x, rep) { + BOOST_CHECK(mru.count(x)); + BOOST_CHECK(mru2.count(x)); + } + + // Check that all elements that are in there, should be in there. + BOOST_FOREACH(int x, mru) { + BOOST_CHECK(all.count(x)); + } + + // Check that all elements that are in there, should be in there. + BOOST_FOREACH(int x, mru2) { + BOOST_CHECK(all.count(x)); + } + + for (int t = 0; t < 10; t++) { + int r = GetRandInt(15000); + BOOST_CHECK(all.count(r) == mru.count(r)); + BOOST_CHECK(all.count(r) == mru2.count(r)); + } + } } } } -// 16-bit permutation function -int static permute(int n) -{ - // hexadecimals of pi; verified to be linearly independent - static const int table[16] = {0x243F, 0x6A88, 0x85A3, 0x08D3, 0x1319, 0x8A2E, 0x0370, 0x7344, - 0xA409, 0x3822, 0x299F, 0x31D0, 0x082E, 0xFA98, 0xEC4E, 0x6C89}; - - int ret = 0; - for (int bit=0; bit<16; bit++) - if (n & (1<<bit)) - ret ^= table[bit]; - - return ret; -} - -// Test that an mruset acts like a moving window, if no duplicate elements are added -BOOST_AUTO_TEST_CASE(mruset_window) -{ - mruset<int> mru(MAX_SIZE); - for (int n=0; n<10*MAX_SIZE; n++) - { - mru.insert(permute(n)); - - set<int> tester; - for (int m=max(0,n-MAX_SIZE+1); m<=n; m++) - tester.insert(permute(m)); - - BOOST_CHECK(mru == tester); - } -} - BOOST_AUTO_TEST_SUITE_END() diff --git a/src/test/pow_tests.cpp b/src/test/pow_tests.cpp index 4ce1591c35..a436749287 100644 --- a/src/test/pow_tests.cpp +++ b/src/test/pow_tests.cpp @@ -69,4 +69,28 @@ BOOST_AUTO_TEST_CASE(get_next_work_upper_limit_actual) BOOST_CHECK_EQUAL(CalculateNextWorkRequired(&pindexLast, nLastRetargetTime, params), 0x1d00e1fd); } +BOOST_AUTO_TEST_CASE(GetBlockProofEquivalentTime_test) +{ + SelectParams(CBaseChainParams::MAIN); + const Consensus::Params& params = Params().GetConsensus(); + + std::vector<CBlockIndex> blocks(10000); + for (int i = 0; i < 10000; i++) { + blocks[i].pprev = i ? &blocks[i - 1] : NULL; + blocks[i].nHeight = i; + blocks[i].nTime = 1269211443 + i * params.nPowTargetSpacing; + blocks[i].nBits = 0x207fffff; /* target 0x7fffff000... */ + blocks[i].nChainWork = i ? blocks[i - 1].nChainWork + GetBlockProof(blocks[i - 1]) : arith_uint256(0); + } + + for (int j = 0; j < 1000; j++) { + CBlockIndex *p1 = &blocks[GetRand(10000)]; + CBlockIndex *p2 = &blocks[GetRand(10000)]; + CBlockIndex *p3 = &blocks[GetRand(10000)]; + + int64_t tdiff = GetBlockProofEquivalentTime(*p1, *p2, *p3, params); + BOOST_CHECK_EQUAL(tdiff, p1->GetBlockTime() - p2->GetBlockTime()); + } +} + BOOST_AUTO_TEST_SUITE_END() diff --git a/src/test/test_bitcoin.cpp b/src/test/test_bitcoin.cpp index a2cb78c989..c727303ea1 100644 --- a/src/test/test_bitcoin.cpp +++ b/src/test/test_bitcoin.cpp @@ -6,6 +6,7 @@ #include "test_bitcoin.h" +#include "key.h" #include "main.h" #include "random.h" #include "txdb.h" @@ -20,7 +21,7 @@ #include <boost/test/unit_test.hpp> #include <boost/thread.hpp> -CClientUIInterface uiInterface; +CClientUIInterface uiInterface; // Declared but not defined in ui_interface.h CWallet* pwalletMain; extern bool fPrintToConsole; @@ -28,6 +29,7 @@ extern void noui_connect(); BasicTestingSetup::BasicTestingSetup() { + ECC_Start(); SetupEnvironment(); fPrintToDebugLog = false; // don't want to write to debug.log file fCheckBlockIndex = true; @@ -35,6 +37,7 @@ BasicTestingSetup::BasicTestingSetup() } BasicTestingSetup::~BasicTestingSetup() { + ECC_Stop(); } TestingSetup::TestingSetup() diff --git a/src/txmempool.cpp b/src/txmempool.cpp index 53992b80da..071fa9d52c 100644 --- a/src/txmempool.cpp +++ b/src/txmempool.cpp @@ -6,6 +6,7 @@ #include "txmempool.h" #include "clientversion.h" +#include "consensus/consensus.h" #include "main.h" #include "policy/fees.h" #include "streams.h" diff --git a/src/ui_interface.h b/src/ui_interface.h index 3f11a1ddab..32a92a4b81 100644 --- a/src/ui_interface.h +++ b/src/ui_interface.h @@ -78,9 +78,6 @@ public: /** Progress message during initialization. */ boost::signals2::signal<void (const std::string &message)> InitMessage; - /** Translate a message to the native language of the user. */ - boost::signals2::signal<std::string (const char* psz)> Translate; - /** Number of network connections changed. */ boost::signals2::signal<void (int newNumConnections)> NotifyNumConnectionsChanged; @@ -102,14 +99,4 @@ public: extern CClientUIInterface uiInterface; -/** - * Translation function: Call Translate signal on UI interface, which returns a boost::optional result. - * If no translation slot is registered, nothing is returned, and simply return the input. - */ -inline std::string _(const char* psz) -{ - boost::optional<std::string> rv = uiInterface.Translate(psz); - return rv ? (*rv) : psz; -} - #endif // BITCOIN_UI_INTERFACE_H diff --git a/src/util.cpp b/src/util.cpp index 5fef3a40dd..da5b259aee 100644 --- a/src/util.cpp +++ b/src/util.cpp @@ -7,6 +7,11 @@ #include "config/bitcoin-config.h" #endif +#if (defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__DragonFly__)) +#include <pthread.h> +#include <pthread_np.h> +#endif + #include "util.h" #include "chainparamsbase.h" @@ -104,6 +109,7 @@ string strMiscWarning; bool fLogTimestamps = false; bool fLogIPs = false; volatile bool fReopenDebugLog = false; +CTranslationInterface translationInterface; /** Init OpenSSL library multithreading support */ static CCriticalSection** ppmutexOpenSSL; @@ -707,10 +713,7 @@ void RenameThread(const char* name) #if defined(PR_SET_NAME) // Only the first 15 characters are used (16 - NUL terminator) ::prctl(PR_SET_NAME, name, 0, 0, 0); -#elif 0 && (defined(__FreeBSD__) || defined(__OpenBSD__)) - // TODO: This is currently disabled because it needs to be verified to work - // on FreeBSD or OpenBSD first. When verified the '0 &&' part can be - // removed. +#elif (defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__DragonFly__)) pthread_set_name_np(pthread_self(), name); #elif defined(MAC_OSX) @@ -723,18 +726,20 @@ void RenameThread(const char* name) void SetupEnvironment() { - std::locale loc("C"); // On most POSIX systems (e.g. Linux, but not BSD) the environment's locale // may be invalid, in which case the "C" locale is used as fallback. #if !defined(WIN32) && !defined(MAC_OSX) && !defined(__FreeBSD__) && !defined(__OpenBSD__) try { - loc = std::locale(""); // Raises a runtime error if current locale is invalid + std::locale(""); // Raises a runtime error if current locale is invalid } catch (const std::runtime_error&) { setenv("LC_ALL", "C", 1); } #endif - // The path locale is lazy initialized and to avoid deinitialization errors + // The path locale is lazy initialized and to avoid deinitialization errors // in multithreading environments, it is set explicitly by the main thread. + // A dummy locale is used to extract the internal default locale, used by + // boost::filesystem::path, which is then used to explicitly imbue the path. + std::locale loc = boost::filesystem::path::imbue(std::locale::classic()); boost::filesystem::path::imbue(loc); } diff --git a/src/util.h b/src/util.h index 9b5a4153dd..483d9d7858 100644 --- a/src/util.h +++ b/src/util.h @@ -25,8 +25,17 @@ #include <vector> #include <boost/filesystem/path.hpp> +#include <boost/signals2/signal.hpp> #include <boost/thread/exceptions.hpp> +/** Signals for translation. */ +class CTranslationInterface +{ +public: + /** Translate a message to the native language of the user. */ + boost::signals2::signal<std::string (const char* psz)> Translate; +}; + extern std::map<std::string, std::string> mapArgs; extern std::map<std::string, std::vector<std::string> > mapMultiArgs; extern bool fDebug; @@ -37,6 +46,17 @@ extern std::string strMiscWarning; extern bool fLogTimestamps; extern bool fLogIPs; extern volatile bool fReopenDebugLog; +extern CTranslationInterface translationInterface; + +/** + * Translation function: Call Translate signal on UI interface, which returns a boost::optional result. + * If no translation slot is registered, nothing is returned, and simply return the input. + */ +inline std::string _(const char* psz) +{ + boost::optional<std::string> rv = translationInterface.Translate(psz); + return rv ? (*rv) : psz; +} void SetupEnvironment(); diff --git a/src/utiltime.cpp b/src/utiltime.cpp index 8f0dcae29d..d316288999 100644 --- a/src/utiltime.cpp +++ b/src/utiltime.cpp @@ -30,13 +30,13 @@ void SetMockTime(int64_t nMockTimeIn) int64_t GetTimeMillis() { - return (boost::posix_time::ptime(boost::posix_time::microsec_clock::universal_time()) - + return (boost::posix_time::microsec_clock::universal_time() - boost::posix_time::ptime(boost::gregorian::date(1970,1,1))).total_milliseconds(); } int64_t GetTimeMicros() { - return (boost::posix_time::ptime(boost::posix_time::microsec_clock::universal_time()) - + return (boost::posix_time::microsec_clock::universal_time() - boost::posix_time::ptime(boost::gregorian::date(1970,1,1))).total_microseconds(); } diff --git a/src/wallet/rpcwallet.cpp b/src/wallet/rpcwallet.cpp index e03cd5b84e..dd5240e3c0 100644 --- a/src/wallet/rpcwallet.cpp +++ b/src/wallet/rpcwallet.cpp @@ -2301,7 +2301,7 @@ Value listunspent(const Array& params, bool fHelp) vector<COutput> vecOutputs; assert(pwalletMain != NULL); LOCK2(cs_main, pwalletMain->cs_wallet); - pwalletMain->AvailableCoins(vecOutputs, false); + pwalletMain->AvailableCoins(vecOutputs, false, NULL, true); BOOST_FOREACH(const COutput& out, vecOutputs) { if (out.nDepth < nMinDepth || out.nDepth > nMaxDepth) continue; @@ -2330,7 +2330,7 @@ Value listunspent(const Array& params, bool fHelp) if (pk.IsPayToScriptHash()) { CTxDestination address; if (ExtractDestination(pk, address)) { - const CScriptID& hash = boost::get<const CScriptID&>(address); + const CScriptID& hash = boost::get<CScriptID>(address); CScript redeemScript; if (pwalletMain->GetCScript(hash, redeemScript)) entry.push_back(Pair("redeemScript", HexStr(redeemScript.begin(), redeemScript.end()))); diff --git a/src/wallet/wallet.cpp b/src/wallet/wallet.cpp index 0d40469393..0afdcd0011 100644 --- a/src/wallet/wallet.cpp +++ b/src/wallet/wallet.cpp @@ -8,6 +8,7 @@ #include "base58.h" #include "checkpoints.h" #include "coincontrol.h" +#include "consensus/consensus.h" #include "main.h" #include "net.h" #include "script/script.h" @@ -34,8 +35,8 @@ bool bSpendZeroConfChange = true; bool fSendFreeTransactions = false; bool fPayAtLeastCustomFee = true; -/** - * Fees smaller than this (in satoshi) are considered zero fee (for transaction creation) +/** + * Fees smaller than this (in satoshi) are considered zero fee (for transaction creation) * Override with -mintxfee */ CFeeRate CWallet::minTxFee = CFeeRate(1000); @@ -528,7 +529,7 @@ bool CWallet::EncryptWallet(const SecureString& strWalletPassphrase) delete pwalletdbEncryption; } // We now probably have half of our keys encrypted in memory, and half not... - // die and let the user reload their unencrypted wallet. + // die and let the user reload the unencrypted wallet. assert(false); } @@ -540,7 +541,7 @@ bool CWallet::EncryptWallet(const SecureString& strWalletPassphrase) if (!pwalletdbEncryption->TxnCommit()) { delete pwalletdbEncryption; // We now have keys encrypted in memory, but not on disk... - // die to avoid confusion and let the user reload their unencrypted wallet. + // die to avoid confusion and let the user reload the unencrypted wallet. assert(false); } @@ -1058,6 +1059,7 @@ int CWallet::ScanForWalletTransactions(CBlockIndex* pindexStart, bool fUpdate) { int ret = 0; int64_t nNow = GetTime(); + const CChainParams& chainParams = Params(); CBlockIndex* pindex = pindexStart; { @@ -1069,12 +1071,12 @@ int CWallet::ScanForWalletTransactions(CBlockIndex* pindexStart, bool fUpdate) pindex = chainActive.Next(pindex); ShowProgress(_("Rescanning..."), 0); // show rescan progress in GUI as dialog or on splashscreen, if -rescan on startup - double dProgressStart = Checkpoints::GuessVerificationProgress(pindex, false); - double dProgressTip = Checkpoints::GuessVerificationProgress(chainActive.Tip(), false); + double dProgressStart = Checkpoints::GuessVerificationProgress(chainParams.Checkpoints(), pindex, false); + double dProgressTip = Checkpoints::GuessVerificationProgress(chainParams.Checkpoints(), chainActive.Tip(), false); while (pindex) { if (pindex->nHeight % 100 == 0 && dProgressTip - dProgressStart > 0.0) - ShowProgress(_("Rescanning..."), std::max(1, std::min(99, (int)((Checkpoints::GuessVerificationProgress(pindex, false) - dProgressStart) / (dProgressTip - dProgressStart) * 100)))); + ShowProgress(_("Rescanning..."), std::max(1, std::min(99, (int)((Checkpoints::GuessVerificationProgress(chainParams.Checkpoints(), pindex, false) - dProgressStart) / (dProgressTip - dProgressStart) * 100)))); CBlock block; ReadBlockFromDisk(block, pindex); @@ -1086,7 +1088,7 @@ int CWallet::ScanForWalletTransactions(CBlockIndex* pindexStart, bool fUpdate) pindex = chainActive.Next(pindex); if (GetTime() >= nNow + 60) { nNow = GetTime(); - LogPrintf("Still rescanning. At block %d. Progress=%f\n", pindex->nHeight, Checkpoints::GuessVerificationProgress(pindex)); + LogPrintf("Still rescanning. At block %d. Progress=%f\n", pindex->nHeight, Checkpoints::GuessVerificationProgress(chainParams.Checkpoints(), pindex)); } } ShowProgress(_("Rescanning..."), 100); // hide progress dialog in GUI @@ -1096,10 +1098,13 @@ int CWallet::ScanForWalletTransactions(CBlockIndex* pindexStart, bool fUpdate) void CWallet::ReacceptWalletTransactions() { - // If transcations aren't broadcasted, don't let them into local mempool either + // If transactions aren't being broadcasted, don't let them into local mempool either if (!fBroadcastTransactions) return; LOCK2(cs_main, cs_wallet); + std::map<int64_t, CWalletTx*> mapSorted; + + // Sort pending wallet transactions based on their initial wallet insertion order BOOST_FOREACH(PAIRTYPE(const uint256, CWalletTx)& item, mapWallet) { const uint256& wtxid = item.first; @@ -1108,13 +1113,19 @@ void CWallet::ReacceptWalletTransactions() int nDepth = wtx.GetDepthInMainChain(); - if (!wtx.IsCoinBase() && nDepth < 0) - { - // Try to add to memory pool - LOCK(mempool.cs); - wtx.AcceptToMemoryPool(false); + if (!wtx.IsCoinBase() && nDepth < 0) { + mapSorted.insert(std::make_pair(wtx.nOrderPos, &wtx)); } } + + // Try to add wallet transactions to memory pool + BOOST_FOREACH(PAIRTYPE(const int64_t, CWalletTx*)& item, mapSorted) + { + CWalletTx& wtx = *(item.second); + + LOCK(mempool.cs); + wtx.AcceptToMemoryPool(false); + } } bool CWalletTx::RelayWalletTransaction() @@ -1481,7 +1492,7 @@ CAmount CWallet::GetImmatureWatchOnlyBalance() const /** * populate vCoins with vector of available COutputs. */ -void CWallet::AvailableCoins(vector<COutput>& vCoins, bool fOnlyConfirmed, const CCoinControl *coinControl) const +void CWallet::AvailableCoins(vector<COutput>& vCoins, bool fOnlyConfirmed, const CCoinControl *coinControl, bool fIncludeZeroValue) const { vCoins.clear(); @@ -1508,7 +1519,7 @@ void CWallet::AvailableCoins(vector<COutput>& vCoins, bool fOnlyConfirmed, const for (unsigned int i = 0; i < pcoin->vout.size(); i++) { isminetype mine = IsMine(pcoin->vout[i]); if (!(IsSpent(wtxid, i)) && mine != ISMINE_NO && - !IsLockedCoin((*it).first, i) && pcoin->vout[i].nValue > 0 && + !IsLockedCoin((*it).first, i) && (pcoin->vout[i].nValue > 0 || fIncludeZeroValue) && (!coinControl || !coinControl->HasSelected() || coinControl->IsSelected((*it).first, i))) vCoins.push_back(COutput(pcoin, i, nDepth, (mine & ISMINE_SPENDABLE) != ISMINE_NO)); } diff --git a/src/wallet/wallet.h b/src/wallet/wallet.h index 10969efee6..1c900b0315 100644 --- a/src/wallet/wallet.h +++ b/src/wallet/wallet.h @@ -540,7 +540,7 @@ public: //! check whether we are allowed to upgrade (or already support) to the named feature bool CanSupportFeature(enum WalletFeature wf) { AssertLockHeld(cs_wallet); return nWalletMaxVersion >= wf; } - void AvailableCoins(std::vector<COutput>& vCoins, bool fOnlyConfirmed=true, const CCoinControl *coinControl = NULL) const; + void AvailableCoins(std::vector<COutput>& vCoins, bool fOnlyConfirmed=true, const CCoinControl *coinControl = NULL, bool fIncludeZeroValue=false) const; bool SelectCoinsMinConf(const CAmount& nTargetValue, int nConfMine, int nConfTheirs, std::vector<COutput> vCoins, std::set<std::pair<const CWalletTx*,unsigned int> >& setCoinsRet, CAmount& nValueRet) const; bool IsSpent(const uint256& hash, unsigned int n) const; |