diff options
95 files changed, 9844 insertions, 9503 deletions
@@ -69,3 +69,15 @@ for the build/test scripts. Large changes should have a test plan, and should be tested by somebody other than the developer who wrote the code. See https://github.com/bitcoin/QA/ for how to create a test plan. + +Translations +------------ + +Changes to translations as well as new translations can be submitted to +[Bitcoin Core's Transifex page](https://www.transifex.com/projects/p/bitcoin/). + +Periodically the translations are pulled from Transifex and merged into the git repository. See the +[translation process](doc/translation_process.md) for details on how this works. + +**Important**: We do not accept translation changes as github pull request because the next +pull from Transifex would automatically overwrite them again. diff --git a/configure.ac b/configure.ac index 45cd023bb1..3e508571e9 100644 --- a/configure.ac +++ b/configure.ac @@ -108,6 +108,12 @@ AC_ARG_ENABLE([lcov], [use_lcov=yes], [use_lcov=no]) +AC_ARG_ENABLE([glibc-back-compat], + [AS_HELP_STRING([--enable-glibc-back-compat], + [enable backwards compatibility with glibc and libstdc++])], + [use_glibc_compat=$enableval], + [use_glibc_compat=no]) + AC_ARG_WITH([protoc-bindir],[AS_HELP_STRING([--with-protoc-bindir=BIN_DIR],[specify protoc bin path])], [protoc_bin_path=$withval], []) @@ -319,6 +325,21 @@ fi AX_CHECK_LINK_FLAG([[-Wl,--large-address-aware]], [LDFLAGS="$LDFLAGS -Wl,--large-address-aware"]) +if test x$use_glibc_compat != xno; then + + #__fdelt_chk's params and return type have changed from long unsigned int to long int. + # See which one is present here. + AC_MSG_CHECKING(__fdelt_chk type) + AC_TRY_COMPILE([#define __USE_FORTIFY_LEVEL 2 + #include <sys/select.h> + extern "C" long unsigned int __fdelt_warn(long unsigned int);],[], + [ fdelt_type="long unsigned int"], + [ fdelt_type="long int"]) + AC_MSG_RESULT($fdelt_type) + AC_DEFINE_UNQUOTED(FDELT_TYPE, $fdelt_type,[parameter and return value type for __fdelt_chk]) + +fi + if test x$use_hardening != xno; then AX_CHECK_COMPILE_FLAG([-Wstack-protector],[HARDENED_CXXFLAGS="$HARDENED_CXXFLAGS -Wstack-protector"]) AX_CHECK_COMPILE_FLAG([-fstack-protector-all],[HARDENED_CXXFLAGS="$HARDENED_CXXFLAGS -fstack-protector-all"]) @@ -691,6 +712,7 @@ AM_CONDITIONAL([USE_QRCODE], [test x$use_qr = xyes]) AM_CONDITIONAL([USE_LCOV],[test x$use_lcov == xyes]) AM_CONDITIONAL([USE_COMPARISON_TOOL],[test x$use_comparison_tool != xno]) AM_CONDITIONAL([USE_COMPARISON_TOOL_REORG_TESTS],[test x$use_comparison_tool_reorg_test != xno]) +AM_CONDITIONAL([GLIBC_BACK_COMPAT],[test x$use_glibc_compat = xyes]) AC_DEFINE(CLIENT_VERSION_MAJOR, _CLIENT_VERSION_MAJOR, [Major version]) AC_DEFINE(CLIENT_VERSION_MINOR, _CLIENT_VERSION_MINOR, [Minor version]) diff --git a/contrib/README.md b/contrib/README.md index cd0dd3b023..92d0a343db 100644 --- a/contrib/README.md +++ b/contrib/README.md @@ -1,22 +1,36 @@ -Python Tools +Wallet Tools --------------------- ### [BitRPC](/contrib/bitrpc) ### Allows for sending of all standard Bitcoin commands via RPC rather than as command line args. +### [SpendFrom](/contrib/spendfrom) ### + +Use the raw transactions API to send coins received on a particular +address (or addresses). + +Repository Tools +--------------------- + +### [Developer tools](/contrib/devtools) ### +Specific tools for developers working on this repository. +Contains the script `github-merge.sh` for merging github pull requests securely and signing them using GPG. + +### [Linearize](/contrib/linearize) ### +Construct a linear, no-fork, best version of the blockchain. + ### [PyMiner](/contrib/pyminer) ### This is a 'getwork' CPU mining client for Bitcoin. It is pure-python, and therefore very, very slow. The purpose is to provide a reference implementation of a miner, for study. -### [SpendFrom](/contrib/spendfrom) ### +### [Qos](/contrib/qos) ### -Use the raw transactions API to send coins received on a particular -address (or addresses). +A Linux bash script that will set up tc to limit the outgoing bandwidth for connections to the Bitcoin network. This means one can have an always-on bitcoind instance running, and another local bitcoind/bitcoin-qt instance which connects to this node and receives blocks from it. -### WalletTools -Removed. Please see [/contrib/bitrpc](/contrib/bitrpc). +### [Seeds](/contrib/seeds) ### +Utility to generate the pnSeed[] array that is compiled into the client. -Repository Tools +Build Tools and Keys --------------------- ### [Debian](/contrib/debian) ### @@ -29,18 +43,11 @@ Gavin's notes on getting gitian builds up and running using KVM. ### [Gitian-downloader](/contrib/gitian-downloader) Various PGP files of core developers. -### [Linearize](/contrib/linearize) ### -Construct a linear, no-fork, best version of the blockchain. - ### [MacDeploy](/contrib/macdeploy) ### Scripts and notes for Mac builds. -### [Qos](/contrib/qos) ### - -A Linux bash script that will set up tc to limit the outgoing bandwidth for connections to the Bitcoin network. This means one can have an always-on bitcoind instance running, and another local bitcoind/bitcoin-qt instance which connects to this node and receives blocks from it. - -### [Seeds](/contrib/seeds) ### -Utility to generate the pnSeed[] array that is compiled into the client. +Test and Verify Tools +--------------------- ### [TestGen](/contrib/testgen) ### Utilities to generate test vectors for the data-driven Bitcoin tests. @@ -51,8 +58,3 @@ tests each pull and when master is tested using jenkins. ### [Verify SF Binaries](/contrib/verifysfbinaries) ### This script attempts to download and verify the signature file SHA256SUMS.asc from SourceForge. - -### [Developer tools](/contrib/devtools) ### -Specific tools for developers working on this repository. -Contains the script `github-merge.sh` for merging github pull requests securely and signing them using GPG. - diff --git a/contrib/bitrpc/bitrpc.py b/contrib/bitrpc/bitrpc.py index a840bc2020..a84d7e34dd 100644 --- a/contrib/bitrpc/bitrpc.py +++ b/contrib/bitrpc/bitrpc.py @@ -1,6 +1,7 @@ from jsonrpc import ServiceProxy import sys import string +import getpass # ===== BEGIN USER SETTINGS ===== # if you do not set these you will be prompted for a password for every command @@ -302,7 +303,7 @@ elif cmd == "validateaddress": elif cmd == "walletpassphrase": try: - pwd = raw_input("Enter wallet passphrase: ") + pwd = getpass.getpass(prompt="Enter wallet passphrase: ") access.walletpassphrase(pwd, 60) print "\n---Wallet unlocked---\n" except: @@ -310,8 +311,8 @@ elif cmd == "walletpassphrase": elif cmd == "walletpassphrasechange": try: - pwd = raw_input("Enter old wallet passphrase: ") - pwd2 = raw_input("Enter new wallet passphrase: ") + pwd = getpass.getpass(prompt="Enter old wallet passphrase: ") + pwd2 = getpass.getpass(prompt="Enter new wallet passphrase: ") access.walletpassphrasechange(pwd, pwd2) print print "\n---Passphrase changed---\n" diff --git a/contrib/debian/bitcoin-qt.install b/contrib/debian/bitcoin-qt.install index 59cacb0e96..e0b32373be 100644 --- a/contrib/debian/bitcoin-qt.install +++ b/contrib/debian/bitcoin-qt.install @@ -1,4 +1,4 @@ -bitcoin-qt usr/bin +usr/local/bin/bitcoin-qt usr/bin share/pixmaps/bitcoin32.xpm usr/share/pixmaps share/pixmaps/bitcoin16.xpm usr/share/pixmaps share/pixmaps/bitcoin128.png usr/share/pixmaps diff --git a/contrib/debian/bitcoind.install b/contrib/debian/bitcoind.install index 7bf746006c..798ea851f6 100644 --- a/contrib/debian/bitcoind.install +++ b/contrib/debian/bitcoind.install @@ -1 +1,2 @@ -src/bitcoind usr/bin +usr/local/bin/bitcoind usr/bin +usr/local/bin/bitcoin-cli usr/bin diff --git a/contrib/debian/changelog b/contrib/debian/changelog index 95b9ad31a3..4f22567f85 100644 --- a/contrib/debian/changelog +++ b/contrib/debian/changelog @@ -1,3 +1,16 @@ +bitcoin (0.9.1-precise1) precise; urgency=medium + + * New upstream release. + * Backport pull #4019 + + -- Matt Corallo <matt@bluematt.me> Sat, 19 Apr 2014 17:29:00 -0400 + +bitcoin (0.9.0-precise1) precise; urgency=medium + + * New upstream release. + + -- Matt Corallo <matt@bluematt.me> Thu, 20 Mar 2014 13:10:00 -0400 + bitcoin (0.8.6-precise1) precise; urgency=medium * New upstream release. diff --git a/contrib/debian/control b/contrib/debian/control index dd167ef53d..9e006a7070 100644 --- a/contrib/debian/control +++ b/contrib/debian/control @@ -5,6 +5,7 @@ Maintainer: Jonas Smedegaard <dr@jones.dk> Uploaders: Micah Anderson <micah@debian.org> Build-Depends: debhelper, devscripts, + automake, bash-completion, libboost-system-dev (>> 1.35) | libboost-system1.35-dev, libdb4.8++-dev, @@ -17,7 +18,8 @@ Build-Depends: debhelper, libboost-test-dev (>> 1.35) | libboost-test1.35-dev, qt4-qmake, libqt4-dev, - libqrencode-dev + libqrencode-dev, + libprotobuf-dev, protobuf-compiler Standards-Version: 3.9.2 Homepage: http://www.bitcoin.org/ Vcs-Git: git://github.com/bitcoin/bitcoin.git @@ -34,7 +36,7 @@ Description: peer-to-peer network based digital currency - daemon check for double-spending. . Full transaction history is stored locally at each client. This - requires 2+ GB of space, slowly growing. + requires 20+ GB of space, slowly growing. . This package provides bitcoind, a combined daemon and CLI tool to interact with the daemon. @@ -50,6 +52,6 @@ Description: peer-to-peer network based digital currency - Qt GUI check for double-spending. . Full transaction history is stored locally at each client. This - requires 2+ GB of space, slowly growing. + requires 20+ GB of space, slowly growing. . This package provides Bitcoin-Qt, a GUI for Bitcoin based on Qt. diff --git a/contrib/debian/rules b/contrib/debian/rules index 98bb2bba1c..52b357cf01 100755 --- a/contrib/debian/rules +++ b/contrib/debian/rules @@ -11,23 +11,14 @@ DEB_INSTALL_MANPAGES_bitcoind += debian/manpages/* %: dh --with bash-completion $@ -override_dh_auto_build: - cd src; $(MAKE) -f makefile.unix bitcoind - $(MAKE) - override_dh_auto_clean: - if [ -f Makefile ]; then $(MAKE) clean; else rm -rf build/; rm -f bitcoin-qt; fi - cd src; $(MAKE) -f makefile.unix clean + if [ -f Makefile ]; then $(MAKE) distclean; fi + rm -rf Makefile.in aclocal.m4 configure src/Makefile.in src/bitcoin-config.h.in src/build-aux src/qt/Makefile.in src/qt/test/Makefile.in src/test/Makefile.in +# Yea, autogen should be run on the source archive, but I like doing git archive override_dh_auto_configure: - qmake bitcoin-qt.pro USE_QRCODE=1 + ./autogen.sh + ./configure override_dh_auto_test: - cd src; $(MAKE) -f makefile.unix test_bitcoin - src/test_bitcoin - -# Ensure wrapper is set executable -binary-post-install/bitcoind: - chmod +x $(cdbs_curdestdir)usr/bin/bitcoind -binary-post-install/bitcoin-qt: - chmod +x $(cdbs_curdestdir)usr/bin/bitcoin-qt + make check diff --git a/contrib/devtools/README.md b/contrib/devtools/README.md index f0d25fd7a2..697a714a47 100644 --- a/contrib/devtools/README.md +++ b/contrib/devtools/README.md @@ -3,7 +3,7 @@ Contents This directory contains tools for developers working on this repository. github-merge.sh ----------------- +================== A small script to automate merging pull-requests securely and sign them with GPG. @@ -36,7 +36,8 @@ Configuring the github-merge tool for the bitcoin repository is done in the foll git config githubmerge.testcmd "make -j4 check" (adapt to whatever you want to use for testing) git config --global user.signingkey mykeyid (if you want to GPG sign) -## fix-copyright-headers.py +fix-copyright-headers.py +=========================== Every year newly updated files need to have its copyright headers updated to reflect the current year. If you run this script from src/ it will automatically update the year on the copyright header for all @@ -46,4 +47,25 @@ For example a file changed in 2014 (with 2014 being the current year): ```// Copyright (c) 2009-2013 The Bitcoin developers``` would be changed to: -```// Copyright (c) 2009-2014 The Bitcoin developers```
\ No newline at end of file +```// Copyright (c) 2009-2014 The Bitcoin developers``` + +symbol-check.py +================== + +A script to check that the (Linux) executables produced by gitian only contain +allowed gcc, glibc and libstdc++ version symbols. This makes sure they are +still compatible with the minimum supported Linux distribution versions. + +Example usage after a gitian build: + + find ../gitian-builder/build -type f -executable | xargs python contrib/devtools/symbol-check.py + +If only supported symbols are used the return value will be 0 and the output will be empty. + +If there are 'unsupported' symbols, the return value will be 1 a list like this will be printed: + + .../64/test_bitcoin: symbol memcpy from unsupported version GLIBC_2.14 + .../64/test_bitcoin: symbol __fdelt_chk from unsupported version GLIBC_2.15 + .../64/test_bitcoin: symbol std::out_of_range::~out_of_range() from unsupported version GLIBCXX_3.4.15 + .../64/test_bitcoin: symbol _ZNSt8__detail15_List_nod from unsupported version GLIBCXX_3.4.15 + diff --git a/contrib/devtools/symbol-check.py b/contrib/devtools/symbol-check.py new file mode 100755 index 0000000000..4f6a18da2d --- /dev/null +++ b/contrib/devtools/symbol-check.py @@ -0,0 +1,108 @@ +#!/usr/bin/python +# Copyright (c) 2014 Wladimir J. van der Laan +# Distributed under the MIT/X11 software license, see the accompanying +# file COPYING or http://www.opensource.org/licenses/mit-license.php. +''' +A script to check that the (Linux) executables produced by gitian only contain +allowed gcc, glibc and libstdc++ version symbols. This makes sure they are +still compatible with the minimum supported Linux distribution versions. + +Example usage: + + find ../gitian-builder/build -type f -executable | xargs python contrib/devtools/symbol-check.py +''' +from __future__ import division, print_function +import subprocess +import re +import sys + +# Debian 6.0.9 (Squeeze) has: +# +# - g++ version 4.4.5 (https://packages.debian.org/search?suite=default§ion=all&arch=any&searchon=names&keywords=g%2B%2B) +# - libc version 2.11.3 (https://packages.debian.org/search?suite=default§ion=all&arch=any&searchon=names&keywords=libc6) +# - libstdc++ version 4.4.5 (https://packages.debian.org/search?suite=default§ion=all&arch=any&searchon=names&keywords=libstdc%2B%2B6) +# +# Ubuntu 10.04.4 (Lucid Lynx) has: +# +# - g++ version 4.4.3 (http://packages.ubuntu.com/search?keywords=g%2B%2B&searchon=names&suite=lucid§ion=all) +# - libc version 2.11.1 (http://packages.ubuntu.com/search?keywords=libc6&searchon=names&suite=lucid§ion=all) +# - libstdc++ version 4.4.3 (http://packages.ubuntu.com/search?suite=lucid§ion=all&arch=any&keywords=libstdc%2B%2B&searchon=names) +# +# Taking the minimum of these as our target. +# +# According to GNU ABI document (http://gcc.gnu.org/onlinedocs/libstdc++/manual/abi.html) this corresponds to: +# GCC 4.4.0: GCC_4.4.0 +# GCC 4.4.2: GLIBCXX_3.4.13, CXXABI_1.3.3 +# (glibc) GLIBC_2_11 +# +MAX_VERSIONS = { +'GCC': (4,4,0), +'CXXABI': (1,3,3), +'GLIBCXX': (3,4,13), +'GLIBC': (2,11) +} +READELF_CMD = '/usr/bin/readelf' +CPPFILT_CMD = '/usr/bin/c++filt' + +class CPPFilt(object): + ''' + Demangle C++ symbol names. + + Use a pipe to the 'c++filt' command. + ''' + def __init__(self): + self.proc = subprocess.Popen(CPPFILT_CMD, stdin=subprocess.PIPE, stdout=subprocess.PIPE) + + def __call__(self, mangled): + self.proc.stdin.write(mangled + '\n') + return self.proc.stdout.readline().rstrip() + + def close(self): + self.proc.stdin.close() + self.proc.stdout.close() + self.proc.wait() + +def read_symbols(executable, imports=True): + ''' + Parse an ELF executable and return a list of (symbol,version) tuples + for dynamic, imported symbols. + ''' + p = subprocess.Popen([READELF_CMD, '--dyn-syms', '-W', executable], stdout=subprocess.PIPE, stderr=subprocess.PIPE, stdin=subprocess.PIPE) + (stdout, stderr) = p.communicate() + if p.returncode: + raise IOError('Could not read symbols for %s: %s' % (executable, stderr.strip())) + syms = [] + for line in stdout.split('\n'): + line = line.split() + if len(line)>7 and re.match('[0-9]+:$', line[0]): + (sym, _, version) = line[7].partition('@') + is_import = line[6] == 'UND' + if version.startswith('@'): + version = version[1:] + if is_import == imports: + syms.append((sym, version)) + return syms + +def check_version(max_versions, version): + if '_' in version: + (lib, _, ver) = version.rpartition('_') + else: + lib = version + ver = '0' + ver = tuple([int(x) for x in ver.split('.')]) + if not lib in max_versions: + return False + return ver <= max_versions[lib] + +if __name__ == '__main__': + cppfilt = CPPFilt() + retval = 0 + for filename in sys.argv[1:]: + for sym,version in read_symbols(filename, True): + if version and not check_version(MAX_VERSIONS, version): + print('%s: symbol %s from unsupported version %s' % (filename, cppfilt(sym), version)) + retval = 1 + + exit(retval) + + diff --git a/contrib/gitian-descriptors/deps-linux.yml b/contrib/gitian-descriptors/deps-linux.yml index 74c1624569..af10461b83 100644 --- a/contrib/gitian-descriptors/deps-linux.yml +++ b/contrib/gitian-descriptors/deps-linux.yml @@ -17,7 +17,7 @@ reference_datetime: "2013-06-01 00:00:00" remotes: [] files: - "openssl-1.0.1g.tar.gz" -- "miniupnpc-1.8.tar.gz" +- "miniupnpc-1.9.tar.gz" - "qrencode-3.4.3.tar.bz2" - "protobuf-2.5.0.tar.bz2" - "db-4.8.30.NC.tar.gz" @@ -31,7 +31,7 @@ script: | export LIBRARY_PATH="$STAGING/lib" # Integrity Check echo "53cb818c3b90e507a8348f4f5eaedb05d8bfe5358aabb508b7263cc670c3e028 openssl-1.0.1g.tar.gz" | sha256sum -c - echo "bc5f73c7b0056252c1888a80e6075787a1e1e9112b808f863a245483ff79859c miniupnpc-1.8.tar.gz" | sha256sum -c + echo "2923e453e880bb949e3d4da9f83dd3cb6f08946d35de0b864d0339cf70934464 miniupnpc-1.9.tar.gz" | sha256sum -c echo "dfd71487513c871bad485806bfd1fdb304dedc84d2b01a8fb8e0940b50597a98 qrencode-3.4.3.tar.bz2" | sha256sum -c echo "13bfc5ae543cf3aa180ac2485c0bc89495e3ae711fc6fab4f8ffe90dfb4bb677 protobuf-2.5.0.tar.bz2" | sha256sum -c echo "12edc0df75bf9abd7f82f821795bcee50f42cb2e5f76a6a281b85732798364ef db-4.8.30.NC.tar.gz" | sha256sum -c @@ -46,8 +46,8 @@ script: | make install_sw cd .. # - tar xzfm miniupnpc-1.8.tar.gz - cd miniupnpc-1.8 + tar xzfm miniupnpc-1.9.tar.gz + cd miniupnpc-1.9 # miniupnpc is always built with -fPIC INSTALLPREFIX=$STAGING make $MAKEOPTS install rm -f $STAGING/lib/libminiupnpc.so* # no way to skip shared lib build @@ -95,4 +95,4 @@ script: | done # cd $STAGING - find include lib bin host | sort | zip -X@ $OUTDIR/bitcoin-deps-linux${GBUILD_BITS}-gitian-r4.zip + find include lib bin host | sort | zip -X@ $OUTDIR/bitcoin-deps-linux${GBUILD_BITS}-gitian-r5.zip diff --git a/contrib/gitian-descriptors/deps-win.yml b/contrib/gitian-descriptors/deps-win.yml index b18d0f031c..17ac413d80 100644 --- a/contrib/gitian-descriptors/deps-win.yml +++ b/contrib/gitian-descriptors/deps-win.yml @@ -16,7 +16,7 @@ remotes: [] files: - "openssl-1.0.1g.tar.gz" - "db-4.8.30.NC.tar.gz" -- "miniupnpc-1.8.tar.gz" +- "miniupnpc-1.9.tar.gz" - "zlib-1.2.8.tar.gz" - "libpng-1.6.8.tar.gz" - "qrencode-3.4.3.tar.bz2" @@ -30,7 +30,7 @@ script: | # Input Integrity Check echo "53cb818c3b90e507a8348f4f5eaedb05d8bfe5358aabb508b7263cc670c3e028 openssl-1.0.1g.tar.gz" | sha256sum -c echo "12edc0df75bf9abd7f82f821795bcee50f42cb2e5f76a6a281b85732798364ef db-4.8.30.NC.tar.gz" | sha256sum -c - echo "bc5f73c7b0056252c1888a80e6075787a1e1e9112b808f863a245483ff79859c miniupnpc-1.8.tar.gz" | sha256sum -c + echo "2923e453e880bb949e3d4da9f83dd3cb6f08946d35de0b864d0339cf70934464 miniupnpc-1.9.tar.gz" | sha256sum -c echo "36658cb768a54c1d4dec43c3116c27ed893e88b02ecfcb44f2166f9c0b7f2a0d zlib-1.2.8.tar.gz" | sha256sum -c echo "32c7acf1608b9c8b71b743b9780adb7a7b347563dbfb4a5263761056da44cc96 libpng-1.6.8.tar.gz" | sha256sum -c echo "dfd71487513c871bad485806bfd1fdb304dedc84d2b01a8fb8e0940b50597a98 qrencode-3.4.3.tar.bz2" | sha256sum -c @@ -67,11 +67,11 @@ script: | make install_lib install_include cd ../.. # - tar xzf $INDIR/miniupnpc-1.8.tar.gz - cd miniupnpc-1.8 + tar xzf $INDIR/miniupnpc-1.9.tar.gz + cd miniupnpc-1.9 echo " - --- miniupnpc-1.8/Makefile.mingw.orig 2013-09-29 18:52:51.014087958 -1000 - +++ miniupnpc-1.8/Makefile.mingw 2013-09-29 19:09:29.663318691 -1000 + --- miniupnpc-1.9/Makefile.mingw.orig 2013-09-29 18:52:51.014087958 -1000 + +++ miniupnpc-1.9/Makefile.mingw 2013-09-29 19:09:29.663318691 -1000 @@ -67,8 +67,8 @@ wingenminiupnpcstrings.o: wingenminiupnpcstrings.c @@ -124,5 +124,5 @@ script: | done # cd $INSTALLPREFIX - find include lib | sort | zip -X@ $OUTDIR/bitcoin-deps-win$BITS-gitian-r11.zip + find include lib | sort | zip -X@ $OUTDIR/bitcoin-deps-win$BITS-gitian-r12.zip done # for BITS in diff --git a/contrib/gitian-descriptors/gitian-linux.yml b/contrib/gitian-descriptors/gitian-linux.yml index 3c25b793d0..1747f531ea 100644 --- a/contrib/gitian-descriptors/gitian-linux.yml +++ b/contrib/gitian-descriptors/gitian-linux.yml @@ -21,8 +21,8 @@ remotes: - "url": "https://github.com/bitcoin/bitcoin.git" "dir": "bitcoin" files: -- "bitcoin-deps-linux32-gitian-r4.zip" -- "bitcoin-deps-linux64-gitian-r4.zip" +- "bitcoin-deps-linux32-gitian-r5.zip" +- "bitcoin-deps-linux64-gitian-r5.zip" - "boost-linux32-1.55.0-gitian-r1.zip" - "boost-linux64-1.55.0-gitian-r1.zip" script: | @@ -36,12 +36,12 @@ script: | # mkdir -p $STAGING cd $STAGING - unzip ../build/bitcoin-deps-linux${GBUILD_BITS}-gitian-r4.zip + unzip ../build/bitcoin-deps-linux${GBUILD_BITS}-gitian-r5.zip unzip ../build/boost-linux${GBUILD_BITS}-1.55.0-gitian-r1.zip cd ../build function do_configure { - ./configure "$@" --enable-upnp-default --prefix=$STAGING --with-protoc-bindir=$STAGING/host/bin --with-boost=$STAGING --disable-maintainer-mode --disable-dependency-tracking PKG_CONFIG_PATH="$STAGING/lib/pkgconfig" CPPFLAGS="-I$STAGING/include ${OPTFLAGS}" LDFLAGS="-L$STAGING/lib ${OPTFLAGS}" CXXFLAGS="-frandom-seed=bitcoin ${OPTFLAGS}" BOOST_CHRONO_EXTRALIBS="-lrt" + ./configure "$@" --enable-upnp-default --prefix=$STAGING --with-protoc-bindir=$STAGING/host/bin --with-boost=$STAGING --disable-maintainer-mode --disable-dependency-tracking PKG_CONFIG_PATH="$STAGING/lib/pkgconfig" CPPFLAGS="-I$STAGING/include ${OPTFLAGS}" LDFLAGS="-L$STAGING/lib ${OPTFLAGS}" CXXFLAGS="-frandom-seed=bitcoin ${OPTFLAGS}" BOOST_CHRONO_EXTRALIBS="-lrt" --enable-glibc-back-compat } # cd bitcoin @@ -60,19 +60,6 @@ script: | make $MAKEOPTS install-strip make $MAKEOPTS clean - # Build fully static versions of bitcoind and bitcoin-cli for older Linux distros - STATIC_BINDIR="$HOME/bindir.static" - mkdir -p $STATIC_BINDIR - # For 32-bit, -pie cannot be used with -static, as invalid executables are generated - # For 64-bit, -pie with -static causes a link error - # Disable hardening in configure and manually pass 'static-safe' hardening flags - OPTFLAGS='-O2 -static -Wstack-protector -fstack-protector-all -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=2 -Wl,-z,relro -Wl,-z,now' - do_configure --bindir=$STATIC_BINDIR --disable-tests --enable-upnp-default --without-gui --disable-hardening - make $MAKEOPTS - make $MAKEOPTS install-strip - cp $STATIC_BINDIR/bitcoind $BINDIR/bitcoind.static - cp $STATIC_BINDIR/bitcoin-cli $BINDIR/bitcoin-cli.static - # sort distribution tar file and normalize user/group/mtime information for deterministic output mkdir -p $OUTDIR/src rm -rf $TEMPDIR diff --git a/contrib/gitian-descriptors/gitian-win.yml b/contrib/gitian-descriptors/gitian-win.yml index 7d98df9ed6..2191fb36c7 100644 --- a/contrib/gitian-descriptors/gitian-win.yml +++ b/contrib/gitian-descriptors/gitian-win.yml @@ -26,8 +26,8 @@ files: - "qt-win64-5.2.0-gitian-r3.zip" - "boost-win32-1.55.0-gitian-r6.zip" - "boost-win64-1.55.0-gitian-r6.zip" -- "bitcoin-deps-win32-gitian-r11.zip" -- "bitcoin-deps-win64-gitian-r11.zip" +- "bitcoin-deps-win32-gitian-r12.zip" +- "bitcoin-deps-win64-gitian-r12.zip" - "protobuf-win32-2.5.0-gitian-r4.zip" - "protobuf-win64-2.5.0-gitian-r4.zip" script: | @@ -61,7 +61,7 @@ script: | cd $STAGING unzip $INDIR/qt-win${BITS}-5.2.0-gitian-r3.zip unzip $INDIR/boost-win${BITS}-1.55.0-gitian-r6.zip - unzip $INDIR/bitcoin-deps-win${BITS}-gitian-r11.zip + unzip $INDIR/bitcoin-deps-win${BITS}-gitian-r12.zip unzip $INDIR/protobuf-win${BITS}-2.5.0-gitian-r4.zip if [ "$NEEDDIST" == "1" ]; then # Make source code archive which is architecture independent so it only needs to be done once diff --git a/contrib/gitian-descriptors/qt-win.yml b/contrib/gitian-descriptors/qt-win.yml index b75b8a735b..8f24492b53 100644 --- a/contrib/gitian-descriptors/qt-win.yml +++ b/contrib/gitian-descriptors/qt-win.yml @@ -15,8 +15,8 @@ reference_datetime: "2011-01-30 00:00:00" remotes: [] files: - "qt-everywhere-opensource-src-5.2.0.tar.gz" -- "bitcoin-deps-win32-gitian-r11.zip" -- "bitcoin-deps-win64-gitian-r11.zip" +- "bitcoin-deps-win32-gitian-r12.zip" +- "bitcoin-deps-win64-gitian-r12.zip" script: | # Defines export TZ=UTC @@ -48,7 +48,7 @@ script: | # # Need mingw-compiled openssl from bitcoin-deps: cd $DEPSDIR - unzip $INDIR/bitcoin-deps-win${BITS}-gitian-r11.zip + unzip $INDIR/bitcoin-deps-win${BITS}-gitian-r12.zip # cd $BUILDDIR # diff --git a/doc/README.md b/doc/README.md index 9a7d101185..f5aeb34a3c 100644 --- a/doc/README.md +++ b/doc/README.md @@ -1,4 +1,4 @@ -Bitcoin 0.9.0 BETA +Bitcoin 0.9.99 BETA ===================== Copyright (c) 2009-2014 Bitcoin Developers @@ -6,7 +6,7 @@ Copyright (c) 2009-2014 Bitcoin Developers Setup --------------------- -[Bitcoin Core](http://bitcoin.org/en/download) is the original Bitcoin client and it builds the backbone of the network. However, it downloads and stores the entire history of Bitcoin transactions (which is currently several GBs); depending on the speed of your computer and network connection, the synchronization process can take anywhere from a few hours to a day or more. Thankfully you only have to do this once. If you would like the process to go faster you can [download the blockchain directly](https://bitcointalk.org/index.php?topic=145386.0). +[Bitcoin Core](http://bitcoin.org/en/download) is the original Bitcoin client and it builds the backbone of the network. However, it downloads and stores the entire history of Bitcoin transactions (which is currently several GBs); depending on the speed of your computer and network connection, the synchronization process can take anywhere from a few hours to a day or more. Thankfully you only have to do this once. If you would like the process to go faster you can [download the blockchain directly](bootstrap.md). Running --------------------- diff --git a/doc/README_windows.txt b/doc/README_windows.txt index abca4894e2..18fd4216f9 100644 --- a/doc/README_windows.txt +++ b/doc/README_windows.txt @@ -1,4 +1,4 @@ -Bitcoin 0.9.0rc1 BETA
+Bitcoin 0.9.99 BETA
Copyright (c) 2009-2014 Bitcoin Core Developers
diff --git a/doc/bootstrap.md b/doc/bootstrap.md new file mode 100644 index 0000000000..fefd33831a --- /dev/null +++ b/doc/bootstrap.md @@ -0,0 +1,65 @@ +### Bootstrap the Blockchain Synchronization + +Normally the Bitcoin client will download the transaction and network information, called the blockchain, from network by syncing with the other clients. This can be a process that can take multiple days as the [Bitcoin block chain](https://blockchain.info/charts/blocks-size) has grown to more than 15 gigabytes, and is growing almost a gigabyte every month. Luckily there is a safe and fast way to speed up this process. We’ll show you how to bootstrap your blockchain to bring your client up to speed in just a few simple steps. + +### Requirements + +A fresh install of the Bitcoin client software. + +### Download the blockchain via Bittorent + +Jeff Garzik, Bitcoin core developer, offers an [torrent file](https://bitcointalk.org/index.php?topic=145386.0) for bootstrapping purposes that is updated often. Bittorrent is a protocol that speeds up the downloading of large files by using the other clients in the network. Example free and safe open-source clients are [Deluge](http://deluge-torrent.org/) or [QBittorent](http://www.qbittorrent.org/). A guide to installing and configuring the torrent clients can be found [here](http://dev.deluge-torrent.org/wiki/UserGuide) for Deluge and [here](http://qbforums.shiki.hu/) for QBittorent. A further in-depth tutorial on Bittorent can be found [here](http://www.howtogeek.com/howto/31846/bittorrent-for-beginners-how-get-started-downloading-torrents/). + +With the client installed we’ll proceed to download the blockchain torrent file. Use the following magnet link: + + magnet:?xt=urn:btih:2d4e6c1f96c5d5fb260dff92aea4e600227f1aea&dn=bootstrap.dat&tr=udp://tracker.openbittorrent.com:80&tr=udp://tracker.publicbt.com:80&tr=udp://tracker.ccc.de:80&tr=udp://tracker.istole.it:80 + + or go to [Jeff Garzik's topic](https://bitcointalk.org/index.php?topic=145386.0) for a signed magnet link. Alternately you can use the [.torrent file](http://sourceforge.net/projects/bitcoin/files/Bitcoin/blockchain/bootstrap.dat.torrent/download) found on Sourceforge. + + + +The download page should look like this, with a countdown to the download. If it does not work click the direct download link. + +The torrent client installed will recognize the download of the torrent file. Save the bootstrap.dat file to a folder you use for downloads. The image below shows the torrent download in QBittorent, with current speed and ETA highlighted. + + + +### Download the block chain directly from official repositories +The Bittorent version, see above, of the block chain download is refreshed more often than the direct download available. If Bittorent is blocked on your network then you can use the direct download method. Be sure to only use official repositories as the link displayed below. This download will only update the client to March 2013. + +Click [here](http://sourceforge.net/projects/bitcoin/files/Bitcoin/blockchain/bitcoin_blockchain_170000.zip/download) to download or copy and paste the link below. + + http://sourceforge.net/projects/bitcoin/files/Bitcoin/blockchain/bitcoin_blockchain_170000.zip/download + +The download page should look like this, with a countdown to the download. If it does not work directly click the download. Save the file to a folder you use for downloads. + + +### Importing the blockchain +Exit the Bitcoin Client software if you have it running. Be sure not to have an actively used wallet in use. Now we are going to copy the download of the blockchain to the Bitcoin client data directory. You should run the client software at least once so it can generate the data directory. Copy the downloaded bootstrap.dat file into the Bitcoin data folder. + +**For Windows users:** +Open explorer, and type into the address bar: + + %APPDATA%\Bitcoin + +This will open up the data folder. It should look like the image below. Copy over the bootstrap.dat from your download folder to this directory. + + +**For OSX users:** +Open Finder by pressing Press [shift] + [cmd] + [g] and enter: + + ~/Library/Application Support/Bitcoin/ + +**For Linux users:** +The directory is hidden in your User folder. Go to: + + ~/.bitcoin/ + +### Importing the blockchain +Now start the Bitcoin client software. It should show "Importing blocks from disk" like the image below. + +Wait until the import finishes. The client will download the last days not covered by the import. Congratulations you have successfully imported the blockchain! + +### Is this safe? + +Yes, the above method is safe. The download contains only raw block chain data and the client verifies this on import. Do not download the blockchain from unofficial sources, especially if they provide `*.rev` and `*.sst` files. These files are not verified and can contain malicious edits. diff --git a/doc/build-osx.md b/doc/build-osx.md index faa31cb023..0de5c792e9 100644 --- a/doc/build-osx.md +++ b/doc/build-osx.md @@ -86,7 +86,9 @@ If not, you can ensure that the Homebrew OpenSSL is correctly linked by running brew link openssl --force -Rerunning "openssl version" should now return the correct version. +Rerunning "openssl version" should now return the correct version. If it +doesn't, make sure `/usr/local/bin` comes before `/usr/bin` in your +PATH. ### Building `bitcoind` diff --git a/doc/build-unix.md b/doc/build-unix.md index b957baa91c..498bfa1e0f 100644 --- a/doc/build-unix.md +++ b/doc/build-unix.md @@ -42,15 +42,7 @@ Licenses of statically linked libraries: Boost MIT-like license miniupnpc New (3-clause) BSD license -- Versions used in this release: -- GCC 4.3.3 -- OpenSSL 1.0.1c -- Berkeley DB 4.8.30.NC -- Boost 1.55 -- miniupnpc 1.6 -- qt 4.8.3 -- protobuf 2.5.0 -- libqrencode 3.2.0 +- For the versions used in this release, see doc/release-process.md under *Fetch and build inputs*. System requirements -------------------- @@ -145,8 +137,12 @@ miniupnpc Berkeley DB ----------- -You need Berkeley DB 4.8. If you have to build Berkeley DB yourself: +You need Berkeley DB 4.8. If you have to build it yourself: + wget 'http://download.oracle.com/berkeley-db/db-4.8.30.NC.tar.gz' + echo '12edc0df75bf9abd7f82f821795bcee50f42cb2e5f76a6a281b85732798364ef db-4.8.30.NC.tar.gz' | sha256sum -c + # -> db-4.8.30.NC.tar.gz: OK + tar -xzvf db-4.8.30.NC.tar.gz cd build_unix/ ../dist/configure --enable-cxx make diff --git a/doc/coding.md b/doc/coding.md index ab3a73494a..69388c9ce2 100644 --- a/doc/coding.md +++ b/doc/coding.md @@ -43,8 +43,61 @@ Common types: set set or multiset bn CBigNum -------------------------- +Doxygen comments +----------------- + +To facilitate the generation of documentation, use doxygen-compatible comment blocks for functions, methods and fields. + +For example, to describe a function use: +```c++ +/** + * ... text ... + * @param[in] arg1 A description + * @param[in] arg2 Another argument description + * @pre Precondition for function... + */ +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. + +To describe a class use the same construct above the class definition: +```c++ +/** + * Alerts are for notifying old versions if they become too obsolete and + * need to upgrade. The message is displayed in the status bar. + * @see GetWarnings() + */ +class CAlert +{ +``` + +To describe a member or variable use: +```c++ +int var; //!< Detailed description after the member +``` + +Also OK: +```c++ +/// +/// ... text ... +/// +bool function2(int arg1, const char *arg2) +``` + +Not OK (used plenty in the current source, but not picked up): +```c++ +// +// ... text ... +// +``` + +A full list of comment syntaxes picked up by doxygen can be found at http://www.stack.nl/~dimitri/doxygen/manual/docblocks.html, +but if possible use one of the above styles. + Locking/mutex usage notes +------------------------- The code is multi-threaded, and uses mutexes and the LOCK/TRY_LOCK macros to protect data structures. @@ -60,8 +113,8 @@ between the various components is a goal, with any necessary locking done by the components (e.g. see the self-contained CKeyStore class and its cs_KeyStore lock for example). -------- Threads +------- - ThreadScriptCheck : Verifies block scripts. diff --git a/doc/gitian-building.md b/doc/gitian-building.md index f12dce5065..544bbc12c1 100644 --- a/doc/gitian-building.md +++ b/doc/gitian-building.md @@ -227,7 +227,6 @@ In this section we will be setting up the Debian installation for Gitian buildin First we need to log in as `root` to set up dependencies and make sure that our user can use the sudo command. Type/paste the following in the terminal: - ```bash apt-get install git ruby sudo apt-cacher-ng qemu-utils debootstrap lxc python-cheetah parted kpartx bridge-utils adduser debian sudo @@ -249,15 +248,16 @@ echo '#!/bin/sh -e' > /etc/rc.local echo 'brctl addbr br0' >> /etc/rc.local echo 'ifconfig br0 10.0.3.2/24 up' >> /etc/rc.local echo 'exit 0' >> /etc/rc.local -# make sure that USE_LXC is always set when logging in as debian +# make sure that USE_LXC is always set when logging in as debian, +# and configure LXC IP addresses echo 'export USE_LXC=1' >> /home/debian/.profile +echo 'export GITIAN_HOST_IP=10.0.3.2' >> /home/debian/.profile +echo 'export LXC_GUEST_IP=10.0.3.5' >> /home/debian/.profile reboot ``` -At the end the VM is rebooted to make sure that the changes take effect. - -**Note**: If you're following this guide on a physical system instead of a VirtualBox VM you could use `10.0.2.2` instead -of `10.0.3.2` in the above `ifconfig` line. This avoids having to patch gitian-builder in next section. +At the end the VM is rebooted to make sure that the changes take effect. The steps in this +section need only to be performed once. Installing gitian ------------------ @@ -286,20 +286,6 @@ git clone https://github.com/devrandom/gitian-builder.git git clone https://github.com/bitcoin/bitcoin ``` -We need to change the guest IP range for the gitian builder because otherwise it will -collide with VirtualBox its NAT IP range. Gitian does not have a way yet to configure -this, so we need to patch the IPs using `sed`. This is not nice but it will -have to do for now... (a [pull request -(#52)](https://github.com/devrandom/gitian-builder/pull/52) to make this -configurable without patching has been submitted): - -```bash -sed -i 's/10.0.2.2/10.0.3.2/g' gitian-builder/target-bin/bootstrap-fixup -sed -i 's/10.0.2.5/10.0.3.5/g' gitian-builder/etc/lxc.config.in -``` - -*note* After you update the gitian-builder repository, you may need to repeat these manual changes. - Setting up gitian images ------------------------- @@ -346,25 +332,6 @@ tail -f var/install.log tail -f var/build.log ``` -To make sure that the output is exactly the same, and that the time, date, locale and -even the ordering of files in the file system doesn't influence the result, -some special precautions are taken. This means that the result is expected to -be the same every time. The expected SHA256 hashes of the intermediate -inputs (at the time of release 0.9.0) are: - - 05fe8e9aef00d295f24a94deef7d3a918af5aeef371ba57fdd5a6acd8c51f6cb bitcoin-deps-linux32-gitian-r3.zip - 4227aa9d9fedbb4265b8d10a4f78b7435f34b00a54eb4d662bf78f59c6e70c27 bitcoin-deps-linux64-gitian-r3.zip - f29b7d9577417333fb56e023c2977f5726a7c297f320b175a4108cf7cd4c2d29 boost-linux32-1.55.0-gitian-r1.zip - 88232451c4104f7eb16e469ac6474fd1231bd485687253f7b2bdf46c0781d535 boost-linux64-1.55.0-gitian-r1.zip - 60dc2d3b61e9c7d5dbe2f90d5955772ad748a47918ff2d8b74e8db9b1b91c909 boost-win32-1.55.0-gitian-r6.zip - f65fcaf346bc7b73bc8db3a8614f4f6bee2f61fcbe495e9881133a7c2612a167 boost-win64-1.55.0-gitian-r6.zip - 0ba0855e1084132d05fd8687c19d8430b91f6c410a9ab7938e4fea650c2b22c8 bitcoin-deps-win32-gitian-r10.zip - 5f9ffba0c13ddefc1d339f66ab973ea64623c9cc1f9078cb2b145bce86bd28e2 bitcoin-deps-win64-gitian-r10.zip - 963e3e5e85879010a91143c90a711a5d1d5aba992e38672cdf7b54e42c56b2f1 qt-win32-5.2.0-gitian-r2.zip - 751c579830d173ef3e6f194e83d18b92ebef6df03289db13ab77a52b6bc86ef0 qt-win64-5.2.0-gitian-r2.zip - e2e403e1a08869c7eed4d4293bce13d51ec6a63592918b90ae215a0eceb44cb4 protobuf-win32-2.5.0-gitian-r4.zip - a0999037e8b0ef9ade13efd88fee261ba401f5ca910068b7e0cd3262ba667db0 protobuf-win64-2.5.0-gitian-r4.zip - Building Bitcoin ---------------- diff --git a/doc/img/bootstrap1.png b/doc/img/bootstrap1.png Binary files differnew file mode 100644 index 0000000000..075930791b --- /dev/null +++ b/doc/img/bootstrap1.png diff --git a/doc/img/bootstrap2.png b/doc/img/bootstrap2.png Binary files differnew file mode 100644 index 0000000000..6461f81810 --- /dev/null +++ b/doc/img/bootstrap2.png diff --git a/doc/img/bootstrap3.png b/doc/img/bootstrap3.png Binary files differnew file mode 100644 index 0000000000..8a6754e3e0 --- /dev/null +++ b/doc/img/bootstrap3.png diff --git a/doc/img/bootstrap4.png b/doc/img/bootstrap4.png Binary files differnew file mode 100644 index 0000000000..ad69737922 --- /dev/null +++ b/doc/img/bootstrap4.png diff --git a/doc/img/bootstrap5.png b/doc/img/bootstrap5.png Binary files differnew file mode 100644 index 0000000000..d8d9baaf37 --- /dev/null +++ b/doc/img/bootstrap5.png diff --git a/doc/release-process.md b/doc/release-process.md index 13d843951a..cd60684f42 100644 --- a/doc/release-process.md +++ b/doc/release-process.md @@ -8,8 +8,6 @@ Release Process ###update (commit) version in sources - - bitcoin-qt.pro contrib/verifysfbinaries/verify.sh doc/README* share/setup.nsi @@ -39,7 +37,7 @@ Release Process Fetch and build inputs: (first time, or when dependency versions change) mkdir -p inputs; cd inputs/ - wget 'http://miniupnp.free.fr/files/download.php?file=miniupnpc-1.8.tar.gz' -O miniupnpc-1.8.tar.gz + wget 'http://miniupnp.free.fr/files/download.php?file=miniupnpc-1.9.tar.gz' -O miniupnpc-1.9.tar.gz wget 'https://www.openssl.org/source/openssl-1.0.1g.tar.gz' wget 'http://download.oracle.com/berkeley-db/db-4.8.30.NC.tar.gz' wget 'http://zlib.net/zlib-1.2.8.tar.gz' @@ -64,6 +62,21 @@ Release Process ./bin/gbuild ../bitcoin/contrib/gitian-descriptors/protobuf-win.yml mv build/out/protobuf-*.zip inputs/ + The expected SHA256 hashes of the intermediate inputs are: + + 35c3dfd8b9362f59e81b51881b295232e3bc9e286f1add193b59d486d9ac4a5c bitcoin-deps-linux32-gitian-r5.zip + 571789867d172500fa96d63d0ba8c5b1e1a3d6f44f720eddf2f93665affc88b3 bitcoin-deps-linux64-gitian-r5.zip + f29b7d9577417333fb56e023c2977f5726a7c297f320b175a4108cf7cd4c2d29 boost-linux32-1.55.0-gitian-r1.zip + 88232451c4104f7eb16e469ac6474fd1231bd485687253f7b2bdf46c0781d535 boost-linux64-1.55.0-gitian-r1.zip + 60dc2d3b61e9c7d5dbe2f90d5955772ad748a47918ff2d8b74e8db9b1b91c909 boost-win32-1.55.0-gitian-r6.zip + f65fcaf346bc7b73bc8db3a8614f4f6bee2f61fcbe495e9881133a7c2612a167 boost-win64-1.55.0-gitian-r6.zip + 97e62002d338885336bb24e7cbb9471491294bd8857af7a83d18c0961f864ec0 bitcoin-deps-win32-gitian-r11.zip + ee3ea2d5aac1a67ea6bfbea2c04068a7c0940616ce48ee4f37c264bb9d4438ef bitcoin-deps-win64-gitian-r11.zip + 963e3e5e85879010a91143c90a711a5d1d5aba992e38672cdf7b54e42c56b2f1 qt-win32-5.2.0-gitian-r3.zip + 751c579830d173ef3e6f194e83d18b92ebef6df03289db13ab77a52b6bc86ef0 qt-win64-5.2.0-gitian-r3.zip + e2e403e1a08869c7eed4d4293bce13d51ec6a63592918b90ae215a0eceb44cb4 protobuf-win32-2.5.0-gitian-r4.zip + a0999037e8b0ef9ade13efd88fee261ba401f5ca910068b7e0cd3262ba667db0 protobuf-win64-2.5.0-gitian-r4.zip + Build bitcoind and bitcoin-qt on Linux32, Linux64, and Win32: ./bin/gbuild --commit bitcoin=v${VERSION} ../bitcoin/contrib/gitian-descriptors/gitian-linux.yml diff --git a/share/genbuild.sh b/share/genbuild.sh index afa4b4ccb9..6890a6eba0 100755 --- a/share/genbuild.sh +++ b/share/genbuild.sh @@ -14,13 +14,21 @@ else fi DESC="" +SUFFIX="" LAST_COMMIT_DATE="" if [ -e "$(which git)" -a -d ".git" ]; then # clean 'dirty' status of touched files that haven't been modified git diff >/dev/null 2>/dev/null - # get a string like "v0.6.0-66-g59887e8-dirty" - DESC="$(git describe --dirty 2>/dev/null)" + # 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 + git diff-index --quiet HEAD -- && DESC=$RAWDESC + fi + + # otherwise generate suffix from git, i.e. string like "59887e8-dirty" + SUFFIX=$(git rev-parse --short HEAD) + git diff-index --quiet HEAD -- || SUFFIX="$SUFFIX-dirty" # get a string like "2012-04-10 16:27:19 +0200" LAST_COMMIT_DATE="$(git log -n 1 --format="%ci")" @@ -28,6 +36,8 @@ fi if [ -n "$DESC" ]; then NEWINFO="#define BUILD_DESC \"$DESC\"" +elif [ -n "$SUFFIX" ]; then + NEWINFO="#define BUILD_SUFFIX $SUFFIX" else NEWINFO="// No build information available" fi diff --git a/share/qt/Info.plist.in b/share/qt/Info.plist.in index e352af1427..e79e59a568 100644 --- a/share/qt/Info.plist.in +++ b/share/qt/Info.plist.in @@ -17,13 +17,13 @@ <string>APPL</string> <key>CFBundleGetInfoString</key> - <string>@CLIENT_VERSION_MAJOR@.@CLIENT_VERSION_MINOR@, Copyright © 2009-@COPYRIGHT_YEAR@ The Bitcoin Core developers</string> + <string>@CLIENT_VERSION_MAJOR@.@CLIENT_VERSION_MINOR@.@CLIENT_VERSION_REVISION@, Copyright © 2009-@COPYRIGHT_YEAR@ The Bitcoin Core developers</string> <key>CFBundleShortVersionString</key> - <string>@CLIENT_VERSION_MAJOR@.@CLIENT_VERSION_MINOR@</string> + <string>@CLIENT_VERSION_MAJOR@.@CLIENT_VERSION_MINOR@.@CLIENT_VERSION_REVISION@</string> <key>CFBundleVersion</key> - <string>@CLIENT_VERSION_MAJOR@.@CLIENT_VERSION_MINOR@</string> + <string>@CLIENT_VERSION_MAJOR@.@CLIENT_VERSION_MINOR@.@CLIENT_VERSION_REVISION@</string> <key>CFBundleSignature</key> <string>????</string> diff --git a/src/Makefile.am b/src/Makefile.am index c725c4f1c2..215d0319f9 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -121,6 +121,7 @@ libbitcoin_wallet_a_SOURCES = \ $(BITCOIN_CORE_H) libbitcoin_common_a_SOURCES = \ + base58.cpp \ allocators.cpp \ chainparams.cpp \ core.cpp \ @@ -135,6 +136,11 @@ libbitcoin_common_a_SOURCES = \ version.cpp \ $(BITCOIN_CORE_H) +if GLIBC_BACK_COMPAT +libbitcoin_common_a_SOURCES += compat/glibc_compat.cpp +libbitcoin_common_a_SOURCES += compat/glibcxx_compat.cpp +endif + libbitcoin_cli_a_SOURCES = \ rpcclient.cpp \ $(BITCOIN_CORE_H) diff --git a/src/base58.cpp b/src/base58.cpp new file mode 100644 index 0000000000..0b08ee3d06 --- /dev/null +++ b/src/base58.cpp @@ -0,0 +1,91 @@ +// Copyright (c) 2014 The Bitcoin developers +// Distributed under the MIT/X11 software license, see the accompanying +// file COPYING or http://www.opensource.org/licenses/mit-license.php. + +#include <assert.h> +#include <stdint.h> +#include <string.h> +#include <vector> +#include <string> + +/* All alphanumeric characters except for "0", "I", "O", and "l" */ +static const char* pszBase58 = "123456789ABCDEFGHJKLMNPQRSTUVWXYZabcdefghijkmnopqrstuvwxyz"; + +bool DecodeBase58(const char *psz, std::vector<unsigned char>& vch) { + // Skip leading spaces. + while (*psz && isspace(*psz)) + psz++; + // Skip and count leading '1's. + int zeroes = 0; + while (*psz == '1') { + zeroes++; + psz++; + } + // Allocate enough space in big-endian base256 representation. + std::vector<unsigned char> b256(strlen(psz) * 733 / 1000 + 1); // log(58) / log(256), rounded up. + // Process the characters. + while (*psz && !isspace(*psz)) { + // Decode base58 character + const char *ch = strchr(pszBase58, *psz); + if (ch == NULL) + return false; + // Apply "b256 = b256 * 58 + ch". + int carry = ch - pszBase58; + for (std::vector<unsigned char>::reverse_iterator it = b256.rbegin(); it != b256.rend(); it++) { + carry += 58 * (*it); + *it = carry % 256; + carry /= 256; + } + assert(carry == 0); + psz++; + } + // Skip trailing spaces. + while (isspace(*psz)) + psz++; + if (*psz != 0) + return false; + // Skip leading zeroes in b256. + std::vector<unsigned char>::iterator it = b256.begin(); + while (it != b256.end() && *it == 0) + it++; + // Copy result into output vector. + vch.reserve(zeroes + (b256.end() - it)); + vch.assign(zeroes, 0x00); + while (it != b256.end()) + vch.push_back(*(it++)); + return true; +} + +std::string EncodeBase58(const unsigned char* pbegin, const unsigned char* pend) { + // Skip & count leading zeroes. + int zeroes = 0; + while (pbegin != pend && *pbegin == 0) { + pbegin++; + zeroes++; + } + // Allocate enough space in big-endian base58 representation. + std::vector<unsigned char> b58((pend - pbegin) * 138 / 100 + 1); // log(256) / log(58), rounded up. + // Process the bytes. + while (pbegin != pend) { + int carry = *pbegin; + // Apply "b58 = b58 * 256 + ch". + for (std::vector<unsigned char>::reverse_iterator it = b58.rbegin(); it != b58.rend(); it++) { + carry += 256 * (*it); + *it = carry % 58; + carry /= 58; + } + assert(carry == 0); + pbegin++; + } + // Skip leading zeroes in base58 result. + std::vector<unsigned char>::iterator it = b58.begin(); + while (it != b58.end() && *it == 0) + it++; + // Translate the result into a string. + std::string str; + str.reserve(zeroes + (b58.end() - it)); + str.assign(zeroes, '1'); + while (it != b58.end()) + str += pszBase58[*(it++)]; + return str; +} diff --git a/src/base58.h b/src/base58.h index ebe5376825..4fb436c5ed 100644 --- a/src/base58.h +++ b/src/base58.h @@ -14,7 +14,6 @@ #ifndef BITCOIN_BASE58_H #define BITCOIN_BASE58_H -#include "bignum.h" #include "chainparams.h" #include "hash.h" #include "key.h" @@ -27,114 +26,39 @@ #include <boost/variant/apply_visitor.hpp> #include <boost/variant/static_visitor.hpp> -static const char* pszBase58 = "123456789ABCDEFGHJKLMNPQRSTUVWXYZabcdefghijkmnopqrstuvwxyz"; - -// Encode a byte sequence as a base58-encoded string -inline std::string EncodeBase58(const unsigned char* pbegin, const unsigned char* pend) -{ - CAutoBN_CTX pctx; - CBigNum bn58 = 58; - CBigNum bn0 = 0; - - // Convert big endian data to little endian - // Extra zero at the end make sure bignum will interpret as a positive number - std::vector<unsigned char> vchTmp(pend-pbegin+1, 0); - reverse_copy(pbegin, pend, vchTmp.begin()); - - // Convert little endian data to bignum - CBigNum bn; - bn.setvch(vchTmp); - - // Convert bignum to std::string - std::string str; - // Expected size increase from base58 conversion is approximately 137% - // use 138% to be safe - str.reserve((pend - pbegin) * 138 / 100 + 1); - CBigNum dv; - CBigNum rem; - while (bn > bn0) - { - if (!BN_div(&dv, &rem, &bn, &bn58, pctx)) - throw bignum_error("EncodeBase58 : BN_div failed"); - bn = dv; - unsigned int c = rem.getulong(); - str += pszBase58[c]; - } - - // Leading zeroes encoded as base58 zeros - for (const unsigned char* p = pbegin; p < pend && *p == 0; p++) - str += pszBase58[0]; - - // Convert little endian std::string to big endian - reverse(str.begin(), str.end()); - return str; -} +/** + * Encode a byte sequence as a base58-encoded string. + * pbegin and pend cannot be NULL, unless both are. + */ +std::string EncodeBase58(const unsigned char* pbegin, const unsigned char* pend); -// Encode a byte vector as a base58-encoded string +/** + * Encode a byte vector as a base58-encoded string + */ inline std::string EncodeBase58(const std::vector<unsigned char>& vch) { return EncodeBase58(&vch[0], &vch[0] + vch.size()); } -// Decode a base58-encoded string psz into byte vector vchRet -// returns true if decoding is successful -inline bool DecodeBase58(const char* psz, std::vector<unsigned char>& vchRet) -{ - CAutoBN_CTX pctx; - vchRet.clear(); - CBigNum bn58 = 58; - CBigNum bn = 0; - CBigNum bnChar; - while (isspace(*psz)) - psz++; - - // Convert big endian string to bignum - for (const char* p = psz; *p; p++) - { - const char* p1 = strchr(pszBase58, *p); - if (p1 == NULL) - { - while (isspace(*p)) - p++; - if (*p != '\0') - return false; - break; - } - bnChar.setulong(p1 - pszBase58); - if (!BN_mul(&bn, &bn, &bn58, pctx)) - throw bignum_error("DecodeBase58 : BN_mul failed"); - bn += bnChar; - } - - // Get bignum as little endian data - std::vector<unsigned char> vchTmp = bn.getvch(); - - // Trim off sign byte if present - if (vchTmp.size() >= 2 && vchTmp.end()[-1] == 0 && vchTmp.end()[-2] >= 0x80) - vchTmp.erase(vchTmp.end()-1); - - // Restore leading zeros - int nLeadingZeros = 0; - for (const char* p = psz; *p == pszBase58[0]; p++) - nLeadingZeros++; - vchRet.assign(nLeadingZeros + vchTmp.size(), 0); - - // Convert little endian data to big endian - reverse_copy(vchTmp.begin(), vchTmp.end(), vchRet.end() - vchTmp.size()); - return true; -} +/** + * Decode a base58-encoded string (psz) into a byte vector (vchRet). + * return true if decoding is successful. + * psz cannot be NULL. + */ +bool DecodeBase58(const char* psz, std::vector<unsigned char>& vchRet); -// Decode a base58-encoded string str into byte vector vchRet -// returns true if decoding is successful +/** + * Decode a base58-encoded string (str) into a byte vector (vchRet). + * return true if decoding is successful. + */ inline bool DecodeBase58(const std::string& str, std::vector<unsigned char>& vchRet) { return DecodeBase58(str.c_str(), vchRet); } - - - -// Encode a byte vector to a base58-encoded string, including checksum +/** + * Encode a byte vector into a base58-encoded string, including checksum + */ inline std::string EncodeBase58Check(const std::vector<unsigned char>& vchIn) { // add 4-byte hash check to the end @@ -144,8 +68,10 @@ inline std::string EncodeBase58Check(const std::vector<unsigned char>& vchIn) return EncodeBase58(vch); } -// Decode a base58-encoded string psz that includes a checksum, into byte vector vchRet -// returns true if decoding is successful +/** + * Decode a base58-encoded string (psz) that includes a checksum into a byte + * vector (vchRet), return true if decoding is successful + */ inline bool DecodeBase58Check(const char* psz, std::vector<unsigned char>& vchRet) { if (!DecodeBase58(psz, vchRet)) @@ -155,6 +81,7 @@ inline bool DecodeBase58Check(const char* psz, std::vector<unsigned char>& vchRe vchRet.clear(); return false; } + // re-calculate the checksum, insure it matches the included 4-byte checksum uint256 hash = Hash(vchRet.begin(), vchRet.end()-4); if (memcmp(&hash, &vchRet.end()[-4], 4) != 0) { @@ -165,18 +92,18 @@ inline bool DecodeBase58Check(const char* psz, std::vector<unsigned char>& vchRe return true; } -// Decode a base58-encoded string str that includes a checksum, into byte vector vchRet -// returns true if decoding is successful +/** + * Decode a base58-encoded string (str) that includes a checksum into a byte + * vector (vchRet), return true if decoding is successful + */ inline bool DecodeBase58Check(const std::string& str, std::vector<unsigned char>& vchRet) { return DecodeBase58Check(str.c_str(), vchRet); } - - - - -/** Base class for all base58-encoded data */ +/** + * Base class for all base58-encoded data + */ class CBase58Data { protected: @@ -347,7 +274,9 @@ bool inline CBitcoinAddressVisitor::operator()(const CKeyID &id) const { bool inline CBitcoinAddressVisitor::operator()(const CScriptID &id) const { return addr->Set(id); } bool inline CBitcoinAddressVisitor::operator()(const CNoDestination &id) const { return false; } -/** A base58-encoded secret key */ +/** + * A base58-encoded secret key + */ class CBitcoinSecret : public CBase58Data { public: @@ -393,7 +322,6 @@ public: } }; - template<typename K, int Size, CChainParams::Base58Type Type> class CBitcoinExtKeyBase : public CBase58Data { public: diff --git a/src/bloom.cpp b/src/bloom.cpp index cbb8cf4a82..1bfcbd406f 100644 --- a/src/bloom.cpp +++ b/src/bloom.cpp @@ -15,8 +15,6 @@ using namespace std; -static const unsigned char bit_mask[8] = {0x01, 0x02, 0x04, 0x08, 0x10, 0x20, 0x40, 0x80}; - 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 @@ -47,7 +45,7 @@ void CBloomFilter::insert(const vector<unsigned char>& vKey) { unsigned int nIndex = Hash(i, vKey); // Sets bit nIndex of vData - vData[nIndex >> 3] |= bit_mask[7 & nIndex]; + vData[nIndex >> 3] |= (1 << (7 & nIndex)); } isEmpty = false; } @@ -76,7 +74,7 @@ bool CBloomFilter::contains(const vector<unsigned char>& vKey) const { unsigned int nIndex = Hash(i, vKey); // Checks bit nIndex of vData - if (!(vData[nIndex >> 3] & bit_mask[7 & nIndex])) + if (!(vData[nIndex >> 3] & (1 << (7 & nIndex)))) return false; } return true; diff --git a/src/clientversion.h b/src/clientversion.h index 8d0f89c715..29b4aa3764 100644 --- a/src/clientversion.h +++ b/src/clientversion.h @@ -11,8 +11,8 @@ // These need to be macros, as version.cpp's and bitcoin-qt.rc's voodoo requires it #define CLIENT_VERSION_MAJOR 0 #define CLIENT_VERSION_MINOR 9 -#define CLIENT_VERSION_REVISION 0 -#define CLIENT_VERSION_BUILD 99 +#define CLIENT_VERSION_REVISION 99 +#define CLIENT_VERSION_BUILD 0 // Set to true for release, false for prerelease or test build #define CLIENT_VERSION_IS_RELEASE false diff --git a/src/compat/glibc_compat.cpp b/src/compat/glibc_compat.cpp new file mode 100644 index 0000000000..5b73e6051a --- /dev/null +++ b/src/compat/glibc_compat.cpp @@ -0,0 +1,19 @@ +#include "bitcoin-config.h" +#include <cstddef> +#include <sys/select.h> + +// Prior to GLIBC_2.14, memcpy was aliased to memmove. +extern "C" void* memmove(void* a, const void* b, size_t c); +extern "C" void* memcpy(void* a, const void* b, size_t c) +{ + return memmove(a, b, c); +} + +extern "C" void __chk_fail (void) __attribute__((__noreturn__)); +extern "C" FDELT_TYPE __fdelt_warn(FDELT_TYPE a) +{ + if (a >= FD_SETSIZE) + __chk_fail (); + return a / __NFDBITS; +} +extern "C" FDELT_TYPE __fdelt_chk(FDELT_TYPE) __attribute__((weak, alias("__fdelt_warn"))); diff --git a/src/compat/glibcxx_compat.cpp b/src/compat/glibcxx_compat.cpp new file mode 100644 index 0000000000..e91376f818 --- /dev/null +++ b/src/compat/glibcxx_compat.cpp @@ -0,0 +1,87 @@ +#include <cstddef> +#include <istream> +#include <stdexcept> +#include <typeinfo> + +#ifndef _GLIBCXX_USE_NOEXCEPT + #define _GLIBCXX_USE_NOEXCEPT throw() +#endif + +namespace std { + +const char* bad_exception::what() const throw() +{ + return "std::bad_exception"; +} + +const char* bad_cast::what() const throw() +{ + return "std::bad_cast"; +} + +const char* bad_alloc::what() const throw() +{ + return "std::bad_alloc"; +} + +namespace __detail +{ +struct _List_node_base +{ + void _M_hook(std::__detail::_List_node_base* const __position) throw () __attribute__((used)) + { + _M_next = __position; + _M_prev = __position->_M_prev; + __position->_M_prev->_M_next = this; + __position->_M_prev = this; + } + void _M_unhook() __attribute__((used)) + { + _List_node_base* const __next_node = _M_next; + _List_node_base* const __prev_node = _M_prev; + __prev_node->_M_next = __next_node; + __next_node->_M_prev = __prev_node; + } + _List_node_base* _M_next; + _List_node_base* _M_prev; +}; +} // namespace detail + +template ostream& ostream::_M_insert(bool); +template ostream& ostream::_M_insert(long); +template ostream& ostream::_M_insert(double); +template ostream& ostream::_M_insert(unsigned long); +template ostream& ostream::_M_insert(const void*); +template ostream& __ostream_insert(ostream&, const char*, streamsize); +template istream& istream::_M_extract(long&); +template istream& istream::_M_extract(unsigned short&); + +out_of_range::~out_of_range() _GLIBCXX_USE_NOEXCEPT { } + +// Used with permission. +// See: https://github.com/madlib/madlib/commit/c3db418c0d34d6813608f2137fef1012ce03043d + +void +ctype<char>::_M_widen_init() const { + char __tmp[sizeof(_M_widen)]; + for (unsigned __i = 0; __i < sizeof(_M_widen); ++__i) + __tmp[__i] = __i; + do_widen(__tmp, __tmp + sizeof(__tmp), _M_widen); + + _M_widen_ok = 1; + // Set _M_widen_ok to 2 if memcpy can't be used. + for (unsigned __i = 0; __i < sizeof(_M_widen); ++__i) + if (__tmp[__i] != _M_widen[__i]) { + _M_widen_ok = 2; + break; + } +} + +void __throw_out_of_range_fmt(const char*, ...) __attribute__((__noreturn__)); +void __throw_out_of_range_fmt(const char* err, ...) +{ + // Safe and over-simplified version. Ignore the format and print it as-is. + __throw_out_of_range(err); +} + +}// namespace std diff --git a/src/main.cpp b/src/main.cpp index c4d6194857..40c713ce93 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -74,53 +74,54 @@ const string strMessageMagic = "Bitcoin Signed Message:\n"; // Internal stuff namespace { -struct CBlockIndexWorkComparator -{ - bool operator()(CBlockIndex *pa, CBlockIndex *pb) { - // First sort by most total work, ... - if (pa->nChainWork > pb->nChainWork) return false; - if (pa->nChainWork < pb->nChainWork) return true; - - // ... then by earliest time received, ... - if (pa->nSequenceId < pb->nSequenceId) return false; - if (pa->nSequenceId > pb->nSequenceId) return true; + struct CBlockIndexWorkComparator + { + bool operator()(CBlockIndex *pa, CBlockIndex *pb) { + // First sort by most total work, ... + if (pa->nChainWork > pb->nChainWork) return false; + if (pa->nChainWork < pb->nChainWork) return true; - // Use pointer address as tie breaker (should only happen with blocks - // loaded from disk, as those all have id 0). - if (pa < pb) return false; - if (pa > pb) return true; + // ... then by earliest time received, ... + if (pa->nSequenceId < pb->nSequenceId) return false; + if (pa->nSequenceId > pb->nSequenceId) return true; - // Identical blocks. - return false; - } -}; + // Use pointer address as tie breaker (should only happen with blocks + // loaded from disk, as those all have id 0). + if (pa < pb) return false; + if (pa > pb) return true; -CBlockIndex *pindexBestInvalid; -set<CBlockIndex*, CBlockIndexWorkComparator> setBlockIndexValid; // may contain all CBlockIndex*'s that have validness >=BLOCK_VALID_TRANSACTIONS, and must contain those who aren't failed - -CCriticalSection cs_LastBlockFile; -CBlockFileInfo infoLastBlockFile; -int nLastBlockFile = 0; - -// Every received block is assigned a unique and increasing identifier, so we -// know which one to give priority in case of a fork. -CCriticalSection cs_nBlockSequenceId; -// Blocks loaded from disk are assigned id 0, so start the counter at 1. -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. -map<uint256, NodeId> mapBlockSource; - -// Blocks that are in flight, and that are in the queue to be downloaded. -// Protected by cs_main. -struct QueuedBlock { - uint256 hash; - int64_t nTime; // Time of "getdata" request in microseconds. - int nQueuedBefore; // Number of blocks in flight at the time of request. -}; -map<uint256, pair<NodeId, list<QueuedBlock>::iterator> > mapBlocksInFlight; -map<uint256, pair<NodeId, list<uint256>::iterator> > mapBlocksToDownload; + // Identical blocks. + return false; + } + }; + + CBlockIndex *pindexBestInvalid; + // may contain all CBlockIndex*'s that have validness >=BLOCK_VALID_TRANSACTIONS, and must contain those who aren't failed + set<CBlockIndex*, CBlockIndexWorkComparator> setBlockIndexValid; + + CCriticalSection cs_LastBlockFile; + CBlockFileInfo infoLastBlockFile; + int nLastBlockFile = 0; + + // Every received block is assigned a unique and increasing identifier, so we + // know which one to give priority in case of a fork. + CCriticalSection cs_nBlockSequenceId; + // Blocks loaded from disk are assigned id 0, so start the counter at 1. + 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. + map<uint256, NodeId> mapBlockSource; + + // Blocks that are in flight, and that are in the queue to be downloaded. + // Protected by cs_main. + struct QueuedBlock { + uint256 hash; + int64_t nTime; // Time of "getdata" request in microseconds. + int nQueuedBefore; // Number of blocks in flight at the time of request. + }; + map<uint256, pair<NodeId, list<QueuedBlock>::iterator> > mapBlocksInFlight; + map<uint256, pair<NodeId, list<uint256>::iterator> > mapBlocksToDownload; } ////////////////////////////////////////////////////////////////////////////// @@ -474,6 +475,7 @@ unsigned int LimitOrphanTxSize(unsigned int nMaxOrphans) bool IsStandardTx(const CTransaction& tx, string& reason) { + AssertLockHeld(cs_main); if (tx.nVersion > CTransaction::CURRENT_VERSION || tx.nVersion < 1) { reason = "version"; return false; @@ -556,6 +558,7 @@ bool IsStandardTx(const CTransaction& tx, string& reason) bool IsFinalTx(const CTransaction &tx, int nBlockHeight, int64_t nBlockTime) { + AssertLockHeld(cs_main); // Time based nLockTime implemented in 0.1.6 if (tx.nLockTime == 0) return true; @@ -667,6 +670,7 @@ unsigned int GetP2SHSigOpCount(const CTransaction& tx, CCoinsViewCache& inputs) int CMerkleTx::SetMerkleBranch(const CBlock* pblock) { + AssertLockHeld(cs_main); CBlock blockTmp; if (pblock == NULL) { @@ -813,6 +817,7 @@ int64_t GetMinFee(const CTransaction& tx, unsigned int nBytes, bool fAllowFree, bool AcceptToMemoryPool(CTxMemPool& pool, CValidationState &state, const CTransaction &tx, bool fLimitFree, bool* pfMissingInputs, bool fRejectInsaneFee) { + AssertLockHeld(cs_main); if (pfMissingInputs) *pfMissingInputs = false; @@ -958,6 +963,7 @@ int CMerkleTx::GetDepthInMainChainINTERNAL(CBlockIndex* &pindexRet) const { if (hashBlock == 0 || nIndex == -1) return 0; + AssertLockHeld(cs_main); // Find the block it claims to be in map<uint256, CBlockIndex*>::iterator mi = mapBlockIndex.find(hashBlock); @@ -981,6 +987,7 @@ int CMerkleTx::GetDepthInMainChainINTERNAL(CBlockIndex* &pindexRet) const int CMerkleTx::GetDepthInMainChain(CBlockIndex* &pindexRet) const { + AssertLockHeld(cs_main); int nResult = GetDepthInMainChainINTERNAL(pindexRet); if (nResult == 0 && !mempool.exists(GetHash())) return -1; // Not in chain, not in mempool @@ -1026,11 +1033,11 @@ bool GetTransaction(const uint256 &hash, CTransaction &txOut, uint256 &hashBlock fseek(file, postx.nTxOffset, SEEK_CUR); file >> txOut; } catch (std::exception &e) { - return error("%s : Deserialize or I/O error - %s", __PRETTY_FUNCTION__, e.what()); + return error("%s : Deserialize or I/O error - %s", __func__, e.what()); } hashBlock = header.GetHash(); if (txOut.GetHash() != hash) - return error("%s : txid mismatch", __PRETTY_FUNCTION__); + return error("%s : txid mismatch", __func__); return true; } } @@ -1114,7 +1121,7 @@ bool ReadBlockFromDisk(CBlock& block, const CDiskBlockPos& pos) filein >> block; } catch (std::exception &e) { - return error("%s : Deserialize or I/O error - %s", __PRETTY_FUNCTION__, e.what()); + return error("%s : Deserialize or I/O error - %s", __func__, e.what()); } // Check the header @@ -1304,6 +1311,7 @@ int GetNumBlocksOfPeers() bool IsInitialBlockDownload() { + LOCK(cs_main); if (fImporting || fReindex || chainActive.Height() < Checkpoints::GetTotalBlocksEstimate()) return true; static int64_t nLastUpdate; @@ -1323,6 +1331,7 @@ CBlockIndex *pindexBestForkTip = NULL, *pindexBestForkBase = NULL; void CheckForkWarningConditions() { + AssertLockHeld(cs_main); // Before we get past initial download, we cannot reliably alert about forks // (we assume we don't get stuck on a fork before the last checkpoint) if (IsInitialBlockDownload()) @@ -1368,6 +1377,7 @@ void CheckForkWarningConditions() void CheckForkWarningConditionsOnNewFork(CBlockIndex* pindexNewForkTip) { + AssertLockHeld(cs_main); // If we are on a fork that is sufficiently large, set a warning flag CBlockIndex* pfork = pindexNewForkTip; CBlockIndex* plonger = chainActive.Tip(); @@ -1718,6 +1728,7 @@ void ThreadScriptCheck() { bool ConnectBlock(CBlock& block, CValidationState& state, CBlockIndex* pindex, CCoinsViewCache& view, bool fJustCheck) { + AssertLockHeld(cs_main); // Check it again in case a previous version let a bad block in if (!CheckBlock(block, state, !fJustCheck, !fJustCheck)) return false; @@ -2078,6 +2089,7 @@ void static FindMostWorkChain() { // Try to activate to the most-work chain (thereby connecting it). bool ActivateBestChain(CValidationState &state) { + LOCK(cs_main); CBlockIndex *pindexOldTip = chainActive.Tip(); bool fComplete = false; while (!fComplete) { @@ -2162,6 +2174,7 @@ bool AddToBlockIndex(CBlock& block, CValidationState& state, const CDiskBlockPos if (!ActivateBestChain(state)) return false; + LOCK(cs_main); if (pindexNew == chainActive.Tip()) { // Clear fork warning if its no longer applicable @@ -2344,6 +2357,7 @@ bool CheckBlock(const CBlock& block, CValidationState& state, bool fCheckPOW, bo bool AcceptBlock(CBlock& block, CValidationState& state, CDiskBlockPos* dbp) { + AssertLockHeld(cs_main); // Check for duplicate uint256 hash = block.GetHash(); if (mapBlockIndex.count(hash)) @@ -2455,6 +2469,7 @@ bool CBlockIndex::IsSuperMajority(int minVersion, const CBlockIndex* pstart, uns int64_t CBlockIndex::GetMedianTime() const { + AssertLockHeld(cs_main); const CBlockIndex* pindex = this; for (int i = 0; i < nMedianTimeSpan/2; i++) { @@ -2467,6 +2482,7 @@ int64_t CBlockIndex::GetMedianTime() const void PushGetBlocks(CNode* pnode, CBlockIndex* pindexBegin, uint256 hashEnd) { + AssertLockHeld(cs_main); // Filter out duplicate requests if (pindexBegin == pnode->pindexLastGetBlocksBegin && hashEnd == pnode->hashLastGetBlocksEnd) return; @@ -2948,6 +2964,7 @@ bool LoadBlockIndex() bool InitBlockIndex() { + LOCK(cs_main); // Check whether we're already initialized if (chainActive.Genesis() != NULL) return true; @@ -2983,6 +3000,7 @@ bool InitBlockIndex() { void PrintBlockTree() { + AssertLockHeld(cs_main); // pre-compute tree structure map<CBlockIndex*, vector<CBlockIndex*> > mapNext; for (map<uint256, CBlockIndex*>::iterator mi = mapBlockIndex.begin(); mi != mapBlockIndex.end(); ++mi) @@ -3075,11 +3093,11 @@ bool LoadExternalBlockFile(FILE* fileIn, CDiskBlockPos *dbp) unsigned int nSize = 0; try { // locate a header - unsigned char buf[4]; + unsigned char buf[MESSAGE_START_SIZE]; blkdat.FindByte(Params().MessageStart()[0]); nRewind = blkdat.GetPos()+1; blkdat >> FLATDATA(buf); - if (memcmp(buf, Params().MessageStart(), 4)) + if (memcmp(buf, Params().MessageStart(), MESSAGE_START_SIZE)) continue; // read size blkdat >> nSize; @@ -3109,7 +3127,7 @@ bool LoadExternalBlockFile(FILE* fileIn, CDiskBlockPos *dbp) break; } } catch (std::exception &e) { - LogPrintf("%s : Deserialize or I/O error - %s", __PRETTY_FUNCTION__, e.what()); + LogPrintf("%s : Deserialize or I/O error - %s", __func__, e.what()); } } fclose(fileIn); @@ -4186,6 +4204,10 @@ bool SendMessages(CNode* pto, bool fSendTrickle) } } + TRY_LOCK(cs_main, lockMain); // Acquire cs_main for IsInitialBlockDownload() and CNodeState() + if (!lockMain) + return true; + // Address refresh broadcast static int64_t nLastRebroadcast; if (!IsInitialBlockDownload() && (GetTime() - nLastRebroadcast > 24 * 60 * 60)) @@ -4236,10 +4258,6 @@ bool SendMessages(CNode* pto, bool fSendTrickle) pto->PushMessage("addr", vAddr); } - TRY_LOCK(cs_main, lockMain); - if (!lockMain) - return true; - CNodeState &state = *State(pto->GetId()); if (state.fShouldBan) { if (pto->addr.IsLocal()) diff --git a/src/main.h b/src/main.h index aff20d0379..825e577d1e 100644 --- a/src/main.h +++ b/src/main.h @@ -381,7 +381,7 @@ public: filein >> hashChecksum; } catch (std::exception &e) { - return error("%s : Deserialize or I/O error - %s", __PRETTY_FUNCTION__, e.what()); + return error("%s : Deserialize or I/O error - %s", __func__, e.what()); } // Verify checksum diff --git a/src/net.cpp b/src/net.cpp index 657a39bcff..a0208c9605 100644 --- a/src/net.cpp +++ b/src/net.cpp @@ -946,11 +946,7 @@ void ThreadSocketHandler() } else if (nInbound >= nMaxConnections - MAX_OUTBOUND_CONNECTIONS) { - { - LOCK(cs_setservAddNodeAddresses); - if (!setservAddNodeAddresses.count(addr)) - closesocket(hSocket); - } + closesocket(hSocket); } else if (CNode::IsBanned(addr)) { diff --git a/src/netbase.cpp b/src/netbase.cpp index d5b75d6afd..2b300e5dd3 100644 --- a/src/netbase.cpp +++ b/src/netbase.cpp @@ -293,8 +293,10 @@ bool static Socks5(string strDest, int port, SOCKET& hSocket) case 0x03: { ret = recv(hSocket, pchRet3, 1, 0) != 1; - if (ret) + if (ret) { + closesocket(hSocket); return error("Error reading from proxy"); + } int nRecv = pchRet3[0]; ret = recv(hSocket, pchRet3, nRecv, 0) != nRecv; break; @@ -501,6 +503,7 @@ bool ConnectSocket(const CService &addrDest, SOCKET& hSocketRet, int nTimeout) return false; break; default: + closesocket(hSocket); return false; } @@ -532,7 +535,9 @@ bool ConnectSocketByName(CService &addr, SOCKET& hSocketRet, const char *pszDest switch(nameproxy.second) { default: - case 4: return false; + case 4: + closesocket(hSocket); + return false; case 5: if (!Socks5(strDest, port, hSocket)) return false; diff --git a/src/qt/Makefile.am b/src/qt/Makefile.am index dd0aa1f3f9..44d2964501 100644 --- a/src/qt/Makefile.am +++ b/src/qt/Makefile.am @@ -25,7 +25,6 @@ QT_TS = \ locale/bitcoin_cs.ts \ locale/bitcoin_cy.ts \ locale/bitcoin_da.ts \ - locale/bitcoin_de_AT.ts \ locale/bitcoin_de.ts \ locale/bitcoin_el_GR.ts \ locale/bitcoin_en.ts \ @@ -212,7 +211,8 @@ BITCOIN_QT_H = \ walletframe.h \ walletmodel.h \ walletmodeltransaction.h \ - walletview.h + walletview.h \ + winshutdownmonitor.h RES_ICONS = \ res/icons/add.png \ @@ -278,7 +278,8 @@ BITCOIN_QT_CPP = \ rpcconsole.cpp \ splashscreen.cpp \ trafficgraphwidget.cpp \ - utilitydialog.cpp + utilitydialog.cpp \ + winshutdownmonitor.cpp if ENABLE_WALLET BITCOIN_QT_CPP += \ diff --git a/src/qt/bitcoin.cpp b/src/qt/bitcoin.cpp index 696e65ec19..c05692efa3 100644 --- a/src/qt/bitcoin.cpp +++ b/src/qt/bitcoin.cpp @@ -15,6 +15,7 @@ #include "optionsmodel.h" #include "splashscreen.h" #include "utilitydialog.h" +#include "winshutdownmonitor.h" #ifdef ENABLE_WALLET #include "paymentserver.h" #include "walletmodel.h" @@ -189,6 +190,9 @@ public: /// Get process return value int getReturnValue() { return returnValue; } + /// Get window identifier of QMainWindow (BitcoinGUI) + WId getMainWinId() const; + public slots: void initializeResult(int retval); void shutdownResult(int retval); @@ -444,6 +448,14 @@ void BitcoinApplication::handleRunawayException(const QString &message) ::exit(1); } +WId BitcoinApplication::getMainWinId() const +{ + if (!window) + return 0; + + return window->winId(); +} + #ifndef BITCOIN_QT_TEST int main(int argc, char *argv[]) { @@ -558,10 +570,15 @@ int main(int argc, char *argv[]) /// 9. Main GUI initialization // Install global event filter that makes sure that long tooltips can be word-wrapped app.installEventFilter(new GUIUtil::ToolTipToRichTextFilter(TOOLTIP_WRAP_THRESHOLD, &app)); - // Install qDebug() message handler to route to debug.log #if QT_VERSION < 0x050000 + // Install qDebug() message handler to route to debug.log qInstallMsgHandler(DebugMessageHandler); #else +#if defined(Q_OS_WIN) + // Install global event filter for processing Windows session related Windows messages (WM_QUERYENDSESSION and WM_ENDSESSION) + qApp->installNativeEventFilter(new WinShutdownMonitor()); +#endif + // Install qDebug() message handler to route to debug.log qInstallMessageHandler(DebugMessageHandler); #endif // Load GUI settings from QSettings @@ -577,6 +594,9 @@ int main(int argc, char *argv[]) { app.createWindow(isaTestNet); app.requestInitialize(); +#if defined(Q_OS_WIN) && QT_VERSION >= 0x050000 + WinShutdownMonitor::registerShutdownBlockReason(QObject::tr("Bitcoin Core did't yet exit safely..."), (HWND)app.getMainWinId()); +#endif app.exec(); app.requestShutdown(); app.exec(); diff --git a/src/qt/bitcoin.qrc b/src/qt/bitcoin.qrc index 263ff5f7eb..75078581ce 100644 --- a/src/qt/bitcoin.qrc +++ b/src/qt/bitcoin.qrc @@ -98,7 +98,6 @@ <file alias="cs">locale/bitcoin_cs.qm</file> <file alias="cy">locale/bitcoin_cy.qm</file> <file alias="da">locale/bitcoin_da.qm</file> - <file alias="de_AT">locale/bitcoin_de_AT.qm</file> <file alias="de">locale/bitcoin_de.qm</file> <file alias="el_GR">locale/bitcoin_el_GR.qm</file> <file alias="en">locale/bitcoin_en.qm</file> diff --git a/src/qt/bitcoinstrings.cpp b/src/qt/bitcoinstrings.cpp index c01b873286..10b44bbc3f 100644 --- a/src/qt/bitcoinstrings.cpp +++ b/src/qt/bitcoinstrings.cpp @@ -36,6 +36,9 @@ QT_TRANSLATE_NOOP("bitcoin-core", "" "Cannot obtain a lock on data directory %s. Bitcoin Core is probably already " "running."), QT_TRANSLATE_NOOP("bitcoin-core", "" +"Continuously rate-limit free transactions to <n>*1000 bytes per minute " +"(default:15)"), +QT_TRANSLATE_NOOP("bitcoin-core", "" "Enter regression test mode, which uses a special chain in which blocks can " "be solved instantly. This is intended for regression testing tools and app " "development."), @@ -61,6 +64,17 @@ QT_TRANSLATE_NOOP("bitcoin-core", "" "Execute command when the best block changes (%s in cmd is replaced by block " "hash)"), QT_TRANSLATE_NOOP("bitcoin-core", "" +"Fees smaller than this are considered zero fee (for transaction creation) " +"(default:"), +QT_TRANSLATE_NOOP("bitcoin-core", "" +"Flush database activity from memory pool to disk log every <n> megabytes " +"(default: 100)"), +QT_TRANSLATE_NOOP("bitcoin-core", "" +"How thorough the block verification of -checkblocks is (0-4, default: 3)"), +QT_TRANSLATE_NOOP("bitcoin-core", "" +"In this mode -genproclimit controls how many blocks are generated " +"immediately."), +QT_TRANSLATE_NOOP("bitcoin-core", "" "Listen for JSON-RPC connections on <port> (default: 8332 or testnet: 18332)"), QT_TRANSLATE_NOOP("bitcoin-core", "" "Number of seconds to keep misbehaving peers from reconnecting (default: " @@ -70,8 +84,11 @@ QT_TRANSLATE_NOOP("bitcoin-core", "" 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 (up to 16, 0 = auto, <0 = " -"leave that many cores free, default: 0)"), +"Set the number of script verification threads (%u to %d, 0 = auto, <0 = " +"leave that many cores free, default: %d)"), +QT_TRANSLATE_NOOP("bitcoin-core", "" +"Set the processor limit for when generation is on (-1 = unlimited, default: " +"-1)"), 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"), @@ -105,6 +122,8 @@ QT_TRANSLATE_NOOP("bitcoin-core", "" "%s\n" "If the file does not exist, create it with owner-readable-only file " "permissions."), +QT_TRANSLATE_NOOP("bitcoin-core", "(default: 1)"), +QT_TRANSLATE_NOOP("bitcoin-core", "(default: wallet.dat)"), 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)"), @@ -113,7 +132,7 @@ QT_TRANSLATE_NOOP("bitcoin-core", "Allow DNS lookups for -addnode, -seednode and QT_TRANSLATE_NOOP("bitcoin-core", "Allow JSON-RPC connections from specified IP address"), QT_TRANSLATE_NOOP("bitcoin-core", "Attempt to recover private keys from a corrupt wallet.dat"), QT_TRANSLATE_NOOP("bitcoin-core", "Bitcoin Core Daemon"), -QT_TRANSLATE_NOOP("bitcoin-core", "Bitcoin RPC client version"), +QT_TRANSLATE_NOOP("bitcoin-core", "Bitcoin Core RPC client version"), QT_TRANSLATE_NOOP("bitcoin-core", "Block creation options:"), QT_TRANSLATE_NOOP("bitcoin-core", "Cannot downgrade wallet"), QT_TRANSLATE_NOOP("bitcoin-core", "Cannot resolve -bind address: '%s'"), @@ -124,7 +143,10 @@ QT_TRANSLATE_NOOP("bitcoin-core", "Connect only to the specified node(s)"), QT_TRANSLATE_NOOP("bitcoin-core", "Connect through SOCKS proxy"), QT_TRANSLATE_NOOP("bitcoin-core", "Connect to JSON-RPC on <port> (default: 8332 or testnet: 18332)"), QT_TRANSLATE_NOOP("bitcoin-core", "Connect to a node to retrieve peer addresses, and disconnect"), +QT_TRANSLATE_NOOP("bitcoin-core", "Connection options:"), QT_TRANSLATE_NOOP("bitcoin-core", "Corrupted block database detected"), +QT_TRANSLATE_NOOP("bitcoin-core", "Debugging/Testing options:"), +QT_TRANSLATE_NOOP("bitcoin-core", "Disable safemode, override a real safe mode event (default: 0)"), 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?"), @@ -152,12 +174,14 @@ QT_TRANSLATE_NOOP("bitcoin-core", "Failed to write to coin database"), QT_TRANSLATE_NOOP("bitcoin-core", "Failed to write transaction index"), QT_TRANSLATE_NOOP("bitcoin-core", "Failed to write undo data"), QT_TRANSLATE_NOOP("bitcoin-core", "Fee per kB to add to transactions you send"), +QT_TRANSLATE_NOOP("bitcoin-core", "Fees smaller than this are considered zero fee (for relaying) (default:"), QT_TRANSLATE_NOOP("bitcoin-core", "Find peers using DNS lookup (default: 1 unless -connect)"), +QT_TRANSLATE_NOOP("bitcoin-core", "Force safe mode (default: 0)"), QT_TRANSLATE_NOOP("bitcoin-core", "Generate coins (default: 0)"), QT_TRANSLATE_NOOP("bitcoin-core", "Get help for a command"), QT_TRANSLATE_NOOP("bitcoin-core", "How many blocks to check at startup (default: 288, 0 = all)"), -QT_TRANSLATE_NOOP("bitcoin-core", "How thorough the block verification is (0-4, default: 3)"), QT_TRANSLATE_NOOP("bitcoin-core", "If <category> is not supplied, output all debugging information."), +QT_TRANSLATE_NOOP("bitcoin-core", "Importing..."), QT_TRANSLATE_NOOP("bitcoin-core", "Imports blocks from external blk000??.dat file"), QT_TRANSLATE_NOOP("bitcoin-core", "Incorrect or no genesis block found. Wrong datadir for network?"), QT_TRANSLATE_NOOP("bitcoin-core", "Information"), @@ -168,11 +192,13 @@ QT_TRANSLATE_NOOP("bitcoin-core", "Invalid amount for -minrelaytxfee=<amount>: ' QT_TRANSLATE_NOOP("bitcoin-core", "Invalid amount for -mintxfee=<amount>: '%s'"), QT_TRANSLATE_NOOP("bitcoin-core", "Invalid amount for -paytxfee=<amount>: '%s'"), QT_TRANSLATE_NOOP("bitcoin-core", "Invalid amount"), +QT_TRANSLATE_NOOP("bitcoin-core", "Limit size of signature cache to <n> entries (default: 50000)"), QT_TRANSLATE_NOOP("bitcoin-core", "List commands"), QT_TRANSLATE_NOOP("bitcoin-core", "Listen for connections on <port> (default: 8333 or testnet: 18333)"), 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", "Log transaction priority and fee per kB when mining blocks (default: 0)"), QT_TRANSLATE_NOOP("bitcoin-core", "Maintain a full transaction index (default: 0)"), QT_TRANSLATE_NOOP("bitcoin-core", "Maintain at most <n> connections to peers (default: 125)"), QT_TRANSLATE_NOOP("bitcoin-core", "Maximum per-connection receive buffer, <n>*1000 bytes (default: 5000)"), @@ -183,14 +209,21 @@ 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: 1)"), +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: 0)"), +QT_TRANSLATE_NOOP("bitcoin-core", "RPC SSL options: (see the Bitcoin Wiki for SSL setup instructions)"), QT_TRANSLATE_NOOP("bitcoin-core", "RPC client options:"), +QT_TRANSLATE_NOOP("bitcoin-core", "RPC server options:"), +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", "Rescan the block chain for missing wallet transactions"), QT_TRANSLATE_NOOP("bitcoin-core", "Rescanning..."), +QT_TRANSLATE_NOOP("bitcoin-core", "Run a thread to flush wallet periodically (default: 1)"), QT_TRANSLATE_NOOP("bitcoin-core", "Run in the background as a daemon and accept commands"), QT_TRANSLATE_NOOP("bitcoin-core", "SSL options: (see the Bitcoin Wiki for SSL setup instructions)"), QT_TRANSLATE_NOOP("bitcoin-core", "Select SOCKS version for -proxy (4 or 5, default: 5)"), -QT_TRANSLATE_NOOP("bitcoin-core", "Send command to Bitcoin server"), +QT_TRANSLATE_NOOP("bitcoin-core", "Send command to Bitcoin Core"), QT_TRANSLATE_NOOP("bitcoin-core", "Send commands to node running on <ip> (default: 127.0.0.1)"), QT_TRANSLATE_NOOP("bitcoin-core", "Send trace/debug info to console instead of debug.log file"), QT_TRANSLATE_NOOP("bitcoin-core", "Server certificate file (default: server.cert)"), @@ -200,6 +233,9 @@ QT_TRANSLATE_NOOP("bitcoin-core", "Set key pool size to <n> (default: 100)"), 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: 0)"), QT_TRANSLATE_NOOP("bitcoin-core", "Set the number of threads to service RPC calls (default: 4)"), +QT_TRANSLATE_NOOP("bitcoin-core", "Sets the DB_PRIVATE flag in the wallet db environment (default: 1)"), +QT_TRANSLATE_NOOP("bitcoin-core", "Show all debugging options (usage: --help -help-debug)"), +QT_TRANSLATE_NOOP("bitcoin-core", "Show benchmark information (default: 0)"), 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: bitcoin.conf)"), @@ -209,7 +245,7 @@ QT_TRANSLATE_NOOP("bitcoin-core", "Specify pid file (default: bitcoind.pid)"), 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: 1)"), -QT_TRANSLATE_NOOP("bitcoin-core", "Start Bitcoin server"), +QT_TRANSLATE_NOOP("bitcoin-core", "Start Bitcoin Core Daemon"), QT_TRANSLATE_NOOP("bitcoin-core", "System error: "), QT_TRANSLATE_NOOP("bitcoin-core", "This help message"), QT_TRANSLATE_NOOP("bitcoin-core", "This is intended for regression testing tools and app development."), @@ -240,6 +276,7 @@ QT_TRANSLATE_NOOP("bitcoin-core", "Warning: Deprecated argument -debugnet ignore QT_TRANSLATE_NOOP("bitcoin-core", "Warning: This version is obsolete, upgrade required!"), QT_TRANSLATE_NOOP("bitcoin-core", "You need to rebuild the database using -reindex to change -txindex"), QT_TRANSLATE_NOOP("bitcoin-core", "Zapping all transactions from wallet..."), +QT_TRANSLATE_NOOP("bitcoin-core", "on startup"), QT_TRANSLATE_NOOP("bitcoin-core", "version"), QT_TRANSLATE_NOOP("bitcoin-core", "wallet.dat corrupt, salvage failed"), }; diff --git a/src/qt/clientmodel.cpp b/src/qt/clientmodel.cpp index cb832fdd42..3c0564c208 100644 --- a/src/qt/clientmodel.cpp +++ b/src/qt/clientmodel.cpp @@ -55,6 +55,7 @@ int ClientModel::getNumConnections(unsigned int flags) const int ClientModel::getNumBlocks() const { + LOCK(cs_main); return chainActive.Height(); } @@ -76,6 +77,7 @@ quint64 ClientModel::getTotalBytesSent() const QDateTime ClientModel::getLastBlockDate() const { + LOCK(cs_main); if (chainActive.Tip()) return QDateTime::fromTime_t(chainActive.Tip()->GetBlockTime()); else @@ -84,11 +86,18 @@ QDateTime ClientModel::getLastBlockDate() const double ClientModel::getVerificationProgress() const { + LOCK(cs_main); return Checkpoints::GuessVerificationProgress(chainActive.Tip()); } void ClientModel::updateTimer() { + // Get required lock upfront. This avoids the GUI from getting stuck on + // periodical polls if the core is holding the locks for a longer time - + // for example, during a wallet rescan. + TRY_LOCK(cs_main, lockMain); + if(!lockMain) + return; // Some quantities (such as number of blocks) change so fast that we don't want to be notified for each change. // Periodically check and update with a timer. int newNumBlocks = getNumBlocks(); diff --git a/src/qt/forms/optionsdialog.ui b/src/qt/forms/optionsdialog.ui index 9fbc865185..0103842e02 100644 --- a/src/qt/forms/optionsdialog.ui +++ b/src/qt/forms/optionsdialog.ui @@ -472,6 +472,30 @@ </widget> </item> <item> + <layout class="QHBoxLayout" name="horizontalLayout_3_Display"> + <item> + <widget class="QLabel" name="thirdPartyTxUrlsLabel"> + <property name="toolTip"> + <string>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 |.</string> + </property> + <property name="text"> + <string>Third party transaction URLs</string> + </property> + <property name="buddy"> + <cstring>thirdPartyTxUrls</cstring> + </property> + </widget> + </item> + <item> + <widget class="QLineEdit" name="thirdPartyTxUrls"> + <property name="toolTip"> + <string>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 |.</string> + </property> + </widget> + </item> + </layout> + </item> + <item> <spacer name="verticalSpacer_Display"> <property name="orientation"> <enum>Qt::Vertical</enum> diff --git a/src/qt/locale/bitcoin_ar.ts b/src/qt/locale/bitcoin_ar.ts index 1ab281b3f0..8a4d4f074f 100644 --- a/src/qt/locale/bitcoin_ar.ts +++ b/src/qt/locale/bitcoin_ar.ts @@ -34,7 +34,7 @@ This product includes software developed by the OpenSSL Project for use in the O <message> <location line="+12"/> <location line="+2"/> - <source> (%1-bit)</source> + <source>(%1-bit)</source> <translation type="unfinished"/> </message> </context> @@ -66,7 +66,7 @@ This product includes software developed by the OpenSSL Project for use in the O <translation type="unfinished"/> </message> <message> - <location line="+52"/> + <location line="+58"/> <source>C&lose</source> <translation type="unfinished"/> </message> @@ -76,7 +76,7 @@ This product includes software developed by the OpenSSL Project for use in the O <translation>انسخ العنوان</translation> </message> <message> - <location filename="../forms/addressbookpage.ui" line="-41"/> + <location filename="../forms/addressbookpage.ui" line="-47"/> <source>Delete the currently selected address from the list</source> <translation type="unfinished"/> </message> @@ -325,7 +325,7 @@ This product includes software developed by the OpenSSL Project for use in the O <context> <name>BitcoinGUI</name> <message> - <location filename="../bitcoingui.cpp" line="+295"/> + <location filename="../bitcoingui.cpp" line="+294"/> <source>Sign &message...</source> <translation>التوقيع Ùˆ الرسائل</translation> </message> @@ -340,12 +340,12 @@ This product includes software developed by the OpenSSL Project for use in the O <translation>نظرة عامة</translation> </message> <message> - <location line="-137"/> + <location line="-136"/> <source>Node</source> <translation type="unfinished"/> </message> <message> - <location line="+138"/> + <location line="+137"/> <source>Show general overview of wallet</source> <translation>إظهار نظرة عامة على المØÙظة</translation> </message> @@ -466,17 +466,17 @@ This product includes software developed by the OpenSSL Project for use in the O <translation type="unfinished"/> </message> <message> - <location line="+430"/> + <location line="+440"/> <source>Bitcoin</source> <translation>بت كوين</translation> </message> <message> - <location line="-643"/> + <location line="-652"/> <source>Wallet</source> <translation>Ù…ØÙظة</translation> </message> <message> - <location line="+146"/> + <location line="+145"/> <source>&Send</source> <translation type="unfinished"/> </message> @@ -532,18 +532,18 @@ This product includes software developed by the OpenSSL Project for use in the O <translation>شريط أدوات علامات التبويب</translation> </message> <message> - <location line="-284"/> - <location line="+376"/> + <location line="-283"/> + <location line="+375"/> <source>[testnet]</source> <translation>[testnet]</translation> </message> <message> - <location line="-401"/> + <location line="-400"/> <source>Bitcoin Core</source> <translation type="unfinished"/> </message> <message> - <location line="+163"/> + <location line="+162"/> <source>Request payments (generates QR codes and bitcoin: URIs)</source> <translation type="unfinished"/> </message> @@ -605,7 +605,7 @@ This product includes software developed by the OpenSSL Project for use in the O <translation type="unfinished"/> </message> <message numerus="yes"> - <location line="+23"/> + <location line="+27"/> <source>%n hour(s)</source> <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation> </message> @@ -616,10 +616,21 @@ This product includes software developed by the OpenSSL Project for use in the O </message> <message numerus="yes"> <location line="+4"/> + <location line="+6"/> <source>%n week(s)</source> <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation> </message> <message> + <location line="+0"/> + <source>%1 and %2</source> + <translation type="unfinished"/> + </message> + <message numerus="yes"> + <location line="+0"/> + <source>%n year(s)</source> + <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation> + </message> + <message> <location line="+4"/> <source>%1 behind</source> <translation type="unfinished"/> @@ -650,12 +661,12 @@ This product includes software developed by the OpenSSL Project for use in the O <translation type="unfinished"/> </message> <message> - <location line="-85"/> + <location line="-95"/> <source>Up to date</source> <translation>Ù…Øين</translation> </message> <message> - <location line="+34"/> + <location line="+44"/> <source>Catching up...</source> <translation>اللØاق بالركب ...</translation> </message> @@ -689,7 +700,7 @@ Address: %4 <translation>المØÙظة مشÙرة Ùˆ مقÙلة Øاليا</translation> </message> <message> - <location filename="../bitcoin.cpp" line="+435"/> + <location filename="../bitcoin.cpp" line="+443"/> <source>A fatal error occurred. Bitcoin can no longer continue safely and will quit.</source> <translation type="unfinished"/> </message> @@ -697,7 +708,7 @@ Address: %4 <context> <name>ClientModel</name> <message> - <location filename="../clientmodel.cpp" line="+119"/> + <location filename="../clientmodel.cpp" line="+128"/> <source>Network Alert</source> <translation type="unfinished"/> </message> @@ -795,7 +806,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location filename="../coincontroldialog.cpp" line="+42"/> + <location filename="../coincontroldialog.cpp" line="+41"/> <source>Copy address</source> <translation> انسخ عنوان</translation> </message> @@ -861,7 +872,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+323"/> + <location line="+332"/> <source>highest</source> <translation type="unfinished"/> </message> @@ -911,7 +922,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+31"/> + <location line="+32"/> <source>none</source> <translation type="unfinished"/> </message> @@ -979,12 +990,12 @@ Address: %4 </message> <message> <location line="+43"/> - <location line="+66"/> + <location line="+61"/> <source>(no label)</source> <translation>(لا وصÙ)</translation> </message> <message> - <location line="-9"/> + <location line="-7"/> <source>change from %1 (%2)</source> <translation type="unfinished"/> </message> @@ -1066,7 +1077,7 @@ Address: %4 <context> <name>FreespaceChecker</name> <message> - <location filename="../intro.cpp" line="+65"/> + <location filename="../intro.cpp" line="+68"/> <source>A new data directory will be created.</source> <translation type="unfinished"/> </message> @@ -1124,7 +1135,7 @@ Address: %4 <translation>خيارات UI</translation> </message> <message> - <location line="+1"/> + <location line="+2"/> <source>Set language, for example "de_DE" (default: system locale)</source> <translation type="unfinished"/> </message> @@ -1135,11 +1146,16 @@ Address: %4 </message> <message> <location line="+1"/> - <source>Show splash screen on startup (default: 1)</source> + <source>Set SSL root certificates for payment request (default: -system-)</source> <translation type="unfinished"/> </message> <message> <location line="+1"/> + <source>Show splash screen on startup (default: 1)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="-4"/> <source>Choose data directory on startup (default: 0)</source> <translation type="unfinished"/> </message> @@ -1177,7 +1193,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location filename="../intro.cpp" line="+85"/> + <location filename="../intro.cpp" line="+82"/> <source>Bitcoin</source> <translation>بت كوين</translation> </message> @@ -1187,7 +1203,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+19"/> + <location line="+24"/> <source>Error</source> <translation>خطأ</translation> </message> @@ -1243,7 +1259,7 @@ Address: %4 <translation>الرئيسي</translation> </message> <message> - <location line="+122"/> + <location line="+116"/> <source>Optional transaction fee per kB that helps make sure your transactions are processed quickly. Most transactions are 1 kB.</source> <translation type="unfinished"/> </message> @@ -1253,7 +1269,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="-131"/> + <location line="-125"/> <source>Automatically start Bitcoin after logging in to the system.</source> <translation type="unfinished"/> </message> @@ -1278,17 +1294,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+13"/> - <source>Set the number of script verification threads (up to 16, 0 = auto, <0 = leave that many cores free, default: 0)</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+107"/> - <source>&Spend unconfirmed change (experts only)</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+37"/> + <location line="+160"/> <source>Connect to the Bitcoin network through a SOCKS proxy.</source> <translation type="unfinished"/> </message> @@ -1303,7 +1309,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+224"/> + <location line="+214"/> <source>Active command-line options that override above options:</source> <translation type="unfinished"/> </message> @@ -1318,22 +1324,42 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="-323"/> + <location line="-313"/> <source>&Network</source> <translation type="unfinished"/> </message> <message> - <location line="-86"/> + <location line="-131"/> + <source>(0 = auto, <0 = leave that many cores free)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+36"/> <source>W&allet</source> <translation type="unfinished"/> </message> <message> - <location line="+52"/> + <location line="+65"/> + <source>Expert</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+9"/> + <source>Enable coin &control features</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+7"/> <source>If you disable the spending of unconfirmed change, the change from a transaction cannot be used until that transaction has at least one confirmation. This also affects how your balance is computed.</source> <translation type="unfinished"/> </message> <message> - <location line="+40"/> + <location line="+3"/> + <source>&Spend unconfirmed change</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+17"/> <source>Automatically open the Bitcoin client port on the router. This only works when your router supports UPnP and it is enabled.</source> <translation type="unfinished"/> </message> @@ -1428,17 +1454,12 @@ Address: %4 <translation>عرض العناوين ÙÙŠ قائمة الصÙقة</translation> </message> <message> - <location line="+7"/> + <location line="-262"/> <source>Whether to show coin control features or not.</source> <translation type="unfinished"/> </message> <message> - <location line="+3"/> - <source>Display coin &control features (experts only)</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+136"/> + <location line="+398"/> <source>&OK</source> <translation>تم</translation> </message> @@ -1448,7 +1469,7 @@ Address: %4 <translation>الغاء</translation> </message> <message> - <location filename="../optionsdialog.cpp" line="+70"/> + <location filename="../optionsdialog.cpp" line="+72"/> <source>default</source> <translation>الاÙتراضي</translation> </message> @@ -1458,7 +1479,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+78"/> + <location line="+80"/> <source>Confirm options reset</source> <translation type="unfinished"/> </message> @@ -1651,23 +1672,29 @@ Address: %4 <context> <name>QObject</name> <message> - <location filename="../bitcoin.cpp" line="+71"/> - <location line="+11"/> + <location filename="../bitcoin.cpp" line="+63"/> + <location line="+7"/> + <location line="+13"/> <source>Bitcoin</source> <translation>بت كوين</translation> </message> <message> - <location line="+1"/> + <location line="-19"/> <source>Error: Specified data directory "%1" does not exist.</source> <translation type="unfinished"/> </message> <message> - <location line="-12"/> + <location line="+7"/> + <source>Error: Cannot parse configuration file: %1. Only use key=value syntax.</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+12"/> <source>Error: Invalid combination of -regtest and -testnet.</source> <translation type="unfinished"/> </message> <message> - <location filename="../guiutil.cpp" line="+82"/> + <location filename="../guiutil.cpp" line="+89"/> <source>Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source> <translation>إدخال عنوانBitcoin (مثال :1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation> </message> @@ -1713,7 +1740,7 @@ Address: %4 <location line="+36"/> <location line="+23"/> <location line="+23"/> - <location filename="../rpcconsole.cpp" line="+359"/> + <location filename="../rpcconsole.cpp" line="+373"/> <source>N/A</source> <translation>غير معروÙ</translation> </message> @@ -1809,11 +1836,13 @@ Address: %4 </message> <message> <location line="+64"/> + <location filename="../rpcconsole.cpp" line="-10"/> <source>In:</source> <translation type="unfinished"/> </message> <message> <location line="+80"/> + <location filename="../rpcconsole.cpp" line="+1"/> <source>Out:</source> <translation type="unfinished"/> </message> @@ -1838,7 +1867,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location filename="../rpcconsole.cpp" line="-30"/> + <location filename="../rpcconsole.cpp" line="-35"/> <source>Welcome to the Bitcoin RPC console.</source> <translation type="unfinished"/> </message> @@ -1853,7 +1882,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+122"/> + <location line="+136"/> <source>%1 B</source> <translation type="unfinished"/> </message> @@ -1969,7 +1998,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+11"/> + <location line="+14"/> <source>Remove the selected entries from the list</source> <translation type="unfinished"/> </message> @@ -1979,7 +2008,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location filename="../receivecoinsdialog.cpp" line="+38"/> + <location filename="../receivecoinsdialog.cpp" line="+39"/> <source>Copy label</source> <translation> انسخ التسمية</translation> </message> @@ -2200,12 +2229,12 @@ Address: %4 <translation>Ù…Ø³Ø Ø§Ù„ÙƒÙ„</translation> </message> <message> - <location line="+52"/> + <location line="+58"/> <source>Balance:</source> <translation>الرصيد:</translation> </message> <message> - <location line="-78"/> + <location line="-84"/> <source>Confirm the send action</source> <translation>تأكيد الإرسال</translation> </message> @@ -2450,7 +2479,7 @@ Address: %4 <context> <name>ShutdownWindow</name> <message> - <location filename="../utilitydialog.cpp" line="+48"/> + <location filename="../utilitydialog.cpp" line="+52"/> <source>Bitcoin Core is shutting down...</source> <translation type="unfinished"/> </message> @@ -2650,7 +2679,7 @@ Address: %4 <context> <name>SplashScreen</name> <message> - <location filename="../splashscreen.cpp" line="+28"/> + <location filename="../splashscreen.cpp" line="+32"/> <source>Bitcoin Core</source> <translation type="unfinished"/> </message> @@ -3103,7 +3132,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+142"/> + <location line="+140"/> <source>Export Transaction History</source> <translation type="unfinished"/> </message> @@ -3197,7 +3226,7 @@ Address: %4 <context> <name>WalletView</name> <message> - <location filename="../walletview.cpp" line="+43"/> + <location filename="../walletview.cpp" line="+44"/> <source>&Export</source> <translation type="unfinished"/> </message> @@ -3207,7 +3236,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+181"/> + <location line="+184"/> <source>Backup Wallet</source> <translation type="unfinished"/> </message> @@ -3240,12 +3269,12 @@ Address: %4 <context> <name>bitcoin-core</name> <message> - <location filename="../bitcoinstrings.cpp" line="+223"/> + <location filename="../bitcoinstrings.cpp" line="+261"/> <source>Usage:</source> <translation>المستخدم</translation> </message> <message> - <location line="-55"/> + <location line="-66"/> <source>List commands</source> <translation>اعرض الأوامر</translation> </message> @@ -3255,12 +3284,12 @@ Address: %4 <translation>مساعدة ÙÙŠ كتابة الاوامر</translation> </message> <message> - <location line="+26"/> + <location line="+27"/> <source>Options:</source> <translation>خيارات: </translation> </message> <message> - <location line="+22"/> + <location line="+32"/> <source>Specify configuration file (default: bitcoin.conf)</source> <translation type="unfinished"/> </message> @@ -3275,27 +3304,22 @@ Address: %4 <translation>Øدد موقع مجلد المعلومات او data directory</translation> </message> <message> - <location line="-9"/> - <source>Set database cache size in megabytes (default: 25)</source> - <translation>ضع Øجم كاش قاعدة البيانات بالميجابايت (الاÙتراضي: 25)</translation> - </message> - <message> - <location line="-26"/> + <location line="-46"/> <source>Listen for connections on <port> (default: 8333 or testnet: 18333)</source> <translation type="unfinished"/> </message> <message> - <location line="+5"/> + <location line="+6"/> <source>Maintain at most <n> connections to peers (default: 125)</source> <translation type="unfinished"/> </message> <message> - <location line="-51"/> + <location line="-57"/> <source>Connect to a node to retrieve peer addresses, and disconnect</source> <translation type="unfinished"/> </message> <message> - <location line="+84"/> + <location line="+100"/> <source>Specify your own public address</source> <translation type="unfinished"/> </message> @@ -3305,42 +3329,47 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="-150"/> + <location line="-172"/> <source>Number of seconds to keep misbehaving peers from reconnecting (default: 86400)</source> <translation type="unfinished"/> </message> <message> - <location line="-36"/> + <location line="-52"/> <source>An error occurred while setting up the RPC port %u for listening on IPv4: %s</source> <translation type="unfinished"/> </message> <message> - <location line="+34"/> + <location line="+50"/> <source>Listen for JSON-RPC connections on <port> (default: 8332 or testnet: 18332)</source> <translation type="unfinished"/> </message> <message> - <location line="+45"/> + <location line="+51"/> <source>Accept command line and JSON-RPC commands</source> <translation type="unfinished"/> </message> <message> - <location line="+81"/> + <location line="+7"/> + <source>Bitcoin Core RPC client version</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+87"/> <source>Run in the background as a daemon and accept commands</source> <translation type="unfinished"/> </message> <message> - <location line="+40"/> + <location line="+43"/> <source>Use the test network</source> <translation>استخدم التØقق من الشبكه</translation> </message> <message> - <location line="-120"/> + <location line="-136"/> <source>Accept connections from outside (default: 1 if no -proxy or -connect)</source> <translation>قبول الاتصالات من خارج</translation> </message> <message> - <location line="-95"/> + <location line="-117"/> <source>%s, you must set a rpcpassword in the configuration file: %s It is recommended you use the following random password: @@ -3370,8 +3399,8 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+3"/> - <source>Cannot obtain a lock on data directory %s. Bitcoin is probably already running.</source> + <location line="+6"/> + <source>Continuously rate-limit free transactions to <n>*1000 bytes per minute (default:15)</source> <translation type="unfinished"/> </message> <message> @@ -3386,6 +3415,11 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. </message> <message> <location line="+3"/> + <source>Error: Listening for incoming connections failed (listen returned error %d)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+2"/> <source>Error: The transaction was rejected! This might happen if some of the coins in your wallet were already spent, such as if you used a copy of wallet.dat and coins were spent in the copy but not marked as spent here.</source> <translation type="unfinished"/> </message> @@ -3400,12 +3434,47 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+18"/> + <location line="+6"/> + <source>Fees smaller than this are considered zero fee (for transaction creation) (default:</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+3"/> + <source>Flush database activity from memory pool to disk log every <n> megabytes (default: 100)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+3"/> + <source>How thorough the block verification of -checkblocks is (0-4, default: 3)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+2"/> + <source>In this mode -genproclimit controls how many blocks are generated immediately.</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+12"/> + <source>Set the number of script verification threads (%u to %d, 0 = auto, <0 = leave that many cores free, default: %d)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+3"/> + <source>Set the processor limit for when generation is on (-1 = unlimited, default: -1)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+3"/> <source>This is a pre-release test build - use at your own risk - do not use for mining or merchant applications</source> <translation type="unfinished"/> </message> <message> - <location line="+5"/> + <location line="+3"/> + <source>Unable to bind to %s on this computer. Bitcoin Core is probably already running.</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+3"/> <source>Use separate SOCKS5 proxy to reach peers via Tor hidden services (default: -proxy)</source> <translation type="unfinished"/> </message> @@ -3441,26 +3510,31 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. </message> <message> <location line="+9"/> - <source><category> can be:</source> + <source>(default: 1)</source> <translation type="unfinished"/> </message> <message> - <location line="+6"/> - <source>Attempt to recover private keys from a corrupt wallet.dat</source> + <location line="+1"/> + <source>(default: wallet.dat)</source> <translation type="unfinished"/> </message> <message> <location line="+1"/> - <source>Bitcoin Core Daemon</source> + <source><category> can be:</source> <translation type="unfinished"/> </message> <message> - <location line="+1"/> - <source>Bitcoin RPC client version</source> + <location line="+6"/> + <source>Attempt to recover private keys from a corrupt wallet.dat</source> <translation type="unfinished"/> </message> <message> <location line="+1"/> + <source>Bitcoin Core Daemon</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+2"/> <source>Block creation options:</source> <translation type="unfinished"/> </message> @@ -3486,11 +3560,26 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. </message> <message> <location line="+2"/> + <source>Connection options:</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> <source>Corrupted block database detected</source> <translation type="unfinished"/> </message> <message> <location line="+1"/> + <source>Debugging/Testing options:</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>Disable safemode, override a real safe mode event (default: 0)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> <source>Discover own IP address (default: 1 when listening and no -externalip)</source> <translation type="unfinished"/> </message> @@ -3601,22 +3690,27 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. </message> <message> <location line="+1"/> - <source>Find peers using DNS lookup (default: 1 unless -connect)</source> + <source>Fees smaller than this are considered zero fee (for relaying) (default:</source> <translation type="unfinished"/> </message> <message> <location line="+1"/> - <source>Generate coins (default: 0)</source> + <source>Find peers using DNS lookup (default: 1 unless -connect)</source> <translation type="unfinished"/> </message> <message> - <location line="+2"/> - <source>How many blocks to check at startup (default: 288, 0 = all)</source> + <location line="+1"/> + <source>Force safe mode (default: 0)</source> <translation type="unfinished"/> </message> <message> <location line="+1"/> - <source>How thorough the block verification is (0-4, default: 3)</source> + <source>Generate coins (default: 0)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+2"/> + <source>How many blocks to check at startup (default: 288, 0 = all)</source> <translation type="unfinished"/> </message> <message> @@ -3635,7 +3729,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+15"/> + <location line="+17"/> <source>Not enough file descriptors available.</source> <translation type="unfinished"/> </message> @@ -3645,27 +3739,27 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+1"/> + <location line="+4"/> <source>RPC client options:</source> <translation type="unfinished"/> </message> <message> - <location line="+1"/> + <location line="+4"/> <source>Rebuild block chain index from current blk000??.dat files</source> <translation type="unfinished"/> </message> <message> - <location line="+5"/> + <location line="+6"/> <source>Select SOCKS version for -proxy (4 or 5, default: 5)</source> <translation type="unfinished"/> </message> <message> - <location line="+1"/> - <source>Send command to Bitcoin server</source> + <location line="+6"/> + <source>Set database cache size in megabytes (%d to %d, default: %d)</source> <translation type="unfinished"/> </message> <message> - <location line="+7"/> + <location line="+2"/> <source>Set maximum block size in bytes (default: %d)</source> <translation type="unfinished"/> </message> @@ -3675,7 +3769,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+7"/> + <location line="+10"/> <source>Specify wallet file (within data directory)</source> <translation type="unfinished"/> </message> @@ -3685,12 +3779,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+1"/> - <source>Start Bitcoin server</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+3"/> + <location line="+4"/> <source>This is intended for regression testing tools and app development.</source> <translation type="unfinished"/> </message> @@ -3735,32 +3824,32 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="-80"/> + <location line="-92"/> <source>Imports blocks from external blk000??.dat file</source> <translation type="unfinished"/> </message> <message> - <location line="-106"/> - <source>Execute command when a relevant alert is received or we see a really long fork (%s in cmd is replaced by message)</source> + <location line="-149"/> + <source>Cannot obtain a lock on data directory %s. Bitcoin Core is probably already running.</source> <translation type="unfinished"/> </message> <message> - <location line="+14"/> - <source>Output debugging information (default: 0, supplying <category> is optional)</source> + <location line="+22"/> + <source>Execute command when a relevant alert is received or we see a really long fork (%s in cmd is replaced by message)</source> <translation type="unfinished"/> </message> <message> - <location line="+2"/> - <source>Set maximum size of high-priority/low-fee transactions in bytes (default: %d)</source> + <location line="+25"/> + <source>Output debugging information (default: 0, supplying <category> is optional)</source> <translation type="unfinished"/> </message> <message> <location line="+2"/> - <source>Set the number of script verification threads (up to 16, 0 = auto, <0 = leave that many cores free, default: 0)</source> + <source>Set maximum size of high-priority/low-fee transactions in bytes (default: %d)</source> <translation type="unfinished"/> </message> <message> - <location line="+90"/> + <location line="+102"/> <source>Information</source> <translation type="unfinished"/> </message> @@ -3775,7 +3864,17 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+8"/> + <location line="+3"/> + <source>Limit size of signature cache to <n> entries (default: 50000)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+6"/> + <source>Log transaction priority and fee per kB when mining blocks (default: 0)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> <source>Maintain a full transaction index (default: 0)</source> <translation type="unfinished"/> </message> @@ -3800,12 +3899,52 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+9"/> - <source>SSL options: (see the Bitcoin Wiki for SSL setup instructions)</source> + <location line="+4"/> + <source>Print block on startup, if found in block index</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>Print block tree on startup (default: 0)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>RPC SSL options: (see the Bitcoin Wiki for SSL setup instructions)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+2"/> + <source>RPC server options:</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>Randomly drop 1 of every <n> network messages</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>Randomly fuzz 1 of every <n> network messages</source> <translation type="unfinished"/> </message> <message> <location line="+4"/> + <source>Run a thread to flush wallet periodically (default: 1)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+2"/> + <source>SSL options: (see the Bitcoin Wiki for SSL setup instructions)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+2"/> + <source>Send command to Bitcoin Core</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+2"/> <source>Send trace/debug info to console instead of debug.log file</source> <translation type="unfinished"/> </message> @@ -3816,6 +3955,21 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. </message> <message> <location line="+2"/> + <source>Sets the DB_PRIVATE flag in the wallet db environment (default: 1)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>Show all debugging options (usage: --help -help-debug)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>Show benchmark information (default: 0)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> <source>Shrink debug.log file on client startup (default: 1 when no -debug)</source> <translation type="unfinished"/> </message> @@ -3830,7 +3984,12 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+7"/> + <location line="+6"/> + <source>Start Bitcoin Core Daemon</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> <source>System error: </source> <translation type="unfinished"/> </message> @@ -3881,6 +4040,11 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. </message> <message> <location line="+1"/> + <source>on startup</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> <source>version</source> <translation>النسخة</translation> </message> @@ -3890,47 +4054,47 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="-60"/> + <location line="-71"/> <source>Password for JSON-RPC connections</source> <translation type="unfinished"/> </message> <message> - <location line="-71"/> + <location line="-77"/> <source>Allow JSON-RPC connections from specified IP address</source> <translation type="unfinished"/> </message> <message> - <location line="+81"/> + <location line="+94"/> <source>Send commands to node running on <ip> (default: 127.0.0.1)</source> <translation type="unfinished"/> </message> <message> - <location line="-133"/> + <location line="-163"/> <source>Execute command when the best block changes (%s in cmd is replaced by block hash)</source> <translation type="unfinished"/> </message> <message> - <location line="+163"/> + <location line="+196"/> <source>Upgrade wallet to latest format</source> <translation type="unfinished"/> </message> <message> - <location line="-25"/> + <location line="-28"/> <source>Set key pool size to <n> (default: 100)</source> <translation type="unfinished"/> </message> <message> - <location line="-11"/> + <location line="-12"/> <source>Rescan the block chain for missing wallet transactions</source> <translation type="unfinished"/> </message> <message> - <location line="+39"/> + <location line="+43"/> <source>Use OpenSSL (https) for JSON-RPC connections</source> <translation type="unfinished"/> </message> <message> - <location line="-31"/> + <location line="-34"/> <source>Server certificate file (default: server.cert)</source> <translation type="unfinished"/> </message> @@ -3940,7 +4104,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+17"/> + <location line="+20"/> <source>This help message</source> <translation>رسالة المساعدة هذه</translation> </message> @@ -3950,17 +4114,17 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="-109"/> + <location line="-125"/> <source>Allow DNS lookups for -addnode, -seednode and -connect</source> <translation type="unfinished"/> </message> <message> - <location line="+61"/> + <location line="+66"/> <source>Loading addresses...</source> <translation>تØميل العنوان</translation> </message> <message> - <location line="-37"/> + <location line="-39"/> <source>Error loading wallet.dat: Wallet corrupted</source> <translation>خطأ عند تنزيل wallet.dat: المØÙظة تالÙØ©</translation> </message> @@ -3970,22 +4134,22 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>خطأ عند تنزيل wallet.dat: المØÙظة تتطلب نسخة Ø£Øدث من بتكوين</translation> </message> <message> - <location line="+99"/> + <location line="+112"/> <source>Wallet needed to be rewritten: restart Bitcoin to complete</source> <translation>المØÙظة تØتاج لإعادة إنشاء: أعد تشغيل بتكوين للإتمام</translation> </message> <message> - <location line="-101"/> + <location line="-114"/> <source>Error loading wallet.dat</source> <translation>خطأ عند تنزيل wallet.dat</translation> </message> <message> - <location line="+31"/> + <location line="+32"/> <source>Invalid -proxy address: '%s'</source> <translation type="unfinished"/> </message> <message> - <location line="+57"/> + <location line="+69"/> <source>Unknown network specified in -onlynet: '%s'</source> <translation type="unfinished"/> </message> @@ -3995,7 +4159,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="-103"/> + <location line="-119"/> <source>Cannot resolve -bind address: '%s'</source> <translation type="unfinished"/> </message> @@ -4005,7 +4169,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+49"/> + <location line="+53"/> <source>Invalid amount for -paytxfee=<amount>: '%s'</source> <translation type="unfinished"/> </message> @@ -4020,27 +4184,22 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+10"/> + <location line="+11"/> <source>Loading block index...</source> <translation type="unfinished"/> </message> <message> - <location line="-63"/> + <location line="-68"/> <source>Add a node to connect to and attempt to keep the connection open</source> <translation type="unfinished"/> </message> <message> - <location line="-32"/> - <source>Unable to bind to %s on this computer. Bitcoin is probably already running.</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+96"/> + <location line="+69"/> <source>Loading wallet...</source> <translation>تØميل المØÙظه</translation> </message> <message> - <location line="-57"/> + <location line="-62"/> <source>Cannot downgrade wallet</source> <translation type="unfinished"/> </message> @@ -4050,27 +4209,27 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+68"/> + <location line="+80"/> <source>Rescanning...</source> <translation>إعادة مسØ</translation> </message> <message> - <location line="-58"/> + <location line="-67"/> <source>Done loading</source> <translation>انتهاء التØميل</translation> </message> <message> - <location line="+86"/> + <location line="+99"/> <source>To use the %s option</source> <translation type="unfinished"/> </message> <message> - <location line="-78"/> + <location line="-91"/> <source>Error</source> <translation>خطأ</translation> </message> <message> - <location line="-36"/> + <location line="-41"/> <source>You must set rpcpassword=<password> in the configuration file: %s If the file does not exist, create it with owner-readable-only file permissions.</source> diff --git a/src/qt/locale/bitcoin_ca@valencia.ts b/src/qt/locale/bitcoin_ca@valencia.ts index 23f6975ac4..9edd3ce6a2 100644 --- a/src/qt/locale/bitcoin_ca@valencia.ts +++ b/src/qt/locale/bitcoin_ca@valencia.ts @@ -31,6 +31,12 @@ This product includes software developed by the OpenSSL Project for use in the O <source>The Bitcoin Core developers</source> <translation type="unfinished"/> </message> + <message> + <location line="+12"/> + <location line="+2"/> + <source>(%1-bit)</source> + <translation type="unfinished"/> + </message> </context> <context> <name>AddressBookPage</name> @@ -60,7 +66,7 @@ This product includes software developed by the OpenSSL Project for use in the O <translation type="unfinished"/> </message> <message> - <location line="+52"/> + <location line="+58"/> <source>C&lose</source> <translation type="unfinished"/> </message> @@ -70,7 +76,7 @@ This product includes software developed by the OpenSSL Project for use in the O <translation type="unfinished"/> </message> <message> - <location filename="../forms/addressbookpage.ui" line="-41"/> + <location filename="../forms/addressbookpage.ui" line="-47"/> <source>Delete the currently selected address from the list</source> <translation type="unfinished"/> </message> @@ -317,7 +323,7 @@ This product includes software developed by the OpenSSL Project for use in the O <context> <name>BitcoinGUI</name> <message> - <location filename="../bitcoingui.cpp" line="+295"/> + <location filename="../bitcoingui.cpp" line="+294"/> <source>Sign &message...</source> <translation type="unfinished"/> </message> @@ -332,12 +338,12 @@ This product includes software developed by the OpenSSL Project for use in the O <translation type="unfinished"/> </message> <message> - <location line="-137"/> + <location line="-136"/> <source>Node</source> <translation type="unfinished"/> </message> <message> - <location line="+138"/> + <location line="+137"/> <source>Show general overview of wallet</source> <translation type="unfinished"/> </message> @@ -458,17 +464,17 @@ This product includes software developed by the OpenSSL Project for use in the O <translation type="unfinished"/> </message> <message> - <location line="+430"/> + <location line="+440"/> <source>Bitcoin</source> <translation type="unfinished"/> </message> <message> - <location line="-643"/> + <location line="-652"/> <source>Wallet</source> <translation type="unfinished"/> </message> <message> - <location line="+146"/> + <location line="+145"/> <source>&Send</source> <translation type="unfinished"/> </message> @@ -524,18 +530,18 @@ This product includes software developed by the OpenSSL Project for use in the O <translation type="unfinished"/> </message> <message> - <location line="-284"/> - <location line="+376"/> + <location line="-283"/> + <location line="+375"/> <source>[testnet]</source> <translation type="unfinished"/> </message> <message> - <location line="-401"/> + <location line="-400"/> <source>Bitcoin Core</source> <translation type="unfinished"/> </message> <message> - <location line="+163"/> + <location line="+162"/> <source>Request payments (generates QR codes and bitcoin: URIs)</source> <translation type="unfinished"/> </message> @@ -597,7 +603,7 @@ This product includes software developed by the OpenSSL Project for use in the O <translation type="unfinished"/> </message> <message numerus="yes"> - <location line="+23"/> + <location line="+27"/> <source>%n hour(s)</source> <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation> </message> @@ -608,10 +614,21 @@ This product includes software developed by the OpenSSL Project for use in the O </message> <message numerus="yes"> <location line="+4"/> + <location line="+6"/> <source>%n week(s)</source> <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation> </message> <message> + <location line="+0"/> + <source>%1 and %2</source> + <translation type="unfinished"/> + </message> + <message numerus="yes"> + <location line="+0"/> + <source>%n year(s)</source> + <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation> + </message> + <message> <location line="+4"/> <source>%1 behind</source> <translation type="unfinished"/> @@ -642,12 +659,12 @@ This product includes software developed by the OpenSSL Project for use in the O <translation type="unfinished"/> </message> <message> - <location line="-85"/> + <location line="-95"/> <source>Up to date</source> <translation type="unfinished"/> </message> <message> - <location line="+34"/> + <location line="+44"/> <source>Catching up...</source> <translation type="unfinished"/> </message> @@ -681,7 +698,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location filename="../bitcoin.cpp" line="+438"/> + <location filename="../bitcoin.cpp" line="+443"/> <source>A fatal error occurred. Bitcoin can no longer continue safely and will quit.</source> <translation type="unfinished"/> </message> @@ -689,7 +706,7 @@ Address: %4 <context> <name>ClientModel</name> <message> - <location filename="../clientmodel.cpp" line="+119"/> + <location filename="../clientmodel.cpp" line="+128"/> <source>Network Alert</source> <translation type="unfinished"/> </message> @@ -742,7 +759,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+63"/> + <location line="+56"/> <source>(un)select all</source> <translation type="unfinished"/> </message> @@ -757,7 +774,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+52"/> + <location line="+53"/> <source>Amount</source> <translation type="unfinished"/> </message> @@ -787,7 +804,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location filename="../coincontroldialog.cpp" line="+42"/> + <location filename="../coincontroldialog.cpp" line="+41"/> <source>Copy address</source> <translation type="unfinished"/> </message> @@ -853,7 +870,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+323"/> + <location line="+332"/> <source>highest</source> <translation type="unfinished"/> </message> @@ -903,12 +920,12 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+31"/> + <location line="+32"/> <source>none</source> <translation type="unfinished"/> </message> <message> - <location line="+140"/> + <location line="+141"/> <source>Dust</source> <translation type="unfinished"/> </message> @@ -971,12 +988,12 @@ Address: %4 </message> <message> <location line="+43"/> - <location line="+66"/> + <location line="+61"/> <source>(no label)</source> <translation type="unfinished"/> </message> <message> - <location line="-9"/> + <location line="-7"/> <source>change from %1 (%2)</source> <translation type="unfinished"/> </message> @@ -1057,7 +1074,7 @@ Address: %4 <context> <name>FreespaceChecker</name> <message> - <location filename="../intro.cpp" line="+65"/> + <location filename="../intro.cpp" line="+68"/> <source>A new data directory will be created.</source> <translation type="unfinished"/> </message> @@ -1090,7 +1107,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location filename="../utilitydialog.cpp" line="+38"/> + <location filename="../utilitydialog.cpp" line="+24"/> <source>Bitcoin Core</source> <translation type="unfinished"/> </message> @@ -1115,7 +1132,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+1"/> + <location line="+2"/> <source>Set language, for example "de_DE" (default: system locale)</source> <translation type="unfinished"/> </message> @@ -1126,11 +1143,16 @@ Address: %4 </message> <message> <location line="+1"/> - <source>Show splash screen on startup (default: 1)</source> + <source>Set SSL root certificates for payment request (default: -system-)</source> <translation type="unfinished"/> </message> <message> <location line="+1"/> + <source>Show splash screen on startup (default: 1)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="-4"/> <source>Choose data directory on startup (default: 0)</source> <translation type="unfinished"/> </message> @@ -1168,7 +1190,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location filename="../intro.cpp" line="+85"/> + <location filename="../intro.cpp" line="+82"/> <source>Bitcoin</source> <translation type="unfinished"/> </message> @@ -1178,7 +1200,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+19"/> + <location line="+24"/> <source>Error</source> <translation type="unfinished"/> </message> @@ -1234,7 +1256,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+6"/> + <location line="+116"/> <source>Optional transaction fee per kB that helps make sure your transactions are processed quickly. Most transactions are 1 kB.</source> <translation type="unfinished"/> </message> @@ -1244,7 +1266,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+31"/> + <location line="-125"/> <source>Automatically start Bitcoin after logging in to the system.</source> <translation type="unfinished"/> </message> @@ -1259,12 +1281,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+13"/> - <source>Set database cache size in megabytes (default: 25)</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+13"/> + <location line="+16"/> <source>MB</source> <translation type="unfinished"/> </message> @@ -1274,12 +1291,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+13"/> - <source>Set the number of script verification threads (up to 16, 0 = auto, <0 = leave that many cores free, default: 0)</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+58"/> + <location line="+160"/> <source>Connect to the Bitcoin network through a SOCKS proxy.</source> <translation type="unfinished"/> </message> @@ -1294,7 +1306,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+224"/> + <location line="+214"/> <source>Active command-line options that override above options:</source> <translation type="unfinished"/> </message> @@ -1309,12 +1321,42 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="-323"/> + <location line="-313"/> <source>&Network</source> <translation type="unfinished"/> </message> <message> - <location line="+6"/> + <location line="-131"/> + <source>(0 = auto, <0 = leave that many cores free)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+36"/> + <source>W&allet</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+65"/> + <source>Expert</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+9"/> + <source>Enable coin &control features</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+7"/> + <source>If you disable the spending of unconfirmed change, the change from a transaction cannot be used until that transaction has at least one confirmation. This also affects how your balance is computed.</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+3"/> + <source>&Spend unconfirmed change</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+17"/> <source>Automatically open the Bitcoin client port on the router. This only works when your router supports UPnP and it is enabled.</source> <translation type="unfinished"/> </message> @@ -1409,17 +1451,12 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+7"/> + <location line="-262"/> <source>Whether to show coin control features or not.</source> <translation type="unfinished"/> </message> <message> - <location line="+3"/> - <source>Display coin &control features (experts only)</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+136"/> + <location line="+398"/> <source>&OK</source> <translation type="unfinished"/> </message> @@ -1429,17 +1466,17 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location filename="../optionsdialog.cpp" line="+67"/> + <location filename="../optionsdialog.cpp" line="+72"/> <source>default</source> <translation type="unfinished"/> </message> <message> - <location line="+57"/> + <location line="+58"/> <source>none</source> <translation type="unfinished"/> </message> <message> - <location line="+75"/> + <location line="+80"/> <source>Confirm options reset</source> <translation type="unfinished"/> </message> @@ -1479,18 +1516,13 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="-155"/> - <source>Unconfirmed:</source> - <translation type="unfinished"/> - </message> - <message> - <location line="-83"/> + <location line="-238"/> <source>Wallet</source> <translation type="unfinished"/> </message> <message> <location line="+51"/> - <source>Confirmed:</source> + <source>Available:</source> <translation type="unfinished"/> </message> <message> @@ -1499,7 +1531,12 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+32"/> + <location line="+16"/> + <source>Pending:</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+16"/> <source>Total of transactions that have yet to be confirmed, and do not yet count toward the spendable balance</source> <translation type="unfinished"/> </message> @@ -1632,23 +1669,29 @@ Address: %4 <context> <name>QObject</name> <message> - <location filename="../bitcoin.cpp" line="+71"/> - <location line="+11"/> + <location filename="../bitcoin.cpp" line="+63"/> + <location line="+7"/> + <location line="+13"/> <source>Bitcoin</source> <translation type="unfinished"/> </message> <message> - <location line="+1"/> + <location line="-19"/> <source>Error: Specified data directory "%1" does not exist.</source> <translation type="unfinished"/> </message> <message> - <location line="-12"/> + <location line="+7"/> + <source>Error: Cannot parse configuration file: %1. Only use key=value syntax.</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+12"/> <source>Error: Invalid combination of -regtest and -testnet.</source> <translation type="unfinished"/> </message> <message> - <location filename="../guiutil.cpp" line="+82"/> + <location filename="../guiutil.cpp" line="+89"/> <source>Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source> <translation type="unfinished"/> </message> @@ -1694,7 +1737,7 @@ Address: %4 <location line="+36"/> <location line="+23"/> <location line="+23"/> - <location filename="../rpcconsole.cpp" line="+359"/> + <location filename="../rpcconsole.cpp" line="+373"/> <source>N/A</source> <translation type="unfinished"/> </message> @@ -1790,11 +1833,13 @@ Address: %4 </message> <message> <location line="+64"/> + <location filename="../rpcconsole.cpp" line="-10"/> <source>In:</source> <translation type="unfinished"/> </message> <message> <location line="+80"/> + <location filename="../rpcconsole.cpp" line="+1"/> <source>Out:</source> <translation type="unfinished"/> </message> @@ -1819,7 +1864,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location filename="../rpcconsole.cpp" line="-30"/> + <location filename="../rpcconsole.cpp" line="-35"/> <source>Welcome to the Bitcoin RPC console.</source> <translation type="unfinished"/> </message> @@ -1834,7 +1879,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+122"/> + <location line="+136"/> <source>%1 B</source> <translation type="unfinished"/> </message> @@ -1950,7 +1995,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+11"/> + <location line="+14"/> <source>Remove the selected entries from the list</source> <translation type="unfinished"/> </message> @@ -1960,7 +2005,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location filename="../receivecoinsdialog.cpp" line="+38"/> + <location filename="../receivecoinsdialog.cpp" line="+39"/> <source>Copy label</source> <translation type="unfinished"/> </message> @@ -2181,12 +2226,12 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+52"/> + <location line="+58"/> <source>Balance:</source> <translation type="unfinished"/> </message> <message> - <location line="-78"/> + <location line="-84"/> <source>Confirm the send action</source> <translation type="unfinished"/> </message> @@ -2431,7 +2476,7 @@ Address: %4 <context> <name>ShutdownWindow</name> <message> - <location filename="../utilitydialog.cpp" line="+48"/> + <location filename="../utilitydialog.cpp" line="+52"/> <source>Bitcoin Core is shutting down...</source> <translation type="unfinished"/> </message> @@ -2631,7 +2676,7 @@ Address: %4 <context> <name>SplashScreen</name> <message> - <location filename="../splashscreen.cpp" line="+28"/> + <location filename="../splashscreen.cpp" line="+32"/> <source>Bitcoin Core</source> <translation type="unfinished"/> </message> @@ -2663,6 +2708,11 @@ Address: %4 </message> <message> <location line="+6"/> + <source>conflicted</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+2"/> <source>%1/offline</source> <translation type="unfinished"/> </message> @@ -2824,12 +2874,12 @@ Address: %4 <translation type="unfinished"/> </message> <message numerus="yes"> - <location line="-35"/> + <location line="-37"/> <source>Open for %n more block(s)</source> <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation> </message> <message> - <location line="+70"/> + <location line="+72"/> <source>unknown</source> <translation type="unfinished"/> </message> @@ -2870,12 +2920,12 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+59"/> + <location line="+78"/> <source>Immature (%1 confirmations, will be available after %2)</source> <translation type="unfinished"/> </message> <message numerus="yes"> - <location line="+16"/> + <location line="-21"/> <source>Open for %n more block(s)</source> <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation> </message> @@ -2885,33 +2935,42 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+3"/> - <source>Offline (%1 confirmations)</source> + <location line="+12"/> + <source>Confirmed (%1 confirmations)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+9"/> + <source>This block was not received by any other nodes and will probably not be accepted!</source> <translation type="unfinished"/> </message> <message> <location line="+3"/> - <source>Unconfirmed (%1 of %2 confirmations)</source> + <source>Generated but not accepted</source> <translation type="unfinished"/> </message> <message> - <location line="-22"/> - <location line="+25"/> - <source>Confirmed (%1 confirmations)</source> + <location line="-21"/> + <source>Offline</source> <translation type="unfinished"/> </message> <message> - <location line="-22"/> - <source>This block was not received by any other nodes and will probably not be accepted!</source> + <location line="+3"/> + <source>Unconfirmed</source> <translation type="unfinished"/> </message> <message> <location line="+3"/> - <source>Generated but not accepted</source> + <source>Confirming (%1 of %2 recommended confirmations)</source> <translation type="unfinished"/> </message> <message> - <location line="+62"/> + <location line="+6"/> + <source>Conflicted</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+51"/> <source>Received with</source> <translation type="unfinished"/> </message> @@ -2941,7 +3000,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+199"/> + <location line="+190"/> <source>Transaction status. Hover over this field to show number of confirmations.</source> <translation type="unfinished"/> </message> @@ -3070,7 +3129,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+142"/> + <location line="+140"/> <source>Export Transaction History</source> <translation type="unfinished"/> </message> @@ -3164,7 +3223,7 @@ Address: %4 <context> <name>WalletView</name> <message> - <location filename="../walletview.cpp" line="+43"/> + <location filename="../walletview.cpp" line="+44"/> <source>&Export</source> <translation type="unfinished"/> </message> @@ -3174,7 +3233,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+181"/> + <location line="+184"/> <source>Backup Wallet</source> <translation type="unfinished"/> </message> @@ -3207,12 +3266,12 @@ Address: %4 <context> <name>bitcoin-core</name> <message> - <location filename="../bitcoinstrings.cpp" line="+221"/> + <location filename="../bitcoinstrings.cpp" line="+261"/> <source>Usage:</source> <translation type="unfinished"/> </message> <message> - <location line="-54"/> + <location line="-66"/> <source>List commands</source> <translation type="unfinished"/> </message> @@ -3222,12 +3281,12 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+26"/> + <location line="+27"/> <source>Options:</source> <translation type="unfinished"/> </message> <message> - <location line="+22"/> + <location line="+32"/> <source>Specify configuration file (default: bitcoin.conf)</source> <translation type="unfinished"/> </message> @@ -3242,72 +3301,72 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="-9"/> - <source>Set database cache size in megabytes (default: 25)</source> - <translation type="unfinished"/> - </message> - <message> - <location line="-26"/> + <location line="-46"/> <source>Listen for connections on <port> (default: 8333 or testnet: 18333)</source> <translation type="unfinished"/> </message> <message> - <location line="+5"/> + <location line="+6"/> <source>Maintain at most <n> connections to peers (default: 125)</source> <translation type="unfinished"/> </message> <message> - <location line="-51"/> + <location line="-57"/> <source>Connect to a node to retrieve peer addresses, and disconnect</source> <translation type="unfinished"/> </message> <message> - <location line="+84"/> + <location line="+100"/> <source>Specify your own public address</source> <translation type="unfinished"/> </message> <message> - <location line="+5"/> + <location line="+6"/> <source>Threshold for disconnecting misbehaving peers (default: 100)</source> <translation type="unfinished"/> </message> <message> - <location line="-148"/> + <location line="-172"/> <source>Number of seconds to keep misbehaving peers from reconnecting (default: 86400)</source> <translation type="unfinished"/> </message> <message> - <location line="-36"/> + <location line="-52"/> <source>An error occurred while setting up the RPC port %u for listening on IPv4: %s</source> <translation type="unfinished"/> </message> <message> - <location line="+34"/> + <location line="+50"/> <source>Listen for JSON-RPC connections on <port> (default: 8332 or testnet: 18332)</source> <translation type="unfinished"/> </message> <message> - <location line="+45"/> + <location line="+51"/> <source>Accept command line and JSON-RPC commands</source> <translation type="unfinished"/> </message> <message> - <location line="+80"/> + <location line="+7"/> + <source>Bitcoin Core RPC client version</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+87"/> <source>Run in the background as a daemon and accept commands</source> <translation type="unfinished"/> </message> <message> - <location line="+39"/> + <location line="+43"/> <source>Use the test network</source> <translation type="unfinished"/> </message> <message> - <location line="-118"/> + <location line="-136"/> <source>Accept connections from outside (default: 1 if no -proxy or -connect)</source> <translation type="unfinished"/> </message> <message> - <location line="-95"/> + <location line="-117"/> <source>%s, you must set a rpcpassword in the configuration file: %s It is recommended you use the following random password: @@ -3337,8 +3396,8 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+3"/> - <source>Cannot obtain a lock on data directory %s. Bitcoin is probably already running.</source> + <location line="+6"/> + <source>Continuously rate-limit free transactions to <n>*1000 bytes per minute (default:15)</source> <translation type="unfinished"/> </message> <message> @@ -3353,6 +3412,11 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. </message> <message> <location line="+3"/> + <source>Error: Listening for incoming connections failed (listen returned error %d)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+2"/> <source>Error: The transaction was rejected! This might happen if some of the coins in your wallet were already spent, such as if you used a copy of wallet.dat and coins were spent in the copy but not marked as spent here.</source> <translation type="unfinished"/> </message> @@ -3367,12 +3431,47 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+18"/> + <location line="+6"/> + <source>Fees smaller than this are considered zero fee (for transaction creation) (default:</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+3"/> + <source>Flush database activity from memory pool to disk log every <n> megabytes (default: 100)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+3"/> + <source>How thorough the block verification of -checkblocks is (0-4, default: 3)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+2"/> + <source>In this mode -genproclimit controls how many blocks are generated immediately.</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+12"/> + <source>Set the number of script verification threads (%u to %d, 0 = auto, <0 = leave that many cores free, default: %d)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+3"/> + <source>Set the processor limit for when generation is on (-1 = unlimited, default: -1)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+3"/> <source>This is a pre-release test build - use at your own risk - do not use for mining or merchant applications</source> <translation type="unfinished"/> </message> <message> - <location line="+5"/> + <location line="+3"/> + <source>Unable to bind to %s on this computer. Bitcoin Core is probably already running.</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+3"/> <source>Use separate SOCKS5 proxy to reach peers via Tor hidden services (default: -proxy)</source> <translation type="unfinished"/> </message> @@ -3408,6 +3507,16 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. </message> <message> <location line="+9"/> + <source>(default: 1)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>(default: wallet.dat)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> <source><category> can be:</source> <translation type="unfinished"/> </message> @@ -3422,17 +3531,17 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+1"/> - <source>Bitcoin RPC client version</source> + <location line="+2"/> + <source>Block creation options:</source> <translation type="unfinished"/> </message> <message> - <location line="+1"/> - <source>Block creation options:</source> + <location line="+5"/> + <source>Clear list of wallet transactions (diagnostic tool; implies -rescan)</source> <translation type="unfinished"/> </message> <message> - <location line="+5"/> + <location line="+1"/> <source>Connect only to the specified node(s)</source> <translation type="unfinished"/> </message> @@ -3448,11 +3557,26 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. </message> <message> <location line="+2"/> + <source>Connection options:</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> <source>Corrupted block database detected</source> <translation type="unfinished"/> </message> <message> <location line="+1"/> + <source>Debugging/Testing options:</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>Disable safemode, override a real safe mode event (default: 0)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> <source>Discover own IP address (default: 1 when listening and no -externalip)</source> <translation type="unfinished"/> </message> @@ -3563,22 +3687,27 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. </message> <message> <location line="+1"/> - <source>Find peers using DNS lookup (default: 1 unless -connect)</source> + <source>Fees smaller than this are considered zero fee (for relaying) (default:</source> <translation type="unfinished"/> </message> <message> <location line="+1"/> - <source>Generate coins (default: 0)</source> + <source>Find peers using DNS lookup (default: 1 unless -connect)</source> <translation type="unfinished"/> </message> <message> - <location line="+2"/> - <source>How many blocks to check at startup (default: 288, 0 = all)</source> + <location line="+1"/> + <source>Force safe mode (default: 0)</source> <translation type="unfinished"/> </message> <message> <location line="+1"/> - <source>How thorough the block verification is (0-4, default: 3)</source> + <source>Generate coins (default: 0)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+2"/> + <source>How many blocks to check at startup (default: 288, 0 = all)</source> <translation type="unfinished"/> </message> <message> @@ -3597,7 +3726,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+15"/> + <location line="+17"/> <source>Not enough file descriptors available.</source> <translation type="unfinished"/> </message> @@ -3607,27 +3736,27 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+1"/> + <location line="+4"/> <source>RPC client options:</source> <translation type="unfinished"/> </message> <message> - <location line="+1"/> + <location line="+4"/> <source>Rebuild block chain index from current blk000??.dat files</source> <translation type="unfinished"/> </message> <message> - <location line="+5"/> + <location line="+6"/> <source>Select SOCKS version for -proxy (4 or 5, default: 5)</source> <translation type="unfinished"/> </message> <message> - <location line="+1"/> - <source>Send command to Bitcoin server</source> + <location line="+6"/> + <source>Set database cache size in megabytes (%d to %d, default: %d)</source> <translation type="unfinished"/> </message> <message> - <location line="+7"/> + <location line="+2"/> <source>Set maximum block size in bytes (default: %d)</source> <translation type="unfinished"/> </message> @@ -3637,17 +3766,17 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+7"/> + <location line="+10"/> <source>Specify wallet file (within data directory)</source> <translation type="unfinished"/> </message> <message> <location line="+2"/> - <source>Start Bitcoin server</source> + <source>Spend unconfirmed change when sending transactions (default: 1)</source> <translation type="unfinished"/> </message> <message> - <location line="+3"/> + <location line="+4"/> <source>This is intended for regression testing tools and app development.</source> <translation type="unfinished"/> </message> @@ -3692,32 +3821,32 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="-79"/> + <location line="-92"/> <source>Imports blocks from external blk000??.dat file</source> <translation type="unfinished"/> </message> <message> - <location line="-105"/> - <source>Execute command when a relevant alert is received or we see a really long fork (%s in cmd is replaced by message)</source> + <location line="-149"/> + <source>Cannot obtain a lock on data directory %s. Bitcoin Core is probably already running.</source> <translation type="unfinished"/> </message> <message> - <location line="+14"/> - <source>Output debugging information (default: 0, supplying <category> is optional)</source> + <location line="+22"/> + <source>Execute command when a relevant alert is received or we see a really long fork (%s in cmd is replaced by message)</source> <translation type="unfinished"/> </message> <message> - <location line="+2"/> - <source>Set maximum size of high-priority/low-fee transactions in bytes (default: %d)</source> + <location line="+25"/> + <source>Output debugging information (default: 0, supplying <category> is optional)</source> <translation type="unfinished"/> </message> <message> <location line="+2"/> - <source>Set the number of script verification threads (up to 16, 0 = auto, <0 = leave that many cores free, default: 0)</source> + <source>Set maximum size of high-priority/low-fee transactions in bytes (default: %d)</source> <translation type="unfinished"/> </message> <message> - <location line="+89"/> + <location line="+102"/> <source>Information</source> <translation type="unfinished"/> </message> @@ -3732,7 +3861,17 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+8"/> + <location line="+3"/> + <source>Limit size of signature cache to <n> entries (default: 50000)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+6"/> + <source>Log transaction priority and fee per kB when mining blocks (default: 0)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> <source>Maintain a full transaction index (default: 0)</source> <translation type="unfinished"/> </message> @@ -3757,12 +3896,52 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+9"/> - <source>SSL options: (see the Bitcoin Wiki for SSL setup instructions)</source> + <location line="+4"/> + <source>Print block on startup, if found in block index</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>Print block tree on startup (default: 0)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>RPC SSL options: (see the Bitcoin Wiki for SSL setup instructions)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+2"/> + <source>RPC server options:</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>Randomly drop 1 of every <n> network messages</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>Randomly fuzz 1 of every <n> network messages</source> <translation type="unfinished"/> </message> <message> <location line="+4"/> + <source>Run a thread to flush wallet periodically (default: 1)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+2"/> + <source>SSL options: (see the Bitcoin Wiki for SSL setup instructions)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+2"/> + <source>Send command to Bitcoin Core</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+2"/> <source>Send trace/debug info to console instead of debug.log file</source> <translation type="unfinished"/> </message> @@ -3773,6 +3952,21 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. </message> <message> <location line="+2"/> + <source>Sets the DB_PRIVATE flag in the wallet db environment (default: 1)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>Show all debugging options (usage: --help -help-debug)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>Show benchmark information (default: 0)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> <source>Shrink debug.log file on client startup (default: 1 when no -debug)</source> <translation type="unfinished"/> </message> @@ -3788,6 +3982,11 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. </message> <message> <location line="+6"/> + <source>Start Bitcoin Core Daemon</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> <source>System error: </source> <translation type="unfinished"/> </message> @@ -3833,6 +4032,16 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. </message> <message> <location line="+2"/> + <source>Zapping all transactions from wallet...</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>on startup</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> <source>version</source> <translation type="unfinished"/> </message> @@ -3842,47 +4051,47 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="-58"/> + <location line="-71"/> <source>Password for JSON-RPC connections</source> <translation type="unfinished"/> </message> <message> - <location line="-70"/> + <location line="-77"/> <source>Allow JSON-RPC connections from specified IP address</source> <translation type="unfinished"/> </message> <message> - <location line="+80"/> + <location line="+94"/> <source>Send commands to node running on <ip> (default: 127.0.0.1)</source> <translation type="unfinished"/> </message> <message> - <location line="-132"/> + <location line="-163"/> <source>Execute command when the best block changes (%s in cmd is replaced by block hash)</source> <translation type="unfinished"/> </message> <message> - <location line="+161"/> + <location line="+196"/> <source>Upgrade wallet to latest format</source> <translation type="unfinished"/> </message> <message> - <location line="-24"/> + <location line="-28"/> <source>Set key pool size to <n> (default: 100)</source> <translation type="unfinished"/> </message> <message> - <location line="-11"/> + <location line="-12"/> <source>Rescan the block chain for missing wallet transactions</source> <translation type="unfinished"/> </message> <message> - <location line="+38"/> + <location line="+43"/> <source>Use OpenSSL (https) for JSON-RPC connections</source> <translation type="unfinished"/> </message> <message> - <location line="-30"/> + <location line="-34"/> <source>Server certificate file (default: server.cert)</source> <translation type="unfinished"/> </message> @@ -3892,7 +4101,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+16"/> + <location line="+20"/> <source>This help message</source> <translation type="unfinished"/> </message> @@ -3902,17 +4111,17 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="-107"/> + <location line="-125"/> <source>Allow DNS lookups for -addnode, -seednode and -connect</source> <translation type="unfinished"/> </message> <message> - <location line="+60"/> + <location line="+66"/> <source>Loading addresses...</source> <translation type="unfinished"/> </message> <message> - <location line="-37"/> + <location line="-39"/> <source>Error loading wallet.dat: Wallet corrupted</source> <translation type="unfinished"/> </message> @@ -3922,22 +4131,22 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+98"/> + <location line="+112"/> <source>Wallet needed to be rewritten: restart Bitcoin to complete</source> <translation type="unfinished"/> </message> <message> - <location line="-100"/> + <location line="-114"/> <source>Error loading wallet.dat</source> <translation type="unfinished"/> </message> <message> - <location line="+31"/> + <location line="+32"/> <source>Invalid -proxy address: '%s'</source> <translation type="unfinished"/> </message> <message> - <location line="+56"/> + <location line="+69"/> <source>Unknown network specified in -onlynet: '%s'</source> <translation type="unfinished"/> </message> @@ -3947,7 +4156,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="-101"/> + <location line="-119"/> <source>Cannot resolve -bind address: '%s'</source> <translation type="unfinished"/> </message> @@ -3957,7 +4166,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+48"/> + <location line="+53"/> <source>Invalid amount for -paytxfee=<amount>: '%s'</source> <translation type="unfinished"/> </message> @@ -3972,27 +4181,22 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+10"/> + <location line="+11"/> <source>Loading block index...</source> <translation type="unfinished"/> </message> <message> - <location line="-62"/> + <location line="-68"/> <source>Add a node to connect to and attempt to keep the connection open</source> <translation type="unfinished"/> </message> <message> - <location line="-32"/> - <source>Unable to bind to %s on this computer. Bitcoin is probably already running.</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+95"/> + <location line="+69"/> <source>Loading wallet...</source> <translation type="unfinished"/> </message> <message> - <location line="-56"/> + <location line="-62"/> <source>Cannot downgrade wallet</source> <translation type="unfinished"/> </message> @@ -4002,27 +4206,27 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+67"/> + <location line="+80"/> <source>Rescanning...</source> <translation type="unfinished"/> </message> <message> - <location line="-58"/> + <location line="-67"/> <source>Done loading</source> <translation type="unfinished"/> </message> <message> - <location line="+85"/> + <location line="+99"/> <source>To use the %s option</source> <translation type="unfinished"/> </message> <message> - <location line="-77"/> + <location line="-91"/> <source>Error</source> <translation type="unfinished"/> </message> <message> - <location line="-35"/> + <location line="-41"/> <source>You must set rpcpassword=<password> in the configuration file: %s If the file does not exist, create it with owner-readable-only file permissions.</source> diff --git a/src/qt/locale/bitcoin_cmn.ts b/src/qt/locale/bitcoin_cmn.ts index 10efc47549..a3010600b0 100644 --- a/src/qt/locale/bitcoin_cmn.ts +++ b/src/qt/locale/bitcoin_cmn.ts @@ -31,6 +31,12 @@ This product includes software developed by the OpenSSL Project for use in the O <source>The Bitcoin Core developers</source> <translation type="unfinished"/> </message> + <message> + <location line="+12"/> + <location line="+2"/> + <source>(%1-bit)</source> + <translation type="unfinished"/> + </message> </context> <context> <name>AddressBookPage</name> @@ -60,7 +66,7 @@ This product includes software developed by the OpenSSL Project for use in the O <translation type="unfinished"/> </message> <message> - <location line="+52"/> + <location line="+58"/> <source>C&lose</source> <translation type="unfinished"/> </message> @@ -70,7 +76,7 @@ This product includes software developed by the OpenSSL Project for use in the O <translation type="unfinished"/> </message> <message> - <location filename="../forms/addressbookpage.ui" line="-41"/> + <location filename="../forms/addressbookpage.ui" line="-47"/> <source>Delete the currently selected address from the list</source> <translation type="unfinished"/> </message> @@ -317,7 +323,7 @@ This product includes software developed by the OpenSSL Project for use in the O <context> <name>BitcoinGUI</name> <message> - <location filename="../bitcoingui.cpp" line="+295"/> + <location filename="../bitcoingui.cpp" line="+294"/> <source>Sign &message...</source> <translation type="unfinished"/> </message> @@ -332,12 +338,12 @@ This product includes software developed by the OpenSSL Project for use in the O <translation type="unfinished"/> </message> <message> - <location line="-137"/> + <location line="-136"/> <source>Node</source> <translation type="unfinished"/> </message> <message> - <location line="+138"/> + <location line="+137"/> <source>Show general overview of wallet</source> <translation type="unfinished"/> </message> @@ -458,17 +464,17 @@ This product includes software developed by the OpenSSL Project for use in the O <translation type="unfinished"/> </message> <message> - <location line="+430"/> + <location line="+440"/> <source>Bitcoin</source> <translation type="unfinished"/> </message> <message> - <location line="-643"/> + <location line="-652"/> <source>Wallet</source> <translation type="unfinished"/> </message> <message> - <location line="+146"/> + <location line="+145"/> <source>&Send</source> <translation type="unfinished"/> </message> @@ -524,18 +530,18 @@ This product includes software developed by the OpenSSL Project for use in the O <translation type="unfinished"/> </message> <message> - <location line="-284"/> - <location line="+376"/> + <location line="-283"/> + <location line="+375"/> <source>[testnet]</source> <translation type="unfinished"/> </message> <message> - <location line="-401"/> + <location line="-400"/> <source>Bitcoin Core</source> <translation type="unfinished"/> </message> <message> - <location line="+163"/> + <location line="+162"/> <source>Request payments (generates QR codes and bitcoin: URIs)</source> <translation type="unfinished"/> </message> @@ -597,7 +603,7 @@ This product includes software developed by the OpenSSL Project for use in the O <translation type="unfinished"/> </message> <message numerus="yes"> - <location line="+23"/> + <location line="+27"/> <source>%n hour(s)</source> <translation type="unfinished"><numerusform></numerusform></translation> </message> @@ -608,10 +614,21 @@ This product includes software developed by the OpenSSL Project for use in the O </message> <message numerus="yes"> <location line="+4"/> + <location line="+6"/> <source>%n week(s)</source> <translation type="unfinished"><numerusform></numerusform></translation> </message> <message> + <location line="+0"/> + <source>%1 and %2</source> + <translation type="unfinished"/> + </message> + <message numerus="yes"> + <location line="+0"/> + <source>%n year(s)</source> + <translation type="unfinished"><numerusform></numerusform></translation> + </message> + <message> <location line="+4"/> <source>%1 behind</source> <translation type="unfinished"/> @@ -642,12 +659,12 @@ This product includes software developed by the OpenSSL Project for use in the O <translation type="unfinished"/> </message> <message> - <location line="-85"/> + <location line="-95"/> <source>Up to date</source> <translation type="unfinished"/> </message> <message> - <location line="+34"/> + <location line="+44"/> <source>Catching up...</source> <translation type="unfinished"/> </message> @@ -681,7 +698,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location filename="../bitcoin.cpp" line="+438"/> + <location filename="../bitcoin.cpp" line="+443"/> <source>A fatal error occurred. Bitcoin can no longer continue safely and will quit.</source> <translation type="unfinished"/> </message> @@ -689,7 +706,7 @@ Address: %4 <context> <name>ClientModel</name> <message> - <location filename="../clientmodel.cpp" line="+119"/> + <location filename="../clientmodel.cpp" line="+128"/> <source>Network Alert</source> <translation type="unfinished"/> </message> @@ -742,7 +759,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+63"/> + <location line="+56"/> <source>(un)select all</source> <translation type="unfinished"/> </message> @@ -757,7 +774,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+52"/> + <location line="+53"/> <source>Amount</source> <translation type="unfinished"/> </message> @@ -787,7 +804,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location filename="../coincontroldialog.cpp" line="+42"/> + <location filename="../coincontroldialog.cpp" line="+41"/> <source>Copy address</source> <translation type="unfinished"/> </message> @@ -853,7 +870,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+323"/> + <location line="+332"/> <source>highest</source> <translation type="unfinished"/> </message> @@ -903,12 +920,12 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+31"/> + <location line="+32"/> <source>none</source> <translation type="unfinished"/> </message> <message> - <location line="+140"/> + <location line="+141"/> <source>Dust</source> <translation type="unfinished"/> </message> @@ -971,12 +988,12 @@ Address: %4 </message> <message> <location line="+43"/> - <location line="+66"/> + <location line="+61"/> <source>(no label)</source> <translation type="unfinished"/> </message> <message> - <location line="-9"/> + <location line="-7"/> <source>change from %1 (%2)</source> <translation type="unfinished"/> </message> @@ -1057,7 +1074,7 @@ Address: %4 <context> <name>FreespaceChecker</name> <message> - <location filename="../intro.cpp" line="+65"/> + <location filename="../intro.cpp" line="+68"/> <source>A new data directory will be created.</source> <translation type="unfinished"/> </message> @@ -1090,7 +1107,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location filename="../utilitydialog.cpp" line="+38"/> + <location filename="../utilitydialog.cpp" line="+24"/> <source>Bitcoin Core</source> <translation type="unfinished"/> </message> @@ -1115,7 +1132,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+1"/> + <location line="+2"/> <source>Set language, for example "de_DE" (default: system locale)</source> <translation type="unfinished"/> </message> @@ -1126,11 +1143,16 @@ Address: %4 </message> <message> <location line="+1"/> - <source>Show splash screen on startup (default: 1)</source> + <source>Set SSL root certificates for payment request (default: -system-)</source> <translation type="unfinished"/> </message> <message> <location line="+1"/> + <source>Show splash screen on startup (default: 1)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="-4"/> <source>Choose data directory on startup (default: 0)</source> <translation type="unfinished"/> </message> @@ -1168,7 +1190,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location filename="../intro.cpp" line="+85"/> + <location filename="../intro.cpp" line="+82"/> <source>Bitcoin</source> <translation type="unfinished"/> </message> @@ -1178,7 +1200,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+19"/> + <location line="+24"/> <source>Error</source> <translation type="unfinished"/> </message> @@ -1234,7 +1256,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+6"/> + <location line="+116"/> <source>Optional transaction fee per kB that helps make sure your transactions are processed quickly. Most transactions are 1 kB.</source> <translation type="unfinished"/> </message> @@ -1244,7 +1266,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+31"/> + <location line="-125"/> <source>Automatically start Bitcoin after logging in to the system.</source> <translation type="unfinished"/> </message> @@ -1259,12 +1281,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+13"/> - <source>Set database cache size in megabytes (default: 25)</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+13"/> + <location line="+16"/> <source>MB</source> <translation type="unfinished"/> </message> @@ -1274,12 +1291,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+13"/> - <source>Set the number of script verification threads (up to 16, 0 = auto, <0 = leave that many cores free, default: 0)</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+58"/> + <location line="+160"/> <source>Connect to the Bitcoin network through a SOCKS proxy.</source> <translation type="unfinished"/> </message> @@ -1294,7 +1306,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+224"/> + <location line="+214"/> <source>Active command-line options that override above options:</source> <translation type="unfinished"/> </message> @@ -1309,12 +1321,42 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="-323"/> + <location line="-313"/> <source>&Network</source> <translation type="unfinished"/> </message> <message> - <location line="+6"/> + <location line="-131"/> + <source>(0 = auto, <0 = leave that many cores free)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+36"/> + <source>W&allet</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+65"/> + <source>Expert</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+9"/> + <source>Enable coin &control features</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+7"/> + <source>If you disable the spending of unconfirmed change, the change from a transaction cannot be used until that transaction has at least one confirmation. This also affects how your balance is computed.</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+3"/> + <source>&Spend unconfirmed change</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+17"/> <source>Automatically open the Bitcoin client port on the router. This only works when your router supports UPnP and it is enabled.</source> <translation type="unfinished"/> </message> @@ -1409,17 +1451,12 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+7"/> + <location line="-262"/> <source>Whether to show coin control features or not.</source> <translation type="unfinished"/> </message> <message> - <location line="+3"/> - <source>Display coin &control features (experts only)</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+136"/> + <location line="+398"/> <source>&OK</source> <translation type="unfinished"/> </message> @@ -1429,17 +1466,17 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location filename="../optionsdialog.cpp" line="+67"/> + <location filename="../optionsdialog.cpp" line="+72"/> <source>default</source> <translation type="unfinished"/> </message> <message> - <location line="+57"/> + <location line="+58"/> <source>none</source> <translation type="unfinished"/> </message> <message> - <location line="+75"/> + <location line="+80"/> <source>Confirm options reset</source> <translation type="unfinished"/> </message> @@ -1479,18 +1516,13 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="-155"/> - <source>Unconfirmed:</source> - <translation type="unfinished"/> - </message> - <message> - <location line="-83"/> + <location line="-238"/> <source>Wallet</source> <translation type="unfinished"/> </message> <message> <location line="+51"/> - <source>Confirmed:</source> + <source>Available:</source> <translation type="unfinished"/> </message> <message> @@ -1499,7 +1531,12 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+32"/> + <location line="+16"/> + <source>Pending:</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+16"/> <source>Total of transactions that have yet to be confirmed, and do not yet count toward the spendable balance</source> <translation type="unfinished"/> </message> @@ -1632,23 +1669,29 @@ Address: %4 <context> <name>QObject</name> <message> - <location filename="../bitcoin.cpp" line="+71"/> - <location line="+11"/> + <location filename="../bitcoin.cpp" line="+63"/> + <location line="+7"/> + <location line="+13"/> <source>Bitcoin</source> <translation type="unfinished"/> </message> <message> - <location line="+1"/> + <location line="-19"/> <source>Error: Specified data directory "%1" does not exist.</source> <translation type="unfinished"/> </message> <message> - <location line="-12"/> + <location line="+7"/> + <source>Error: Cannot parse configuration file: %1. Only use key=value syntax.</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+12"/> <source>Error: Invalid combination of -regtest and -testnet.</source> <translation type="unfinished"/> </message> <message> - <location filename="../guiutil.cpp" line="+82"/> + <location filename="../guiutil.cpp" line="+89"/> <source>Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source> <translation type="unfinished"/> </message> @@ -1694,7 +1737,7 @@ Address: %4 <location line="+36"/> <location line="+23"/> <location line="+23"/> - <location filename="../rpcconsole.cpp" line="+359"/> + <location filename="../rpcconsole.cpp" line="+373"/> <source>N/A</source> <translation type="unfinished"/> </message> @@ -1790,11 +1833,13 @@ Address: %4 </message> <message> <location line="+64"/> + <location filename="../rpcconsole.cpp" line="-10"/> <source>In:</source> <translation type="unfinished"/> </message> <message> <location line="+80"/> + <location filename="../rpcconsole.cpp" line="+1"/> <source>Out:</source> <translation type="unfinished"/> </message> @@ -1819,7 +1864,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location filename="../rpcconsole.cpp" line="-30"/> + <location filename="../rpcconsole.cpp" line="-35"/> <source>Welcome to the Bitcoin RPC console.</source> <translation type="unfinished"/> </message> @@ -1834,7 +1879,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+122"/> + <location line="+136"/> <source>%1 B</source> <translation type="unfinished"/> </message> @@ -1950,7 +1995,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+11"/> + <location line="+14"/> <source>Remove the selected entries from the list</source> <translation type="unfinished"/> </message> @@ -1960,7 +2005,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location filename="../receivecoinsdialog.cpp" line="+38"/> + <location filename="../receivecoinsdialog.cpp" line="+39"/> <source>Copy label</source> <translation type="unfinished"/> </message> @@ -2181,12 +2226,12 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+52"/> + <location line="+58"/> <source>Balance:</source> <translation type="unfinished"/> </message> <message> - <location line="-78"/> + <location line="-84"/> <source>Confirm the send action</source> <translation type="unfinished"/> </message> @@ -2431,7 +2476,7 @@ Address: %4 <context> <name>ShutdownWindow</name> <message> - <location filename="../utilitydialog.cpp" line="+48"/> + <location filename="../utilitydialog.cpp" line="+52"/> <source>Bitcoin Core is shutting down...</source> <translation type="unfinished"/> </message> @@ -2631,7 +2676,7 @@ Address: %4 <context> <name>SplashScreen</name> <message> - <location filename="../splashscreen.cpp" line="+28"/> + <location filename="../splashscreen.cpp" line="+32"/> <source>Bitcoin Core</source> <translation type="unfinished"/> </message> @@ -2663,6 +2708,11 @@ Address: %4 </message> <message> <location line="+6"/> + <source>conflicted</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+2"/> <source>%1/offline</source> <translation type="unfinished"/> </message> @@ -2824,12 +2874,12 @@ Address: %4 <translation type="unfinished"/> </message> <message numerus="yes"> - <location line="-35"/> + <location line="-37"/> <source>Open for %n more block(s)</source> <translation type="unfinished"><numerusform></numerusform></translation> </message> <message> - <location line="+70"/> + <location line="+72"/> <source>unknown</source> <translation type="unfinished"/> </message> @@ -2870,12 +2920,12 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+59"/> + <location line="+78"/> <source>Immature (%1 confirmations, will be available after %2)</source> <translation type="unfinished"/> </message> <message numerus="yes"> - <location line="+16"/> + <location line="-21"/> <source>Open for %n more block(s)</source> <translation type="unfinished"><numerusform></numerusform></translation> </message> @@ -2885,33 +2935,42 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+3"/> - <source>Offline (%1 confirmations)</source> + <location line="+12"/> + <source>Confirmed (%1 confirmations)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+9"/> + <source>This block was not received by any other nodes and will probably not be accepted!</source> <translation type="unfinished"/> </message> <message> <location line="+3"/> - <source>Unconfirmed (%1 of %2 confirmations)</source> + <source>Generated but not accepted</source> <translation type="unfinished"/> </message> <message> - <location line="-22"/> - <location line="+25"/> - <source>Confirmed (%1 confirmations)</source> + <location line="-21"/> + <source>Offline</source> <translation type="unfinished"/> </message> <message> - <location line="-22"/> - <source>This block was not received by any other nodes and will probably not be accepted!</source> + <location line="+3"/> + <source>Unconfirmed</source> <translation type="unfinished"/> </message> <message> <location line="+3"/> - <source>Generated but not accepted</source> + <source>Confirming (%1 of %2 recommended confirmations)</source> <translation type="unfinished"/> </message> <message> - <location line="+62"/> + <location line="+6"/> + <source>Conflicted</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+51"/> <source>Received with</source> <translation type="unfinished"/> </message> @@ -2941,7 +3000,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+199"/> + <location line="+190"/> <source>Transaction status. Hover over this field to show number of confirmations.</source> <translation type="unfinished"/> </message> @@ -3070,7 +3129,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+142"/> + <location line="+140"/> <source>Export Transaction History</source> <translation type="unfinished"/> </message> @@ -3164,7 +3223,7 @@ Address: %4 <context> <name>WalletView</name> <message> - <location filename="../walletview.cpp" line="+43"/> + <location filename="../walletview.cpp" line="+44"/> <source>&Export</source> <translation type="unfinished"/> </message> @@ -3174,7 +3233,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+181"/> + <location line="+184"/> <source>Backup Wallet</source> <translation type="unfinished"/> </message> @@ -3207,12 +3266,12 @@ Address: %4 <context> <name>bitcoin-core</name> <message> - <location filename="../bitcoinstrings.cpp" line="+221"/> + <location filename="../bitcoinstrings.cpp" line="+261"/> <source>Usage:</source> <translation type="unfinished"/> </message> <message> - <location line="-54"/> + <location line="-66"/> <source>List commands</source> <translation type="unfinished"/> </message> @@ -3222,12 +3281,12 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+26"/> + <location line="+27"/> <source>Options:</source> <translation type="unfinished"/> </message> <message> - <location line="+22"/> + <location line="+32"/> <source>Specify configuration file (default: bitcoin.conf)</source> <translation type="unfinished"/> </message> @@ -3242,72 +3301,72 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="-9"/> - <source>Set database cache size in megabytes (default: 25)</source> - <translation type="unfinished"/> - </message> - <message> - <location line="-26"/> + <location line="-46"/> <source>Listen for connections on <port> (default: 8333 or testnet: 18333)</source> <translation type="unfinished"/> </message> <message> - <location line="+5"/> + <location line="+6"/> <source>Maintain at most <n> connections to peers (default: 125)</source> <translation type="unfinished"/> </message> <message> - <location line="-51"/> + <location line="-57"/> <source>Connect to a node to retrieve peer addresses, and disconnect</source> <translation type="unfinished"/> </message> <message> - <location line="+84"/> + <location line="+100"/> <source>Specify your own public address</source> <translation type="unfinished"/> </message> <message> - <location line="+5"/> + <location line="+6"/> <source>Threshold for disconnecting misbehaving peers (default: 100)</source> <translation type="unfinished"/> </message> <message> - <location line="-148"/> + <location line="-172"/> <source>Number of seconds to keep misbehaving peers from reconnecting (default: 86400)</source> <translation type="unfinished"/> </message> <message> - <location line="-36"/> + <location line="-52"/> <source>An error occurred while setting up the RPC port %u for listening on IPv4: %s</source> <translation type="unfinished"/> </message> <message> - <location line="+34"/> + <location line="+50"/> <source>Listen for JSON-RPC connections on <port> (default: 8332 or testnet: 18332)</source> <translation type="unfinished"/> </message> <message> - <location line="+45"/> + <location line="+51"/> <source>Accept command line and JSON-RPC commands</source> <translation type="unfinished"/> </message> <message> - <location line="+80"/> + <location line="+7"/> + <source>Bitcoin Core RPC client version</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+87"/> <source>Run in the background as a daemon and accept commands</source> <translation type="unfinished"/> </message> <message> - <location line="+39"/> + <location line="+43"/> <source>Use the test network</source> <translation type="unfinished"/> </message> <message> - <location line="-118"/> + <location line="-136"/> <source>Accept connections from outside (default: 1 if no -proxy or -connect)</source> <translation type="unfinished"/> </message> <message> - <location line="-95"/> + <location line="-117"/> <source>%s, you must set a rpcpassword in the configuration file: %s It is recommended you use the following random password: @@ -3337,8 +3396,8 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+3"/> - <source>Cannot obtain a lock on data directory %s. Bitcoin is probably already running.</source> + <location line="+6"/> + <source>Continuously rate-limit free transactions to <n>*1000 bytes per minute (default:15)</source> <translation type="unfinished"/> </message> <message> @@ -3353,6 +3412,11 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. </message> <message> <location line="+3"/> + <source>Error: Listening for incoming connections failed (listen returned error %d)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+2"/> <source>Error: The transaction was rejected! This might happen if some of the coins in your wallet were already spent, such as if you used a copy of wallet.dat and coins were spent in the copy but not marked as spent here.</source> <translation type="unfinished"/> </message> @@ -3367,12 +3431,47 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+18"/> + <location line="+6"/> + <source>Fees smaller than this are considered zero fee (for transaction creation) (default:</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+3"/> + <source>Flush database activity from memory pool to disk log every <n> megabytes (default: 100)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+3"/> + <source>How thorough the block verification of -checkblocks is (0-4, default: 3)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+2"/> + <source>In this mode -genproclimit controls how many blocks are generated immediately.</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+12"/> + <source>Set the number of script verification threads (%u to %d, 0 = auto, <0 = leave that many cores free, default: %d)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+3"/> + <source>Set the processor limit for when generation is on (-1 = unlimited, default: -1)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+3"/> <source>This is a pre-release test build - use at your own risk - do not use for mining or merchant applications</source> <translation type="unfinished"/> </message> <message> - <location line="+5"/> + <location line="+3"/> + <source>Unable to bind to %s on this computer. Bitcoin Core is probably already running.</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+3"/> <source>Use separate SOCKS5 proxy to reach peers via Tor hidden services (default: -proxy)</source> <translation type="unfinished"/> </message> @@ -3408,6 +3507,16 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. </message> <message> <location line="+9"/> + <source>(default: 1)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>(default: wallet.dat)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> <source><category> can be:</source> <translation type="unfinished"/> </message> @@ -3422,17 +3531,17 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+1"/> - <source>Bitcoin RPC client version</source> + <location line="+2"/> + <source>Block creation options:</source> <translation type="unfinished"/> </message> <message> - <location line="+1"/> - <source>Block creation options:</source> + <location line="+5"/> + <source>Clear list of wallet transactions (diagnostic tool; implies -rescan)</source> <translation type="unfinished"/> </message> <message> - <location line="+5"/> + <location line="+1"/> <source>Connect only to the specified node(s)</source> <translation type="unfinished"/> </message> @@ -3448,11 +3557,26 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. </message> <message> <location line="+2"/> + <source>Connection options:</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> <source>Corrupted block database detected</source> <translation type="unfinished"/> </message> <message> <location line="+1"/> + <source>Debugging/Testing options:</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>Disable safemode, override a real safe mode event (default: 0)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> <source>Discover own IP address (default: 1 when listening and no -externalip)</source> <translation type="unfinished"/> </message> @@ -3563,22 +3687,27 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. </message> <message> <location line="+1"/> - <source>Find peers using DNS lookup (default: 1 unless -connect)</source> + <source>Fees smaller than this are considered zero fee (for relaying) (default:</source> <translation type="unfinished"/> </message> <message> <location line="+1"/> - <source>Generate coins (default: 0)</source> + <source>Find peers using DNS lookup (default: 1 unless -connect)</source> <translation type="unfinished"/> </message> <message> - <location line="+2"/> - <source>How many blocks to check at startup (default: 288, 0 = all)</source> + <location line="+1"/> + <source>Force safe mode (default: 0)</source> <translation type="unfinished"/> </message> <message> <location line="+1"/> - <source>How thorough the block verification is (0-4, default: 3)</source> + <source>Generate coins (default: 0)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+2"/> + <source>How many blocks to check at startup (default: 288, 0 = all)</source> <translation type="unfinished"/> </message> <message> @@ -3597,7 +3726,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+15"/> + <location line="+17"/> <source>Not enough file descriptors available.</source> <translation type="unfinished"/> </message> @@ -3607,27 +3736,27 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+1"/> + <location line="+4"/> <source>RPC client options:</source> <translation type="unfinished"/> </message> <message> - <location line="+1"/> + <location line="+4"/> <source>Rebuild block chain index from current blk000??.dat files</source> <translation type="unfinished"/> </message> <message> - <location line="+5"/> + <location line="+6"/> <source>Select SOCKS version for -proxy (4 or 5, default: 5)</source> <translation type="unfinished"/> </message> <message> - <location line="+1"/> - <source>Send command to Bitcoin server</source> + <location line="+6"/> + <source>Set database cache size in megabytes (%d to %d, default: %d)</source> <translation type="unfinished"/> </message> <message> - <location line="+7"/> + <location line="+2"/> <source>Set maximum block size in bytes (default: %d)</source> <translation type="unfinished"/> </message> @@ -3637,17 +3766,17 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+7"/> + <location line="+10"/> <source>Specify wallet file (within data directory)</source> <translation type="unfinished"/> </message> <message> <location line="+2"/> - <source>Start Bitcoin server</source> + <source>Spend unconfirmed change when sending transactions (default: 1)</source> <translation type="unfinished"/> </message> <message> - <location line="+3"/> + <location line="+4"/> <source>This is intended for regression testing tools and app development.</source> <translation type="unfinished"/> </message> @@ -3692,32 +3821,32 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="-79"/> + <location line="-92"/> <source>Imports blocks from external blk000??.dat file</source> <translation type="unfinished"/> </message> <message> - <location line="-105"/> - <source>Execute command when a relevant alert is received or we see a really long fork (%s in cmd is replaced by message)</source> + <location line="-149"/> + <source>Cannot obtain a lock on data directory %s. Bitcoin Core is probably already running.</source> <translation type="unfinished"/> </message> <message> - <location line="+14"/> - <source>Output debugging information (default: 0, supplying <category> is optional)</source> + <location line="+22"/> + <source>Execute command when a relevant alert is received or we see a really long fork (%s in cmd is replaced by message)</source> <translation type="unfinished"/> </message> <message> - <location line="+2"/> - <source>Set maximum size of high-priority/low-fee transactions in bytes (default: %d)</source> + <location line="+25"/> + <source>Output debugging information (default: 0, supplying <category> is optional)</source> <translation type="unfinished"/> </message> <message> <location line="+2"/> - <source>Set the number of script verification threads (up to 16, 0 = auto, <0 = leave that many cores free, default: 0)</source> + <source>Set maximum size of high-priority/low-fee transactions in bytes (default: %d)</source> <translation type="unfinished"/> </message> <message> - <location line="+89"/> + <location line="+102"/> <source>Information</source> <translation type="unfinished"/> </message> @@ -3732,7 +3861,17 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+8"/> + <location line="+3"/> + <source>Limit size of signature cache to <n> entries (default: 50000)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+6"/> + <source>Log transaction priority and fee per kB when mining blocks (default: 0)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> <source>Maintain a full transaction index (default: 0)</source> <translation type="unfinished"/> </message> @@ -3757,12 +3896,52 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+9"/> - <source>SSL options: (see the Bitcoin Wiki for SSL setup instructions)</source> + <location line="+4"/> + <source>Print block on startup, if found in block index</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>Print block tree on startup (default: 0)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>RPC SSL options: (see the Bitcoin Wiki for SSL setup instructions)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+2"/> + <source>RPC server options:</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>Randomly drop 1 of every <n> network messages</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>Randomly fuzz 1 of every <n> network messages</source> <translation type="unfinished"/> </message> <message> <location line="+4"/> + <source>Run a thread to flush wallet periodically (default: 1)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+2"/> + <source>SSL options: (see the Bitcoin Wiki for SSL setup instructions)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+2"/> + <source>Send command to Bitcoin Core</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+2"/> <source>Send trace/debug info to console instead of debug.log file</source> <translation type="unfinished"/> </message> @@ -3773,6 +3952,21 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. </message> <message> <location line="+2"/> + <source>Sets the DB_PRIVATE flag in the wallet db environment (default: 1)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>Show all debugging options (usage: --help -help-debug)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>Show benchmark information (default: 0)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> <source>Shrink debug.log file on client startup (default: 1 when no -debug)</source> <translation type="unfinished"/> </message> @@ -3788,6 +3982,11 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. </message> <message> <location line="+6"/> + <source>Start Bitcoin Core Daemon</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> <source>System error: </source> <translation type="unfinished"/> </message> @@ -3833,6 +4032,16 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. </message> <message> <location line="+2"/> + <source>Zapping all transactions from wallet...</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>on startup</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> <source>version</source> <translation type="unfinished"/> </message> @@ -3842,47 +4051,47 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="-58"/> + <location line="-71"/> <source>Password for JSON-RPC connections</source> <translation type="unfinished"/> </message> <message> - <location line="-70"/> + <location line="-77"/> <source>Allow JSON-RPC connections from specified IP address</source> <translation type="unfinished"/> </message> <message> - <location line="+80"/> + <location line="+94"/> <source>Send commands to node running on <ip> (default: 127.0.0.1)</source> <translation type="unfinished"/> </message> <message> - <location line="-132"/> + <location line="-163"/> <source>Execute command when the best block changes (%s in cmd is replaced by block hash)</source> <translation type="unfinished"/> </message> <message> - <location line="+161"/> + <location line="+196"/> <source>Upgrade wallet to latest format</source> <translation type="unfinished"/> </message> <message> - <location line="-24"/> + <location line="-28"/> <source>Set key pool size to <n> (default: 100)</source> <translation type="unfinished"/> </message> <message> - <location line="-11"/> + <location line="-12"/> <source>Rescan the block chain for missing wallet transactions</source> <translation type="unfinished"/> </message> <message> - <location line="+38"/> + <location line="+43"/> <source>Use OpenSSL (https) for JSON-RPC connections</source> <translation type="unfinished"/> </message> <message> - <location line="-30"/> + <location line="-34"/> <source>Server certificate file (default: server.cert)</source> <translation type="unfinished"/> </message> @@ -3892,7 +4101,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+16"/> + <location line="+20"/> <source>This help message</source> <translation type="unfinished"/> </message> @@ -3902,17 +4111,17 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="-107"/> + <location line="-125"/> <source>Allow DNS lookups for -addnode, -seednode and -connect</source> <translation type="unfinished"/> </message> <message> - <location line="+60"/> + <location line="+66"/> <source>Loading addresses...</source> <translation type="unfinished"/> </message> <message> - <location line="-37"/> + <location line="-39"/> <source>Error loading wallet.dat: Wallet corrupted</source> <translation type="unfinished"/> </message> @@ -3922,22 +4131,22 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+98"/> + <location line="+112"/> <source>Wallet needed to be rewritten: restart Bitcoin to complete</source> <translation type="unfinished"/> </message> <message> - <location line="-100"/> + <location line="-114"/> <source>Error loading wallet.dat</source> <translation type="unfinished"/> </message> <message> - <location line="+31"/> + <location line="+32"/> <source>Invalid -proxy address: '%s'</source> <translation type="unfinished"/> </message> <message> - <location line="+56"/> + <location line="+69"/> <source>Unknown network specified in -onlynet: '%s'</source> <translation type="unfinished"/> </message> @@ -3947,7 +4156,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="-101"/> + <location line="-119"/> <source>Cannot resolve -bind address: '%s'</source> <translation type="unfinished"/> </message> @@ -3957,7 +4166,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+48"/> + <location line="+53"/> <source>Invalid amount for -paytxfee=<amount>: '%s'</source> <translation type="unfinished"/> </message> @@ -3972,27 +4181,22 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+10"/> + <location line="+11"/> <source>Loading block index...</source> <translation type="unfinished"/> </message> <message> - <location line="-62"/> + <location line="-68"/> <source>Add a node to connect to and attempt to keep the connection open</source> <translation type="unfinished"/> </message> <message> - <location line="-32"/> - <source>Unable to bind to %s on this computer. Bitcoin is probably already running.</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+95"/> + <location line="+69"/> <source>Loading wallet...</source> <translation type="unfinished"/> </message> <message> - <location line="-56"/> + <location line="-62"/> <source>Cannot downgrade wallet</source> <translation type="unfinished"/> </message> @@ -4002,27 +4206,27 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+67"/> + <location line="+80"/> <source>Rescanning...</source> <translation type="unfinished"/> </message> <message> - <location line="-58"/> + <location line="-67"/> <source>Done loading</source> <translation type="unfinished"/> </message> <message> - <location line="+85"/> + <location line="+99"/> <source>To use the %s option</source> <translation type="unfinished"/> </message> <message> - <location line="-77"/> + <location line="-91"/> <source>Error</source> <translation type="unfinished"/> </message> <message> - <location line="-35"/> + <location line="-41"/> <source>You must set rpcpassword=<password> in the configuration file: %s If the file does not exist, create it with owner-readable-only file permissions.</source> diff --git a/src/qt/locale/bitcoin_de.ts b/src/qt/locale/bitcoin_de.ts index 11bf37817a..e359b9fc09 100644 --- a/src/qt/locale/bitcoin_de.ts +++ b/src/qt/locale/bitcoin_de.ts @@ -1,4 +1,4 @@ -<?xml version="1.0" ?><!DOCTYPE TS><TS language="de" version="2.0"> +<?xml version="1.0" ?><!DOCTYPE TS><TS language="de" version="2.1"> <context> <name>AboutDialog</name> <message> @@ -36,6 +36,12 @@ Dieses Produkt enthält Software, die vom OpenSSL-Projekt zur Verwendung im Open <source>The Bitcoin Core developers</source> <translation>Die "Bitcoin Core"-Entwickler</translation> </message> + <message> + <location line="+12"/> + <location line="+2"/> + <source> (%1-bit)</source> + <translation> (%1-Bit)</translation> + </message> </context> <context> <name>AddressBookPage</name> @@ -65,7 +71,7 @@ Dieses Produkt enthält Software, die vom OpenSSL-Projekt zur Verwendung im Open <translation>&Kopieren</translation> </message> <message> - <location line="+52"/> + <location line="+58"/> <source>C&lose</source> <translation>&Schließen</translation> </message> @@ -75,7 +81,7 @@ Dieses Produkt enthält Software, die vom OpenSSL-Projekt zur Verwendung im Open <translation>Adresse &kopieren</translation> </message> <message> - <location filename="../forms/addressbookpage.ui" line="-41"/> + <location filename="../forms/addressbookpage.ui" line="-47"/> <source>Delete the currently selected address from the list</source> <translation>Ausgewählte Adresse aus der Liste entfernen</translation> </message> @@ -322,7 +328,7 @@ Dieses Produkt enthält Software, die vom OpenSSL-Projekt zur Verwendung im Open <context> <name>BitcoinGUI</name> <message> - <location filename="../bitcoingui.cpp" line="+295"/> + <location filename="../bitcoingui.cpp" line="+294"/> <source>Sign &message...</source> <translation>Nachricht s&ignieren...</translation> </message> @@ -337,12 +343,12 @@ Dieses Produkt enthält Software, die vom OpenSSL-Projekt zur Verwendung im Open <translation>&Ãœbersicht</translation> </message> <message> - <location line="-137"/> + <location line="-136"/> <source>Node</source> <translation>Knoten</translation> </message> <message> - <location line="+138"/> + <location line="+137"/> <source>Show general overview of wallet</source> <translation>Allgemeine Wallet-Ãœbersicht anzeigen</translation> </message> @@ -463,17 +469,17 @@ Dieses Produkt enthält Software, die vom OpenSSL-Projekt zur Verwendung im Open <translation>Nachricht &verifizieren...</translation> </message> <message> - <location line="+430"/> + <location line="+440"/> <source>Bitcoin</source> <translation>Bitcoin</translation> </message> <message> - <location line="-643"/> + <location line="-652"/> <source>Wallet</source> <translation>Wallet</translation> </message> <message> - <location line="+146"/> + <location line="+145"/> <source>&Send</source> <translation>Ãœberweisen</translation> </message> @@ -529,18 +535,18 @@ Dieses Produkt enthält Software, die vom OpenSSL-Projekt zur Verwendung im Open <translation>Registerkartenleiste</translation> </message> <message> - <location line="-284"/> - <location line="+376"/> + <location line="-283"/> + <location line="+375"/> <source>[testnet]</source> <translation>[Testnetz]</translation> </message> <message> - <location line="-401"/> + <location line="-400"/> <source>Bitcoin Core</source> - <translation>Bitcoin-Kern</translation> + <translation>Bitcoin Core</translation> </message> <message> - <location line="+163"/> + <location line="+162"/> <source>Request payments (generates QR codes and bitcoin: URIs)</source> <translation>Zahlungen anfordern (erzeugt QR-Codes und bitcoin: URIs)</translation> </message> @@ -602,7 +608,7 @@ Dieses Produkt enthält Software, die vom OpenSSL-Projekt zur Verwendung im Open <translation>%1 Blöcke des Transaktionsverlaufs verarbeitet.</translation> </message> <message numerus="yes"> - <location line="+23"/> + <location line="+27"/> <source>%n hour(s)</source> <translation><numerusform>%n Stunde</numerusform><numerusform>%n Stunden</numerusform></translation> </message> @@ -613,10 +619,21 @@ Dieses Produkt enthält Software, die vom OpenSSL-Projekt zur Verwendung im Open </message> <message numerus="yes"> <location line="+4"/> + <location line="+6"/> <source>%n week(s)</source> <translation><numerusform>%n Woche</numerusform><numerusform>%n Wochen</numerusform></translation> </message> <message> + <location line="+0"/> + <source>%1 and %2</source> + <translation>%1 und %2</translation> + </message> + <message numerus="yes"> + <location line="+0"/> + <source>%n year(s)</source> + <translation><numerusform>%n Jahr</numerusform><numerusform>%n Jahre</numerusform></translation> + </message> + <message> <location line="+4"/> <source>%1 behind</source> <translation>%1 im Rückstand</translation> @@ -647,12 +664,12 @@ Dieses Produkt enthält Software, die vom OpenSSL-Projekt zur Verwendung im Open <translation>Hinweis</translation> </message> <message> - <location line="-85"/> + <location line="-95"/> <source>Up to date</source> <translation>Auf aktuellem Stand</translation> </message> <message> - <location line="+34"/> + <location line="+44"/> <source>Catching up...</source> <translation>Hole auf...</translation> </message> @@ -689,7 +706,7 @@ Adresse: %4</translation> <translation>Wallet ist <b>verschlüsselt</b> und aktuell <b>gesperrt</b></translation> </message> <message> - <location filename="../bitcoin.cpp" line="+438"/> + <location filename="../bitcoin.cpp" line="+441"/> <source>A fatal error occurred. Bitcoin can no longer continue safely and will quit.</source> <translation>Ein schwerer Fehler ist aufgetreten. Bitcoin kann nicht stabil weiter ausgeführt werden und wird beendet.</translation> </message> @@ -697,7 +714,7 @@ Adresse: %4</translation> <context> <name>ClientModel</name> <message> - <location filename="../clientmodel.cpp" line="+119"/> + <location filename="../clientmodel.cpp" line="+128"/> <source>Network Alert</source> <translation>Netzwerkalarm</translation> </message> @@ -750,7 +767,7 @@ Adresse: %4</translation> <translation>Wechselgeld:</translation> </message> <message> - <location line="+63"/> + <location line="+56"/> <source>(un)select all</source> <translation>Alles (de)selektieren</translation> </message> @@ -765,7 +782,7 @@ Adresse: %4</translation> <translation>Listenansicht</translation> </message> <message> - <location line="+52"/> + <location line="+53"/> <source>Amount</source> <translation>Betrag</translation> </message> @@ -795,7 +812,7 @@ Adresse: %4</translation> <translation>Priorität</translation> </message> <message> - <location filename="../coincontroldialog.cpp" line="+42"/> + <location filename="../coincontroldialog.cpp" line="+41"/> <source>Copy address</source> <translation>Adresse kopieren</translation> </message> @@ -861,7 +878,7 @@ Adresse: %4</translation> <translation>Wechselgeld kopieren</translation> </message> <message> - <location line="+323"/> + <location line="+332"/> <source>highest</source> <translation>am höchsten</translation> </message> @@ -916,7 +933,7 @@ Adresse: %4</translation> <translation>keine</translation> </message> <message> - <location line="+140"/> + <location line="+141"/> <source>Dust</source> <translation>Dust</translation> </message> @@ -979,7 +996,7 @@ Adresse: %4</translation> </message> <message> <location line="+43"/> - <location line="+66"/> + <location line="+63"/> <source>(no label)</source> <translation>(keine Bezeichnung)</translation> </message> @@ -1098,9 +1115,9 @@ Adresse: %4</translation> <translation>Bitcoin Core - Kommandozeilenoptionen</translation> </message> <message> - <location filename="../utilitydialog.cpp" line="+38"/> + <location filename="../utilitydialog.cpp" line="+24"/> <source>Bitcoin Core</source> - <translation>Bitcoin-Kern</translation> + <translation>Bitcoin Core</translation> </message> <message> <location line="+0"/> @@ -1176,7 +1193,7 @@ Adresse: %4</translation> <translation>Ein benutzerdefiniertes Datenverzeichnis verwenden:</translation> </message> <message> - <location filename="../intro.cpp" line="+85"/> + <location filename="../intro.cpp" line="+82"/> <source>Bitcoin</source> <translation>Bitcoin</translation> </message> @@ -1242,7 +1259,7 @@ Adresse: %4</translation> <translation>&Allgemein</translation> </message> <message> - <location line="+6"/> + <location line="+122"/> <source>Optional transaction fee per kB that helps make sure your transactions are processed quickly. Most transactions are 1 kB.</source> <translation>Optionale Transaktionsgebühr pro kB, die sicherstellt, dass ihre Transaktionen schnell bearbeitet werden. Die meisten Transaktionen sind 1 kB groß.</translation> </message> @@ -1252,7 +1269,7 @@ Adresse: %4</translation> <translation>Transaktions&gebühr bezahlen</translation> </message> <message> - <location line="+31"/> + <location line="-131"/> <source>Automatically start Bitcoin after logging in to the system.</source> <translation>Bitcoin nach der Anmeldung am System automatisch ausführen.</translation> </message> @@ -1267,12 +1284,7 @@ Adresse: %4</translation> <translation>Größe des &Datenbankcaches</translation> </message> <message> - <location line="+13"/> - <source>Set database cache size in megabytes (default: 25)</source> - <translation>Größe des Datenbankcaches in MB festlegen (Standard: 25)</translation> - </message> - <message> - <location line="+13"/> + <location line="+16"/> <source>MB</source> <translation>MB</translation> </message> @@ -1287,7 +1299,7 @@ Adresse: %4</translation> <translation>Maximale Anzahl an Skript-Verifizierungs-Threads festlegen (bis zu 16, 0 = automatisch, <0 = so viele Kerne frei lassen, Standard: 0)</translation> </message> <message> - <location line="+58"/> + <location line="+153"/> <source>Connect to the Bitcoin network through a SOCKS proxy.</source> <translation>Ãœber einen SOCKS-Proxy mit dem Bitcoin-Netzwerk verbinden.</translation> </message> @@ -1302,7 +1314,7 @@ Adresse: %4</translation> <translation>IP-Adresse des Proxies (z.B. IPv4: 127.0.0.1 / IPv6: ::1)</translation> </message> <message> - <location line="+224"/> + <location line="+214"/> <source>Active command-line options that override above options:</source> <translation>Aktive Kommandozeilenoptionen, die obige Konfiguration überschreiben:</translation> </message> @@ -1317,12 +1329,37 @@ Adresse: %4</translation> <translation>Konfiguration &zurücksetzen</translation> </message> <message> - <location line="-323"/> + <location line="-313"/> <source>&Network</source> <translation>&Netzwerk</translation> </message> <message> - <location line="+6"/> + <location line="-95"/> + <source>W&allet</source> + <translation>W&allet</translation> + </message> + <message> + <location line="+65"/> + <source>Expert</source> + <translation>Erweiterte Wallet-Optionen</translation> + </message> + <message> + <location line="+9"/> + <source>Enable coin &control features</source> + <translation>"&Coin Control"-Funktionen aktivieren</translation> + </message> + <message> + <location line="+7"/> + <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>Wenn Sie das Ausgeben von unbestätigtem Wechselgeld deaktivieren, kann das Wechselgeld einer Transaktion nicht verwendet werden, bis es mindestens eine Bestätigung erhalten hat. Dies wirkt sich auf die Berechnung des Kontostands aus.</translation> + </message> + <message> + <location line="+3"/> + <source>&Spend unconfirmed change</source> + <translation>&Unbestätigtes Wechselgeld darf ausgegeben werden</translation> + </message> + <message> + <location line="+17"/> <source>Automatically open the Bitcoin client port on the router. This only works when your router supports UPnP and it is enabled.</source> <translation>Automatisch den Bitcoin-Clientport auf dem Router öffnen. Dies funktioniert nur, wenn ihr Router UPnP unterstützt und dies aktiviert ist.</translation> </message> @@ -1384,7 +1421,7 @@ Adresse: %4</translation> <message> <location line="+21"/> <source>&Display</source> - <translation>&Anzeige</translation> + <translation>Anzei&ge</translation> </message> <message> <location line="+8"/> @@ -1417,37 +1454,32 @@ Adresse: %4</translation> <translation>Adressen in der Transaktionsliste &anzeigen</translation> </message> <message> - <location line="+7"/> + <location line="-262"/> <source>Whether to show coin control features or not.</source> <translation>Legt fest, ob die "Coin Control"-Funktionen angezeigt werden.</translation> </message> <message> - <location line="+3"/> - <source>Display coin &control features (experts only)</source> - <translation>"&Coin Control"-Funktionen anzeigen (nur für Experten)</translation> - </message> - <message> - <location line="+136"/> + <location line="+398"/> <source>&OK</source> <translation>&OK</translation> </message> <message> <location line="+7"/> <source>&Cancel</source> - <translation>&Abbrechen</translation> + <translation>A&bbrechen</translation> </message> <message> - <location filename="../optionsdialog.cpp" line="+67"/> + <location filename="../optionsdialog.cpp" line="+70"/> <source>default</source> <translation>Standard</translation> </message> <message> - <location line="+57"/> + <location line="+58"/> <source>none</source> <translation>keine</translation> </message> <message> - <location line="+75"/> + <location line="+78"/> <source>Confirm options reset</source> <translation>Zurücksetzen der Konfiguration bestätigen</translation> </message> @@ -1487,19 +1519,14 @@ Adresse: %4</translation> <translation>Die angezeigten Informationen sind möglicherweise nicht mehr aktuell. Ihre Wallet wird automatisch synchronisiert, nachdem eine Verbindung zum Bitcoin-Netzwerk hergestellt wurde. Dieser Prozess ist jedoch derzeit noch nicht abgeschlossen.</translation> </message> <message> - <location line="-155"/> - <source>Unconfirmed:</source> - <translation>Unbestätigt:</translation> - </message> - <message> - <location line="-83"/> + <location line="-238"/> <source>Wallet</source> <translation>Wallet</translation> </message> <message> <location line="+51"/> - <source>Confirmed:</source> - <translation>Bestätigt:</translation> + <source>Available:</source> + <translation>Verfügbar:</translation> </message> <message> <location line="+16"/> @@ -1507,7 +1534,12 @@ Adresse: %4</translation> <translation>Ihr aktuell verfügbarer Kontostand</translation> </message> <message> - <location line="+32"/> + <location line="+16"/> + <source>Pending:</source> + <translation>Ausstehend:</translation> + </message> + <message> + <location line="+16"/> <source>Total of transactions that have yet to be confirmed, and do not yet count toward the spendable balance</source> <translation>Betrag aus unbestätigten Transaktionen, der noch nicht im aktuell verfügbaren Kontostand enthalten ist</translation> </message> @@ -1640,18 +1672,18 @@ Adresse: %4</translation> <context> <name>QObject</name> <message> - <location filename="../bitcoin.cpp" line="+71"/> - <location line="+11"/> + <location filename="../bitcoin.cpp" line="+63"/> + <location line="+14"/> <source>Bitcoin</source> <translation>Bitcoin</translation> </message> <message> - <location line="+1"/> + <location line="-13"/> <source>Error: Specified data directory "%1" does not exist.</source> <translation>Fehler: Angegebenes Datenverzeichnis "%1" existiert nicht.</translation> </message> <message> - <location line="-12"/> + <location line="+13"/> <source>Error: Invalid combination of -regtest and -testnet.</source> <translation>Fehler: Ungültige Kombination von -regtest und -testnet.</translation> </message> @@ -1702,7 +1734,7 @@ Adresse: %4</translation> <location line="+36"/> <location line="+23"/> <location line="+23"/> - <location filename="../rpcconsole.cpp" line="+359"/> + <location filename="../rpcconsole.cpp" line="+373"/> <source>N/A</source> <translation>k.A.</translation> </message> @@ -1798,11 +1830,13 @@ Adresse: %4</translation> </message> <message> <location line="+64"/> + <location filename="../rpcconsole.cpp" line="-10"/> <source>In:</source> <translation>eingehend:</translation> </message> <message> <location line="+80"/> + <location filename="../rpcconsole.cpp" line="+1"/> <source>Out:</source> <translation>ausgehend:</translation> </message> @@ -1827,7 +1861,7 @@ Adresse: %4</translation> <translation>Konsole zurücksetzen</translation> </message> <message> - <location filename="../rpcconsole.cpp" line="-30"/> + <location filename="../rpcconsole.cpp" line="-35"/> <source>Welcome to the Bitcoin RPC console.</source> <translation>Willkommen in der Bitcoin-RPC-Konsole.</translation> </message> @@ -1842,7 +1876,7 @@ Adresse: %4</translation> <translation>Bitte <b>help</b> eingeben, um eine Ãœbersicht verfügbarer Befehle zu erhalten.</translation> </message> <message> - <location line="+122"/> + <location line="+136"/> <source>%1 B</source> <translation>%1 B</translation> </message> @@ -1958,7 +1992,7 @@ Adresse: %4</translation> <translation>Anzeigen</translation> </message> <message> - <location line="+11"/> + <location line="+14"/> <source>Remove the selected entries from the list</source> <translation>Die ausgewählten Einträge aus der Liste entfernen</translation> </message> @@ -1968,7 +2002,7 @@ Adresse: %4</translation> <translation>Entfernen</translation> </message> <message> - <location filename="../receivecoinsdialog.cpp" line="+38"/> + <location filename="../receivecoinsdialog.cpp" line="+39"/> <source>Copy label</source> <translation>Bezeichnung kopieren</translation> </message> @@ -2038,7 +2072,7 @@ Adresse: %4</translation> <message> <location line="+2"/> <source>Message</source> - <translation>Nachricht signieren</translation> + <translation>Nachricht</translation> </message> <message> <location line="+10"/> @@ -2066,7 +2100,7 @@ Adresse: %4</translation> <message> <location line="+0"/> <source>Message</source> - <translation>Nachricht signieren</translation> + <translation>Nachricht</translation> </message> <message> <location line="+0"/> @@ -2189,12 +2223,12 @@ Adresse: %4</translation> <translation>&Zurücksetzen</translation> </message> <message> - <location line="+52"/> + <location line="+58"/> <source>Balance:</source> <translation>Kontostand:</translation> </message> <message> - <location line="-78"/> + <location line="-84"/> <source>Confirm the send action</source> <translation>Ãœberweisung bestätigen</translation> </message> @@ -2641,7 +2675,7 @@ Adresse: %4</translation> <message> <location filename="../splashscreen.cpp" line="+28"/> <source>Bitcoin Core</source> - <translation>Bitcoin-Kern</translation> + <translation>Bitcoin Core</translation> </message> <message> <location line="+2"/> @@ -2671,6 +2705,11 @@ Adresse: %4</translation> </message> <message> <location line="+6"/> + <source>conflicted</source> + <translation>in Konflikt stehend</translation> + </message> + <message> + <location line="+2"/> <source>%1/offline</source> <translation>%1/offline</translation> </message> @@ -2774,7 +2813,7 @@ Adresse: %4</translation> <location line="+6"/> <location line="+9"/> <source>Message</source> - <translation>Nachricht signieren</translation> + <translation>Nachricht</translation> </message> <message> <location line="-7"/> @@ -2832,12 +2871,12 @@ Adresse: %4</translation> <translation>, wurde noch nicht erfolgreich übertragen</translation> </message> <message numerus="yes"> - <location line="-35"/> + <location line="-37"/> <source>Open for %n more block(s)</source> <translation><numerusform>Offen für %n weiteren Block</numerusform><numerusform>Offen für %n weitere Blöcke</numerusform></translation> </message> <message> - <location line="+70"/> + <location line="+72"/> <source>unknown</source> <translation>unbekannt</translation> </message> @@ -2878,12 +2917,12 @@ Adresse: %4</translation> <translation>Betrag</translation> </message> <message> - <location line="+59"/> + <location line="+78"/> <source>Immature (%1 confirmations, will be available after %2)</source> <translation>Unreif (%1 Bestätigungen, wird verfügbar sein nach %2)</translation> </message> <message numerus="yes"> - <location line="+16"/> + <location line="-21"/> <source>Open for %n more block(s)</source> <translation><numerusform>Offen für %n weiteren Block</numerusform><numerusform>Offen für %n weitere Blöcke</numerusform></translation> </message> @@ -2893,23 +2932,12 @@ Adresse: %4</translation> <translation>Offen bis %1</translation> </message> <message> - <location line="+3"/> - <source>Offline (%1 confirmations)</source> - <translation>Offline (%1 Bestätigungen)</translation> - </message> - <message> - <location line="+3"/> - <source>Unconfirmed (%1 of %2 confirmations)</source> - <translation>Unbestätigt (%1 von %2 Bestätigungen)</translation> - </message> - <message> - <location line="-22"/> - <location line="+25"/> + <location line="+12"/> <source>Confirmed (%1 confirmations)</source> <translation>Bestätigt (%1 Bestätigungen)</translation> </message> <message> - <location line="-22"/> + <location line="+9"/> <source>This block was not received by any other nodes and will probably not be accepted!</source> <translation>Dieser Block wurde von keinem anderen Knoten empfangen und wird wahrscheinlich nicht angenommen werden!</translation> </message> @@ -2919,7 +2947,27 @@ Adresse: %4</translation> <translation>Generiert, jedoch nicht angenommen</translation> </message> <message> - <location line="+62"/> + <location line="-21"/> + <source>Offline</source> + <translation>Offline</translation> + </message> + <message> + <location line="+3"/> + <source>Unconfirmed</source> + <translation>Unbestätigt</translation> + </message> + <message> + <location line="+3"/> + <source>Confirming (%1 of %2 recommended confirmations)</source> + <translation>Bestätige (%1 von %2 empfohlenen Bestätigungen)</translation> + </message> + <message> + <location line="+6"/> + <source>Conflicted</source> + <translation>in Konflikt stehend</translation> + </message> + <message> + <location line="+51"/> <source>Received with</source> <translation>Empfangen über</translation> </message> @@ -2949,7 +2997,7 @@ Adresse: %4</translation> <translation>(k.A.)</translation> </message> <message> - <location line="+199"/> + <location line="+190"/> <source>Transaction status. Hover over this field to show number of confirmations.</source> <translation>Transaktionsstatus. Fahren Sie mit der Maus über dieses Feld, um die Anzahl der Bestätigungen zu sehen.</translation> </message> @@ -3078,7 +3126,7 @@ Adresse: %4</translation> <translation>Transaktionsdetails anzeigen</translation> </message> <message> - <location line="+142"/> + <location line="+140"/> <source>Export Transaction History</source> <translation>Transaktionsverlauf exportieren</translation> </message> @@ -3215,12 +3263,12 @@ Adresse: %4</translation> <context> <name>bitcoin-core</name> <message> - <location filename="../bitcoinstrings.cpp" line="+221"/> + <location filename="../bitcoinstrings.cpp" line="+226"/> <source>Usage:</source> <translation>Benutzung:</translation> </message> <message> - <location line="-54"/> + <location line="-55"/> <source>List commands</source> <translation>Befehle auflisten</translation> </message> @@ -3250,12 +3298,7 @@ Adresse: %4</translation> <translation>Datenverzeichnis festlegen</translation> </message> <message> - <location line="-9"/> - <source>Set database cache size in megabytes (default: 25)</source> - <translation>Größe des Datenbankcaches in MB festlegen (Standard: 25)</translation> - </message> - <message> - <location line="-26"/> + <location line="-35"/> <source>Listen for connections on <port> (default: 8333 or testnet: 18333)</source> <translation><port> nach Verbindungen abhören (Standard: 8333 oder Testnetz: 18333)</translation> </message> @@ -3275,47 +3318,47 @@ Adresse: %4</translation> <translation>Die eigene öffentliche Adresse angeben</translation> </message> <message> - <location line="+5"/> + <location line="+6"/> <source>Threshold for disconnecting misbehaving peers (default: 100)</source> <translation>Schwellenwert, um Verbindungen zu sich nicht konform verhaltenden Gegenstellen zu beenden (Standard: 100)</translation> </message> <message> - <location line="-148"/> + <location line="-151"/> <source>Number of seconds to keep misbehaving peers from reconnecting (default: 86400)</source> <translation>Anzahl Sekunden, während denen sich nicht konform verhaltenden Gegenstellen die Wiederverbindung verweigert wird (Standard: 86400)</translation> </message> <message> - <location line="-36"/> + <location line="-38"/> <source>An error occurred while setting up the RPC port %u for listening on IPv4: %s</source> <translation>Beim Einrichten des abzuhörenden RPC-Ports %u für IPv4 ist ein Fehler aufgetreten: %s</translation> </message> <message> - <location line="+34"/> + <location line="+36"/> <source>Listen for JSON-RPC connections on <port> (default: 8332 or testnet: 18332)</source> <translation><port> nach JSON-RPC-Verbindungen abhören (Standard: 8332 oder Testnetz: 18332)</translation> </message> <message> - <location line="+45"/> + <location line="+46"/> <source>Accept command line and JSON-RPC commands</source> <translation>Kommandozeilenbefehle und JSON-RPC-Befehle annehmen</translation> </message> <message> - <location line="+80"/> + <location line="+81"/> <source>Run in the background as a daemon and accept commands</source> <translation>Als Hintergrunddienst starten und Befehle annehmen</translation> </message> <message> - <location line="+39"/> + <location line="+40"/> <source>Use the test network</source> <translation>Das Testnetz verwenden</translation> </message> <message> - <location line="-118"/> + <location line="-120"/> <source>Accept connections from outside (default: 1 if no -proxy or -connect)</source> <translation>Eingehende Verbindungen annehmen (Standard: 1, wenn nicht -proxy oder -connect)</translation> </message> <message> - <location line="-95"/> + <location line="-98"/> <source>%s, you must set a rpcpassword in the configuration file: %s It is recommended you use the following random password: @@ -3355,12 +3398,7 @@ zum Beispiel: alertnotify=echo %%s | mail -s \"Bitcoin Alert\" admin@f <translation>An die angegebene Adresse binden und immer abhören. Für IPv6 [Host]:Port-Schreibweise verwenden</translation> </message> <message> - <location line="+3"/> - <source>Cannot obtain a lock on data directory %s. Bitcoin is probably already running.</source> - <translation>Datenverzeichnis %s kann nicht gesperrt werden. Evtl. wurde Bitcoin bereits gestartet.</translation> - </message> - <message> - <location line="+3"/> + <location line="+6"/> <source>Enter regression test mode, which uses a special chain in which blocks can be solved instantly. This is intended for regression testing tools and app development.</source> <translation>Regressionstest-Modus aktivieren, welcher eine spezielle Kette nutzt, in der Blöcke sofort gelöst werden. Dies ist für Regressionstest-Tools und Anwendungsentwicklung gedacht.</translation> </message> @@ -3371,6 +3409,11 @@ zum Beispiel: alertnotify=echo %%s | mail -s \"Bitcoin Alert\" admin@f </message> <message> <location line="+3"/> + <source>Error: Listening for incoming connections failed (listen returned error %d)</source> + <translation>Fehler: Abhören nach eingehenden Verbindungen fehlgeschlagen (Fehler %d)</translation> + </message> + <message> + <location line="+2"/> <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> @@ -3390,7 +3433,12 @@ zum Beispiel: alertnotify=echo %%s | mail -s \"Bitcoin Alert\" admin@f <translation>Dies ist eine Vorab-Testversion - Verwendung auf eigene Gefahr - nicht für Mining- oder Handelsanwendungen nutzen!</translation> </message> <message> - <location line="+5"/> + <location line="+3"/> + <source>Unable to bind to %s on this computer. Bitcoin Core is probably already running.</source> + <translation>Kann auf diesem Computer nicht an %s binden. Evtl. wurde Bitcoin Core bereits gestartet.</translation> + </message> + <message> + <location line="+3"/> <source>Use separate SOCKS5 proxy to reach peers via Tor hidden services (default: -proxy)</source> <translation>Separaten SOCKS5-Proxy verwenden, um Gegenstellen über versteckte Tor-Dienste zu erreichen (Standard: -proxy)</translation> </message> @@ -3437,7 +3485,7 @@ zum Beispiel: alertnotify=echo %%s | mail -s \"Bitcoin Alert\" admin@f <message> <location line="+1"/> <source>Bitcoin Core Daemon</source> - <translation>"Bitcoin Core"-Daemon</translation> + <translation>"Bitcoin Core"-Hintergrunddienst</translation> </message> <message> <location line="+1"/> @@ -3451,6 +3499,11 @@ zum Beispiel: alertnotify=echo %%s | mail -s \"Bitcoin Alert\" admin@f </message> <message> <location line="+5"/> + <source>Clear list of wallet transactions (diagnostic tool; implies -rescan)</source> + <translation>Liste der Wallet-Transaktionen zurücksetzen (Diagnosetool; beinhaltet -rescan)</translation> + </message> + <message> + <location line="+1"/> <source>Connect only to the specified node(s)</source> <translation>Nur mit dem/den angegebenen Knoten verbinden</translation> </message> @@ -3645,7 +3698,12 @@ zum Beispiel: alertnotify=echo %%s | mail -s \"Bitcoin Alert\" admin@f <translation>Befehl an Bitcoin-Server senden</translation> </message> <message> - <location line="+7"/> + <location line="+5"/> + <source>Set database cache size in megabytes (%d to %d, default: %d)</source> + <translation>Größe des Datenbankcaches in MB festlegen (%d bis %d, Standard: %d)</translation> + </message> + <message> + <location line="+2"/> <source>Set maximum block size in bytes (default: %d)</source> <translation>Maximale Blockgröße in Byte festlegen (Standard: %d)</translation> </message> @@ -3661,6 +3719,11 @@ zum Beispiel: alertnotify=echo %%s | mail -s \"Bitcoin Alert\" admin@f </message> <message> <location line="+2"/> + <source>Spend unconfirmed change when sending transactions (default: 1)</source> + <translation>Unbestätigtes Wechselgeld beim Senden von Transaktionen ausgeben (Standard: 1)</translation> + </message> + <message> + <location line="+1"/> <source>Start Bitcoin server</source> <translation>Bitcoin-Server starten</translation> </message> @@ -3710,12 +3773,17 @@ zum Beispiel: alertnotify=echo %%s | mail -s \"Bitcoin Alert\" admin@f <translation>Sie müssen die Datenbank mit Hilfe von -reindex neu aufbauen, um -txindex zu verändern</translation> </message> <message> - <location line="-79"/> + <location line="-80"/> <source>Imports blocks from external blk000??.dat file</source> <translation>Blöcke aus externer Datei blk000??.dat importieren</translation> </message> <message> - <location line="-105"/> + <location line="-126"/> + <source>Cannot obtain a lock on data directory %s. Bitcoin Core is probably already running.</source> + <translation>Datenverzeichnis %s kann nicht gesperrt werden. Evtl. wurde Bitcoin Core bereits gestartet.</translation> + </message> + <message> + <location line="+19"/> <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>Kommando ausführen wenn ein relevanter Alarm empfangen wird oder wir einen wirklich langen Fork entdecken (%s im Kommando wird durch die Nachricht ersetzt)</translation> </message> @@ -3735,7 +3803,7 @@ zum Beispiel: alertnotify=echo %%s | mail -s \"Bitcoin Alert\" admin@f <translation>Maximale Anzahl an Skript-Verifizierungs-Threads festlegen (bis zu 16, 0 = automatisch, <0 = so viele Kerne frei lassen, Standard: 0)</translation> </message> <message> - <location line="+89"/> + <location line="+91"/> <source>Information</source> <translation>Hinweis</translation> </message> @@ -3805,7 +3873,7 @@ zum Beispiel: alertnotify=echo %%s | mail -s \"Bitcoin Alert\" admin@f <translation>Verbindungstimeout in Millisekunden festlegen (Standard: 5000)</translation> </message> <message> - <location line="+6"/> + <location line="+7"/> <source>System error: </source> <translation>Systemfehler: </translation> </message> @@ -3851,6 +3919,11 @@ zum Beispiel: alertnotify=echo %%s | mail -s \"Bitcoin Alert\" admin@f </message> <message> <location line="+2"/> + <source>Zapping all transactions from wallet...</source> + <translation>Lösche alle Transaktionen aus Wallet...</translation> + </message> + <message> + <location line="+1"/> <source>version</source> <translation>Version</translation> </message> @@ -3860,32 +3933,32 @@ zum Beispiel: alertnotify=echo %%s | mail -s \"Bitcoin Alert\" admin@f <translation>wallet.dat beschädigt, Rettung fehlgeschlagen</translation> </message> <message> - <location line="-58"/> + <location line="-60"/> <source>Password for JSON-RPC connections</source> <translation>Passwort für JSON-RPC-Verbindungen</translation> </message> <message> - <location line="-70"/> + <location line="-71"/> <source>Allow JSON-RPC connections from specified IP address</source> <translation>JSON-RPC-Verbindungen von der angegebenen IP-Adresse erlauben</translation> </message> <message> - <location line="+80"/> + <location line="+81"/> <source>Send commands to node running on <ip> (default: 127.0.0.1)</source> <translation>Sende Befehle an Knoten <ip> (Standard: 127.0.0.1)</translation> </message> <message> - <location line="-132"/> + <location line="-134"/> <source>Execute command when the best block changes (%s in cmd is replaced by block hash)</source> <translation>Kommando ausführen wenn der beste Block wechselt (%s im Kommando wird durch den Hash des Blocks ersetzt)</translation> </message> <message> - <location line="+161"/> + <location line="+164"/> <source>Upgrade wallet to latest format</source> <translation>Wallet auf das neueste Format aktualisieren</translation> </message> <message> - <location line="-24"/> + <location line="-25"/> <source>Set key pool size to <n> (default: 100)</source> <translation>Größe des Schlüsselpools festlegen auf <n> (Standard: 100)</translation> </message> @@ -3895,12 +3968,12 @@ zum Beispiel: alertnotify=echo %%s | mail -s \"Bitcoin Alert\" admin@f <translation>Blockkette erneut nach fehlenden Wallet-Transaktionen durchsuchen</translation> </message> <message> - <location line="+38"/> + <location line="+39"/> <source>Use OpenSSL (https) for JSON-RPC connections</source> <translation>OpenSSL (https) für JSON-RPC-Verbindungen verwenden</translation> </message> <message> - <location line="-30"/> + <location line="-31"/> <source>Server certificate file (default: server.cert)</source> <translation>Serverzertifikat (Standard: server.cert)</translation> </message> @@ -3910,7 +3983,7 @@ zum Beispiel: alertnotify=echo %%s | mail -s \"Bitcoin Alert\" admin@f <translation>Privater Serverschlüssel (Standard: server.pem)</translation> </message> <message> - <location line="+16"/> + <location line="+17"/> <source>This help message</source> <translation>Dieser Hilfetext</translation> </message> @@ -3920,12 +3993,12 @@ zum Beispiel: alertnotify=echo %%s | mail -s \"Bitcoin Alert\" admin@f <translation>Kann auf diesem Computer nicht an %s binden (von bind zurückgegebener Fehler %d, %s)</translation> </message> <message> - <location line="-107"/> + <location line="-109"/> <source>Allow DNS lookups for -addnode, -seednode and -connect</source> <translation>Erlaube DNS-Namensauflösung für -addnode, -seednode und -connect</translation> </message> <message> - <location line="+60"/> + <location line="+61"/> <source>Loading addresses...</source> <translation>Lade Adressen...</translation> </message> @@ -3940,12 +4013,12 @@ zum Beispiel: alertnotify=echo %%s | mail -s \"Bitcoin Alert\" admin@f <translation>Fehler beim Laden von wallet.dat: Wallet benötigt neuere Version von Bitcoin</translation> </message> <message> - <location line="+98"/> + <location line="+99"/> <source>Wallet needed to be rewritten: restart Bitcoin to complete</source> <translation>Wallet musste neu geschrieben werden: starten Sie Bitcoin zur Fertigstellung neu</translation> </message> <message> - <location line="-100"/> + <location line="-101"/> <source>Error loading wallet.dat</source> <translation>Fehler beim Laden von wallet.dat</translation> </message> @@ -3955,7 +4028,7 @@ zum Beispiel: alertnotify=echo %%s | mail -s \"Bitcoin Alert\" admin@f <translation>Ungültige Adresse in -proxy: '%s'</translation> </message> <message> - <location line="+56"/> + <location line="+57"/> <source>Unknown network specified in -onlynet: '%s'</source> <translation>Unbekannter Netztyp in -onlynet angegeben: '%s'</translation> </message> @@ -3965,7 +4038,7 @@ zum Beispiel: alertnotify=echo %%s | mail -s \"Bitcoin Alert\" admin@f <translation>Unbekannte Proxyversion in -socks angefordert: %i</translation> </message> <message> - <location line="-101"/> + <location line="-103"/> <source>Cannot resolve -bind address: '%s'</source> <translation>Kann Adresse in -bind nicht auflösen: '%s'</translation> </message> @@ -3975,7 +4048,7 @@ zum Beispiel: alertnotify=echo %%s | mail -s \"Bitcoin Alert\" admin@f <translation>Kann Adresse in -externalip nicht auflösen: '%s'</translation> </message> <message> - <location line="+48"/> + <location line="+49"/> <source>Invalid amount for -paytxfee=<amount>: '%s'</source> <translation>Ungültiger Betrag für -paytxfee=<amount>: '%s'</translation> </message> @@ -3995,22 +4068,17 @@ zum Beispiel: alertnotify=echo %%s | mail -s \"Bitcoin Alert\" admin@f <translation>Lade Blockindex...</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>Mit dem Knoten verbinden und versuchen die Verbindung aufrecht zu halten</translation> </message> <message> - <location line="-32"/> - <source>Unable to bind to %s on this computer. Bitcoin is probably already running.</source> - <translation>Kann auf diesem Computer nicht an %s binden. Evtl. wurde Bitcoin bereits gestartet.</translation> - </message> - <message> - <location line="+95"/> + <location line="+64"/> <source>Loading wallet...</source> <translation>Lade Wallet...</translation> </message> <message> - <location line="-56"/> + <location line="-57"/> <source>Cannot downgrade wallet</source> <translation>Wallet kann nicht auf eine ältere Version herabgestuft werden</translation> </message> @@ -4020,7 +4088,7 @@ zum Beispiel: alertnotify=echo %%s | mail -s \"Bitcoin Alert\" admin@f <translation>Standardadresse kann nicht geschrieben werden</translation> </message> <message> - <location line="+67"/> + <location line="+68"/> <source>Rescanning...</source> <translation>Durchsuche erneut...</translation> </message> @@ -4030,17 +4098,17 @@ zum Beispiel: alertnotify=echo %%s | mail -s \"Bitcoin Alert\" admin@f <translation>Laden abgeschlossen</translation> </message> <message> - <location line="+85"/> + <location line="+86"/> <source>To use the %s option</source> <translation>Zur Nutzung der %s Option</translation> </message> <message> - <location line="-77"/> + <location line="-78"/> <source>Error</source> <translation>Fehler</translation> </message> <message> - <location line="-35"/> + <location line="-36"/> <source>You must set rpcpassword=<password> in the configuration file: %s If the file does not exist, create it with owner-readable-only file permissions.</source> diff --git a/src/qt/locale/bitcoin_de_AT.ts b/src/qt/locale/bitcoin_de_AT.ts deleted file mode 100644 index ba5a622c8a..0000000000 --- a/src/qt/locale/bitcoin_de_AT.ts +++ /dev/null @@ -1,4093 +0,0 @@ -<?xml version="1.0" ?><!DOCTYPE TS><TS language="de_AT" version="2.0"> -<context> - <name>AboutDialog</name> - <message> - <location filename="../forms/aboutdialog.ui" line="+14"/> - <source>About Bitcoin Core</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+39"/> - <source><b>Bitcoin Core</b> version</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+57"/> - <source> -This is experimental software. - -Distributed under the MIT/X11 software license, see the accompanying file COPYING or http://www.opensource.org/licenses/mit-license.php. - -This product includes software developed by the OpenSSL Project for use in the OpenSSL Toolkit (http://www.openssl.org/) and cryptographic software written by Eric Young (eay@cryptsoft.com) and UPnP software written by Thomas Bernard.</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../utilitydialog.cpp" line="+29"/> - <source>Copyright</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+0"/> - <source>The Bitcoin Core developers</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+12"/> - <location line="+2"/> - <source> (%1-bit)</source> - <translation type="unfinished"/> - </message> -</context> -<context> - <name>AddressBookPage</name> - <message> - <location filename="../forms/addressbookpage.ui" line="+30"/> - <source>Double-click to edit address or label</source> - <translation>Doppelklickn zan Editian vo da Adress und Titl</translation> - </message> - <message> - <location line="+27"/> - <source>Create a new address</source> - <translation>Eazeig a neiche Adress</translation> - </message> - <message> - <location line="+3"/> - <source>&New</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+11"/> - <source>Copy the currently selected address to the system clipboard</source> - <translation>Kopia de ausgwöhte Adress in de Zwischenoblog</translation> - </message> - <message> - <location line="+3"/> - <source>&Copy</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+52"/> - <source>C&lose</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../addressbookpage.cpp" line="+74"/> - <source>&Copy Address</source> - <translation>Adress &Kopian</translation> - </message> - <message> - <location filename="../forms/addressbookpage.ui" line="-41"/> - <source>Delete the currently selected address from the list</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+27"/> - <source>Export the data in the current tab to a file</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+3"/> - <source>&Export</source> - <translation type="unfinished"/> - </message> - <message> - <location line="-27"/> - <source>&Delete</source> - <translation>&Leschn</translation> - </message> - <message> - <location filename="../addressbookpage.cpp" line="-30"/> - <source>Choose the address to send coins to</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+1"/> - <source>Choose the address to receive coins with</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+5"/> - <source>C&hoose</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+6"/> - <source>Sending addresses</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+1"/> - <source>Receiving addresses</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+7"/> - <source>These are your Bitcoin addresses for sending payments. Always check the amount and the receiving address before sending coins.</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+4"/> - <source>These are your Bitcoin addresses for receiving payments. It is recommended to use a new receiving address for each transaction.</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+7"/> - <source>Copy &Label</source> - <translation>&Titl Kopian</translation> - </message> - <message> - <location line="+1"/> - <source>&Edit</source> - <translation>&Ändan</translation> - </message> - <message> - <location line="+194"/> - <source>Export Address List</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+1"/> - <source>Comma separated file (*.csv)</source> - <translation>Mid Beistrich 'trennte Weate (*.csv)</translation> - </message> - <message> - <location line="+13"/> - <source>Exporting Failed</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+1"/> - <source>There was an error trying to save the address list to %1.</source> - <translation type="unfinished"/> - </message> -</context> -<context> - <name>AddressTableModel</name> - <message> - <location filename="../addresstablemodel.cpp" line="+168"/> - <source>Label</source> - <translation>Titl</translation> - </message> - <message> - <location line="+0"/> - <source>Address</source> - <translation>Adress</translation> - </message> - <message> - <location line="+36"/> - <source>(no label)</source> - <translation>nixda</translation> - </message> -</context> -<context> - <name>AskPassphraseDialog</name> - <message> - <location filename="../forms/askpassphrasedialog.ui" line="+26"/> - <source>Passphrase Dialog</source> - <translation>Geheimwort-Eingabedialog</translation> - </message> - <message> - <location line="+21"/> - <source>Enter passphrase</source> - <translation>Gib dei Geheimwuat ei</translation> - </message> - <message> - <location line="+14"/> - <source>New passphrase</source> - <translation>Gib a neix Geheimwuat ei</translation> - </message> - <message> - <location line="+14"/> - <source>Repeat new passphrase</source> - <translation>Und des gleiche noamoi</translation> - </message> - <message> - <location filename="../askpassphrasedialog.cpp" line="+40"/> - <source>Enter the new passphrase to the wallet.<br/>Please use a passphrase of <b>10 or more random characters</b>, or <b>eight or more words</b>.</source> - <translation>A neix Geheimwuat fias Beasl vagebn.<br/>Vawend dabei entweda <b>10 (oda mea) zufölliche Zeichn</b> (oiso Buchstobn, Ziffan, Sondazeichn), oda <b>ocht (oda mea) gaunze Weata</b>.</translation> - </message> - <message> - <location line="+1"/> - <source>Encrypt wallet</source> - <translation>Vaschlissl 's Beasl</translation> - </message> - <message> - <location line="+3"/> - <source>This operation needs your wallet passphrase to unlock the wallet.</source> - <translation>Dafia muasst dei Beasl mitm Geheimwuat aufspean.</translation> - </message> - <message> - <location line="+5"/> - <source>Unlock wallet</source> - <translation>Beasl aufspean</translation> - </message> - <message> - <location line="+3"/> - <source>This operation needs your wallet passphrase to decrypt the wallet.</source> - <translation>Dafia musst des Beasl mitm Geheimwuat entschlissln.</translation> - </message> - <message> - <location line="+5"/> - <source>Decrypt wallet</source> - <translation>Beasl entschlissln</translation> - </message> - <message> - <location line="+3"/> - <source>Change passphrase</source> - <translation>Geheimwuat ändan</translation> - </message> - <message> - <location line="+1"/> - <source>Enter the old and new passphrase to the wallet.</source> - <translation>Gib des oite und des neiche Geheimwuat fias Beasl ei.</translation> - </message> - <message> - <location line="+46"/> - <source>Confirm wallet encryption</source> - <translation>Beasl-Vaschlisselung bschtätign</translation> - </message> - <message> - <location line="+1"/> - <source>Warning: If you encrypt your wallet and lose your passphrase, you will <b>LOSE ALL OF YOUR BITCOINS</b>!</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+0"/> - <source>Are you sure you wish to encrypt your wallet?</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+15"/> - <source>IMPORTANT: Any previous backups you have made of your wallet file should be replaced with the newly generated, encrypted wallet file. For security reasons, previous backups of the unencrypted wallet file will become useless as soon as you start using the new, encrypted wallet.</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+100"/> - <location line="+24"/> - <source>Warning: The Caps Lock key is on!</source> - <translation type="unfinished"/> - </message> - <message> - <location line="-130"/> - <location line="+58"/> - <source>Wallet encrypted</source> - <translation>Beasl is vaschlisslt</translation> - </message> - <message> - <location line="-56"/> - <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 wiad si jetz vatschüssn um de Vaschlisselung obzschliaßn. Denk draun, doss di söbst de Vaschlisselung ned vua an Maleur schitzn kau, waunnst amoi a Ungeziefa (schadsoftware: viren, trojaner) auf dein Rechna host (oda losst).</translation> - </message> - <message> - <location line="+13"/> - <location line="+7"/> - <location line="+42"/> - <location line="+6"/> - <source>Wallet encryption failed</source> - <translation>Vaschlisselung vom Beasl is föhgschlogn</translation> - </message> - <message> - <location line="-54"/> - <source>Wallet encryption failed due to an internal error. Your wallet was not encrypted.</source> - <translation>Vaschlisselung vom Beasl is wegn an inteanen Föhla föhgschlogn. Bleede Gschicht. Jetz is' immano unvaschlisslt.</translation> - </message> - <message> - <location line="+7"/> - <location line="+48"/> - <source>The supplied passphrases do not match.</source> - <translation>howined gsogd: <b>des gleiche<b/> noamoi?</translation> - </message> - <message> - <location line="-37"/> - <source>Wallet unlock failed</source> - <translation>Beasl aufspean is föhgschlogn</translation> - </message> - <message> - <location line="+1"/> - <location line="+11"/> - <location line="+19"/> - <source>The passphrase entered for the wallet decryption was incorrect.</source> - <translation>Des Geheimwuat fias Beasl-Entschlissln woa owa sowos vo foisch.</translation> - </message> - <message> - <location line="-20"/> - <source>Wallet decryption failed</source> - <translation>Beasl-Entschlisselung is föhgschlogn</translation> - </message> - <message> - <location line="+14"/> - <source>Wallet passphrase was successfully changed.</source> - <translation type="unfinished"/> - </message> -</context> -<context> - <name>BitcoinGUI</name> - <message> - <location filename="../bitcoingui.cpp" line="+295"/> - <source>Sign &message...</source> - <translation>A Mödung untaschreim...</translation> - </message> - <message> - <location line="+335"/> - <source>Synchronizing with network...</source> - <translation>Obgleichn midm Netz...</translation> - </message> - <message> - <location line="-407"/> - <source>&Overview</source> - <translation>&Iwasicht</translation> - </message> - <message> - <location line="-137"/> - <source>Node</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+138"/> - <source>Show general overview of wallet</source> - <translation>Zeig de Gesaumt-Iwasicht iwa's Beasl</translation> - </message> - <message> - <location line="+20"/> - <source>&Transactions</source> - <translation>&Iwaweisungen</translation> - </message> - <message> - <location line="+1"/> - <source>Browse transaction history</source> - <translation>Oite Iwaweisungen tscheckn</translation> - </message> - <message> - <location line="+17"/> - <source>E&xit</source> - <translation>&baba</translation> - </message> - <message> - <location line="+1"/> - <source>Quit application</source> - <translation>Baba und foi ned!</translation> - </message> - <message> - <location line="+7"/> - <source>Show information about Bitcoin</source> - <translation>Zeig Infoamationen iwa Bitcoin</translation> - </message> - <message> - <location line="+3"/> - <location line="+2"/> - <source>About &Qt</source> - <translation>Iwa &Qt</translation> - </message> - <message> - <location line="+2"/> - <source>Show information about Qt</source> - <translation>Zeig Infoamationen iwa Qt</translation> - </message> - <message> - <location line="+2"/> - <source>&Options...</source> - <translation>&Eistöllungen...</translation> - </message> - <message> - <location line="+9"/> - <source>&Encrypt Wallet...</source> - <translation>'s &Beasl vaschlissln...</translation> - </message> - <message> - <location line="+3"/> - <source>&Backup Wallet...</source> - <translation>&Sicharungskopie vom Beasl mochn...</translation> - </message> - <message> - <location line="+2"/> - <source>&Change Passphrase...</source> - <translation>&Geheimwuat ändan...</translation> - </message> - <message> - <location line="+10"/> - <source>&Sending addresses...</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+2"/> - <source>&Receiving addresses...</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+3"/> - <source>Open &URI...</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+325"/> - <source>Importing blocks from disk...</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+3"/> - <source>Reindexing blocks on disk...</source> - <translation type="unfinished"/> - </message> - <message> - <location line="-405"/> - <source>Send coins to a Bitcoin address</source> - <translation>Schick Zasta aun a Bitcoin Adress</translation> - </message> - <message> - <location line="+49"/> - <source>Modify configuration options for Bitcoin</source> - <translation>Ända de Eistöllungen fia Bitcoin</translation> - </message> - <message> - <location line="+12"/> - <source>Backup wallet to another location</source> - <translation>Moch a Sichaheitskopie woaundas hin</translation> - </message> - <message> - <location line="+2"/> - <source>Change the passphrase used for wallet encryption</source> - <translation>Des Geheimwuat fia Beasl-Vaschlisselung ändan</translation> - </message> - <message> - <location line="+6"/> - <source>&Debug window</source> - <translation>&Debug Fensta</translation> - </message> - <message> - <location line="+1"/> - <source>Open debugging and diagnostic console</source> - <translation>Debug und Diagnose Konsole öffnen</translation> - </message> - <message> - <location line="-4"/> - <source>&Verify message...</source> - <translation>&Untaschrift tscheckn...</translation> - </message> - <message> - <location line="+430"/> - <source>Bitcoin</source> - <translation>Bitcoin</translation> - </message> - <message> - <location line="-643"/> - <source>Wallet</source> - <translation>Beasl</translation> - </message> - <message> - <location line="+146"/> - <source>&Send</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+7"/> - <source>&Receive</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+46"/> - <location line="+2"/> - <source>&Show / Hide</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+1"/> - <source>Show or hide the main Window</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+3"/> - <source>Encrypt the private keys that belong to your wallet</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+7"/> - <source>Sign messages with your Bitcoin addresses to prove you own them</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+2"/> - <source>Verify messages to ensure they were signed with specified Bitcoin addresses</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+48"/> - <source>&File</source> - <translation>&Datei</translation> - </message> - <message> - <location line="+14"/> - <source>&Settings</source> - <translation>&Eistöllungen</translation> - </message> - <message> - <location line="+9"/> - <source>&Help</source> - <translation>&Hüfe</translation> - </message> - <message> - <location line="+15"/> - <source>Tabs toolbar</source> - <translation>Karteireita Werkzeigleistn</translation> - </message> - <message> - <location line="-284"/> - <location line="+376"/> - <source>[testnet]</source> - <translation>[testnetz]</translation> - </message> - <message> - <location line="-401"/> - <source>Bitcoin Core</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+163"/> - <source>Request payments (generates QR codes and bitcoin: URIs)</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+29"/> - <location line="+2"/> - <source>&About Bitcoin Core</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+35"/> - <source>Show the list of used sending addresses and labels</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+2"/> - <source>Show the list of used receiving addresses and labels</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+3"/> - <source>Open a bitcoin: URI or payment request</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+2"/> - <source>&Command-line options</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+1"/> - <source>Show the Bitcoin Core help message to get a list with possible Bitcoin command-line options</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+159"/> - <location line="+5"/> - <source>Bitcoin client</source> - <translation>Bitcoin Klient</translation> - </message> - <message numerus="yes"> - <location line="+142"/> - <source>%n active connection(s) to Bitcoin network</source> - <translation><numerusform>%n aktive Vabindung zum Netz</numerusform><numerusform>%n aktive Vabindungen zum Netz</numerusform></translation> - </message> - <message> - <location line="+22"/> - <source>No block source available...</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+12"/> - <source>Processed %1 of %2 (estimated) blocks of transaction history.</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+4"/> - <source>Processed %1 blocks of transaction history.</source> - <translation type="unfinished"/> - </message> - <message numerus="yes"> - <location line="+23"/> - <source>%n hour(s)</source> - <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation> - </message> - <message numerus="yes"> - <location line="+4"/> - <source>%n day(s)</source> - <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation> - </message> - <message numerus="yes"> - <location line="+4"/> - <source>%n week(s)</source> - <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation> - </message> - <message> - <location line="+0"/> - <source>%1 and %2</source> - <translation type="unfinished"/> - </message> - <message numerus="yes"> - <location line="+0"/> - <source>%n year(s)</source> - <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation> - </message> - <message> - <location line="+4"/> - <source>%1 behind</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+21"/> - <source>Last received block was generated %1 ago.</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+2"/> - <source>Transactions after this will not yet be visible.</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+27"/> - <source>Error</source> - <translation>Föhla</translation> - </message> - <message> - <location line="+3"/> - <source>Warning</source> - <translation>Pass auf</translation> - </message> - <message> - <location line="+3"/> - <source>Information</source> - <translation type="unfinished"/> - </message> - <message> - <location line="-85"/> - <source>Up to date</source> - <translation>Aktuö</translation> - </message> - <message> - <location line="+34"/> - <source>Catching up...</source> - <translation>Aufhoin...</translation> - </message> - <message> - <location line="+130"/> - <source>Sent transaction</source> - <translation>Iwaweisung oogschickt</translation> - </message> - <message> - <location line="+0"/> - <source>Incoming transaction</source> - <translation>Iwaweisung aun dii</translation> - </message> - <message> - <location line="+1"/> - <source>Date: %1 -Amount: %2 -Type: %3 -Address: %4 -</source> - <translation>Waunn: %1 -Wiavü: %2 -Wos: %3 -Wohin: %4 -</translation> - </message> - <message> - <location line="+69"/> - <source>Wallet is <b>encrypted</b> and currently <b>unlocked</b></source> - <translation>'s Beasl is <b>vaschlisslt</b> und deazeit grod <b>aufgschpeat</b></translation> - </message> - <message> - <location line="+8"/> - <source>Wallet is <b>encrypted</b> and currently <b>locked</b></source> - <translation>'s Beasl is <b>vaschlisslt</b> und deazeit grod <b>zuagschpeat</b></translation> - </message> - <message> - <location filename="../bitcoin.cpp" line="+435"/> - <source>A fatal error occurred. Bitcoin can no longer continue safely and will quit.</source> - <translation type="unfinished"/> - </message> -</context> -<context> - <name>ClientModel</name> - <message> - <location filename="../clientmodel.cpp" line="+119"/> - <source>Network Alert</source> - <translation>Netz Alarm</translation> - </message> -</context> -<context> - <name>CoinControlDialog</name> - <message> - <location filename="../forms/coincontroldialog.ui" line="+14"/> - <source>Coin Control Address Selection</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+34"/> - <source>Quantity:</source> - <translation>Quantität:</translation> - </message> - <message> - <location line="+29"/> - <source>Bytes:</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+45"/> - <source>Amount:</source> - <translation>Betrog:</translation> - </message> - <message> - <location line="+29"/> - <source>Priority:</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+45"/> - <source>Fee:</source> - <translation>Obolus:</translation> - </message> - <message> - <location line="+32"/> - <source>Low Output:</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+48"/> - <source>After Fee:</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+32"/> - <source>Change:</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+56"/> - <source>(un)select all</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+13"/> - <source>Tree mode</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+16"/> - <source>List mode</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+53"/> - <source>Amount</source> - <translation>Betrog</translation> - </message> - <message> - <location line="+10"/> - <source>Address</source> - <translation>Adress</translation> - </message> - <message> - <location line="+5"/> - <source>Date</source> - <translation>Waunn</translation> - </message> - <message> - <location line="+5"/> - <source>Confirmations</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+3"/> - <source>Confirmed</source> - <translation>Bschtätigt</translation> - </message> - <message> - <location line="+5"/> - <source>Priority</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../coincontroldialog.cpp" line="+42"/> - <source>Copy address</source> - <translation>Adress in' Puffa kopian</translation> - </message> - <message> - <location line="+1"/> - <source>Copy label</source> - <translation>Titl in' Puffa kopian</translation> - </message> - <message> - <location line="+1"/> - <location line="+26"/> - <source>Copy amount</source> - <translation>Betrog in' Puffa kopian</translation> - </message> - <message> - <location line="-25"/> - <source>Copy transaction ID</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+1"/> - <source>Lock unspent</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+1"/> - <source>Unlock unspent</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+22"/> - <source>Copy quantity</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+2"/> - <source>Copy fee</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+1"/> - <source>Copy after fee</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+1"/> - <source>Copy bytes</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+1"/> - <source>Copy priority</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+1"/> - <source>Copy low output</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+1"/> - <source>Copy change</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+323"/> - <source>highest</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+1"/> - <source>higher</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+1"/> - <source>high</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+1"/> - <source>medium-high</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+1"/> - <source>medium</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+4"/> - <source>low-medium</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+1"/> - <source>low</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+1"/> - <source>lower</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+1"/> - <source>lowest</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+11"/> - <source>(%1 locked)</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+31"/> - <source>none</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+141"/> - <source>Dust</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+0"/> - <source>yes</source> - <translation>jo</translation> - </message> - <message> - <location line="+0"/> - <source>no</source> - <translation>na</translation> - </message> - <message> - <location line="+10"/> - <source>This label turns red, if the transaction size is greater than 1000 bytes.</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+1"/> - <location line="+5"/> - <source>This means a fee of at least %1 per kB is required.</source> - <translation type="unfinished"/> - </message> - <message> - <location line="-4"/> - <source>Can vary +/- 1 byte per input.</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+2"/> - <source>Transactions with higher priority are more likely to get included into a block.</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+1"/> - <source>This label turns red, if the priority is smaller than "medium".</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+3"/> - <source>This label turns red, if any recipient receives an amount smaller than %1.</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+1"/> - <location line="+4"/> - <source>This means a fee of at least %1 is required.</source> - <translation type="unfinished"/> - </message> - <message> - <location line="-3"/> - <source>Amounts below 0.546 times the minimum relay fee are shown as dust.</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+2"/> - <source>This label turns red, if the change is smaller than %1.</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+43"/> - <location line="+66"/> - <source>(no label)</source> - <translation>nixda</translation> - </message> - <message> - <location line="-9"/> - <source>change from %1 (%2)</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+1"/> - <source>(change)</source> - <translation type="unfinished"/> - </message> -</context> -<context> - <name>EditAddressDialog</name> - <message> - <location filename="../forms/editaddressdialog.ui" line="+14"/> - <source>Edit Address</source> - <translation>Adress ändan</translation> - </message> - <message> - <location line="+11"/> - <source>&Label</source> - <translation>&Titl</translation> - </message> - <message> - <location line="+10"/> - <source>The label associated with this address list entry</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+17"/> - <source>The address associated with this address list entry. This can only be modified for sending addresses.</source> - <translation type="unfinished"/> - </message> - <message> - <location line="-10"/> - <source>&Address</source> - <translation>&Adress</translation> - </message> - <message> - <location filename="../editaddressdialog.cpp" line="+28"/> - <source>New receiving address</source> - <translation>Neiche Empfaungsadress</translation> - </message> - <message> - <location line="+4"/> - <source>New sending address</source> - <translation>Neiche Züü-Adress</translation> - </message> - <message> - <location line="+3"/> - <source>Edit receiving address</source> - <translation>Empfaungs-Adress ändan</translation> - </message> - <message> - <location line="+4"/> - <source>Edit sending address</source> - <translation>Züü-Adress ändan</translation> - </message> - <message> - <location line="+76"/> - <source>The entered address "%1" is already in the address book.</source> - <translation>De eingebene Adress "%1" gibts eh scho im Adressbiachl.</translation> - </message> - <message> - <location line="-5"/> - <source>The entered address "%1" is not a valid Bitcoin address.</source> - <translation>De eingebane Adress "%1" is a Kas.</translation> - </message> - <message> - <location line="+10"/> - <source>Could not unlock wallet.</source> - <translation>'s Aufspean vom Beasl is föhgschlogn.</translation> - </message> - <message> - <location line="+5"/> - <source>New key generation failed.</source> - <translation>Neicha Schlissl hod ned eazeigt weadn kennan.</translation> - </message> -</context> -<context> - <name>FreespaceChecker</name> - <message> - <location filename="../intro.cpp" line="+65"/> - <source>A new data directory will be created.</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+22"/> - <source>name</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+2"/> - <source>Directory already exists. Add %1 if you intend to create a new directory here.</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+3"/> - <source>Path already exists, and is not a directory.</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+7"/> - <source>Cannot create data directory here.</source> - <translation type="unfinished"/> - </message> -</context> -<context> - <name>HelpMessageDialog</name> - <message> - <location filename="../forms/helpmessagedialog.ui" line="+19"/> - <source>Bitcoin Core - Command-line options</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../utilitydialog.cpp" line="+24"/> - <source>Bitcoin Core</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+0"/> - <source>version</source> - <translation>veasion</translation> - </message> - <message> - <location line="+2"/> - <source>Usage:</source> - <translation>Vawendung:</translation> - </message> - <message> - <location line="+1"/> - <source>command-line options</source> - <translation>Kommandozeiln-Optionen</translation> - </message> - <message> - <location line="+4"/> - <source>UI options</source> - <translation>UI Optionen</translation> - </message> - <message> - <location line="+1"/> - <source>Set language, for example "de_DE" (default: system locale)</source> - <translation>de Sproch, am Bestn "de_AT" (sunsta: de Standard-Sproch auf dera Maschin)</translation> - </message> - <message> - <location line="+1"/> - <source>Start minimized</source> - <translation>Mid minimiatn Fensta startn</translation> - </message> - <message> - <location line="+1"/> - <source>Show splash screen on startup (default: 1)</source> - <translation>Zeig a Willkommens-Fensterl beim Starten (waunn ned aundas aungebm: 1)</translation> - </message> - <message> - <location line="+1"/> - <source>Choose data directory on startup (default: 0)</source> - <translation type="unfinished"/> - </message> -</context> -<context> - <name>Intro</name> - <message> - <location filename="../forms/intro.ui" line="+14"/> - <source>Welcome</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+9"/> - <source>Welcome to Bitcoin Core.</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+26"/> - <source>As this is the first time the program is launched, you can choose where Bitcoin Core will store its data.</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+10"/> - <source>Bitcoin Core will download and store a copy of the Bitcoin block chain. At least %1GB of data will be stored in this directory, and it will grow over time. The wallet will also be stored in this directory.</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+10"/> - <source>Use the default data directory</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+7"/> - <source>Use a custom data directory:</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../intro.cpp" line="+85"/> - <source>Bitcoin</source> - <translation>Bitcoin</translation> - </message> - <message> - <location line="+1"/> - <source>Error: Specified data directory "%1" can not be created.</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+19"/> - <source>Error</source> - <translation>Föhla</translation> - </message> - <message> - <location line="+9"/> - <source>GB of free space available</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+3"/> - <source>(of %1GB needed)</source> - <translation type="unfinished"/> - </message> -</context> -<context> - <name>OpenURIDialog</name> - <message> - <location filename="../forms/openuridialog.ui" line="+14"/> - <source>Open URI</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+6"/> - <source>Open payment request from URI or file</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+9"/> - <source>URI:</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+11"/> - <source>Select payment request file</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../openuridialog.cpp" line="+47"/> - <source>Select payment request file to open</source> - <translation type="unfinished"/> - </message> -</context> -<context> - <name>OptionsDialog</name> - <message> - <location filename="../forms/optionsdialog.ui" line="+14"/> - <source>Options</source> - <translation>Eistöllungen</translation> - </message> - <message> - <location line="+13"/> - <source>&Main</source> - <translation>&Masta</translation> - </message> - <message> - <location line="+122"/> - <source>Optional transaction fee per kB that helps make sure your transactions are processed quickly. Most transactions are 1 kB.</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+15"/> - <source>Pay transaction &fee</source> - <translation>Iwaweisungs-Gebührn zoin</translation> - </message> - <message> - <location line="-131"/> - <source>Automatically start Bitcoin after logging in to the system.</source> - <translation>Bitcoin automatisch nochm Einloggn starten.</translation> - </message> - <message> - <location line="+3"/> - <source>&Start Bitcoin on system login</source> - <translation>Bitcoin beim System-Einloggen starten</translation> - </message> - <message> - <location line="+9"/> - <source>Size of &database cache</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+16"/> - <source>MB</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+27"/> - <source>Number of script &verification threads</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+13"/> - <source>Set the number of script verification threads (up to 16, 0 = auto, <0 = leave that many cores free, default: 0)</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+107"/> - <source>&Spend unconfirmed change (experts only)</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+37"/> - <source>Connect to the Bitcoin network through a SOCKS proxy.</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+3"/> - <source>&Connect through SOCKS proxy (default proxy):</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+34"/> - <source>IP address of the proxy (e.g. IPv4: 127.0.0.1 / IPv6: ::1)</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+224"/> - <source>Active command-line options that override above options:</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+43"/> - <source>Reset all client options to default.</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+3"/> - <source>&Reset Options</source> - <translation type="unfinished"/> - </message> - <message> - <location line="-323"/> - <source>&Network</source> - <translation>&Netzwerk</translation> - </message> - <message> - <location line="-86"/> - <source>W&allet</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+52"/> - <source>If you disable the spending of unconfirmed change, the change from a transaction cannot be used until that transaction has at least one confirmation. This also affects how your balance is computed.</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+40"/> - <source>Automatically open the Bitcoin client port on the router. This only works when your router supports UPnP and it is enabled.</source> - <translation>Automatisch den Router fia 'n Bitcoin port eistölln. Des geht nur, waunn da Router UPnP kaunn und waunns des durtn aa eigschoitn is.</translation> - </message> - <message> - <location line="+3"/> - <source>Map port using &UPnP</source> - <translation>Port mit UPnP zuweisen</translation> - </message> - <message> - <location line="+19"/> - <source>Proxy &IP:</source> - <translation>Proxy &IP:</translation> - </message> - <message> - <location line="+32"/> - <source>&Port:</source> - <translation>&Port:</translation> - </message> - <message> - <location line="+25"/> - <source>Port of the proxy (e.g. 9050)</source> - <translation>Port vom Proxy (z.B. 9050)</translation> - </message> - <message> - <location line="+7"/> - <source>SOCKS &Version:</source> - <translation>SOCKS &Version:</translation> - </message> - <message> - <location line="+13"/> - <source>SOCKS version of the proxy (e.g. 5)</source> - <translation>SOCKS version vom Proxy (e.g. 5)</translation> - </message> - <message> - <location line="+36"/> - <source>&Window</source> - <translation>&Fensta</translation> - </message> - <message> - <location line="+6"/> - <source>Show only a tray icon after minimizing the window.</source> - <translation>Zeig nur 's Tray-Büderl, waunns Fensta minimiat wird.</translation> - </message> - <message> - <location line="+3"/> - <source>&Minimize to the tray instead of the taskbar</source> - <translation>Minimier in' Tray stott in' 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>Waunns Fensta gschlossn wiad, moch kaan Exitus, sondan minimier di afoch nua. Zum wiaklichn Beendn muass ma daunn im Menü auf "baba und foi ned" klickn.</translation> - </message> - <message> - <location line="+3"/> - <source>M&inimize on close</source> - <translation>Minimian stott Schliaßn</translation> - </message> - <message> - <location line="+21"/> - <source>&Display</source> - <translation>&Anzeige</translation> - </message> - <message> - <location line="+8"/> - <source>User Interface &language:</source> - <translation>Sproch fias UI:</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>De UI Sproch kaunn do gsetzt weadn. Auswiakn tuat si des owa eascht beim nächsten Start.</translation> - </message> - <message> - <location line="+11"/> - <source>&Unit to show amounts in:</source> - <translation>&Weat-Einheit, in dea Beträge zeigt weadn:</translation> - </message> - <message> - <location line="+13"/> - <source>Choose the default subdivision unit to show in the interface and when sending coins.</source> - <translation>Wöh de standard Unta-Einheit aus, mit der Beträge im UI und beim Vaschickn zeigt weadn.</translation> - </message> - <message> - <location line="+9"/> - <source>Whether to show Bitcoin addresses in the transaction list or not.</source> - <translation>Ob Bitcoin Adressn in da Iwaweisungslistn zeigt weadn soin, oda ned.</translation> - </message> - <message> - <location line="+3"/> - <source>&Display addresses in transaction list</source> - <translation>Zeig Adressn in a Iwaweisungslistn</translation> - </message> - <message> - <location line="+7"/> - <source>Whether to show coin control features or not.</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+3"/> - <source>Display coin &control features (experts only)</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+136"/> - <source>&OK</source> - <translation>&Passt!</translation> - </message> - <message> - <location line="+7"/> - <source>&Cancel</source> - <translation>&Na Ned!</translation> - </message> - <message> - <location filename="../optionsdialog.cpp" line="+70"/> - <source>default</source> - <translation>sunsta</translation> - </message> - <message> - <location line="+58"/> - <source>none</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+78"/> - <source>Confirm options reset</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+1"/> - <location line="+29"/> - <source>Client restart required to activate changes.</source> - <translation type="unfinished"/> - </message> - <message> - <location line="-29"/> - <source>Client will be shutdown, do you want to proceed?</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+33"/> - <source>This change would require a client restart.</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+34"/> - <source>The supplied proxy address is invalid.</source> - <translation>De aungebane Proxy-Adress is a Kas.</translation> - </message> -</context> -<context> - <name>OverviewPage</name> - <message> - <location filename="../forms/overviewpage.ui" line="+14"/> - <source>Form</source> - <translation>Foamulaa</translation> - </message> - <message> - <location line="+50"/> - <location line="+231"/> - <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>De aunzeigtn Datn san meglichaweis ned aktuö. Dei Beasl gleicht si automatisch mitm Netz au, soboid a Vabindung aufrecht is, owa soweit samma no ned.</translation> - </message> - <message> - <location line="-238"/> - <source>Wallet</source> - <translation>Beasl</translation> - </message> - <message> - <location line="+51"/> - <source>Available:</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+16"/> - <source>Your current spendable balance</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+16"/> - <source>Pending:</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+16"/> - <source>Total of transactions that have yet to be confirmed, and do not yet count toward the spendable balance</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+16"/> - <source>Immature:</source> - <translation>Unreif:</translation> - </message> - <message> - <location line="+13"/> - <source>Mined balance that has not yet matured</source> - <translation>Gschiafta Betrog, dea no ned reif is</translation> - </message> - <message> - <location line="+16"/> - <source>Total:</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+16"/> - <source>Your current total balance</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+71"/> - <source><b>Recent transactions</b></source> - <translation><b>unlängste Iwaweisungen</b></translation> - </message> - <message> - <location filename="../overviewpage.cpp" line="+120"/> - <location line="+1"/> - <source>out of sync</source> - <translation>nimma aktuö</translation> - </message> -</context> -<context> - <name>PaymentServer</name> - <message> - <location filename="../paymentserver.cpp" line="+403"/> - <location line="+13"/> - <source>URI handling</source> - <translation>URI Behaundlung</translation> - </message> - <message> - <location line="+1"/> - <source>URI can not be parsed! This can be caused by an invalid Bitcoin address or malformed URI parameters.</source> - <translation>De URI is a Kas! Meglichaweis is de Bitcoin Adress foisch, oda hoit sunst wos vamuakst.</translation> - </message> - <message> - <location line="+96"/> - <source>Requested payment amount of %1 is too small (considered dust).</source> - <translation type="unfinished"/> - </message> - <message> - <location line="-221"/> - <location line="+212"/> - <location line="+13"/> - <location line="+95"/> - <location line="+18"/> - <location line="+16"/> - <source>Payment request error</source> - <translation type="unfinished"/> - </message> - <message> - <location line="-353"/> - <source>Cannot start bitcoin: click-to-pay handler</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+58"/> - <source>Net manager warning</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+1"/> - <source>Your active proxy doesn't support SOCKS5, which is required for payment requests via proxy.</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+52"/> - <source>Payment request fetch URL is invalid: %1</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+27"/> - <source>Payment request file handling</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+1"/> - <source>Payment request file can not be read or processed! This can be caused by an invalid payment request file.</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+73"/> - <source>Unverified payment requests to custom payment scripts are unsupported.</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+59"/> - <source>Refund from %1</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+43"/> - <source>Error communicating with %1: %2</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+24"/> - <source>Payment request can not be parsed or processed!</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+11"/> - <source>Bad response from server %1</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+33"/> - <source>Payment acknowledged</source> - <translation type="unfinished"/> - </message> - <message> - <location line="-11"/> - <source>Network request error</source> - <translation type="unfinished"/> - </message> -</context> -<context> - <name>QObject</name> - <message> - <location filename="../bitcoin.cpp" line="+71"/> - <location line="+11"/> - <source>Bitcoin</source> - <translation>Bitcoin</translation> - </message> - <message> - <location line="+1"/> - <source>Error: Specified data directory "%1" does not exist.</source> - <translation type="unfinished"/> - </message> - <message> - <location line="-12"/> - <source>Error: Invalid combination of -regtest and -testnet.</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../guiutil.cpp" line="+82"/> - <source>Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source> - <translation>Gib a Bitcoin-Adress ei (sowos wia: 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation> - </message> -</context> -<context> - <name>QRImageWidget</name> - <message> - <location filename="../receiverequestdialog.cpp" line="+36"/> - <source>&Save Image...</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+3"/> - <source>&Copy Image</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+28"/> - <source>Save QR Code</source> - <translation>QR-Büderl speichan</translation> - </message> - <message> - <location line="+0"/> - <source>PNG Image (*.png)</source> - <translation type="unfinished"/> - </message> -</context> -<context> - <name>RPCConsole</name> - <message> - <location filename="../forms/rpcconsole.ui" line="+46"/> - <source>Client name</source> - <translation>Klient Namen</translation> - </message> - <message> - <location line="+10"/> - <location line="+23"/> - <location line="+26"/> - <location line="+23"/> - <location line="+23"/> - <location line="+36"/> - <location line="+23"/> - <location line="+36"/> - <location line="+23"/> - <location line="+23"/> - <location filename="../rpcconsole.cpp" line="+359"/> - <source>N/A</source> - <translation>Nix</translation> - </message> - <message> - <location line="-223"/> - <source>Client version</source> - <translation>Klient Veasion</translation> - </message> - <message> - <location line="-45"/> - <source>&Information</source> - <translation>&Information</translation> - </message> - <message> - <location line="-10"/> - <source>Debug window</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+25"/> - <source>General</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+53"/> - <source>Using OpenSSL version</source> - <translation>Vawend OpenSSL in a Version</translation> - </message> - <message> - <location line="+49"/> - <source>Startup time</source> - <translation>Startzeit</translation> - </message> - <message> - <location line="+29"/> - <source>Network</source> - <translation>Netz</translation> - </message> - <message> - <location line="+7"/> - <source>Name</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+23"/> - <source>Number of connections</source> - <translation>Aunzoi von Vabindungen</translation> - </message> - <message> - <location line="+29"/> - <source>Block chain</source> - <translation>Block-Kettn</translation> - </message> - <message> - <location line="+7"/> - <source>Current number of blocks</source> - <translation>Anzoi da Blöck</translation> - </message> - <message> - <location line="+23"/> - <source>Estimated total blocks</source> - <translation>Gschätzte Aunzoi da Blöck insgesaumt</translation> - </message> - <message> - <location line="+23"/> - <source>Last block time</source> - <translation>Zeit vom letztn Block</translation> - </message> - <message> - <location line="+52"/> - <source>&Open</source> - <translation>&Lodn</translation> - </message> - <message> - <location line="+24"/> - <source>&Console</source> - <translation>&Konsole</translation> - </message> - <message> - <location line="+72"/> - <source>&Network Traffic</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+52"/> - <source>&Clear</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+13"/> - <source>Totals</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+64"/> - <source>In:</source> - <translation>In:</translation> - </message> - <message> - <location line="+80"/> - <source>Out:</source> - <translation type="unfinished"/> - </message> - <message> - <location line="-521"/> - <source>Build date</source> - <translation>Programm-Iwasetzunszeitpunkt</translation> - </message> - <message> - <location line="+206"/> - <source>Debug log file</source> - <translation type="unfinished"/> - </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 type="unfinished"/> - </message> - <message> - <location line="+76"/> - <source>Clear console</source> - <translation>Konsole leermochn</translation> - </message> - <message> - <location filename="../rpcconsole.cpp" line="-30"/> - <source>Welcome to the Bitcoin RPC console.</source> - <translation>Heazlich willkomman zua Bitcoin RPC Konsole.</translation> - </message> - <message> - <location line="+1"/> - <source>Use up and down arrows to navigate history, and <b>Ctrl-L</b> to clear screen.</source> - <translation>Vawend de Rauf- und Runta Tastn um bisherige Kommandos zruckzhoin, oder druck Strg-L zum Leschn.</translation> - </message> - <message> - <location line="+1"/> - <source>Type <b>help</b> for an overview of available commands.</source> - <translation>Gib <b>help</b> ein fiara Iwasicht iwa olle Kommandos.</translation> - </message> - <message> - <location line="+122"/> - <source>%1 B</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+2"/> - <source>%1 KB</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+2"/> - <source>%1 MB</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+2"/> - <source>%1 GB</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+7"/> - <source>%1 m</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+5"/> - <source>%1 h</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+2"/> - <source>%1 h %2 m</source> - <translation type="unfinished"/> - </message> -</context> -<context> - <name>ReceiveCoinsDialog</name> - <message> - <location filename="../forms/receivecoinsdialog.ui" line="+107"/> - <source>&Amount:</source> - <translation type="unfinished"/> - </message> - <message> - <location line="-16"/> - <source>&Label:</source> - <translation>&Titl:</translation> - </message> - <message> - <location line="-37"/> - <source>&Message:</source> - <translation type="unfinished"/> - </message> - <message> - <location line="-20"/> - <source>Reuse one of the previously used receiving addresses. Reusing addresses has security and privacy issues. Do not use this unless re-generating a payment request made before.</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+3"/> - <source>R&euse an existing receiving address (not recommended)</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+14"/> - <location line="+23"/> - <source>An optional message to attach to the payment request, which will be displayed when the request is opened. Note: The message will not be sent with the payment over the Bitcoin network.</source> - <translation type="unfinished"/> - </message> - <message> - <location line="-7"/> - <location line="+21"/> - <source>An optional label to associate with the new receiving address.</source> - <translation type="unfinished"/> - </message> - <message> - <location line="-7"/> - <source>Use this form to request payments. All fields are <b>optional</b>.</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+23"/> - <location line="+22"/> - <source>An optional amount to request. Leave this empty or zero to not request a specific amount.</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+32"/> - <source>Clear all fields of the form.</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+3"/> - <source>Clear</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+78"/> - <source>Requested payments history</source> - <translation type="unfinished"/> - </message> - <message> - <location line="-98"/> - <source>&Request payment</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+120"/> - <source>Show the selected request (does the same as double clicking an entry)</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+3"/> - <source>Show</source> - <translation>Zeig</translation> - </message> - <message> - <location line="+11"/> - <source>Remove the selected entries from the list</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+3"/> - <source>Remove</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../receivecoinsdialog.cpp" line="+38"/> - <source>Copy label</source> - <translation>Titl in' Puffa kopian</translation> - </message> - <message> - <location line="+1"/> - <source>Copy message</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+1"/> - <source>Copy amount</source> - <translation>Betrog in' Puffa kopian</translation> - </message> -</context> -<context> - <name>ReceiveRequestDialog</name> - <message> - <location filename="../forms/receiverequestdialog.ui" line="+29"/> - <source>QR Code</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+46"/> - <source>Copy &URI</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+7"/> - <source>Copy &Address</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+7"/> - <source>&Save Image...</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../receiverequestdialog.cpp" line="+56"/> - <source>Request payment to %1</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+6"/> - <source>Payment information</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+1"/> - <source>URI</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+2"/> - <source>Address</source> - <translation>Adress</translation> - </message> - <message> - <location line="+2"/> - <source>Amount</source> - <translation>Betrog</translation> - </message> - <message> - <location line="+2"/> - <source>Label</source> - <translation>Titl</translation> - </message> - <message> - <location line="+2"/> - <source>Message</source> - <translation>Mödung</translation> - </message> - <message> - <location line="+10"/> - <source>Resulting URI too long, try to reduce the text for label / message.</source> - <translation>De URI is z'laung. Tua hoit ned goa sovü fasln. </translation> - </message> - <message> - <location line="+5"/> - <source>Error encoding URI into QR Code.</source> - <translation>Föhla beim Eazeign vo an QR-Büderl fia de URI.</translation> - </message> -</context> -<context> - <name>RecentRequestsTableModel</name> - <message> - <location filename="../recentrequeststablemodel.cpp" line="+24"/> - <source>Date</source> - <translation>Waunn</translation> - </message> - <message> - <location line="+0"/> - <source>Label</source> - <translation>Titl</translation> - </message> - <message> - <location line="+0"/> - <source>Message</source> - <translation>Mödung</translation> - </message> - <message> - <location line="+0"/> - <source>Amount</source> - <translation>Betrog</translation> - </message> - <message> - <location line="+38"/> - <source>(no label)</source> - <translation>nixda</translation> - </message> - <message> - <location line="+9"/> - <source>(no message)</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+8"/> - <source>(no amount)</source> - <translation type="unfinished"/> - </message> -</context> -<context> - <name>SendCoinsDialog</name> - <message> - <location filename="../forms/sendcoinsdialog.ui" line="+14"/> - <location filename="../sendcoinsdialog.cpp" line="+380"/> - <location line="+80"/> - <source>Send Coins</source> - <translation>Vaschick Zasta</translation> - </message> - <message> - <location line="+76"/> - <source>Coin Control Features</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+20"/> - <source>Inputs...</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+7"/> - <source>automatically selected</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+19"/> - <source>Insufficient funds!</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+89"/> - <source>Quantity:</source> - <translation>Quantität:</translation> - </message> - <message> - <location line="+35"/> - <source>Bytes:</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+48"/> - <source>Amount:</source> - <translation>Betrog:</translation> - </message> - <message> - <location line="+32"/> - <source>Priority:</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+48"/> - <source>Fee:</source> - <translation>Obolus:</translation> - </message> - <message> - <location line="+32"/> - <source>Low Output:</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+48"/> - <source>After Fee:</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+32"/> - <source>Change:</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+44"/> - <source>If this is activated, but the change address is empty or invalid, change will be sent to a newly generated address.</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+3"/> - <source>Custom change address</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+164"/> - <source>Send to multiple recipients at once</source> - <translation>Vaschick Zasta glei aun mehrare auf aamoi</translation> - </message> - <message> - <location line="+3"/> - <source>Add &Recipient</source> - <translation type="unfinished"/> - </message> - <message> - <location line="-23"/> - <source>Clear all fields of the form.</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+3"/> - <source>Clear &All</source> - <translation>&Ois Leschn</translation> - </message> - <message> - <location line="+52"/> - <source>Balance:</source> - <translation>Kontostaund:</translation> - </message> - <message> - <location line="-78"/> - <source>Confirm the send action</source> - <translation>Bschtätige de Iwaweisung</translation> - </message> - <message> - <location line="+3"/> - <source>S&end</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../sendcoinsdialog.cpp" line="-229"/> - <source>Confirm send coins</source> - <translation>Iwaweisung bschtätign</translation> - </message> - <message> - <location line="-74"/> - <location line="+5"/> - <location line="+5"/> - <location line="+4"/> - <source>%1 to %2</source> - <translation type="unfinished"/> - </message> - <message> - <location line="-121"/> - <source>Copy quantity</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+1"/> - <source>Copy amount</source> - <translation>Betrog in' Puffa kopian</translation> - </message> - <message> - <location line="+1"/> - <source>Copy fee</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+1"/> - <source>Copy after fee</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+1"/> - <source>Copy bytes</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+1"/> - <source>Copy priority</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+1"/> - <source>Copy low output</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+1"/> - <source>Copy change</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+170"/> - <source>Total Amount %1 (= %2)</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+2"/> - <source>or</source> - <translation>oda</translation> - </message> - <message> - <location line="+203"/> - <source>The recipient address is not valid, please recheck.</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+3"/> - <source>The amount to pay must be larger than 0.</source> - <translation>Waunnst nix vaschickn wüst, daunn loss' hoit bleibm.</translation> - </message> - <message> - <location line="+3"/> - <source>The amount exceeds your balance.</source> - <translation>Des is mea ois wost host.</translation> - </message> - <message> - <location line="+3"/> - <source>The total exceeds your balance when the %1 transaction fee is included.</source> - <translation>Ois zsamm und de Spesn vo %1 dazua is mea ois wost host.</translation> - </message> - <message> - <location line="+3"/> - <source>Duplicate address found, can only send to each address once per send operation.</source> - <translation>A doppete Adress gfundn. (A jede Adress derfs immanua amoi in ana Iwaweisung gebm)</translation> - </message> - <message> - <location line="+3"/> - <source>Transaction creation failed!</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+4"/> - <source>The transaction was rejected! This might happen if some of the coins in your wallet were already spent, such as if you used a copy of wallet.dat and coins were spent in the copy but not marked as spent here.</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+113"/> - <source>Warning: Invalid Bitcoin address</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+20"/> - <source>(no label)</source> - <translation>nixda</translation> - </message> - <message> - <location line="-11"/> - <source>Warning: Unknown change address</source> - <translation type="unfinished"/> - </message> - <message> - <location line="-367"/> - <source>Are you sure you want to send?</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+9"/> - <source>added as transaction fee</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+171"/> - <source>Payment request expired</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+8"/> - <source>Invalid payment address %1</source> - <translation type="unfinished"/> - </message> -</context> -<context> - <name>SendCoinsEntry</name> - <message> - <location filename="../forms/sendcoinsentry.ui" line="+131"/> - <location line="+521"/> - <location line="+536"/> - <source>A&mount:</source> - <translation>&Betrog:</translation> - </message> - <message> - <location line="-1152"/> - <source>Pay &To:</source> - <translation>wo&hin:</translation> - </message> - <message> - <location line="+18"/> - <source>The address to send the payment to (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../sendcoinsentry.cpp" line="+30"/> - <source>Enter a label for this address to add it to your address book</source> - <translation>Gib an Titl fia de neiche Adress</translation> - </message> - <message> - <location filename="../forms/sendcoinsentry.ui" line="+57"/> - <source>&Label:</source> - <translation>&Titl:</translation> - </message> - <message> - <location line="-50"/> - <source>Choose previously used address</source> - <translation type="unfinished"/> - </message> - <message> - <location line="-40"/> - <source>This is a normal payment.</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+50"/> - <source>Alt+A</source> - <translation>Alt+A</translation> - </message> - <message> - <location line="+7"/> - <source>Paste address from clipboard</source> - <translation>Eifügn da Adress ausm Puffa</translation> - </message> - <message> - <location line="+10"/> - <source>Alt+P</source> - <translation>Alt+P</translation> - </message> - <message> - <location line="+7"/> - <location line="+524"/> - <location line="+536"/> - <source>Remove this entry</source> - <translation type="unfinished"/> - </message> - <message> - <location line="-1008"/> - <source>Message:</source> - <translation>Mödung:</translation> - </message> - <message> - <location line="+968"/> - <source>This is a verified payment request.</source> - <translation type="unfinished"/> - </message> - <message> - <location line="-991"/> - <source>Enter a label for this address to add it to the list of used addresses</source> - <translation type="unfinished"/> - </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> - <translation type="unfinished"/> - </message> - <message> - <location line="+426"/> - <source>This is an unverified payment request.</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+18"/> - <location line="+532"/> - <source>Pay To:</source> - <translation type="unfinished"/> - </message> - <message> - <location line="-498"/> - <location line="+536"/> - <source>Memo:</source> - <translation type="unfinished"/> - </message> -</context> -<context> - <name>ShutdownWindow</name> - <message> - <location filename="../utilitydialog.cpp" line="+48"/> - <source>Bitcoin Core is shutting down...</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+1"/> - <source>Do not shut down the computer until this window disappears.</source> - <translation type="unfinished"/> - </message> -</context> -<context> - <name>SignVerifyMessageDialog</name> - <message> - <location filename="../forms/signverifymessagedialog.ui" line="+14"/> - <source>Signatures - Sign / Verify a Message</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+10"/> - <source>&Sign Message</source> - <translation>Mödung &untaschreim</translation> - </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>Duachs Untaschreim vo ana Mödung mit deina Adress stöllst kloa, dass du den Schlissl dazua host. Pass owa auf, dassd ned glei ois untaschreibsd wos da iangdana hinhoit, weu sunst kennts leicht passian, dassd vasehentlich kwasi an Blanko-Scheck untaschreibst. Untaschreib nua konkrete Mödungen denenst aa wiakli zuastimmst.</translation> - </message> - <message> - <location line="+18"/> - <source>The address to sign the message with (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source> - <translation>De Adress mit dera'st untaschreibst (z.B. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation> - </message> - <message> - <location line="+7"/> - <location line="+210"/> - <source>Choose previously used address</source> - <translation type="unfinished"/> - </message> - <message> - <location line="-200"/> - <location line="+210"/> - <source>Alt+A</source> - <translation>Alt+A</translation> - </message> - <message> - <location line="-200"/> - <source>Paste address from clipboard</source> - <translation>Eifügn da Adress ausm Puffa</translation> - </message> - <message> - <location line="+10"/> - <source>Alt+P</source> - <translation>Alt+P</translation> - </message> - <message> - <location line="+12"/> - <source>Enter the message you want to sign here</source> - <translation>Gib de Mödung ei, de'st untaschreibm wüst</translation> - </message> - <message> - <location line="+7"/> - <source>Signature</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+27"/> - <source>Copy the current signature to the system clipboard</source> - <translation>De Untaschrift in den Puffa kopian</translation> - </message> - <message> - <location line="+21"/> - <source>Sign the message to prove you own this Bitcoin address</source> - <translation>Untaschreib de Mödung, damid kloa is, dass de Adress dia gheat</translation> - </message> - <message> - <location line="+3"/> - <source>Sign &Message</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+14"/> - <source>Reset all sign message fields</source> - <translation>Olle Föda zrucksetzn</translation> - </message> - <message> - <location line="+3"/> - <location line="+143"/> - <source>Clear &All</source> - <translation>&Ois Leschn</translation> - </message> - <message> - <location line="-84"/> - <source>&Verify Message</source> - <translation>&Untaschrift tscheckn</translation> - </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>Gib de Untaschrifts-Adress, de Mödung und de Untaschrift ei. De Mödung muass auf Punkt und Beistrich (und Leerzeichn, Tabulatorn, Zeulnumbrüch, usw) gaunz genau des gleiche sein, wos untaschriem wuan is. Pass auf, dassd ned mea in de Mödung eineliest, ois wos wiakli drinsteht, sunst kenntast leicht auf an Schmäh einefoin.</translation> - </message> - <message> - <location line="+21"/> - <source>The address the message was signed with (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source> - <translation>De Adress, mit dera untaschriem wuan is (z.B. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation> - </message> - <message> - <location line="+37"/> - <source>Verify the message to ensure it was signed with the specified Bitcoin address</source> - <translation>Tscheck, doss de Mödung a wiakli mit da aungebanan Adress untaschriem wuan is</translation> - </message> - <message> - <location line="+3"/> - <source>Verify &Message</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+14"/> - <source>Reset all verify message fields</source> - <translation>Olle Föda zrucksetzn</translation> - </message> - <message> - <location filename="../signverifymessagedialog.cpp" line="+30"/> - <source>Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source> - <translation>Gib a Bitcoin-Adress ei (sowos wia: 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation> - </message> - <message> - <location line="-1"/> - <source>Click "Sign Message" to generate signature</source> - <translation>Klick auf "Mödung untaschreim" zum Untaschreim</translation> - </message> - <message> - <location line="+84"/> - <location line="+80"/> - <source>The entered address is invalid.</source> - <translation>De eingebane Adress is a Kas.</translation> - </message> - <message> - <location line="-80"/> - <location line="+8"/> - <location line="+72"/> - <location line="+8"/> - <source>Please check the address and try again.</source> - <translation>Tscheck dassd Adress richtig is, und prowias noamoi.</translation> - </message> - <message> - <location line="-80"/> - <location line="+80"/> - <source>The entered address does not refer to a key.</source> - <translation>De eingebene Adress gheat zu kaan Schlissl.</translation> - </message> - <message> - <location line="-72"/> - <source>Wallet unlock was cancelled.</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+8"/> - <source>Private key for the entered address is not available.</source> - <translation>Zu dera Adress howi kaan Schlissl gspeichat.</translation> - </message> - <message> - <location line="+12"/> - <source>Message signing failed.</source> - <translation>'s Untaschreim is föhgschlogn.</translation> - </message> - <message> - <location line="+5"/> - <source>Message signed.</source> - <translation>Mödung is untaschriem.</translation> - </message> - <message> - <location line="+58"/> - <source>The signature could not be decoded.</source> - <translation>De Untaschrift woara Kas.</translation> - </message> - <message> - <location line="+0"/> - <location line="+13"/> - <source>Please check the signature and try again.</source> - <translation>Tscheck dassd Untaschrift richtig is, und prowias noamoi.</translation> - </message> - <message> - <location line="+0"/> - <source>The signature did not match the message digest.</source> - <translation>De Untaschrift passt ned zu dera Mödung.</translation> - </message> - <message> - <location line="+7"/> - <source>Message verification failed.</source> - <translation>Iwaprifung da Untaschrift is föhgschlogn.</translation> - </message> - <message> - <location line="+5"/> - <source>Message verified.</source> - <translation>De Untaschrift hod zua Mödung passt.</translation> - </message> -</context> -<context> - <name>SplashScreen</name> - <message> - <location filename="../splashscreen.cpp" line="+28"/> - <source>Bitcoin Core</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+2"/> - <source>The Bitcoin Core developers</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+1"/> - <source>[testnet]</source> - <translation>[testnet]</translation> - </message> -</context> -<context> - <name>TrafficGraphWidget</name> - <message> - <location filename="../trafficgraphwidget.cpp" line="+79"/> - <source>KB/s</source> - <translation type="unfinished"/> - </message> -</context> -<context> - <name>TransactionDesc</name> - <message> - <location filename="../transactiondesc.cpp" line="+28"/> - <source>Open until %1</source> - <translation>Offn bis %1</translation> - </message> - <message> - <location line="+6"/> - <source>conflicted</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+2"/> - <source>%1/offline</source> - <translation>%1/koa netz</translation> - </message> - <message> - <location line="+2"/> - <source>%1/unconfirmed</source> - <translation>%1/unbschtätigt</translation> - </message> - <message> - <location line="+2"/> - <source>%1 confirmations</source> - <translation>%1 Bschtätigungan</translation> - </message> - <message> - <location line="+18"/> - <source>Status</source> - <translation>Zuastaund</translation> - </message> - <message numerus="yes"> - <location line="+7"/> - <source>, broadcast through %n node(s)</source> - <translation><numerusform>, iwa %n Knotn vateult</numerusform><numerusform>, iwa %n Knotn vateult</numerusform></translation> - </message> - <message> - <location line="+4"/> - <source>Date</source> - <translation>Waunn</translation> - </message> - <message> - <location line="+7"/> - <source>Source</source> - <translation>Kwöön</translation> - </message> - <message> - <location line="+0"/> - <source>Generated</source> - <translation>Gschiaft</translation> - </message> - <message> - <location line="+5"/> - <location line="+17"/> - <source>From</source> - <translation>Vo</translation> - </message> - <message> - <location line="+1"/> - <location line="+22"/> - <location line="+58"/> - <source>To</source> - <translation>Aun</translation> - </message> - <message> - <location line="-77"/> - <location line="+2"/> - <source>own address</source> - <translation>eigane Adress</translation> - </message> - <message> - <location line="-2"/> - <source>label</source> - <translation>Titl</translation> - </message> - <message> - <location line="+37"/> - <location line="+12"/> - <location line="+45"/> - <location line="+17"/> - <location line="+53"/> - <source>Credit</source> - <translation>eahoitena Betrog</translation> - </message> - <message numerus="yes"> - <location line="-125"/> - <source>matures in %n more block(s)</source> - <translation><numerusform>eascht noch %n Block vawendboa</numerusform><numerusform>eascht noch %n Bleckn vawendboa</numerusform></translation> - </message> - <message> - <location line="+2"/> - <source>not accepted</source> - <translation>ned aungnumman</translation> - </message> - <message> - <location line="+44"/> - <location line="+8"/> - <location line="+15"/> - <location line="+53"/> - <source>Debit</source> - <translation>ausgebana Betrog</translation> - </message> - <message> - <location line="-62"/> - <source>Transaction fee</source> - <translation>Iwaweisungsgebüa</translation> - </message> - <message> - <location line="+16"/> - <source>Net amount</source> - <translation>Untam Strich</translation> - </message> - <message> - <location line="+6"/> - <location line="+9"/> - <source>Message</source> - <translation>Mödung</translation> - </message> - <message> - <location line="-7"/> - <source>Comment</source> - <translation>Bemeakung</translation> - </message> - <message> - <location line="+2"/> - <source>Transaction ID</source> - <translation>Iwaweisungs Nr</translation> - </message> - <message> - <location line="+18"/> - <source>Merchant</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+7"/> - <source>Generated coins must mature %1 blocks before they can be spent. When you generated this block, it was broadcast to the network to be added to the block chain. If it fails to get into the chain, its state will change to "not accepted" and it won't be spendable. This may occasionally happen if another node generates a block within a few seconds of yours.</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+8"/> - <source>Debug information</source> - <translation>Debug Infoamation</translation> - </message> - <message> - <location line="+8"/> - <source>Transaction</source> - <translation>Iwaweisung</translation> - </message> - <message> - <location line="+3"/> - <source>Inputs</source> - <translation>Eingobn</translation> - </message> - <message> - <location line="+23"/> - <source>Amount</source> - <translation>Betrog</translation> - </message> - <message> - <location line="+1"/> - <source>true</source> - <translation>woah</translation> - </message> - <message> - <location line="+0"/> - <source>false</source> - <translation>foisch</translation> - </message> - <message> - <location line="-232"/> - <source>, has not been successfully broadcast yet</source> - <translation>, is no ned eafoigreich oogschickt wuan.</translation> - </message> - <message numerus="yes"> - <location line="-37"/> - <source>Open for %n more block(s)</source> - <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation> - </message> - <message> - <location line="+72"/> - <source>unknown</source> - <translation>unbekaunnt</translation> - </message> -</context> -<context> - <name>TransactionDescDialog</name> - <message> - <location filename="../forms/transactiondescdialog.ui" line="+14"/> - <source>Transaction details</source> - <translation>Iwaweisungsdatn</translation> - </message> - <message> - <location line="+6"/> - <source>This pane shows a detailed description of the transaction</source> - <translation>Do sichst de Einzlheitn fo dera Iwaweisung</translation> - </message> -</context> -<context> - <name>TransactionTableModel</name> - <message> - <location filename="../transactiontablemodel.cpp" line="+234"/> - <source>Date</source> - <translation>Waunn</translation> - </message> - <message> - <location line="+0"/> - <source>Type</source> - <translation>Oat</translation> - </message> - <message> - <location line="+0"/> - <source>Address</source> - <translation>Adress</translation> - </message> - <message> - <location line="+0"/> - <source>Amount</source> - <translation>Betrog</translation> - </message> - <message> - <location line="+78"/> - <source>Immature (%1 confirmations, will be available after %2)</source> - <translation type="unfinished"/> - </message> - <message numerus="yes"> - <location line="-21"/> - <source>Open for %n more block(s)</source> - <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation> - </message> - <message> - <location line="+3"/> - <source>Open until %1</source> - <translation>Offn bis %1</translation> - </message> - <message> - <location line="+12"/> - <source>Confirmed (%1 confirmations)</source> - <translation>bschtätigt (%1 Bschtätigungen)</translation> - </message> - <message> - <location line="+9"/> - <source>This block was not received by any other nodes and will probably not be accepted!</source> - <translation>Den Block kaunnst da in d' Hoa schmian!</translation> - </message> - <message> - <location line="+3"/> - <source>Generated but not accepted</source> - <translation>Eazeigt, owa ned aungnumman</translation> - </message> - <message> - <location line="-21"/> - <source>Offline</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+3"/> - <source>Unconfirmed</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+3"/> - <source>Confirming (%1 of %2 recommended confirmations)</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+6"/> - <source>Conflicted</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+51"/> - <source>Received with</source> - <translation>Empfaungen mid</translation> - </message> - <message> - <location line="+2"/> - <source>Received from</source> - <translation>Empfaungen vo</translation> - </message> - <message> - <location line="+3"/> - <source>Sent to</source> - <translation>gschickt aun</translation> - </message> - <message> - <location line="+2"/> - <source>Payment to yourself</source> - <translation>Aun di söbst</translation> - </message> - <message> - <location line="+2"/> - <source>Mined</source> - <translation>gschiaft</translation> - </message> - <message> - <location line="+38"/> - <source>(n/a)</source> - <translation>(nix)</translation> - </message> - <message> - <location line="+190"/> - <source>Transaction status. Hover over this field to show number of confirmations.</source> - <translation>Zuastaund da Iwaweisung. Fia de Aunzoi da Bschtätigungan foah mid da Maus driwa.</translation> - </message> - <message> - <location line="+2"/> - <source>Date and time that the transaction was received.</source> - <translation>Waunn de Iwaweisung einakumman is.</translation> - </message> - <message> - <location line="+2"/> - <source>Type of transaction.</source> - <translation>Oat da Iwaweisung.</translation> - </message> - <message> - <location line="+2"/> - <source>Destination address of transaction.</source> - <translation>Züü-Adress da Iwaweisung.</translation> - </message> - <message> - <location line="+2"/> - <source>Amount removed from or added to balance.</source> - <translation>Da Betrog, den wos'd zoit oda kriagd host.</translation> - </message> -</context> -<context> - <name>TransactionView</name> - <message> - <location filename="../transactionview.cpp" line="+57"/> - <location line="+16"/> - <source>All</source> - <translation>Ois</translation> - </message> - <message> - <location line="-15"/> - <source>Today</source> - <translation>Heit</translation> - </message> - <message> - <location line="+1"/> - <source>This week</source> - <translation>de Wochn</translation> - </message> - <message> - <location line="+1"/> - <source>This month</source> - <translation>den Monat</translation> - </message> - <message> - <location line="+1"/> - <source>Last month</source> - <translation>letztn Monat</translation> - </message> - <message> - <location line="+1"/> - <source>This year</source> - <translation>des Joa</translation> - </message> - <message> - <location line="+1"/> - <source>Range...</source> - <translation>Bereich...</translation> - </message> - <message> - <location line="+11"/> - <source>Received with</source> - <translation>Empfaungen mid</translation> - </message> - <message> - <location line="+2"/> - <source>Sent to</source> - <translation>Gsendet aun</translation> - </message> - <message> - <location line="+2"/> - <source>To yourself</source> - <translation>Aun di söbst</translation> - </message> - <message> - <location line="+1"/> - <source>Mined</source> - <translation>Gschiaft</translation> - </message> - <message> - <location line="+1"/> - <source>Other</source> - <translation>Aundare</translation> - </message> - <message> - <location line="+6"/> - <source>Enter address or label to search</source> - <translation>Suach noch ana Adress oda an Titl</translation> - </message> - <message> - <location line="+6"/> - <source>Min amount</source> - <translation>klaaansta Betrog</translation> - </message> - <message> - <location line="+34"/> - <source>Copy address</source> - <translation>Adress in' Puffa kopian</translation> - </message> - <message> - <location line="+1"/> - <source>Copy label</source> - <translation>Titl in' Puffa kopian</translation> - </message> - <message> - <location line="+1"/> - <source>Copy amount</source> - <translation>Betrog in' Puffa kopian</translation> - </message> - <message> - <location line="+1"/> - <source>Copy transaction ID</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+1"/> - <source>Edit label</source> - <translation>Titl ändan</translation> - </message> - <message> - <location line="+1"/> - <source>Show transaction details</source> - <translation>Zeig de Einzlheitn vo da Iwaweisung</translation> - </message> - <message> - <location line="+142"/> - <source>Export Transaction History</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+19"/> - <source>Exporting Failed</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+0"/> - <source>There was an error trying to save the transaction history to %1.</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+4"/> - <source>Exporting Successful</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+0"/> - <source>The transaction history was successfully saved to %1.</source> - <translation type="unfinished"/> - </message> - <message> - <location line="-22"/> - <source>Comma separated file (*.csv)</source> - <translation>Beistrich 'trennte Weate (*.csv)</translation> - </message> - <message> - <location line="+9"/> - <source>Confirmed</source> - <translation>Bschtätigt</translation> - </message> - <message> - <location line="+1"/> - <source>Date</source> - <translation>Waunn</translation> - </message> - <message> - <location line="+1"/> - <source>Type</source> - <translation>Oat</translation> - </message> - <message> - <location line="+1"/> - <source>Label</source> - <translation>Titl</translation> - </message> - <message> - <location line="+1"/> - <source>Address</source> - <translation>Adress</translation> - </message> - <message> - <location line="+1"/> - <source>Amount</source> - <translation>Betrog</translation> - </message> - <message> - <location line="+1"/> - <source>ID</source> - <translation>Nr</translation> - </message> - <message> - <location line="+107"/> - <source>Range:</source> - <translation>Bereich:</translation> - </message> - <message> - <location line="+8"/> - <source>to</source> - <translation>bis</translation> - </message> -</context> -<context> - <name>WalletFrame</name> - <message> - <location filename="../walletframe.cpp" line="+26"/> - <source>No wallet has been loaded.</source> - <translation type="unfinished"/> - </message> -</context> -<context> - <name>WalletModel</name> - <message> - <location filename="../walletmodel.cpp" line="+245"/> - <source>Send Coins</source> - <translation>Vaschick Zasta</translation> - </message> -</context> -<context> - <name>WalletView</name> - <message> - <location filename="../walletview.cpp" line="+43"/> - <source>&Export</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+1"/> - <source>Export the data in the current tab to a file</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+181"/> - <source>Backup Wallet</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+1"/> - <source>Wallet Data (*.dat)</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+6"/> - <source>Backup Failed</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+0"/> - <source>There was an error trying to save the wallet data to %1.</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+4"/> - <source>The wallet data was successfully saved to %1.</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+0"/> - <source>Backup Successful</source> - <translation type="unfinished"/> - </message> -</context> -<context> - <name>bitcoin-core</name> - <message> - <location filename="../bitcoinstrings.cpp" line="+223"/> - <source>Usage:</source> - <translation>Vawendung:</translation> - </message> - <message> - <location line="-55"/> - <source>List commands</source> - <translation>Kommandos aunzeign</translation> - </message> - <message> - <location line="-14"/> - <source>Get help for a command</source> - <translation>Hüfe fiara Kommando</translation> - </message> - <message> - <location line="+26"/> - <source>Options:</source> - <translation>Eistöllungen:</translation> - </message> - <message> - <location line="+22"/> - <source>Specify configuration file (default: bitcoin.conf)</source> - <translation>Gib de Konfigurationsdatei aun (sunsta: bitcoin.conf)</translation> - </message> - <message> - <location line="+3"/> - <source>Specify pid file (default: bitcoind.pid)</source> - <translation>Datei, wo de Prozessnumma gspeichat wiad (sunsta: bitcoin.pid)</translation> - </message> - <message> - <location line="-1"/> - <source>Specify data directory</source> - <translation>Vazeichnis fia de Datein</translation> - </message> - <message> - <location line="-9"/> - <source>Set database cache size in megabytes (default: 25)</source> - <translation>Zwischnspeichagreß fia de Datenbank in megabeits (sunsta: 25)</translation> - </message> - <message> - <location line="-26"/> - <source>Listen for connections on <port> (default: 8333 or testnet: 18333)</source> - <translation>Auf Vabindungen am <port> lauschn (sunsta: 8333 bzw. testnet: 18333)</translation> - </message> - <message> - <location line="+5"/> - <source>Maintain at most <n> connections to peers (default: 125)</source> - <translation>Hechstns <n> Vabindungen zu aundare Netz-Knotn aufrecht eahoitn (sunsta: 125)</translation> - </message> - <message> - <location line="-51"/> - <source>Connect to a node to retrieve peer addresses, and disconnect</source> - <translation>Vabind di mid an Netz-Knotn, owa frog nua noch aundare Knotn, danoch vapäulisia di wieda</translation> - </message> - <message> - <location line="+84"/> - <source>Specify your own public address</source> - <translation>Gib dei eigene öffentliche Adress aun</translation> - </message> - <message> - <location line="+6"/> - <source>Threshold for disconnecting misbehaving peers (default: 100)</source> - <translation>Geduidsfodnstärke gegniwa deppate Netz-Knotn (sunsta: 100)</translation> - </message> - <message> - <location line="-150"/> - <source>Number of seconds to keep misbehaving peers from reconnecting (default: 86400)</source> - <translation>Waunn Geduidsfodn amoi grissn, daunn wia long bis wieda guat (sunsta: 86400)</translation> - </message> - <message> - <location line="-36"/> - <source>An error occurred while setting up the RPC port %u for listening on IPv4: %s</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+34"/> - <source>Listen for JSON-RPC connections on <port> (default: 8332 or testnet: 18332)</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+45"/> - <source>Accept command line and JSON-RPC commands</source> - <translation>Hob a Uawaschl offn fia de Kommandozeuln und JSON-RPC Beföhle</translation> - </message> - <message> - <location line="+81"/> - <source>Run in the background as a daemon and accept commands</source> - <translation>Ois Dämon im Hintagrund laafn und auf Beföhle lauschn</translation> - </message> - <message> - <location line="+40"/> - <source>Use the test network</source> - <translation>Des Test-Netz vawenden</translation> - </message> - <message> - <location line="-120"/> - <source>Accept connections from outside (default: 1 if no -proxy or -connect)</source> - <translation>Nimm Vabindungen vo aussn aun (waunn nix aungebn is, güt 1, aussa waunn -proxy oda -connect optionen aungebm san)</translation> - </message> - <message> - <location line="-95"/> - <source>%s, you must set a rpcpassword in the configuration file: -%s -It is recommended you use the following random password: -rpcuser=bitcoinrpc -rpcpassword=%s -(you do not need to remember this password) -The username and password MUST NOT be the same. -If the file does not exist, create it with owner-readable-only file permissions. -It is also recommended to set alertnotify so you are notified of problems; -for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo.com -</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+12"/> - <source>Acceptable ciphers (default: TLSv1.2+HIGH:TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!3DES:@STRENGTH)</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+5"/> - <source>An error occurred while setting up the RPC port %u for listening on IPv6, falling back to IPv4: %s</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+3"/> - <source>Bind to given address and always listen on it. Use [host]:port notation for IPv6</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+3"/> - <source>Cannot obtain a lock on data directory %s. Bitcoin is probably already running.</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+3"/> - <source>Enter regression test mode, which uses a special chain in which blocks can be solved instantly. This is intended for regression testing tools and app development.</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+4"/> - <source>Enter regression test mode, which uses a special chain in which blocks can be solved instantly.</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+3"/> - <source>Error: The transaction was rejected! This might happen if some of the coins in your wallet were already spent, such as if you used a copy of wallet.dat and coins were spent in the copy but not marked as spent here.</source> - <translation type="unfinished"/> - </message> - <message> - <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 type="unfinished"/> - </message> - <message> - <location line="+6"/> - <source>Execute command when a wallet transaction changes (%s in cmd is replaced by TxID)</source> - <translation>A programmal startn, waunn si a unbstätigte Iwaweisung ändat. (a %s wiad dabei duachn Iwaweisungs-Hash easetzt)</translation> - </message> - <message> - <location line="+18"/> - <source>This is a pre-release test build - use at your own risk - do not use for mining or merchant applications</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+5"/> - <source>Use separate SOCKS5 proxy to reach peers via Tor hidden services (default: -proxy)</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+3"/> - <source>Warning: -paytxfee is set very high! This is the transaction fee you will pay if you send a transaction.</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+3"/> - <source>Warning: Please check that your computer's date and time are correct! If your clock is wrong Bitcoin will not work properly.</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+3"/> - <source>Warning: The network does not appear to fully agree! Some miners appear to be experiencing issues.</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+3"/> - <source>Warning: We do not appear to fully agree with our peers! You may need to upgrade, or other nodes may need to upgrade.</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+3"/> - <source>Warning: error reading wallet.dat! All keys read correctly, but transaction data or address book entries might be missing or incorrect.</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+3"/> - <source>Warning: wallet.dat corrupt, data salvaged! Original wallet.dat saved as wallet.{timestamp}.bak in %s; if your balance or transactions are incorrect you should restore from a backup.</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+9"/> - <source><category> can be:</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+6"/> - <source>Attempt to recover private keys from a corrupt wallet.dat</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+1"/> - <source>Bitcoin Core Daemon</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+1"/> - <source>Bitcoin RPC client version</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+1"/> - <source>Block creation options:</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+5"/> - <source>Clear list of wallet transactions (diagnostic tool; implies -rescan)</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+1"/> - <source>Connect only to the specified node(s)</source> - <translation>Nur mit de aungebanen Netz-Knotn vabindn.</translation> - </message> - <message> - <location line="+1"/> - <source>Connect through SOCKS proxy</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+1"/> - <source>Connect to JSON-RPC on <port> (default: 8332 or testnet: 18332)</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+2"/> - <source>Corrupted block database detected</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+1"/> - <source>Discover own IP address (default: 1 when listening and no -externalip)</source> - <translation>Find söbst de eigane IP-Adress (waunn nix aungebn is: 1, aussa mit -externalip oda waunns Lauschn oisagaunza oodraht is)</translation> - </message> - <message> - <location line="+1"/> - <source>Do not load the wallet and disable wallet RPC calls</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+1"/> - <source>Do you want to rebuild the block database now?</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+2"/> - <source>Error initializing block database</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+1"/> - <source>Error initializing wallet database environment %s!</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+1"/> - <source>Error loading block database</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+4"/> - <source>Error opening block database</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+2"/> - <source>Error: Disk space is low!</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+1"/> - <source>Error: Wallet locked, unable to create transaction!</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+1"/> - <source>Error: system error: </source> - <translation type="unfinished"/> - </message> - <message> - <location line="+1"/> - <source>Failed to listen on any port. Use -listen=0 if you want this.</source> - <translation>Föhla beim Lauschn aufn port. Waunn des so gwoit is, dann gib de Option -listen=0 aun.</translation> - </message> - <message> - <location line="+1"/> - <source>Failed to read block info</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+1"/> - <source>Failed to read block</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+1"/> - <source>Failed to sync block index</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+1"/> - <source>Failed to write block index</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+1"/> - <source>Failed to write block info</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+1"/> - <source>Failed to write block</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+1"/> - <source>Failed to write file info</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+1"/> - <source>Failed to write to coin database</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+1"/> - <source>Failed to write transaction index</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+1"/> - <source>Failed to write undo data</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+1"/> - <source>Fee per kB to add to transactions you send</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+1"/> - <source>Find peers using DNS lookup (default: 1 unless -connect)</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+1"/> - <source>Generate coins (default: 0)</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+2"/> - <source>How many blocks to check at startup (default: 288, 0 = all)</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+1"/> - <source>How thorough the block verification is (0-4, default: 3)</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+1"/> - <source>If <category> is not supplied, output all debugging information.</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+2"/> - <source>Incorrect or no genesis block found. Wrong datadir for network?</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+3"/> - <source>Invalid -onion address: '%s'</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+15"/> - <source>Not enough file descriptors available.</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+5"/> - <source>Prepend debug output with timestamp (default: 1)</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+1"/> - <source>RPC client options:</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+1"/> - <source>Rebuild block chain index from current blk000??.dat files</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+5"/> - <source>Select SOCKS version for -proxy (4 or 5, default: 5)</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+1"/> - <source>Send command to Bitcoin server</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+7"/> - <source>Set maximum block size in bytes (default: %d)</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+2"/> - <source>Set the number of threads to service RPC calls (default: 4)</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+7"/> - <source>Specify wallet file (within data directory)</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+2"/> - <source>Spend unconfirmed change when sending transactions (default: 1)</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+1"/> - <source>Start Bitcoin server</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+3"/> - <source>This is intended for regression testing tools and app development.</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+10"/> - <source>Usage (deprecated, use bitcoin-cli):</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+7"/> - <source>Verifying blocks...</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+1"/> - <source>Verifying wallet...</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+1"/> - <source>Wait for RPC server to start</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+1"/> - <source>Wallet %s resides outside data directory %s</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+2"/> - <source>Wallet options:</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+2"/> - <source>Warning: Deprecated argument -debugnet ignored, use -debug=net</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+2"/> - <source>You need to rebuild the database using -reindex to change -txindex</source> - <translation type="unfinished"/> - </message> - <message> - <location line="-80"/> - <source>Imports blocks from external blk000??.dat file</source> - <translation type="unfinished"/> - </message> - <message> - <location line="-106"/> - <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>A programmal startn, waunn de Alarmglockn leitn, oda waunn de Block-Kettn oag vazweigt. (a %s wiad dabei duach a Nochricht easetzt)</translation> - </message> - <message> - <location line="+14"/> - <source>Output debugging information (default: 0, supplying <category> is optional)</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+2"/> - <source>Set maximum size of high-priority/low-fee transactions in bytes (default: %d)</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+2"/> - <source>Set the number of script verification threads (up to 16, 0 = auto, <0 = leave that many cores free, default: 0)</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+90"/> - <source>Information</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+4"/> - <source>Invalid amount for -minrelaytxfee=<amount>: '%s'</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+1"/> - <source>Invalid amount for -mintxfee=<amount>: '%s'</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+8"/> - <source>Maintain a full transaction index (default: 0)</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+2"/> - <source>Maximum per-connection receive buffer, <n>*1000 bytes (default: 5000)</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+1"/> - <source>Maximum per-connection send buffer, <n>*1000 bytes (default: 1000)</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+2"/> - <source>Only accept block chain matching built-in checkpoints (default: 1)</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+1"/> - <source>Only connect to nodes in network <net> (IPv4, IPv6 or Tor)</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+9"/> - <source>SSL options: (see the Bitcoin Wiki for SSL setup instructions)</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+4"/> - <source>Send trace/debug info to console instead of debug.log file</source> - <translation>Protokoi anstott in de Datei debug.log liawa direkt aussaschreibn</translation> - </message> - <message> - <location line="+6"/> - <source>Set minimum block size in bytes (default: 0)</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+2"/> - <source>Shrink debug.log file on client startup (default: 1 when no -debug)</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+1"/> - <source>Signing transaction failed</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+2"/> - <source>Specify connection timeout in milliseconds (default: 5000)</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+7"/> - <source>System error: </source> - <translation type="unfinished"/> - </message> - <message> - <location line="+5"/> - <source>Transaction amount too small</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+1"/> - <source>Transaction amounts must be positive</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+1"/> - <source>Transaction too large</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+8"/> - <source>Use UPnP to map the listening port (default: 0)</source> - <translation>Vawend UPnP um den Lausch-Port zuzuweisn (sunsta: 0)</translation> - </message> - <message> - <location line="+1"/> - <source>Use UPnP to map the listening port (default: 1 when listening)</source> - <translation>Vawend UPnP um den Lausch-Port zuzuweisn (wenn nix aungebm is: 1, wenns Lauschn eigschoitn is)</translation> - </message> - <message> - <location line="+2"/> - <source>Username for JSON-RPC connections</source> - <translation>Benutza fia JSON-RPC Vabindungen</translation> - </message> - <message> - <location line="+7"/> - <source>Warning</source> - <translation>Pass auf</translation> - </message> - <message> - <location line="+2"/> - <source>Warning: This version is obsolete, upgrade required!</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+2"/> - <source>Zapping all transactions from wallet...</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+1"/> - <source>version</source> - <translation>veasion</translation> - </message> - <message> - <location line="+1"/> - <source>wallet.dat corrupt, salvage failed</source> - <translation type="unfinished"/> - </message> - <message> - <location line="-60"/> - <source>Password for JSON-RPC connections</source> - <translation>Geheimwuat fia JSON-RPC Vabindungen</translation> - </message> - <message> - <location line="-71"/> - <source>Allow JSON-RPC connections from specified IP address</source> - <translation>JSON-RPC Beföhle nua vo da aungebanen Netz-Adress ealaubn</translation> - </message> - <message> - <location line="+81"/> - <source>Send commands to node running on <ip> (default: 127.0.0.1)</source> - <translation>Beföhle zum Netz-Knotn mit da <ip>-Adress schickn (sunsta: 127.0.0.1)</translation> - </message> - <message> - <location line="-133"/> - <source>Execute command when the best block changes (%s in cmd is replaced by block hash)</source> - <translation>A programmal startn, waunn si wos am bestn Block ändat. (a %s wiad dabei duachn Block-Hash easetzt)</translation> - </message> - <message> - <location line="+163"/> - <source>Upgrade wallet to latest format</source> - <translation>'s Beasl ins neichaste Foamat bringan</translation> - </message> - <message> - <location line="-25"/> - <source>Set key pool size to <n> (default: 100)</source> - <translation>Schlisslvorratsgreß auf <n> setzn (sunsta: 100)</translation> - </message> - <message> - <location line="-11"/> - <source>Rescan the block chain for missing wallet transactions</source> - <translation>De gaunze Block-kettn noch föhlende Iwaweisungen oosuachn</translation> - </message> - <message> - <location line="+39"/> - <source>Use OpenSSL (https) for JSON-RPC connections</source> - <translation>Vawend OpenSSL (https) fia JSON-RPC Vabindungan</translation> - </message> - <message> - <location line="-31"/> - <source>Server certificate file (default: server.cert)</source> - <translation>Söawa Zeatifikatsdatei (sunsta: server.cert)</translation> - </message> - <message> - <location line="+1"/> - <source>Server private key (default: server.pem)</source> - <translation>Söawa Privatschlissl (sunsta: server.pem)</translation> - </message> - <message> - <location line="+17"/> - <source>This help message</source> - <translation>Dea Hüfe-Text</translation> - </message> - <message> - <location line="+7"/> - <source>Unable to bind to %s on this computer (bind returned error %d, %s)</source> - <translation>Kaun mi ned aun %s auf dera Maschin draunhängan (bind returned error %d, %s)</translation> - </message> - <message> - <location line="-109"/> - <source>Allow DNS lookups for -addnode, -seednode and -connect</source> - <translation>Ealaub DNS nochfrogn fia -addnode, -seednode und -connect</translation> - </message> - <message> - <location line="+61"/> - <source>Loading addresses...</source> - <translation>Adressbiachl lodn...</translation> - </message> - <message> - <location line="-37"/> - <source>Error loading wallet.dat: Wallet corrupted</source> - <translation>Föhla beim Lodn vom Beasl: 's Beasl is leida hinnich</translation> - </message> - <message> - <location line="+1"/> - <source>Error loading wallet.dat: Wallet requires newer version of Bitcoin</source> - <translation>Föhla beim Lodn vom Beasl: fia des Beasl brauchst a neichare Bitcoin veasion</translation> - </message> - <message> - <location line="+99"/> - <source>Wallet needed to be rewritten: restart Bitcoin to complete</source> - <translation>'s Beasl hod neich gschriem weadn miassn: beend des Programmal und starts noamoi zum Featigmochn</translation> - </message> - <message> - <location line="-101"/> - <source>Error loading wallet.dat</source> - <translation>Föhla beim Lodn vom Beasl (wallet.dat)</translation> - </message> - <message> - <location line="+31"/> - <source>Invalid -proxy address: '%s'</source> - <translation>Ungültige "-proxy" Adress: '%s'</translation> - </message> - <message> - <location line="+57"/> - <source>Unknown network specified in -onlynet: '%s'</source> - <translation>Des Netzwerk in -onlynet is a Kas: '%s'</translation> - </message> - <message> - <location line="-1"/> - <source>Unknown -socks proxy version requested: %i</source> - <translation>De valongte -socks proxy version is ned bekaunnt: %i</translation> - </message> - <message> - <location line="-103"/> - <source>Cannot resolve -bind address: '%s'</source> - <translation>Kaunn de -bind Adressn ned auflösn: '%s'</translation> - </message> - <message> - <location line="+1"/> - <source>Cannot resolve -externalip address: '%s'</source> - <translation>Kaunn de -externalip Adressn ned auflösn: '%s'</translation> - </message> - <message> - <location line="+49"/> - <source>Invalid amount for -paytxfee=<amount>: '%s'</source> - <translation>Da Betrog fia -paytxfee=<amount> is a Kas: '%s'</translation> - </message> - <message> - <location line="+1"/> - <source>Invalid amount</source> - <translation>Ungültiga Betrog</translation> - </message> - <message> - <location line="-6"/> - <source>Insufficient funds</source> - <translation>Sovü host goaned</translation> - </message> - <message> - <location line="+10"/> - <source>Loading block index...</source> - <translation>Block index lodn...</translation> - </message> - <message> - <location line="-63"/> - <source>Add a node to connect to and attempt to keep the connection open</source> - <translation>An Netz-Knotn aufnehman, und bei da Staungan hoitn</translation> - </message> - <message> - <location line="-32"/> - <source>Unable to bind to %s on this computer. Bitcoin is probably already running.</source> - <translation>Konnt mi ned aun %s auf dera Maschin aunhängan. Meglichaweis rennt des Programmal scho.</translation> - </message> - <message> - <location line="+96"/> - <source>Loading wallet...</source> - <translation>Beasl lodn...</translation> - </message> - <message> - <location line="-57"/> - <source>Cannot downgrade wallet</source> - <translation>Zrucksteign geht nimma beim Beasl</translation> - </message> - <message> - <location line="+3"/> - <source>Cannot write default address</source> - <translation>De Easotz Adress kaunn ned gschriem weadn</translation> - </message> - <message> - <location line="+68"/> - <source>Rescanning...</source> - <translation>Noch-tscheckn...</translation> - </message> - <message> - <location line="-58"/> - <source>Done loading</source> - <translation>Featig midm Lodn</translation> - </message> - <message> - <location line="+86"/> - <source>To use the %s option</source> - <translation>Um de Option %s z'vawendn</translation> - </message> - <message> - <location line="-78"/> - <source>Error</source> - <translation>Föhla</translation> - </message> - <message> - <location line="-36"/> - <source>You must set rpcpassword=<password> in the configuration file: -%s -If the file does not exist, create it with owner-readable-only file permissions.</source> - <translation>Du muasst rpcpassword=<password> in da Konfigurationsdatei: -%s -setzn. Waunns de Datei no ned gibt, daunn eazeigs so, dass' ka aundara lesn kau.</translation> - </message> -</context> -</TS>
\ No newline at end of file diff --git a/src/qt/locale/bitcoin_en.ts b/src/qt/locale/bitcoin_en.ts index 9523a38801..8f6e0fead8 100644 --- a/src/qt/locale/bitcoin_en.ts +++ b/src/qt/locale/bitcoin_en.ts @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <!DOCTYPE TS> -<TS version="2.1" language="en"> +<TS version="2.0" language="en"> <context> <name>AboutDialog</name> <message> @@ -41,7 +41,7 @@ This product includes software developed by the OpenSSL Project for use in the O <message> <location line="+12"/> <location line="+2"/> - <source> (%1-bit)</source> + <source>(%1-bit)</source> <translation type="unfinished"></translation> </message> </context> @@ -724,7 +724,7 @@ Address: %4 <translation>Wallet is <b>encrypted</b> and currently <b>locked</b></translation> </message> <message> - <location filename="../bitcoin.cpp" line="+441"/> + <location filename="../bitcoin.cpp" line="+447"/> <source>A fatal error occurred. Bitcoin can no longer continue safely and will quit.</source> <translation>A fatal error occurred. Bitcoin can no longer continue safely and will quit.</translation> </message> @@ -732,7 +732,7 @@ Address: %4 <context> <name>ClientModel</name> <message> - <location filename="../clientmodel.cpp" line="+128"/> + <location filename="../clientmodel.cpp" line="+137"/> <source>Network Alert</source> <translation>Network Alert</translation> </message> @@ -946,7 +946,7 @@ Address: %4 <translation type="unfinished"></translation> </message> <message> - <location line="+31"/> + <location line="+32"/> <source>none</source> <translation type="unfinished"></translation> </message> @@ -1014,12 +1014,12 @@ Address: %4 </message> <message> <location line="+43"/> - <location line="+63"/> + <location line="+61"/> <source>(no label)</source> <translation type="unfinished">(no label)</translation> </message> <message> - <location line="-9"/> + <location line="-7"/> <source>change from %1 (%2)</source> <translation type="unfinished"></translation> </message> @@ -1100,7 +1100,7 @@ Address: %4 <context> <name>FreespaceChecker</name> <message> - <location filename="../intro.cpp" line="+65"/> + <location filename="../intro.cpp" line="+68"/> <source>A new data directory will be created.</source> <translation>A new data directory will be created.</translation> </message> @@ -1158,7 +1158,7 @@ Address: %4 <translation type="unfinished">UI options</translation> </message> <message> - <location line="+1"/> + <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> @@ -1169,11 +1169,16 @@ Address: %4 </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="+1"/> + <location line="-4"/> <source>Choose data directory on startup (default: 0)</source> <translation type="unfinished">Choose data directory on startup (default: 0)</translation> </message> @@ -1221,7 +1226,7 @@ Address: %4 <translation type="unfinished">Error: Specified data directory "%1" can not be created.</translation> </message> <message> - <location line="+19"/> + <location line="+24"/> <source>Error</source> <translation>Error</translation> </message> @@ -1277,7 +1282,7 @@ Address: %4 <translation>&Main</translation> </message> <message> - <location line="+122"/> + <location line="+116"/> <source>Optional transaction fee per kB that helps make sure your transactions are processed quickly. Most transactions are 1 kB.</source> <translation>Optional transaction fee per kB that helps make sure your transactions are processed quickly. Most transactions are 1 kB.</translation> </message> @@ -1287,7 +1292,7 @@ Address: %4 <translation>Pay transaction &fee</translation> </message> <message> - <location line="-131"/> + <location line="-125"/> <source>Automatically start Bitcoin after logging in to the system.</source> <translation>Automatically start Bitcoin after logging in to the system.</translation> </message> @@ -1312,12 +1317,7 @@ Address: %4 <translation type="unfinished"></translation> </message> <message> - <location line="+13"/> - <source>Set the number of script verification threads (up to 16, 0 = auto, <0 = leave that many cores free, default: 0)</source> - <translation type="unfinished">Set the number of script verification threads (up to 16, 0 = auto, <0 = leave that many cores free, default: 0)</translation> - </message> - <message> - <location line="+153"/> + <location line="+160"/> <source>Connect to the Bitcoin network through a SOCKS proxy.</source> <translation type="unfinished"></translation> </message> @@ -1352,7 +1352,12 @@ Address: %4 <translation>&Network</translation> </message> <message> - <location line="-95"/> + <location line="-131"/> + <source>(0 = auto, <0 = leave that many cores free)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+36"/> <source>W&allet</source> <translation type="unfinished"></translation> </message> @@ -1487,7 +1492,7 @@ Address: %4 <translation>&Cancel</translation> </message> <message> - <location filename="../optionsdialog.cpp" line="+70"/> + <location filename="../optionsdialog.cpp" line="+72"/> <source>default</source> <translation>default</translation> </message> @@ -1497,7 +1502,7 @@ Address: %4 <translation type="unfinished"></translation> </message> <message> - <location line="+78"/> + <location line="+80"/> <source>Confirm options reset</source> <translation>Confirm options reset</translation> </message> @@ -1690,23 +1695,34 @@ Address: %4 <context> <name>QObject</name> <message> - <location filename="../bitcoin.cpp" line="+63"/> - <location line="+14"/> + <location filename="../bitcoin.cpp" line="+71"/> + <location line="+7"/> + <location line="+13"/> <source>Bitcoin</source> <translation>Bitcoin</translation> </message> <message> - <location line="-13"/> + <location line="-19"/> <source>Error: Specified data directory "%1" does not exist.</source> <translation>Error: Specified data directory "%1" does not exist.</translation> </message> <message> - <location line="+13"/> + <location line="+7"/> + <source>Error: Cannot parse configuration file: %1. Only use key=value syntax.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+12"/> <source>Error: Invalid combination of -regtest and -testnet.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../guiutil.cpp" line="+82"/> + <location line="+60"/> + <source>Bitcoin Core did't yet exit safely...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../guiutil.cpp" line="+89"/> <source>Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source> <translation type="unfinished">Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation> </message> @@ -2491,7 +2507,7 @@ Address: %4 <context> <name>ShutdownWindow</name> <message> - <location filename="../utilitydialog.cpp" line="+48"/> + <location filename="../utilitydialog.cpp" line="+52"/> <source>Bitcoin Core is shutting down...</source> <translation type="unfinished"></translation> </message> @@ -2691,7 +2707,7 @@ Address: %4 <context> <name>SplashScreen</name> <message> - <location filename="../splashscreen.cpp" line="+28"/> + <location filename="../splashscreen.cpp" line="+32"/> <source>Bitcoin Core</source> <translation type="unfinished">Bitcoin Core</translation> </message> @@ -2717,7 +2733,7 @@ Address: %4 <context> <name>TransactionDesc</name> <message> - <location filename="../transactiondesc.cpp" line="+28"/> + <location filename="../transactiondesc.cpp" line="+29"/> <source>Open until %1</source> <translation>Open until %1</translation> </message> @@ -2742,7 +2758,7 @@ Address: %4 <translation>%1 confirmations</translation> </message> <message> - <location line="+18"/> + <location line="+17"/> <source>Status</source> <translation>Status</translation> </message> @@ -2875,7 +2891,7 @@ Address: %4 <translation>Inputs</translation> </message> <message> - <location line="+23"/> + <location line="+21"/> <source>Amount</source> <translation>Amount</translation> </message> @@ -2890,12 +2906,12 @@ Address: %4 <translation>false</translation> </message> <message> - <location line="-232"/> + <location line="-230"/> <source>, has not been successfully broadcast yet</source> <translation>, has not been successfully broadcast yet</translation> </message> <message numerus="yes"> - <location line="-37"/> + <location line="-36"/> <source>Open for %n more block(s)</source> <translation> <numerusform>Open for %n more block</numerusform> @@ -2903,7 +2919,7 @@ Address: %4 </translation> </message> <message> - <location line="+72"/> + <location line="+71"/> <source>unknown</source> <translation>unknown</translation> </message> @@ -2924,7 +2940,7 @@ Address: %4 <context> <name>TransactionTableModel</name> <message> - <location filename="../transactiontablemodel.cpp" line="+234"/> + <location filename="../transactiontablemodel.cpp" line="+238"/> <source>Date</source> <translation>Date</translation> </message> @@ -2944,7 +2960,7 @@ Address: %4 <translation>Amount</translation> </message> <message> - <location line="+78"/> + <location line="+70"/> <source>Immature (%1 confirmations, will be available after %2)</source> <translation type="unfinished"></translation> </message> @@ -3242,7 +3258,7 @@ Address: %4 <context> <name>WalletModel</name> <message> - <location filename="../walletmodel.cpp" line="+245"/> + <location filename="../walletmodel.cpp" line="+258"/> <source>Send Coins</source> <translation>Send Coins</translation> </message> @@ -3250,7 +3266,7 @@ Address: %4 <context> <name>WalletView</name> <message> - <location filename="../walletview.cpp" line="+43"/> + <location filename="../walletview.cpp" line="+44"/> <source>&Export</source> <translation>&Export</translation> </message> @@ -3260,7 +3276,7 @@ Address: %4 <translation>Export the data in the current tab to a file</translation> </message> <message> - <location line="+181"/> + <location line="+184"/> <source>Backup Wallet</source> <translation>Backup Wallet</translation> </message> @@ -3293,27 +3309,27 @@ Address: %4 <context> <name>bitcoin-core</name> <message> - <location filename="../bitcoinstrings.cpp" line="+226"/> + <location filename="../bitcoinstrings.cpp" line="+262"/> <source>Usage:</source> <translation>Usage:</translation> </message> <message> - <location line="-55"/> + <location line="-66"/> <source>List commands</source> <translation>List commands</translation> </message> <message> - <location line="-14"/> + <location line="-15"/> <source>Get help for a command</source> <translation>Get help for a command</translation> </message> <message> - <location line="+26"/> + <location line="+28"/> <source>Options:</source> <translation>Options:</translation> </message> <message> - <location line="+22"/> + <location line="+32"/> <source>Specify configuration file (default: bitcoin.conf)</source> <translation>Specify configuration file (default: bitcoin.conf)</translation> </message> @@ -3328,22 +3344,22 @@ Address: %4 <translation>Specify data directory</translation> </message> <message> - <location line="-35"/> + <location line="-46"/> <source>Listen for connections on <port> (default: 8333 or testnet: 18333)</source> <translation>Listen for connections on <port> (default: 8333 or testnet: 18333)</translation> </message> <message> - <location line="+5"/> + <location line="+6"/> <source>Maintain at most <n> connections to peers (default: 125)</source> <translation>Maintain at most <n> connections to peers (default: 125)</translation> </message> <message> - <location line="-51"/> + <location line="-58"/> <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="+84"/> + <location line="+101"/> <source>Specify your own public address</source> <translation>Specify your own public address</translation> </message> @@ -3353,42 +3369,47 @@ Address: %4 <translation>Threshold for disconnecting misbehaving peers (default: 100)</translation> </message> <message> - <location line="-151"/> + <location line="-173"/> <source>Number of seconds to keep misbehaving peers from reconnecting (default: 86400)</source> <translation>Number of seconds to keep misbehaving peers from reconnecting (default: 86400)</translation> </message> <message> - <location line="-38"/> + <location line="-52"/> <source>An error occurred while setting up the RPC port %u for listening on IPv4: %s</source> <translation>An error occurred while setting up the RPC port %u for listening on IPv4: %s</translation> </message> <message> - <location line="+36"/> + <location line="+50"/> <source>Listen for JSON-RPC connections on <port> (default: 8332 or testnet: 18332)</source> <translation>Listen for JSON-RPC connections on <port> (default: 8332 or testnet: 18332)</translation> </message> <message> - <location line="+46"/> + <location line="+51"/> <source>Accept command line and JSON-RPC commands</source> <translation>Accept command line and JSON-RPC commands</translation> </message> <message> - <location line="+81"/> + <location line="+7"/> + <source>Bitcoin Core RPC client version</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+88"/> <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="+40"/> + <location line="+43"/> <source>Use the test network</source> <translation>Use the test network</translation> </message> <message> - <location line="-120"/> + <location line="-137"/> <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="-98"/> + <location line="-117"/> <source>%s, you must set a rpcpassword in the configuration file: %s It is recommended you use the following random password: @@ -3429,6 +3450,11 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. </message> <message> <location line="+6"/> + <source>Continuously rate-limit free transactions to <n>*1000 bytes per minute (default:15)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+3"/> <source>Enter regression test mode, which uses a special chain in which blocks can be solved instantly. This is intended for regression testing tools and app development.</source> <translation>Enter regression test mode, which uses a special chain in which blocks can be solved instantly. This is intended for regression testing tools and app development.</translation> </message> @@ -3458,7 +3484,37 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Execute command when a wallet transaction changes (%s in cmd is replaced by TxID)</translation> </message> <message> - <location line="+18"/> + <location line="+6"/> + <source>Fees smaller than this are considered zero fee (for transaction creation) (default:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+3"/> + <source>Flush database activity from memory pool to disk log every <n> megabytes (default: 100)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+3"/> + <source>How thorough the block verification of -checkblocks is (0-4, default: 3)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+2"/> + <source>In this mode -genproclimit controls how many blocks are generated immediately.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+12"/> + <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="+3"/> + <source>Set the processor limit for when generation is on (-1 = unlimited, default: -1)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+3"/> <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> @@ -3504,6 +3560,16 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. </message> <message> <location line="+9"/> + <source>(default: 1)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+1"/> + <source>(default: wallet.dat)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+1"/> <source><category> can be:</source> <translation type="unfinished"></translation> </message> @@ -3518,12 +3584,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"></translation> </message> <message> - <location line="+1"/> - <source>Bitcoin RPC client version</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+1"/> + <location line="+2"/> <source>Block creation options:</source> <translation>Block creation options:</translation> </message> @@ -3549,11 +3610,26 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. </message> <message> <location line="+2"/> + <source>Connection options:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+1"/> <source>Corrupted block database detected</source> <translation>Corrupted block database detected</translation> </message> <message> <location line="+1"/> + <source>Debugging/Testing options:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+1"/> + <source>Disable safemode, override a real safe mode event (default: 0)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+1"/> <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> @@ -3664,11 +3740,21 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. </message> <message> <location line="+1"/> + <source>Fees smaller than this are considered zero fee (for relaying) (default:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+1"/> <source>Find peers using DNS lookup (default: 1 unless -connect)</source> <translation>Find peers using DNS lookup (default: 1 unless -connect)</translation> </message> <message> <location line="+1"/> + <source>Force safe mode (default: 0)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+1"/> <source>Generate coins (default: 0)</source> <translation>Generate coins (default: 0)</translation> </message> @@ -3679,12 +3765,12 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. </message> <message> <location line="+1"/> - <source>How thorough the block verification is (0-4, default: 3)</source> - <translation>How thorough the block verification is (0-4, default: 3)</translation> + <source>If <category> is not supplied, output all debugging information.</source> + <translation type="unfinished"></translation> </message> <message> <location line="+1"/> - <source>If <category> is not supplied, output all debugging information.</source> + <source>Importing...</source> <translation type="unfinished"></translation> </message> <message> @@ -3698,7 +3784,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"></translation> </message> <message> - <location line="+15"/> + <location line="+17"/> <source>Not enough file descriptors available.</source> <translation>Not enough file descriptors available.</translation> </message> @@ -3708,27 +3794,22 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"></translation> </message> <message> - <location line="+1"/> + <location line="+4"/> <source>RPC client options:</source> <translation type="unfinished"></translation> </message> <message> - <location line="+1"/> + <location line="+4"/> <source>Rebuild block chain index from current blk000??.dat files</source> <translation>Rebuild block chain index from current blk000??.dat files</translation> </message> <message> - <location line="+5"/> + <location line="+6"/> <source>Select SOCKS version for -proxy (4 or 5, default: 5)</source> <translation type="unfinished"></translation> </message> <message> - <location line="+1"/> - <source>Send command to Bitcoin server</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+5"/> + <location line="+6"/> <source>Set database cache size in megabytes (%d to %d, default: %d)</source> <translation type="unfinished"></translation> </message> @@ -3743,7 +3824,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Set the number of threads to service RPC calls (default: 4)</translation> </message> <message> - <location line="+7"/> + <location line="+10"/> <source>Specify wallet file (within data directory)</source> <translation>Specify wallet file (within data directory)</translation> </message> @@ -3753,12 +3834,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"></translation> </message> <message> - <location line="+1"/> - <source>Start Bitcoin server</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+3"/> + <location line="+4"/> <source>This is intended for regression testing tools and app development.</source> <translation type="unfinished"></translation> </message> @@ -3803,22 +3879,22 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>You need to rebuild the database using -reindex to change -txindex</translation> </message> <message> - <location line="-80"/> + <location line="-92"/> <source>Imports blocks from external blk000??.dat file</source> <translation>Imports blocks from external blk000??.dat file</translation> </message> <message> - <location line="-126"/> + <location line="-150"/> <source>Cannot obtain a lock on data directory %s. Bitcoin Core is probably already running.</source> <translation type="unfinished"></translation> </message> <message> - <location line="+19"/> + <location line="+22"/> <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>Execute command when a relevant alert is received or we see a really long fork (%s in cmd is replaced by message)</translation> </message> <message> - <location line="+14"/> + <location line="+25"/> <source>Output debugging information (default: 0, supplying <category> is optional)</source> <translation type="unfinished"></translation> </message> @@ -3828,12 +3904,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"></translation> </message> <message> - <location line="+2"/> - <source>Set the number of script verification threads (up to 16, 0 = auto, <0 = leave that many cores free, default: 0)</source> - <translation>Set the number of script verification threads (up to 16, 0 = auto, <0 = leave that many cores free, default: 0)</translation> - </message> - <message> - <location line="+91"/> + <location line="+103"/> <source>Information</source> <translation>Information</translation> </message> @@ -3848,7 +3919,17 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Invalid amount for -mintxfee=<amount>: '%s'</translation> </message> <message> - <location line="+8"/> + <location line="+3"/> + <source>Limit size of signature cache to <n> entries (default: 50000)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+6"/> + <source>Log transaction priority and fee per kB when mining blocks (default: 0)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+1"/> <source>Maintain a full transaction index (default: 0)</source> <translation>Maintain a full transaction index (default: 0)</translation> </message> @@ -3873,12 +3954,52 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Only connect to nodes in network <net> (IPv4, IPv6 or Tor)</translation> </message> <message> - <location line="+9"/> + <location line="+4"/> + <source>Print block on startup, if found in block index</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+1"/> + <source>Print block tree on startup (default: 0)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+1"/> + <source>RPC SSL options: (see the Bitcoin Wiki for SSL setup instructions)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+2"/> + <source>RPC server options:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+1"/> + <source>Randomly drop 1 of every <n> network messages</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+1"/> + <source>Randomly fuzz 1 of every <n> network messages</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+4"/> + <source>Run a thread to flush wallet periodically (default: 1)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+2"/> <source>SSL options: (see the Bitcoin Wiki for SSL setup instructions)</source> <translation>SSL options: (see the Bitcoin Wiki for SSL setup instructions)</translation> </message> <message> - <location line="+4"/> + <location line="+2"/> + <source>Send command to Bitcoin Core</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+2"/> <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> @@ -3889,6 +4010,21 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. </message> <message> <location line="+2"/> + <source>Sets the DB_PRIVATE flag in the wallet db environment (default: 1)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+1"/> + <source>Show all debugging options (usage: --help -help-debug)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+1"/> + <source>Show benchmark information (default: 0)</source> + <translation type="unfinished"></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> @@ -3903,7 +4039,12 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Specify connection timeout in milliseconds (default: 5000)</translation> </message> <message> - <location line="+7"/> + <location line="+6"/> + <source>Start Bitcoin Core Daemon</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+1"/> <source>System error: </source> <translation>System error: </translation> </message> @@ -3954,6 +4095,11 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. </message> <message> <location line="+1"/> + <source>on startup</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+1"/> <source>version</source> <translation type="unfinished">version</translation> </message> @@ -3963,47 +4109,47 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>wallet.dat corrupt, salvage failed</translation> </message> <message> - <location line="-60"/> + <location line="-71"/> <source>Password for JSON-RPC connections</source> <translation>Password for JSON-RPC connections</translation> </message> <message> - <location line="-71"/> + <location line="-78"/> <source>Allow JSON-RPC connections from specified IP address</source> <translation>Allow JSON-RPC connections from specified IP address</translation> </message> <message> - <location line="+81"/> + <location line="+95"/> <source>Send commands to node running on <ip> (default: 127.0.0.1)</source> <translation>Send commands to node running on <ip> (default: 127.0.0.1)</translation> </message> <message> - <location line="-134"/> + <location line="-164"/> <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="+164"/> + <location line="+197"/> <source>Upgrade wallet to latest format</source> <translation>Upgrade wallet to latest format</translation> </message> <message> - <location line="-25"/> + <location line="-28"/> <source>Set key pool size to <n> (default: 100)</source> <translation>Set key pool size to <n> (default: 100)</translation> </message> <message> - <location line="-11"/> + <location line="-12"/> <source>Rescan the block chain for missing wallet transactions</source> <translation>Rescan the block chain for missing wallet transactions</translation> </message> <message> - <location line="+39"/> + <location line="+43"/> <source>Use OpenSSL (https) for JSON-RPC connections</source> <translation>Use OpenSSL (https) for JSON-RPC connections</translation> </message> <message> - <location line="-31"/> + <location line="-34"/> <source>Server certificate file (default: server.cert)</source> <translation>Server certificate file (default: server.cert)</translation> </message> @@ -4013,7 +4159,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Server private key (default: server.pem)</translation> </message> <message> - <location line="+17"/> + <location line="+20"/> <source>This help message</source> <translation>This help message</translation> </message> @@ -4023,17 +4169,17 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Unable to bind to %s on this computer (bind returned error %d, %s)</translation> </message> <message> - <location line="-109"/> + <location line="-126"/> <source>Allow DNS lookups for -addnode, -seednode and -connect</source> <translation>Allow DNS lookups for -addnode, -seednode and -connect</translation> </message> <message> - <location line="+61"/> + <location line="+67"/> <source>Loading addresses...</source> <translation>Loading addresses...</translation> </message> <message> - <location line="-37"/> + <location line="-40"/> <source>Error loading wallet.dat: Wallet corrupted</source> <translation>Error loading wallet.dat: Wallet corrupted</translation> </message> @@ -4043,22 +4189,22 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Error loading wallet.dat: Wallet requires newer version of Bitcoin</translation> </message> <message> - <location line="+99"/> + <location line="+113"/> <source>Wallet needed to be rewritten: restart Bitcoin to complete</source> <translation>Wallet needed to be rewritten: restart Bitcoin to complete</translation> </message> <message> - <location line="-101"/> + <location line="-115"/> <source>Error loading wallet.dat</source> <translation>Error loading wallet.dat</translation> </message> <message> - <location line="+31"/> + <location line="+33"/> <source>Invalid -proxy address: '%s'</source> <translation>Invalid -proxy address: '%s'</translation> </message> <message> - <location line="+57"/> + <location line="+69"/> <source>Unknown network specified in -onlynet: '%s'</source> <translation>Unknown network specified in -onlynet: '%s'</translation> </message> @@ -4068,7 +4214,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Unknown -socks proxy version requested: %i</translation> </message> <message> - <location line="-103"/> + <location line="-120"/> <source>Cannot resolve -bind address: '%s'</source> <translation>Cannot resolve -bind address: '%s'</translation> </message> @@ -4078,7 +4224,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Cannot resolve -externalip address: '%s'</translation> </message> <message> - <location line="+49"/> + <location line="+54"/> <source>Invalid amount for -paytxfee=<amount>: '%s'</source> <translation>Invalid amount for -paytxfee=<amount>: '%s'</translation> </message> @@ -4093,22 +4239,22 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Insufficient funds</translation> </message> <message> - <location line="+10"/> + <location line="+11"/> <source>Loading block index...</source> <translation>Loading block index...</translation> </message> <message> - <location line="-63"/> + <location line="-69"/> <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="+64"/> + <location line="+70"/> <source>Loading wallet...</source> <translation>Loading wallet...</translation> </message> <message> - <location line="-57"/> + <location line="-63"/> <source>Cannot downgrade wallet</source> <translation>Cannot downgrade wallet</translation> </message> @@ -4118,27 +4264,27 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Cannot write default address</translation> </message> <message> - <location line="+68"/> + <location line="+81"/> <source>Rescanning...</source> <translation>Rescanning...</translation> </message> <message> - <location line="-58"/> + <location line="-68"/> <source>Done loading</source> <translation>Done loading</translation> </message> <message> - <location line="+86"/> + <location line="+100"/> <source>To use the %s option</source> <translation>To use the %s option</translation> </message> <message> - <location line="-78"/> + <location line="-92"/> <source>Error</source> <translation>Error</translation> </message> <message> - <location line="-36"/> + <location line="-41"/> <source>You must set rpcpassword=<password> in the configuration file: %s If the file does not exist, create it with owner-readable-only file permissions.</source> diff --git a/src/qt/locale/bitcoin_es.ts b/src/qt/locale/bitcoin_es.ts index df88d59f90..7dcc98797a 100644 --- a/src/qt/locale/bitcoin_es.ts +++ b/src/qt/locale/bitcoin_es.ts @@ -42,8 +42,8 @@ Eric Young (eay@cryptsoft.com) y el software UPnP escrito por Thomas Bernard.</t <message> <location line="+12"/> <location line="+2"/> - <source> (%1-bit)</source> - <translation> (%1-bit)</translation> + <source>(%1-bit)</source> + <translation>(%1-bit)</translation> </message> </context> <context> @@ -51,7 +51,7 @@ Eric Young (eay@cryptsoft.com) y el software UPnP escrito por Thomas Bernard.</t <message> <location filename="../forms/addressbookpage.ui" line="+30"/> <source>Double-click to edit address or label</source> - <translation>Haga doble clic para editar una etiqueta o dirección </translation> + <translation>Haga doble clic para editar la etiqueta o dirección </translation> </message> <message> <location line="+27"/> @@ -74,7 +74,7 @@ Eric Young (eay@cryptsoft.com) y el software UPnP escrito por Thomas Bernard.</t <translation>&Copiar</translation> </message> <message> - <location line="+52"/> + <location line="+58"/> <source>C&lose</source> <translation>&Cerrar</translation> </message> @@ -84,7 +84,7 @@ Eric Young (eay@cryptsoft.com) y el software UPnP escrito por Thomas Bernard.</t <translation>&Copiar dirección</translation> </message> <message> - <location filename="../forms/addressbookpage.ui" line="-41"/> + <location filename="../forms/addressbookpage.ui" line="-47"/> <source>Delete the currently selected address from the list</source> <translation>Borrar de la lista la dirección seleccionada</translation> </message> @@ -331,7 +331,7 @@ Eric Young (eay@cryptsoft.com) y el software UPnP escrito por Thomas Bernard.</t <context> <name>BitcoinGUI</name> <message> - <location filename="../bitcoingui.cpp" line="+295"/> + <location filename="../bitcoingui.cpp" line="+294"/> <source>Sign &message...</source> <translation>Firmar &mensaje...</translation> </message> @@ -346,12 +346,12 @@ Eric Young (eay@cryptsoft.com) y el software UPnP escrito por Thomas Bernard.</t <translation>&Vista general</translation> </message> <message> - <location line="-137"/> + <location line="-136"/> <source>Node</source> <translation>Nodo</translation> </message> <message> - <location line="+138"/> + <location line="+137"/> <source>Show general overview of wallet</source> <translation>Mostrar vista general del monedero</translation> </message> @@ -472,17 +472,17 @@ Eric Young (eay@cryptsoft.com) y el software UPnP escrito por Thomas Bernard.</t <translation>&Verificar mensaje...</translation> </message> <message> - <location line="+430"/> + <location line="+440"/> <source>Bitcoin</source> <translation>Bitcoin</translation> </message> <message> - <location line="-643"/> + <location line="-652"/> <source>Wallet</source> <translation>Monedero</translation> </message> <message> - <location line="+146"/> + <location line="+145"/> <source>&Send</source> <translation>&Enviar</translation> </message> @@ -538,18 +538,18 @@ Eric Young (eay@cryptsoft.com) y el software UPnP escrito por Thomas Bernard.</t <translation>Barra de pestañas</translation> </message> <message> - <location line="-284"/> - <location line="+376"/> + <location line="-283"/> + <location line="+375"/> <source>[testnet]</source> <translation>[testnet]</translation> </message> <message> - <location line="-401"/> + <location line="-400"/> <source>Bitcoin Core</source> <translation>Bitcoin Core</translation> </message> <message> - <location line="+163"/> + <location line="+162"/> <source>Request payments (generates QR codes and bitcoin: URIs)</source> <translation>Solicitar pagos (genera codigo QR y URL's de Bitcoin)</translation> </message> @@ -611,7 +611,7 @@ Eric Young (eay@cryptsoft.com) y el software UPnP escrito por Thomas Bernard.</t <translation>Procesados %1 bloques del historial de transacciones.</translation> </message> <message numerus="yes"> - <location line="+23"/> + <location line="+27"/> <source>%n hour(s)</source> <translation><numerusform>%n hora</numerusform><numerusform>%n horas</numerusform></translation> </message> @@ -622,6 +622,7 @@ Eric Young (eay@cryptsoft.com) y el software UPnP escrito por Thomas Bernard.</t </message> <message numerus="yes"> <location line="+4"/> + <location line="+6"/> <source>%n week(s)</source> <translation><numerusform>%n semana</numerusform><numerusform>%n semanas</numerusform></translation> </message> @@ -666,12 +667,12 @@ Eric Young (eay@cryptsoft.com) y el software UPnP escrito por Thomas Bernard.</t <translation>Información</translation> </message> <message> - <location line="-85"/> + <location line="-95"/> <source>Up to date</source> <translation>Actualizado</translation> </message> <message> - <location line="+34"/> + <location line="+44"/> <source>Catching up...</source> <translation>Actualizando...</translation> </message> @@ -709,7 +710,7 @@ Dirección: %4 <translation>El monedero está <b>cifrado</b> y actualmente <b>bloqueado</b></translation> </message> <message> - <location filename="../bitcoin.cpp" line="+435"/> + <location filename="../bitcoin.cpp" line="+443"/> <source>A fatal error occurred. Bitcoin can no longer continue safely and will quit.</source> <translation>Ha ocurrido un error crÃtico. Bitcoin ya no puede continuar con seguridad y se cerrará.</translation> </message> @@ -717,7 +718,7 @@ Dirección: %4 <context> <name>ClientModel</name> <message> - <location filename="../clientmodel.cpp" line="+119"/> + <location filename="../clientmodel.cpp" line="+128"/> <source>Network Alert</source> <translation>Alerta de red</translation> </message> @@ -815,7 +816,7 @@ Dirección: %4 <translation>Prioridad</translation> </message> <message> - <location filename="../coincontroldialog.cpp" line="+42"/> + <location filename="../coincontroldialog.cpp" line="+41"/> <source>Copy address</source> <translation>Copiar dirección</translation> </message> @@ -881,7 +882,7 @@ Dirección: %4 <translation>Copiar cambio</translation> </message> <message> - <location line="+323"/> + <location line="+332"/> <source>highest</source> <translation>lo más alto</translation> </message> @@ -931,7 +932,7 @@ Dirección: %4 <translation>(%1 bloqueado)</translation> </message> <message> - <location line="+31"/> + <location line="+32"/> <source>none</source> <translation>ninguna</translation> </message> @@ -999,12 +1000,12 @@ Dirección: %4 </message> <message> <location line="+43"/> - <location line="+66"/> + <location line="+61"/> <source>(no label)</source> <translation>(sin etiqueta)</translation> </message> <message> - <location line="-9"/> + <location line="-7"/> <source>change from %1 (%2)</source> <translation>Enviar desde %1 (%2)</translation> </message> @@ -1085,7 +1086,7 @@ Dirección: %4 <context> <name>FreespaceChecker</name> <message> - <location filename="../intro.cpp" line="+65"/> + <location filename="../intro.cpp" line="+68"/> <source>A new data directory will be created.</source> <translation>Se creará un nuevo directorio de datos.</translation> </message> @@ -1143,7 +1144,7 @@ Dirección: %4 <translation>Opciones GUI</translation> </message> <message> - <location line="+1"/> + <location line="+2"/> <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> @@ -1154,11 +1155,16 @@ Dirección: %4 </message> <message> <location line="+1"/> + <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> + <location line="+1"/> <source>Show splash screen on startup (default: 1)</source> <translation>Mostrar pantalla de bienvenida en el inicio (predeterminado: 1)</translation> </message> <message> - <location line="+1"/> + <location line="-4"/> <source>Choose data directory on startup (default: 0)</source> <translation>Elegir directorio de datos al iniciar (predeterminado: 0)</translation> </message> @@ -1178,12 +1184,12 @@ Dirección: %4 <message> <location line="+26"/> <source>As this is the first time the program is launched, you can choose where Bitcoin Core will store its data.</source> - <translation>Al ser la primera vez que se ejecuta el programa, puede elegir dónde almacenará sus datos Bitcoin-Qt.</translation> + <translation>Al ser la primera vez que se ejecuta el programa, puede elegir dónde almacenará sus datos Bitcoin Core.</translation> </message> <message> <location line="+10"/> <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-Qt va a descargar y guardar una copia de la cadena de bloques de Bitcoin. Se almacenará al menos %1GB de datos en este directorio, que irá creciendo con el tiempo. El monedero se guardará también en este directorio.</translation> + <translation>Bitcoin Core va a descargar y guardar una copia de la cadena de bloques de Bitcoin. Se almacenará al menos %1GB de datos en este directorio, que irá creciendo con el tiempo. El monedero se guardará también en este directorio.</translation> </message> <message> <location line="+10"/> @@ -1196,7 +1202,7 @@ Dirección: %4 <translation>Utilice un directorio de datos personalizado:</translation> </message> <message> - <location filename="../intro.cpp" line="+85"/> + <location filename="../intro.cpp" line="+82"/> <source>Bitcoin</source> <translation>Bitcoin</translation> </message> @@ -1206,7 +1212,7 @@ Dirección: %4 <translation>Error: No puede crearse el directorio de datos especificado "%1".</translation> </message> <message> - <location line="+19"/> + <location line="+24"/> <source>Error</source> <translation>Error</translation> </message> @@ -1262,7 +1268,7 @@ Dirección: %4 <translation>&Principal</translation> </message> <message> - <location line="+122"/> + <location line="+116"/> <source>Optional transaction fee per kB that helps make sure your transactions are processed quickly. Most transactions are 1 kB.</source> <translation>Tarifa de transacción opcional por kB que ayuda a asegurar que sus transacciones sean procesadas rápidamente. La mayorÃa de transacciones son de 1kB.</translation> </message> @@ -1272,7 +1278,7 @@ Dirección: %4 <translation>Comisión de &transacciones</translation> </message> <message> - <location line="-131"/> + <location line="-125"/> <source>Automatically start Bitcoin after logging in to the system.</source> <translation>Iniciar Bitcoin automáticamente al encender el sistema.</translation> </message> @@ -1297,17 +1303,7 @@ Dirección: %4 <translation>Número de procesos de &verificación de scripts</translation> </message> <message> - <location line="+13"/> - <source>Set the number of script verification threads (up to 16, 0 = auto, <0 = leave that many cores free, default: 0)</source> - <translation>Configura el número de hilos para el script de verificación (hasta 16, 0 = auto, <0 = leave that many cores free, por fecto: 0)</translation> - </message> - <message> - <location line="+107"/> - <source>&Spend unconfirmed change (experts only)</source> - <translation>&Gastar cambio no confirmado (solo expertos)</translation> - </message> - <message> - <location line="+37"/> + <location line="+160"/> <source>Connect to the Bitcoin network through a SOCKS proxy.</source> <translation>Conectarse a la red Bitcoin a través de un proxy SOCKS.</translation> </message> @@ -1322,7 +1318,7 @@ Dirección: %4 <translation>Dirección IP del proxy (p. ej. IPv4: 127.0.0.1 / IPv6: ::1)</translation> </message> <message> - <location line="+224"/> + <location line="+214"/> <source>Active command-line options that override above options:</source> <translation>Opciones activas de consola de comandos que tienen preferencia sobre las opciones antes mencionadas:</translation> </message> @@ -1337,22 +1333,42 @@ Dirección: %4 <translation>&Restablecer opciones</translation> </message> <message> - <location line="-323"/> + <location line="-313"/> <source>&Network</source> <translation>&Red</translation> </message> <message> - <location line="-86"/> + <location line="-131"/> + <source>(0 = auto, <0 = leave that many cores free)</source> + <translation>(0 = automático, <0 = dejar libres ese número de núcleos)</translation> + </message> + <message> + <location line="+36"/> <source>W&allet</source> <translation>&Monedero</translation> </message> <message> - <location line="+52"/> + <location line="+65"/> + <source>Expert</source> + <translation>Experto</translation> + </message> + <message> + <location line="+9"/> + <source>Enable coin &control features</source> + <translation>Habilitar funcionalidad de &coin control</translation> + </message> + <message> + <location line="+7"/> <source>If you disable the spending of unconfirmed change, the change from a transaction cannot be used until that transaction has at least one confirmation. This also affects how your balance is computed.</source> <translation>Si desactiva el gasto del cambio no confirmado, no se podrá usar el cambio de una transacción hasta que se alcance al menos una confirmación. Esto afecta también a cómo se calcula su saldo.</translation> </message> <message> - <location line="+40"/> + <location line="+3"/> + <source>&Spend unconfirmed change</source> + <translation>&Gastar cambio no confirmado</translation> + </message> + <message> + <location line="+17"/> <source>Automatically open the Bitcoin client port on the router. This only works when your router supports UPnP and it is enabled.</source> <translation>Abrir automáticamente el puerto del cliente Bitcoin en el router. Esta opción solo funciona si el router admite UPnP y está activado.</translation> </message> @@ -1447,17 +1463,12 @@ Dirección: %4 <translation>&Mostrar las direcciones en la lista de transacciones</translation> </message> <message> - <location line="+7"/> + <location line="-262"/> <source>Whether to show coin control features or not.</source> <translation>Mostrar o no funcionalidad de Coin Control</translation> </message> <message> - <location line="+3"/> - <source>Display coin &control features (experts only)</source> - <translation>Mostrar funcionalidad de Coin Control (solo expertos)</translation> - </message> - <message> - <location line="+136"/> + <location line="+398"/> <source>&OK</source> <translation>&Aceptar</translation> </message> @@ -1467,7 +1478,7 @@ Dirección: %4 <translation>&Cancelar</translation> </message> <message> - <location filename="../optionsdialog.cpp" line="+70"/> + <location filename="../optionsdialog.cpp" line="+72"/> <source>default</source> <translation>predeterminado</translation> </message> @@ -1477,7 +1488,7 @@ Dirección: %4 <translation>ninguna</translation> </message> <message> - <location line="+78"/> + <location line="+80"/> <source>Confirm options reset</source> <translation>Confirme el restablecimiento de las opciones</translation> </message> @@ -1670,23 +1681,29 @@ Dirección: %4 <context> <name>QObject</name> <message> - <location filename="../bitcoin.cpp" line="+71"/> - <location line="+11"/> + <location filename="../bitcoin.cpp" line="+63"/> + <location line="+7"/> + <location line="+13"/> <source>Bitcoin</source> <translation>Bitcoin</translation> </message> <message> - <location line="+1"/> + <location line="-19"/> <source>Error: Specified data directory "%1" does not exist.</source> <translation>Error: El directorio de datos especificado "%1" no existe.</translation> </message> <message> - <location line="-12"/> + <location line="+7"/> + <source>Error: Cannot parse configuration file: %1. Only use key=value syntax.</source> + <translation>Error: No se ha podido leer el archivo de configuración: %1. Debe utilizarse solamente la sintaxis clave=valor.</translation> + </message> + <message> + <location line="+12"/> <source>Error: Invalid combination of -regtest and -testnet.</source> <translation>Error: Combinación no válida de -regtest y -testnet.</translation> </message> <message> - <location filename="../guiutil.cpp" line="+82"/> + <location filename="../guiutil.cpp" line="+89"/> <source>Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source> <translation>Introduzca una dirección Bitcoin (ej. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation> </message> @@ -1732,7 +1749,7 @@ Dirección: %4 <location line="+36"/> <location line="+23"/> <location line="+23"/> - <location filename="../rpcconsole.cpp" line="+359"/> + <location filename="../rpcconsole.cpp" line="+373"/> <source>N/A</source> <translation>N/D</translation> </message> @@ -1828,11 +1845,13 @@ Dirección: %4 </message> <message> <location line="+64"/> + <location filename="../rpcconsole.cpp" line="-10"/> <source>In:</source> <translation>Entrante:</translation> </message> <message> <location line="+80"/> + <location filename="../rpcconsole.cpp" line="+1"/> <source>Out:</source> <translation>Saliente:</translation> </message> @@ -1857,7 +1876,7 @@ Dirección: %4 <translation>Borrar consola</translation> </message> <message> - <location filename="../rpcconsole.cpp" line="-30"/> + <location filename="../rpcconsole.cpp" line="-35"/> <source>Welcome to the Bitcoin RPC console.</source> <translation>Bienvenido a la consola RPC de Bitcoin</translation> </message> @@ -1872,7 +1891,7 @@ Dirección: %4 <translation>Escriba <b>help</b> para ver un resumen de los comandos disponibles.</translation> </message> <message> - <location line="+122"/> + <location line="+136"/> <source>%1 B</source> <translation>%1 B</translation> </message> @@ -1988,7 +2007,7 @@ Dirección: %4 <translation>Mostrar</translation> </message> <message> - <location line="+11"/> + <location line="+14"/> <source>Remove the selected entries from the list</source> <translation>Borrar de la lista las direcciónes actualmente seleccionadas</translation> </message> @@ -1998,7 +2017,7 @@ Dirección: %4 <translation>Eliminar</translation> </message> <message> - <location filename="../receivecoinsdialog.cpp" line="+38"/> + <location filename="../receivecoinsdialog.cpp" line="+39"/> <source>Copy label</source> <translation>Copiar etiqueta</translation> </message> @@ -2219,12 +2238,12 @@ Dirección: %4 <translation>Vaciar &todo</translation> </message> <message> - <location line="+52"/> + <location line="+58"/> <source>Balance:</source> <translation>Saldo:</translation> </message> <message> - <location line="-78"/> + <location line="-84"/> <source>Confirm the send action</source> <translation>Confirmar el envÃo</translation> </message> @@ -2469,7 +2488,7 @@ Dirección: %4 <context> <name>ShutdownWindow</name> <message> - <location filename="../utilitydialog.cpp" line="+48"/> + <location filename="../utilitydialog.cpp" line="+52"/> <source>Bitcoin Core is shutting down...</source> <translation>Bitcoin Core se está cerrando... </translation> @@ -2670,7 +2689,7 @@ Dirección: %4 <context> <name>SplashScreen</name> <message> - <location filename="../splashscreen.cpp" line="+28"/> + <location filename="../splashscreen.cpp" line="+32"/> <source>Bitcoin Core</source> <translation>Bitcoin Core</translation> </message> @@ -3123,7 +3142,7 @@ Dirección: %4 <translation>Mostrar detalles de la transacción</translation> </message> <message> - <location line="+142"/> + <location line="+140"/> <source>Export Transaction History</source> <translation>Exportar historial de transacciones</translation> </message> @@ -3217,7 +3236,7 @@ Dirección: %4 <context> <name>WalletView</name> <message> - <location filename="../walletview.cpp" line="+43"/> + <location filename="../walletview.cpp" line="+44"/> <source>&Export</source> <translation>&Exportar</translation> </message> @@ -3227,7 +3246,7 @@ Dirección: %4 <translation>Exportar a un archivo los datos de esta pestaña</translation> </message> <message> - <location line="+181"/> + <location line="+184"/> <source>Backup Wallet</source> <translation>Copia de seguridad del monedero</translation> </message> @@ -3260,12 +3279,12 @@ Dirección: %4 <context> <name>bitcoin-core</name> <message> - <location filename="../bitcoinstrings.cpp" line="+223"/> + <location filename="../bitcoinstrings.cpp" line="+261"/> <source>Usage:</source> <translation>Uso:</translation> </message> <message> - <location line="-55"/> + <location line="-66"/> <source>List commands</source> <translation>Muestra comandos </translation> @@ -3277,13 +3296,13 @@ Dirección: %4 </translation> </message> <message> - <location line="+26"/> + <location line="+27"/> <source>Options:</source> <translation>Opciones: </translation> </message> <message> - <location line="+22"/> + <location line="+32"/> <source>Specify configuration file (default: bitcoin.conf)</source> <translation>Especificar archivo de configuración (predeterminado: bitcoin.conf) </translation> @@ -3300,27 +3319,22 @@ Dirección: %4 <translation>Especificar directorio para los datos</translation> </message> <message> - <location line="-9"/> - <source>Set database cache size in megabytes (default: 25)</source> - <translation>Establecer el tamaño de caché de la base de datos en megabytes (predeterminado: 25)</translation> - </message> - <message> - <location line="-26"/> + <location line="-46"/> <source>Listen for connections on <port> (default: 8333 or testnet: 18333)</source> <translation>Escuchar conexiones en <puerto> (predeterminado: 8333 o testnet: 18333)</translation> </message> <message> - <location line="+5"/> + <location line="+6"/> <source>Maintain at most <n> connections to peers (default: 125)</source> <translation>Mantener como máximo <n> conexiones a pares (predeterminado: 125)</translation> </message> <message> - <location line="-51"/> + <location line="-57"/> <source>Connect to a node to retrieve peer addresses, and disconnect</source> <translation>Conectar a un nodo para obtener direcciones de pares y desconectar</translation> </message> <message> - <location line="+84"/> + <location line="+100"/> <source>Specify your own public address</source> <translation>Especifique su propia dirección pública</translation> </message> @@ -3330,45 +3344,50 @@ Dirección: %4 <translation>Umbral para la desconexión de pares con mal comportamiento (predeterminado: 100)</translation> </message> <message> - <location line="-150"/> + <location line="-172"/> <source>Number of seconds to keep misbehaving peers from reconnecting (default: 86400)</source> <translation>Número de segundos en que se evita la reconexión de pares con mal comportamiento (predeterminado: 86400)</translation> </message> <message> - <location line="-36"/> + <location line="-52"/> <source>An error occurred while setting up the RPC port %u for listening on IPv4: %s</source> <translation>Ha ocurrido un error al configurar el puerto RPC %u para escucha en IPv4: %s</translation> </message> <message> - <location line="+34"/> + <location line="+50"/> <source>Listen for JSON-RPC connections on <port> (default: 8332 or testnet: 18332)</source> <translation>Escuchar conexiones JSON-RPC en <puerto> (predeterminado: 8332 o testnet:18332)</translation> </message> <message> - <location line="+45"/> + <location line="+51"/> <source>Accept command line and JSON-RPC commands</source> <translation>Aceptar comandos consola y JSON-RPC </translation> </message> <message> - <location line="+81"/> + <location line="+7"/> + <source>Bitcoin Core RPC client version</source> + <translation>Versión del cliente RPC de Bitcoin Core RPC</translation> + </message> + <message> + <location line="+87"/> <source>Run in the background as a daemon and accept commands</source> <translation>Ejecutar en segundo plano como daemon y aceptar comandos </translation> </message> <message> - <location line="+40"/> + <location line="+43"/> <source>Use the test network</source> <translation>Usar la red de pruebas </translation> </message> <message> - <location line="-120"/> + <location line="-136"/> <source>Accept connections from outside (default: 1 if no -proxy or -connect)</source> <translation>Aceptar conexiones desde el exterior (predeterminado: 1 si no -proxy o -connect)</translation> </message> <message> - <location line="-95"/> + <location line="-117"/> <source>%s, you must set a rpcpassword in the configuration file: %s It is recommended you use the following random password: @@ -3408,9 +3427,9 @@ Por ejemplo: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Vincular a la dirección dada y escuchar siempre en ella. Utilice la notación [host]:port para IPv6</translation> </message> <message> - <location line="+3"/> - <source>Cannot obtain a lock on data directory %s. Bitcoin is probably already running.</source> - <translation>No se puede bloquear el directorio de datos %s. Probablemente Bitcoin ya se está ejecutando.</translation> + <location line="+6"/> + <source>Continuously rate-limit free transactions to <n>*1000 bytes per minute (default:15)</source> + <translation>Limitar continuamente las transacciones gratuitas a <n>*1000 bytes por minuto (predeterminado:15)</translation> </message> <message> <location line="+3"/> @@ -3424,6 +3443,11 @@ Por ejemplo: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. </message> <message> <location line="+3"/> + <source>Error: Listening for incoming connections failed (listen returned error %d)</source> + <translation>Error: Ha fallado la escucha de conexiones entrantes (listen ha devuelto el error %d)</translation> + </message> + <message> + <location line="+2"/> <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> @@ -3438,12 +3462,47 @@ Por ejemplo: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Ejecutar comando cuando una transacción del monedero cambia (%s en cmd se remplazará por TxID)</translation> </message> <message> - <location line="+18"/> + <location line="+6"/> + <source>Fees smaller than this are considered zero fee (for transaction creation) (default:</source> + <translation>Las comisiones inferiores se consideran comisión cero (a efectos de creación de transacciones) (predeterminado:</translation> + </message> + <message> + <location line="+3"/> + <source>Flush database activity from memory pool to disk log every <n> megabytes (default: 100)</source> + <translation>Volcar la actividad de la base de datos de memoria al registro en disco cada <n> megabytes (predeterminado: 100)</translation> + </message> + <message> + <location line="+3"/> + <source>How thorough the block verification of -checkblocks is (0-4, default: 3)</source> + <translation>Nivel de rigor en la verificación de bloques de -checkblocks (0-4; predeterminado: 3)</translation> + </message> + <message> + <location line="+2"/> + <source>In this mode -genproclimit controls how many blocks are generated immediately.</source> + <translation>En este modo -genproclimit controla cuántos bloques se generan de inmediato.</translation> + </message> + <message> + <location line="+12"/> + <source>Set the number of script verification threads (%u to %d, 0 = auto, <0 = leave that many cores free, default: %d)</source> + <translation>Establecer el número de hilos (threads) de verificación de scripts (entre %u y %d, 0 = automático, <0 = dejar libres ese número de núcleos; predeterminado: %d)</translation> + </message> + <message> + <location line="+3"/> + <source>Set the processor limit for when generation is on (-1 = unlimited, default: -1)</source> + <translation>Establecer el lÃmite de procesadores cuando está activada la generación (-1 = sin lÃmite; predeterminado: -1)</translation> + </message> + <message> + <location line="+3"/> <source>This is a pre-release test build - use at your own risk - do not use for mining or merchant applications</source> <translation>Esta es una versión de pre-prueba - utilÃcela bajo su propio riesgo. No la utilice para usos comerciales o de minerÃa.</translation> </message> <message> - <location line="+5"/> + <location line="+3"/> + <source>Unable to bind to %s on this computer. Bitcoin Core is probably already running.</source> + <translation>No se ha podido acceder a %s en esta máquina. Probablemente ya se está ejecutando Bitcoin Core.</translation> + </message> + <message> + <location line="+3"/> <source>Use separate SOCKS5 proxy to reach peers via Tor hidden services (default: -proxy)</source> <translation>Usar proxy SOCKS5 distinto para comunicarse vÃa Tor de forma anónima (Predeterminado: -proxy)</translation> </message> @@ -3479,6 +3538,16 @@ Por ejemplo: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. </message> <message> <location line="+9"/> + <source>(default: 1)</source> + <translation>(predeterminado: 1)</translation> + </message> + <message> + <location line="+1"/> + <source>(default: wallet.dat)</source> + <translation>(predeterminado: wallet.dat)</translation> + </message> + <message> + <location line="+1"/> <source><category> can be:</source> <translation><category> puede ser:</translation> </message> @@ -3490,15 +3559,10 @@ Por ejemplo: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <message> <location line="+1"/> <source>Bitcoin Core Daemon</source> - <translation>Proceso Bitcoin Core</translation> - </message> - <message> - <location line="+1"/> - <source>Bitcoin RPC client version</source> - <translation>Versión de cliente BitcoinROC</translation> + <translation>Bitcoin Core Daemon (proceso independiente)</translation> </message> <message> - <location line="+1"/> + <location line="+2"/> <source>Block creation options:</source> <translation>Opciones de creación de bloques:</translation> </message> @@ -3524,11 +3588,26 @@ Por ejemplo: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. </message> <message> <location line="+2"/> + <source>Connection options:</source> + <translation>Opciones de conexión:</translation> + </message> + <message> + <location line="+1"/> <source>Corrupted block database detected</source> <translation>Corrupción de base de datos de bloques detectada.</translation> </message> <message> <location line="+1"/> + <source>Debugging/Testing options:</source> + <translation>Opciones de depuración/pruebas:</translation> + </message> + <message> + <location line="+1"/> + <source>Disable safemode, override a real safe mode event (default: 0)</source> + <translation>Inhabilitar el modo seguro, no considerar un suceso real de modo seguro (predeterminado: 0)</translation> + </message> + <message> + <location line="+1"/> <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> @@ -3639,11 +3718,21 @@ Por ejemplo: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. </message> <message> <location line="+1"/> + <source>Fees smaller than this are considered zero fee (for relaying) (default:</source> + <translation>Las comisiones inferiores se consideran comisión cero (a efectos de propagación) (predeterminado:</translation> + </message> + <message> + <location line="+1"/> <source>Find peers using DNS lookup (default: 1 unless -connect)</source> <translation>Encontrar pares mediante búsqueda de DNS (predeterminado: 1 salvo con -connect)</translation> </message> <message> <location line="+1"/> + <source>Force safe mode (default: 0)</source> + <translation>Forzar modo seguro (predeterminado: 0)</translation> + </message> + <message> + <location line="+1"/> <source>Generate coins (default: 0)</source> <translation>Generar bitcoins (predeterminado: 0)</translation> </message> @@ -3654,11 +3743,6 @@ Por ejemplo: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. </message> <message> <location line="+1"/> - <source>How thorough the block verification is (0-4, default: 3)</source> - <translation>Cómo es de exhaustiva la verificación de bloques (0-4, predeterminado 3)</translation> - </message> - <message> - <location line="+1"/> <source>If <category> is not supplied, output all debugging information.</source> <translation>Si no se proporciona <category>, mostrar toda la depuración</translation> </message> @@ -3673,7 +3757,7 @@ Por ejemplo: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Dirección -onion inválida: '%s'</translation> </message> <message> - <location line="+15"/> + <location line="+17"/> <source>Not enough file descriptors available.</source> <translation>No hay suficientes descriptores de archivo disponibles. </translation> </message> @@ -3683,27 +3767,27 @@ Por ejemplo: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Anteponer marca temporal a la información de depuración (predeterminado: 1)</translation> </message> <message> - <location line="+1"/> + <location line="+4"/> <source>RPC client options:</source> <translation>Opciones para cliente RPC:</translation> </message> <message> - <location line="+1"/> + <location line="+4"/> <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> - <location line="+5"/> + <location line="+6"/> <source>Select SOCKS version for -proxy (4 or 5, default: 5)</source> <translation>Seleccionar versión de SOCKS para -proxy (4 o 5, predeterminado: 5)</translation> </message> <message> - <location line="+1"/> - <source>Send command to Bitcoin server</source> - <translation>Enviar comando a servidor Bitcoin</translation> + <location line="+6"/> + <source>Set database cache size in megabytes (%d to %d, default: %d)</source> + <translation>Asignar tamaño de cache en megabytes (entre %d y %d; predeterminado: %d)</translation> </message> <message> - <location line="+7"/> + <location line="+2"/> <source>Set maximum block size in bytes (default: %d)</source> <translation>Establecer tamaño máximo de bloque en bytes (predeterminado: %d)</translation> </message> @@ -3713,7 +3797,7 @@ Por ejemplo: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Establecer el número de procesos para atender las llamadas RPC (predeterminado: 4)</translation> </message> <message> - <location line="+7"/> + <location line="+10"/> <source>Specify wallet file (within data directory)</source> <translation>Especificar archivo de monedero (dentro del directorio de datos)</translation> </message> @@ -3723,12 +3807,7 @@ Por ejemplo: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Gastar cambio no confirmado al enviar transacciones (predeterminado: 1)</translation> </message> <message> - <location line="+1"/> - <source>Start Bitcoin server</source> - <translation>Iniciar servidor Bitcoin</translation> - </message> - <message> - <location line="+3"/> + <location line="+4"/> <source>This is intended for regression testing tools and app development.</source> <translation>Esto afecta a las herramientas de prueba de regresión y al desarrollo informático de la aplicación.</translation> </message> @@ -3773,17 +3852,22 @@ Por ejemplo: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Usted necesita reconstruir la base de datos utilizando -reindex para cambiar -txindex</translation> </message> <message> - <location line="-80"/> + <location line="-92"/> <source>Imports blocks from external blk000??.dat file</source> <translation>Importa los bloques desde un archivo blk000??.dat externo</translation> </message> <message> - <location line="-106"/> + <location line="-149"/> + <source>Cannot obtain a lock on data directory %s. Bitcoin Core is probably already running.</source> + <translation>No se ha podido bloquear el directorio de datos %s. Probablemente ya se está ejecutando Bitcoin Core.</translation> + </message> + <message> + <location line="+22"/> <source>Execute command when a relevant alert is received or we see a really long fork (%s in cmd is replaced by message)</source> <translation>Ejecutar un comando cuando se reciba una alerta importante o cuando veamos un fork demasiado largo (%s en cmd se reemplazará por el mensaje)</translation> </message> <message> - <location line="+14"/> + <location line="+25"/> <source>Output debugging information (default: 0, supplying <category> is optional)</source> <translation>Mostrar información de depuración (predeterminado: 0, proporcionar <category> es opcional)</translation> </message> @@ -3793,12 +3877,7 @@ Por ejemplo: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Establecer tamaño máximo de las transacciones de alta prioridad/baja comisión en bytes (predeterminado: %d)</translation> </message> <message> - <location line="+2"/> - <source>Set the number of script verification threads (up to 16, 0 = auto, <0 = leave that many cores free, default: 0)</source> - <translation>Configura el número de hilos para el script de verificación (hasta 16, 0 = auto, <0 = leave that many cores free, por fecto: 0)</translation> - </message> - <message> - <location line="+90"/> + <location line="+102"/> <source>Information</source> <translation>Información</translation> </message> @@ -3813,7 +3892,17 @@ Por ejemplo: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Cantidad inválida para -mintxfee=<amount>: '%s'</translation> </message> <message> - <location line="+8"/> + <location line="+3"/> + <source>Limit size of signature cache to <n> entries (default: 50000)</source> + <translation>Limitar tamaño de la cache de firmas a <n> entradas (predeterminado: 50000)</translation> + </message> + <message> + <location line="+6"/> + <source>Log transaction priority and fee per kB when mining blocks (default: 0)</source> + <translation>Registrar en el log la prioridad de transacciones y la comisión por kB al minar bloques (predeterminado: 0)</translation> + </message> + <message> + <location line="+1"/> <source>Maintain a full transaction index (default: 0)</source> <translation>Mantener Ãndice de transacciones completo (predeterminado: 0)</translation> </message> @@ -3838,12 +3927,52 @@ Por ejemplo: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Conectarse solo a nodos de la red <net> (IPv4, IPv6 o Tor)</translation> </message> <message> - <location line="+9"/> + <location line="+4"/> + <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> + <location line="+1"/> + <source>Print block tree on startup (default: 0)</source> + <translation>Imprimir árbol de bloques al iniciar (predeterminado: 0)</translation> + </message> + <message> + <location line="+1"/> + <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> + <message> + <location line="+2"/> + <source>RPC server options:</source> + <translation>Opciones de servidor RPC:</translation> + </message> + <message> + <location line="+1"/> + <source>Randomly drop 1 of every <n> network messages</source> + <translation>Ignorar 1 de cada <n> mensajes de red al azar</translation> + </message> + <message> + <location line="+1"/> + <source>Randomly fuzz 1 of every <n> network messages</source> + <translation>Introducir datos fuzz en 1 de cada <n> mensajes de red al azar</translation> + </message> + <message> + <location line="+4"/> + <source>Run a thread to flush wallet periodically (default: 1)</source> + <translation>Ejecutar un hilo (thread) para limpiar de la memoria el monedero periódicamente (predeterminado: 1)</translation> + </message> + <message> + <location line="+2"/> <source>SSL options: (see the Bitcoin Wiki for SSL setup instructions)</source> <translation>Opciones SSL: (ver la Bitcoin Wiki para instrucciones de configuración SSL)</translation> </message> <message> - <location line="+4"/> + <location line="+2"/> + <source>Send command to Bitcoin Core</source> + <translation>Enviar orden a Bitcoin Core</translation> + </message> + <message> + <location line="+2"/> <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> @@ -3854,6 +3983,21 @@ Por ejemplo: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. </message> <message> <location line="+2"/> + <source>Sets the DB_PRIVATE flag in the wallet db environment (default: 1)</source> + <translation>Establece la opción DB_PRIVATE en el entorno de base de datos del monedero (predeterminado: 1)</translation> + </message> + <message> + <location line="+1"/> + <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> + <location line="+1"/> + <source>Show benchmark information (default: 0)</source> + <translation>Mostrar información de benchmarking (predeterminado: 0)</translation> + </message> + <message> + <location line="+1"/> <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> @@ -3868,7 +4012,12 @@ Por ejemplo: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Especificar el tiempo máximo de conexión en milisegundos (predeterminado: 5000)</translation> </message> <message> - <location line="+7"/> + <location line="+6"/> + <source>Start Bitcoin Core Daemon</source> + <translation>Iniciar Bitcoin Core Daemon</translation> + </message> + <message> + <location line="+1"/> <source>System error: </source> <translation>Error de sistema: </translation> </message> @@ -3920,6 +4069,11 @@ Por ejemplo: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. </message> <message> <location line="+1"/> + <source>on startup</source> + <translation>al iniciar</translation> + </message> + <message> + <location line="+1"/> <source>version</source> <translation>versión</translation> </message> @@ -3929,52 +4083,52 @@ Por ejemplo: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>wallet.dat corrupto. Ha fallado la recuperación.</translation> </message> <message> - <location line="-60"/> + <location line="-71"/> <source>Password for JSON-RPC connections</source> <translation>Contraseña para las conexiones JSON-RPC </translation> </message> <message> - <location line="-71"/> + <location line="-77"/> <source>Allow JSON-RPC connections from specified IP address</source> <translation>Permitir conexiones JSON-RPC desde la dirección IP especificada </translation> </message> <message> - <location line="+81"/> + <location line="+94"/> <source>Send commands to node running on <ip> (default: 127.0.0.1)</source> <translation>Enviar comando al nodo situado en <ip> (predeterminado: 127.0.0.1) </translation> </message> <message> - <location line="-133"/> + <location line="-163"/> <source>Execute command when the best block changes (%s in cmd is replaced by block hash)</source> <translation>Ejecutar un comando cuando cambia el mejor bloque (%s en cmd se sustituye por el hash de bloque)</translation> </message> <message> - <location line="+163"/> + <location line="+196"/> <source>Upgrade wallet to latest format</source> <translation>Actualizar el monedero al último formato</translation> </message> <message> - <location line="-25"/> + <location line="-28"/> <source>Set key pool size to <n> (default: 100)</source> <translation>Ajustar el número de claves en reserva <n> (predeterminado: 100) </translation> </message> <message> - <location line="-11"/> + <location line="-12"/> <source>Rescan the block chain for missing wallet transactions</source> <translation>Volver a examinar la cadena de bloques en busca de transacciones del monedero perdidas</translation> </message> <message> - <location line="+39"/> + <location line="+43"/> <source>Use OpenSSL (https) for JSON-RPC connections</source> <translation>Usar OpenSSL (https) para las conexiones JSON-RPC </translation> </message> <message> - <location line="-31"/> + <location line="-34"/> <source>Server certificate file (default: server.cert)</source> <translation>Certificado del servidor (predeterminado: server.cert) </translation> @@ -3986,7 +4140,7 @@ Por ejemplo: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. </translation> </message> <message> - <location line="+17"/> + <location line="+20"/> <source>This help message</source> <translation>Este mensaje de ayuda </translation> @@ -3997,17 +4151,17 @@ Por ejemplo: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>No es posible conectar con %s en este sistema (bind ha dado el error %d, %s)</translation> </message> <message> - <location line="-109"/> + <location line="-125"/> <source>Allow DNS lookups for -addnode, -seednode and -connect</source> <translation>Permitir búsquedas DNS para -addnode, -seednode y -connect</translation> </message> <message> - <location line="+61"/> + <location line="+66"/> <source>Loading addresses...</source> <translation>Cargando direcciones...</translation> </message> <message> - <location line="-37"/> + <location line="-39"/> <source>Error loading wallet.dat: Wallet corrupted</source> <translation>Error al cargar wallet.dat: el monedero está dañado</translation> </message> @@ -4017,22 +4171,22 @@ Por ejemplo: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Error al cargar wallet.dat: El monedero requiere una versión más reciente de Bitcoin</translation> </message> <message> - <location line="+99"/> + <location line="+112"/> <source>Wallet needed to be rewritten: restart Bitcoin to complete</source> <translation>El monedero ha necesitado ser reescrito. Reinicie Bitcoin para completar el proceso</translation> </message> <message> - <location line="-101"/> + <location line="-114"/> <source>Error loading wallet.dat</source> <translation>Error al cargar wallet.dat</translation> </message> <message> - <location line="+31"/> + <location line="+32"/> <source>Invalid -proxy address: '%s'</source> <translation>Dirección -proxy inválida: '%s'</translation> </message> <message> - <location line="+57"/> + <location line="+69"/> <source>Unknown network specified in -onlynet: '%s'</source> <translation>La red especificada en -onlynet '%s' es desconocida</translation> </message> @@ -4042,7 +4196,7 @@ Por ejemplo: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Solicitada versión de proxy -socks desconocida: %i</translation> </message> <message> - <location line="-103"/> + <location line="-119"/> <source>Cannot resolve -bind address: '%s'</source> <translation>No se puede resolver la dirección de -bind: '%s'</translation> </message> @@ -4052,7 +4206,7 @@ Por ejemplo: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>No se puede resolver la dirección de -externalip: '%s'</translation> </message> <message> - <location line="+49"/> + <location line="+53"/> <source>Invalid amount for -paytxfee=<amount>: '%s'</source> <translation>Cantidad inválida para -paytxfee=<amount>: '%s'</translation> </message> @@ -4067,27 +4221,22 @@ Por ejemplo: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Fondos insuficientes</translation> </message> <message> - <location line="+10"/> + <location line="+11"/> <source>Loading block index...</source> <translation>Cargando el Ãndice de bloques...</translation> </message> <message> - <location line="-63"/> + <location line="-68"/> <source>Add a node to connect to and attempt to keep the connection open</source> <translation>Añadir un nodo al que conectarse y tratar de mantener la conexión abierta</translation> </message> <message> - <location line="-32"/> - <source>Unable to bind to %s on this computer. Bitcoin is probably already running.</source> - <translation>No es posible conectar con %s en este sistema. Probablemente Bitcoin ya está ejecutándose.</translation> - </message> - <message> - <location line="+96"/> + <location line="+69"/> <source>Loading wallet...</source> <translation>Cargando monedero...</translation> </message> <message> - <location line="-57"/> + <location line="-62"/> <source>Cannot downgrade wallet</source> <translation>No se puede rebajar el monedero</translation> </message> @@ -4097,27 +4246,27 @@ Por ejemplo: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>No se puede escribir la dirección predeterminada</translation> </message> <message> - <location line="+68"/> + <location line="+80"/> <source>Rescanning...</source> <translation>Reexplorando...</translation> </message> <message> - <location line="-58"/> + <location line="-67"/> <source>Done loading</source> <translation>Generado pero no aceptado</translation> </message> <message> - <location line="+86"/> + <location line="+99"/> <source>To use the %s option</source> <translation>Para utilizar la opción %s</translation> </message> <message> - <location line="-78"/> + <location line="-91"/> <source>Error</source> <translation>Error</translation> </message> <message> - <location line="-36"/> + <location line="-41"/> <source>You must set rpcpassword=<password> in the configuration file: %s If the file does not exist, create it with owner-readable-only file permissions.</source> diff --git a/src/qt/locale/bitcoin_es_CL.ts b/src/qt/locale/bitcoin_es_CL.ts index 24cefe2bac..e48e37d6d8 100644 --- a/src/qt/locale/bitcoin_es_CL.ts +++ b/src/qt/locale/bitcoin_es_CL.ts @@ -39,6 +39,12 @@ Eric Young (eay@cryptsoft.com) y UPnP software escrito por Thomas Bernard.</tran <source>The Bitcoin Core developers</source> <translation type="unfinished"/> </message> + <message> + <location line="+12"/> + <location line="+2"/> + <source>(%1-bit)</source> + <translation type="unfinished"/> + </message> </context> <context> <name>AddressBookPage</name> @@ -68,7 +74,7 @@ Eric Young (eay@cryptsoft.com) y UPnP software escrito por Thomas Bernard.</tran <translation type="unfinished"/> </message> <message> - <location line="+52"/> + <location line="+58"/> <source>C&lose</source> <translation type="unfinished"/> </message> @@ -78,7 +84,7 @@ Eric Young (eay@cryptsoft.com) y UPnP software escrito por Thomas Bernard.</tran <translation>&Copia dirección</translation> </message> <message> - <location filename="../forms/addressbookpage.ui" line="-41"/> + <location filename="../forms/addressbookpage.ui" line="-47"/> <source>Delete the currently selected address from the list</source> <translation type="unfinished"/> </message> @@ -325,7 +331,7 @@ Eric Young (eay@cryptsoft.com) y UPnP software escrito por Thomas Bernard.</tran <context> <name>BitcoinGUI</name> <message> - <location filename="../bitcoingui.cpp" line="+295"/> + <location filename="../bitcoingui.cpp" line="+294"/> <source>Sign &message...</source> <translation>Firmar &Mensaje...</translation> </message> @@ -340,12 +346,12 @@ Eric Young (eay@cryptsoft.com) y UPnP software escrito por Thomas Bernard.</tran <translation>&Vista general</translation> </message> <message> - <location line="-137"/> + <location line="-136"/> <source>Node</source> <translation type="unfinished"/> </message> <message> - <location line="+138"/> + <location line="+137"/> <source>Show general overview of wallet</source> <translation>Muestra una vista general de la billetera</translation> </message> @@ -466,17 +472,17 @@ Eric Young (eay@cryptsoft.com) y UPnP software escrito por Thomas Bernard.</tran <translation type="unfinished"/> </message> <message> - <location line="+430"/> + <location line="+440"/> <source>Bitcoin</source> <translation>Bitcoin</translation> </message> <message> - <location line="-643"/> + <location line="-652"/> <source>Wallet</source> <translation>Cartera</translation> </message> <message> - <location line="+146"/> + <location line="+145"/> <source>&Send</source> <translation type="unfinished"/> </message> @@ -532,18 +538,18 @@ Eric Young (eay@cryptsoft.com) y UPnP software escrito por Thomas Bernard.</tran <translation>Barra de pestañas</translation> </message> <message> - <location line="-284"/> - <location line="+376"/> + <location line="-283"/> + <location line="+375"/> <source>[testnet]</source> <translation>[red-de-pruebas]</translation> </message> <message> - <location line="-401"/> + <location line="-400"/> <source>Bitcoin Core</source> <translation type="unfinished"/> </message> <message> - <location line="+163"/> + <location line="+162"/> <source>Request payments (generates QR codes and bitcoin: URIs)</source> <translation type="unfinished"/> </message> @@ -605,7 +611,7 @@ Eric Young (eay@cryptsoft.com) y UPnP software escrito por Thomas Bernard.</tran <translation type="unfinished"/> </message> <message numerus="yes"> - <location line="+23"/> + <location line="+27"/> <source>%n hour(s)</source> <translation><numerusform>%n hora</numerusform><numerusform>%n horas</numerusform></translation> </message> @@ -616,10 +622,21 @@ Eric Young (eay@cryptsoft.com) y UPnP software escrito por Thomas Bernard.</tran </message> <message numerus="yes"> <location line="+4"/> + <location line="+6"/> <source>%n week(s)</source> <translation><numerusform>%n semana</numerusform><numerusform>%n semanas</numerusform></translation> </message> <message> + <location line="+0"/> + <source>%1 and %2</source> + <translation type="unfinished"/> + </message> + <message numerus="yes"> + <location line="+0"/> + <source>%n year(s)</source> + <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation> + </message> + <message> <location line="+4"/> <source>%1 behind</source> <translation type="unfinished"/> @@ -650,12 +667,12 @@ Eric Young (eay@cryptsoft.com) y UPnP software escrito por Thomas Bernard.</tran <translation>Información</translation> </message> <message> - <location line="-85"/> + <location line="-95"/> <source>Up to date</source> <translation>Actualizado</translation> </message> <message> - <location line="+34"/> + <location line="+44"/> <source>Catching up...</source> <translation>Recuperando...</translation> </message> @@ -692,7 +709,7 @@ Dirección: %4</translation> <translation>La billetera esta <b>codificada</b> y actualmente <b>bloqueda</b></translation> </message> <message> - <location filename="../bitcoin.cpp" line="+438"/> + <location filename="../bitcoin.cpp" line="+443"/> <source>A fatal error occurred. Bitcoin can no longer continue safely and will quit.</source> <translation type="unfinished"/> </message> @@ -700,7 +717,7 @@ Dirección: %4</translation> <context> <name>ClientModel</name> <message> - <location filename="../clientmodel.cpp" line="+119"/> + <location filename="../clientmodel.cpp" line="+128"/> <source>Network Alert</source> <translation>Alerta de Red</translation> </message> @@ -753,7 +770,7 @@ Dirección: %4</translation> <translation type="unfinished"/> </message> <message> - <location line="+63"/> + <location line="+56"/> <source>(un)select all</source> <translation type="unfinished"/> </message> @@ -768,7 +785,7 @@ Dirección: %4</translation> <translation type="unfinished"/> </message> <message> - <location line="+52"/> + <location line="+53"/> <source>Amount</source> <translation>Cantidad</translation> </message> @@ -798,7 +815,7 @@ Dirección: %4</translation> <translation type="unfinished"/> </message> <message> - <location filename="../coincontroldialog.cpp" line="+42"/> + <location filename="../coincontroldialog.cpp" line="+41"/> <source>Copy address</source> <translation>Copia dirección</translation> </message> @@ -864,7 +881,7 @@ Dirección: %4</translation> <translation type="unfinished"/> </message> <message> - <location line="+323"/> + <location line="+332"/> <source>highest</source> <translation type="unfinished"/> </message> @@ -914,12 +931,12 @@ Dirección: %4</translation> <translation type="unfinished"/> </message> <message> - <location line="+31"/> + <location line="+32"/> <source>none</source> <translation type="unfinished"/> </message> <message> - <location line="+140"/> + <location line="+141"/> <source>Dust</source> <translation type="unfinished"/> </message> @@ -982,12 +999,12 @@ Dirección: %4</translation> </message> <message> <location line="+43"/> - <location line="+66"/> + <location line="+61"/> <source>(no label)</source> <translation>(sin etiqueta)</translation> </message> <message> - <location line="-9"/> + <location line="-7"/> <source>change from %1 (%2)</source> <translation type="unfinished"/> </message> @@ -1068,7 +1085,7 @@ Dirección: %4</translation> <context> <name>FreespaceChecker</name> <message> - <location filename="../intro.cpp" line="+65"/> + <location filename="../intro.cpp" line="+68"/> <source>A new data directory will be created.</source> <translation type="unfinished"/> </message> @@ -1101,7 +1118,7 @@ Dirección: %4</translation> <translation type="unfinished"/> </message> <message> - <location filename="../utilitydialog.cpp" line="+38"/> + <location filename="../utilitydialog.cpp" line="+24"/> <source>Bitcoin Core</source> <translation type="unfinished"/> </message> @@ -1126,7 +1143,7 @@ Dirección: %4</translation> <translation>UI opciones</translation> </message> <message> - <location line="+1"/> + <location line="+2"/> <source>Set language, for example "de_DE" (default: system locale)</source> <translation type="unfinished"/> </message> @@ -1138,11 +1155,16 @@ Dirección: %4</translation> </message> <message> <location line="+1"/> - <source>Show splash screen on startup (default: 1)</source> + <source>Set SSL root certificates for payment request (default: -system-)</source> <translation type="unfinished"/> </message> <message> <location line="+1"/> + <source>Show splash screen on startup (default: 1)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="-4"/> <source>Choose data directory on startup (default: 0)</source> <translation type="unfinished"/> </message> @@ -1180,7 +1202,7 @@ Dirección: %4</translation> <translation type="unfinished"/> </message> <message> - <location filename="../intro.cpp" line="+85"/> + <location filename="../intro.cpp" line="+82"/> <source>Bitcoin</source> <translation>Bitcoin</translation> </message> @@ -1190,7 +1212,7 @@ Dirección: %4</translation> <translation type="unfinished"/> </message> <message> - <location line="+19"/> + <location line="+24"/> <source>Error</source> <translation>Error</translation> </message> @@ -1246,7 +1268,7 @@ Dirección: %4</translation> <translation>&Principal</translation> </message> <message> - <location line="+6"/> + <location line="+116"/> <source>Optional transaction fee per kB that helps make sure your transactions are processed quickly. Most transactions are 1 kB.</source> <translation type="unfinished"/> </message> @@ -1256,7 +1278,7 @@ Dirección: %4</translation> <translation>Comisión de &transacciónes</translation> </message> <message> - <location line="+31"/> + <location line="-125"/> <source>Automatically start Bitcoin after logging in to the system.</source> <translation>Inicia Bitcoin automáticamente despues de encender el computador</translation> </message> @@ -1271,12 +1293,7 @@ Dirección: %4</translation> <translation type="unfinished"/> </message> <message> - <location line="+13"/> - <source>Set database cache size in megabytes (default: 25)</source> - <translation>Asigna el tamaño del caché de la base de datos en MB (25 predeterminado)</translation> - </message> - <message> - <location line="+13"/> + <location line="+16"/> <source>MB</source> <translation type="unfinished"/> </message> @@ -1286,12 +1303,7 @@ Dirección: %4</translation> <translation type="unfinished"/> </message> <message> - <location line="+13"/> - <source>Set the number of script verification threads (up to 16, 0 = auto, <0 = leave that many cores free, default: 0)</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+58"/> + <location line="+160"/> <source>Connect to the Bitcoin network through a SOCKS proxy.</source> <translation type="unfinished"/> </message> @@ -1306,7 +1318,7 @@ Dirección: %4</translation> <translation type="unfinished"/> </message> <message> - <location line="+224"/> + <location line="+214"/> <source>Active command-line options that override above options:</source> <translation type="unfinished"/> </message> @@ -1321,12 +1333,42 @@ Dirección: %4</translation> <translation type="unfinished"/> </message> <message> - <location line="-323"/> + <location line="-313"/> <source>&Network</source> <translation>&Red</translation> </message> <message> - <location line="+6"/> + <location line="-131"/> + <source>(0 = auto, <0 = leave that many cores free)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+36"/> + <source>W&allet</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+65"/> + <source>Expert</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+9"/> + <source>Enable coin &control features</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+7"/> + <source>If you disable the spending of unconfirmed change, the change from a transaction cannot be used until that transaction has at least one confirmation. This also affects how your balance is computed.</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+3"/> + <source>&Spend unconfirmed change</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+17"/> <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> @@ -1421,17 +1463,12 @@ Dirección: %4</translation> <translation>&Muestra direcciones en el listado de transaccioines</translation> </message> <message> - <location line="+7"/> + <location line="-262"/> <source>Whether to show coin control features or not.</source> <translation type="unfinished"/> </message> <message> - <location line="+3"/> - <source>Display coin &control features (experts only)</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+136"/> + <location line="+398"/> <source>&OK</source> <translation>&OK</translation> </message> @@ -1441,17 +1478,17 @@ Dirección: %4</translation> <translation>&Cancela</translation> </message> <message> - <location filename="../optionsdialog.cpp" line="+67"/> + <location filename="../optionsdialog.cpp" line="+72"/> <source>default</source> <translation>predeterminado</translation> </message> <message> - <location line="+57"/> + <location line="+58"/> <source>none</source> <translation type="unfinished"/> </message> <message> - <location line="+75"/> + <location line="+80"/> <source>Confirm options reset</source> <translation>Confirmar reestablecimiento de las opciones</translation> </message> @@ -1491,18 +1528,13 @@ Dirección: %4</translation> <translation type="unfinished"/> </message> <message> - <location line="-155"/> - <source>Unconfirmed:</source> - <translation>No confirmados:</translation> - </message> - <message> - <location line="-83"/> + <location line="-238"/> <source>Wallet</source> <translation>Cartera</translation> </message> <message> <location line="+51"/> - <source>Confirmed:</source> + <source>Available:</source> <translation type="unfinished"/> </message> <message> @@ -1511,7 +1543,12 @@ Dirección: %4</translation> <translation type="unfinished"/> </message> <message> - <location line="+32"/> + <location line="+16"/> + <source>Pending:</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+16"/> <source>Total of transactions that have yet to be confirmed, and do not yet count toward the spendable balance</source> <translation type="unfinished"/> </message> @@ -1644,23 +1681,29 @@ Dirección: %4</translation> <context> <name>QObject</name> <message> - <location filename="../bitcoin.cpp" line="+71"/> - <location line="+11"/> + <location filename="../bitcoin.cpp" line="+63"/> + <location line="+7"/> + <location line="+13"/> <source>Bitcoin</source> <translation>Bitcoin</translation> </message> <message> - <location line="+1"/> + <location line="-19"/> <source>Error: Specified data directory "%1" does not exist.</source> <translation type="unfinished"/> </message> <message> - <location line="-12"/> + <location line="+7"/> + <source>Error: Cannot parse configuration file: %1. Only use key=value syntax.</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+12"/> <source>Error: Invalid combination of -regtest and -testnet.</source> <translation type="unfinished"/> </message> <message> - <location filename="../guiutil.cpp" line="+82"/> + <location filename="../guiutil.cpp" line="+89"/> <source>Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source> <translation>Introduce una dirección Bitcoin (ej. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation> </message> @@ -1706,7 +1749,7 @@ Dirección: %4</translation> <location line="+36"/> <location line="+23"/> <location line="+23"/> - <location filename="../rpcconsole.cpp" line="+359"/> + <location filename="../rpcconsole.cpp" line="+373"/> <source>N/A</source> <translation>N/A</translation> </message> @@ -1802,11 +1845,13 @@ Dirección: %4</translation> </message> <message> <location line="+64"/> + <location filename="../rpcconsole.cpp" line="-10"/> <source>In:</source> <translation type="unfinished"/> </message> <message> <location line="+80"/> + <location filename="../rpcconsole.cpp" line="+1"/> <source>Out:</source> <translation type="unfinished"/> </message> @@ -1831,7 +1876,7 @@ Dirección: %4</translation> <translation>Limpiar Consola</translation> </message> <message> - <location filename="../rpcconsole.cpp" line="-30"/> + <location filename="../rpcconsole.cpp" line="-35"/> <source>Welcome to the Bitcoin RPC console.</source> <translation type="unfinished"/> </message> @@ -1846,7 +1891,7 @@ Dirección: %4</translation> <translation type="unfinished"/> </message> <message> - <location line="+122"/> + <location line="+136"/> <source>%1 B</source> <translation type="unfinished"/> </message> @@ -1962,7 +2007,7 @@ Dirección: %4</translation> <translation type="unfinished"/> </message> <message> - <location line="+11"/> + <location line="+14"/> <source>Remove the selected entries from the list</source> <translation type="unfinished"/> </message> @@ -1972,7 +2017,7 @@ Dirección: %4</translation> <translation type="unfinished"/> </message> <message> - <location filename="../receivecoinsdialog.cpp" line="+38"/> + <location filename="../receivecoinsdialog.cpp" line="+39"/> <source>Copy label</source> <translation>Copia etiqueta</translation> </message> @@ -2193,12 +2238,12 @@ Dirección: %4</translation> <translation>&Borra todos</translation> </message> <message> - <location line="+52"/> + <location line="+58"/> <source>Balance:</source> <translation>Balance:</translation> </message> <message> - <location line="-78"/> + <location line="-84"/> <source>Confirm the send action</source> <translation>Confirma el envio</translation> </message> @@ -2443,7 +2488,7 @@ Dirección: %4</translation> <context> <name>ShutdownWindow</name> <message> - <location filename="../utilitydialog.cpp" line="+48"/> + <location filename="../utilitydialog.cpp" line="+52"/> <source>Bitcoin Core is shutting down...</source> <translation type="unfinished"/> </message> @@ -2643,7 +2688,7 @@ Dirección: %4</translation> <context> <name>SplashScreen</name> <message> - <location filename="../splashscreen.cpp" line="+28"/> + <location filename="../splashscreen.cpp" line="+32"/> <source>Bitcoin Core</source> <translation type="unfinished"/> </message> @@ -2675,6 +2720,11 @@ Dirección: %4</translation> </message> <message> <location line="+6"/> + <source>conflicted</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+2"/> <source>%1/offline</source> <translation>%1/fuera de linea</translation> </message> @@ -2836,12 +2886,12 @@ Dirección: %4</translation> <translation>, no ha sido emitido satisfactoriamente todavÃa</translation> </message> <message numerus="yes"> - <location line="-35"/> + <location line="-37"/> <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> - <location line="+70"/> + <location line="+72"/> <source>unknown</source> <translation>desconocido</translation> </message> @@ -2882,12 +2932,12 @@ Dirección: %4</translation> <translation>Cantidad</translation> </message> <message> - <location line="+59"/> + <location line="+78"/> <source>Immature (%1 confirmations, will be available after %2)</source> <translation type="unfinished"/> </message> <message numerus="yes"> - <location line="+16"/> + <location line="-21"/> <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> @@ -2897,23 +2947,12 @@ Dirección: %4</translation> <translation>Abierto hasta %1</translation> </message> <message> - <location line="+3"/> - <source>Offline (%1 confirmations)</source> - <translation>Fuera de linea (%1 confirmaciónes)</translation> - </message> - <message> - <location line="+3"/> - <source>Unconfirmed (%1 of %2 confirmations)</source> - <translation>No confirmado (%1 de %2 confirmaciónes)</translation> - </message> - <message> - <location line="-22"/> - <location line="+25"/> + <location line="+12"/> <source>Confirmed (%1 confirmations)</source> <translation>Confirmado (%1 confirmaciones)</translation> </message> <message> - <location line="-22"/> + <location line="+9"/> <source>This block was not received by any other nodes and will probably not be accepted!</source> <translation>Este bloque no ha sido recibido por otros nodos y probablemente no sea aceptado !</translation> </message> @@ -2923,7 +2962,27 @@ Dirección: %4</translation> <translation>Generado pero no acceptado</translation> </message> <message> - <location line="+62"/> + <location line="-21"/> + <source>Offline</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+3"/> + <source>Unconfirmed</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+3"/> + <source>Confirming (%1 of %2 recommended confirmations)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+6"/> + <source>Conflicted</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+51"/> <source>Received with</source> <translation>Recibido con</translation> </message> @@ -2953,7 +3012,7 @@ Dirección: %4</translation> <translation>(n/a)</translation> </message> <message> - <location line="+199"/> + <location line="+190"/> <source>Transaction status. Hover over this field to show number of confirmations.</source> <translation>Estado de transacción. Pasa el raton sobre este campo para ver el numero de confirmaciónes.</translation> </message> @@ -3082,7 +3141,7 @@ Dirección: %4</translation> <translation>Mostrar detalles de la transacción</translation> </message> <message> - <location line="+142"/> + <location line="+140"/> <source>Export Transaction History</source> <translation type="unfinished"/> </message> @@ -3176,7 +3235,7 @@ Dirección: %4</translation> <context> <name>WalletView</name> <message> - <location filename="../walletview.cpp" line="+43"/> + <location filename="../walletview.cpp" line="+44"/> <source>&Export</source> <translation type="unfinished"/> </message> @@ -3186,7 +3245,7 @@ Dirección: %4</translation> <translation>Exportar los datos de la pestaña actual a un archivo</translation> </message> <message> - <location line="+181"/> + <location line="+184"/> <source>Backup Wallet</source> <translation type="unfinished"/> </message> @@ -3219,12 +3278,12 @@ Dirección: %4</translation> <context> <name>bitcoin-core</name> <message> - <location filename="../bitcoinstrings.cpp" line="+221"/> + <location filename="../bitcoinstrings.cpp" line="+261"/> <source>Usage:</source> <translation>Uso:</translation> </message> <message> - <location line="-54"/> + <location line="-66"/> <source>List commands</source> <translation>Muestra comandos </translation> @@ -3236,13 +3295,13 @@ Dirección: %4</translation> </translation> </message> <message> - <location line="+26"/> + <location line="+27"/> <source>Options:</source> <translation>Opciones: </translation> </message> <message> - <location line="+22"/> + <location line="+32"/> <source>Specify configuration file (default: bitcoin.conf)</source> <translation>Especifica archivo de configuración (predeterminado: bitcoin.conf) </translation> @@ -3260,75 +3319,75 @@ Dirección: %4</translation> </translation> </message> <message> - <location line="-9"/> - <source>Set database cache size in megabytes (default: 25)</source> - <translation>Asigna el tamaño del caché de la base de datos en MB (25 predeterminado)</translation> - </message> - <message> - <location line="-26"/> + <location line="-46"/> <source>Listen for connections on <port> (default: 8333 or testnet: 18333)</source> <translation>Escuchar por conecciones en <puerto> (Por defecto: 8333 o red de prueba: 18333)</translation> </message> <message> - <location line="+5"/> + <location line="+6"/> <source>Maintain at most <n> connections to peers (default: 125)</source> <translation>Mantener al menos <n> conecciones por cliente (por defecto: 125) </translation> </message> <message> - <location line="-51"/> + <location line="-57"/> <source>Connect to a node to retrieve peer addresses, and disconnect</source> <translation type="unfinished"/> </message> <message> - <location line="+84"/> + <location line="+100"/> <source>Specify your own public address</source> <translation type="unfinished"/> </message> <message> - <location line="+5"/> + <location line="+6"/> <source>Threshold for disconnecting misbehaving peers (default: 100)</source> <translation>Umbral de desconección de clientes con mal comportamiento (por defecto: 100)</translation> </message> <message> - <location line="-148"/> + <location line="-172"/> <source>Number of seconds to keep misbehaving peers from reconnecting (default: 86400)</source> <translation type="unfinished"/> </message> <message> - <location line="-36"/> + <location line="-52"/> <source>An error occurred while setting up the RPC port %u for listening on IPv4: %s</source> <translation type="unfinished"/> </message> <message> - <location line="+34"/> + <location line="+50"/> <source>Listen for JSON-RPC connections on <port> (default: 8332 or testnet: 18332)</source> <translation>Escucha conexiones JSON-RPC en el puerto <port> (predeterminado: 8332 or testnet: 18332)</translation> </message> <message> - <location line="+45"/> + <location line="+51"/> <source>Accept command line and JSON-RPC commands</source> <translation>Aceptar comandos consola y JSON-RPC </translation> </message> <message> - <location line="+80"/> + <location line="+7"/> + <source>Bitcoin Core RPC client version</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+87"/> <source>Run in the background as a daemon and accept commands</source> <translation>Correr como demonio y acepta comandos </translation> </message> <message> - <location line="+39"/> + <location line="+43"/> <source>Use the test network</source> <translation>Usa la red de pruebas </translation> </message> <message> - <location line="-118"/> + <location line="-136"/> <source>Accept connections from outside (default: 1 if no -proxy or -connect)</source> <translation type="unfinished"/> </message> <message> - <location line="-95"/> + <location line="-117"/> <source>%s, you must set a rpcpassword in the configuration file: %s It is recommended you use the following random password: @@ -3358,8 +3417,8 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+3"/> - <source>Cannot obtain a lock on data directory %s. Bitcoin is probably already running.</source> + <location line="+6"/> + <source>Continuously rate-limit free transactions to <n>*1000 bytes per minute (default:15)</source> <translation type="unfinished"/> </message> <message> @@ -3374,6 +3433,11 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. </message> <message> <location line="+3"/> + <source>Error: Listening for incoming connections failed (listen returned error %d)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+2"/> <source>Error: The transaction was rejected! This might happen if some of the coins in your wallet were already spent, such as if you used a copy of wallet.dat and coins were spent in the copy but not marked as spent here.</source> <translation type="unfinished"/> </message> @@ -3388,12 +3452,47 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+18"/> + <location line="+6"/> + <source>Fees smaller than this are considered zero fee (for transaction creation) (default:</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+3"/> + <source>Flush database activity from memory pool to disk log every <n> megabytes (default: 100)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+3"/> + <source>How thorough the block verification of -checkblocks is (0-4, default: 3)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+2"/> + <source>In this mode -genproclimit controls how many blocks are generated immediately.</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+12"/> + <source>Set the number of script verification threads (%u to %d, 0 = auto, <0 = leave that many cores free, default: %d)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+3"/> + <source>Set the processor limit for when generation is on (-1 = unlimited, default: -1)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+3"/> <source>This is a pre-release test build - use at your own risk - do not use for mining or merchant applications</source> <translation type="unfinished"/> </message> <message> - <location line="+5"/> + <location line="+3"/> + <source>Unable to bind to %s on this computer. Bitcoin Core is probably already running.</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+3"/> <source>Use separate SOCKS5 proxy to reach peers via Tor hidden services (default: -proxy)</source> <translation type="unfinished"/> </message> @@ -3429,6 +3528,16 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. </message> <message> <location line="+9"/> + <source>(default: 1)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>(default: wallet.dat)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> <source><category> can be:</source> <translation type="unfinished"/> </message> @@ -3443,17 +3552,17 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+1"/> - <source>Bitcoin RPC client version</source> + <location line="+2"/> + <source>Block creation options:</source> <translation type="unfinished"/> </message> <message> - <location line="+1"/> - <source>Block creation options:</source> + <location line="+5"/> + <source>Clear list of wallet transactions (diagnostic tool; implies -rescan)</source> <translation type="unfinished"/> </message> <message> - <location line="+5"/> + <location line="+1"/> <source>Connect only to the specified node(s)</source> <translation>Conecta solo al nodo especificado </translation> @@ -3470,11 +3579,26 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. </message> <message> <location line="+2"/> + <source>Connection options:</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> <source>Corrupted block database detected</source> <translation type="unfinished"/> </message> <message> <location line="+1"/> + <source>Debugging/Testing options:</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>Disable safemode, override a real safe mode event (default: 0)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> <source>Discover own IP address (default: 1 when listening and no -externalip)</source> <translation type="unfinished"/> </message> @@ -3585,22 +3709,27 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. </message> <message> <location line="+1"/> - <source>Find peers using DNS lookup (default: 1 unless -connect)</source> + <source>Fees smaller than this are considered zero fee (for relaying) (default:</source> <translation type="unfinished"/> </message> <message> <location line="+1"/> - <source>Generate coins (default: 0)</source> + <source>Find peers using DNS lookup (default: 1 unless -connect)</source> <translation type="unfinished"/> </message> <message> - <location line="+2"/> - <source>How many blocks to check at startup (default: 288, 0 = all)</source> + <location line="+1"/> + <source>Force safe mode (default: 0)</source> <translation type="unfinished"/> </message> <message> <location line="+1"/> - <source>How thorough the block verification is (0-4, default: 3)</source> + <source>Generate coins (default: 0)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+2"/> + <source>How many blocks to check at startup (default: 288, 0 = all)</source> <translation type="unfinished"/> </message> <message> @@ -3619,7 +3748,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+15"/> + <location line="+17"/> <source>Not enough file descriptors available.</source> <translation type="unfinished"/> </message> @@ -3629,27 +3758,27 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+1"/> + <location line="+4"/> <source>RPC client options:</source> <translation type="unfinished"/> </message> <message> - <location line="+1"/> + <location line="+4"/> <source>Rebuild block chain index from current blk000??.dat files</source> <translation type="unfinished"/> </message> <message> - <location line="+5"/> + <location line="+6"/> <source>Select SOCKS version for -proxy (4 or 5, default: 5)</source> <translation type="unfinished"/> </message> <message> - <location line="+1"/> - <source>Send command to Bitcoin server</source> + <location line="+6"/> + <source>Set database cache size in megabytes (%d to %d, default: %d)</source> <translation type="unfinished"/> </message> <message> - <location line="+7"/> + <location line="+2"/> <source>Set maximum block size in bytes (default: %d)</source> <translation type="unfinished"/> </message> @@ -3659,17 +3788,17 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+7"/> + <location line="+10"/> <source>Specify wallet file (within data directory)</source> <translation type="unfinished"/> </message> <message> <location line="+2"/> - <source>Start Bitcoin server</source> - <translation>Iniciar Bitcoin</translation> + <source>Spend unconfirmed change when sending transactions (default: 1)</source> + <translation type="unfinished"/> </message> <message> - <location line="+3"/> + <location line="+4"/> <source>This is intended for regression testing tools and app development.</source> <translation type="unfinished"/> </message> @@ -3714,32 +3843,32 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="-79"/> + <location line="-92"/> <source>Imports blocks from external blk000??.dat file</source> <translation>Importar bloques desde el archivo externo blk000??.dat </translation> </message> <message> - <location line="-105"/> - <source>Execute command when a relevant alert is received or we see a really long fork (%s in cmd is replaced by message)</source> + <location line="-149"/> + <source>Cannot obtain a lock on data directory %s. Bitcoin Core is probably already running.</source> <translation type="unfinished"/> </message> <message> - <location line="+14"/> - <source>Output debugging information (default: 0, supplying <category> is optional)</source> + <location line="+22"/> + <source>Execute command when a relevant alert is received or we see a really long fork (%s in cmd is replaced by message)</source> <translation type="unfinished"/> </message> <message> - <location line="+2"/> - <source>Set maximum size of high-priority/low-fee transactions in bytes (default: %d)</source> + <location line="+25"/> + <source>Output debugging information (default: 0, supplying <category> is optional)</source> <translation type="unfinished"/> </message> <message> <location line="+2"/> - <source>Set the number of script verification threads (up to 16, 0 = auto, <0 = leave that many cores free, default: 0)</source> + <source>Set maximum size of high-priority/low-fee transactions in bytes (default: %d)</source> <translation type="unfinished"/> </message> <message> - <location line="+89"/> + <location line="+102"/> <source>Information</source> <translation>Información</translation> </message> @@ -3754,7 +3883,17 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+8"/> + <location line="+3"/> + <source>Limit size of signature cache to <n> entries (default: 50000)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+6"/> + <source>Log transaction priority and fee per kB when mining blocks (default: 0)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> <source>Maintain a full transaction index (default: 0)</source> <translation type="unfinished"/> </message> @@ -3779,12 +3918,52 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+9"/> + <location line="+4"/> + <source>Print block on startup, if found in block index</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>Print block tree on startup (default: 0)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>RPC SSL options: (see the Bitcoin Wiki for SSL setup instructions)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+2"/> + <source>RPC server options:</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>Randomly drop 1 of every <n> network messages</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>Randomly fuzz 1 of every <n> network messages</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+4"/> + <source>Run a thread to flush wallet periodically (default: 1)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+2"/> <source>SSL options: (see the Bitcoin Wiki for SSL setup instructions)</source> <translation>Opciones SSL: (ver la Bitcoin Wiki para instrucciones de configuración SSL)</translation> </message> <message> - <location line="+4"/> + <location line="+2"/> + <source>Send command to Bitcoin Core</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+2"/> <source>Send trace/debug info to console instead of debug.log file</source> <translation>Enviar informacion de seguimiento a la consola en vez del archivo debug.log</translation> </message> @@ -3795,6 +3974,21 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. </message> <message> <location line="+2"/> + <source>Sets the DB_PRIVATE flag in the wallet db environment (default: 1)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>Show all debugging options (usage: --help -help-debug)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>Show benchmark information (default: 0)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> <source>Shrink debug.log file on client startup (default: 1 when no -debug)</source> <translation type="unfinished"/> </message> @@ -3810,6 +4004,11 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. </message> <message> <location line="+6"/> + <source>Start Bitcoin Core Daemon</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> <source>System error: </source> <translation>Error de sistema:</translation> </message> @@ -3856,6 +4055,16 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. </message> <message> <location line="+2"/> + <source>Zapping all transactions from wallet...</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>on startup</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> <source>version</source> <translation>versión</translation> </message> @@ -3865,53 +4074,53 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>wallet.dat corrompió, guardado fallido</translation> </message> <message> - <location line="-58"/> + <location line="-71"/> <source>Password for JSON-RPC connections</source> <translation>Contraseña para las conexiones JSON-RPC </translation> </message> <message> - <location line="-70"/> + <location line="-77"/> <source>Allow JSON-RPC connections from specified IP address</source> <translation>Permite conexiones JSON-RPC desde la dirección IP especificada </translation> </message> <message> - <location line="+80"/> + <location line="+94"/> <source>Send commands to node running on <ip> (default: 127.0.0.1)</source> <translation>Envia comando al nodo situado en <ip> (predeterminado: 127.0.0.1) </translation> </message> <message> - <location line="-132"/> + <location line="-163"/> <source>Execute command when the best block changes (%s in cmd is replaced by block hash)</source> <translation type="unfinished"/> </message> <message> - <location line="+161"/> + <location line="+196"/> <source>Upgrade wallet to latest format</source> <translation>Actualizar billetera al formato actual</translation> </message> <message> - <location line="-24"/> + <location line="-28"/> <source>Set key pool size to <n> (default: 100)</source> <translation>Ajusta el numero de claves en reserva <n> (predeterminado: 100) </translation> </message> <message> - <location line="-11"/> + <location line="-12"/> <source>Rescan the block chain for missing wallet transactions</source> <translation>Rescanea la cadena de bloques para transacciones perdidas de la cartera </translation> </message> <message> - <location line="+38"/> + <location line="+43"/> <source>Use OpenSSL (https) for JSON-RPC connections</source> <translation>Usa OpenSSL (https) para las conexiones JSON-RPC </translation> </message> <message> - <location line="-30"/> + <location line="-34"/> <source>Server certificate file (default: server.cert)</source> <translation>Certificado del servidor (Predeterminado: server.cert) </translation> @@ -3923,7 +4132,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. </translation> </message> <message> - <location line="+16"/> + <location line="+20"/> <source>This help message</source> <translation>Este mensaje de ayuda </translation> @@ -3934,18 +4143,18 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>No es posible escuchar en el %s en este ordenador (bind returned error %d, %s)</translation> </message> <message> - <location line="-107"/> + <location line="-125"/> <source>Allow DNS lookups for -addnode, -seednode and -connect</source> <translation>Permite búsqueda DNS para addnode y connect </translation> </message> <message> - <location line="+60"/> + <location line="+66"/> <source>Loading addresses...</source> <translation>Cargando direcciónes...</translation> </message> <message> - <location line="-37"/> + <location line="-39"/> <source>Error loading wallet.dat: Wallet corrupted</source> <translation>Error cargando wallet.dat: Billetera corrupta</translation> </message> @@ -3955,22 +4164,22 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Error cargando wallet.dat: Billetera necesita una vercion reciente de Bitcoin</translation> </message> <message> - <location line="+98"/> + <location line="+112"/> <source>Wallet needed to be rewritten: restart Bitcoin to complete</source> <translation>La billetera necesita ser reescrita: reinicie Bitcoin para completar</translation> </message> <message> - <location line="-100"/> + <location line="-114"/> <source>Error loading wallet.dat</source> <translation>Error cargando wallet.dat</translation> </message> <message> - <location line="+31"/> + <location line="+32"/> <source>Invalid -proxy address: '%s'</source> <translation>Dirección -proxy invalida: '%s'</translation> </message> <message> - <location line="+56"/> + <location line="+69"/> <source>Unknown network specified in -onlynet: '%s'</source> <translation type="unfinished"/> </message> @@ -3980,7 +4189,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="-101"/> + <location line="-119"/> <source>Cannot resolve -bind address: '%s'</source> <translation type="unfinished"/> </message> @@ -3990,7 +4199,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+48"/> + <location line="+53"/> <source>Invalid amount for -paytxfee=<amount>: '%s'</source> <translation>Cantidad inválida para -paytxfee=<amount>: '%s'</translation> </message> @@ -4005,27 +4214,22 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Fondos insuficientes</translation> </message> <message> - <location line="+10"/> + <location line="+11"/> <source>Loading block index...</source> <translation>Cargando el index de bloques...</translation> </message> <message> - <location line="-62"/> + <location line="-68"/> <source>Add a node to connect to and attempt to keep the connection open</source> <translation>Agrega un nodo para conectarse and attempt to keep the connection open</translation> </message> <message> - <location line="-32"/> - <source>Unable to bind to %s on this computer. Bitcoin is probably already running.</source> - <translation>No es posible escuchar en el %s en este ordenador. Probablemente Bitcoin ya se está ejecutando.</translation> - </message> - <message> - <location line="+95"/> + <location line="+69"/> <source>Loading wallet...</source> <translation>Cargando cartera...</translation> </message> <message> - <location line="-56"/> + <location line="-62"/> <source>Cannot downgrade wallet</source> <translation type="unfinished"/> </message> @@ -4035,27 +4239,27 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+67"/> + <location line="+80"/> <source>Rescanning...</source> <translation>Rescaneando...</translation> </message> <message> - <location line="-58"/> + <location line="-67"/> <source>Done loading</source> <translation>Carga completa</translation> </message> <message> - <location line="+85"/> + <location line="+99"/> <source>To use the %s option</source> <translation>Para utilizar la opción %s</translation> </message> <message> - <location line="-77"/> + <location line="-91"/> <source>Error</source> <translation>Error</translation> </message> <message> - <location line="-35"/> + <location line="-41"/> <source>You must set rpcpassword=<password> in the configuration file: %s If the file does not exist, create it with owner-readable-only file permissions.</source> diff --git a/src/qt/locale/bitcoin_es_DO.ts b/src/qt/locale/bitcoin_es_DO.ts index 2126ff2230..c78a043113 100644 --- a/src/qt/locale/bitcoin_es_DO.ts +++ b/src/qt/locale/bitcoin_es_DO.ts @@ -1,4 +1,4 @@ -<?xml version="1.0" ?><!DOCTYPE TS><TS language="es_DO" version="2.0"> +<?xml version="1.0" ?><!DOCTYPE TS><TS language="es_DO" version="2.1"> <context> <name>AboutDialog</name> <message> @@ -39,6 +39,12 @@ Eric Young (eay@cryptsoft.com) y el software UPnP escrito por Thomas Bernard.</t <source>The Bitcoin Core developers</source> <translation>Los desarrolladores del Núcleo de Bitcoin</translation> </message> + <message> + <location line="+12"/> + <location line="+2"/> + <source> (%1-bit)</source> + <translation type="unfinished"/> + </message> </context> <context> <name>AddressBookPage</name> @@ -68,7 +74,7 @@ Eric Young (eay@cryptsoft.com) y el software UPnP escrito por Thomas Bernard.</t <translation>&Copiar</translation> </message> <message> - <location line="+52"/> + <location line="+58"/> <source>C&lose</source> <translation>&Cerrar</translation> </message> @@ -78,7 +84,7 @@ Eric Young (eay@cryptsoft.com) y el software UPnP escrito por Thomas Bernard.</t <translation>&Copiar dirección</translation> </message> <message> - <location filename="../forms/addressbookpage.ui" line="-41"/> + <location filename="../forms/addressbookpage.ui" line="-47"/> <source>Delete the currently selected address from the list</source> <translation>Borrar de la lista la dirección seleccionada</translation> </message> @@ -325,7 +331,7 @@ Eric Young (eay@cryptsoft.com) y el software UPnP escrito por Thomas Bernard.</t <context> <name>BitcoinGUI</name> <message> - <location filename="../bitcoingui.cpp" line="+295"/> + <location filename="../bitcoingui.cpp" line="+294"/> <source>Sign &message...</source> <translation>Firmar &mensaje...</translation> </message> @@ -340,12 +346,12 @@ Eric Young (eay@cryptsoft.com) y el software UPnP escrito por Thomas Bernard.</t <translation>&Vista general</translation> </message> <message> - <location line="-137"/> + <location line="-136"/> <source>Node</source> <translation>Nodo</translation> </message> <message> - <location line="+138"/> + <location line="+137"/> <source>Show general overview of wallet</source> <translation>Mostrar vista general del monedero</translation> </message> @@ -466,17 +472,17 @@ Eric Young (eay@cryptsoft.com) y el software UPnP escrito por Thomas Bernard.</t <translation>&Verificar mensaje...</translation> </message> <message> - <location line="+430"/> + <location line="+440"/> <source>Bitcoin</source> <translation>Bitcoin</translation> </message> <message> - <location line="-643"/> + <location line="-652"/> <source>Wallet</source> <translation>Monedero</translation> </message> <message> - <location line="+146"/> + <location line="+145"/> <source>&Send</source> <translation>&Enviar</translation> </message> @@ -532,18 +538,18 @@ Eric Young (eay@cryptsoft.com) y el software UPnP escrito por Thomas Bernard.</t <translation>Barra de pestañas</translation> </message> <message> - <location line="-284"/> - <location line="+376"/> + <location line="-283"/> + <location line="+375"/> <source>[testnet]</source> <translation>[testnet]</translation> </message> <message> - <location line="-401"/> + <location line="-400"/> <source>Bitcoin Core</source> <translation>Núcleo de Bitcoin</translation> </message> <message> - <location line="+163"/> + <location line="+162"/> <source>Request payments (generates QR codes and bitcoin: URIs)</source> <translation>Solicitar pagos (genera codigo QR y URL's de Bitcoin)</translation> </message> @@ -571,7 +577,7 @@ Eric Young (eay@cryptsoft.com) y el software UPnP escrito por Thomas Bernard.</t <message> <location line="+2"/> <source>&Command-line options</source> - <translation type="unfinished"/> + <translation>&Opciones de linea de comando</translation> </message> <message> <location line="+1"/> @@ -605,7 +611,7 @@ Eric Young (eay@cryptsoft.com) y el software UPnP escrito por Thomas Bernard.</t <translation>Procesados %1 bloques del historial de transacciones.</translation> </message> <message numerus="yes"> - <location line="+23"/> + <location line="+27"/> <source>%n hour(s)</source> <translation><numerusform>%n hora</numerusform><numerusform>%n horas</numerusform></translation> </message> @@ -616,10 +622,21 @@ Eric Young (eay@cryptsoft.com) y el software UPnP escrito por Thomas Bernard.</t </message> <message numerus="yes"> <location line="+4"/> + <location line="+6"/> <source>%n week(s)</source> <translation><numerusform>%n semana</numerusform><numerusform>%n semanas</numerusform></translation> </message> <message> + <location line="+0"/> + <source>%1 and %2</source> + <translation type="unfinished"/> + </message> + <message numerus="yes"> + <location line="+0"/> + <source>%n year(s)</source> + <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation> + </message> + <message> <location line="+4"/> <source>%1 behind</source> <translation>%1 atrás</translation> @@ -650,12 +667,12 @@ Eric Young (eay@cryptsoft.com) y el software UPnP escrito por Thomas Bernard.</t <translation>Información</translation> </message> <message> - <location line="-85"/> + <location line="-95"/> <source>Up to date</source> <translation>Actualizado</translation> </message> <message> - <location line="+34"/> + <location line="+44"/> <source>Catching up...</source> <translation>Actualizando...</translation> </message> @@ -693,7 +710,7 @@ Dirección: %4 <translation>El monedero está <b>cifrado</b> y actualmente <b>bloqueado</b></translation> </message> <message> - <location filename="../bitcoin.cpp" line="+438"/> + <location filename="../bitcoin.cpp" line="+441"/> <source>A fatal error occurred. Bitcoin can no longer continue safely and will quit.</source> <translation>Ha ocurrido un error crÃtico. Bitcoin ya no puede continuar con seguridad y se cerrará.</translation> </message> @@ -701,7 +718,7 @@ Dirección: %4 <context> <name>ClientModel</name> <message> - <location filename="../clientmodel.cpp" line="+119"/> + <location filename="../clientmodel.cpp" line="+128"/> <source>Network Alert</source> <translation>Alerta de red</translation> </message> @@ -754,7 +771,7 @@ Dirección: %4 <translation>Cambio:</translation> </message> <message> - <location line="+63"/> + <location line="+56"/> <source>(un)select all</source> <translation>(des)selecciona todos</translation> </message> @@ -769,7 +786,7 @@ Dirección: %4 <translation>Modo lista</translation> </message> <message> - <location line="+52"/> + <location line="+53"/> <source>Amount</source> <translation>Cantidad</translation> </message> @@ -799,7 +816,7 @@ Dirección: %4 <translation>Prioridad</translation> </message> <message> - <location filename="../coincontroldialog.cpp" line="+42"/> + <location filename="../coincontroldialog.cpp" line="+41"/> <source>Copy address</source> <translation>Copiar dirección</translation> </message> @@ -865,7 +882,7 @@ Dirección: %4 <translation>Copiar cambio</translation> </message> <message> - <location line="+323"/> + <location line="+332"/> <source>highest</source> <translation>lo más alto</translation> </message> @@ -917,10 +934,10 @@ Dirección: %4 <message> <location line="+31"/> <source>none</source> - <translation type="unfinished"/> + <translation>ninguno</translation> </message> <message> - <location line="+140"/> + <location line="+141"/> <source>Dust</source> <translation>Basura</translation> </message> @@ -958,7 +975,7 @@ Dirección: %4 <message> <location line="+1"/> <source>This label turns red, if the priority is smaller than "medium".</source> - <translation type="unfinished"/> + <translation>Esta etiqueta se convierte en rojo, si la prioridad es menor que "medio".</translation> </message> <message> <location line="+3"/> @@ -983,7 +1000,7 @@ Dirección: %4 </message> <message> <location line="+43"/> - <location line="+66"/> + <location line="+63"/> <source>(no label)</source> <translation>(sin etiqueta)</translation> </message> @@ -1102,7 +1119,7 @@ Dirección: %4 <translation type="unfinished"/> </message> <message> - <location filename="../utilitydialog.cpp" line="+38"/> + <location filename="../utilitydialog.cpp" line="+24"/> <source>Bitcoin Core</source> <translation>Núcleo de Bitcoin</translation> </message> @@ -1180,7 +1197,7 @@ Dirección: %4 <translation>Utilice un directorio de datos personalizado:</translation> </message> <message> - <location filename="../intro.cpp" line="+85"/> + <location filename="../intro.cpp" line="+82"/> <source>Bitcoin</source> <translation>Bitcoin</translation> </message> @@ -1246,7 +1263,7 @@ Dirección: %4 <translation>&Principal</translation> </message> <message> - <location line="+6"/> + <location line="+122"/> <source>Optional transaction fee per kB that helps make sure your transactions are processed quickly. Most transactions are 1 kB.</source> <translation>Tarifa de transacción opcional por kB que ayuda a asegurar que sus transacciones sean procesadas rápidamente. La mayorÃa de transacciones son de 1kB.</translation> </message> @@ -1256,7 +1273,7 @@ Dirección: %4 <translation>Comisión de &transacciones</translation> </message> <message> - <location line="+31"/> + <location line="-131"/> <source>Automatically start Bitcoin after logging in to the system.</source> <translation>Iniciar Bitcoin automáticamente al encender el sistema.</translation> </message> @@ -1271,14 +1288,9 @@ Dirección: %4 <translation type="unfinished"/> </message> <message> - <location line="+13"/> - <source>Set database cache size in megabytes (default: 25)</source> - <translation>Establecer el tamaño de caché de la base de datos en megabytes (predeterminado: 25)</translation> - </message> - <message> - <location line="+13"/> + <location line="+16"/> <source>MB</source> - <translation type="unfinished"/> + <translation>MB</translation> </message> <message> <location line="+27"/> @@ -1291,9 +1303,9 @@ Dirección: %4 <translation>Configura el número de hilos para el script de verificación (hasta 16, 0 = auto, <0 = leave that many cores free, por fecto: 0)</translation> </message> <message> - <location line="+58"/> + <location line="+153"/> <source>Connect to the Bitcoin network through a SOCKS proxy.</source> - <translation type="unfinished"/> + <translation>Conéctese a la red Bitcoin través de un proxy SOCKS.</translation> </message> <message> <location line="+3"/> @@ -1303,10 +1315,10 @@ Dirección: %4 <message> <location line="+34"/> <source>IP address of the proxy (e.g. IPv4: 127.0.0.1 / IPv6: ::1)</source> - <translation type="unfinished"/> + <translation>Dirección IP del proxy (ej. IPv4: 127.0.0.1 / IPv6: ::1)</translation> </message> <message> - <location line="+224"/> + <location line="+214"/> <source>Active command-line options that override above options:</source> <translation type="unfinished"/> </message> @@ -1321,12 +1333,37 @@ Dirección: %4 <translation>&Restablecer opciones</translation> </message> <message> - <location line="-323"/> + <location line="-313"/> <source>&Network</source> <translation>&Red</translation> </message> <message> - <location line="+6"/> + <location line="-95"/> + <source>W&allet</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+65"/> + <source>Expert</source> + <translation>Experto</translation> + </message> + <message> + <location line="+9"/> + <source>Enable coin &control features</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+7"/> + <source>If you disable the spending of unconfirmed change, the change from a transaction cannot be used until that transaction has at least one confirmation. This also affects how your balance is computed.</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+3"/> + <source>&Spend unconfirmed change</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+17"/> <source>Automatically open the Bitcoin client port on the router. This only works when your router supports UPnP and it is enabled.</source> <translation>Abrir automáticamente el puerto del cliente Bitcoin en el router. Esta opción solo funciona si el router admite UPnP y está activado.</translation> </message> @@ -1421,17 +1458,12 @@ Dirección: %4 <translation>&Mostrar las direcciones en la lista de transacciones</translation> </message> <message> - <location line="+7"/> + <location line="-262"/> <source>Whether to show coin control features or not.</source> <translation>Mostrar o no caracterÃsticas de control de moneda</translation> </message> <message> - <location line="+3"/> - <source>Display coin &control features (experts only)</source> - <translation>Mostrar moneda y caracterÃsticas de control (Avanzado)</translation> - </message> - <message> - <location line="+136"/> + <location line="+398"/> <source>&OK</source> <translation>&Aceptar</translation> </message> @@ -1441,17 +1473,17 @@ Dirección: %4 <translation>&Cancelar</translation> </message> <message> - <location filename="../optionsdialog.cpp" line="+67"/> + <location filename="../optionsdialog.cpp" line="+70"/> <source>default</source> <translation>predeterminado</translation> </message> <message> - <location line="+57"/> + <location line="+58"/> <source>none</source> - <translation type="unfinished"/> + <translation>Ninguna</translation> </message> <message> - <location line="+75"/> + <location line="+78"/> <source>Confirm options reset</source> <translation>Confirme el restablecimiento de las opciones</translation> </message> @@ -1459,7 +1491,7 @@ Dirección: %4 <location line="+1"/> <location line="+29"/> <source>Client restart required to activate changes.</source> - <translation type="unfinished"/> + <translation>Reinicio del cliente para activar cambios.</translation> </message> <message> <location line="-29"/> @@ -1469,7 +1501,7 @@ Dirección: %4 <message> <location line="+33"/> <source>This change would require a client restart.</source> - <translation type="unfinished"/> + <translation>Este cambio requiere reinicio por parte del cliente.</translation> </message> <message> <location line="+34"/> @@ -1491,19 +1523,14 @@ Dirección: %4 <translation>La información mostrada puede estar desactualizada. Su monedero se sincroniza automáticamente con la red Bitcoin después de que se haya establecido una conexión, pero este proceso aún no se ha completado.</translation> </message> <message> - <location line="-155"/> - <source>Unconfirmed:</source> - <translation>No confirmado(s):</translation> - </message> - <message> - <location line="-83"/> + <location line="-238"/> <source>Wallet</source> <translation>Monedero</translation> </message> <message> <location line="+51"/> - <source>Confirmed:</source> - <translation>Confirmado:</translation> + <source>Available:</source> + <translation type="unfinished"/> </message> <message> <location line="+16"/> @@ -1511,7 +1538,12 @@ Dirección: %4 <translation>Su balance actual gastable</translation> </message> <message> - <location line="+32"/> + <location line="+16"/> + <source>Pending:</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+16"/> <source>Total of transactions that have yet to be confirmed, and do not yet count toward the spendable balance</source> <translation>Total de transacciones que deben ser confirmadas, y que no cuentan con el balance gastable necesario</translation> </message> @@ -1644,18 +1676,18 @@ Dirección: %4 <context> <name>QObject</name> <message> - <location filename="../bitcoin.cpp" line="+71"/> - <location line="+11"/> + <location filename="../bitcoin.cpp" line="+63"/> + <location line="+14"/> <source>Bitcoin</source> <translation>Bitcoin</translation> </message> <message> - <location line="+1"/> + <location line="-13"/> <source>Error: Specified data directory "%1" does not exist.</source> <translation>Error: El directorio de datos especificado "%1" no existe.</translation> </message> <message> - <location line="-12"/> + <location line="+13"/> <source>Error: Invalid combination of -regtest and -testnet.</source> <translation>Error: Combinación no válida de -regtest y -testnet.</translation> </message> @@ -1706,7 +1738,7 @@ Dirección: %4 <location line="+36"/> <location line="+23"/> <location line="+23"/> - <location filename="../rpcconsole.cpp" line="+359"/> + <location filename="../rpcconsole.cpp" line="+373"/> <source>N/A</source> <translation>N/D</translation> </message> @@ -1728,7 +1760,7 @@ Dirección: %4 <message> <location line="+25"/> <source>General</source> - <translation type="unfinished"/> + <translation>General</translation> </message> <message> <location line="+53"/> @@ -1748,7 +1780,7 @@ Dirección: %4 <message> <location line="+7"/> <source>Name</source> - <translation type="unfinished"/> + <translation>Nombre</translation> </message> <message> <location line="+23"/> @@ -1802,11 +1834,13 @@ Dirección: %4 </message> <message> <location line="+64"/> + <location filename="../rpcconsole.cpp" line="-10"/> <source>In:</source> <translation>Dentro:</translation> </message> <message> <location line="+80"/> + <location filename="../rpcconsole.cpp" line="+1"/> <source>Out:</source> <translation>Fuera:</translation> </message> @@ -1831,7 +1865,7 @@ Dirección: %4 <translation>Borrar consola</translation> </message> <message> - <location filename="../rpcconsole.cpp" line="-30"/> + <location filename="../rpcconsole.cpp" line="-35"/> <source>Welcome to the Bitcoin RPC console.</source> <translation>Bienvenido a la consola RPC de Bitcoin</translation> </message> @@ -1846,7 +1880,7 @@ Dirección: %4 <translation>Escriba <b>help</b> para ver un resumen de los comandos disponibles.</translation> </message> <message> - <location line="+122"/> + <location line="+136"/> <source>%1 B</source> <translation>%1 B</translation> </message> @@ -1962,7 +1996,7 @@ Dirección: %4 <translation>Mostrar</translation> </message> <message> - <location line="+11"/> + <location line="+14"/> <source>Remove the selected entries from the list</source> <translation>Borrar de la lista las direcciónes actualmente seleccionadas</translation> </message> @@ -1972,7 +2006,7 @@ Dirección: %4 <translation>Eliminar</translation> </message> <message> - <location filename="../receivecoinsdialog.cpp" line="+38"/> + <location filename="../receivecoinsdialog.cpp" line="+39"/> <source>Copy label</source> <translation>Copiar etiqueta</translation> </message> @@ -2193,12 +2227,12 @@ Dirección: %4 <translation>Limpiar &todo</translation> </message> <message> - <location line="+52"/> + <location line="+58"/> <source>Balance:</source> <translation>Saldo:</translation> </message> <message> - <location line="-78"/> + <location line="-84"/> <source>Confirm the send action</source> <translation>Confirmar el envÃo</translation> </message> @@ -2675,6 +2709,11 @@ Dirección: %4 </message> <message> <location line="+6"/> + <source>conflicted</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+2"/> <source>%1/offline</source> <translation>%1/fuera de lÃnea</translation> </message> @@ -2836,12 +2875,12 @@ Dirección: %4 <translation>, todavÃa no se ha sido difundido satisfactoriamente</translation> </message> <message numerus="yes"> - <location line="-35"/> + <location line="-37"/> <source>Open for %n more block(s)</source> <translation><numerusform>Abrir para %n bloque más</numerusform><numerusform>Abrir para %n bloques más</numerusform></translation> </message> <message> - <location line="+70"/> + <location line="+72"/> <source>unknown</source> <translation>desconocido</translation> </message> @@ -2882,12 +2921,12 @@ Dirección: %4 <translation>Cantidad</translation> </message> <message> - <location line="+59"/> + <location line="+78"/> <source>Immature (%1 confirmations, will be available after %2)</source> <translation type="unfinished"/> </message> <message numerus="yes"> - <location line="+16"/> + <location line="-21"/> <source>Open for %n more block(s)</source> <translation><numerusform>Abrir para %n bloque más</numerusform><numerusform>Abrir para %n bloques más</numerusform></translation> </message> @@ -2897,23 +2936,12 @@ Dirección: %4 <translation>Abierto hasta %1</translation> </message> <message> - <location line="+3"/> - <source>Offline (%1 confirmations)</source> - <translation>Fuera de lÃnea (%1 confirmaciones)</translation> - </message> - <message> - <location line="+3"/> - <source>Unconfirmed (%1 of %2 confirmations)</source> - <translation>No confirmado (%1 de %2 confirmaciones)</translation> - </message> - <message> - <location line="-22"/> - <location line="+25"/> + <location line="+12"/> <source>Confirmed (%1 confirmations)</source> <translation>Confirmado (%1 confirmaciones)</translation> </message> <message> - <location line="-22"/> + <location line="+9"/> <source>This block was not received by any other nodes and will probably not be accepted!</source> <translation>Este bloque no ha sido recibido por otros nodos y probablemente no sea aceptado!</translation> </message> @@ -2923,7 +2951,27 @@ Dirección: %4 <translation>Generado pero no aceptado</translation> </message> <message> - <location line="+62"/> + <location line="-21"/> + <source>Offline</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+3"/> + <source>Unconfirmed</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+3"/> + <source>Confirming (%1 of %2 recommended confirmations)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+6"/> + <source>Conflicted</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+51"/> <source>Received with</source> <translation>Recibido con</translation> </message> @@ -2953,7 +3001,7 @@ Dirección: %4 <translation>(nd)</translation> </message> <message> - <location line="+199"/> + <location line="+190"/> <source>Transaction status. Hover over this field to show number of confirmations.</source> <translation>Estado de transacción. Pasa el ratón sobre este campo para ver el número de confirmaciones.</translation> </message> @@ -3082,7 +3130,7 @@ Dirección: %4 <translation>Mostrar detalles de la transacción</translation> </message> <message> - <location line="+142"/> + <location line="+140"/> <source>Export Transaction History</source> <translation>Exportar historial de transacciones</translation> </message> @@ -3219,12 +3267,12 @@ Dirección: %4 <context> <name>bitcoin-core</name> <message> - <location filename="../bitcoinstrings.cpp" line="+221"/> + <location filename="../bitcoinstrings.cpp" line="+226"/> <source>Usage:</source> <translation>Uso:</translation> </message> <message> - <location line="-54"/> + <location line="-55"/> <source>List commands</source> <translation>Muestra comandos </translation> @@ -3259,12 +3307,7 @@ Dirección: %4 <translation>Especificar directorio para los datos</translation> </message> <message> - <location line="-9"/> - <source>Set database cache size in megabytes (default: 25)</source> - <translation>Establecer el tamaño de caché de la base de datos en megabytes (predeterminado: 25)</translation> - </message> - <message> - <location line="-26"/> + <location line="-35"/> <source>Listen for connections on <port> (default: 8333 or testnet: 18333)</source> <translation>Escuchar conexiones en <puerto> (predeterminado: 8333 o testnet: 18333)</translation> </message> @@ -3284,50 +3327,50 @@ Dirección: %4 <translation>Especifique su propia dirección pública</translation> </message> <message> - <location line="+5"/> + <location line="+6"/> <source>Threshold for disconnecting misbehaving peers (default: 100)</source> <translation>Umbral para la desconexión de pares con mal comportamiento (predeterminado: 100)</translation> </message> <message> - <location line="-148"/> + <location line="-151"/> <source>Number of seconds to keep misbehaving peers from reconnecting (default: 86400)</source> <translation>Número de segundos en que se evita la reconexión de pares con mal comportamiento (predeterminado: 86400)</translation> </message> <message> - <location line="-36"/> + <location line="-38"/> <source>An error occurred while setting up the RPC port %u for listening on IPv4: %s</source> <translation>Ha ocurrido un error al configurar el puerto RPC %u para escucha en IPv4: %s</translation> </message> <message> - <location line="+34"/> + <location line="+36"/> <source>Listen for JSON-RPC connections on <port> (default: 8332 or testnet: 18332)</source> <translation>Escuchar conexiones JSON-RPC en <puerto> (predeterminado: 8332 o testnet:18332)</translation> </message> <message> - <location line="+45"/> + <location line="+46"/> <source>Accept command line and JSON-RPC commands</source> <translation>Aceptar comandos consola y JSON-RPC </translation> </message> <message> - <location line="+80"/> + <location line="+81"/> <source>Run in the background as a daemon and accept commands</source> <translation>Ejecutar en segundo plano como daemon y aceptar comandos </translation> </message> <message> - <location line="+39"/> + <location line="+40"/> <source>Use the test network</source> <translation>Usar la red de pruebas </translation> </message> <message> - <location line="-118"/> + <location line="-120"/> <source>Accept connections from outside (default: 1 if no -proxy or -connect)</source> <translation>Aceptar conexiones desde el exterior (predeterminado: 1 si no -proxy o -connect)</translation> </message> <message> - <location line="-95"/> + <location line="-98"/> <source>%s, you must set a rpcpassword in the configuration file: %s It is recommended you use the following random password: @@ -3367,12 +3410,7 @@ Por ejemplo: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Vincular a la dirección dada y escuchar siempre en ella. Utilice la notación [host]:port para IPv6</translation> </message> <message> - <location line="+3"/> - <source>Cannot obtain a lock on data directory %s. Bitcoin is probably already running.</source> - <translation>No se puede bloquear el directorio de datos %s. Probablemente Bitcoin ya se está ejecutando.</translation> - </message> - <message> - <location line="+3"/> + <location line="+6"/> <source>Enter regression test mode, which uses a special chain in which blocks can be solved instantly. This is intended for regression testing tools and app development.</source> <translation>Iniciar modo de prueba de regresión, el cuál utiliza una cadena especial en la cual los bloques pueden ser resueltos instantáneamente. Se utiliza para herramientas de prueba de regresión y desarrollo de aplicaciones.</translation> </message> @@ -3383,6 +3421,11 @@ Por ejemplo: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. </message> <message> <location line="+3"/> + <source>Error: Listening for incoming connections failed (listen returned error %d)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+2"/> <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> @@ -3402,7 +3445,12 @@ Por ejemplo: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Esta es una versión de pre-prueba - utilÃcela bajo su propio riesgo. No la utilice para usos comerciales o de minerÃa.</translation> </message> <message> - <location line="+5"/> + <location line="+3"/> + <source>Unable to bind to %s on this computer. Bitcoin Core is probably already running.</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+3"/> <source>Use separate SOCKS5 proxy to reach peers via Tor hidden services (default: -proxy)</source> <translation>Usar distintos proxys SOCKS5 para comunicarse vÃa Tor de forma anónima (Por defecto: -proxy)</translation> </message> @@ -3463,6 +3511,11 @@ Por ejemplo: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. </message> <message> <location line="+5"/> + <source>Clear list of wallet transactions (diagnostic tool; implies -rescan)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> <source>Connect only to the specified node(s)</source> <translation>Conectar sólo a los nodos (o nodo) especificados</translation> </message> @@ -3657,7 +3710,12 @@ Por ejemplo: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Enviar comando a servidor Bitcoin</translation> </message> <message> - <location line="+7"/> + <location line="+5"/> + <source>Set database cache size in megabytes (%d to %d, default: %d)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+2"/> <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> @@ -3673,6 +3731,11 @@ Por ejemplo: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. </message> <message> <location line="+2"/> + <source>Spend unconfirmed change when sending transactions (default: 1)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> <source>Start Bitcoin server</source> <translation>Iniciar servidor Bitcoin</translation> </message> @@ -3722,12 +3785,17 @@ Por ejemplo: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Usted necesita reconstruir la base de datos utilizando -reindex para cambiar -txindex</translation> </message> <message> - <location line="-79"/> + <location line="-80"/> <source>Imports blocks from external blk000??.dat file</source> <translation>Importa los bloques desde un archivo blk000??.dat externo</translation> </message> <message> - <location line="-105"/> + <location line="-126"/> + <source>Cannot obtain a lock on data directory %s. Bitcoin Core is probably already running.</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+19"/> <source>Execute command when a relevant alert is received or we see a really long fork (%s in cmd is replaced by message)</source> <translation>Ejecutar un comando cuando se reciba una alerta importante o cuando veamos un fork demasiado largo (%s en cmd se reemplazará por el mensaje)</translation> </message> @@ -3747,7 +3815,7 @@ Por ejemplo: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Configura el número de hilos para el script de verificación (hasta 16, 0 = auto, <0 = leave that many cores free, por fecto: 0)</translation> </message> <message> - <location line="+89"/> + <location line="+91"/> <source>Information</source> <translation>Información</translation> </message> @@ -3817,7 +3885,7 @@ Por ejemplo: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Especificar el tiempo máximo de conexión en milisegundos (predeterminado: 5000)</translation> </message> <message> - <location line="+6"/> + <location line="+7"/> <source>System error: </source> <translation>Error de sistema: </translation> </message> @@ -3864,6 +3932,11 @@ Por ejemplo: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. </message> <message> <location line="+2"/> + <source>Zapping all transactions from wallet...</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> <source>version</source> <translation>versión</translation> </message> @@ -3873,35 +3946,35 @@ Por ejemplo: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>wallet.dat corrupto. Ha fallado la recuperación.</translation> </message> <message> - <location line="-58"/> + <location line="-60"/> <source>Password for JSON-RPC connections</source> <translation>Contraseña para las conexiones JSON-RPC </translation> </message> <message> - <location line="-70"/> + <location line="-71"/> <source>Allow JSON-RPC connections from specified IP address</source> <translation>Permitir conexiones JSON-RPC desde la dirección IP especificada </translation> </message> <message> - <location line="+80"/> + <location line="+81"/> <source>Send commands to node running on <ip> (default: 127.0.0.1)</source> <translation>Enviar comando al nodo situado en <ip> (predeterminado: 127.0.0.1) </translation> </message> <message> - <location line="-132"/> + <location line="-134"/> <source>Execute command when the best block changes (%s in cmd is replaced by block hash)</source> <translation>Ejecutar un comando cuando cambia el mejor bloque (%s en cmd se sustituye por el hash de bloque)</translation> </message> <message> - <location line="+161"/> + <location line="+164"/> <source>Upgrade wallet to latest format</source> <translation>Actualizar el monedero al último formato</translation> </message> <message> - <location line="-24"/> + <location line="-25"/> <source>Set key pool size to <n> (default: 100)</source> <translation>Ajustar el número de claves en reserva <n> (predeterminado: 100) </translation> @@ -3912,13 +3985,13 @@ Por ejemplo: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Volver a examinar la cadena de bloques en busca de transacciones del monedero perdidas</translation> </message> <message> - <location line="+38"/> + <location line="+39"/> <source>Use OpenSSL (https) for JSON-RPC connections</source> <translation>Usar OpenSSL (https) para las conexiones JSON-RPC </translation> </message> <message> - <location line="-30"/> + <location line="-31"/> <source>Server certificate file (default: server.cert)</source> <translation>Certificado del servidor (predeterminado: server.cert) </translation> @@ -3930,7 +4003,7 @@ Por ejemplo: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. </translation> </message> <message> - <location line="+16"/> + <location line="+17"/> <source>This help message</source> <translation>Este mensaje de ayuda </translation> @@ -3941,12 +4014,12 @@ Por ejemplo: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>No es posible conectar con %s en este sistema (bind ha dado el error %d, %s)</translation> </message> <message> - <location line="-107"/> + <location line="-109"/> <source>Allow DNS lookups for -addnode, -seednode and -connect</source> <translation>Permitir búsquedas DNS para -addnode, -seednode y -connect</translation> </message> <message> - <location line="+60"/> + <location line="+61"/> <source>Loading addresses...</source> <translation>Cargando direcciones...</translation> </message> @@ -3961,12 +4034,12 @@ Por ejemplo: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Error al cargar wallet.dat: El monedero requiere una versión más reciente de Bitcoin</translation> </message> <message> - <location line="+98"/> + <location line="+99"/> <source>Wallet needed to be rewritten: restart Bitcoin to complete</source> <translation>El monedero ha necesitado ser reescrito. Reinicie Bitcoin para completar el proceso</translation> </message> <message> - <location line="-100"/> + <location line="-101"/> <source>Error loading wallet.dat</source> <translation>Error al cargar wallet.dat</translation> </message> @@ -3976,7 +4049,7 @@ Por ejemplo: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Dirección -proxy inválida: '%s'</translation> </message> <message> - <location line="+56"/> + <location line="+57"/> <source>Unknown network specified in -onlynet: '%s'</source> <translation>La red especificada en -onlynet '%s' es desconocida</translation> </message> @@ -3986,7 +4059,7 @@ Por ejemplo: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Solicitada versión de proxy -socks desconocida: %i</translation> </message> <message> - <location line="-101"/> + <location line="-103"/> <source>Cannot resolve -bind address: '%s'</source> <translation>No se puede resolver la dirección de -bind: '%s'</translation> </message> @@ -3996,7 +4069,7 @@ Por ejemplo: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>No se puede resolver la dirección de -externalip: '%s'</translation> </message> <message> - <location line="+48"/> + <location line="+49"/> <source>Invalid amount for -paytxfee=<amount>: '%s'</source> <translation>Cantidad inválida para -paytxfee=<amount>: '%s'</translation> </message> @@ -4016,22 +4089,17 @@ Por ejemplo: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Cargando el Ãndice de bloques...</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>Añadir un nodo al que conectarse y tratar de mantener la conexión abierta</translation> </message> <message> - <location line="-32"/> - <source>Unable to bind to %s on this computer. Bitcoin is probably already running.</source> - <translation>No es posible conectar con %s en este sistema. Probablemente Bitcoin ya está ejecutándose.</translation> - </message> - <message> - <location line="+95"/> + <location line="+64"/> <source>Loading wallet...</source> <translation>Cargando monedero...</translation> </message> <message> - <location line="-56"/> + <location line="-57"/> <source>Cannot downgrade wallet</source> <translation>No se puede rebajar el monedero</translation> </message> @@ -4041,7 +4109,7 @@ Por ejemplo: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>No se puede escribir la dirección predeterminada</translation> </message> <message> - <location line="+67"/> + <location line="+68"/> <source>Rescanning...</source> <translation>Reexplorando...</translation> </message> @@ -4051,17 +4119,17 @@ Por ejemplo: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Generado pero no aceptado</translation> </message> <message> - <location line="+85"/> + <location line="+86"/> <source>To use the %s option</source> <translation>Para utilizar la opción %s</translation> </message> <message> - <location line="-77"/> + <location line="-78"/> <source>Error</source> <translation>Error</translation> </message> <message> - <location line="-35"/> + <location line="-36"/> <source>You must set rpcpassword=<password> in the configuration file: %s If the file does not exist, create it with owner-readable-only file permissions.</source> diff --git a/src/qt/locale/bitcoin_fi.ts b/src/qt/locale/bitcoin_fi.ts index 0b4bb7e822..190eda041b 100644 --- a/src/qt/locale/bitcoin_fi.ts +++ b/src/qt/locale/bitcoin_fi.ts @@ -4,12 +4,12 @@ <message> <location filename="../forms/aboutdialog.ui" line="+14"/> <source>About Bitcoin Core</source> - <translation type="unfinished"/> + <translation>Tietoja Bitcoin Core</translation> </message> <message> <location line="+39"/> <source><b>Bitcoin Core</b> version</source> - <translation type="unfinished"/> + <translation><b>Bitcoin Core</b> versio</translation> </message> <message> <location line="+57"/> @@ -35,13 +35,13 @@ Tämä ohjelma sisältää OpenSSL projektin OpenSSL työkalupakin (http://www.o <message> <location line="+0"/> <source>The Bitcoin Core developers</source> - <translation type="unfinished"/> + <translation>Bitcoin Core kehittäjät</translation> </message> <message> <location line="+12"/> <location line="+2"/> - <source> (%1-bit)</source> - <translation type="unfinished"/> + <source>(%1-bit)</source> + <translation>(%1-bit)</translation> </message> </context> <context> @@ -59,7 +59,7 @@ Tämä ohjelma sisältää OpenSSL projektin OpenSSL työkalupakin (http://www.o <message> <location line="+3"/> <source>&New</source> - <translation type="unfinished"/> + <translation>&Uusi</translation> </message> <message> <location line="+11"/> @@ -69,12 +69,12 @@ Tämä ohjelma sisältää OpenSSL projektin OpenSSL työkalupakin (http://www.o <message> <location line="+3"/> <source>&Copy</source> - <translation type="unfinished"/> + <translation>&Kopioi</translation> </message> <message> - <location line="+52"/> + <location line="+58"/> <source>C&lose</source> - <translation type="unfinished"/> + <translation>&Sulje</translation> </message> <message> <location filename="../addressbookpage.cpp" line="+74"/> @@ -82,7 +82,7 @@ Tämä ohjelma sisältää OpenSSL projektin OpenSSL työkalupakin (http://www.o <translation>&Kopioi Osoite</translation> </message> <message> - <location filename="../forms/addressbookpage.ui" line="-41"/> + <location filename="../forms/addressbookpage.ui" line="-47"/> <source>Delete the currently selected address from the list</source> <translation>Poista valittu osoite listalta</translation> </message> @@ -94,7 +94,7 @@ Tämä ohjelma sisältää OpenSSL projektin OpenSSL työkalupakin (http://www.o <message> <location line="+3"/> <source>&Export</source> - <translation type="unfinished"/> + <translation>&Vie...</translation> </message> <message> <location line="-27"/> @@ -104,37 +104,37 @@ Tämä ohjelma sisältää OpenSSL projektin OpenSSL työkalupakin (http://www.o <message> <location filename="../addressbookpage.cpp" line="-30"/> <source>Choose the address to send coins to</source> - <translation type="unfinished"/> + <translation>Valitse osoite johon lähetetään kolikoita</translation> </message> <message> <location line="+1"/> <source>Choose the address to receive coins with</source> - <translation type="unfinished"/> + <translation>Valitse osoite jolla vastaanotetaan kolikoita</translation> </message> <message> <location line="+5"/> <source>C&hoose</source> - <translation type="unfinished"/> + <translation>&Valitse</translation> </message> <message> <location line="+6"/> <source>Sending addresses</source> - <translation type="unfinished"/> + <translation>Lähettävä osoite</translation> </message> <message> <location line="+1"/> <source>Receiving addresses</source> - <translation type="unfinished"/> + <translation>Vastaanottava osoite</translation> </message> <message> <location line="+7"/> <source>These are your Bitcoin addresses for sending payments. Always check the amount and the receiving address before sending coins.</source> - <translation type="unfinished"/> + <translation>Nämä ovat sinun Bitcoin osoitteita maksujen lähetykseen. Tarkista aina rahan määrä ja vastaanottajan osoite ennenkuin lähetät kolikkoja.</translation> </message> <message> <location line="+4"/> <source>These are your Bitcoin addresses for receiving payments. It is recommended to use a new receiving address for each transaction.</source> - <translation type="unfinished"/> + <translation>Nämä ovat sinun Bitcoin-osoitteesi suoritusten vastaanottamiseen. Suositellaan että annat uuden osoitteen kullekin rahansiirrolle</translation> </message> <message> <location line="+7"/> @@ -149,7 +149,7 @@ Tämä ohjelma sisältää OpenSSL projektin OpenSSL työkalupakin (http://www.o <message> <location line="+194"/> <source>Export Address List</source> - <translation type="unfinished"/> + <translation>Vie osoitekirja</translation> </message> <message> <location line="+1"/> @@ -159,12 +159,12 @@ Tämä ohjelma sisältää OpenSSL projektin OpenSSL työkalupakin (http://www.o <message> <location line="+13"/> <source>Exporting Failed</source> - <translation type="unfinished"/> + <translation>Vienti epäonnistui</translation> </message> <message> <location line="+1"/> <source>There was an error trying to save the address list to %1.</source> - <translation type="unfinished"/> + <translation>Osoitelistan tallennuksessa tapahtui virhe tiedostoon %1.</translation> </message> </context> <context> @@ -205,7 +205,7 @@ Tämä ohjelma sisältää OpenSSL projektin OpenSSL työkalupakin (http://www.o <message> <location line="+14"/> <source>Repeat new passphrase</source> - <translation>Kiroita uusi tunnuslause uudelleen</translation> + <translation>Kirjoita uusi tunnuslause uudelleen</translation> </message> <message> <location filename="../askpassphrasedialog.cpp" line="+40"/> @@ -329,7 +329,7 @@ Tämä ohjelma sisältää OpenSSL projektin OpenSSL työkalupakin (http://www.o <context> <name>BitcoinGUI</name> <message> - <location filename="../bitcoingui.cpp" line="+295"/> + <location filename="../bitcoingui.cpp" line="+294"/> <source>Sign &message...</source> <translation>&Allekirjoita viesti...</translation> </message> @@ -344,12 +344,12 @@ Tämä ohjelma sisältää OpenSSL projektin OpenSSL työkalupakin (http://www.o <translation>&Yleisnäkymä</translation> </message> <message> - <location line="-137"/> + <location line="-136"/> <source>Node</source> - <translation type="unfinished"/> + <translation>Solmu</translation> </message> <message> - <location line="+138"/> + <location line="+137"/> <source>Show general overview of wallet</source> <translation>Lompakon tilanteen yleiskatsaus</translation> </message> @@ -412,17 +412,17 @@ Tämä ohjelma sisältää OpenSSL projektin OpenSSL työkalupakin (http://www.o <message> <location line="+10"/> <source>&Sending addresses...</source> - <translation type="unfinished"/> + <translation>&Lähetysosoitteet...</translation> </message> <message> <location line="+2"/> <source>&Receiving addresses...</source> - <translation type="unfinished"/> + <translation>&Vastaanotto-osoitteet...</translation> </message> <message> <location line="+3"/> <source>Open &URI...</source> - <translation type="unfinished"/> + <translation>Avaa &URI...</translation> </message> <message> <location line="+325"/> @@ -470,17 +470,17 @@ Tämä ohjelma sisältää OpenSSL projektin OpenSSL työkalupakin (http://www.o <translation>Varmista &viesti...</translation> </message> <message> - <location line="+430"/> + <location line="+440"/> <source>Bitcoin</source> <translation>Bitcoin</translation> </message> <message> - <location line="-643"/> + <location line="-652"/> <source>Wallet</source> <translation>Lompakko</translation> </message> <message> - <location line="+146"/> + <location line="+145"/> <source>&Send</source> <translation>&Lähetä</translation> </message> @@ -536,51 +536,51 @@ Tämä ohjelma sisältää OpenSSL projektin OpenSSL työkalupakin (http://www.o <translation>Välilehtipalkki</translation> </message> <message> - <location line="-284"/> - <location line="+376"/> + <location line="-283"/> + <location line="+375"/> <source>[testnet]</source> <translation>[testnet]</translation> </message> <message> - <location line="-401"/> + <location line="-400"/> <source>Bitcoin Core</source> <translation>Bitcoin-ydin</translation> </message> <message> - <location line="+163"/> + <location line="+162"/> <source>Request payments (generates QR codes and bitcoin: URIs)</source> - <translation type="unfinished"/> + <translation>Pyydä maksuja (Luo QR koodit ja bitcoin: URIt)</translation> </message> <message> <location line="+29"/> <location line="+2"/> <source>&About Bitcoin Core</source> - <translation type="unfinished"/> + <translation>&Tietoja Bitcoin Core</translation> </message> <message> <location line="+35"/> <source>Show the list of used sending addresses and labels</source> - <translation type="unfinished"/> + <translation>Näytä lähettämiseen käytettyjen osoitteiden ja nimien lista</translation> </message> <message> <location line="+2"/> <source>Show the list of used receiving addresses and labels</source> - <translation type="unfinished"/> + <translation>Näytä vastaanottamiseen käytettyjen osoitteiden ja nimien lista</translation> </message> <message> <location line="+3"/> <source>Open a bitcoin: URI or payment request</source> - <translation type="unfinished"/> + <translation>Avaa bitcoin: URI tai maksupyyntö</translation> </message> <message> <location line="+2"/> <source>&Command-line options</source> - <translation type="unfinished"/> + <translation>&Komentorivin valinnat</translation> </message> <message> <location line="+1"/> <source>Show the Bitcoin Core help message to get a list with possible Bitcoin command-line options</source> - <translation type="unfinished"/> + <translation>Näytä Bitcoin Core ohjeet saadaksesi listan mahdollisista Bitcoinin komentorivivalinnoista</translation> </message> <message> <location line="+159"/> @@ -596,12 +596,12 @@ Tämä ohjelma sisältää OpenSSL projektin OpenSSL työkalupakin (http://www.o <message> <location line="+22"/> <source>No block source available...</source> - <translation type="unfinished"/> + <translation>Lohkojen lähdettä ei saatavilla...</translation> </message> <message> <location line="+12"/> <source>Processed %1 of %2 (estimated) blocks of transaction history.</source> - <translation type="unfinished"/> + <translation>Käsitelty %1 of %2 (arviolta) rahansiirtohistorian lohkoa.</translation> </message> <message> <location line="+4"/> @@ -609,34 +609,35 @@ Tämä ohjelma sisältää OpenSSL projektin OpenSSL työkalupakin (http://www.o <translation>Käsitelty %1 lohkoa rahansiirtohistoriasta</translation> </message> <message numerus="yes"> - <location line="+23"/> + <location line="+27"/> <source>%n hour(s)</source> <translation><numerusform>%n tunti</numerusform><numerusform>%n tuntia</numerusform></translation> </message> <message numerus="yes"> <location line="+4"/> <source>%n day(s)</source> - <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation> + <translation><numerusform>%n päivä</numerusform><numerusform>%n päivää</numerusform></translation> </message> <message numerus="yes"> <location line="+4"/> + <location line="+6"/> <source>%n week(s)</source> <translation><numerusform>%n viikko</numerusform><numerusform>%n viikkoa</numerusform></translation> </message> <message> <location line="+0"/> <source>%1 and %2</source> - <translation type="unfinished"/> + <translation>%1 ja %2</translation> </message> <message numerus="yes"> <location line="+0"/> <source>%n year(s)</source> - <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation> + <translation><numerusform>%n vuosi</numerusform><numerusform>%n vuotta</numerusform></translation> </message> <message> <location line="+4"/> <source>%1 behind</source> - <translation type="unfinished"/> + <translation>%1 jäljessä</translation> </message> <message> <location line="+21"/> @@ -646,7 +647,7 @@ Tämä ohjelma sisältää OpenSSL projektin OpenSSL työkalupakin (http://www.o <message> <location line="+2"/> <source>Transactions after this will not yet be visible.</source> - <translation type="unfinished"/> + <translation>Tämän jälkeiset rahansiirrot eivät ole vielä näkyvissä.</translation> </message> <message> <location line="+27"/> @@ -664,12 +665,12 @@ Tämä ohjelma sisältää OpenSSL projektin OpenSSL työkalupakin (http://www.o <translation>Tietoa</translation> </message> <message> - <location line="-85"/> + <location line="-95"/> <source>Up to date</source> <translation>Rahansiirtohistoria on ajan tasalla</translation> </message> <message> - <location line="+34"/> + <location line="+44"/> <source>Catching up...</source> <translation>Saavutetaan verkkoa...</translation> </message> @@ -706,7 +707,7 @@ Osoite: %4</translation> <translation>Lompakko on <b>salattu</b> ja tällä hetkellä <b>lukittuna</b></translation> </message> <message> - <location filename="../bitcoin.cpp" line="+435"/> + <location filename="../bitcoin.cpp" line="+443"/> <source>A fatal error occurred. Bitcoin can no longer continue safely and will quit.</source> <translation>Peruuttamaton virhe on tapahtunut. Bitcoin ei voi enää jatkaa turvallisesti ja sammutetaan.</translation> </message> @@ -714,7 +715,7 @@ Osoite: %4</translation> <context> <name>ClientModel</name> <message> - <location filename="../clientmodel.cpp" line="+119"/> + <location filename="../clientmodel.cpp" line="+128"/> <source>Network Alert</source> <translation>Verkkohälytys</translation> </message> @@ -724,17 +725,17 @@ Osoite: %4</translation> <message> <location filename="../forms/coincontroldialog.ui" line="+14"/> <source>Coin Control Address Selection</source> - <translation type="unfinished"/> + <translation>Kolikkokontrollin osoitteen valinta</translation> </message> <message> <location line="+34"/> <source>Quantity:</source> - <translation type="unfinished"/> + <translation>Määrä:</translation> </message> <message> <location line="+29"/> <source>Bytes:</source> - <translation type="unfinished"/> + <translation>Tavuja:</translation> </message> <message> <location line="+45"/> @@ -744,42 +745,42 @@ Osoite: %4</translation> <message> <location line="+29"/> <source>Priority:</source> - <translation type="unfinished"/> + <translation>Prioriteetti:</translation> </message> <message> <location line="+45"/> <source>Fee:</source> - <translation type="unfinished"/> + <translation>Palkkio:</translation> </message> <message> <location line="+32"/> <source>Low Output:</source> - <translation type="unfinished"/> + <translation>Pieni Tuotos</translation> </message> <message> <location line="+48"/> <source>After Fee:</source> - <translation type="unfinished"/> + <translation>Palkkion jälkeen:</translation> </message> <message> <location line="+32"/> <source>Change:</source> - <translation type="unfinished"/> + <translation>Vaihtoraha:</translation> </message> <message> <location line="+56"/> <source>(un)select all</source> - <translation type="unfinished"/> + <translation>(epä)valitse kaikki</translation> </message> <message> <location line="+13"/> <source>Tree mode</source> - <translation type="unfinished"/> + <translation>Puurakenne</translation> </message> <message> <location line="+16"/> <source>List mode</source> - <translation type="unfinished"/> + <translation>Listarakenne</translation> </message> <message> <location line="+53"/> @@ -799,7 +800,7 @@ Osoite: %4</translation> <message> <location line="+5"/> <source>Confirmations</source> - <translation type="unfinished"/> + <translation>Vahvistuksia</translation> </message> <message> <location line="+3"/> @@ -809,10 +810,10 @@ Osoite: %4</translation> <message> <location line="+5"/> <source>Priority</source> - <translation type="unfinished"/> + <translation>Prioriteetti</translation> </message> <message> - <location filename="../coincontroldialog.cpp" line="+42"/> + <location filename="../coincontroldialog.cpp" line="+41"/> <source>Copy address</source> <translation>Kopioi osoite</translation> </message> @@ -830,185 +831,185 @@ Osoite: %4</translation> <message> <location line="-25"/> <source>Copy transaction ID</source> - <translation type="unfinished"/> + <translation>Kopioi siirtotunnus</translation> </message> <message> <location line="+1"/> <source>Lock unspent</source> - <translation type="unfinished"/> + <translation>Lukitse käyttämättömät</translation> </message> <message> <location line="+1"/> <source>Unlock unspent</source> - <translation type="unfinished"/> + <translation>Avaa käyttämättömät</translation> </message> <message> <location line="+22"/> <source>Copy quantity</source> - <translation type="unfinished"/> + <translation>Kopioi määrä</translation> </message> <message> <location line="+2"/> <source>Copy fee</source> - <translation type="unfinished"/> + <translation>Kopioi palkkio</translation> </message> <message> <location line="+1"/> <source>Copy after fee</source> - <translation type="unfinished"/> + <translation>Kopioi palkkion jälkeen</translation> </message> <message> <location line="+1"/> <source>Copy bytes</source> - <translation type="unfinished"/> + <translation>Kopioi tavut</translation> </message> <message> <location line="+1"/> <source>Copy priority</source> - <translation type="unfinished"/> + <translation>Kopioi prioriteetti</translation> </message> <message> <location line="+1"/> <source>Copy low output</source> - <translation type="unfinished"/> + <translation>Kopioi pieni tuotos</translation> </message> <message> <location line="+1"/> <source>Copy change</source> - <translation type="unfinished"/> + <translation>Kopioi vaihtoraha</translation> </message> <message> - <location line="+323"/> + <location line="+332"/> <source>highest</source> - <translation type="unfinished"/> + <translation>korkein</translation> </message> <message> <location line="+1"/> <source>higher</source> - <translation type="unfinished"/> + <translation>korkeampi</translation> </message> <message> <location line="+1"/> <source>high</source> - <translation type="unfinished"/> + <translation>korkea</translation> </message> <message> <location line="+1"/> <source>medium-high</source> - <translation type="unfinished"/> + <translation>keski-korkea</translation> </message> <message> <location line="+1"/> <source>medium</source> - <translation type="unfinished"/> + <translation>keskisuuri</translation> </message> <message> <location line="+4"/> <source>low-medium</source> - <translation type="unfinished"/> + <translation>pieni-keskisuuri</translation> </message> <message> <location line="+1"/> <source>low</source> - <translation type="unfinished"/> + <translation>pieni</translation> </message> <message> <location line="+1"/> <source>lower</source> - <translation type="unfinished"/> + <translation>pienempi</translation> </message> <message> <location line="+1"/> <source>lowest</source> - <translation type="unfinished"/> + <translation>pienin</translation> </message> <message> <location line="+11"/> <source>(%1 locked)</source> - <translation type="unfinished"/> + <translation>(%1 lukittu)</translation> </message> <message> - <location line="+31"/> + <location line="+32"/> <source>none</source> - <translation type="unfinished"/> + <translation>ei mitään</translation> </message> <message> <location line="+141"/> <source>Dust</source> - <translation type="unfinished"/> + <translation>Tomu</translation> </message> <message> <location line="+0"/> <source>yes</source> - <translation type="unfinished"/> + <translation>kyllä</translation> </message> <message> <location line="+0"/> <source>no</source> - <translation type="unfinished"/> + <translation>ei</translation> </message> <message> <location line="+10"/> <source>This label turns red, if the transaction size is greater than 1000 bytes.</source> - <translation type="unfinished"/> + <translation>Tämä nimi muuttuu punaiseksi jos rahansiirron koko on suurempi kuin 1000 tavua</translation> </message> <message> <location line="+1"/> <location line="+5"/> <source>This means a fee of at least %1 per kB is required.</source> - <translation type="unfinished"/> + <translation>Tämä tarkoittaa että vähintään %1 per kB palkkio on pakollinen.</translation> </message> <message> <location line="-4"/> <source>Can vary +/- 1 byte per input.</source> - <translation type="unfinished"/> + <translation>Voi vaihdella +/- 1 tavu per syöte</translation> </message> <message> <location line="+2"/> <source>Transactions with higher priority are more likely to get included into a block.</source> - <translation type="unfinished"/> + <translation>Rahansiirrot korkeammalla prioriteetilla sisällytetään varmemmin lohkoon.</translation> </message> <message> <location line="+1"/> <source>This label turns red, if the priority is smaller than "medium".</source> - <translation type="unfinished"/> + <translation>Tämä nimi muuttuu punaiseksi jos prioriteetti on pienempi kuin "keskisuuri".</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>Tämä nimi muuttuu punaiseksi jos vastaanottaja saa pienemmän määrän kuin %1</translation> </message> <message> <location line="+1"/> <location line="+4"/> <source>This means a fee of at least %1 is required.</source> - <translation type="unfinished"/> + <translation>Tämä tarkoittaa että vähintään %1 palkkio on pakollinen.</translation> </message> <message> <location line="-3"/> <source>Amounts below 0.546 times the minimum relay fee are shown as dust.</source> - <translation type="unfinished"/> + <translation>Maksumäärät alle 0.546 kertaa vähimmäispalkkion näytetään tomuna.</translation> </message> <message> <location line="+2"/> <source>This label turns red, if the change is smaller than %1.</source> - <translation type="unfinished"/> + <translation>Tämä nimi muuttuu punaiseksi jos vaihtoraha on alle %1.</translation> </message> <message> <location line="+43"/> - <location line="+66"/> + <location line="+61"/> <source>(no label)</source> <translation>(ei nimeä)</translation> </message> <message> - <location line="-9"/> + <location line="-7"/> <source>change from %1 (%2)</source> - <translation type="unfinished"/> + <translation>Vaihda %1 (%2)</translation> </message> <message> <location line="+1"/> <source>(change)</source> - <translation type="unfinished"/> + <translation>(vaihtoraha)</translation> </message> </context> <context> @@ -1026,12 +1027,12 @@ Osoite: %4</translation> <message> <location line="+10"/> <source>The label associated with this address list entry</source> - <translation type="unfinished"/> + <translation>Tähän osoitteeseen liitetty nimi</translation> </message> <message> <location line="+17"/> <source>The address associated with this address list entry. This can only be modified for sending addresses.</source> - <translation type="unfinished"/> + <translation>Osoite liitettynä tähän osoitekirjan alkioon. Tämä voidaan muokata vain lähetysosoitteissa.</translation> </message> <message> <location line="-10"/> @@ -1082,7 +1083,7 @@ Osoite: %4</translation> <context> <name>FreespaceChecker</name> <message> - <location filename="../intro.cpp" line="+65"/> + <location filename="../intro.cpp" line="+68"/> <source>A new data directory will be created.</source> <translation>Luodaan uusi kansio.</translation> </message> @@ -1094,7 +1095,7 @@ Osoite: %4</translation> <message> <location line="+2"/> <source>Directory already exists. Add %1 if you intend to create a new directory here.</source> - <translation type="unfinished"/> + <translation>Hakemisto on jo olemassa. Lisää %1 jos tarkoitus on luoda hakemisto tänne.</translation> </message> <message> <location line="+3"/> @@ -1104,7 +1105,7 @@ Osoite: %4</translation> <message> <location line="+7"/> <source>Cannot create data directory here.</source> - <translation type="unfinished"/> + <translation>Ei voida luoda data-hakemistoa tänne.</translation> </message> </context> <context> @@ -1112,7 +1113,7 @@ Osoite: %4</translation> <message> <location filename="../forms/helpmessagedialog.ui" line="+19"/> <source>Bitcoin Core - Command-line options</source> - <translation type="unfinished"/> + <translation>Bitcoin Core - Kometorivivalinnat</translation> </message> <message> <location filename="../utilitydialog.cpp" line="+24"/> @@ -1140,7 +1141,7 @@ Osoite: %4</translation> <translation>Käyttöliittymäasetukset</translation> </message> <message> - <location line="+1"/> + <location line="+2"/> <source>Set language, for example "de_DE" (default: system locale)</source> <translation>Set language, for example "de_DE" (default: system locale)</translation> </message> @@ -1151,13 +1152,18 @@ Osoite: %4</translation> </message> <message> <location line="+1"/> + <source>Set SSL root certificates for payment request (default: -system-)</source> + <translation>Aseta SSL root varmenne maksupyynnöille (oletus: -system-)</translation> + </message> + <message> + <location line="+1"/> <source>Show splash screen on startup (default: 1)</source> <translation>Näytä aloitusruutu käynnistettäessä (oletus: 1)</translation> </message> <message> - <location line="+1"/> + <location line="-4"/> <source>Choose data directory on startup (default: 0)</source> - <translation type="unfinished"/> + <translation>Valitse data-hakemisto käynnistyksessä (oletus: 0)</translation> </message> </context> <context> @@ -1170,17 +1176,17 @@ Osoite: %4</translation> <message> <location line="+9"/> <source>Welcome to Bitcoin Core.</source> - <translation type="unfinished"/> + <translation>Tervetuloa Bitcoin Core</translation> </message> <message> <location line="+26"/> <source>As this is the first time the program is launched, you can choose where Bitcoin Core will store its data.</source> - <translation type="unfinished"/> + <translation>Tämän on ensimmäinen kerta kun Bitcoin Core on käynnistetty joten voit valita data-hakemiston paikan.</translation> </message> <message> <location line="+10"/> <source>Bitcoin Core will download and store a copy of the Bitcoin block chain. At least %1GB of data will be stored in this directory, and it will grow over time. The wallet will also be stored in this directory.</source> - <translation type="unfinished"/> + <translation>Bitcoin Core lataa ja tallentaa kopion Bitcoinin lohkoketjusta. Vähintään %1GB dataa tullaan tallentamaan tähän hakemistoon ja tarve kasvaa ajan myötä. Lomakko tullaan myös tallentamaan tähän hakemistoon.</translation> </message> <message> <location line="+10"/> @@ -1193,29 +1199,29 @@ Osoite: %4</translation> <translation>Määritä oma kansio:</translation> </message> <message> - <location filename="../intro.cpp" line="+85"/> + <location filename="../intro.cpp" line="+82"/> <source>Bitcoin</source> <translation>Bitcoin</translation> </message> <message> <location line="+1"/> <source>Error: Specified data directory "%1" can not be created.</source> - <translation type="unfinished"/> + <translation>Virhe: Annettua data-hakemistoa "%1" ei voida luoda.</translation> </message> <message> - <location line="+19"/> + <location line="+24"/> <source>Error</source> <translation>Virhe</translation> </message> <message> <location line="+9"/> <source>GB of free space available</source> - <translation type="unfinished"/> + <translation>GB vapaata tilaa</translation> </message> <message> <location line="+3"/> <source>(of %1GB needed)</source> - <translation type="unfinished"/> + <translation>(tarvitaan %1GB)</translation> </message> </context> <context> @@ -1223,27 +1229,27 @@ Osoite: %4</translation> <message> <location filename="../forms/openuridialog.ui" line="+14"/> <source>Open URI</source> - <translation type="unfinished"/> + <translation>Avaa URI</translation> </message> <message> <location line="+6"/> <source>Open payment request from URI or file</source> - <translation type="unfinished"/> + <translation>Avaa maksupyyntö URI:sta tai tiedostosta</translation> </message> <message> <location line="+9"/> <source>URI:</source> - <translation type="unfinished"/> + <translation>URI:</translation> </message> <message> <location line="+11"/> <source>Select payment request file</source> - <translation type="unfinished"/> + <translation>Valitse maksupyynnön tiedosto</translation> </message> <message> <location filename="../openuridialog.cpp" line="+47"/> <source>Select payment request file to open</source> - <translation type="unfinished"/> + <translation>Valitse maksypyynnön tiedosto avattavaksi</translation> </message> </context> <context> @@ -1259,9 +1265,9 @@ Osoite: %4</translation> <translation>&Yleiset</translation> </message> <message> - <location line="+122"/> + <location line="+116"/> <source>Optional transaction fee per kB that helps make sure your transactions are processed quickly. Most transactions are 1 kB.</source> - <translation type="unfinished"/> + <translation>Valinnainen rahansiirtopalkkio per kB auttaa varmistamaan että rahansiirtosi prosessoidaan nopeasti. Useimmat rahansiirrot ovat alle 1 kB.</translation> </message> <message> <location line="+15"/> @@ -1269,7 +1275,7 @@ Osoite: %4</translation> <translation>Maksa rahansiirtopalkkio</translation> </message> <message> - <location line="-131"/> + <location line="-125"/> <source>Automatically start Bitcoin after logging in to the system.</source> <translation>Käynnistä Bitcoin kirjautumisen yhteydessä.</translation> </message> @@ -1281,75 +1287,85 @@ Osoite: %4</translation> <message> <location line="+9"/> <source>Size of &database cache</source> - <translation type="unfinished"/> + <translation>&Tietokannan välimuistin koko</translation> </message> <message> <location line="+16"/> <source>MB</source> - <translation type="unfinished"/> + <translation>MB</translation> </message> <message> <location line="+27"/> <source>Number of script &verification threads</source> - <translation type="unfinished"/> + <translation>Script &varmistuksen threadien määrä</translation> </message> <message> - <location line="+13"/> - <source>Set the number of script verification threads (up to 16, 0 = auto, <0 = leave that many cores free, default: 0)</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+107"/> - <source>&Spend unconfirmed change (experts only)</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+37"/> + <location line="+160"/> <source>Connect to the Bitcoin network through a SOCKS proxy.</source> - <translation type="unfinished"/> + <translation>Yhdistä Bitcoin-verkkoon SOCKS proxyn kautta.</translation> </message> <message> <location line="+3"/> <source>&Connect through SOCKS proxy (default proxy):</source> - <translation type="unfinished"/> + <translation>&Yhdistä SOCKS proxyn kautta (oletus proxy):</translation> </message> <message> <location line="+34"/> <source>IP address of the proxy (e.g. IPv4: 127.0.0.1 / IPv6: ::1)</source> - <translation type="unfinished"/> + <translation>IP osoite proxille (esim. IPv4: 127.0.0.1 / IPv6: ::1)</translation> </message> <message> - <location line="+224"/> + <location line="+214"/> <source>Active command-line options that override above options:</source> - <translation type="unfinished"/> + <translation>Aktiiviset komentorivivalinnat jotka ohittavat ylläolevat valinnat:</translation> </message> <message> <location line="+43"/> <source>Reset all client options to default.</source> - <translation type="unfinished"/> + <translation>Palauta kaikki asetukset takaisin alkuperäisiksi.</translation> </message> <message> <location line="+3"/> <source>&Reset Options</source> - <translation type="unfinished"/> + <translation>&Palauta asetukset</translation> </message> <message> - <location line="-323"/> + <location line="-313"/> <source>&Network</source> <translation>&Verkko</translation> </message> <message> - <location line="-86"/> + <location line="-131"/> + <source>(0 = auto, <0 = leave that many cores free)</source> + <translation>(0 = auto, <0 = jätä näin monta ydintä vapaaksi)</translation> + </message> + <message> + <location line="+36"/> <source>W&allet</source> - <translation type="unfinished"/> + <translation>&Lompakko</translation> </message> <message> - <location line="+52"/> + <location line="+65"/> + <source>Expert</source> + <translation>Expertti</translation> + </message> + <message> + <location line="+9"/> + <source>Enable coin &control features</source> + <translation>Ota käytöön &Kolikkokontrolli-ominaisuudet</translation> + </message> + <message> + <location line="+7"/> <source>If you disable the spending of unconfirmed change, the change from a transaction cannot be used until that transaction has at least one confirmation. This also affects how your balance is computed.</source> - <translation type="unfinished"/> + <translation>Jos poistat varmistamattomien vaihtorahojen käytön, rahansiirron vaihtorahaa ei voida käyttää ennen vähintään yhtä varmistusta. Tämä vaikuttaa myös kuinka taseesi lasketaan.</translation> </message> <message> - <location line="+40"/> + <location line="+3"/> + <source>&Spend unconfirmed change</source> + <translation>&Käytä varmistamattomia vaihtorahoja</translation> + </message> + <message> + <location line="+17"/> <source>Automatically open the Bitcoin client port on the router. This only works when your router supports UPnP and it is enabled.</source> <translation>Avaa Bitcoin-asiakasohjelman portti reitittimellä automaattisesti. Tämä toimii vain, jos reitittimesi tukee UPnP:tä ja se on käytössä.</translation> </message> @@ -1444,17 +1460,12 @@ Osoite: %4</translation> <translation>&Näytä osoitteet rahansiirrot listassa</translation> </message> <message> - <location line="+7"/> + <location line="-262"/> <source>Whether to show coin control features or not.</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+3"/> - <source>Display coin &control features (experts only)</source> - <translation type="unfinished"/> + <translation>Näytetäänkö kolikkokontrollin ominaisuuksia vai ei</translation> </message> <message> - <location line="+136"/> + <location line="+398"/> <source>&OK</source> <translation>&OK</translation> </message> @@ -1464,35 +1475,35 @@ Osoite: %4</translation> <translation>&Peruuta</translation> </message> <message> - <location filename="../optionsdialog.cpp" line="+70"/> + <location filename="../optionsdialog.cpp" line="+72"/> <source>default</source> <translation>oletus</translation> </message> <message> <location line="+58"/> <source>none</source> - <translation type="unfinished"/> + <translation>ei mitään</translation> </message> <message> - <location line="+78"/> + <location line="+80"/> <source>Confirm options reset</source> - <translation type="unfinished"/> + <translation>Varmista asetusten palautus</translation> </message> <message> <location line="+1"/> <location line="+29"/> <source>Client restart required to activate changes.</source> - <translation type="unfinished"/> + <translation>Ohjelman uudelleenkäynnistys aktivoi muutokset.</translation> </message> <message> <location line="-29"/> <source>Client will be shutdown, do you want to proceed?</source> - <translation type="unfinished"/> + <translation>Ohjelma lopetetaan. Haluatko jatkaa?</translation> </message> <message> <location line="+33"/> <source>This change would require a client restart.</source> - <translation type="unfinished"/> + <translation>Tämä muutos vaatii ohjelman uudelleenkäynnistyksen.</translation> </message> <message> <location line="+34"/> @@ -1521,22 +1532,22 @@ Osoite: %4</translation> <message> <location line="+51"/> <source>Available:</source> - <translation type="unfinished"/> + <translation>Käytettävissä:</translation> </message> <message> <location line="+16"/> <source>Your current spendable balance</source> - <translation type="unfinished"/> + <translation>Nykyinen käytettävissä oleva tase</translation> </message> <message> <location line="+16"/> <source>Pending:</source> - <translation type="unfinished"/> + <translation>Odotetaan:</translation> </message> <message> <location line="+16"/> <source>Total of transactions that have yet to be confirmed, and do not yet count toward the spendable balance</source> - <translation type="unfinished"/> + <translation>Varmistamattomien rahansiirtojen summa, jota ei lasketa käytettävissä olevaan taseeseen.</translation> </message> <message> <location line="+16"/> @@ -1551,7 +1562,7 @@ Osoite: %4</translation> <message> <location line="+16"/> <source>Total:</source> - <translation type="unfinished"/> + <translation>Yhteensä:</translation> </message> <message> <location line="+16"/> @@ -1586,7 +1597,7 @@ Osoite: %4</translation> <message> <location line="+96"/> <source>Requested payment amount of %1 is too small (considered dust).</source> - <translation type="unfinished"/> + <translation>Maksupyyntö %1 on liian pieni (huomioidaan tomuna).</translation> </message> <message> <location line="-221"/> @@ -1596,94 +1607,100 @@ Osoite: %4</translation> <location line="+18"/> <location line="+16"/> <source>Payment request error</source> - <translation type="unfinished"/> + <translation>Maksupyyntövirhe</translation> </message> <message> <location line="-353"/> <source>Cannot start bitcoin: click-to-pay handler</source> - <translation type="unfinished"/> + <translation>Ei voida käynnistää bitcoin: klikkaa-maksu käsittelijää</translation> </message> <message> <location line="+58"/> <source>Net manager warning</source> - <translation type="unfinished"/> + <translation>Verkkohallinnan varoitus</translation> </message> <message> <location line="+1"/> <source>Your active proxy doesn't support SOCKS5, which is required for payment requests via proxy.</source> - <translation type="unfinished"/> + <translation>Aktiivinen proxy ei tue SOCKS5, joka on pakollinen maksupyynnöissä proxyn kautta.</translation> </message> <message> <location line="+52"/> <source>Payment request fetch URL is invalid: %1</source> - <translation type="unfinished"/> + <translation>Maksupyynnön haku URL on virheellinen: %1</translation> </message> <message> <location line="+27"/> <source>Payment request file handling</source> - <translation type="unfinished"/> + <translation>Maksupyynnön tiedoston käsittely</translation> </message> <message> <location line="+1"/> <source>Payment request file can not be read or processed! This can be caused by an invalid payment request file.</source> - <translation type="unfinished"/> + <translation>Maksupyynnön tiedostoa ei voida lukea tai prosessoida! Tämä voi johtua virheellisestä maksupyyntötiedostosta.</translation> </message> <message> <location line="+73"/> <source>Unverified payment requests to custom payment scripts are unsupported.</source> - <translation type="unfinished"/> + <translation>Varmistamattomia maksupyyntöjä kustomoituun maksupalveluun ei tueta.</translation> </message> <message> <location line="+59"/> <source>Refund from %1</source> - <translation type="unfinished"/> + <translation>Maksupalautus %1:sta</translation> </message> <message> <location line="+43"/> <source>Error communicating with %1: %2</source> - <translation type="unfinished"/> + <translation>Virhe kommunikoidessa %1n kanssa: %2</translation> </message> <message> <location line="+24"/> <source>Payment request can not be parsed or processed!</source> - <translation type="unfinished"/> + <translation>Maksupyyntöä ei voida jäsentää tai prosessoida!</translation> </message> <message> <location line="+11"/> <source>Bad response from server %1</source> - <translation type="unfinished"/> + <translation>Huono vastaus palvelimelta %1</translation> </message> <message> <location line="+33"/> <source>Payment acknowledged</source> - <translation type="unfinished"/> + <translation>Rahansiirto tunnistettu</translation> </message> <message> <location line="-11"/> <source>Network request error</source> - <translation type="unfinished"/> + <translation>Tietoverkon pyyntövirhe</translation> </message> </context> <context> <name>QObject</name> <message> - <location filename="../bitcoin.cpp" line="+71"/> - <location line="+11"/> + <location filename="../bitcoin.cpp" line="+63"/> + <location line="+7"/> + <location line="+13"/> <source>Bitcoin</source> <translation>Bitcoin</translation> </message> <message> - <location line="+1"/> + <location line="-19"/> <source>Error: Specified data directory "%1" does not exist.</source> - <translation type="unfinished"/> + <translation>Virhe: Annettu data-hakemisto "%1" ei ole olemassa.</translation> </message> <message> - <location line="-12"/> + <location line="+7"/> + <source>Error: Cannot parse configuration file: %1. Only use key=value syntax.</source> + <translation>Virhe: Ei voida jäsentää asetustiedostoa: %1. Käytä vain avain=arvo syntaksia.</translation> + </message> + <message> + <location line="+12"/> <source>Error: Invalid combination of -regtest and -testnet.</source> - <translation type="unfinished"/> + <translation>Virhe: Virheellinen yhdistelmä -regtest ja -testnet.</translation> </message> <message> - <location filename="../guiutil.cpp" line="+82"/> + <location filename="../guiutil.cpp" line="+89"/> <source>Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source> <translation>Anna Bitcoin-osoite (esim. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation> </message> @@ -1693,12 +1710,12 @@ Osoite: %4</translation> <message> <location filename="../receiverequestdialog.cpp" line="+36"/> <source>&Save Image...</source> - <translation type="unfinished"/> + <translation>&Tallenna kuva</translation> </message> <message> <location line="+3"/> <source>&Copy Image</source> - <translation type="unfinished"/> + <translation>&Kopioi kuva</translation> </message> <message> <location line="+28"/> @@ -1708,7 +1725,7 @@ Osoite: %4</translation> <message> <location line="+0"/> <source>PNG Image (*.png)</source> - <translation type="unfinished"/> + <translation>PNG kuva (*.png)</translation> </message> </context> <context> @@ -1729,7 +1746,7 @@ Osoite: %4</translation> <location line="+36"/> <location line="+23"/> <location line="+23"/> - <location filename="../rpcconsole.cpp" line="+359"/> + <location filename="../rpcconsole.cpp" line="+373"/> <source>N/A</source> <translation>Ei saatavilla</translation> </message> @@ -1746,12 +1763,12 @@ Osoite: %4</translation> <message> <location line="-10"/> <source>Debug window</source> - <translation type="unfinished"/> + <translation>&Debug-ikkuna</translation> </message> <message> <location line="+25"/> <source>General</source> - <translation type="unfinished"/> + <translation>Yleinen</translation> </message> <message> <location line="+53"/> @@ -1811,27 +1828,29 @@ Osoite: %4</translation> <message> <location line="+72"/> <source>&Network Traffic</source> - <translation type="unfinished"/> + <translation>&Verkkoliikenne</translation> </message> <message> <location line="+52"/> <source>&Clear</source> - <translation type="unfinished"/> + <translation>&Tyhjennä</translation> </message> <message> <location line="+13"/> <source>Totals</source> - <translation type="unfinished"/> + <translation>Yhteensä</translation> </message> <message> <location line="+64"/> + <location filename="../rpcconsole.cpp" line="-10"/> <source>In:</source> - <translation type="unfinished"/> + <translation>Sisään:</translation> </message> <message> <location line="+80"/> + <location filename="../rpcconsole.cpp" line="+1"/> <source>Out:</source> - <translation type="unfinished"/> + <translation>Ulos:</translation> </message> <message> <location line="-521"/> @@ -1854,7 +1873,7 @@ Osoite: %4</translation> <translation>Tyhjennä konsoli</translation> </message> <message> - <location filename="../rpcconsole.cpp" line="-30"/> + <location filename="../rpcconsole.cpp" line="-35"/> <source>Welcome to the Bitcoin RPC console.</source> <translation>Tervetuloa Bitcoin RPC konsoliin.</translation> </message> @@ -1869,39 +1888,39 @@ Osoite: %4</translation> <translation>Kirjoita <b>help</b> nähdäksesi yleiskatsauksen käytettävissä olevista komennoista.</translation> </message> <message> - <location line="+122"/> + <location line="+136"/> <source>%1 B</source> - <translation type="unfinished"/> + <translation>%1 B</translation> </message> <message> <location line="+2"/> <source>%1 KB</source> - <translation type="unfinished"/> + <translation>%1 KB</translation> </message> <message> <location line="+2"/> <source>%1 MB</source> - <translation type="unfinished"/> + <translation>%1 MB</translation> </message> <message> <location line="+2"/> <source>%1 GB</source> - <translation type="unfinished"/> + <translation>%1 GB</translation> </message> <message> <location line="+7"/> <source>%1 m</source> - <translation type="unfinished"/> + <translation>%1 m</translation> </message> <message> <location line="+5"/> <source>%1 h</source> - <translation type="unfinished"/> + <translation>%1 h</translation> </message> <message> <location line="+2"/> <source>%1 h %2 m</source> - <translation type="unfinished"/> + <translation>%1 h %2 m</translation> </message> </context> <context> @@ -1909,7 +1928,7 @@ Osoite: %4</translation> <message> <location filename="../forms/receivecoinsdialog.ui" line="+107"/> <source>&Amount:</source> - <translation type="unfinished"/> + <translation>&Määrä</translation> </message> <message> <location line="-16"/> @@ -1919,90 +1938,90 @@ Osoite: %4</translation> <message> <location line="-37"/> <source>&Message:</source> - <translation type="unfinished"/> + <translation>&Viesti:</translation> </message> <message> <location line="-20"/> <source>Reuse one of the previously used receiving addresses. Reusing addresses has security and privacy issues. Do not use this unless re-generating a payment request made before.</source> - <translation type="unfinished"/> + <translation>Uudelleenkäytä yksi vanhoista vastaanotto-osoitteista. Uudelleenkäyttössä on turvallisuus- ja yksityisyysongelmia. Älä käytä tätä ellet ole uudelleenluomassa aikaisempaa maksupyyntöä.</translation> </message> <message> <location line="+3"/> <source>R&euse an existing receiving address (not recommended)</source> - <translation type="unfinished"/> + <translation>&Uudelleenkäytä vastaanotto-osoitetta (ei suositella)</translation> </message> <message> <location line="+14"/> <location line="+23"/> <source>An optional message to attach to the payment request, which will be displayed when the request is opened. Note: The message will not be sent with the payment over the Bitcoin network.</source> - <translation type="unfinished"/> + <translation>Valinnainen viesti liitetään maksupyyntöön ja näytetään avattaessa. Viestiä ei lähetetä Bitcoin-verkkoon.</translation> </message> <message> <location line="-7"/> <location line="+21"/> <source>An optional label to associate with the new receiving address.</source> - <translation type="unfinished"/> + <translation>Valinnainen nimi liitetään vastaanottavaan osoitteeseen.</translation> </message> <message> <location line="-7"/> <source>Use this form to request payments. All fields are <b>optional</b>.</source> - <translation type="unfinished"/> + <translation>Käytä lomaketta maksupyyntöihin. Kaikki kentät ovat <b>valinnaisia</b>.</translation> </message> <message> <location line="+23"/> <location line="+22"/> <source>An optional amount to request. Leave this empty or zero to not request a specific amount.</source> - <translation type="unfinished"/> + <translation>Valinnainen pyyntömäärä. Jätä tyhjäksi tai nollaksi jos et pyydä tiettyä määrää.</translation> </message> <message> <location line="+32"/> <source>Clear all fields of the form.</source> - <translation type="unfinished"/> + <translation>Tyhjennä lomakkeen kaikki kentät.</translation> </message> <message> <location line="+3"/> <source>Clear</source> - <translation type="unfinished"/> + <translation>Tyhjennä</translation> </message> <message> <location line="+78"/> <source>Requested payments history</source> - <translation type="unfinished"/> + <translation>Pyydettyjen maksujen historia</translation> </message> <message> <location line="-98"/> <source>&Request payment</source> - <translation type="unfinished"/> + <translation>&Vastaanota maksu</translation> </message> <message> <location line="+120"/> <source>Show the selected request (does the same as double clicking an entry)</source> - <translation type="unfinished"/> + <translation>Näytä valittu pyyntö (sama toiminta kuin alkion tuplaklikkaus)</translation> </message> <message> <location line="+3"/> <source>Show</source> - <translation type="unfinished"/> + <translation>Näytä</translation> </message> <message> - <location line="+11"/> + <location line="+14"/> <source>Remove the selected entries from the list</source> - <translation type="unfinished"/> + <translation>Poista valitut alkiot listasta</translation> </message> <message> <location line="+3"/> <source>Remove</source> - <translation type="unfinished"/> + <translation>Poista</translation> </message> <message> - <location filename="../receivecoinsdialog.cpp" line="+38"/> + <location filename="../receivecoinsdialog.cpp" line="+39"/> <source>Copy label</source> <translation>Kopioi nimi</translation> </message> <message> <location line="+1"/> <source>Copy message</source> - <translation type="unfinished"/> + <translation>Kopioi viesti</translation> </message> <message> <location line="+1"/> @@ -2020,32 +2039,32 @@ Osoite: %4</translation> <message> <location line="+46"/> <source>Copy &URI</source> - <translation type="unfinished"/> + <translation>Kopioi &URI</translation> </message> <message> <location line="+7"/> <source>Copy &Address</source> - <translation type="unfinished"/> + <translation>Kopioi &Osoite</translation> </message> <message> <location line="+7"/> <source>&Save Image...</source> - <translation type="unfinished"/> + <translation>&Tallenna kuva</translation> </message> <message> <location filename="../receiverequestdialog.cpp" line="+56"/> <source>Request payment to %1</source> - <translation type="unfinished"/> + <translation>Vastaanota maksu %1</translation> </message> <message> <location line="+6"/> <source>Payment information</source> - <translation type="unfinished"/> + <translation>Maksutiedot</translation> </message> <message> <location line="+1"/> <source>URI</source> - <translation type="unfinished"/> + <translation>URI</translation> </message> <message> <location line="+2"/> @@ -2108,12 +2127,12 @@ Osoite: %4</translation> <message> <location line="+9"/> <source>(no message)</source> - <translation type="unfinished"/> + <translation>(ei viestiä)</translation> </message> <message> <location line="+8"/> <source>(no amount)</source> - <translation type="unfinished"/> + <translation>(ei määrää)</translation> </message> </context> <context> @@ -2128,32 +2147,32 @@ Osoite: %4</translation> <message> <location line="+76"/> <source>Coin Control Features</source> - <translation type="unfinished"/> + <translation>Kolikkokontrolli ominaisuudet</translation> </message> <message> <location line="+20"/> <source>Inputs...</source> - <translation type="unfinished"/> + <translation>Sisääntulot...</translation> </message> <message> <location line="+7"/> <source>automatically selected</source> - <translation type="unfinished"/> + <translation>automaattisesti valitut</translation> </message> <message> <location line="+19"/> <source>Insufficient funds!</source> - <translation type="unfinished"/> + <translation>Lompakon saldo ei riitä!</translation> </message> <message> <location line="+89"/> <source>Quantity:</source> - <translation type="unfinished"/> + <translation>Määrä:</translation> </message> <message> <location line="+35"/> <source>Bytes:</source> - <translation type="unfinished"/> + <translation>Tavuja:</translation> </message> <message> <location line="+48"/> @@ -2163,42 +2182,42 @@ Osoite: %4</translation> <message> <location line="+32"/> <source>Priority:</source> - <translation type="unfinished"/> + <translation>Prioriteetti:</translation> </message> <message> <location line="+48"/> <source>Fee:</source> - <translation type="unfinished"/> + <translation>Palkkio:</translation> </message> <message> <location line="+32"/> <source>Low Output:</source> - <translation type="unfinished"/> + <translation>Pieni Tuotos</translation> </message> <message> <location line="+48"/> <source>After Fee:</source> - <translation type="unfinished"/> + <translation>Palkkion jälkeen:</translation> </message> <message> <location line="+32"/> <source>Change:</source> - <translation type="unfinished"/> + <translation>Vaihtoraha:</translation> </message> <message> <location line="+44"/> <source>If this is activated, but the change address is empty or invalid, change will be sent to a newly generated address.</source> - <translation type="unfinished"/> + <translation>Jos tämä aktivoidaan mutta vaihtorahan osoite on tyhjä tai virheellinen, vaihtoraha tullaan lähettämään uuteen luotuun osoitteeseen.</translation> </message> <message> <location line="+3"/> <source>Custom change address</source> - <translation type="unfinished"/> + <translation>Kustomoitu vaihtorahan osoite</translation> </message> <message> <location line="+164"/> <source>Send to multiple recipients at once</source> - <translation>Lähetä monelle vastaanottajalle</translation> + <translation>Lähetä usealla vastaanottajalle samanaikaisesti</translation> </message> <message> <location line="+3"/> @@ -2208,7 +2227,7 @@ Osoite: %4</translation> <message> <location line="-23"/> <source>Clear all fields of the form.</source> - <translation type="unfinished"/> + <translation>Tyhjennä lomakkeen kaikki kentät</translation> </message> <message> <location line="+3"/> @@ -2216,12 +2235,12 @@ Osoite: %4</translation> <translation>&Tyhjennnä Kaikki</translation> </message> <message> - <location line="+52"/> + <location line="+58"/> <source>Balance:</source> - <translation>Saldo:</translation> + <translation>Balanssi:</translation> </message> <message> - <location line="-78"/> + <location line="-84"/> <source>Confirm the send action</source> <translation>Vahvista lähetys</translation> </message> @@ -2241,12 +2260,12 @@ Osoite: %4</translation> <location line="+5"/> <location line="+4"/> <source>%1 to %2</source> - <translation type="unfinished"/> + <translation>%1 to %2</translation> </message> <message> <location line="-121"/> <source>Copy quantity</source> - <translation type="unfinished"/> + <translation>Kopioi määrä</translation> </message> <message> <location line="+1"/> @@ -2256,42 +2275,42 @@ Osoite: %4</translation> <message> <location line="+1"/> <source>Copy fee</source> - <translation type="unfinished"/> + <translation>Kopioi palkkio</translation> </message> <message> <location line="+1"/> <source>Copy after fee</source> - <translation type="unfinished"/> + <translation>Kopioi palkkion jälkeen</translation> </message> <message> <location line="+1"/> <source>Copy bytes</source> - <translation type="unfinished"/> + <translation>Kopioi tavut</translation> </message> <message> <location line="+1"/> <source>Copy priority</source> - <translation type="unfinished"/> + <translation>Kopioi prioriteetti</translation> </message> <message> <location line="+1"/> <source>Copy low output</source> - <translation type="unfinished"/> + <translation>Kopioi pieni tuotos</translation> </message> <message> <location line="+1"/> <source>Copy change</source> - <translation type="unfinished"/> + <translation>Kopioi vaihtoraha</translation> </message> <message> <location line="+170"/> <source>Total Amount %1 (= %2)</source> - <translation type="unfinished"/> + <translation>Yhteensä %1 (= %2)</translation> </message> <message> <location line="+2"/> <source>or</source> - <translation type="unfinished"/> + <translation>tai</translation> </message> <message> <location line="+203"/> @@ -2321,17 +2340,17 @@ Osoite: %4</translation> <message> <location line="+3"/> <source>Transaction creation failed!</source> - <translation type="unfinished"/> + <translation>Rahansiirron luonti epäonnistui!</translation> </message> <message> <location line="+4"/> <source>The transaction was rejected! This might happen if some of the coins in your wallet were already spent, such as if you used a copy of wallet.dat and coins were spent in the copy but not marked as spent here.</source> - <translation type="unfinished"/> + <translation>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> <location line="+113"/> <source>Warning: Invalid Bitcoin address</source> - <translation type="unfinished"/> + <translation>Varoitus: Virheellinen Bitcoin osoite</translation> </message> <message> <location line="+20"/> @@ -2341,27 +2360,27 @@ Osoite: %4</translation> <message> <location line="-11"/> <source>Warning: Unknown change address</source> - <translation type="unfinished"/> + <translation>Varoitus: Tuntematon vaihtorahan osoite</translation> </message> <message> <location line="-367"/> <source>Are you sure you want to send?</source> - <translation type="unfinished"/> + <translation>Haluatko varmasti lähettää?</translation> </message> <message> <location line="+9"/> <source>added as transaction fee</source> - <translation type="unfinished"/> + <translation>lisätty rahansiirtomaksuna</translation> </message> <message> <location line="+171"/> <source>Payment request expired</source> - <translation type="unfinished"/> + <translation>Maksupyyntö vanhentui</translation> </message> <message> <location line="+8"/> <source>Invalid payment address %1</source> - <translation type="unfinished"/> + <translation>Virheellinen maksuosoite %1</translation> </message> </context> <context> @@ -2396,12 +2415,12 @@ Osoite: %4</translation> <message> <location line="-50"/> <source>Choose previously used address</source> - <translation type="unfinished"/> + <translation>Valitse aikaisemmin käytetty osoite</translation> </message> <message> <location line="-40"/> <source>This is a normal payment.</source> - <translation type="unfinished"/> + <translation>Tämä on normaali maksu.</translation> </message> <message> <location line="+50"/> @@ -2423,7 +2442,7 @@ Osoite: %4</translation> <location line="+524"/> <location line="+536"/> <source>Remove this entry</source> - <translation type="unfinished"/> + <translation>Poista tämä alkio</translation> </message> <message> <location line="-1008"/> @@ -2433,47 +2452,47 @@ Osoite: %4</translation> <message> <location line="+968"/> <source>This is a verified payment request.</source> - <translation type="unfinished"/> + <translation>Tämä on varmistettu maksupyyntö.</translation> </message> <message> <location line="-991"/> <source>Enter a label for this address to add it to the list of used addresses</source> - <translation type="unfinished"/> + <translation>Aseta nimi tälle osoitteelle lisätäksesi sen käytettyjen osoitteiden listalle.</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> - <translation type="unfinished"/> + <translation>Viesti joka liitettiin bitcoin: URI:iin tallennetaan rahansiirtoon viitteeksi. Tätä viestiä ei lähetetä Bitcoin-verkkoon.</translation> </message> <message> <location line="+426"/> <source>This is an unverified payment request.</source> - <translation type="unfinished"/> + <translation>Tämä on varmistamaton maksupyyntö</translation> </message> <message> <location line="+18"/> <location line="+532"/> <source>Pay To:</source> - <translation type="unfinished"/> + <translation>Saaja:</translation> </message> <message> <location line="-498"/> <location line="+536"/> <source>Memo:</source> - <translation type="unfinished"/> + <translation>Muistio:</translation> </message> </context> <context> <name>ShutdownWindow</name> <message> - <location filename="../utilitydialog.cpp" line="+48"/> + <location filename="../utilitydialog.cpp" line="+52"/> <source>Bitcoin Core is shutting down...</source> - <translation type="unfinished"/> + <translation>Bitcoin core sulkeutuu...</translation> </message> <message> <location line="+1"/> <source>Do not shut down the computer until this window disappears.</source> - <translation type="unfinished"/> + <translation>Älä sammuta tietokonetta ennenkuin tämä ikkuna katoaa.</translation> </message> </context> <context> @@ -2502,7 +2521,7 @@ Osoite: %4</translation> <location line="+7"/> <location line="+210"/> <source>Choose previously used address</source> - <translation type="unfinished"/> + <translation>Valitse aikaisemmin käytetty osoite</translation> </message> <message> <location line="-200"/> @@ -2666,14 +2685,14 @@ Osoite: %4</translation> <context> <name>SplashScreen</name> <message> - <location filename="../splashscreen.cpp" line="+28"/> + <location filename="../splashscreen.cpp" line="+32"/> <source>Bitcoin Core</source> <translation>Bitcoin-ydin</translation> </message> <message> <location line="+2"/> <source>The Bitcoin Core developers</source> - <translation type="unfinished"/> + <translation>Bitcoin Core kehittäjät</translation> </message> <message> <location line="+1"/> @@ -2686,7 +2705,7 @@ Osoite: %4</translation> <message> <location filename="../trafficgraphwidget.cpp" line="+79"/> <source>KB/s</source> - <translation type="unfinished"/> + <translation>KB/s</translation> </message> </context> <context> @@ -2699,7 +2718,7 @@ Osoite: %4</translation> <message> <location line="+6"/> <source>conflicted</source> - <translation type="unfinished"/> + <translation>ristiriitainen</translation> </message> <message> <location line="+2"/> @@ -2821,12 +2840,12 @@ Osoite: %4</translation> <message> <location line="+18"/> <source>Merchant</source> - <translation type="unfinished"/> + <translation>Kauppias</translation> </message> <message> <location line="+7"/> <source>Generated coins must mature %1 blocks before they can be spent. When you generated this block, it was broadcast to the network to be added to the block chain. If it fails to get into the chain, its state will change to "not accepted" and it won't be spendable. This may occasionally happen if another node generates a block within a few seconds of yours.</source> - <translation type="unfinished"/> + <translation>Luodut kolikot täytyy kypsyttää %1 lohkoa kunnes ne voidaan käyttää. Kun loit tämän lohkon, se lähetettiin verkkoon lisänä lohkoketjuun. Jos se epäonnistuu pääsemään ketjuun sen tila tulee muuttumaan "ei hyväksytty" ja sitä ei voida käyttää. Tämä voi ajoittain tapahtua kun toisen solmun lohko luodaan samanaikaisesti omasi kanssa.</translation> </message> <message> <location line="+8"/> @@ -2866,7 +2885,7 @@ Osoite: %4</translation> <message numerus="yes"> <location line="-37"/> <source>Open for %n more block(s)</source> - <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation> + <translation><numerusform>Avoinna %n lisälohkolle</numerusform><numerusform>Avoinna %n lisälohkolle</numerusform></translation> </message> <message> <location line="+72"/> @@ -2912,12 +2931,12 @@ Osoite: %4</translation> <message> <location line="+78"/> <source>Immature (%1 confirmations, will be available after %2)</source> - <translation type="unfinished"/> + <translation>Epäkypsä (%1 varmistusta, saatavilla %2 jälkeen)</translation> </message> <message numerus="yes"> <location line="-21"/> <source>Open for %n more block(s)</source> - <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation> + <translation><numerusform>Avoinna %n lisälohkolle</numerusform><numerusform>Avoinna %n lisälohkolle</numerusform></translation> </message> <message> <location line="+3"/> @@ -2942,22 +2961,22 @@ Osoite: %4</translation> <message> <location line="-21"/> <source>Offline</source> - <translation type="unfinished"/> + <translation>Offline</translation> </message> <message> <location line="+3"/> <source>Unconfirmed</source> - <translation type="unfinished"/> + <translation>Varmistamaton</translation> </message> <message> <location line="+3"/> <source>Confirming (%1 of %2 recommended confirmations)</source> - <translation type="unfinished"/> + <translation>Varmistetaan (%1 kehoitetusta %2 varmistuksesta)</translation> </message> <message> <location line="+6"/> <source>Conflicted</source> - <translation type="unfinished"/> + <translation>Ristiriitainen</translation> </message> <message> <location line="+51"/> @@ -3106,7 +3125,7 @@ Osoite: %4</translation> <message> <location line="+1"/> <source>Copy transaction ID</source> - <translation type="unfinished"/> + <translation>Kopioi siirtotunnus</translation> </message> <message> <location line="+1"/> @@ -3119,29 +3138,29 @@ Osoite: %4</translation> <translation>Näytä rahansiirron yksityiskohdat</translation> </message> <message> - <location line="+142"/> + <location line="+140"/> <source>Export Transaction History</source> - <translation type="unfinished"/> + <translation>Vie rahansiirtohistoria</translation> </message> <message> <location line="+19"/> <source>Exporting Failed</source> - <translation type="unfinished"/> + <translation>Vienti epäonnistui</translation> </message> <message> <location line="+0"/> <source>There was an error trying to save the transaction history to %1.</source> - <translation type="unfinished"/> + <translation>Rahansiirron historian tallentamisessa tapahtui virhe paikkaan %1.</translation> </message> <message> <location line="+4"/> <source>Exporting Successful</source> - <translation type="unfinished"/> + <translation>Vienti onnistui</translation> </message> <message> <location line="+0"/> <source>The transaction history was successfully saved to %1.</source> - <translation type="unfinished"/> + <translation>Rahansiirron historia tallennettiin onnistuneesti paikkaan %1.</translation> </message> <message> <location line="-22"/> @@ -3199,7 +3218,7 @@ Osoite: %4</translation> <message> <location filename="../walletframe.cpp" line="+26"/> <source>No wallet has been loaded.</source> - <translation type="unfinished"/> + <translation>Lomakkoa ei ole ladattu.</translation> </message> </context> <context> @@ -3213,9 +3232,9 @@ Osoite: %4</translation> <context> <name>WalletView</name> <message> - <location filename="../walletview.cpp" line="+43"/> + <location filename="../walletview.cpp" line="+44"/> <source>&Export</source> - <translation type="unfinished"/> + <translation>&Vie...</translation> </message> <message> <location line="+1"/> @@ -3223,14 +3242,14 @@ Osoite: %4</translation> <translation>Vie auki olevan välilehden tiedot tiedostoon</translation> </message> <message> - <location line="+181"/> + <location line="+184"/> <source>Backup Wallet</source> - <translation type="unfinished"/> + <translation>Varmuuskopioi lompakko</translation> </message> <message> <location line="+1"/> <source>Wallet Data (*.dat)</source> - <translation type="unfinished"/> + <translation>Lompakkodata (*.dat)</translation> </message> <message> <location line="+6"/> @@ -3240,12 +3259,12 @@ Osoite: %4</translation> <message> <location line="+0"/> <source>There was an error trying to save the wallet data to %1.</source> - <translation type="unfinished"/> + <translation>Lompakon tallennuksessa tapahtui virhe %1.</translation> </message> <message> <location line="+4"/> <source>The wallet data was successfully saved to %1.</source> - <translation type="unfinished"/> + <translation>Lompakko tallennettiin onnistuneesti tiedostoon %1.</translation> </message> <message> <location line="+0"/> @@ -3256,12 +3275,12 @@ Osoite: %4</translation> <context> <name>bitcoin-core</name> <message> - <location filename="../bitcoinstrings.cpp" line="+223"/> + <location filename="../bitcoinstrings.cpp" line="+261"/> <source>Usage:</source> <translation>Käyttö:</translation> </message> <message> - <location line="-55"/> + <location line="-66"/> <source>List commands</source> <translation>Lista komennoista</translation> </message> @@ -3271,12 +3290,12 @@ Osoite: %4</translation> <translation>Hanki apua käskyyn</translation> </message> <message> - <location line="+26"/> + <location line="+27"/> <source>Options:</source> <translation>Asetukset:</translation> </message> <message> - <location line="+22"/> + <location line="+32"/> <source>Specify configuration file (default: bitcoin.conf)</source> <translation>Määritä asetustiedosto (oletus: bitcoin.conf)</translation> </message> @@ -3291,27 +3310,22 @@ Osoite: %4</translation> <translation>Määritä data-hakemisto</translation> </message> <message> - <location line="-9"/> - <source>Set database cache size in megabytes (default: 25)</source> - <translation>Aseta tietokannan välimuistin koko megatavuina (oletus: 25)</translation> - </message> - <message> - <location line="-26"/> + <location line="-46"/> <source>Listen for connections on <port> (default: 8333 or testnet: 18333)</source> <translation>Kuuntele yhteyksiä portista <port> (oletus: 8333 tai testnet: 18333)</translation> </message> <message> - <location line="+5"/> + <location line="+6"/> <source>Maintain at most <n> connections to peers (default: 125)</source> <translation>Pidä enintään <n> yhteyttä verkkoihin (oletus: 125)</translation> </message> <message> - <location line="-51"/> + <location line="-57"/> <source>Connect to a node to retrieve peer addresses, and disconnect</source> <translation>Yhdistä noodiin hakeaksesi naapurien osoitteet ja katkaise yhteys</translation> </message> <message> - <location line="+84"/> + <location line="+100"/> <source>Specify your own public address</source> <translation>Määritä julkinen osoitteesi</translation> </message> @@ -3321,42 +3335,47 @@ Osoite: %4</translation> <translation>Kynnysarvo aikakatkaisulle heikosti toimiville verkoille (oletus: 100)</translation> </message> <message> - <location line="-150"/> + <location line="-172"/> <source>Number of seconds to keep misbehaving peers from reconnecting (default: 86400)</source> <translation>Sekuntien määrä, kuinka kauan uudelleenkytkeydytään verkkoihin (oletus: 86400)</translation> </message> <message> - <location line="-36"/> + <location line="-52"/> <source>An error occurred while setting up the RPC port %u for listening on IPv4: %s</source> <translation>Virhe valmisteltaessa RPC-portin %u avaamista kuunneltavaksi: %s</translation> </message> <message> - <location line="+34"/> + <location line="+50"/> <source>Listen for JSON-RPC connections on <port> (default: 8332 or testnet: 18332)</source> <translation>Kuuntele JSON-RPC -yhteyksiä portista <port> (oletus: 8332 or testnet: 18332)</translation> </message> <message> - <location line="+45"/> + <location line="+51"/> <source>Accept command line and JSON-RPC commands</source> <translation>Hyväksy merkkipohjaiset- ja JSON-RPC-käskyt</translation> </message> <message> - <location line="+81"/> + <location line="+7"/> + <source>Bitcoin Core RPC client version</source> + <translation>Bitcoin Core RPC asiakasversio</translation> + </message> + <message> + <location line="+87"/> <source>Run in the background as a daemon and accept commands</source> <translation>Aja taustalla daemonina ja hyväksy komennot</translation> </message> <message> - <location line="+40"/> + <location line="+43"/> <source>Use the test network</source> <translation>Käytä test -verkkoa</translation> </message> <message> - <location line="-120"/> + <location line="-136"/> <source>Accept connections from outside (default: 1 if no -proxy or -connect)</source> <translation>Hyväksy yhteyksiä ulkopuolelta (vakioasetus: 1 jos -proxy tai -connect ei määritelty)</translation> </message> <message> - <location line="-95"/> + <location line="-117"/> <source>%s, you must set a rpcpassword in the configuration file: %s It is recommended you use the following random password: @@ -3368,12 +3387,22 @@ 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>%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> <location line="+12"/> <source>Acceptable ciphers (default: TLSv1.2+HIGH:TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!3DES:@STRENGTH)</source> - <translation type="unfinished"/> + <translation>Hyväksytyt koodit (oletus: TLSv1.2+HIGH:TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!3DES:@STRENGTH)</translation> </message> <message> <location line="+5"/> @@ -3386,44 +3415,84 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Kytkeydy annettuun osoitteeseen ja pidä linja aina auki. Käytä [host]:portin merkintätapaa IPv6:lle.</translation> </message> <message> - <location line="+3"/> - <source>Cannot obtain a lock on data directory %s. Bitcoin is probably already running.</source> - <translation type="unfinished"/> + <location line="+6"/> + <source>Continuously rate-limit free transactions to <n>*1000 bytes per minute (default:15)</source> + <translation>Yhtäaikaisesti rajaa vapaat rahansiirrot <n>*1000 tavua per minuutti (oletus: 15)</translation> </message> <message> <location line="+3"/> <source>Enter regression test mode, which uses a special chain in which blocks can be solved instantly. This is intended for regression testing tools and app development.</source> - <translation type="unfinished"/> + <translation>Aloita regressio testimoodi joka käyttää erikoisketjua missä lohkot voidaan ratkaista välittömästi. Tämä on tarkoitettu regressiotestien työkaluksi ja ohjelman kehittämiseen.</translation> </message> <message> <location line="+4"/> <source>Enter regression test mode, which uses a special chain in which blocks can be solved instantly.</source> - <translation type="unfinished"/> + <translation>Aloita regression testimoodi joka käyttää erikoisketjua jossa lohkoja voidaan ratkaista välittömästi.</translation> </message> <message> <location line="+3"/> + <source>Error: Listening for incoming connections failed (listen returned error %d)</source> + <translation>Virhe: Odottaessa sisääntulevia yhteyksiä epäonnistui (listen palautti virheen %d)</translation> + </message> + <message> + <location line="+2"/> <source>Error: The transaction was rejected! This might happen if some of the coins in your wallet were already spent, such as if you used a copy of wallet.dat and coins were spent in the copy but not marked as spent here.</source> - <translation type="unfinished"/> + <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> <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 type="unfinished"/> + <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> <location line="+6"/> <source>Execute command when a wallet transaction changes (%s in cmd is replaced by TxID)</source> - <translation type="unfinished"/> + <translation>Suorita käsky kun lompakossa rahansiirto muuttuu (%s cmd on vaihdettu TxID kanssa)</translation> </message> <message> - <location line="+18"/> + <location line="+6"/> + <source>Fees smaller than this are considered zero fee (for transaction creation) (default:</source> + <translation>Tätä pienemmät palkkiot huomioidaan tyhjäksi (rahansiirron luonnissa) (oletus:</translation> + </message> + <message> + <location line="+3"/> + <source>Flush database activity from memory pool to disk log every <n> megabytes (default: 100)</source> + <translation>Aja tietokannan toimet muistivarannosta kovalevylogiin joka <n> megatavu (oletus: 100)</translation> + </message> + <message> + <location line="+3"/> + <source>How thorough the block verification of -checkblocks is (0-4, default: 3)</source> + <translation>Kuinka vaativa lohkonvarmistus -checkblocks on (0-4, oletus: 3)</translation> + </message> + <message> + <location line="+2"/> + <source>In this mode -genproclimit controls how many blocks are generated immediately.</source> + <translation>Tässä moodissa -genproclimit ohjaa kuinka monta lohkoa luodaan välittömästi.</translation> + </message> + <message> + <location line="+12"/> + <source>Set the number of script verification threads (%u to %d, 0 = auto, <0 = leave that many cores free, default: %d)</source> + <translation>Aseta script varmistuksen threadien lukumäärä (%u - %d, 0= auto, <0 = jätä näin monta ydintä vapaaksi, oletus: %d)</translation> + </message> + <message> + <location line="+3"/> + <source>Set the processor limit for when generation is on (-1 = unlimited, default: -1)</source> + <translation>Aseta prosessorin raja kun luonti on päällä (-1 = rajoittamaton, oletus: -1)</translation> + </message> + <message> + <location line="+3"/> <source>This is a pre-release test build - use at your own risk - do not use for mining or merchant applications</source> - <translation type="unfinished"/> + <translation>Tämä on esi-julkaistu testiversio - Käytä omalla riskillä - Ei saa käytää louhimiseen tai kauppasovelluksiin.</translation> </message> <message> - <location line="+5"/> + <location line="+3"/> + <source>Unable to bind to %s on this computer. Bitcoin Core is probably already running.</source> + <translation>Ei voida yhdistää %s tässä tietokoneessa. Bitcoin Core on luultavasti jo käynnissä.</translation> + </message> + <message> + <location line="+3"/> <source>Use separate SOCKS5 proxy to reach peers via Tor hidden services (default: -proxy)</source> - <translation type="unfinished"/> + <translation>Käytä erillistä SOCKS5 proxya tavoittaaksesi vertaiset Tor palvelun kautta (oletus: -proxy)</translation> </message> <message> <location line="+3"/> @@ -3438,52 +3507,57 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <message> <location line="+3"/> <source>Warning: The network does not appear to fully agree! Some miners appear to be experiencing issues.</source> - <translation type="unfinished"/> + <translation>Varoitus: Tietoverkko ei ole sovussa! Luohijat näyttävät kokevan virhetilanteita.</translation> </message> <message> <location line="+3"/> <source>Warning: We do not appear to fully agree with our peers! You may need to upgrade, or other nodes may need to upgrade.</source> - <translation type="unfinished"/> + <translation>Varoitus: Olemme vertaisverkon kanssa ristiriidassa! Sinun tulee päivittää tai toisten solmujen tulee päivitää.</translation> </message> <message> <location line="+3"/> <source>Warning: error reading wallet.dat! All keys read correctly, but transaction data or address book entries might be missing or incorrect.</source> - <translation type="unfinished"/> + <translation>Varoitus: virhe luettaessa wallet.dat-lompakkotiedostoa. Kaikki avaimet luettiin onnistuneesti, mutta siirtohistoria tai osoitekirja saattavat olla kadonneet tai virheellisiä.</translation> </message> <message> <location line="+3"/> <source>Warning: wallet.dat corrupt, data salvaged! Original wallet.dat saved as wallet.{timestamp}.bak in %s; if your balance or transactions are incorrect you should restore from a backup.</source> - <translation type="unfinished"/> + <translation>Varoitus: wallet.dat -lompakkotiedosto on korruptoitunut, tiedot pelastettu. Alkuperäinen wallet.dat -lompakkotiedosto on tallennettu wallet.{timestamp}.bak kansioon %s; jos balanssisi tai siirtohistoria on virheellinen, sinun tulisi palauttaa lompakkotiedosto varmuuskopiosta.</translation> </message> <message> <location line="+9"/> + <source>(default: 1)</source> + <translation>(oletus: 1)</translation> + </message> + <message> + <location line="+1"/> + <source>(default: wallet.dat)</source> + <translation>(oletus: wallet.dat)</translation> + </message> + <message> + <location line="+1"/> <source><category> can be:</source> - <translation type="unfinished"/> + <translation><category> voi olla:</translation> </message> <message> <location line="+6"/> <source>Attempt to recover private keys from a corrupt wallet.dat</source> - <translation type="unfinished"/> + <translation>Yritetään palauttaa privaattiavaimia korruptoituneesta wallet.dat -lompakkotiedostosta</translation> </message> <message> <location line="+1"/> <source>Bitcoin Core Daemon</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+1"/> - <source>Bitcoin RPC client version</source> - <translation type="unfinished"/> + <translation>Bitcoin Core taustapalvelin</translation> </message> <message> - <location line="+1"/> + <location line="+2"/> <source>Block creation options:</source> <translation>Lohkon luonnin asetukset:</translation> </message> <message> <location line="+5"/> <source>Clear list of wallet transactions (diagnostic tool; implies -rescan)</source> - <translation type="unfinished"/> + <translation>Tyhjennä lompakon rahansiirtojen lista (diagnostiikka työkalu; olettaa -rescan)</translation> </message> <message> <location line="+1"/> @@ -3493,17 +3567,32 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <message> <location line="+1"/> <source>Connect through SOCKS proxy</source> - <translation type="unfinished"/> + <translation>Yhdistä SOCKS proxin kautta</translation> </message> <message> <location line="+1"/> <source>Connect to JSON-RPC on <port> (default: 8332 or testnet: 18332)</source> - <translation type="unfinished"/> + <translation>Yhdistä JSON-RPC portissa <port> (oletus: 8332 tai testnet: 18332)</translation> </message> <message> <location line="+2"/> + <source>Connection options:</source> + <translation>Yhteyden valinnat:</translation> + </message> + <message> + <location line="+1"/> <source>Corrupted block database detected</source> - <translation type="unfinished"/> + <translation>Vioittunut lohkotietokanta havaittu</translation> + </message> + <message> + <location line="+1"/> + <source>Debugging/Testing options:</source> + <translation>Debuggaus/Testauksen valinnat:</translation> + </message> + <message> + <location line="+1"/> + <source>Disable safemode, override a real safe mode event (default: 0)</source> + <translation>Poista safemode, ohita oikea turvallinen mooditapahtuma (oletus: 0)</translation> </message> <message> <location line="+1"/> @@ -3513,27 +3602,27 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <message> <location line="+1"/> <source>Do not load the wallet and disable wallet RPC calls</source> - <translation type="unfinished"/> + <translation>Älä lataa lompakkoa ja poista lompakon RPC kutsut</translation> </message> <message> <location line="+1"/> <source>Do you want to rebuild the block database now?</source> - <translation type="unfinished"/> + <translation>Haluatko uudelleenrakentaa lohkotietokannan nyt?</translation> </message> <message> <location line="+2"/> <source>Error initializing block database</source> - <translation type="unfinished"/> + <translation>Virhe alustaessa lohkotietokantaa</translation> </message> <message> <location line="+1"/> <source>Error initializing wallet database environment %s!</source> - <translation type="unfinished"/> + <translation>Virhe alustaessa lompakon tietokantaympäristöä %s!</translation> </message> <message> <location line="+1"/> <source>Error loading block database</source> - <translation type="unfinished"/> + <translation>Virhe avattaessa lohkoketjua</translation> </message> <message> <location line="+4"/> @@ -3563,27 +3652,27 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <message> <location line="+1"/> <source>Failed to read block info</source> - <translation type="unfinished"/> + <translation>Lohkotietojen luku epäonnistui</translation> </message> <message> <location line="+1"/> <source>Failed to read block</source> - <translation type="unfinished"/> + <translation>Lohkon luku epäonnistui</translation> </message> <message> <location line="+1"/> <source>Failed to sync block index</source> - <translation type="unfinished"/> + <translation>Lohkoindeksin synkronointi epäonnistui</translation> </message> <message> <location line="+1"/> <source>Failed to write block index</source> - <translation type="unfinished"/> + <translation>Lohkoindeksin kirjoitus epäonnistui</translation> </message> <message> <location line="+1"/> <source>Failed to write block info</source> - <translation type="unfinished"/> + <translation>Lohkotiedon kirjoitus epäonnistui</translation> </message> <message> <location line="+1"/> @@ -3593,22 +3682,22 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <message> <location line="+1"/> <source>Failed to write file info</source> - <translation type="unfinished"/> + <translation>Tiedoston tietojen kirjoitus epäonnistui</translation> </message> <message> <location line="+1"/> <source>Failed to write to coin database</source> - <translation type="unfinished"/> + <translation>Kolikkotietokannan kirjoitus epäonnistui</translation> </message> <message> <location line="+1"/> <source>Failed to write transaction index</source> - <translation type="unfinished"/> + <translation>Rahasiirtojen indeksin kirjoitus epäonnistui</translation> </message> <message> <location line="+1"/> <source>Failed to write undo data</source> - <translation type="unfinished"/> + <translation>Palautustiedon kirjoitus epäonnistui</translation> </message> <message> <location line="+1"/> @@ -3617,183 +3706,193 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. </message> <message> <location line="+1"/> + <source>Fees smaller than this are considered zero fee (for relaying) (default:</source> + <translation>Tätä pienemmät palkkiot huomioidaan tyhjäksi (välittämisessä) (oletus:</translation> + </message> + <message> + <location line="+1"/> <source>Find peers using DNS lookup (default: 1 unless -connect)</source> <translation>Hae naapureita DNS hauilla (vakioasetus: 1 paitsi jos -connect)</translation> </message> <message> <location line="+1"/> + <source>Force safe mode (default: 0)</source> + <translation>Pakota safe moodi (oletus: 0)</translation> + </message> + <message> + <location line="+1"/> <source>Generate coins (default: 0)</source> <translation>Generoi kolikoita (vakio: 0)</translation> </message> <message> <location line="+2"/> <source>How many blocks to check at startup (default: 288, 0 = all)</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+1"/> - <source>How thorough the block verification is (0-4, default: 3)</source> - <translation type="unfinished"/> + <translation>Kuinka monta lohkoa tarkistetaan käynnistettäessä (oletus: 288, 0 = kaikki)</translation> </message> <message> <location line="+1"/> <source>If <category> is not supplied, output all debugging information.</source> - <translation type="unfinished"/> + <translation>Jos <kategoria> ei annettu, tulosta kaikki debuggaustieto.</translation> </message> <message> <location line="+2"/> <source>Incorrect or no genesis block found. Wrong datadir for network?</source> - <translation type="unfinished"/> + <translation>Virheellinen tai olematon alkulohko löydetty. Väärä data-hakemisto verkolle?</translation> </message> <message> <location line="+3"/> <source>Invalid -onion address: '%s'</source> - <translation type="unfinished"/> + <translation>Virheellinen -onion osoite: '%s'</translation> </message> <message> - <location line="+15"/> + <location line="+17"/> <source>Not enough file descriptors available.</source> - <translation type="unfinished"/> + <translation>Ei tarpeeksi tiedostomerkintöjä vapaana.</translation> </message> <message> <location line="+5"/> <source>Prepend debug output with timestamp (default: 1)</source> - <translation type="unfinished"/> + <translation>Lisää aikamerkki debug tulosteen eteen (oletus: 1)</translation> </message> <message> - <location line="+1"/> + <location line="+4"/> <source>RPC client options:</source> - <translation type="unfinished"/> + <translation>RPC asiakas valinnat:</translation> </message> <message> - <location line="+1"/> + <location line="+4"/> <source>Rebuild block chain index from current blk000??.dat files</source> - <translation type="unfinished"/> + <translation>Uudelleenrakenna lohkoketjuindeksi nykyisistä blk000??.dat tiedostoista</translation> </message> <message> - <location line="+5"/> + <location line="+6"/> <source>Select SOCKS version for -proxy (4 or 5, default: 5)</source> - <translation type="unfinished"/> + <translation>Valitse SOCKS versio -proxy:lle (4 tai 5, oletus: 5)</translation> </message> <message> - <location line="+1"/> - <source>Send command to Bitcoin server</source> - <translation type="unfinished"/> + <location line="+6"/> + <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> <message> - <location line="+7"/> + <location line="+2"/> <source>Set maximum block size in bytes (default: %d)</source> - <translation type="unfinished"/> + <translation>Aseta lohkon maksimikoko tavuissa (oletus: %d)</translation> </message> <message> <location line="+2"/> <source>Set the number of threads to service RPC calls (default: 4)</source> - <translation type="unfinished"/> + <translation>Aseta threadien lukumäärä RPC kutsuille (oletus: 4)</translation> </message> <message> - <location line="+7"/> + <location line="+10"/> <source>Specify wallet file (within data directory)</source> - <translation type="unfinished"/> + <translation>Aseta lompakkotiedosto (data-hakemiston sisällä)</translation> </message> <message> <location line="+2"/> <source>Spend unconfirmed change when sending transactions (default: 1)</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+1"/> - <source>Start Bitcoin server</source> - <translation type="unfinished"/> + <translation>Käytä varmistamattomia vaihtorahoja lähetettäessä rahansiirtoja (oletus: 1)</translation> </message> <message> - <location line="+3"/> + <location line="+4"/> <source>This is intended for regression testing tools and app development.</source> - <translation type="unfinished"/> + <translation>Tämä on tarkoitettu regression testityökaluille ja ohjelman kehittämiseen.</translation> </message> <message> <location line="+10"/> <source>Usage (deprecated, use bitcoin-cli):</source> - <translation type="unfinished"/> + <translation>Käyttö (vanhentunut, käytä bitcoin-cli):</translation> </message> <message> <location line="+7"/> <source>Verifying blocks...</source> - <translation type="unfinished"/> + <translation>Varmistetaan lohkoja...</translation> </message> <message> <location line="+1"/> <source>Verifying wallet...</source> - <translation type="unfinished"/> + <translation>Varmistetaan lompakko...</translation> </message> <message> <location line="+1"/> <source>Wait for RPC server to start</source> - <translation type="unfinished"/> + <translation>Odota RPC palvelimen käynnistystä</translation> </message> <message> <location line="+1"/> <source>Wallet %s resides outside data directory %s</source> - <translation type="unfinished"/> + <translation>Lompakko %s sijaitsee data-hakemiston ulkopuolella %s</translation> </message> <message> <location line="+2"/> <source>Wallet options:</source> - <translation type="unfinished"/> + <translation>Lompakon valinnat:</translation> </message> <message> <location line="+2"/> <source>Warning: Deprecated argument -debugnet ignored, use -debug=net</source> - <translation type="unfinished"/> + <translation>Varoitus: Vanhentunut argumentti -debugnet sivutettu, käytä debug=net</translation> </message> <message> <location line="+2"/> <source>You need to rebuild the database using -reindex to change -txindex</source> - <translation type="unfinished"/> + <translation>Sinun tulee uudelleenrakentaa tietokanta käyttäen -reindex vaihtaen -txindex</translation> </message> <message> - <location line="-80"/> + <location line="-92"/> <source>Imports blocks from external blk000??.dat file</source> <translation>Tuodaan lohkoja ulkoisesta blk000??.dat tiedostosta</translation> </message> <message> - <location line="-106"/> + <location line="-149"/> + <source>Cannot obtain a lock on data directory %s. Bitcoin Core is probably already running.</source> + <translation>Ei voida lukita data-hakemistoa %s. Bitcoin Core on luultavasti jo käynnissä.</translation> + </message> + <message> + <location line="+22"/> <source>Execute command when a relevant alert is received or we see a really long fork (%s in cmd is replaced by message)</source> - <translation type="unfinished"/> + <translation>Aja komento kun olennainen hälytys vastaanotetaan tai nähdään todella pitkä haara (%s komennossa korvataan viestillä)</translation> </message> <message> - <location line="+14"/> + <location line="+25"/> <source>Output debugging information (default: 0, supplying <category> is optional)</source> - <translation type="unfinished"/> + <translation>Tulosta debuggaustieto (oletus: 0, annettu <kategoria> valinnainen)</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>Aseta maksimikoko korkea prioriteetti/pieni palkkio rahansiirtoihin tavuissa (oletus: %d)</translation> </message> <message> - <location line="+2"/> - <source>Set the number of script verification threads (up to 16, 0 = auto, <0 = leave that many cores free, default: 0)</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+90"/> + <location line="+102"/> <source>Information</source> <translation>Tietoa</translation> </message> <message> <location line="+4"/> <source>Invalid amount for -minrelaytxfee=<amount>: '%s'</source> - <translation type="unfinished"/> + <translation>Virheellinen määrä -minrelaytxfee=<amount>: '%s'</translation> </message> <message> <location line="+1"/> <source>Invalid amount for -mintxfee=<amount>: '%s'</source> - <translation type="unfinished"/> + <translation>Virheellinen määrä -mintxfee=<amount>: '%s'</translation> </message> <message> - <location line="+8"/> + <location line="+3"/> + <source>Limit size of signature cache to <n> entries (default: 50000)</source> + <translation>Rajaa allekirjoituksen välimuistin koko <n> alkioon (oletus: 50000)</translation> + </message> + <message> + <location line="+6"/> + <source>Log transaction priority and fee per kB when mining blocks (default: 0)</source> + <translation>Kirjaa rahansiirron prioriteetti ja palkkio per kB kun louhitaan lohkoja (oletus: 0)</translation> + </message> + <message> + <location line="+1"/> <source>Maintain a full transaction index (default: 0)</source> - <translation type="unfinished"/> + <translation>Ylläpidä täydellistä rahasiirtojen indeksiä (oletus: 0)</translation> </message> <message> <location line="+2"/> @@ -3808,7 +3907,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <message> <location line="+2"/> <source>Only accept block chain matching built-in checkpoints (default: 1)</source> - <translation type="unfinished"/> + <translation>Hyväksy vain lohkoketjua vastaavat sisäänrakennetut varmistuspisteet (Oletus: 1)</translation> </message> <message> <location line="+1"/> @@ -3816,12 +3915,52 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Yhdistä vain noodeihin verkossa <net> (IPv4, IPv6 tai Tor)</translation> </message> <message> - <location line="+9"/> + <location line="+4"/> + <source>Print block on startup, if found in block index</source> + <translation>Tulosta lohko käynnistyksessä jos löydetään lohkoindeksistä</translation> + </message> + <message> + <location line="+1"/> + <source>Print block tree on startup (default: 0)</source> + <translation>Tulosta lohkopuu käynnistyksessä (oletus: 0)</translation> + </message> + <message> + <location line="+1"/> + <source>RPC SSL options: (see the Bitcoin Wiki for SSL setup instructions)</source> + <translation>RPC SSL valinnat: (katso Bitcoin Wikistä SSL-asennuksen ohjeet)</translation> + </message> + <message> + <location line="+2"/> + <source>RPC server options:</source> + <translation>RPC-palvelimen valinnat:</translation> + </message> + <message> + <location line="+1"/> + <source>Randomly drop 1 of every <n> network messages</source> + <translation>Satunnaisesti pudota 1 joka <n> verkkoviestistä</translation> + </message> + <message> + <location line="+1"/> + <source>Randomly fuzz 1 of every <n> network messages</source> + <translation>Satunnaisesti sekoita 1 joka <n> verkkoviestistä</translation> + </message> + <message> + <location line="+4"/> + <source>Run a thread to flush wallet periodically (default: 1)</source> + <translation>Aja threadi jossa tallennetaan lompakko ajoittain (oletus: 1)</translation> + </message> + <message> + <location line="+2"/> <source>SSL options: (see the Bitcoin Wiki for SSL setup instructions)</source> <translation>SSL asetukset (katso Bitcoin Wikistä tarkemmat SSL ohjeet)</translation> </message> <message> - <location line="+4"/> + <location line="+2"/> + <source>Send command to Bitcoin Core</source> + <translation>Lähetä komento Bitcoin Coreen</translation> + </message> + <message> + <location line="+2"/> <source>Send trace/debug info to console instead of debug.log file</source> <translation>Lähetä jäljitys/debug-tieto konsoliin, debug.log-tiedoston sijaan</translation> </message> @@ -3832,6 +3971,21 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. </message> <message> <location line="+2"/> + <source>Sets the DB_PRIVATE flag in the wallet db environment (default: 1)</source> + <translation>Asettaa DB_PRIVATE lipun lompakon tietokantaympäristössä (oletus: 1)</translation> + </message> + <message> + <location line="+1"/> + <source>Show all debugging options (usage: --help -help-debug)</source> + <translation>Näytä kaikki debuggaus valinnat: (käyttö: --help -help-debug)</translation> + </message> + <message> + <location line="+1"/> + <source>Show benchmark information (default: 0)</source> + <translation>Näytä suorituskykytietoja (oletus: 0)</translation> + </message> + <message> + <location line="+1"/> <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> @@ -3846,7 +4000,12 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Määritä yhteyden aikakataisu millisekunneissa (vakioasetus: 5000)</translation> </message> <message> - <location line="+7"/> + <location line="+6"/> + <source>Start Bitcoin Core Daemon</source> + <translation>Käynnistä Bitcoin Core taustapalvelin</translation> + </message> + <message> + <location line="+1"/> <source>System error: </source> <translation>Järjestelmävirhe:</translation> </message> @@ -3858,7 +4017,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <message> <location line="+1"/> <source>Transaction amounts must be positive</source> - <translation type="unfinished"/> + <translation>Siirtosumman tulee olla positiivinen</translation> </message> <message> <location line="+1"/> @@ -3893,7 +4052,12 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <message> <location line="+2"/> <source>Zapping all transactions from wallet...</source> - <translation type="unfinished"/> + <translation>Tyhjennetään kaikki rahansiirrot lompakosta....</translation> + </message> + <message> + <location line="+1"/> + <source>on startup</source> + <translation>käynnistyksessä</translation> </message> <message> <location line="+1"/> @@ -3903,50 +4067,50 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <message> <location line="+1"/> <source>wallet.dat corrupt, salvage failed</source> - <translation type="unfinished"/> + <translation>wallet.dat -lompakkotiedosto korruptoitunut, korjaaminen epäonnistui</translation> </message> <message> - <location line="-60"/> + <location line="-71"/> <source>Password for JSON-RPC connections</source> <translation>Salasana JSON-RPC-yhteyksille</translation> </message> <message> - <location line="-71"/> + <location line="-77"/> <source>Allow JSON-RPC connections from specified IP address</source> <translation>Salli JSON-RPC yhteydet tietystä ip-osoitteesta</translation> </message> <message> - <location line="+81"/> + <location line="+94"/> <source>Send commands to node running on <ip> (default: 127.0.0.1)</source> <translation>Lähetä käskyjä solmuun osoitteessa <ip> (oletus: 127.0.0.1)</translation> </message> <message> - <location line="-133"/> + <location line="-163"/> <source>Execute command when the best block changes (%s in cmd is replaced by block hash)</source> <translation>Suorita käsky kun paras lohko muuttuu (%s cmd on vaihdettu block hashin kanssa)</translation> </message> <message> - <location line="+163"/> + <location line="+196"/> <source>Upgrade wallet to latest format</source> <translation>Päivitä lompakko uusimpaan formaattiin</translation> </message> <message> - <location line="-25"/> + <location line="-28"/> <source>Set key pool size to <n> (default: 100)</source> <translation>Aseta avainpoolin koko arvoon <n> (oletus: 100)</translation> </message> <message> - <location line="-11"/> + <location line="-12"/> <source>Rescan the block chain for missing wallet transactions</source> <translation>Skannaa uudelleen lohkoketju lompakon puuttuvien rahasiirtojen vuoksi</translation> </message> <message> - <location line="+39"/> + <location line="+43"/> <source>Use OpenSSL (https) for JSON-RPC connections</source> <translation>Käytä OpenSSL:ää (https) JSON-RPC-yhteyksille</translation> </message> <message> - <location line="-31"/> + <location line="-34"/> <source>Server certificate file (default: server.cert)</source> <translation>Palvelimen sertifikaatti-tiedosto (oletus: server.cert)</translation> </message> @@ -3956,7 +4120,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Palvelimen yksityisavain (oletus: server.pem)</translation> </message> <message> - <location line="+17"/> + <location line="+20"/> <source>This help message</source> <translation>Tämä ohjeviesti</translation> </message> @@ -3966,17 +4130,17 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Kytkeytyminen %s tällä tietokonella ei onnistu (kytkeytyminen palautti virheen %d, %s)</translation> </message> <message> - <location line="-109"/> + <location line="-125"/> <source>Allow DNS lookups for -addnode, -seednode and -connect</source> <translation>Salli DNS kyselyt -addnode, -seednode ja -connect yhteydessä</translation> </message> <message> - <location line="+61"/> + <location line="+66"/> <source>Loading addresses...</source> <translation>Ladataan osoitteita...</translation> </message> <message> - <location line="-37"/> + <location line="-39"/> <source>Error loading wallet.dat: Wallet corrupted</source> <translation>Virhe ladattaessa wallet.dat-tiedostoa: Lompakko vioittunut</translation> </message> @@ -3986,22 +4150,22 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Virhe ladattaessa wallet.dat-tiedostoa: Tarvitset uudemman version Bitcoinista</translation> </message> <message> - <location line="+99"/> + <location line="+112"/> <source>Wallet needed to be rewritten: restart Bitcoin to complete</source> <translation>Lompakko tarvitsee uudelleenkirjoittaa: käynnistä Bitcoin uudelleen</translation> </message> <message> - <location line="-101"/> + <location line="-114"/> <source>Error loading wallet.dat</source> <translation>Virhe ladattaessa wallet.dat-tiedostoa</translation> </message> <message> - <location line="+31"/> + <location line="+32"/> <source>Invalid -proxy address: '%s'</source> <translation>Virheellinen proxy-osoite '%s'</translation> </message> <message> - <location line="+57"/> + <location line="+69"/> <source>Unknown network specified in -onlynet: '%s'</source> <translation>Tuntematon verkko -onlynet parametrina: '%s'</translation> </message> @@ -4011,7 +4175,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Tuntematon -socks proxy versio pyydetty: %i</translation> </message> <message> - <location line="-103"/> + <location line="-119"/> <source>Cannot resolve -bind address: '%s'</source> <translation>-bind osoitteen '%s' selvittäminen epäonnistui</translation> </message> @@ -4021,7 +4185,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>-externalip osoitteen '%s' selvittäminen epäonnistui</translation> </message> <message> - <location line="+49"/> + <location line="+53"/> <source>Invalid amount for -paytxfee=<amount>: '%s'</source> <translation>-paytxfee=<amount>: '%s' on virheellinen</translation> </message> @@ -4036,27 +4200,22 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Lompakon saldo ei riitä</translation> </message> <message> - <location line="+10"/> + <location line="+11"/> <source>Loading block index...</source> <translation>Ladataan lohkoindeksiä...</translation> </message> <message> - <location line="-63"/> + <location line="-68"/> <source>Add a node to connect to and attempt to keep the connection open</source> <translation>Linää solmu mihin liittyä pitääksesi yhteyden auki</translation> </message> <message> - <location line="-32"/> - <source>Unable to bind to %s on this computer. Bitcoin is probably already running.</source> - <translation>Kytkeytyminen %s ei onnistu tällä tietokoneella. Bitcoin on todennäköisesti jo ajamassa.</translation> - </message> - <message> - <location line="+96"/> + <location line="+69"/> <source>Loading wallet...</source> <translation>Ladataan lompakkoa...</translation> </message> <message> - <location line="-57"/> + <location line="-62"/> <source>Cannot downgrade wallet</source> <translation>Et voi päivittää lompakkoasi vanhempaan versioon</translation> </message> @@ -4066,27 +4225,27 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Oletusosoitetta ei voi kirjoittaa</translation> </message> <message> - <location line="+68"/> + <location line="+80"/> <source>Rescanning...</source> <translation>Skannataan uudelleen...</translation> </message> <message> - <location line="-58"/> + <location line="-67"/> <source>Done loading</source> <translation>Lataus on valmis</translation> </message> <message> - <location line="+86"/> + <location line="+99"/> <source>To use the %s option</source> <translation>Käytä %s optiota</translation> </message> <message> - <location line="-78"/> + <location line="-91"/> <source>Error</source> <translation>Virhe</translation> </message> <message> - <location line="-36"/> + <location line="-41"/> <source>You must set rpcpassword=<password> in the configuration file: %s If the file does not exist, create it with owner-readable-only file permissions.</source> diff --git a/src/qt/locale/bitcoin_gl.ts b/src/qt/locale/bitcoin_gl.ts index 6394fb9e0f..c2287eea2f 100644 --- a/src/qt/locale/bitcoin_gl.ts +++ b/src/qt/locale/bitcoin_gl.ts @@ -36,6 +36,12 @@ Este produto inclúe software desenvolvido polo OpenSSL Project para o uso no Op <source>The Bitcoin Core developers</source> <translation>Os desarrolladores de Bitcoin Core</translation> </message> + <message> + <location line="+12"/> + <location line="+2"/> + <source>(%1-bit)</source> + <translation type="unfinished"/> + </message> </context> <context> <name>AddressBookPage</name> @@ -65,7 +71,7 @@ Este produto inclúe software desenvolvido polo OpenSSL Project para o uso no Op <translation>&Copiar</translation> </message> <message> - <location line="+52"/> + <location line="+58"/> <source>C&lose</source> <translation>&Pechar</translation> </message> @@ -75,7 +81,7 @@ Este produto inclúe software desenvolvido polo OpenSSL Project para o uso no Op <translation>&Copiar Dirección</translation> </message> <message> - <location filename="../forms/addressbookpage.ui" line="-41"/> + <location filename="../forms/addressbookpage.ui" line="-47"/> <source>Delete the currently selected address from the list</source> <translation>Borrar a dirección actualmente seleccionada da listaxe</translation> </message> @@ -322,7 +328,7 @@ Este produto inclúe software desenvolvido polo OpenSSL Project para o uso no Op <context> <name>BitcoinGUI</name> <message> - <location filename="../bitcoingui.cpp" line="+295"/> + <location filename="../bitcoingui.cpp" line="+294"/> <source>Sign &message...</source> <translation>&Asinar mensaxe...</translation> </message> @@ -337,12 +343,12 @@ Este produto inclúe software desenvolvido polo OpenSSL Project para o uso no Op <translation>&Vista xeral</translation> </message> <message> - <location line="-137"/> + <location line="-136"/> <source>Node</source> <translation type="unfinished"/> </message> <message> - <location line="+138"/> + <location line="+137"/> <source>Show general overview of wallet</source> <translation>Amosar vista xeral do moedeiro</translation> </message> @@ -463,17 +469,17 @@ Este produto inclúe software desenvolvido polo OpenSSL Project para o uso no Op <translation>&Verificar mensaxe...</translation> </message> <message> - <location line="+430"/> + <location line="+440"/> <source>Bitcoin</source> <translation>Bitcoin</translation> </message> <message> - <location line="-643"/> + <location line="-652"/> <source>Wallet</source> <translation>Moedeiro</translation> </message> <message> - <location line="+146"/> + <location line="+145"/> <source>&Send</source> <translation>&Enviar</translation> </message> @@ -529,18 +535,18 @@ Este produto inclúe software desenvolvido polo OpenSSL Project para o uso no Op <translation>Barra de ferramentas</translation> </message> <message> - <location line="-284"/> - <location line="+376"/> + <location line="-283"/> + <location line="+375"/> <source>[testnet]</source> <translation>[testnet]</translation> </message> <message> - <location line="-401"/> + <location line="-400"/> <source>Bitcoin Core</source> <translation>Core de Bitcoin</translation> </message> <message> - <location line="+163"/> + <location line="+162"/> <source>Request payments (generates QR codes and bitcoin: URIs)</source> <translation>Solicitar pagos (xenera códigos QR e bitcoin: URIs)</translation> </message> @@ -602,7 +608,7 @@ Este produto inclúe software desenvolvido polo OpenSSL Project para o uso no Op <translation>Procesados %1 bloques do historial de transacccións.</translation> </message> <message numerus="yes"> - <location line="+23"/> + <location line="+27"/> <source>%n hour(s)</source> <translation><numerusform>%n hora</numerusform><numerusform>%n horas</numerusform></translation> </message> @@ -613,10 +619,21 @@ Este produto inclúe software desenvolvido polo OpenSSL Project para o uso no Op </message> <message numerus="yes"> <location line="+4"/> + <location line="+6"/> <source>%n week(s)</source> <translation><numerusform>%n semana</numerusform><numerusform>%n semanas</numerusform></translation> </message> <message> + <location line="+0"/> + <source>%1 and %2</source> + <translation type="unfinished"/> + </message> + <message numerus="yes"> + <location line="+0"/> + <source>%n year(s)</source> + <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation> + </message> + <message> <location line="+4"/> <source>%1 behind</source> <translation>%1 detrás</translation> @@ -647,12 +664,12 @@ Este produto inclúe software desenvolvido polo OpenSSL Project para o uso no Op <translation>Información</translation> </message> <message> - <location line="-85"/> + <location line="-95"/> <source>Up to date</source> <translation>Actualizado</translation> </message> <message> - <location line="+34"/> + <location line="+44"/> <source>Catching up...</source> <translation>Poñendo ao dÃa...</translation> </message> @@ -690,7 +707,7 @@ Dirección: %4 <translation>O moedeiro está <b>encriptado</b> e actualmente <b>bloqueado</b></translation> </message> <message> - <location filename="../bitcoin.cpp" line="+438"/> + <location filename="../bitcoin.cpp" line="+443"/> <source>A fatal error occurred. Bitcoin can no longer continue safely and will quit.</source> <translation>Ocorriu un erro fatal. Bitcoin non pode continuar en condicións de seguridade e pecharáse.</translation> </message> @@ -698,7 +715,7 @@ Dirección: %4 <context> <name>ClientModel</name> <message> - <location filename="../clientmodel.cpp" line="+119"/> + <location filename="../clientmodel.cpp" line="+128"/> <source>Network Alert</source> <translation>Alerta de Rede</translation> </message> @@ -751,7 +768,7 @@ Dirección: %4 <translation>Cambiar:</translation> </message> <message> - <location line="+63"/> + <location line="+56"/> <source>(un)select all</source> <translation>(des)selecciona todo</translation> </message> @@ -766,7 +783,7 @@ Dirección: %4 <translation>Modo lista</translation> </message> <message> - <location line="+52"/> + <location line="+53"/> <source>Amount</source> <translation>Cantidade</translation> </message> @@ -796,7 +813,7 @@ Dirección: %4 <translation>Prioridade</translation> </message> <message> - <location filename="../coincontroldialog.cpp" line="+42"/> + <location filename="../coincontroldialog.cpp" line="+41"/> <source>Copy address</source> <translation>Copiar dirección</translation> </message> @@ -862,7 +879,7 @@ Dirección: %4 <translation>Copiar cambio</translation> </message> <message> - <location line="+323"/> + <location line="+332"/> <source>highest</source> <translation>O máis alto</translation> </message> @@ -912,12 +929,12 @@ Dirección: %4 <translation>(%1 bloqueado)</translation> </message> <message> - <location line="+31"/> + <location line="+32"/> <source>none</source> <translation type="unfinished"/> </message> <message> - <location line="+140"/> + <location line="+141"/> <source>Dust</source> <translation>Limpar</translation> </message> @@ -980,12 +997,12 @@ Dirección: %4 </message> <message> <location line="+43"/> - <location line="+66"/> + <location line="+61"/> <source>(no label)</source> <translation>(sen etiqueta)</translation> </message> <message> - <location line="-9"/> + <location line="-7"/> <source>change from %1 (%2)</source> <translation type="unfinished"/> </message> @@ -1066,7 +1083,7 @@ Dirección: %4 <context> <name>FreespaceChecker</name> <message> - <location filename="../intro.cpp" line="+65"/> + <location filename="../intro.cpp" line="+68"/> <source>A new data directory will be created.</source> <translation>Crearáse un novo directorio de datos.</translation> </message> @@ -1099,7 +1116,7 @@ Dirección: %4 <translation type="unfinished"/> </message> <message> - <location filename="../utilitydialog.cpp" line="+38"/> + <location filename="../utilitydialog.cpp" line="+24"/> <source>Bitcoin Core</source> <translation>Core de Bitcoin</translation> </message> @@ -1124,7 +1141,7 @@ Dirección: %4 <translation>opcións de UI</translation> </message> <message> - <location line="+1"/> + <location line="+2"/> <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> @@ -1135,11 +1152,16 @@ Dirección: %4 </message> <message> <location line="+1"/> + <source>Set SSL root certificates for payment request (default: -system-)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> <source>Show splash screen on startup (default: 1)</source> <translation>Amosar pantalla splash no arranque (por defecto: 1)</translation> </message> <message> - <location line="+1"/> + <location line="-4"/> <source>Choose data directory on startup (default: 0)</source> <translation>Escolle directorio de datos ao arrancar (por defecto: 0)</translation> </message> @@ -1177,7 +1199,7 @@ Dirección: %4 <translation>Empregar un directorio de datos personalizado</translation> </message> <message> - <location filename="../intro.cpp" line="+85"/> + <location filename="../intro.cpp" line="+82"/> <source>Bitcoin</source> <translation>Bitcoin</translation> </message> @@ -1187,7 +1209,7 @@ Dirección: %4 <translation>Erro: O directorio de datos especificado "%1" non pode ser creado.</translation> </message> <message> - <location line="+19"/> + <location line="+24"/> <source>Error</source> <translation>Erro</translation> </message> @@ -1243,7 +1265,7 @@ Dirección: %4 <translation>&Principal</translation> </message> <message> - <location line="+6"/> + <location line="+116"/> <source>Optional transaction fee per kB that helps make sure your transactions are processed quickly. Most transactions are 1 kB.</source> <translation>Tarifa por kB de transacción opcional que axuda a asegurar que as túas transaccións son procesadas rapidamente. A maiorÃa das transaccións son 1 kB.</translation> </message> @@ -1253,7 +1275,7 @@ Dirección: %4 <translation>Pagar &tarifa da transacción</translation> </message> <message> - <location line="+31"/> + <location line="-125"/> <source>Automatically start Bitcoin after logging in to the system.</source> <translation>Comezar Bitcoin automáticamente despois de loguearse no sistema.</translation> </message> @@ -1268,12 +1290,7 @@ Dirección: %4 <translation type="unfinished"/> </message> <message> - <location line="+13"/> - <source>Set database cache size in megabytes (default: 25)</source> - <translation>Fixar tamaño da caché da base de datos en megabytes (por defecto: 25)</translation> - </message> - <message> - <location line="+13"/> + <location line="+16"/> <source>MB</source> <translation type="unfinished"/> </message> @@ -1283,12 +1300,7 @@ Dirección: %4 <translation type="unfinished"/> </message> <message> - <location line="+13"/> - <source>Set the number of script verification threads (up to 16, 0 = auto, <0 = leave that many cores free, default: 0)</source> - <translation>Fixar o número de fÃos para sripts de verificación (ata 16, 0 = auto, <0 = deixa tantos cores libres, por defecto: 0)</translation> - </message> - <message> - <location line="+58"/> + <location line="+160"/> <source>Connect to the Bitcoin network through a SOCKS proxy.</source> <translation type="unfinished"/> </message> @@ -1303,7 +1315,7 @@ Dirección: %4 <translation type="unfinished"/> </message> <message> - <location line="+224"/> + <location line="+214"/> <source>Active command-line options that override above options:</source> <translation type="unfinished"/> </message> @@ -1318,12 +1330,42 @@ Dirección: %4 <translation>Opcións de &Restaurar</translation> </message> <message> - <location line="-323"/> + <location line="-313"/> <source>&Network</source> <translation>&Rede</translation> </message> <message> - <location line="+6"/> + <location line="-131"/> + <source>(0 = auto, <0 = leave that many cores free)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+36"/> + <source>W&allet</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+65"/> + <source>Expert</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+9"/> + <source>Enable coin &control features</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+7"/> + <source>If you disable the spending of unconfirmed change, the change from a transaction cannot be used until that transaction has at least one confirmation. This also affects how your balance is computed.</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+3"/> + <source>&Spend unconfirmed change</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+17"/> <source>Automatically open the Bitcoin client port on the router. This only works when your router supports UPnP and it is enabled.</source> <translation>Abrir automáticamente o porto do cliente Bitcoin no router. Esto so funciona se o teu router soporta UPnP e está habilitado.</translation> </message> @@ -1418,17 +1460,12 @@ Dirección: %4 <translation>&Visualizar direccións na listaxe de transaccións</translation> </message> <message> - <location line="+7"/> + <location line="-262"/> <source>Whether to show coin control features or not.</source> <translation type="unfinished"/> </message> <message> - <location line="+3"/> - <source>Display coin &control features (experts only)</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+136"/> + <location line="+398"/> <source>&OK</source> <translation>&OK</translation> </message> @@ -1438,17 +1475,17 @@ Dirección: %4 <translation>&Cancelar</translation> </message> <message> - <location filename="../optionsdialog.cpp" line="+67"/> + <location filename="../optionsdialog.cpp" line="+72"/> <source>default</source> <translation>por defecto</translation> </message> <message> - <location line="+57"/> + <location line="+58"/> <source>none</source> <translation type="unfinished"/> </message> <message> - <location line="+75"/> + <location line="+80"/> <source>Confirm options reset</source> <translation>Confirmar opcións de restaurar</translation> </message> @@ -1488,19 +1525,14 @@ Dirección: %4 <translation>A información amosada por estar desactualizada. O teu moedeiro sincronÃzase automáticamente coa rede Bitcoin despois de que se estableza unha conexión, pero este proceso non está todavÃa rematado.</translation> </message> <message> - <location line="-155"/> - <source>Unconfirmed:</source> - <translation>Sen confirmar:</translation> - </message> - <message> - <location line="-83"/> + <location line="-238"/> <source>Wallet</source> <translation>Moedeiro</translation> </message> <message> <location line="+51"/> - <source>Confirmed:</source> - <translation>Confirmado:</translation> + <source>Available:</source> + <translation type="unfinished"/> </message> <message> <location line="+16"/> @@ -1508,7 +1540,12 @@ Dirección: %4 <translation>O teu balance actualmente dispoñible</translation> </message> <message> - <location line="+32"/> + <location line="+16"/> + <source>Pending:</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+16"/> <source>Total of transactions that have yet to be confirmed, and do not yet count toward the spendable balance</source> <translation>Total de transaccións que aÃnda teñen que ser confirmadas, e non contan todavÃa dentro do balance gastable</translation> </message> @@ -1641,23 +1678,29 @@ Dirección: %4 <context> <name>QObject</name> <message> - <location filename="../bitcoin.cpp" line="+71"/> - <location line="+11"/> + <location filename="../bitcoin.cpp" line="+63"/> + <location line="+7"/> + <location line="+13"/> <source>Bitcoin</source> <translation>Bitcoin</translation> </message> <message> - <location line="+1"/> + <location line="-19"/> <source>Error: Specified data directory "%1" does not exist.</source> <translation>Erro: O directorio de datos especificado "%1" non existe.</translation> </message> <message> - <location line="-12"/> + <location line="+7"/> + <source>Error: Cannot parse configuration file: %1. Only use key=value syntax.</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+12"/> <source>Error: Invalid combination of -regtest and -testnet.</source> <translation>Erro: combinación inválida de -regtest e -testnet.</translation> </message> <message> - <location filename="../guiutil.cpp" line="+82"/> + <location filename="../guiutil.cpp" line="+89"/> <source>Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source> <translation>Introduce unha dirección Bitcoin (exemplo: 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation> </message> @@ -1703,7 +1746,7 @@ Dirección: %4 <location line="+36"/> <location line="+23"/> <location line="+23"/> - <location filename="../rpcconsole.cpp" line="+359"/> + <location filename="../rpcconsole.cpp" line="+373"/> <source>N/A</source> <translation>N/A</translation> </message> @@ -1799,11 +1842,13 @@ Dirección: %4 </message> <message> <location line="+64"/> + <location filename="../rpcconsole.cpp" line="-10"/> <source>In:</source> <translation>Dentro:</translation> </message> <message> <location line="+80"/> + <location filename="../rpcconsole.cpp" line="+1"/> <source>Out:</source> <translation>Fóra:</translation> </message> @@ -1828,7 +1873,7 @@ Dirección: %4 <translation>Limpar consola</translation> </message> <message> - <location filename="../rpcconsole.cpp" line="-30"/> + <location filename="../rpcconsole.cpp" line="-35"/> <source>Welcome to the Bitcoin RPC console.</source> <translation>Benvido á consola RPC de Bitcoin</translation> </message> @@ -1843,7 +1888,7 @@ Dirección: %4 <translation>Escribe <b>axuda</b> para unha vista xeral dos comandos dispoñibles.</translation> </message> <message> - <location line="+122"/> + <location line="+136"/> <source>%1 B</source> <translation>%1 B</translation> </message> @@ -1959,7 +2004,7 @@ Dirección: %4 <translation type="unfinished"/> </message> <message> - <location line="+11"/> + <location line="+14"/> <source>Remove the selected entries from the list</source> <translation type="unfinished"/> </message> @@ -1969,7 +2014,7 @@ Dirección: %4 <translation type="unfinished"/> </message> <message> - <location filename="../receivecoinsdialog.cpp" line="+38"/> + <location filename="../receivecoinsdialog.cpp" line="+39"/> <source>Copy label</source> <translation>Copiar etiqueta</translation> </message> @@ -2190,12 +2235,12 @@ Dirección: %4 <translation>Limpar &Todo</translation> </message> <message> - <location line="+52"/> + <location line="+58"/> <source>Balance:</source> <translation>Balance:</translation> </message> <message> - <location line="-78"/> + <location line="-84"/> <source>Confirm the send action</source> <translation>Confirmar a acción de envÃo</translation> </message> @@ -2440,7 +2485,7 @@ Dirección: %4 <context> <name>ShutdownWindow</name> <message> - <location filename="../utilitydialog.cpp" line="+48"/> + <location filename="../utilitydialog.cpp" line="+52"/> <source>Bitcoin Core is shutting down...</source> <translation type="unfinished"/> </message> @@ -2640,7 +2685,7 @@ Dirección: %4 <context> <name>SplashScreen</name> <message> - <location filename="../splashscreen.cpp" line="+28"/> + <location filename="../splashscreen.cpp" line="+32"/> <source>Bitcoin Core</source> <translation>Core de Bitcoin</translation> </message> @@ -2672,6 +2717,11 @@ Dirección: %4 </message> <message> <location line="+6"/> + <source>conflicted</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+2"/> <source>%1/offline</source> <translation>%1/fóra de liña</translation> </message> @@ -2833,12 +2883,12 @@ Dirección: %4 <translation>, non foi propagado con éxito todavÃa</translation> </message> <message numerus="yes"> - <location line="-35"/> + <location line="-37"/> <source>Open for %n more block(s)</source> <translation><numerusform>Abrir para %s bloque máis</numerusform><numerusform>Abrir para %n bloques máis</numerusform></translation> </message> <message> - <location line="+70"/> + <location line="+72"/> <source>unknown</source> <translation>descoñecido</translation> </message> @@ -2879,12 +2929,12 @@ Dirección: %4 <translation>Cantidade</translation> </message> <message> - <location line="+59"/> + <location line="+78"/> <source>Immature (%1 confirmations, will be available after %2)</source> <translation type="unfinished"/> </message> <message numerus="yes"> - <location line="+16"/> + <location line="-21"/> <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> @@ -2894,23 +2944,12 @@ Dirección: %4 <translation>Aberto ata %1</translation> </message> <message> - <location line="+3"/> - <source>Offline (%1 confirmations)</source> - <translation>Sen liña (%1 confirmacións)</translation> - </message> - <message> - <location line="+3"/> - <source>Unconfirmed (%1 of %2 confirmations)</source> - <translation>Sen confirmar (%1 de %2 confirmacións)</translation> - </message> - <message> - <location line="-22"/> - <location line="+25"/> + <location line="+12"/> <source>Confirmed (%1 confirmations)</source> <translation>Confirmado (%1 confirmacións)</translation> </message> <message> - <location line="-22"/> + <location line="+9"/> <source>This block was not received by any other nodes and will probably not be accepted!</source> <translation>Este bloque non foi recibido por ningún outro nodo e probablemente non será aceptado!</translation> </message> @@ -2920,7 +2959,27 @@ Dirección: %4 <translation>Xerado pero non aceptado</translation> </message> <message> - <location line="+62"/> + <location line="-21"/> + <source>Offline</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+3"/> + <source>Unconfirmed</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+3"/> + <source>Confirming (%1 of %2 recommended confirmations)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+6"/> + <source>Conflicted</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+51"/> <source>Received with</source> <translation>Recibido con</translation> </message> @@ -2950,7 +3009,7 @@ Dirección: %4 <translation>(n/a)</translation> </message> <message> - <location line="+199"/> + <location line="+190"/> <source>Transaction status. Hover over this field to show number of confirmations.</source> <translation>Estado da transacción. Pasa por riba deste campo para amosar o número de confirmacións.</translation> </message> @@ -3079,7 +3138,7 @@ Dirección: %4 <translation>Amosar detalles da transacción</translation> </message> <message> - <location line="+142"/> + <location line="+140"/> <source>Export Transaction History</source> <translation>Exportar Historial de Transaccións</translation> </message> @@ -3173,7 +3232,7 @@ Dirección: %4 <context> <name>WalletView</name> <message> - <location filename="../walletview.cpp" line="+43"/> + <location filename="../walletview.cpp" line="+44"/> <source>&Export</source> <translation>&Exportar</translation> </message> @@ -3183,7 +3242,7 @@ Dirección: %4 <translation>Exportar os datos da pestaña actual a un arquivo.</translation> </message> <message> - <location line="+181"/> + <location line="+184"/> <source>Backup Wallet</source> <translation>Copia de Seguridade de Moedeiro</translation> </message> @@ -3216,12 +3275,12 @@ Dirección: %4 <context> <name>bitcoin-core</name> <message> - <location filename="../bitcoinstrings.cpp" line="+221"/> + <location filename="../bitcoinstrings.cpp" line="+261"/> <source>Usage:</source> <translation>Emprego:</translation> </message> <message> - <location line="-54"/> + <location line="-66"/> <source>List commands</source> <translation>Listar comandos</translation> </message> @@ -3231,12 +3290,12 @@ Dirección: %4 <translation>Obter axuda para un comando</translation> </message> <message> - <location line="+26"/> + <location line="+27"/> <source>Options:</source> <translation>Opcións:</translation> </message> <message> - <location line="+22"/> + <location line="+32"/> <source>Specify configuration file (default: bitcoin.conf)</source> <translation>Especificar arquivo de configuración (por defecto: bitcoin.conf)</translation> </message> @@ -3251,72 +3310,72 @@ Dirección: %4 <translation>Especificar directorio de datos</translation> </message> <message> - <location line="-9"/> - <source>Set database cache size in megabytes (default: 25)</source> - <translation>Fixar tamaño da caché da base de datos en megabytes (por defecto: 25)</translation> - </message> - <message> - <location line="-26"/> + <location line="-46"/> <source>Listen for connections on <port> (default: 8333 or testnet: 18333)</source> <translation>Escoitar conexións no <porto> (por defecto: 8333 ou testnet: 18333)</translation> </message> <message> - <location line="+5"/> + <location line="+6"/> <source>Maintain at most <n> connections to peers (default: 125)</source> <translation>Manter como moito <n> conexións con pares (por defecto: 125)</translation> </message> <message> - <location line="-51"/> + <location line="-57"/> <source>Connect to a node to retrieve peer addresses, and disconnect</source> <translation>Conectar a nodo para recuperar direccións de pares, e desconectar</translation> </message> <message> - <location line="+84"/> + <location line="+100"/> <source>Specify your own public address</source> <translation>Especificar a túa propia dirección pública</translation> </message> <message> - <location line="+5"/> + <location line="+6"/> <source>Threshold for disconnecting misbehaving peers (default: 100)</source> <translation>Umbral para desconectar pares con mal comportamento (por defecto: 100)</translation> </message> <message> - <location line="-148"/> + <location line="-172"/> <source>Number of seconds to keep misbehaving peers from reconnecting (default: 86400)</source> <translation>Número de segundos para manter sen reconectar aos pares con mal comportamento (por defecto: 86400)</translation> </message> <message> - <location line="-36"/> + <location line="-52"/> <source>An error occurred while setting up the RPC port %u for listening on IPv4: %s</source> <translation>Ocorreu un erro mentres se establecÃa o porto RPC %u para escoitar sobre IPv4: %s</translation> </message> <message> - <location line="+34"/> + <location line="+50"/> <source>Listen for JSON-RPC connections on <port> (default: 8332 or testnet: 18332)</source> <translation>Escoitar conexións JSON-RPC no <porto> (por defecto: 8332 ou testnet: 18332)</translation> </message> <message> - <location line="+45"/> + <location line="+51"/> <source>Accept command line and JSON-RPC commands</source> <translation>Aceptar liña de comandos e comandos JSON-RPC</translation> </message> <message> - <location line="+80"/> + <location line="+7"/> + <source>Bitcoin Core RPC client version</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+87"/> <source>Run in the background as a daemon and accept commands</source> <translation>Executar no fondo como un demo e aceptar comandos</translation> </message> <message> - <location line="+39"/> + <location line="+43"/> <source>Use the test network</source> <translation>Empregar a rede de proba</translation> </message> <message> - <location line="-118"/> + <location line="-136"/> <source>Accept connections from outside (default: 1 if no -proxy or -connect)</source> <translation>Aceptar conexións de fóra (por defecto: 1 se non -proxy ou -connect)</translation> </message> <message> - <location line="-95"/> + <location line="-117"/> <source>%s, you must set a rpcpassword in the configuration file: %s It is recommended you use the following random password: @@ -3356,9 +3415,9 @@ por exemplo: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Enlazar a unha dirección dada e escoitar sempre nela. Emprega a notación [host]:post para IPv6</translation> </message> <message> - <location line="+3"/> - <source>Cannot obtain a lock on data directory %s. Bitcoin is probably already running.</source> - <translation>Non se pode obter un bloqueo sobre o directorio de datos %s. Bitcoin está probablemente xa executándose.</translation> + <location line="+6"/> + <source>Continuously rate-limit free transactions to <n>*1000 bytes per minute (default:15)</source> + <translation type="unfinished"/> </message> <message> <location line="+3"/> @@ -3372,6 +3431,11 @@ por exemplo: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. </message> <message> <location line="+3"/> + <source>Error: Listening for incoming connections failed (listen returned error %d)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+2"/> <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> @@ -3386,12 +3450,47 @@ por exemplo: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Executar comando cando unha transacción do moedeiro cambia (%s no comando é substituÃdo por TxID)</translation> </message> <message> - <location line="+18"/> + <location line="+6"/> + <source>Fees smaller than this are considered zero fee (for transaction creation) (default:</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+3"/> + <source>Flush database activity from memory pool to disk log every <n> megabytes (default: 100)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+3"/> + <source>How thorough the block verification of -checkblocks is (0-4, default: 3)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+2"/> + <source>In this mode -genproclimit controls how many blocks are generated immediately.</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+12"/> + <source>Set the number of script verification threads (%u to %d, 0 = auto, <0 = leave that many cores free, default: %d)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+3"/> + <source>Set the processor limit for when generation is on (-1 = unlimited, default: -1)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+3"/> <source>This is a pre-release test build - use at your own risk - do not use for mining or merchant applications</source> <translation>Esta é unha build de test pre-lanzamento - emprégaa baixo o teu propio risco - non empregar para minado ou aplicacións de comerciantes</translation> </message> <message> - <location line="+5"/> + <location line="+3"/> + <source>Unable to bind to %s on this computer. Bitcoin Core is probably already running.</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+3"/> <source>Use separate SOCKS5 proxy to reach peers via Tor hidden services (default: -proxy)</source> <translation type="unfinished"/> </message> @@ -3427,6 +3526,16 @@ por exemplo: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. </message> <message> <location line="+9"/> + <source>(default: 1)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>(default: wallet.dat)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> <source><category> can be:</source> <translation><categorÃa> pode ser:</translation> </message> @@ -3441,17 +3550,17 @@ por exemplo: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+1"/> - <source>Bitcoin RPC client version</source> - <translation>Versión de cliente RPC de Bitcoin</translation> - </message> - <message> - <location line="+1"/> + <location line="+2"/> <source>Block creation options:</source> <translation>Opcións de creación de bloque:</translation> </message> <message> <location line="+5"/> + <source>Clear list of wallet transactions (diagnostic tool; implies -rescan)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> <source>Connect only to the specified node(s)</source> <translation>Conectar so ao(s) nodo(s) especificado(s)</translation> </message> @@ -3467,11 +3576,26 @@ por exemplo: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. </message> <message> <location line="+2"/> + <source>Connection options:</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> <source>Corrupted block database detected</source> <translation>Detectada base de datos de bloques corrupta.</translation> </message> <message> <location line="+1"/> + <source>Debugging/Testing options:</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>Disable safemode, override a real safe mode event (default: 0)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> <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> @@ -3582,11 +3706,21 @@ por exemplo: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. </message> <message> <location line="+1"/> + <source>Fees smaller than this are considered zero fee (for relaying) (default:</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> <source>Find peers using DNS lookup (default: 1 unless -connect)</source> <translation>Atopar pares usando lookup DNS (por defecto: 1 agás -connect)</translation> </message> <message> <location line="+1"/> + <source>Force safe mode (default: 0)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> <source>Generate coins (default: 0)</source> <translation>Xerar moedas (por defecto: 0)</translation> </message> @@ -3597,11 +3731,6 @@ por exemplo: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. </message> <message> <location line="+1"/> - <source>How thorough the block verification is (0-4, default: 3)</source> - <translation>Como de exhaustiva é a verificación de bloques (0-4, pro defecto: 3)</translation> - </message> - <message> - <location line="+1"/> <source>If <category> is not supplied, output all debugging information.</source> <translation type="unfinished"/> </message> @@ -3616,7 +3745,7 @@ por exemplo: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Dirección -onion inválida: '%s'</translation> </message> <message> - <location line="+15"/> + <location line="+17"/> <source>Not enough file descriptors available.</source> <translation>Non hai suficientes descritores de arquivo dispoñibles.</translation> </message> @@ -3626,27 +3755,27 @@ por exemplo: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+1"/> + <location line="+4"/> <source>RPC client options:</source> <translation type="unfinished"/> </message> <message> - <location line="+1"/> + <location line="+4"/> <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> - <location line="+5"/> + <location line="+6"/> <source>Select SOCKS version for -proxy (4 or 5, default: 5)</source> <translation type="unfinished"/> </message> <message> - <location line="+1"/> - <source>Send command to Bitcoin server</source> - <translation>Enviar comando a servidor Bitcoin</translation> + <location line="+6"/> + <source>Set database cache size in megabytes (%d to %d, default: %d)</source> + <translation type="unfinished"/> </message> <message> - <location line="+7"/> + <location line="+2"/> <source>Set maximum block size in bytes (default: %d)</source> <translation type="unfinished"/> </message> @@ -3656,17 +3785,17 @@ por exemplo: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Fixar o número de fÃos para as chamadas aos servicios RPC (por defecto: 4)</translation> </message> <message> - <location line="+7"/> + <location line="+10"/> <source>Specify wallet file (within data directory)</source> <translation>Especificar arquivo do moedeiro (dentro do directorio de datos)</translation> </message> <message> <location line="+2"/> - <source>Start Bitcoin server</source> - <translation>Comezar servidor Bitcoin</translation> + <source>Spend unconfirmed change when sending transactions (default: 1)</source> + <translation type="unfinished"/> </message> <message> - <location line="+3"/> + <location line="+4"/> <source>This is intended for regression testing tools and app development.</source> <translation type="unfinished"/> </message> @@ -3711,17 +3840,22 @@ por exemplo: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Precisas reconstruÃr a base de datos empregando -reindex para cambiar -txindex</translation> </message> <message> - <location line="-79"/> + <location line="-92"/> <source>Imports blocks from external blk000??.dat file</source> <translation>Importa bloques dende arquivos blk000??.dat externos</translation> </message> <message> - <location line="-105"/> + <location line="-149"/> + <source>Cannot obtain a lock on data directory %s. Bitcoin Core is probably already running.</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+22"/> <source>Execute command when a relevant alert is received or we see a really long fork (%s in cmd is replaced by message)</source> <translation>Executar comando cando se recibe unha alerta relevante ou vemos un fork realmente longo (%s no cmd é substituÃdo pola mensaxe)</translation> </message> <message> - <location line="+14"/> + <location line="+25"/> <source>Output debugging information (default: 0, supplying <category> is optional)</source> <translation type="unfinished"/> </message> @@ -3731,12 +3865,7 @@ por exemplo: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+2"/> - <source>Set the number of script verification threads (up to 16, 0 = auto, <0 = leave that many cores free, default: 0)</source> - <translation>Fixar o número de fÃos para sripts de verificación (ata 16, 0 = auto, <0 = deixa tantos cores libres, por defecto: 0)</translation> - </message> - <message> - <location line="+89"/> + <location line="+102"/> <source>Information</source> <translation>Información</translation> </message> @@ -3751,7 +3880,17 @@ por exemplo: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Cantidade inválida para -mintxfee=<cantidade>: '%s'</translation> </message> <message> - <location line="+8"/> + <location line="+3"/> + <source>Limit size of signature cache to <n> entries (default: 50000)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+6"/> + <source>Log transaction priority and fee per kB when mining blocks (default: 0)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> <source>Maintain a full transaction index (default: 0)</source> <translation>Manter un Ãndice completo de transaccións (por defecto: 0)</translation> </message> @@ -3776,12 +3915,52 @@ por exemplo: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Conectar so a nodos na rede <net> (IPv4, IPv6 ou Tor)</translation> </message> <message> - <location line="+9"/> + <location line="+4"/> + <source>Print block on startup, if found in block index</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>Print block tree on startup (default: 0)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>RPC SSL options: (see the Bitcoin Wiki for SSL setup instructions)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+2"/> + <source>RPC server options:</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>Randomly drop 1 of every <n> network messages</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>Randomly fuzz 1 of every <n> network messages</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+4"/> + <source>Run a thread to flush wallet periodically (default: 1)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+2"/> <source>SSL options: (see the Bitcoin Wiki for SSL setup instructions)</source> <translation>Opcións SSL: (ver Å„a Wiki Bitcoin as instrucción de configuración de SSL)</translation> </message> <message> - <location line="+4"/> + <location line="+2"/> + <source>Send command to Bitcoin Core</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+2"/> <source>Send trace/debug info to console instead of debug.log file</source> <translation>Enviar traza/información de depuración á consola en lugar de ao arquivo debug.log</translation> </message> @@ -3792,6 +3971,21 @@ por exemplo: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. </message> <message> <location line="+2"/> + <source>Sets the DB_PRIVATE flag in the wallet db environment (default: 1)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>Show all debugging options (usage: --help -help-debug)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>Show benchmark information (default: 0)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> <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> @@ -3807,6 +4001,11 @@ por exemplo: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. </message> <message> <location line="+6"/> + <source>Start Bitcoin Core Daemon</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> <source>System error: </source> <translation>Erro do sistema:</translation> </message> @@ -3852,6 +4051,16 @@ por exemplo: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. </message> <message> <location line="+2"/> + <source>Zapping all transactions from wallet...</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>on startup</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> <source>version</source> <translation>versión</translation> </message> @@ -3861,47 +4070,47 @@ por exemplo: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>wallet.dat corrupto, fallou o gardado</translation> </message> <message> - <location line="-58"/> + <location line="-71"/> <source>Password for JSON-RPC connections</source> <translation>Contrasinal para conexións JSON-RPC</translation> </message> <message> - <location line="-70"/> + <location line="-77"/> <source>Allow JSON-RPC connections from specified IP address</source> <translation>Permitir conexións JSON-RPC dende direccións IP especificadas</translation> </message> <message> - <location line="+80"/> + <location line="+94"/> <source>Send commands to node running on <ip> (default: 127.0.0.1)</source> <translation>Enviar comandos a nodo executando na <ip> (por defecto: 127.0.0.1)</translation> </message> <message> - <location line="-132"/> + <location line="-163"/> <source>Execute command when the best block changes (%s in cmd is replaced by block hash)</source> <translation>Executar comando cando o mellor bloque cambie (%s no comando é sustituÃdo polo hash do bloque)</translation> </message> <message> - <location line="+161"/> + <location line="+196"/> <source>Upgrade wallet to latest format</source> <translation>Actualizar moedeiro ao formato máis recente</translation> </message> <message> - <location line="-24"/> + <location line="-28"/> <source>Set key pool size to <n> (default: 100)</source> <translation>Fixar tamaño do pool de claves a <n> (por defecto: 100)</translation> </message> <message> - <location line="-11"/> + <location line="-12"/> <source>Rescan the block chain for missing wallet transactions</source> <translation>Rescanear transaccións ausentes na cadea de bloques</translation> </message> <message> - <location line="+38"/> + <location line="+43"/> <source>Use OpenSSL (https) for JSON-RPC connections</source> <translation>Empregar OpenSSL (https) para conexións JSON-RPC</translation> </message> <message> - <location line="-30"/> + <location line="-34"/> <source>Server certificate file (default: server.cert)</source> <translation>Arquivo de certificado do servidor (por defecto: server.cert)</translation> </message> @@ -3911,7 +4120,7 @@ por exemplo: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Clave privada do servidor (por defecto: server.perm)</translation> </message> <message> - <location line="+16"/> + <location line="+20"/> <source>This help message</source> <translation>Esta mensaxe de axuda</translation> </message> @@ -3921,17 +4130,17 @@ por exemplo: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Imposible enlazar con %s neste ordenador (enlace devolveu erro %d, %s)</translation> </message> <message> - <location line="-107"/> + <location line="-125"/> <source>Allow DNS lookups for -addnode, -seednode and -connect</source> <translation>Permitir lookup de DNS para -addnote, -seednote e -connect</translation> </message> <message> - <location line="+60"/> + <location line="+66"/> <source>Loading addresses...</source> <translation>Cargando direccións...</translation> </message> <message> - <location line="-37"/> + <location line="-39"/> <source>Error loading wallet.dat: Wallet corrupted</source> <translation>Erro cargando wallet.dat: Moedeiro corrupto</translation> </message> @@ -3941,22 +4150,22 @@ por exemplo: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Erro cargando wallet.dat: O moedeiro precisa unha versión máis nova de Bitcoin</translation> </message> <message> - <location line="+98"/> + <location line="+112"/> <source>Wallet needed to be rewritten: restart Bitcoin to complete</source> <translation>PrecÃsase rescribir o moedeiro: reinicie Bitcoin para completar</translation> </message> <message> - <location line="-100"/> + <location line="-114"/> <source>Error loading wallet.dat</source> <translation>Erro cargando wallet.dat</translation> </message> <message> - <location line="+31"/> + <location line="+32"/> <source>Invalid -proxy address: '%s'</source> <translation>Dirección -proxy inválida: '%s'</translation> </message> <message> - <location line="+56"/> + <location line="+69"/> <source>Unknown network specified in -onlynet: '%s'</source> <translation>Rede descoñecida especificada en -onlynet: '%s'</translation> </message> @@ -3966,7 +4175,7 @@ por exemplo: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Versión solicitada de proxy -socks descoñecida: %i</translation> </message> <message> - <location line="-101"/> + <location line="-119"/> <source>Cannot resolve -bind address: '%s'</source> <translation>Non se pode resolver a dirección -bind: '%s'</translation> </message> @@ -3976,7 +4185,7 @@ por exemplo: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Non se pode resolver dirección -externalip: '%s'</translation> </message> <message> - <location line="+48"/> + <location line="+53"/> <source>Invalid amount for -paytxfee=<amount>: '%s'</source> <translation>Cantidade inválida para -paytxfee=<cantidade>: '%s'</translation> </message> @@ -3991,27 +4200,22 @@ por exemplo: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Fondos insuficientes</translation> </message> <message> - <location line="+10"/> + <location line="+11"/> <source>Loading block index...</source> <translation>Cargando Ãndice de bloques...</translation> </message> <message> - <location line="-62"/> + <location line="-68"/> <source>Add a node to connect to and attempt to keep the connection open</source> <translation>Engadir un nodo ao que conectarse e tentar manter a conexión aberta</translation> </message> <message> - <location line="-32"/> - <source>Unable to bind to %s on this computer. Bitcoin is probably already running.</source> - <translation>Imposible enlazar a %s neste ordenador. Bitcoin probablemente xa se estea executando.</translation> - </message> - <message> - <location line="+95"/> + <location line="+69"/> <source>Loading wallet...</source> <translation>Cargando moedeiro...</translation> </message> <message> - <location line="-56"/> + <location line="-62"/> <source>Cannot downgrade wallet</source> <translation>Non se pode desactualizar o moedeiro</translation> </message> @@ -4021,27 +4225,27 @@ por exemplo: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Non se pode escribir a dirección por defecto</translation> </message> <message> - <location line="+67"/> + <location line="+80"/> <source>Rescanning...</source> <translation>Rescaneando...</translation> </message> <message> - <location line="-58"/> + <location line="-67"/> <source>Done loading</source> <translation>Carga completa</translation> </message> <message> - <location line="+85"/> + <location line="+99"/> <source>To use the %s option</source> <translation>Empregar a opción %s</translation> </message> <message> - <location line="-77"/> + <location line="-91"/> <source>Error</source> <translation>Erro</translation> </message> <message> - <location line="-35"/> + <location line="-41"/> <source>You must set rpcpassword=<password> in the configuration file: %s If the file does not exist, create it with owner-readable-only file permissions.</source> diff --git a/src/qt/locale/bitcoin_he.ts b/src/qt/locale/bitcoin_he.ts index 2c070d20b3..2d56efe8ae 100644 --- a/src/qt/locale/bitcoin_he.ts +++ b/src/qt/locale/bitcoin_he.ts @@ -1,10 +1,10 @@ -<?xml version="1.0" ?><!DOCTYPE TS><TS language="he" version="2.0"> +<?xml version="1.0" ?><!DOCTYPE TS><TS language="he" version="2.1"> <context> <name>AboutDialog</name> <message> <location filename="../forms/aboutdialog.ui" line="+14"/> <source>About Bitcoin Core</source> - <translation type="unfinished"/> + <translation>על ×ודות ליבת ביטקוין</translation> </message> <message> <location line="+39"/> @@ -71,7 +71,7 @@ This product includes software developed by the OpenSSL Project for use in the O <translation type="unfinished"/> </message> <message> - <location line="+52"/> + <location line="+58"/> <source>C&lose</source> <translation type="unfinished"/> </message> @@ -81,7 +81,7 @@ This product includes software developed by the OpenSSL Project for use in the O <translation>העתק כתובת</translation> </message> <message> - <location filename="../forms/addressbookpage.ui" line="-41"/> + <location filename="../forms/addressbookpage.ui" line="-47"/> <source>Delete the currently selected address from the list</source> <translation>מחק ×ת הכתובת ×©× ×‘×—×¨×” מהרשימה</translation> </message> @@ -328,7 +328,7 @@ This product includes software developed by the OpenSSL Project for use in the O <context> <name>BitcoinGUI</name> <message> - <location filename="../bitcoingui.cpp" line="+295"/> + <location filename="../bitcoingui.cpp" line="+294"/> <source>Sign &message...</source> <translation>×—×ª×•× ×¢×œ הודעה</translation> </message> @@ -343,12 +343,12 @@ This product includes software developed by the OpenSSL Project for use in the O <translation>&סקירה</translation> </message> <message> - <location line="-137"/> + <location line="-136"/> <source>Node</source> <translation type="unfinished"/> </message> <message> - <location line="+138"/> + <location line="+137"/> <source>Show general overview of wallet</source> <translation>הצג סקירה כללית של ×”××¨× ×§</translation> </message> @@ -469,17 +469,17 @@ This product includes software developed by the OpenSSL Project for use in the O <translation>×מת הודעה...</translation> </message> <message> - <location line="+430"/> + <location line="+440"/> <source>Bitcoin</source> <translation>ביטקוין</translation> </message> <message> - <location line="-643"/> + <location line="-652"/> <source>Wallet</source> <translation>××¨× ×§</translation> </message> <message> - <location line="+146"/> + <location line="+145"/> <source>&Send</source> <translation>&שלח</translation> </message> @@ -535,20 +535,20 @@ This product includes software developed by the OpenSSL Project for use in the O <translation>סרגל ×›×œ×™× ×˜×בי×</translation> </message> <message> - <location line="-284"/> - <location line="+376"/> + <location line="-283"/> + <location line="+375"/> <source>[testnet]</source> <translation>[רשת-בדיקה]</translation> </message> <message> - <location line="-401"/> + <location line="-400"/> <source>Bitcoin Core</source> <translation>ליבת ביטקוין</translation> </message> <message> - <location line="+163"/> + <location line="+162"/> <source>Request payments (generates QR codes and bitcoin: URIs)</source> - <translation type="unfinished"/> + <translation>בקש ×ª×©×œ×•×ž×™× (מייצר קודיי QR וסכימות URI של :bitcoin)</translation> </message> <message> <location line="+29"/> @@ -608,7 +608,7 @@ This product includes software developed by the OpenSSL Project for use in the O <translation>×”×•×©×œ× ×¢×™×‘×•×“ של %1 ×‘×œ×•×§×™× ×©×œ היסטוריית פעולות.</translation> </message> <message numerus="yes"> - <location line="+23"/> + <location line="+27"/> <source>%n hour(s)</source> <translation><numerusform>%n שעה</numerusform><numerusform>%n שעות</numerusform></translation> </message> @@ -619,6 +619,7 @@ This product includes software developed by the OpenSSL Project for use in the O </message> <message numerus="yes"> <location line="+4"/> + <location line="+6"/> <source>%n week(s)</source> <translation><numerusform>%n שבוע</numerusform><numerusform>%n שבועות</numerusform></translation> </message> @@ -663,12 +664,12 @@ This product includes software developed by the OpenSSL Project for use in the O <translation>מידע</translation> </message> <message> - <location line="-85"/> + <location line="-95"/> <source>Up to date</source> <translation>×¢×“×›× ×™</translation> </message> <message> - <location line="+34"/> + <location line="+44"/> <source>Catching up...</source> <translation>מתעדכן...</translation> </message> @@ -705,7 +706,7 @@ Address: %4 <translation>×”××¨× ×§ <b>מוצפן</b> וכרגע <b>× ×¢×•×œ</b></translation> </message> <message> - <location filename="../bitcoin.cpp" line="+435"/> + <location filename="../bitcoin.cpp" line="+441"/> <source>A fatal error occurred. Bitcoin can no longer continue safely and will quit.</source> <translation>שגי××” ×¡×•×¤× ×™×ª ×ירעה. ביטקוין ××™× ×• יכול להמשיך לפעול בבטחה ולכן ייסגר.</translation> </message> @@ -713,7 +714,7 @@ Address: %4 <context> <name>ClientModel</name> <message> - <location filename="../clientmodel.cpp" line="+119"/> + <location filename="../clientmodel.cpp" line="+128"/> <source>Network Alert</source> <translation>×זעקת רשת</translation> </message> @@ -811,7 +812,7 @@ Address: %4 <translation>קדימות</translation> </message> <message> - <location filename="../coincontroldialog.cpp" line="+42"/> + <location filename="../coincontroldialog.cpp" line="+41"/> <source>Copy address</source> <translation>העתק כתובת</translation> </message> @@ -877,7 +878,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+323"/> + <location line="+332"/> <source>highest</source> <translation>×”×›×™ גבוה</translation> </message> @@ -995,7 +996,7 @@ Address: %4 </message> <message> <location line="+43"/> - <location line="+66"/> + <location line="+63"/> <source>(no label)</source> <translation>(×œ×œ× ×ª×•×™×ª)</translation> </message> @@ -1083,7 +1084,7 @@ Address: %4 <message> <location filename="../intro.cpp" line="+65"/> <source>A new data directory will be created.</source> - <translation type="unfinished"/> + <translation>ספריית מידע חדשה תיווצר.</translation> </message> <message> <location line="+22"/> @@ -1093,17 +1094,17 @@ Address: %4 <message> <location line="+2"/> <source>Directory already exists. Add %1 if you intend to create a new directory here.</source> - <translation type="unfinished"/> + <translation>הספריה כבר קיימת. הוסף %1 ×× ×‘×¨×¦×•× ×š ליצור ספריה חדשה ×›×ן.</translation> </message> <message> <location line="+3"/> <source>Path already exists, and is not a directory.</source> - <translation type="unfinished"/> + <translation>×”× ×ª×™×‘ כבר ×§×™×™× ×•××™× ×• מצביע על ספרייה.</translation> </message> <message> <location line="+7"/> <source>Cannot create data directory here.</source> - <translation type="unfinished"/> + <translation>×œ× × ×™×ª×Ÿ ליצור ספריית מידע ×›×ן.</translation> </message> </context> <context> @@ -1184,15 +1185,15 @@ Address: %4 <message> <location line="+10"/> <source>Use the default data directory</source> - <translation type="unfinished"/> + <translation>השתמש בברירת המחדל עבור ספריית המידע.</translation> </message> <message> <location line="+7"/> <source>Use a custom data directory:</source> - <translation type="unfinished"/> + <translation>השתמש בספריית מידע מות×מת ×ישית:</translation> </message> <message> - <location filename="../intro.cpp" line="+85"/> + <location filename="../intro.cpp" line="+82"/> <source>Bitcoin</source> <translation>ביטקוין</translation> </message> @@ -1209,12 +1210,12 @@ Address: %4 <message> <location line="+9"/> <source>GB of free space available</source> - <translation type="unfinished"/> + <translation>×’"ב של שטח ×חסון ×¤× ×•×™</translation> </message> <message> <location line="+3"/> <source>(of %1GB needed)</source> - <translation type="unfinished"/> + <translation>(מתוך %1 ×’"ב × ×—×•×¦×™×)</translation> </message> </context> <context> @@ -1260,7 +1261,7 @@ Address: %4 <message> <location line="+122"/> <source>Optional transaction fee per kB that helps make sure your transactions are processed quickly. Most transactions are 1 kB.</source> - <translation>עמלת פעולה ××•×¤×¦×™×•× ×œ×™×ª לכל kB תבטיח שהפעולה שלך תעובד בזריזות. רוב הפעולות הן 1 kB. מומלצת עמלה בסך 0.01.</translation> + <translation>עמלת פעולה ××•×¤×¦×™×•× ×œ×™×ª לכל kB תבטיח שהפעולה שלך תעובד בזריזות. רוב הפעולות הן 1 kB.</translation> </message> <message> <location line="+15"/> @@ -1298,12 +1299,7 @@ Address: %4 <translation>קבע ×ת מספר ×ª×”×œ×™×›×•× ×™ ×ימות ×”×¡×§×¨×™×¤×˜×™× (1-16, 0 = ×וטומטי, ברירת מחדל: 0)</translation> </message> <message> - <location line="+107"/> - <source>&Spend unconfirmed change (experts only)</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+37"/> + <location line="+153"/> <source>Connect to the Bitcoin network through a SOCKS proxy.</source> <translation type="unfinished"/> </message> @@ -1318,7 +1314,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+224"/> + <location line="+214"/> <source>Active command-line options that override above options:</source> <translation type="unfinished"/> </message> @@ -1333,22 +1329,37 @@ Address: %4 <translation>×יפוס ×פשרויות</translation> </message> <message> - <location line="-323"/> + <location line="-313"/> <source>&Network</source> <translation>רשת</translation> </message> <message> - <location line="-86"/> + <location line="-95"/> <source>W&allet</source> <translation type="unfinished"/> </message> <message> - <location line="+52"/> + <location line="+65"/> + <source>Expert</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+9"/> + <source>Enable coin &control features</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+7"/> <source>If you disable the spending of unconfirmed change, the change from a transaction cannot be used until that transaction has at least one confirmation. This also affects how your balance is computed.</source> <translation type="unfinished"/> </message> <message> - <location line="+40"/> + <location line="+3"/> + <source>&Spend unconfirmed change</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+17"/> <source>Automatically open the Bitcoin client port on the router. This only works when your router supports UPnP and it is enabled.</source> <translation>פתח ×ת פורט ביטקוין ×‘× ×ª×‘ ב×ופן ×וטומטי. עובד רק ×× UPnP מ×ופשר ×•× ×ª×ž×š ×¢"×™ ×”× ×ª×‘.</translation> </message> @@ -1443,17 +1454,12 @@ Address: %4 <translation>הצג כתובות ברשימת הפעולות</translation> </message> <message> - <location line="+7"/> + <location line="-262"/> <source>Whether to show coin control features or not.</source> <translation type="unfinished"/> </message> <message> - <location line="+3"/> - <source>Display coin &control features (experts only)</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+136"/> + <location line="+398"/> <source>&OK</source> <translation>×ישור</translation> </message> @@ -1585,7 +1591,7 @@ Address: %4 <message> <location line="+96"/> <source>Requested payment amount of %1 is too small (considered dust).</source> - <translation type="unfinished"/> + <translation>×”×¡×›×•× ×”× ×“×¨×© ×œ×ª×©×œ×•× %1 קטן מדי (× ×—×©×‘ ל×בק)</translation> </message> <message> <location line="-221"/> @@ -1630,7 +1636,7 @@ Address: %4 <message> <location line="+73"/> <source>Unverified payment requests to custom payment scripts are unsupported.</source> - <translation type="unfinished"/> + <translation>בקשות ×œ×ª×©×œ×•× ×œ×¡×§×¨×™×¤×˜×™×™ ×ª×©×œ×•× ×ž×•×ª××ž×™× ×ישית ××™× ×Ÿ × ×ª×ž×›×•×ª.</translation> </message> <message> <location line="+59"/> @@ -1640,7 +1646,7 @@ Address: %4 <message> <location line="+43"/> <source>Error communicating with %1: %2</source> - <translation type="unfinished"/> + <translation>שגי××” בתקשורת ×¢× %1: %2</translation> </message> <message> <location line="+24"/> @@ -1650,7 +1656,7 @@ Address: %4 <message> <location line="+11"/> <source>Bad response from server %1</source> - <translation type="unfinished"/> + <translation>×ž×¢× ×” שגוי משרת %1</translation> </message> <message> <location line="+33"/> @@ -1666,20 +1672,20 @@ Address: %4 <context> <name>QObject</name> <message> - <location filename="../bitcoin.cpp" line="+71"/> - <location line="+11"/> + <location filename="../bitcoin.cpp" line="+63"/> + <location line="+14"/> <source>Bitcoin</source> <translation>ביטקוין</translation> </message> <message> - <location line="+1"/> + <location line="-13"/> <source>Error: Specified data directory "%1" does not exist.</source> - <translation type="unfinished"/> + <translation>שגי××”: הספריה "%1" ×œ× ×§×™×™×ž×ª.</translation> </message> <message> - <location line="-12"/> + <location line="+13"/> <source>Error: Invalid combination of -regtest and -testnet.</source> - <translation type="unfinished"/> + <translation>שגי××”: שילוב בלתי חוקי של regtest- ו testnet-.</translation> </message> <message> <location filename="../guiutil.cpp" line="+82"/> @@ -1728,7 +1734,7 @@ Address: %4 <location line="+36"/> <location line="+23"/> <location line="+23"/> - <location filename="../rpcconsole.cpp" line="+359"/> + <location filename="../rpcconsole.cpp" line="+373"/> <source>N/A</source> <translation>N/A</translation> </message> @@ -1824,11 +1830,13 @@ Address: %4 </message> <message> <location line="+64"/> + <location filename="../rpcconsole.cpp" line="-10"/> <source>In:</source> <translation>× ×›× ×¡:</translation> </message> <message> <location line="+80"/> + <location filename="../rpcconsole.cpp" line="+1"/> <source>Out:</source> <translation>יוצ×:</translation> </message> @@ -1853,7 +1861,7 @@ Address: %4 <translation>× ×§×” לוח בקרה</translation> </message> <message> - <location filename="../rpcconsole.cpp" line="-30"/> + <location filename="../rpcconsole.cpp" line="-35"/> <source>Welcome to the Bitcoin RPC console.</source> <translation>×‘×¨×•×›×™× ×”×‘××™× ×œ×œ×•×— בקרת RPC של ביטקוין</translation> </message> @@ -1868,7 +1876,7 @@ Address: %4 <translation>הקלד <b>help</b> בשביל סקירה של הפקודות ×”×–×ž×™× ×•×ª.</translation> </message> <message> - <location line="+122"/> + <location line="+136"/> <source>%1 B</source> <translation>%1 בייט</translation> </message> @@ -1923,7 +1931,7 @@ Address: %4 <message> <location line="-20"/> <source>Reuse one of the previously used receiving addresses. Reusing addresses has security and privacy issues. Do not use this unless re-generating a payment request made before.</source> - <translation type="unfinished"/> + <translation>השתמש שוב ב×חת מכתובות הקבלה שכבר × ×¢×©×” בהן שימוש. לשימוש חוזר בכתובות ישהן השלכות ×בטחה ופרטיות. השתמש בזה רק ×× ×תה מייצר מחדש בקשת ×ª×©×œ×•× ×©×›×‘×¨ × ×¢×©×ª×”.</translation> </message> <message> <location line="+3"/> @@ -1984,7 +1992,7 @@ Address: %4 <translation>הצג</translation> </message> <message> - <location line="+11"/> + <location line="+14"/> <source>Remove the selected entries from the list</source> <translation type="unfinished"/> </message> @@ -1994,7 +2002,7 @@ Address: %4 <translation>הסר</translation> </message> <message> - <location filename="../receivecoinsdialog.cpp" line="+38"/> + <location filename="../receivecoinsdialog.cpp" line="+39"/> <source>Copy label</source> <translation>העתק תוית</translation> </message> @@ -2044,7 +2052,7 @@ Address: %4 <message> <location line="+1"/> <source>URI</source> - <translation type="unfinished"/> + <translation>כתובת (×תר ×ו מש×ב)</translation> </message> <message> <location line="+2"/> @@ -2215,12 +2223,12 @@ Address: %4 <translation>× ×§×” הכל</translation> </message> <message> - <location line="+52"/> + <location line="+58"/> <source>Balance:</source> <translation>יתרה:</translation> </message> <message> - <location line="-78"/> + <location line="-84"/> <source>Confirm the send action</source> <translation>×שר ×ת פעולת השליחה</translation> </message> @@ -2240,7 +2248,7 @@ Address: %4 <location line="+5"/> <location line="+4"/> <source>%1 to %2</source> - <translation type="unfinished"/> + <translation>%1 ×ל %2</translation> </message> <message> <location line="-121"/> @@ -2360,7 +2368,7 @@ Address: %4 <message> <location line="+8"/> <source>Invalid payment address %1</source> - <translation type="unfinished"/> + <translation>כתובת ×ª×©×œ×•× ×©×’×•×™×” %1</translation> </message> </context> <context> @@ -2437,7 +2445,7 @@ Address: %4 <message> <location line="-991"/> <source>Enter a label for this address to add it to the list of used addresses</source> - <translation type="unfinished"/> + <translation>הקלד תווית עבור כתובת זו בכדי להוסיף ×ותה לרשימת הכתובות בשימוש</translation> </message> <message> <location line="+33"/> @@ -2820,12 +2828,12 @@ Address: %4 <message> <location line="+18"/> <source>Merchant</source> - <translation type="unfinished"/> + <translation>סוחר</translation> </message> <message> <location line="+7"/> <source>Generated coins must mature %1 blocks before they can be spent. When you generated this block, it was broadcast to the network to be added to the block chain. If it fails to get into the chain, its state will change to "not accepted" and it won't be spendable. This may occasionally happen if another node generates a block within a few seconds of yours.</source> - <translation type="unfinished"/> + <translation>מטבעות ×—×“×©×™× ×©× ×•×¦×¨×• ×—×™×™×‘×™× ×œ×”×‘×©×™×œ במשך %1 ×‘×œ×•×§×™× ×œ×¤× ×™ ×©× ×™×ª×Ÿ ×œ× ×¦×œ ×ות×. כשבלוק ×–×” × ×•×¦×¨ ×”×•× ×©×•×“×¨ ברשת על ×ž× ×ª ×©×™×™×›× ×¡ לשרשרת הבלוקי×. במקרה ×•×”×•× ×œ× ×™×™×›× ×¡ לשרשרת, מצבו ×™×©×ª× ×” ל"×œ× ×”×ª×§×‘×œ" ×•×œ× × ×™×ª×Ÿ ×™×”×™×” ×œ× ×¦×œ×•. ×–×” יכול לקרות מדי ×¤×¢× ×× ×‘×ž×§×¨×” צומת ×חרת ייצרה בלוק בהבדל של ×©× ×™×•×ª בודדות ממך.</translation> </message> <message> <location line="+8"/> @@ -3118,7 +3126,7 @@ Address: %4 <translation>הצג פרטי פעולה</translation> </message> <message> - <location line="+142"/> + <location line="+140"/> <source>Export Transaction History</source> <translation>×™×¦×•× ×”×™×¡×˜×•×¨×™×™×ª פעולות</translation> </message> @@ -3255,7 +3263,7 @@ Address: %4 <context> <name>bitcoin-core</name> <message> - <location filename="../bitcoinstrings.cpp" line="+223"/> + <location filename="../bitcoinstrings.cpp" line="+226"/> <source>Usage:</source> <translation>שימוש:</translation> </message> @@ -3290,12 +3298,7 @@ Address: %4 <translation>ציין תיקיית × ×ª×•× ×™×</translation> </message> <message> - <location line="-9"/> - <source>Set database cache size in megabytes (default: 25)</source> - <translation>קבע ×ת גודל המטמון של מסד ×”× ×ª×•× ×™× ×‘×ž×’×”×‘×™×™×˜ (ברירת מחדל: 25)</translation> - </message> - <message> - <location line="-26"/> + <location line="-35"/> <source>Listen for connections on <port> (default: 8333 or testnet: 18333)</source> <translation>×”×זן ×œ×—×™×‘×•×¨×™× ×‘<פורט> (ברירת מחדל: 8333 ×ו ברשת הבדיקה: 18333)</translation> </message> @@ -3320,22 +3323,22 @@ Address: %4 <translation>סף ×œ×”×ª× ×ª×§×•×ª ×ž×¢×ž×™×ª×™× ×”× ×•×”×’×™× ×©×œ× ×›×”×œ×›×” (ברירת מחדל: 100)</translation> </message> <message> - <location line="-150"/> + <location line="-151"/> <source>Number of seconds to keep misbehaving peers from reconnecting (default: 86400)</source> <translation>מספר ×©× ×™×•×ª ×œ×ž× ×•×¢ ×ž×¢×ž×™×ª×™× ×”× ×•×”×’×™× ×©×œ× ×›×”×œ×›×” מלהתחבר מחדש (ברירת מחדל: 86400)</translation> </message> <message> - <location line="-36"/> + <location line="-38"/> <source>An error occurred while setting up the RPC port %u for listening on IPv4: %s</source> <translation>×ירעה שגי××” בעת הגדרת פורט RPC %u לה××–× ×” ב-IPv4: %s</translation> </message> <message> - <location line="+34"/> + <location line="+36"/> <source>Listen for JSON-RPC connections on <port> (default: 8332 or testnet: 18332)</source> <translation>×”×זן לחיבורי JSON-RPC ב- <port> (ברירת מחדל: 8332 ×ו רשת בדיקה: 18332)</translation> </message> <message> - <location line="+45"/> + <location line="+46"/> <source>Accept command line and JSON-RPC commands</source> <translation>קבל פקודות משורת הפקודה ו- JSON-RPC</translation> </message> @@ -3355,7 +3358,7 @@ Address: %4 <translation>קבל ×—×™×‘×•×¨×™× ×ž×‘×—×•×¥ (ברירת מחדל: 1 ×œ×œ× -proxy ×ו -connect)</translation> </message> <message> - <location line="-95"/> + <location line="-98"/> <source>%s, you must set a rpcpassword in the configuration file: %s It is recommended you use the following random password: @@ -3382,7 +3385,7 @@ rpcpassword=%s <message> <location line="+12"/> <source>Acceptable ciphers (default: TLSv1.2+HIGH:TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!3DES:@STRENGTH)</source> - <translation type="unfinished"/> + <translation>×¦×¤× ×™× ×§×‘×™×œ×™× (ברירת מחדל: TLSv1.2+HIGH:TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!3DES:@STRENGTH)</translation> </message> <message> <location line="+5"/> @@ -3395,14 +3398,9 @@ rpcpassword=%s <translation>קשור ×¢× ×›×ª×•×‘×ª × ×ª×•× ×” וה×זן לה תמיד. השתמש בסימון [host]:port עבוד IPv6.</translation> </message> <message> - <location line="+3"/> - <source>Cannot obtain a lock on data directory %s. Bitcoin is probably already running.</source> - <translation>×œ× ×ž×¡×•×’×œ להשיג × ×¢×™×œ×” על תיקיית ×”× ×ª×•× ×™× %s. ×›× ×¨××” שביטקוין כבר רץ.</translation> - </message> - <message> - <location line="+3"/> + <location line="+6"/> <source>Enter regression test mode, which uses a special chain in which blocks can be solved instantly. This is intended for regression testing tools and app development.</source> - <translation type="unfinished"/> + <translation>×›× ×™×¡×” למצב בדיקת רגרסיה, בה × ×¢×©×” שימוש בשרשרת מיוחדת המ×פשרת פתרון מיידי של בלוקי×. מצב ×–×” מיועד לכלי בדיקת רגרסיה ופיתוח ×ª×•×›× ×”.</translation> </message> <message> <location line="+4"/> @@ -3411,6 +3409,11 @@ rpcpassword=%s </message> <message> <location line="+3"/> + <source>Error: Listening for incoming connections failed (listen returned error %d)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+2"/> <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> @@ -3430,7 +3433,12 @@ rpcpassword=%s <translation>זוהי ×‘× ×™×™×ª × ×™×¡×™×•×Ÿ טרו×-שחרור - השימוש בה על ×חריותך - ×ין להשתמש לצורך כריה ×ו יישומי מסחר</translation> </message> <message> - <location line="+5"/> + <location line="+3"/> + <source>Unable to bind to %s on this computer. Bitcoin Core is probably already running.</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+3"/> <source>Use separate SOCKS5 proxy to reach peers via Tor hidden services (default: -proxy)</source> <translation type="unfinished"/> </message> @@ -3447,12 +3455,12 @@ rpcpassword=%s <message> <location line="+3"/> <source>Warning: The network does not appear to fully agree! Some miners appear to be experiencing issues.</source> - <translation type="unfinished"/> + <translation>×זהרה: × ×¨××” ×©×œ× ×›×œ הרשת מסכימה! × ×¨××” ×©×™×©× × ×›×•×¨×™× ×שר × ×ª×§×œ×™× ×‘×‘×¢×™×•×ª.</translation> </message> <message> <location line="+3"/> <source>Warning: We do not appear to fully agree with our peers! You may need to upgrade, or other nodes may need to upgrade.</source> - <translation type="unfinished"/> + <translation>×זהרה: × ×¨××” ש×× ×—× ×• ×œ× ×ž×¡×›×™×ž×™× ×œ×—×œ×•×˜×™×Ÿ ×¢× ×”×¢×ž×™×ª×™× ×©×œ× ×•! ייתכן ו×× ×—× ×• ×¦×¨×™×›×™× ×œ×©×“×¨×’, ×ו ×©×¦×ž×ª×™× ×חרות צריכות לשדרג.</translation> </message> <message> <location line="+3"/> @@ -3482,7 +3490,7 @@ rpcpassword=%s <message> <location line="+1"/> <source>Bitcoin RPC client version</source> - <translation type="unfinished"/> + <translation>גרסת לקוח RPC של ביטקוין</translation> </message> <message> <location line="+1"/> @@ -3507,7 +3515,7 @@ rpcpassword=%s <message> <location line="+1"/> <source>Connect to JSON-RPC on <port> (default: 8332 or testnet: 18332)</source> - <translation type="unfinished"/> + <translation>התחבר ל JSON-RPC ב <port> (ברירת מחדל: 8332 ×ו ברשת בדיקה: 18332)</translation> </message> <message> <location line="+2"/> @@ -3652,12 +3660,12 @@ rpcpassword=%s <message> <location line="+2"/> <source>Incorrect or no genesis block found. Wrong datadir for network?</source> - <translation type="unfinished"/> + <translation>בלוק בר×שית ×”×™× ×• שגוי ×ו ×œ× × ×ž×¦×. ספריית מידע ×œ× × ×›×•× ×” עבור הרשת?</translation> </message> <message> <location line="+3"/> <source>Invalid -onion address: '%s'</source> - <translation type="unfinished"/> + <translation>כתובת onion- שגויה: '%s'</translation> </message> <message> <location line="+15"/> @@ -3690,7 +3698,12 @@ rpcpassword=%s <translation>שליחת פקודה לשרת הביטקוין</translation> </message> <message> - <location line="+7"/> + <location line="+5"/> + <source>Set database cache size in megabytes (%d to %d, default: %d)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+2"/> <source>Set maximum block size in bytes (default: %d)</source> <translation type="unfinished"/> </message> @@ -3702,7 +3715,7 @@ rpcpassword=%s <message> <location line="+7"/> <source>Specify wallet file (within data directory)</source> - <translation type="unfinished"/> + <translation>ציין קובץ ××¨× ×§ (בתוך ספריית המידע)</translation> </message> <message> <location line="+2"/> @@ -3722,7 +3735,7 @@ rpcpassword=%s <message> <location line="+10"/> <source>Usage (deprecated, use bitcoin-cli):</source> - <translation type="unfinished"/> + <translation>שימוש (מיושן, השתמש ב bitcoin-cli):</translation> </message> <message> <location line="+7"/> @@ -3742,7 +3755,7 @@ rpcpassword=%s <message> <location line="+1"/> <source>Wallet %s resides outside data directory %s</source> - <translation type="unfinished"/> + <translation>×”××¨× ×§ %s יושב מחוץ לספריית המידע %s</translation> </message> <message> <location line="+2"/> @@ -3765,11 +3778,16 @@ rpcpassword=%s <translation>×ž×™×™×‘× ×‘×œ×•×§×™× ×ž×§×•×‘×¦×™ blk000??.dat ×—×™×¦×•× ×™×™×</translation> </message> <message> - <location line="-106"/> - <source>Execute command when a relevant alert is received or we see a really long fork (%s in cmd is replaced by message)</source> + <location line="-126"/> + <source>Cannot obtain a lock on data directory %s. Bitcoin Core is probably already running.</source> <translation type="unfinished"/> </message> <message> + <location line="+19"/> + <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> <location line="+14"/> <source>Output debugging information (default: 0, supplying <category> is optional)</source> <translation type="unfinished"/> @@ -3785,7 +3803,7 @@ rpcpassword=%s <translation>קבע ×ת מספר ×ª×”×œ×™×›×•× ×™ ×ימות ×”×¡×§×¨×™×¤×˜×™× (1-16, 0 = ×וטומטי, ברירת מחדל: 0)</translation> </message> <message> - <location line="+90"/> + <location line="+91"/> <source>Information</source> <translation>מידע</translation> </message> @@ -3930,12 +3948,12 @@ rpcpassword=%s <translation>שלח פקודות לצומת ב-<ip> (ברירת מחדל: 127.0.0.1)</translation> </message> <message> - <location line="-133"/> + <location line="-134"/> <source>Execute command when the best block changes (%s in cmd is replaced by block hash)</source> <translation>בצע פקודה זו כשהבלוק הטוב ביותר ×ž×©×ª× ×” (%s בפקודה יוחלף בגיבוב הבלוק)</translation> </message> <message> - <location line="+163"/> + <location line="+164"/> <source>Upgrade wallet to latest format</source> <translation>שדרג ×ת ×”××¨× ×§ לפורמט ×”×¢×“×›× ×™</translation> </message> @@ -4055,12 +4073,7 @@ rpcpassword=%s <translation>הוסף צומת להתחברות ×•× ×¡×” לשמור ×ת החיבור פתוח</translation> </message> <message> - <location line="-32"/> - <source>Unable to bind to %s on this computer. Bitcoin is probably already running.</source> - <translation>×œ× × ×™×ª×Ÿ לקשור ל-%s במחשב ×–×”. ביטקוין ×›× ×¨××” עדיין רץ.</translation> - </message> - <message> - <location line="+96"/> + <location line="+64"/> <source>Loading wallet...</source> <translation>טוען ××¨× ×§...</translation> </message> diff --git a/src/qt/locale/bitcoin_ja.ts b/src/qt/locale/bitcoin_ja.ts index 808f377a20..bf14711159 100644 --- a/src/qt/locale/bitcoin_ja.ts +++ b/src/qt/locale/bitcoin_ja.ts @@ -39,7 +39,7 @@ MIT/X11 ソフトウェア ライセンスã®ä¸‹ã§é…布ã•ã‚Œã¦ã„ã¾ã™ã€‚è© <message> <location line="+12"/> <location line="+2"/> - <source> (%1-bit)</source> + <source>(%1-bit)</source> <translation type="unfinished"/> </message> </context> @@ -58,7 +58,7 @@ MIT/X11 ソフトウェア ライセンスã®ä¸‹ã§é…布ã•ã‚Œã¦ã„ã¾ã™ã€‚è© <message> <location line="+3"/> <source>&New</source> - <translation type="unfinished"/> + <translation>æ–°è¦(&N)</translation> </message> <message> <location line="+11"/> @@ -68,12 +68,12 @@ MIT/X11 ソフトウェア ライセンスã®ä¸‹ã§é…布ã•ã‚Œã¦ã„ã¾ã™ã€‚è© <message> <location line="+3"/> <source>&Copy</source> - <translation type="unfinished"/> + <translation>コピー(&C)</translation> </message> <message> - <location line="+52"/> + <location line="+58"/> <source>C&lose</source> - <translation type="unfinished"/> + <translation>é–‰ã˜ã‚‹(&C)</translation> </message> <message> <location filename="../addressbookpage.cpp" line="+74"/> @@ -81,7 +81,7 @@ MIT/X11 ソフトウェア ライセンスã®ä¸‹ã§é…布ã•ã‚Œã¦ã„ã¾ã™ã€‚è© <translation>アドレスをコピー (&C)</translation> </message> <message> - <location filename="../forms/addressbookpage.ui" line="-41"/> + <location filename="../forms/addressbookpage.ui" line="-47"/> <source>Delete the currently selected address from the list</source> <translation>é¸æŠžã•ã‚ŒãŸã‚¢ãƒ‰ãƒ¬ã‚¹ã‚’一覧ã‹ã‚‰å‰Šé™¤ã™ã‚‹</translation> </message> @@ -103,17 +103,17 @@ MIT/X11 ソフトウェア ライセンスã®ä¸‹ã§é…布ã•ã‚Œã¦ã„ã¾ã™ã€‚è© <message> <location filename="../addressbookpage.cpp" line="-30"/> <source>Choose the address to send coins to</source> - <translation type="unfinished"/> + <translation>é€ä¿¡å…ˆã®ã‚¢ãƒ‰ãƒ¬ã‚¹ã‚’é¸æŠž</translation> </message> <message> <location line="+1"/> <source>Choose the address to receive coins with</source> - <translation type="unfinished"/> + <translation>支払ã„ã‚’å—ã‘å–るアドレスを指定ã™ã‚‹</translation> </message> <message> <location line="+5"/> <source>C&hoose</source> - <translation type="unfinished"/> + <translation>é¸æŠž(&C)</translation> </message> <message> <location line="+6"/> @@ -148,7 +148,7 @@ MIT/X11 ソフトウェア ライセンスã®ä¸‹ã§é…布ã•ã‚Œã¦ã„ã¾ã™ã€‚è© <message> <location line="+194"/> <source>Export Address List</source> - <translation type="unfinished"/> + <translation>アドレス帳をエクスãƒãƒ¼ãƒˆ</translation> </message> <message> <location line="+1"/> @@ -328,7 +328,7 @@ MIT/X11 ソフトウェア ライセンスã®ä¸‹ã§é…布ã•ã‚Œã¦ã„ã¾ã™ã€‚è© <context> <name>BitcoinGUI</name> <message> - <location filename="../bitcoingui.cpp" line="+295"/> + <location filename="../bitcoingui.cpp" line="+294"/> <source>Sign &message...</source> <translation>メッセージã®ç½²å... (&m)</translation> </message> @@ -343,12 +343,12 @@ MIT/X11 ソフトウェア ライセンスã®ä¸‹ã§é…布ã•ã‚Œã¦ã„ã¾ã™ã€‚è© <translation>概è¦(&O)</translation> </message> <message> - <location line="-137"/> + <location line="-136"/> <source>Node</source> <translation type="unfinished"/> </message> <message> - <location line="+138"/> + <location line="+137"/> <source>Show general overview of wallet</source> <translation>ウォレットã®æ¦‚è¦ã‚’見る</translation> </message> @@ -469,17 +469,17 @@ MIT/X11 ソフトウェア ライセンスã®ä¸‹ã§é…布ã•ã‚Œã¦ã„ã¾ã™ã€‚è© <translation>メッセージã®æ¤œè¨¼... (&V)</translation> </message> <message> - <location line="+430"/> + <location line="+440"/> <source>Bitcoin</source> <translation>Bitcoin</translation> </message> <message> - <location line="-643"/> + <location line="-652"/> <source>Wallet</source> <translation>ウォレット</translation> </message> <message> - <location line="+146"/> + <location line="+145"/> <source>&Send</source> <translation>é€ã‚‹ (&S)</translation> </message> @@ -535,18 +535,18 @@ MIT/X11 ソフトウェア ライセンスã®ä¸‹ã§é…布ã•ã‚Œã¦ã„ã¾ã™ã€‚è© <translation>タブツールãƒãƒ¼</translation> </message> <message> - <location line="-284"/> - <location line="+376"/> + <location line="-283"/> + <location line="+375"/> <source>[testnet]</source> <translation>[testnet]</translation> </message> <message> - <location line="-401"/> + <location line="-400"/> <source>Bitcoin Core</source> <translation>Bitcoin ã®ã‚³ã‚¢</translation> </message> <message> - <location line="+163"/> + <location line="+162"/> <source>Request payments (generates QR codes and bitcoin: URIs)</source> <translation type="unfinished"/> </message> @@ -564,7 +564,7 @@ MIT/X11 ソフトウェア ライセンスã®ä¸‹ã§é…布ã•ã‚Œã¦ã„ã¾ã™ã€‚è© <message> <location line="+2"/> <source>Show the list of used receiving addresses and labels</source> - <translation type="unfinished"/> + <translation>支払ã„ã‚’å—ã‘å–るアドレスã¨ãƒ©ãƒ™ãƒ«ã®ãƒªã‚¹ãƒˆã‚’表示ã™ã‚‹</translation> </message> <message> <location line="+3"/> @@ -608,7 +608,7 @@ MIT/X11 ソフトウェア ライセンスã®ä¸‹ã§é…布ã•ã‚Œã¦ã„ã¾ã™ã€‚è© <translation>å–引履æ´ã® %1 ブãƒãƒƒã‚¯ã‚’処ç†ã—ã¾ã—ãŸã€‚</translation> </message> <message numerus="yes"> - <location line="+23"/> + <location line="+27"/> <source>%n hour(s)</source> <translation><numerusform>%n 時間</numerusform></translation> </message> @@ -619,6 +619,7 @@ MIT/X11 ソフトウェア ライセンスã®ä¸‹ã§é…布ã•ã‚Œã¦ã„ã¾ã™ã€‚è© </message> <message numerus="yes"> <location line="+4"/> + <location line="+6"/> <source>%n week(s)</source> <translation><numerusform>%n 週間</numerusform></translation> </message> @@ -663,12 +664,12 @@ MIT/X11 ソフトウェア ライセンスã®ä¸‹ã§é…布ã•ã‚Œã¦ã„ã¾ã™ã€‚è© <translation>æƒ…å ±</translation> </message> <message> - <location line="-85"/> + <location line="-95"/> <source>Up to date</source> <translation>ãƒãƒ¼ã‚¸ãƒ§ãƒ³ã¯æœ€æ–°ã§ã™</translation> </message> <message> - <location line="+34"/> + <location line="+44"/> <source>Catching up...</source> <translation>追跡ä¸...</translation> </message> @@ -705,7 +706,7 @@ Address: %4 <translation>ウォレットã¯<b>æš—å·åŒ–ã•ã‚Œã¦ã€ãƒãƒƒã‚¯ã•ã‚Œã¦ã„ã¾ã™</b></translation> </message> <message> - <location filename="../bitcoin.cpp" line="+435"/> + <location filename="../bitcoin.cpp" line="+443"/> <source>A fatal error occurred. Bitcoin can no longer continue safely and will quit.</source> <translation>致命的ãªã‚¨ãƒ©ãƒ¼ãŒç™ºç”Ÿã—ã¾ã—ãŸã€‚Bitcoin ã¯å®‰å…¨ã«ç¶™ç¶šã™ã‚‹ã“ã¨ãŒã§ããšçµ‚了ã™ã‚‹ã§ã—ょã†ã€‚ </translation> @@ -714,7 +715,7 @@ Address: %4 <context> <name>ClientModel</name> <message> - <location filename="../clientmodel.cpp" line="+119"/> + <location filename="../clientmodel.cpp" line="+128"/> <source>Network Alert</source> <translation>ãƒãƒƒãƒˆãƒ¯ãƒ¼ã‚¯è¦å‘Š</translation> </message> @@ -812,7 +813,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location filename="../coincontroldialog.cpp" line="+42"/> + <location filename="../coincontroldialog.cpp" line="+41"/> <source>Copy address</source> <translation>アドレスをコピーã™ã‚‹</translation> </message> @@ -878,7 +879,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+323"/> + <location line="+332"/> <source>highest</source> <translation type="unfinished"/> </message> @@ -928,7 +929,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+31"/> + <location line="+32"/> <source>none</source> <translation type="unfinished"/> </message> @@ -940,12 +941,12 @@ Address: %4 <message> <location line="+0"/> <source>yes</source> - <translation type="unfinished"/> + <translation>ã¯ã„</translation> </message> <message> <location line="+0"/> <source>no</source> - <translation type="unfinished"/> + <translation>ã„ã„ãˆ</translation> </message> <message> <location line="+10"/> @@ -996,12 +997,12 @@ Address: %4 </message> <message> <location line="+43"/> - <location line="+66"/> + <location line="+61"/> <source>(no label)</source> <translation>（ラベル無ã—）</translation> </message> <message> - <location line="-9"/> + <location line="-7"/> <source>change from %1 (%2)</source> <translation type="unfinished"/> </message> @@ -1082,7 +1083,7 @@ Address: %4 <context> <name>FreespaceChecker</name> <message> - <location filename="../intro.cpp" line="+65"/> + <location filename="../intro.cpp" line="+68"/> <source>A new data directory will be created.</source> <translation>æ–°ã—ã„データ ディレクトリãŒä½œæˆã•ã‚Œã¾ã™ã€‚</translation> </message> @@ -1140,7 +1141,7 @@ Address: %4 <translation>UI オプション</translation> </message> <message> - <location line="+1"/> + <location line="+2"/> <source>Set language, for example "de_DE" (default: system locale)</source> <translation>言語è¨å®š 例: "de_DE" (åˆæœŸå€¤: システムã®è¨€èªž)</translation> </message> @@ -1151,11 +1152,16 @@ Address: %4 </message> <message> <location line="+1"/> + <source>Set SSL root certificates for payment request (default: -system-)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> <source>Show splash screen on startup (default: 1)</source> <translation>起動時ã«ã‚¹ãƒ—ラッシュ画é¢ã‚’表示ã™ã‚‹ (åˆæœŸå€¤: 1)</translation> </message> <message> - <location line="+1"/> + <location line="-4"/> <source>Choose data directory on startup (default: 0)</source> <translation>起動時ã«ãƒ‡ãƒ¼ã‚¿ ディレクトリをé¸ã¶ (åˆæœŸå€¤: 0)</translation> </message> @@ -1193,7 +1199,7 @@ Address: %4 <translation>ä»»æ„ã®ãƒ‡ãƒ¼ã‚¿ ディレクトリを使用:</translation> </message> <message> - <location filename="../intro.cpp" line="+85"/> + <location filename="../intro.cpp" line="+82"/> <source>Bitcoin</source> <translation>Bitcoin</translation> </message> @@ -1203,7 +1209,7 @@ Address: %4 <translation>エラー: 指定ã®ãƒ‡ãƒ¼ã‚¿ ディレクトリ "%1" を作æˆã§ãã¾ã›ã‚“。</translation> </message> <message> - <location line="+19"/> + <location line="+24"/> <source>Error</source> <translation>エラー</translation> </message> @@ -1233,7 +1239,7 @@ Address: %4 <message> <location line="+9"/> <source>URI:</source> - <translation type="unfinished"/> + <translation>URI:</translation> </message> <message> <location line="+11"/> @@ -1259,7 +1265,7 @@ Address: %4 <translation>メイン (&M)</translation> </message> <message> - <location line="+122"/> + <location line="+116"/> <source>Optional transaction fee per kB that helps make sure your transactions are processed quickly. Most transactions are 1 kB.</source> <translation>ã‚ãŸãªã®å–引ãŒæ—©ã処ç†ã•ã‚Œã‚‹ã‚ˆã†ã«ä»»æ„㧠kB 毎ã®å–引手数料をè¨å®šã—ã¾ã™ã€‚ã»ã¨ã‚“ã©ã®å–引㯠1 kB ã§ã™ã€‚</translation> </message> @@ -1269,7 +1275,7 @@ Address: %4 <translation>支払ã†å–引手数料 (&f)</translation> </message> <message> - <location line="-131"/> + <location line="-125"/> <source>Automatically start Bitcoin after logging in to the system.</source> <translation>システムã«ãƒã‚°ã‚¤ãƒ³ã—ãŸæ™‚ã«è‡ªå‹•çš„ã« Bitcoin ã‚’èµ·å‹•ã—ã¾ã™ã€‚</translation> </message> @@ -1294,17 +1300,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+13"/> - <source>Set the number of script verification threads (up to 16, 0 = auto, <0 = leave that many cores free, default: 0)</source> - <translation>スクリプト検証スレッドをè¨å®š (最大 16, 0 = 自動, <0 = ãŸãã•ã‚“ã®ã‚³ã‚¢ã‚’自由ã«ã—ã¦ãŠã, åˆæœŸå€¤: 0)</translation> - </message> - <message> - <location line="+107"/> - <source>&Spend unconfirmed change (experts only)</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+37"/> + <location line="+160"/> <source>Connect to the Bitcoin network through a SOCKS proxy.</source> <translation type="unfinished"/> </message> @@ -1319,7 +1315,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+224"/> + <location line="+214"/> <source>Active command-line options that override above options:</source> <translation type="unfinished"/> </message> @@ -1334,22 +1330,42 @@ Address: %4 <translation>オプションをリセット (&R)</translation> </message> <message> - <location line="-323"/> + <location line="-313"/> <source>&Network</source> <translation>ãƒãƒƒãƒˆãƒ¯ãƒ¼ã‚¯ (&N)</translation> </message> <message> - <location line="-86"/> + <location line="-131"/> + <source>(0 = auto, <0 = leave that many cores free)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+36"/> <source>W&allet</source> <translation type="unfinished"/> </message> <message> - <location line="+52"/> + <location line="+65"/> + <source>Expert</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+9"/> + <source>Enable coin &control features</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+7"/> <source>If you disable the spending of unconfirmed change, the change from a transaction cannot be used until that transaction has at least one confirmation. This also affects how your balance is computed.</source> <translation type="unfinished"/> </message> <message> - <location line="+40"/> + <location line="+3"/> + <source>&Spend unconfirmed change</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+17"/> <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> @@ -1444,17 +1460,12 @@ Address: %4 <translation>å–引履æ´ã«ã‚¢ãƒ‰ãƒ¬ã‚¹ã‚’表示 (&D)</translation> </message> <message> - <location line="+7"/> + <location line="-262"/> <source>Whether to show coin control features or not.</source> <translation type="unfinished"/> </message> <message> - <location line="+3"/> - <source>Display coin &control features (experts only)</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+136"/> + <location line="+398"/> <source>&OK</source> <translation>&OK</translation> </message> @@ -1464,7 +1475,7 @@ Address: %4 <translation>ã‚ャンセル (&C)</translation> </message> <message> - <location filename="../optionsdialog.cpp" line="+70"/> + <location filename="../optionsdialog.cpp" line="+72"/> <source>default</source> <translation>åˆæœŸå€¤</translation> </message> @@ -1474,7 +1485,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+78"/> + <location line="+80"/> <source>Confirm options reset</source> <translation>オプションã®ãƒªã‚»ãƒƒãƒˆã®ç¢ºèª</translation> </message> @@ -1668,23 +1679,29 @@ Address: %4 <context> <name>QObject</name> <message> - <location filename="../bitcoin.cpp" line="+71"/> - <location line="+11"/> + <location filename="../bitcoin.cpp" line="+63"/> + <location line="+7"/> + <location line="+13"/> <source>Bitcoin</source> <translation>Bitcoin</translation> </message> <message> - <location line="+1"/> + <location line="-19"/> <source>Error: Specified data directory "%1" does not exist.</source> <translation>エラー: 指定ã®ãƒ‡ãƒ¼ã‚¿ ディレクトリ "%1" ã¯å˜åœ¨ã—ã¾ã›ã‚“。</translation> </message> <message> - <location line="-12"/> + <location line="+7"/> + <source>Error: Cannot parse configuration file: %1. Only use key=value syntax.</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+12"/> <source>Error: Invalid combination of -regtest and -testnet.</source> <translation>エラー：　-regtestã¨-testnetã¯ä¸€ç·’ã«ã™ã‚‹ã®ã¯ç„¡åŠ¹ã§ã™ã€‚</translation> </message> <message> - <location filename="../guiutil.cpp" line="+82"/> + <location filename="../guiutil.cpp" line="+89"/> <source>Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source> <translation>Bitcoin アドレスを入力ã—ã¾ã™ (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation> </message> @@ -1694,12 +1711,12 @@ Address: %4 <message> <location filename="../receiverequestdialog.cpp" line="+36"/> <source>&Save Image...</source> - <translation type="unfinished"/> + <translation>ç”»åƒã‚’ä¿å˜(&S)</translation> </message> <message> <location line="+3"/> <source>&Copy Image</source> - <translation type="unfinished"/> + <translation>ç”»åƒã‚’コピー(&C)</translation> </message> <message> <location line="+28"/> @@ -1709,7 +1726,7 @@ Address: %4 <message> <location line="+0"/> <source>PNG Image (*.png)</source> - <translation type="unfinished"/> + <translation>PNGç”»åƒãƒ•ã‚¡ã‚¤ãƒ«(*.png)</translation> </message> </context> <context> @@ -1730,7 +1747,7 @@ Address: %4 <location line="+36"/> <location line="+23"/> <location line="+23"/> - <location filename="../rpcconsole.cpp" line="+359"/> + <location filename="../rpcconsole.cpp" line="+373"/> <source>N/A</source> <translation>N/A</translation> </message> @@ -1747,7 +1764,7 @@ Address: %4 <message> <location line="-10"/> <source>Debug window</source> - <translation type="unfinished"/> + <translation>デãƒãƒƒã‚° ウインドウ</translation> </message> <message> <location line="+25"/> @@ -1812,25 +1829,27 @@ Address: %4 <message> <location line="+72"/> <source>&Network Traffic</source> - <translation type="unfinished"/> + <translation>ãƒãƒƒãƒˆãƒ¯ãƒ¼ã‚¯ (&N)</translation> </message> <message> <location line="+52"/> <source>&Clear</source> - <translation type="unfinished"/> + <translation>クリア(&C)</translation> </message> <message> <location line="+13"/> <source>Totals</source> - <translation type="unfinished"/> + <translation>åˆè¨ˆ</translation> </message> <message> <location line="+64"/> + <location filename="../rpcconsole.cpp" line="-10"/> <source>In:</source> <translation type="unfinished"/> </message> <message> <location line="+80"/> + <location filename="../rpcconsole.cpp" line="+1"/> <source>Out:</source> <translation type="unfinished"/> </message> @@ -1855,7 +1874,7 @@ Address: %4 <translation>コンソールをクリア</translation> </message> <message> - <location filename="../rpcconsole.cpp" line="-30"/> + <location filename="../rpcconsole.cpp" line="-35"/> <source>Welcome to the Bitcoin RPC console.</source> <translation>Bitcoin RPC コンソールã¸ã‚ˆã†ã“ã。</translation> </message> @@ -1870,7 +1889,7 @@ Address: %4 <translation>使用å¯èƒ½ãªã‚³ãƒžãƒ³ãƒ‰ã‚’見るã«ã¯ <b>help</b> ã¨å…¥åŠ›ã—ã¾ã™ã€‚</translation> </message> <message> - <location line="+122"/> + <location line="+136"/> <source>%1 B</source> <translation type="unfinished"/> </message> @@ -1910,7 +1929,7 @@ Address: %4 <message> <location filename="../forms/receivecoinsdialog.ui" line="+107"/> <source>&Amount:</source> - <translation type="unfinished"/> + <translation>ç·é¡:(&A)</translation> </message> <message> <location line="-16"/> @@ -1983,10 +2002,10 @@ Address: %4 <message> <location line="+3"/> <source>Show</source> - <translation type="unfinished"/> + <translation>表示</translation> </message> <message> - <location line="+11"/> + <location line="+14"/> <source>Remove the selected entries from the list</source> <translation type="unfinished"/> </message> @@ -1996,7 +2015,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location filename="../receivecoinsdialog.cpp" line="+38"/> + <location filename="../receivecoinsdialog.cpp" line="+39"/> <source>Copy label</source> <translation>ラベルをコピーã™ã‚‹</translation> </message> @@ -2031,7 +2050,7 @@ Address: %4 <message> <location line="+7"/> <source>&Save Image...</source> - <translation type="unfinished"/> + <translation>ç”»åƒã‚’ä¿å˜(&S)</translation> </message> <message> <location filename="../receiverequestdialog.cpp" line="+56"/> @@ -2217,12 +2236,12 @@ Address: %4 <translation>ã™ã¹ã¦ã‚¯ãƒªã‚¢ (&A)</translation> </message> <message> - <location line="+52"/> + <location line="+58"/> <source>Balance:</source> <translation>残高:</translation> </message> <message> - <location line="-78"/> + <location line="-84"/> <source>Confirm the send action</source> <translation>é€ã‚‹æ“作を確èªã™ã‚‹</translation> </message> @@ -2467,7 +2486,7 @@ Address: %4 <context> <name>ShutdownWindow</name> <message> - <location filename="../utilitydialog.cpp" line="+48"/> + <location filename="../utilitydialog.cpp" line="+52"/> <source>Bitcoin Core is shutting down...</source> <translation type="unfinished"/> </message> @@ -2667,7 +2686,7 @@ Address: %4 <context> <name>SplashScreen</name> <message> - <location filename="../splashscreen.cpp" line="+28"/> + <location filename="../splashscreen.cpp" line="+32"/> <source>Bitcoin Core</source> <translation>Bitcoin ã®ã‚³ã‚¢</translation> </message> @@ -3120,7 +3139,7 @@ Address: %4 <translation>å–引ã®è©³ç´°ã‚’表示</translation> </message> <message> - <location line="+142"/> + <location line="+140"/> <source>Export Transaction History</source> <translation type="unfinished"/> </message> @@ -3214,7 +3233,7 @@ Address: %4 <context> <name>WalletView</name> <message> - <location filename="../walletview.cpp" line="+43"/> + <location filename="../walletview.cpp" line="+44"/> <source>&Export</source> <translation>エクスãƒãƒ¼ãƒˆ (&E)</translation> </message> @@ -3224,7 +3243,7 @@ Address: %4 <translation>ファイルã«ç¾åœ¨ã®ã‚¿ãƒ–ã®ãƒ‡ãƒ¼ã‚¿ã‚’エクスãƒãƒ¼ãƒˆ</translation> </message> <message> - <location line="+181"/> + <location line="+184"/> <source>Backup Wallet</source> <translation>ウォレットã®ãƒãƒƒã‚¯ã‚¢ãƒƒãƒ—</translation> </message> @@ -3257,12 +3276,12 @@ Address: %4 <context> <name>bitcoin-core</name> <message> - <location filename="../bitcoinstrings.cpp" line="+223"/> + <location filename="../bitcoinstrings.cpp" line="+261"/> <source>Usage:</source> <translation>使用法:</translation> </message> <message> - <location line="-55"/> + <location line="-66"/> <source>List commands</source> <translation>コマンド一覧</translation> </message> @@ -3272,12 +3291,12 @@ Address: %4 <translation>コマンドã®ãƒ˜ãƒ«ãƒ—</translation> </message> <message> - <location line="+26"/> + <location line="+27"/> <source>Options:</source> <translation>オプション:</translation> </message> <message> - <location line="+22"/> + <location line="+32"/> <source>Specify configuration file (default: bitcoin.conf)</source> <translation>è¨å®šãƒ•ã‚¡ã‚¤ãƒ«ã®æŒ‡å®š (åˆæœŸå€¤: bitcoin.conf)</translation> </message> @@ -3292,27 +3311,22 @@ Address: %4 <translation>データ ディレクトリã®æŒ‡å®š</translation> </message> <message> - <location line="-9"/> - <source>Set database cache size in megabytes (default: 25)</source> - <translation>データベースã®ã‚ャッシュサイズをメガãƒã‚¤ãƒˆã§è¨å®š (åˆæœŸå€¤: 25)</translation> - </message> - <message> - <location line="-26"/> + <location line="-46"/> <source>Listen for connections on <port> (default: 8333 or testnet: 18333)</source> <translation>接続ã®ãƒãƒ¼ãƒˆç•ªå· (åˆæœŸå€¤: 8333ã€testnet: 18333)</translation> </message> <message> - <location line="+5"/> + <location line="+6"/> <source>Maintain at most <n> connections to peers (default: 125)</source> <translation>ピアã®æœ€å¤§æŽ¥ç¶šæ•° (åˆæœŸå€¤: 125)</translation> </message> <message> - <location line="-51"/> + <location line="-57"/> <source>Connect to a node to retrieve peer addresses, and disconnect</source> <translation>ピア アドレスをå–å¾—ã™ã‚‹ãŸã‚ã«ãƒŽãƒ¼ãƒ‰ã«æŽ¥ç¶šã—ã€ãã—ã¦åˆ‡æ–ã—ã¾ã™</translation> </message> <message> - <location line="+84"/> + <location line="+100"/> <source>Specify your own public address</source> <translation>ã‚ãªãŸè‡ªèº«ã®ãƒ‘ブリックãªã‚¢ãƒ‰ãƒ¬ã‚¹ã‚’指定</translation> </message> @@ -3322,42 +3336,47 @@ Address: %4 <translation>ä¸æ£ãªãƒ”アを切æ–ã™ã‚‹ãŸã‚ã®ã—ãã„値 (åˆæœŸå€¤: 100)</translation> </message> <message> - <location line="-150"/> + <location line="-172"/> <source>Number of seconds to keep misbehaving peers from reconnecting (default: 86400)</source> <translation>ä¸æ£ãªãƒ”アをå†æŽ¥ç¶šã™ã‚‹ã¾ã§ã®ç§’æ•° (åˆæœŸå€¤: 86400)</translation> </message> <message> - <location line="-36"/> + <location line="-52"/> <source>An error occurred while setting up the RPC port %u for listening on IPv4: %s</source> <translation>IPv4 ã§ãƒªã‚¹ãƒ³ã™ã‚‹ RPC ãƒãƒ¼ãƒˆ %u ã®è¨å®šä¸ã«ã‚¨ãƒ©ãƒ¼ãŒç™ºç”Ÿã—ã¾ã—ãŸ: %s</translation> </message> <message> - <location line="+34"/> + <location line="+50"/> <source>Listen for JSON-RPC connections on <port> (default: 8332 or testnet: 18332)</source> <translation><port> 㧠JSON-RPC 接続をリスン (åˆæœŸå€¤: 8332ã€testnet 㯠18332)</translation> </message> <message> - <location line="+45"/> + <location line="+51"/> <source>Accept command line and JSON-RPC commands</source> <translation>コマンドライン㨠JSON-RPC コマンドを許å¯</translation> </message> <message> - <location line="+81"/> + <location line="+7"/> + <source>Bitcoin Core RPC client version</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+87"/> <source>Run in the background as a daemon and accept commands</source> <translation>デーモンã¨ã—ã¦ãƒãƒƒã‚¯ã‚°ãƒ©ãƒ³ãƒ‰ã§å®Ÿè¡Œã—コマンドを許å¯</translation> </message> <message> - <location line="+40"/> + <location line="+43"/> <source>Use the test network</source> <translation>テストã®ãŸã‚ã®ãƒãƒƒãƒˆãƒ¯ãƒ¼ã‚¯ã‚’使用</translation> </message> <message> - <location line="-120"/> + <location line="-136"/> <source>Accept connections from outside (default: 1 if no -proxy or -connect)</source> <translation>外部ã‹ã‚‰ã®æŽ¥ç¶šã‚’è¨±å¯ (åˆæœŸå€¤: -proxy ã¾ãŸã¯ -connect を使用ã—ã¦ã„ãªã„å ´åˆã¯1)</translation> </message> <message> - <location line="-95"/> + <location line="-117"/> <source>%s, you must set a rpcpassword in the configuration file: %s It is recommended you use the following random password: @@ -3396,9 +3415,9 @@ rpcpassword=%s <translation>指定ã®ã‚¢ãƒ‰ãƒ¬ã‚¹ã¸ãƒã‚¤ãƒ³ãƒ‰ã—ã€ãã®ä¸Šã§å¸¸ã«ãƒªã‚¹ãƒ³ã—ã¾ã™ã€‚IPv6 㯠[ホストå]:ãƒãƒ¼ãƒˆç•ªå· ã¨è¡¨è¨˜ã—ã¾ã™</translation> </message> <message> - <location line="+3"/> - <source>Cannot obtain a lock on data directory %s. Bitcoin is probably already running.</source> - <translation>データ ディレクトリ %s ã®ãƒãƒƒã‚¯ã‚’å–å¾—ã™ã‚‹ã“ã¨ãŒã§ãã¾ã›ã‚“。ãŠãらã Bitcoin ã¯å®Ÿè¡Œä¸ã§ã™ã€‚</translation> + <location line="+6"/> + <source>Continuously rate-limit free transactions to <n>*1000 bytes per minute (default:15)</source> + <translation type="unfinished"/> </message> <message> <location line="+3"/> @@ -3412,6 +3431,11 @@ rpcpassword=%s </message> <message> <location line="+3"/> + <source>Error: Listening for incoming connections failed (listen returned error %d)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+2"/> <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> @@ -3426,12 +3450,47 @@ rpcpassword=%s <translation>ウォレットã®å–引を変更ã™ã‚‹éš›ã«ã‚³ãƒžãƒ³ãƒ‰ã‚’実行 (cmd ã® %s 㯠TxID ã«ç½®æ›ã•ã‚Œã‚‹)</translation> </message> <message> - <location line="+18"/> + <location line="+6"/> + <source>Fees smaller than this are considered zero fee (for transaction creation) (default:</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+3"/> + <source>Flush database activity from memory pool to disk log every <n> megabytes (default: 100)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+3"/> + <source>How thorough the block verification of -checkblocks is (0-4, default: 3)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+2"/> + <source>In this mode -genproclimit controls how many blocks are generated immediately.</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+12"/> + <source>Set the number of script verification threads (%u to %d, 0 = auto, <0 = leave that many cores free, default: %d)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+3"/> + <source>Set the processor limit for when generation is on (-1 = unlimited, default: -1)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+3"/> <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> - <location line="+5"/> + <location line="+3"/> + <source>Unable to bind to %s on this computer. Bitcoin Core is probably already running.</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+3"/> <source>Use separate SOCKS5 proxy to reach peers via Tor hidden services (default: -proxy)</source> <translation type="unfinished"/> </message> @@ -3467,6 +3526,16 @@ rpcpassword=%s </message> <message> <location line="+9"/> + <source>(default: 1)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>(default: wallet.dat)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> <source><category> can be:</source> <translation type="unfinished"/> </message> @@ -3481,12 +3550,7 @@ rpcpassword=%s <translation type="unfinished"/> </message> <message> - <location line="+1"/> - <source>Bitcoin RPC client version</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+1"/> + <location line="+2"/> <source>Block creation options:</source> <translation>ブãƒãƒƒã‚¯ä½œæˆã‚ªãƒ—ション:</translation> </message> @@ -3512,12 +3576,27 @@ rpcpassword=%s </message> <message> <location line="+2"/> + <source>Connection options:</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> <source>Corrupted block database detected</source> <translation>ç ´æã—ãŸãƒ–ãƒãƒƒã‚¯ データベースãŒè¦‹ã¤ã‹ã‚Šã¾ã—㟠</translation> </message> <message> <location line="+1"/> + <source>Debugging/Testing options:</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>Disable safemode, override a real safe mode event (default: 0)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> <source>Discover own IP address (default: 1 when listening and no -externalip)</source> <translation>自分㮠IP アドレスを発見 (åˆæœŸå€¤: リスンä¸ã¨ -externalip を使用ã—ã¦ã„ãªã„å ´åˆã¯1)</translation> </message> @@ -3628,11 +3707,21 @@ rpcpassword=%s </message> <message> <location line="+1"/> + <source>Fees smaller than this are considered zero fee (for relaying) (default:</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> <source>Find peers using DNS lookup (default: 1 unless -connect)</source> <translation>DNS ルックアップã§ãƒ”アを探㙠(åˆæœŸå€¤: -connect を使ã£ã¦ã„ãªã‘ã‚Œã°1)</translation> </message> <message> <location line="+1"/> + <source>Force safe mode (default: 0)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> <source>Generate coins (default: 0)</source> <translation>ã‚³ã‚¤ãƒ³ã‚’ç”Ÿæˆ (åˆæœŸå€¤: 0)</translation> </message> @@ -3643,11 +3732,6 @@ rpcpassword=%s </message> <message> <location line="+1"/> - <source>How thorough the block verification is (0-4, default: 3)</source> - <translation>ブãƒãƒƒã‚¯ã®æ¤œè¨¼ãƒ¬ãƒ™ãƒ« (0-4, åˆæœŸå€¤: 3)</translation> - </message> - <message> - <location line="+1"/> <source>If <category> is not supplied, output all debugging information.</source> <translation type="unfinished"/> </message> @@ -3662,7 +3746,7 @@ rpcpassword=%s <translation type="unfinished"/> </message> <message> - <location line="+15"/> + <location line="+17"/> <source>Not enough file descriptors available.</source> <translation>使用å¯èƒ½ãªãƒ•ã‚¡ã‚¤ãƒ«ãƒ‡ã‚£ã‚¹ã‚¯ãƒªãƒ—ã‚¿ãŒä¸è¶³ã—ã¦ã„ã¾ã™ã€‚</translation> </message> @@ -3672,27 +3756,27 @@ rpcpassword=%s <translation type="unfinished"/> </message> <message> - <location line="+1"/> + <location line="+4"/> <source>RPC client options:</source> <translation type="unfinished"/> </message> <message> - <location line="+1"/> + <location line="+4"/> <source>Rebuild block chain index from current blk000??.dat files</source> <translation>ç¾åœ¨ã® blk000??.dat ファイルã‹ã‚‰ãƒ–ãƒãƒƒã‚¯ ãƒã‚§ãƒ¼ãƒ³ã®ã‚¤ãƒ³ãƒ‡ãƒƒã‚¯ã‚¹ã‚’å†æ§‹ç¯‰</translation> </message> <message> - <location line="+5"/> + <location line="+6"/> <source>Select SOCKS version for -proxy (4 or 5, default: 5)</source> <translation type="unfinished"/> </message> <message> - <location line="+1"/> - <source>Send command to Bitcoin server</source> + <location line="+6"/> + <source>Set database cache size in megabytes (%d to %d, default: %d)</source> <translation type="unfinished"/> </message> <message> - <location line="+7"/> + <location line="+2"/> <source>Set maximum block size in bytes (default: %d)</source> <translation type="unfinished"/> </message> @@ -3702,7 +3786,7 @@ rpcpassword=%s <translation>RPC サービスã®ã‚¹ãƒ¬ãƒƒãƒ‰æ•°ã‚’è¨å®š (åˆæœŸå€¤: 4)</translation> </message> <message> - <location line="+7"/> + <location line="+10"/> <source>Specify wallet file (within data directory)</source> <translation>ウォレットã®ãƒ•ã‚¡ã‚¤ãƒ«ã‚’指定　(データ・ディレクトリã®ä¸ã«)</translation> </message> @@ -3712,12 +3796,7 @@ rpcpassword=%s <translation type="unfinished"/> </message> <message> - <location line="+1"/> - <source>Start Bitcoin server</source> - <translation>Bitcoinサーãƒãƒ¼ã‚’始ã‚ã‚‹</translation> - </message> - <message> - <location line="+3"/> + <location line="+4"/> <source>This is intended for regression testing tools and app development.</source> <translation type="unfinished"/> </message> @@ -3762,17 +3841,22 @@ rpcpassword=%s <translation>-txindex を変更ã™ã‚‹ã«ã¯ -reindex を使用ã—ã¦ãƒ‡ãƒ¼ã‚¿ãƒ™ãƒ¼ã‚¹ã‚’å†æ§‹ç¯‰ã™ã‚‹å¿…è¦ãŒã‚ã‚Šã¾ã™</translation> </message> <message> - <location line="-80"/> + <location line="-92"/> <source>Imports blocks from external blk000??.dat file</source> <translation>外部㮠blk000??.dat ファイルã‹ã‚‰ãƒ–ãƒãƒƒã‚¯ã‚’インãƒãƒ¼ãƒˆ</translation> </message> <message> - <location line="-106"/> + <location line="-149"/> + <source>Cannot obtain a lock on data directory %s. Bitcoin Core is probably already running.</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+22"/> <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> - <location line="+14"/> + <location line="+25"/> <source>Output debugging information (default: 0, supplying <category> is optional)</source> <translation type="unfinished"/> </message> @@ -3782,12 +3866,7 @@ rpcpassword=%s <translation type="unfinished"/> </message> <message> - <location line="+2"/> - <source>Set the number of script verification threads (up to 16, 0 = auto, <0 = leave that many cores free, default: 0)</source> - <translation>スクリプト検証スレッドをè¨å®š (最大 16, 0 = 自動, <0 = ãŸãã•ã‚“ã®ã‚³ã‚¢ã‚’自由ã«ã—ã¦ãŠã, åˆæœŸå€¤: 0)</translation> - </message> - <message> - <location line="+90"/> + <location line="+102"/> <source>Information</source> <translation>æƒ…å ±</translation> </message> @@ -3802,7 +3881,17 @@ rpcpassword=%s <translation>ä¸æ£ãªé¡ -minrelaytxfee=<amount>: '%s'</translation> </message> <message> - <location line="+8"/> + <location line="+3"/> + <source>Limit size of signature cache to <n> entries (default: 50000)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+6"/> + <source>Log transaction priority and fee per kB when mining blocks (default: 0)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> <source>Maintain a full transaction index (default: 0)</source> <translation>完全ãªå–引インデックスをç¶æŒã™ã‚‹ (åˆæœŸå€¤: 0)</translation> </message> @@ -3827,12 +3916,52 @@ rpcpassword=%s <translation><net> (IPv4, IPv6, Tor) ãƒãƒƒãƒˆãƒ¯ãƒ¼ã‚¯å†…ã®ãƒŽãƒ¼ãƒ‰ã ã‘ã«æŽ¥ç¶šã™ã‚‹</translation> </message> <message> - <location line="+9"/> + <location line="+4"/> + <source>Print block on startup, if found in block index</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>Print block tree on startup (default: 0)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>RPC SSL options: (see the Bitcoin Wiki for SSL setup instructions)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+2"/> + <source>RPC server options:</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>Randomly drop 1 of every <n> network messages</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>Randomly fuzz 1 of every <n> network messages</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+4"/> + <source>Run a thread to flush wallet periodically (default: 1)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+2"/> <source>SSL options: (see the Bitcoin Wiki for SSL setup instructions)</source> <translation>SSL オプション: (SSLã®ã‚»ãƒƒãƒˆã‚¢ãƒƒãƒ—æ‰‹é †ã¯ Bitcoin Wiki ã‚’ã”覧下ã•ã„)</translation> </message> <message> - <location line="+4"/> + <location line="+2"/> + <source>Send command to Bitcoin Core</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+2"/> <source>Send trace/debug info to console instead of debug.log file</source> <translation>トレース/デãƒãƒƒã‚°æƒ…å ±ã‚’ debug.log ファイルã®ä»£ã‚ã‚Šã«ã‚³ãƒ³ã‚½ãƒ¼ãƒ«ã¸é€ã‚‹</translation> </message> @@ -3843,6 +3972,21 @@ rpcpassword=%s </message> <message> <location line="+2"/> + <source>Sets the DB_PRIVATE flag in the wallet db environment (default: 1)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>Show all debugging options (usage: --help -help-debug)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>Show benchmark information (default: 0)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> <source>Shrink debug.log file on client startup (default: 1 when no -debug)</source> <translation>クライアント起動時㫠debug.log ãƒ•ã‚¡ã‚¤ãƒ«ã‚’ç¸®å° (åˆæœŸå€¤: -debug オプションを指定ã—ãªã„å ´åˆã¯1)</translation> </message> @@ -3857,7 +4001,12 @@ rpcpassword=%s <translation>接続ã®ã‚¿ã‚¤ãƒ アウトをミリセコンドã§æŒ‡å®š (åˆæœŸå€¤: 5000)</translation> </message> <message> - <location line="+7"/> + <location line="+6"/> + <source>Start Bitcoin Core Daemon</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> <source>System error: </source> <translation>システムエラー:</translation> </message> @@ -3908,6 +4057,11 @@ rpcpassword=%s </message> <message> <location line="+1"/> + <source>on startup</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> <source>version</source> <translation>ãƒãƒ¼ã‚¸ãƒ§ãƒ³</translation> </message> @@ -3917,47 +4071,47 @@ rpcpassword=%s <translation>wallet.dat ãŒå£Šã‚Œã€å¾©æ—§ã«å¤±æ•—ã—ã¾ã—ãŸ</translation> </message> <message> - <location line="-60"/> + <location line="-71"/> <source>Password for JSON-RPC connections</source> <translation>JSON-RPC 接続ã®ãƒ‘スワード</translation> </message> <message> - <location line="-71"/> + <location line="-77"/> <source>Allow JSON-RPC connections from specified IP address</source> <translation>指定ã—㟠IP アドレスã‹ã‚‰ã® JSON-RPC 接続を許å¯</translation> </message> <message> - <location line="+81"/> + <location line="+94"/> <source>Send commands to node running on <ip> (default: 127.0.0.1)</source> <translation><ip> (åˆæœŸå€¤: 127.0.0.1) ã§å®Ÿè¡Œä¸ã®ãƒŽãƒ¼ãƒ‰ã«ã‚³ãƒžãƒ³ãƒ‰ã‚’é€ä¿¡</translation> </message> <message> - <location line="-133"/> + <location line="-163"/> <source>Execute command when the best block changes (%s in cmd is replaced by block hash)</source> <translation>最良ã®ãƒ–ãƒãƒƒã‚¯ã«å¤‰æ›´ã™ã‚‹éš›ã«ã‚³ãƒžãƒ³ãƒ‰ã‚’実行 (cmd ã® %s ã¯ãƒ–ãƒãƒƒã‚¯ ãƒãƒƒã‚·ãƒ¥ã«ç½®æ›ã•ã‚Œã‚‹)</translation> </message> <message> - <location line="+163"/> + <location line="+196"/> <source>Upgrade wallet to latest format</source> <translation>ウォレットを最新ã®ãƒ•ã‚©ãƒ¼ãƒžãƒƒãƒˆã«ã‚¢ãƒƒãƒ—グレード</translation> </message> <message> - <location line="-25"/> + <location line="-28"/> <source>Set key pool size to <n> (default: 100)</source> <translation>key pool ã®ã‚µã‚¤ã‚ºã‚’ <n> (åˆæœŸå€¤: 100) ã«ã‚»ãƒƒãƒˆ</translation> </message> <message> - <location line="-11"/> + <location line="-12"/> <source>Rescan the block chain for missing wallet transactions</source> <translation>失ã£ãŸã‚¦ã‚©ãƒ¬ãƒƒãƒˆã®å–引ã®ãƒ–ãƒãƒƒã‚¯ ãƒã‚§ãƒ¼ãƒ³ã‚’å†ã‚¹ã‚ャン</translation> </message> <message> - <location line="+39"/> + <location line="+43"/> <source>Use OpenSSL (https) for JSON-RPC connections</source> <translation>JSON-RPC 接続㫠OpenSSL (https) を使用</translation> </message> <message> - <location line="-31"/> + <location line="-34"/> <source>Server certificate file (default: server.cert)</source> <translation>サーãƒè¨¼æ˜Žæ›¸ãƒ•ã‚¡ã‚¤ãƒ« (åˆæœŸå€¤: server.cert)</translation> </message> @@ -3967,7 +4121,7 @@ rpcpassword=%s <translation>サーãƒã®ç§˜å¯†éµ (åˆæœŸå€¤: server.pem)</translation> </message> <message> - <location line="+17"/> + <location line="+20"/> <source>This help message</source> <translation>ã“ã®ãƒ˜ãƒ«ãƒ— メッセージ</translation> </message> @@ -3977,17 +4131,17 @@ rpcpassword=%s <translation>ã“ã®ã‚³ãƒ³ãƒ”ュータ㮠%s ã«ãƒã‚¤ãƒ³ãƒ‰ã™ã‚‹ã“ã¨ãŒã§ãã¾ã›ã‚“ (ãƒã‚¤ãƒ³ãƒ‰ãŒè¿”ã—ãŸã‚¨ãƒ©ãƒ¼ã¯ %d, %s)</translation> </message> <message> - <location line="-109"/> + <location line="-125"/> <source>Allow DNS lookups for -addnode, -seednode and -connect</source> <translation>-addnode, -seednode 㨠-connect 㧠DNS ルックアップを許å¯ã™ã‚‹</translation> </message> <message> - <location line="+61"/> + <location line="+66"/> <source>Loading addresses...</source> <translation>アドレスをèªã¿è¾¼ã‚“ã§ã„ã¾ã™...</translation> </message> <message> - <location line="-37"/> + <location line="-39"/> <source>Error loading wallet.dat: Wallet corrupted</source> <translation>wallet.dat èªã¿è¾¼ã¿ã‚¨ãƒ©ãƒ¼: ウォレットãŒå£Šã‚Œã¾ã—ãŸ</translation> </message> @@ -3997,22 +4151,22 @@ rpcpassword=%s <translation>wallet.dat èªã¿è¾¼ã¿ã‚¨ãƒ©ãƒ¼: ウォレット㯠Bitcoin ã®æœ€æ–°ãƒãƒ¼ã‚¸ãƒ§ãƒ³ã‚’å¿…è¦ã¨ã—ã¾ã™</translation> </message> <message> - <location line="+99"/> + <location line="+112"/> <source>Wallet needed to be rewritten: restart Bitcoin to complete</source> <translation>ウォレットãŒæ›¸ãç›´ã•ã‚Œã‚‹å¿…è¦ãŒã‚ã‚Šã¾ã—ãŸ: 完了ã™ã‚‹ãŸã‚ã« Bitcoin ã‚’å†èµ·å‹•ã—ã¾ã™</translation> </message> <message> - <location line="-101"/> + <location line="-114"/> <source>Error loading wallet.dat</source> <translation>wallet.dat èªã¿è¾¼ã¿ã‚¨ãƒ©ãƒ¼</translation> </message> <message> - <location line="+31"/> + <location line="+32"/> <source>Invalid -proxy address: '%s'</source> <translation>無効㪠-proxy アドレス: '%s'</translation> </message> <message> - <location line="+57"/> + <location line="+69"/> <source>Unknown network specified in -onlynet: '%s'</source> <translation>-onlynet ã§æŒ‡å®šã•ã‚ŒãŸ '%s' ã¯æœªçŸ¥ã®ãƒãƒƒãƒˆãƒ¯ãƒ¼ã‚¯ã§ã™</translation> </message> @@ -4022,7 +4176,7 @@ rpcpassword=%s <translation>-socks ã§æŒ‡å®šã•ã‚ŒãŸ %i ã¯æœªçŸ¥ã®ãƒãƒ¼ã‚¸ãƒ§ãƒ³ã§ã™</translation> </message> <message> - <location line="-103"/> + <location line="-119"/> <source>Cannot resolve -bind address: '%s'</source> <translation>-bind ã®ã‚¢ãƒ‰ãƒ¬ã‚¹ '%s' を解決ã§ãã¾ã›ã‚“</translation> </message> @@ -4032,7 +4186,7 @@ rpcpassword=%s <translation>-externalip ã®ã‚¢ãƒ‰ãƒ¬ã‚¹ '%s' を解決ã§ãã¾ã›ã‚“</translation> </message> <message> - <location line="+49"/> + <location line="+53"/> <source>Invalid amount for -paytxfee=<amount>: '%s'</source> <translation>-paytxfee=<amount> ã®é¡ '%s' ãŒç„¡åŠ¹ã§ã™</translation> </message> @@ -4047,27 +4201,22 @@ rpcpassword=%s <translation>残高ä¸è¶³</translation> </message> <message> - <location line="+10"/> + <location line="+11"/> <source>Loading block index...</source> <translation>ブãƒãƒƒã‚¯ インデックスをèªã¿è¾¼ã‚“ã§ã„ã¾ã™...</translation> </message> <message> - <location line="-63"/> + <location line="-68"/> <source>Add a node to connect to and attempt to keep the connection open</source> <translation>接続ã™ã‚‹ãƒŽãƒ¼ãƒ‰ã‚’è¿½åŠ ã—接続をæŒç¶šã™ã‚‹ã‚ˆã†ã«è©¦ã—ã¾ã™</translation> </message> <message> - <location line="-32"/> - <source>Unable to bind to %s on this computer. Bitcoin is probably already running.</source> - <translation>ã“ã®ã‚³ãƒ³ãƒ”ュータ㮠%s ã«ãƒã‚¤ãƒ³ãƒ‰ã™ã‚‹ã“ã¨ãŒã§ãã¾ã›ã‚“。ãŠãらã Bitcoin ã¯æ—¢ã«å®Ÿè¡Œã•ã‚Œã¦ã„ã¾ã™ã€‚</translation> - </message> - <message> - <location line="+96"/> + <location line="+69"/> <source>Loading wallet...</source> <translation>ウォレットをèªã¿è¾¼ã‚“ã§ã„ã¾ã™...</translation> </message> <message> - <location line="-57"/> + <location line="-62"/> <source>Cannot downgrade wallet</source> <translation>ウォレットã®ãƒ€ã‚¦ãƒ³ã‚°ãƒ¬ãƒ¼ãƒ‰ã¯ã§ãã¾ã›ã‚“</translation> </message> @@ -4077,27 +4226,27 @@ rpcpassword=%s <translation>åˆæœŸå€¤ã®ã‚¢ãƒ‰ãƒ¬ã‚¹ã‚’書ã込むã“ã¨ãŒã§ãã¾ã›ã‚“</translation> </message> <message> - <location line="+68"/> + <location line="+80"/> <source>Rescanning...</source> <translation>å†ã‚¹ã‚ャンä¸...</translation> </message> <message> - <location line="-58"/> + <location line="-67"/> <source>Done loading</source> <translation>èªã¿è¾¼ã¿å®Œäº†</translation> </message> <message> - <location line="+86"/> + <location line="+99"/> <source>To use the %s option</source> <translation>%s オプションを使ã†ã«ã¯</translation> </message> <message> - <location line="-78"/> + <location line="-91"/> <source>Error</source> <translation>エラー</translation> </message> <message> - <location line="-36"/> + <location line="-41"/> <source>You must set rpcpassword=<password> in the configuration file: %s If the file does not exist, create it with owner-readable-only file permissions.</source> diff --git a/src/qt/locale/bitcoin_ka.ts b/src/qt/locale/bitcoin_ka.ts index 80fbc4c282..27f327d029 100644 --- a/src/qt/locale/bitcoin_ka.ts +++ b/src/qt/locale/bitcoin_ka.ts @@ -36,6 +36,12 @@ This product includes software developed by the OpenSSL Project for use in the O <source>The Bitcoin Core developers</source> <translation>Bitcoin Core-ს áƒáƒ•áƒ¢áƒáƒ ები</translation> </message> + <message> + <location line="+12"/> + <location line="+2"/> + <source>(%1-bit)</source> + <translation type="unfinished"/> + </message> </context> <context> <name>AddressBookPage</name> @@ -65,7 +71,7 @@ This product includes software developed by the OpenSSL Project for use in the O <translation>&კáƒáƒžáƒ˜áƒ ებáƒ</translation> </message> <message> - <location line="+52"/> + <location line="+58"/> <source>C&lose</source> <translation>&დáƒáƒ®áƒ£áƒ ვáƒ</translation> </message> @@ -75,7 +81,7 @@ This product includes software developed by the OpenSSL Project for use in the O <translation>&მისáƒáƒ›áƒáƒ თის კáƒáƒžáƒ˜áƒ ებáƒ</translation> </message> <message> - <location filename="../forms/addressbookpage.ui" line="-41"/> + <location filename="../forms/addressbookpage.ui" line="-47"/> <source>Delete the currently selected address from the list</source> <translation>მáƒáƒœáƒ˜áƒ¨áƒœáƒ£áƒšáƒ˜ მისáƒáƒ›áƒáƒ თის წáƒáƒ¨áƒšáƒ სიიდáƒáƒœ</translation> </message> @@ -322,7 +328,7 @@ This product includes software developed by the OpenSSL Project for use in the O <context> <name>BitcoinGUI</name> <message> - <location filename="../bitcoingui.cpp" line="+295"/> + <location filename="../bitcoingui.cpp" line="+294"/> <source>Sign &message...</source> <translation>ხელ&მáƒáƒ¬áƒ”რáƒ</translation> </message> @@ -337,12 +343,12 @@ This product includes software developed by the OpenSSL Project for use in the O <translation>მიმ&áƒáƒ®áƒ˜áƒšáƒ•áƒ</translation> </message> <message> - <location line="-137"/> + <location line="-136"/> <source>Node</source> <translation>კვáƒáƒœáƒ«áƒ˜</translation> </message> <message> - <location line="+138"/> + <location line="+137"/> <source>Show general overview of wallet</source> <translation>სáƒáƒ¤áƒ£áƒšáƒ˜áƒ¡ ზáƒáƒ’áƒáƒ“ი მიმáƒáƒ®áƒ˜áƒšáƒ•áƒ</translation> </message> @@ -463,17 +469,17 @@ This product includes software developed by the OpenSSL Project for use in the O <translation>&ვერიფიკáƒáƒªáƒ˜áƒ</translation> </message> <message> - <location line="+430"/> + <location line="+440"/> <source>Bitcoin</source> <translation>Bitcoin</translation> </message> <message> - <location line="-643"/> + <location line="-652"/> <source>Wallet</source> <translation>სáƒáƒ¤áƒ£áƒšáƒ”</translation> </message> <message> - <location line="+146"/> + <location line="+145"/> <source>&Send</source> <translation>&გáƒáƒ’ზáƒáƒ•áƒœáƒ</translation> </message> @@ -529,18 +535,18 @@ This product includes software developed by the OpenSSL Project for use in the O <translation>ბáƒáƒ áƒáƒ—ების პáƒáƒœáƒ”ლი</translation> </message> <message> - <location line="-284"/> - <location line="+376"/> + <location line="-283"/> + <location line="+375"/> <source>[testnet]</source> <translation>[testnet]</translation> </message> <message> - <location line="-401"/> + <location line="-400"/> <source>Bitcoin Core</source> <translation>Bitcoin Core</translation> </message> <message> - <location line="+163"/> + <location line="+162"/> <source>Request payments (generates QR codes and bitcoin: URIs)</source> <translation>გáƒáƒ“áƒáƒ®áƒ“ის მáƒáƒ—ხáƒáƒ•áƒœáƒ (შეიქმნებრQR-კáƒáƒ“ები დრbitcoin: ბმულები)</translation> </message> @@ -602,7 +608,7 @@ This product includes software developed by the OpenSSL Project for use in the O <translation>დáƒáƒ›áƒ£áƒ¨áƒáƒ•áƒ”ბულირტრáƒáƒœáƒ¡áƒáƒ¥áƒªáƒ˜áƒ”ბის ისტáƒáƒ იის %1 ბლáƒáƒ™áƒ˜.</translation> </message> <message numerus="yes"> - <location line="+23"/> + <location line="+27"/> <source>%n hour(s)</source> <translation><numerusform>%n სáƒáƒáƒ—ი</numerusform></translation> </message> @@ -613,10 +619,21 @@ This product includes software developed by the OpenSSL Project for use in the O </message> <message numerus="yes"> <location line="+4"/> + <location line="+6"/> <source>%n week(s)</source> <translation><numerusform>%n კვირáƒ</numerusform></translation> </message> <message> + <location line="+0"/> + <source>%1 and %2</source> + <translation>%1 დრ%2</translation> + </message> + <message numerus="yes"> + <location line="+0"/> + <source>%n year(s)</source> + <translation><numerusform>%n წელი</numerusform></translation> + </message> + <message> <location line="+4"/> <source>%1 behind</source> <translation>%1 გáƒáƒ•áƒšáƒ˜áƒšáƒ˜áƒ</translation> @@ -647,12 +664,12 @@ This product includes software developed by the OpenSSL Project for use in the O <translation>ინფáƒáƒ მáƒáƒªáƒ˜áƒ</translation> </message> <message> - <location line="-85"/> + <location line="-95"/> <source>Up to date</source> <translation>გáƒáƒœáƒáƒ®áƒšáƒ”ბულიáƒ</translation> </message> <message> - <location line="+34"/> + <location line="+44"/> <source>Catching up...</source> <translation>ჩáƒáƒ თვáƒ...</translation> </message> @@ -690,7 +707,7 @@ Address: %4 <translation>სáƒáƒ¤áƒ£áƒšáƒ” <b>დáƒáƒ¨áƒ˜áƒ¤áƒ ულიáƒ</b> დრáƒáƒ›áƒŸáƒáƒ›áƒáƒ“ <b>დáƒáƒ‘ლáƒáƒ™áƒ˜áƒšáƒ˜áƒ</b></translation> </message> <message> - <location filename="../bitcoin.cpp" line="+438"/> + <location filename="../bitcoin.cpp" line="+443"/> <source>A fatal error occurred. Bitcoin can no longer continue safely and will quit.</source> <translation>ფáƒáƒ¢áƒáƒšáƒ£áƒ ი შეცდáƒáƒ›áƒ. Bitcoin ვერუზრუნველყáƒáƒ¤áƒ¡ უსáƒáƒ¤áƒ თხრგáƒáƒ’რძელებáƒáƒ¡, áƒáƒ›áƒ˜áƒ¢áƒáƒ› იხურებáƒ.</translation> </message> @@ -698,7 +715,7 @@ Address: %4 <context> <name>ClientModel</name> <message> - <location filename="../clientmodel.cpp" line="+119"/> + <location filename="../clientmodel.cpp" line="+128"/> <source>Network Alert</source> <translation>ქსელური გáƒáƒœáƒ’áƒáƒ¨áƒ˜</translation> </message> @@ -751,7 +768,7 @@ Address: %4 <translation>ხურდáƒ:</translation> </message> <message> - <location line="+63"/> + <location line="+56"/> <source>(un)select all</source> <translation>ყველáƒáƒ¡ მáƒáƒœáƒ˜áƒ¨áƒ•áƒœáƒ/(მáƒáƒ®áƒ¡áƒœáƒ)</translation> </message> @@ -766,7 +783,7 @@ Address: %4 <translation>სიáƒ</translation> </message> <message> - <location line="+52"/> + <location line="+53"/> <source>Amount</source> <translation>რáƒáƒáƒ“ენáƒáƒ‘áƒ</translation> </message> @@ -796,7 +813,7 @@ Address: %4 <translation>პრიáƒáƒ იტეტი</translation> </message> <message> - <location filename="../coincontroldialog.cpp" line="+42"/> + <location filename="../coincontroldialog.cpp" line="+41"/> <source>Copy address</source> <translation>მისáƒáƒ›áƒáƒ თის კáƒáƒžáƒ˜áƒ ებáƒ</translation> </message> @@ -862,7 +879,7 @@ Address: %4 <translation>ხურდის კáƒáƒžáƒ˜áƒ ებáƒ</translation> </message> <message> - <location line="+323"/> + <location line="+332"/> <source>highest</source> <translation>უმáƒáƒ¦áƒšáƒ”სი</translation> </message> @@ -912,12 +929,12 @@ Address: %4 <translation>(%1 დáƒáƒ‘ლáƒáƒ™áƒ˜áƒšáƒ˜áƒ)</translation> </message> <message> - <location line="+31"/> + <location line="+32"/> <source>none</source> <translation>ცáƒáƒ იელი</translation> </message> <message> - <location line="+140"/> + <location line="+141"/> <source>Dust</source> <translation>მტვერი</translation> </message> @@ -980,12 +997,12 @@ Address: %4 </message> <message> <location line="+43"/> - <location line="+66"/> + <location line="+61"/> <source>(no label)</source> <translation>(áƒáƒ áƒáƒ ის ნიშნული)</translation> </message> <message> - <location line="-9"/> + <location line="-7"/> <source>change from %1 (%2)</source> <translation>ხურდრ%1-დáƒáƒœ (%2)</translation> </message> @@ -1066,7 +1083,7 @@ Address: %4 <context> <name>FreespaceChecker</name> <message> - <location filename="../intro.cpp" line="+65"/> + <location filename="../intro.cpp" line="+68"/> <source>A new data directory will be created.</source> <translation>შეიქმნებრáƒáƒ®áƒáƒšáƒ˜ მáƒáƒœáƒáƒªáƒ”მთრკáƒáƒ¢áƒáƒšáƒáƒ’ი.</translation> </message> @@ -1099,7 +1116,7 @@ Address: %4 <translation>Bitcoin Core - სáƒáƒ™áƒáƒ›áƒáƒœáƒ“რსტრიქáƒáƒœáƒ˜áƒ¡ áƒáƒžáƒªáƒ˜áƒ”ბი</translation> </message> <message> - <location filename="../utilitydialog.cpp" line="+38"/> + <location filename="../utilitydialog.cpp" line="+24"/> <source>Bitcoin Core</source> <translation>Bitcoin Core</translation> </message> @@ -1124,7 +1141,7 @@ Address: %4 <translation>ინტერფეისის პáƒáƒ áƒáƒ›áƒ”ტრები</translation> </message> <message> - <location line="+1"/> + <location line="+2"/> <source>Set language, for example "de_DE" (default: system locale)</source> <translation>áƒáƒ˜áƒ ჩიეთ ენáƒ, მáƒáƒ’áƒáƒšáƒ˜áƒ—áƒáƒ“ "de_DE" (ნáƒáƒ’ულისხმევირსისტემური ლáƒáƒ™áƒáƒšáƒ˜)</translation> </message> @@ -1135,11 +1152,16 @@ Address: %4 </message> <message> <location line="+1"/> + <source>Set SSL root certificates for payment request (default: -system-)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> <source>Show splash screen on startup (default: 1)</source> <translation>მისáƒáƒšáƒ›áƒ”ბის ეკრáƒáƒœáƒ˜áƒ¡ ჩვენებრგáƒáƒ¨áƒ•áƒ”ბისáƒáƒ¡ (ნáƒáƒ’ულისხმევი:1)</translation> </message> <message> - <location line="+1"/> + <location line="-4"/> <source>Choose data directory on startup (default: 0)</source> <translation>მáƒáƒœáƒáƒªáƒ”მთრკáƒáƒ¢áƒáƒšáƒáƒ’ის მითითებრყáƒáƒ•áƒ”ლი გáƒáƒ¨áƒ•áƒ”ბისáƒáƒ¡ (ნáƒáƒ’ულისხმევი: 0)</translation> </message> @@ -1177,7 +1199,7 @@ Address: %4 <translation>მითითებული კáƒáƒ¢áƒáƒšáƒáƒ’ის გáƒáƒ›áƒáƒ§áƒ”ნებáƒ:</translation> </message> <message> - <location filename="../intro.cpp" line="+85"/> + <location filename="../intro.cpp" line="+82"/> <source>Bitcoin</source> <translation>Bitcoin</translation> </message> @@ -1187,7 +1209,7 @@ Address: %4 <translation>შეცდáƒáƒ›áƒ: მითითებული მáƒáƒœáƒáƒªáƒ”მთრკáƒáƒ¢áƒáƒšáƒáƒ’ი "%1" ვერშეიქმნáƒ.</translation> </message> <message> - <location line="+19"/> + <location line="+24"/> <source>Error</source> <translation>შეცდáƒáƒ›áƒ</translation> </message> @@ -1243,7 +1265,7 @@ Address: %4 <translation>&მთáƒáƒ•áƒáƒ ი</translation> </message> <message> - <location line="+6"/> + <location line="+116"/> <source>Optional transaction fee per kB that helps make sure your transactions are processed quickly. Most transactions are 1 kB.</source> <translation>დáƒáƒ›áƒáƒ¢áƒ”ბითი სáƒáƒ™áƒáƒ›áƒ˜áƒ¡áƒ˜áƒ თითრკილáƒáƒ‘áƒáƒ˜áƒ¢áƒ–ე; áƒáƒ©áƒ¥áƒáƒ ებს ტრáƒáƒœáƒ¡áƒáƒ¥áƒªáƒ˜áƒ˜áƒ¡ შესრულებáƒáƒ¡. ტრáƒáƒœáƒ¡áƒáƒ¥áƒªáƒ˜áƒ”ბის უმეტესáƒáƒ‘რáƒáƒ ის 1 კბ.</translation> </message> @@ -1253,7 +1275,7 @@ Address: %4 <translation>ტრáƒáƒœáƒ¡áƒáƒ¥áƒªáƒ˜áƒ˜áƒ¡ სáƒ&ფáƒáƒ¡áƒ£áƒ ის გáƒáƒ“áƒáƒ®áƒ“áƒ</translation> </message> <message> - <location line="+31"/> + <location line="-125"/> <source>Automatically start Bitcoin after logging in to the system.</source> <translation>სისტემáƒáƒ¨áƒ˜ შესვლის შემდეგ Bitcoin-ის áƒáƒ•áƒ¢áƒáƒ›áƒáƒ¢áƒ£áƒ ი გáƒáƒ¨áƒ•áƒ”ბáƒ.</translation> </message> @@ -1268,12 +1290,7 @@ Address: %4 <translation>მáƒáƒœáƒáƒªáƒ”მთრბáƒáƒ–ის კეშის სი&დიდე</translation> </message> <message> - <location line="+13"/> - <source>Set database cache size in megabytes (default: 25)</source> - <translation>მáƒáƒœáƒáƒªáƒ”მთრბáƒáƒ–ის ქეშის ზáƒáƒ›áƒ მეგáƒáƒ‘áƒáƒ˜áƒ¢áƒ”ბში (ნáƒáƒ’ულისხმევირ25)</translation> - </message> - <message> - <location line="+13"/> + <location line="+16"/> <source>MB</source> <translation>MB</translation> </message> @@ -1283,12 +1300,7 @@ Address: %4 <translation>სკრიპტის &ვერიფიცირების ნáƒáƒ™áƒáƒ“ების რáƒáƒáƒ“ენáƒáƒ‘áƒ</translation> </message> <message> - <location line="+13"/> - <source>Set the number of script verification threads (up to 16, 0 = auto, <0 = leave that many cores free, default: 0)</source> - <translation>სკრიპტის ვერიფიკáƒáƒªáƒ˜áƒ˜áƒ¡ ნáƒáƒ™áƒáƒ“ების რáƒáƒáƒ“ენáƒáƒ‘რ(16-მდე, 0 - áƒáƒ•áƒ¢áƒáƒ›áƒáƒ¢áƒ£áƒ ი, <0 - დáƒáƒ¡áƒáƒ¢áƒáƒ•áƒ”ბელი ბირთვების რáƒáƒáƒ“ენáƒáƒ‘áƒ, ნáƒáƒ’ულისხმევი: 0)</translation> - </message> - <message> - <location line="+58"/> + <location line="+160"/> <source>Connect to the Bitcoin network through a SOCKS proxy.</source> <translation>Bitcoin-ქსელზე მიერთებრSOCKS-პრáƒáƒ¥áƒ¡áƒ˜áƒ—.</translation> </message> @@ -1303,7 +1315,7 @@ Address: %4 <translation>პრáƒáƒ¥áƒ¡áƒ˜áƒ¡ IP-მისáƒáƒ›áƒáƒ თი (მáƒáƒ’.: IPv4: 127.0.0.1 / IPv6: ::1)</translation> </message> <message> - <location line="+224"/> + <location line="+214"/> <source>Active command-line options that override above options:</source> <translation>სáƒáƒ™áƒáƒ›áƒáƒœáƒ“რსტრიქáƒáƒœáƒ˜áƒ¡ áƒáƒ¥áƒ¢áƒ˜áƒ£áƒ ი áƒáƒžáƒªáƒ˜áƒ”ბი, რáƒáƒ›áƒšáƒ”ბიც გáƒáƒ“áƒáƒ¤áƒáƒ áƒáƒ•áƒ”ნ ზემáƒáƒ—ნáƒáƒ©áƒ•áƒ”ნებს:</translation> </message> @@ -1318,12 +1330,42 @@ Address: %4 <translation>დáƒáƒ‘&რუნების áƒáƒžáƒªáƒ˜áƒ”ბი</translation> </message> <message> - <location line="-323"/> + <location line="-313"/> <source>&Network</source> <translation>&ქსელი</translation> </message> <message> - <location line="+6"/> + <location line="-131"/> + <source>(0 = auto, <0 = leave that many cores free)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+36"/> + <source>W&allet</source> + <translation>ს&áƒáƒ¤áƒ£áƒšáƒ”</translation> + </message> + <message> + <location line="+65"/> + <source>Expert</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+9"/> + <source>Enable coin &control features</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+7"/> + <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>დáƒáƒ£áƒ“áƒáƒ¡áƒ¢áƒ£áƒ ებელი ხურდის გáƒáƒ›áƒáƒ§áƒ”ნების áƒáƒ™áƒ ძáƒáƒšáƒ•áƒ˜áƒ¡ შემდეგ მáƒáƒ—ი გáƒáƒ›áƒáƒ§áƒ”ნებრშეუძლებელი იქნებáƒ, სáƒáƒœáƒáƒ› ტრáƒáƒœáƒ¡áƒáƒ¥áƒªáƒ˜áƒáƒ¡ áƒáƒ ექნებრერთი დáƒáƒ¡áƒ¢áƒ£áƒ ი მáƒáƒ˜áƒœáƒª. ეს áƒáƒ˜áƒ¡áƒáƒ®áƒ”ბრთქვენი ნáƒáƒ¨áƒ—ის დáƒáƒ—ვლáƒáƒ–ეც.</translation> + </message> + <message> + <location line="+3"/> + <source>&Spend unconfirmed change</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+17"/> <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> @@ -1418,17 +1460,12 @@ Address: %4 <translation>მისáƒáƒ›áƒáƒ თების &ჩვენებრსიáƒáƒ¨áƒ˜</translation> </message> <message> - <location line="+7"/> + <location line="-262"/> <source>Whether to show coin control features or not.</source> <translation>ვáƒáƒ©áƒ•áƒ”ნáƒáƒ— თუ áƒáƒ რმáƒáƒœáƒ”ტების მáƒáƒ თვის პáƒáƒ áƒáƒ›áƒ”ტრები.</translation> </message> <message> - <location line="+3"/> - <source>Display coin &control features (experts only)</source> - <translation>მáƒáƒ თვის პáƒáƒ áƒáƒ›áƒ”ტრები (მხáƒáƒšáƒáƒ“ ექსპერტთáƒáƒ—ვის)</translation> - </message> - <message> - <location line="+136"/> + <location line="+398"/> <source>&OK</source> <translation>&OK</translation> </message> @@ -1438,17 +1475,17 @@ Address: %4 <translation>&გáƒáƒ£áƒ¥áƒ›áƒ”ბáƒ</translation> </message> <message> - <location filename="../optionsdialog.cpp" line="+67"/> + <location filename="../optionsdialog.cpp" line="+72"/> <source>default</source> <translation>ნáƒáƒ’ულისხმევი</translation> </message> <message> - <location line="+57"/> + <location line="+58"/> <source>none</source> <translation>ცáƒáƒ იელი</translation> </message> <message> - <location line="+75"/> + <location line="+80"/> <source>Confirm options reset</source> <translation>დáƒáƒáƒ“áƒáƒ¡áƒ¢áƒ£áƒ ეთ პáƒáƒ áƒáƒ›áƒ”ტრების დáƒáƒ‘რუნებრნáƒáƒ’ულისხმევზე</translation> </message> @@ -1488,19 +1525,14 @@ Address: %4 <translation>ნáƒáƒ©áƒ•áƒ”ნები ინფáƒáƒ მáƒáƒªáƒ˜áƒ შეიძლებრმáƒáƒ«áƒ•áƒ”ლებული იყáƒáƒ¡. თქვენი სáƒáƒ¤áƒ£áƒšáƒ” áƒáƒ•áƒ¢áƒáƒ›áƒáƒ¢áƒ£áƒ áƒáƒ“ სინქრáƒáƒœáƒ˜áƒ–დებრBitcoin-ის ქსელთáƒáƒœ კáƒáƒ•áƒ¨áƒ˜áƒ ის დáƒáƒ›áƒ§áƒáƒ ების შემდეგ, ეს პრáƒáƒªáƒ”სი ჯერáƒáƒ áƒáƒ ის დáƒáƒ¡áƒ ულებული.</translation> </message> <message> - <location line="-155"/> - <source>Unconfirmed:</source> - <translation>დáƒáƒ£áƒ“áƒáƒ¡áƒ¢áƒ£áƒ ებელიáƒ:</translation> - </message> - <message> - <location line="-83"/> + <location line="-238"/> <source>Wallet</source> <translation>სáƒáƒ¤áƒ£áƒšáƒ”</translation> </message> <message> <location line="+51"/> - <source>Confirmed:</source> - <translation>დáƒáƒ“áƒáƒ¡áƒ¢áƒ£áƒ ებულიáƒ:</translation> + <source>Available:</source> + <translation>ხელმისáƒáƒ¬áƒ•áƒ“áƒáƒ›áƒ˜áƒ:</translation> </message> <message> <location line="+16"/> @@ -1508,7 +1540,12 @@ Address: %4 <translation>თქვენი ხელმისáƒáƒ¬áƒ•áƒ“áƒáƒ›áƒ˜ ნáƒáƒ¨áƒ—ი</translation> </message> <message> - <location line="+32"/> + <location line="+16"/> + <source>Pending:</source> + <translation>იგზáƒáƒ•áƒœáƒ”ბáƒ:</translation> + </message> + <message> + <location line="+16"/> <source>Total of transactions that have yet to be confirmed, and do not yet count toward the spendable balance</source> <translation>დáƒáƒ¡áƒáƒ“áƒáƒ¡áƒ¢áƒ£áƒ ებელი ტრáƒáƒœáƒ¡áƒáƒ¥áƒªáƒ˜áƒ”ბის სáƒáƒ”რთრრáƒáƒáƒ“ენáƒáƒ‘áƒ, რáƒáƒ›áƒšáƒ”ბიც ჯერáƒáƒ áƒáƒ ის áƒáƒ¡áƒáƒ®áƒ£áƒšáƒ˜ ბáƒáƒšáƒáƒœáƒ¡áƒ¨áƒ˜</translation> </message> @@ -1641,23 +1678,29 @@ Address: %4 <context> <name>QObject</name> <message> - <location filename="../bitcoin.cpp" line="+71"/> - <location line="+11"/> + <location filename="../bitcoin.cpp" line="+63"/> + <location line="+7"/> + <location line="+13"/> <source>Bitcoin</source> <translation>Bitcoin</translation> </message> <message> - <location line="+1"/> + <location line="-19"/> <source>Error: Specified data directory "%1" does not exist.</source> <translation>შეცდáƒáƒ›áƒ: მითითებული მáƒáƒœáƒáƒªáƒ”მთრკáƒáƒ¢áƒáƒšáƒáƒ’ი "%1" áƒáƒ áƒáƒ სებáƒáƒ‘ს.</translation> </message> <message> - <location line="-12"/> + <location line="+7"/> + <source>Error: Cannot parse configuration file: %1. Only use key=value syntax.</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+12"/> <source>Error: Invalid combination of -regtest and -testnet.</source> <translation>შეცდáƒáƒ›áƒ: -regtest-ისრდრ-testnet-ის დáƒáƒ£áƒ¨áƒ•áƒ”ბელი კáƒáƒ›áƒ‘ინáƒáƒªáƒ˜áƒ.</translation> </message> <message> - <location filename="../guiutil.cpp" line="+82"/> + <location filename="../guiutil.cpp" line="+89"/> <source>Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source> <translation>შეიყვáƒáƒœáƒ”თ ბიტკáƒáƒ˜áƒœ-მისáƒáƒ›áƒáƒ თი (მáƒáƒ’. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation> </message> @@ -1703,7 +1746,7 @@ Address: %4 <location line="+36"/> <location line="+23"/> <location line="+23"/> - <location filename="../rpcconsole.cpp" line="+359"/> + <location filename="../rpcconsole.cpp" line="+373"/> <source>N/A</source> <translation>მიუწვდ.</translation> </message> @@ -1799,11 +1842,13 @@ Address: %4 </message> <message> <location line="+64"/> + <location filename="../rpcconsole.cpp" line="-10"/> <source>In:</source> <translation>შემáƒáƒ›áƒáƒ•áƒáƒšáƒ˜:</translation> </message> <message> <location line="+80"/> + <location filename="../rpcconsole.cpp" line="+1"/> <source>Out:</source> <translation>გáƒáƒ›áƒáƒ•áƒáƒšáƒ˜:</translation> </message> @@ -1828,7 +1873,7 @@ Address: %4 <translation>კáƒáƒœáƒ¡áƒáƒšáƒ˜áƒ¡ გáƒáƒ¡áƒ£áƒ¤áƒ—áƒáƒ•áƒ”ბáƒ</translation> </message> <message> - <location filename="../rpcconsole.cpp" line="-30"/> + <location filename="../rpcconsole.cpp" line="-35"/> <source>Welcome to the Bitcoin RPC console.</source> <translation>მáƒáƒ’ესáƒáƒšáƒ›áƒ”ბáƒáƒ— Bitcoin-ის RPC კáƒáƒœáƒ¡áƒáƒšáƒ˜.</translation> </message> @@ -1843,7 +1888,7 @@ Address: %4 <translation>áƒáƒ™áƒ იფეთ <b>help</b> ფáƒáƒ¨áƒ•áƒ”ბული ბრძáƒáƒœáƒ”ბების სáƒáƒœáƒáƒ®áƒáƒ•áƒáƒ“.</translation> </message> <message> - <location line="+122"/> + <location line="+136"/> <source>%1 B</source> <translation>%1 B</translation> </message> @@ -1959,7 +2004,7 @@ Address: %4 <translation>ჩვენებáƒ</translation> </message> <message> - <location line="+11"/> + <location line="+14"/> <source>Remove the selected entries from the list</source> <translation>მáƒáƒœáƒ˜áƒ¨áƒœáƒ£áƒšáƒ˜ ჩáƒáƒœáƒáƒ¬áƒ”რების წáƒáƒ¨áƒšáƒ სიიდáƒáƒœ</translation> </message> @@ -1969,7 +2014,7 @@ Address: %4 <translation>წáƒáƒ¨áƒšáƒ</translation> </message> <message> - <location filename="../receivecoinsdialog.cpp" line="+38"/> + <location filename="../receivecoinsdialog.cpp" line="+39"/> <source>Copy label</source> <translation>ნიშნულის კáƒáƒžáƒ˜áƒ ებáƒ</translation> </message> @@ -2190,12 +2235,12 @@ Address: %4 <translation>გ&áƒáƒ¡áƒ£áƒ¤áƒ—áƒáƒ•áƒ”ბáƒ</translation> </message> <message> - <location line="+52"/> + <location line="+58"/> <source>Balance:</source> <translation>ბáƒáƒšáƒáƒœáƒ¡áƒ˜:</translation> </message> <message> - <location line="-78"/> + <location line="-84"/> <source>Confirm the send action</source> <translation>გáƒáƒ’ზáƒáƒ•áƒœáƒ˜áƒ¡ დáƒáƒ“áƒáƒ¡áƒ¢áƒ£áƒ ებáƒ</translation> </message> @@ -2440,7 +2485,7 @@ Address: %4 <context> <name>ShutdownWindow</name> <message> - <location filename="../utilitydialog.cpp" line="+48"/> + <location filename="../utilitydialog.cpp" line="+52"/> <source>Bitcoin Core is shutting down...</source> <translation>Bitcoin Core იხურებáƒ...</translation> </message> @@ -2640,7 +2685,7 @@ Address: %4 <context> <name>SplashScreen</name> <message> - <location filename="../splashscreen.cpp" line="+28"/> + <location filename="../splashscreen.cpp" line="+32"/> <source>Bitcoin Core</source> <translation>Bitcoin Core</translation> </message> @@ -2672,6 +2717,11 @@ Address: %4 </message> <message> <location line="+6"/> + <source>conflicted</source> + <translation>კáƒáƒœáƒ¤áƒšáƒ˜áƒ¥áƒ¢áƒ¨áƒ˜áƒ</translation> + </message> + <message> + <location line="+2"/> <source>%1/offline</source> <translation>%1/გáƒáƒ—იშულიáƒ</translation> </message> @@ -2833,12 +2883,12 @@ Address: %4 <translation>, დáƒáƒ’ზáƒáƒ•áƒœáƒ áƒáƒ áƒáƒ ის წáƒáƒ მáƒáƒ¢áƒ”ბით დáƒáƒ¡áƒ ულებული</translation> </message> <message numerus="yes"> - <location line="-35"/> + <location line="-37"/> <source>Open for %n more block(s)</source> <translation><numerusform>ღიáƒáƒ კიდევ %n ბლáƒáƒ™áƒ˜áƒ¡áƒáƒ—ვის</numerusform></translation> </message> <message> - <location line="+70"/> + <location line="+72"/> <source>unknown</source> <translation>უცნáƒáƒ‘იáƒ</translation> </message> @@ -2879,12 +2929,12 @@ Address: %4 <translation>რáƒáƒáƒ“ენáƒáƒ‘áƒ</translation> </message> <message> - <location line="+59"/> + <location line="+78"/> <source>Immature (%1 confirmations, will be available after %2)</source> <translation>áƒáƒ áƒáƒ ის მáƒáƒ›áƒ¬áƒ˜áƒ¤áƒ”ბული (%1 დáƒáƒ¡áƒ¢áƒ£áƒ ი, სáƒáƒáƒ˜áƒ áƒáƒ სულ %2)</translation> </message> <message numerus="yes"> - <location line="+16"/> + <location line="-21"/> <source>Open for %n more block(s)</source> <translation><numerusform>ღიáƒáƒ კიდევ %n ბლáƒáƒ™áƒ˜áƒ¡áƒáƒ—ვის</numerusform></translation> </message> @@ -2894,23 +2944,12 @@ Address: %4 <translation>ღირიქნებრსáƒáƒœáƒáƒ› %1</translation> </message> <message> - <location line="+3"/> - <source>Offline (%1 confirmations)</source> - <translation>áƒáƒ¤áƒšáƒáƒ˜áƒœáƒ¨áƒ˜áƒ (%1 დáƒáƒ¡áƒáƒ¡áƒ¢áƒ£áƒ ებáƒ)</translation> - </message> - <message> - <location line="+3"/> - <source>Unconfirmed (%1 of %2 confirmations)</source> - <translation>დáƒáƒ£áƒ“áƒáƒ¡áƒ¢áƒ£áƒ ებელირ(%1 დáƒáƒ“áƒáƒ¡áƒ¢áƒ£áƒ ებრ%2-დáƒáƒœ)</translation> - </message> - <message> - <location line="-22"/> - <location line="+25"/> + <location line="+12"/> <source>Confirmed (%1 confirmations)</source> <translation>დáƒáƒ“áƒáƒ¡áƒ¢áƒ£áƒ ებულირ(%1დáƒáƒ¡áƒ¢áƒ£áƒ ი)</translation> </message> <message> - <location line="-22"/> + <location line="+9"/> <source>This block was not received by any other nodes and will probably not be accepted!</source> <translation>ეს ბლáƒáƒ™áƒ˜ áƒáƒ áƒáƒ ის მიღებული áƒáƒ ცერთი კვáƒáƒœáƒ«áƒ˜áƒ¡ მიერდრსáƒáƒ•áƒáƒ áƒáƒ£áƒ“áƒáƒ“ უáƒáƒ ყáƒáƒ¤áƒ˜áƒšáƒ˜áƒ!</translation> </message> @@ -2920,7 +2959,27 @@ Address: %4 <translation>გენერირებულიáƒ, მáƒáƒ’რáƒáƒ› უáƒáƒ ყáƒáƒ¤áƒ˜áƒšáƒ˜áƒ</translation> </message> <message> - <location line="+62"/> + <location line="-21"/> + <source>Offline</source> + <translation>áƒáƒ¤áƒšáƒáƒ˜áƒœáƒ¨áƒ˜áƒ</translation> + </message> + <message> + <location line="+3"/> + <source>Unconfirmed</source> + <translation>დáƒáƒ£áƒ“áƒáƒ¡áƒ¢áƒ£áƒ ებელიáƒ</translation> + </message> + <message> + <location line="+3"/> + <source>Confirming (%1 of %2 recommended confirmations)</source> + <translation>დáƒáƒ“áƒáƒ¡áƒ¢áƒ£áƒ ებულირ(%1, რეკáƒáƒ›áƒ”ნდებულირ%2)</translation> + </message> + <message> + <location line="+6"/> + <source>Conflicted</source> + <translation>კáƒáƒœáƒ¤áƒšáƒ˜áƒ¥áƒ¢áƒ¨áƒ˜áƒ</translation> + </message> + <message> + <location line="+51"/> <source>Received with</source> <translation>მიღებულიáƒ</translation> </message> @@ -2950,7 +3009,7 @@ Address: %4 <translation>(მიუწვდ.)</translation> </message> <message> - <location line="+199"/> + <location line="+190"/> <source>Transaction status. Hover over this field to show number of confirmations.</source> <translation>ტრáƒáƒœáƒ¡áƒáƒ¥áƒªáƒ˜áƒ˜áƒ¡ სტáƒáƒ¢áƒ£áƒ¡áƒ˜. ველზე კურსáƒáƒ ის შეყვáƒáƒœáƒ˜áƒ¡áƒáƒ¡ გáƒáƒ›áƒáƒ©áƒœáƒ“ებრდáƒáƒ¡áƒ¢áƒ£áƒ ების რáƒáƒáƒ“ენáƒáƒ‘áƒ.</translation> </message> @@ -3079,7 +3138,7 @@ Address: %4 <translation>ტრáƒáƒœáƒ¡áƒáƒ¥áƒªáƒ˜áƒ˜áƒ¡ დეტáƒáƒšáƒ”ბის ჩვენებáƒ</translation> </message> <message> - <location line="+142"/> + <location line="+140"/> <source>Export Transaction History</source> <translation>ტრáƒáƒœáƒ¡áƒáƒ¥áƒªáƒ˜áƒ”ბის ისტáƒáƒ იის ექსპáƒáƒ ტი</translation> </message> @@ -3173,7 +3232,7 @@ Address: %4 <context> <name>WalletView</name> <message> - <location filename="../walletview.cpp" line="+43"/> + <location filename="../walletview.cpp" line="+44"/> <source>&Export</source> <translation>&ექსპáƒáƒ ტი</translation> </message> @@ -3183,7 +3242,7 @@ Address: %4 <translation>áƒáƒ› ბáƒáƒ áƒáƒ—იდáƒáƒœ მáƒáƒœáƒáƒªáƒ”მების ექსპáƒáƒ ტი ფáƒáƒ˜áƒšáƒ¨áƒ˜</translation> </message> <message> - <location line="+181"/> + <location line="+184"/> <source>Backup Wallet</source> <translation>სáƒáƒ¤áƒ£áƒšáƒ˜áƒ¡ áƒáƒ ქივირებáƒ</translation> </message> @@ -3216,12 +3275,12 @@ Address: %4 <context> <name>bitcoin-core</name> <message> - <location filename="../bitcoinstrings.cpp" line="+221"/> + <location filename="../bitcoinstrings.cpp" line="+261"/> <source>Usage:</source> <translation>გáƒáƒ›áƒáƒ§áƒ”ნებáƒ:</translation> </message> <message> - <location line="-54"/> + <location line="-66"/> <source>List commands</source> <translation>ბრძáƒáƒœáƒ”ბები</translation> </message> @@ -3231,12 +3290,12 @@ Address: %4 <translation>ბრძáƒáƒœáƒ”ბის áƒáƒ¦áƒ¬áƒ”რილáƒáƒ‘áƒ</translation> </message> <message> - <location line="+26"/> + <location line="+27"/> <source>Options:</source> <translation>áƒáƒžáƒªáƒ˜áƒ”ბი:</translation> </message> <message> - <location line="+22"/> + <location line="+32"/> <source>Specify configuration file (default: bitcoin.conf)</source> <translation>მიუთითეთ სáƒáƒ™áƒáƒœáƒ¤áƒ˜áƒ’ურáƒáƒªáƒ˜áƒ ფáƒáƒ˜áƒšáƒ˜ (ნáƒáƒ’ულისხმევიáƒ: bitcoin.conf)</translation> </message> @@ -3251,72 +3310,72 @@ Address: %4 <translation>მიუთითეთ მáƒáƒœáƒáƒªáƒ”მთრკáƒáƒ¢áƒáƒšáƒáƒ’ი</translation> </message> <message> - <location line="-9"/> - <source>Set database cache size in megabytes (default: 25)</source> - <translation>მáƒáƒœáƒáƒªáƒ”მთრბáƒáƒ–ის ქეშის ზáƒáƒ›áƒ მეგáƒáƒ‘áƒáƒ˜áƒ¢áƒ”ბში (ნáƒáƒ’ულისხმევირ25)</translation> - </message> - <message> - <location line="-26"/> + <location line="-46"/> <source>Listen for connections on <port> (default: 8333 or testnet: 18333)</source> <translation>მიყურáƒáƒ“ებრპáƒáƒ ტზე <port> (ნáƒáƒ’ულისხმევი: 8333 áƒáƒœ სáƒáƒ¢áƒ”სტრქსელში: 18333)</translation> </message> <message> - <location line="+5"/> + <location line="+6"/> <source>Maintain at most <n> connections to peers (default: 125)</source> <translation>áƒáƒ áƒáƒ£áƒ›áƒ”ტეს <n> შეერთებისრპირებზე (ნáƒáƒ’ულისხმევი: 125)</translation> </message> <message> - <location line="-51"/> + <location line="-57"/> <source>Connect to a node to retrieve peer addresses, and disconnect</source> <translation>მიერთებრკვáƒáƒœáƒ«áƒ—áƒáƒœ, პირების მისáƒáƒ›áƒáƒ თების მიღებრდრგáƒáƒ—იშვáƒ</translation> </message> <message> - <location line="+84"/> + <location line="+100"/> <source>Specify your own public address</source> <translation>მიუთითეთ თქვენი სáƒáƒ¯áƒáƒ რმისáƒáƒ›áƒáƒ თი</translation> </message> <message> - <location line="+5"/> + <location line="+6"/> <source>Threshold for disconnecting misbehaving peers (default: 100)</source> <translation>áƒáƒ áƒáƒ¡áƒ¬áƒáƒ áƒáƒ“ მáƒáƒ¥áƒ›áƒ”დი პირების გáƒáƒ—იშვის ზღვáƒáƒ ი (ნáƒáƒ’ულისხმევი:100)</translation> </message> <message> - <location line="-148"/> + <location line="-172"/> <source>Number of seconds to keep misbehaving peers from reconnecting (default: 86400)</source> <translation>áƒáƒ áƒáƒ¡áƒ¬áƒáƒ áƒáƒ“ მáƒáƒ¥áƒ›áƒ”დი პირების ბლáƒáƒ™áƒ˜áƒ ების დრრწáƒáƒ›áƒ”ბში (ნáƒáƒ’ულისხმევი: 86400)</translation> </message> <message> - <location line="-36"/> + <location line="-52"/> <source>An error occurred while setting up the RPC port %u for listening on IPv4: %s</source> <translation>შეცდáƒáƒ›áƒ %u RPC-პáƒáƒ ტის მიყურáƒáƒ“ების ჩáƒáƒ თვისáƒáƒ¡ IPv4 მისáƒáƒ›áƒáƒ თზე: %s</translation> </message> <message> - <location line="+34"/> + <location line="+50"/> <source>Listen for JSON-RPC connections on <port> (default: 8332 or testnet: 18332)</source> <translation> JSON-RPC-შეერთებების მიყურáƒáƒ“ებრპáƒáƒ ტზე <port> (ნáƒáƒ’ულისხმევი: 8332 áƒáƒœ სáƒáƒ¢áƒ”სტრქსელში: 18332)</translation> </message> <message> - <location line="+45"/> + <location line="+51"/> <source>Accept command line and JSON-RPC commands</source> <translation>სáƒáƒ™áƒáƒ›áƒáƒœáƒ“რსტრიქáƒáƒœáƒ˜áƒ¡áƒ დრJSON-RPC-კáƒáƒ›áƒáƒ›áƒ“ების ნებáƒáƒ თვáƒ</translation> </message> <message> - <location line="+80"/> + <location line="+7"/> + <source>Bitcoin Core RPC client version</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+87"/> <source>Run in the background as a daemon and accept commands</source> <translation>რეზიდენტულáƒáƒ“ გáƒáƒ¨áƒ•áƒ”ბრდრკáƒáƒ›áƒáƒœáƒ“ების მიღებáƒ</translation> </message> <message> - <location line="+39"/> + <location line="+43"/> <source>Use the test network</source> <translation>სáƒáƒ¢áƒ”სტრქსელის გáƒáƒ›áƒáƒ§áƒ”ნებáƒ</translation> </message> <message> - <location line="-118"/> + <location line="-136"/> <source>Accept connections from outside (default: 1 if no -proxy or -connect)</source> <translation>გáƒáƒ ედáƒáƒœ შეერთებების დáƒáƒ¨áƒ•áƒ”ბრ(ნáƒáƒ’ულისხმევი: 1 თუ áƒáƒ გáƒáƒ›áƒáƒ˜áƒ§áƒ”ნებრ-proxy áƒáƒœ -connect)</translation> </message> <message> - <location line="-95"/> + <location line="-117"/> <source>%s, you must set a rpcpassword in the configuration file: %s It is recommended you use the following random password: @@ -3356,9 +3415,9 @@ rpcpassword=%s <translation>მáƒáƒªáƒ”მულ მისáƒáƒ›áƒáƒ თზე მიჯáƒáƒáƒ•áƒ მუდმივáƒáƒ“ მáƒáƒ¡áƒ–ე მიყურáƒáƒ“ებით. გáƒáƒ›áƒáƒ˜áƒ§áƒ”ნეთ [host]:port ფáƒáƒ მრIPv6-სáƒáƒ—ვის</translation> </message> <message> - <location line="+3"/> - <source>Cannot obtain a lock on data directory %s. Bitcoin is probably already running.</source> - <translation>მáƒáƒœáƒáƒªáƒ”მთრკáƒáƒ¢áƒáƒšáƒáƒ’ის %s ბლáƒáƒ™áƒ˜áƒ ებრვერხერხდებáƒ. შესáƒáƒ«áƒšáƒáƒ Bitcoin უკვე გáƒáƒ¨áƒ•áƒ”ბულიáƒ.</translation> + <location line="+6"/> + <source>Continuously rate-limit free transactions to <n>*1000 bytes per minute (default:15)</source> + <translation type="unfinished"/> </message> <message> <location line="+3"/> @@ -3372,6 +3431,11 @@ rpcpassword=%s </message> <message> <location line="+3"/> + <source>Error: Listening for incoming connections failed (listen returned error %d)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+2"/> <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> @@ -3386,12 +3450,47 @@ rpcpassword=%s <translation>კáƒáƒ›áƒáƒœáƒ“ის შესრულებრსáƒáƒ¤áƒ£áƒšáƒ˜áƒ¡ ტრáƒáƒœáƒ¡áƒáƒ¥áƒªáƒ˜áƒ˜áƒ¡ ცვლილებისáƒáƒ¡ (%s კáƒáƒ›áƒáƒœáƒ“áƒáƒ¨áƒ˜ ჩáƒáƒœáƒáƒªáƒ•áƒšáƒ“ებრTxID-ით)</translation> </message> <message> - <location line="+18"/> + <location line="+6"/> + <source>Fees smaller than this are considered zero fee (for transaction creation) (default:</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+3"/> + <source>Flush database activity from memory pool to disk log every <n> megabytes (default: 100)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+3"/> + <source>How thorough the block verification of -checkblocks is (0-4, default: 3)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+2"/> + <source>In this mode -genproclimit controls how many blocks are generated immediately.</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+12"/> + <source>Set the number of script verification threads (%u to %d, 0 = auto, <0 = leave that many cores free, default: %d)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+3"/> + <source>Set the processor limit for when generation is on (-1 = unlimited, default: -1)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+3"/> <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> - <location line="+5"/> + <location line="+3"/> + <source>Unable to bind to %s on this computer. Bitcoin Core is probably already running.</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+3"/> <source>Use separate SOCKS5 proxy to reach peers via Tor hidden services (default: -proxy)</source> <translation>ფáƒáƒ ული Tor-სერვისებით პირების წვდáƒáƒ›áƒ˜áƒ¡áƒáƒ—ვის სხვრSOCKS5 პრáƒáƒ¥áƒ¡áƒ˜áƒ¡ გáƒáƒ›áƒáƒ§áƒ”ნებრ(ნáƒáƒ’ულისხმევიáƒ: -proxy)</translation> </message> @@ -3427,6 +3526,16 @@ rpcpassword=%s </message> <message> <location line="+9"/> + <source>(default: 1)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>(default: wallet.dat)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> <source><category> can be:</source> <translation><category> შეიძლებრიყáƒáƒ¡:</translation> </message> @@ -3441,17 +3550,17 @@ rpcpassword=%s <translation>Bitcoin Core დემáƒáƒœáƒ˜</translation> </message> <message> - <location line="+1"/> - <source>Bitcoin RPC client version</source> - <translation>Bitcoin-კლიენტის RPC-ვერსიáƒ</translation> - </message> - <message> - <location line="+1"/> + <location line="+2"/> <source>Block creation options:</source> <translation>ბლáƒáƒ™áƒ˜áƒ¡ შექმნის áƒáƒžáƒªáƒ˜áƒ”ბი:</translation> </message> <message> <location line="+5"/> + <source>Clear list of wallet transactions (diagnostic tool; implies -rescan)</source> + <translation>სáƒáƒ¤áƒ£áƒšáƒ˜áƒ¡ ტრáƒáƒœáƒ¡áƒáƒ¥áƒªáƒ˜áƒ”ბის სიის წáƒáƒ¨áƒšáƒ (დიáƒáƒ’ნáƒáƒ¡áƒ¢áƒ˜áƒ™áƒ˜áƒ¡ სáƒáƒ¨áƒ£áƒáƒšáƒ”ბáƒ; მáƒáƒ˜áƒªáƒáƒ•áƒ¡ -rescan-ს)</translation> + </message> + <message> + <location line="+1"/> <source>Connect only to the specified node(s)</source> <translation>შეერთებრმხáƒáƒšáƒáƒ“ მითითებულ კვáƒáƒœáƒ«(ებ)თáƒáƒœ</translation> </message> @@ -3467,11 +3576,26 @@ rpcpassword=%s </message> <message> <location line="+2"/> + <source>Connection options:</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> <source>Corrupted block database detected</source> <translation>შენიშნულირბლáƒáƒ™áƒ—რბáƒáƒ–ის დáƒáƒ–იáƒáƒœáƒ”ბáƒ</translation> </message> <message> <location line="+1"/> + <source>Debugging/Testing options:</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>Disable safemode, override a real safe mode event (default: 0)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> <source>Discover own IP address (default: 1 when listening and no -externalip)</source> <translation>სáƒáƒ™áƒ£áƒ—áƒáƒ ი IP-მისáƒáƒ›áƒáƒ თის გáƒáƒœáƒ¡áƒáƒ–ღვრრ(ნáƒáƒ’ულისხმევი: 1 თუ ჩáƒáƒ თულირმიყურáƒáƒ“ებრდრáƒáƒ გáƒáƒ›áƒáƒ˜áƒ§áƒ”ნებრ-externalip)</translation> </message> @@ -3582,11 +3706,21 @@ rpcpassword=%s </message> <message> <location line="+1"/> + <source>Fees smaller than this are considered zero fee (for relaying) (default:</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> <source>Find peers using DNS lookup (default: 1 unless -connect)</source> <translation>პირების ძებნრDNS-ით (ნáƒáƒ’ულისხმევი: 1 გáƒáƒ დრ-connect-ისáƒ)</translation> </message> <message> <location line="+1"/> + <source>Force safe mode (default: 0)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> <source>Generate coins (default: 0)</source> <translation>მáƒáƒœáƒ”ტების გენერირებრ(ნáƒáƒ’ულისხმევი: 0)</translation> </message> @@ -3597,11 +3731,6 @@ rpcpassword=%s </message> <message> <location line="+1"/> - <source>How thorough the block verification is (0-4, default: 3)</source> - <translation>ბლáƒáƒ™áƒ”ბის შემáƒáƒ¬áƒ›áƒ”ბის სიზუსტე (0-4, ნáƒáƒ’ულისხმევი: 3)</translation> - </message> - <message> - <location line="+1"/> <source>If <category> is not supplied, output all debugging information.</source> <translation>თუ <category> áƒáƒ áƒáƒ ის მითითებული, ნáƒáƒ©áƒ•áƒ”ნები იქნებრსრული დáƒáƒ®áƒ•áƒ”წის ინფáƒáƒ მáƒáƒªáƒ˜áƒ.</translation> </message> @@ -3616,7 +3745,7 @@ rpcpassword=%s <translation>áƒáƒ áƒáƒ¡áƒ¬áƒáƒ ირმისáƒáƒ›áƒáƒ თი -onion: '%s'</translation> </message> <message> - <location line="+15"/> + <location line="+17"/> <source>Not enough file descriptors available.</source> <translation>áƒáƒ áƒáƒ ის სáƒáƒ™áƒ›áƒáƒ ისი ფáƒáƒ˜áƒš-დესკრიპტáƒáƒ ები.</translation> </message> @@ -3626,27 +3755,27 @@ rpcpassword=%s <translation>დáƒáƒ”მáƒáƒ¢áƒáƒ¡ დáƒáƒ®áƒ•áƒ”წის ინფáƒáƒ მáƒáƒªáƒ˜áƒáƒ¡ დრáƒáƒ˜áƒ¡ áƒáƒ“ეები (ნáƒáƒ’ულისხმევი: 1)</translation> </message> <message> - <location line="+1"/> + <location line="+4"/> <source>RPC client options:</source> <translation>RPC კლიენტის áƒáƒžáƒªáƒ˜áƒ”ბი:</translation> </message> <message> - <location line="+1"/> + <location line="+4"/> <source>Rebuild block chain index from current blk000??.dat files</source> <translation>ბლáƒáƒ™áƒ—რჯáƒáƒáƒ•áƒ˜áƒ¡ ინდექსის ხელáƒáƒ®áƒšáƒ áƒáƒ’ებრblk000??.dat ფáƒáƒ˜áƒšáƒ˜áƒ“áƒáƒœ</translation> </message> <message> - <location line="+5"/> + <location line="+6"/> <source>Select SOCKS version for -proxy (4 or 5, default: 5)</source> <translation> SOCKS-ვერსიის áƒáƒ ჩევრ-proxy-სáƒáƒ—ვის (4 áƒáƒœ 5, ნáƒáƒ’ულისხმევი: 5)</translation> </message> <message> - <location line="+1"/> - <source>Send command to Bitcoin server</source> - <translation>კáƒáƒ›áƒáƒœáƒ“ის გáƒáƒ’ზáƒáƒ•áƒœáƒ Bitcoin-სერვერზე</translation> + <location line="+6"/> + <source>Set database cache size in megabytes (%d to %d, default: %d)</source> + <translation type="unfinished"/> </message> <message> - <location line="+7"/> + <location line="+2"/> <source>Set maximum block size in bytes (default: %d)</source> <translation>ბლáƒáƒ™áƒ˜áƒ¡ მáƒáƒ¥áƒ¡áƒ˜áƒ›áƒáƒšáƒ£áƒ ი ზáƒáƒ›áƒ˜áƒ¡ გáƒáƒœáƒ¡áƒáƒ–ღვრრბáƒáƒ˜áƒ¢áƒ”ბში (ნáƒáƒ“ულისხმევი: %d)</translation> </message> @@ -3656,17 +3785,17 @@ rpcpassword=%s <translation>RPC-ნáƒáƒ™áƒáƒ“ების რáƒáƒáƒ“ენáƒáƒ‘რ(ნáƒáƒ’ულისხმევი: 4)</translation> </message> <message> - <location line="+7"/> + <location line="+10"/> <source>Specify wallet file (within data directory)</source> <translation>მიუთითეთ სáƒáƒ¤áƒ£áƒšáƒ˜áƒ¡ ფáƒáƒ˜áƒšáƒ˜ (კáƒáƒ¢áƒáƒšáƒáƒ’ში)</translation> </message> <message> <location line="+2"/> - <source>Start Bitcoin server</source> - <translation>Bitcoin-სერვერის გáƒáƒ¨áƒ•áƒ”ბáƒ</translation> + <source>Spend unconfirmed change when sending transactions (default: 1)</source> + <translation>დáƒáƒ£áƒ“áƒáƒ¡áƒ¢áƒ£áƒ ებელი ხურდის გáƒáƒ›áƒáƒ§áƒ”ნებრტრáƒáƒœáƒ¡áƒáƒ¥áƒªáƒ˜áƒ˜áƒ¡ გáƒáƒ’ზáƒáƒ•áƒœáƒ˜áƒ¡áƒáƒ¡ (ნáƒáƒ’ულისხმევი: 1)</translation> </message> <message> - <location line="+3"/> + <location line="+4"/> <source>This is intended for regression testing tools and app development.</source> <translation>გáƒáƒ›áƒáƒ˜áƒ§áƒ”ნებრრეგრესული ტესტირების ინსტრუმენტებისრდრპრáƒáƒ’რáƒáƒ›áƒ”ბის შემუშáƒáƒ•áƒ”ბისáƒáƒ¡.</translation> </message> @@ -3711,17 +3840,22 @@ rpcpassword=%s <translation>სáƒáƒáƒ˜áƒ áƒáƒ ბáƒáƒ–ის ხელáƒáƒ®áƒáƒšáƒ˜ áƒáƒ’ებáƒ, გáƒáƒ›áƒáƒ˜áƒ§áƒ”ნეთ -reindex რáƒáƒ—რშეცვáƒáƒšáƒáƒ— -txindex</translation> </message> <message> - <location line="-79"/> + <location line="-92"/> <source>Imports blocks from external blk000??.dat file</source> <translation>ბლáƒáƒ™áƒ”ბის იმპáƒáƒ ტი გáƒáƒ ე blk000??.dat ფáƒáƒ˜áƒšáƒ˜áƒ“áƒáƒœ</translation> </message> <message> - <location line="-105"/> + <location line="-149"/> + <source>Cannot obtain a lock on data directory %s. Bitcoin Core is probably already running.</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+22"/> <source>Execute command when a relevant alert is received or we see a really long fork (%s in cmd is replaced by message)</source> <translation>ბრძáƒáƒœáƒ”ბის შესრულებრშესáƒáƒ‘áƒáƒ›áƒ˜áƒ¡áƒ˜ უწყების მიღებისáƒáƒ¡ áƒáƒœ რáƒáƒªáƒ შეინიშნებრსáƒáƒ’რძნáƒáƒ‘ი გáƒáƒ®áƒšáƒ”ჩრ(cmd-ში %s შეიცვლებრმესიჯით)</translation> </message> <message> - <location line="+14"/> + <location line="+25"/> <source>Output debugging information (default: 0, supplying <category> is optional)</source> <translation>დáƒáƒ®áƒ•áƒ”წის ინფáƒáƒ მáƒáƒªáƒ˜áƒ˜áƒ¡ გáƒáƒ›áƒáƒ§áƒ•áƒáƒœáƒ (ნáƒáƒ’ულისხმევი: 0, <category> - áƒáƒ áƒáƒáƒ£áƒªáƒ˜áƒšáƒ”ბელი áƒáƒ გუმენტიáƒ)</translation> </message> @@ -3731,12 +3865,7 @@ rpcpassword=%s <translation>მáƒáƒ¦áƒáƒšáƒžáƒ იáƒáƒ იტეტული/დáƒáƒ‘áƒáƒšáƒ¡áƒáƒ™áƒáƒ›áƒ˜áƒ¡áƒ˜áƒáƒ˜áƒáƒœáƒ˜ ტრáƒáƒœáƒ¡áƒáƒ¥áƒªáƒ˜áƒ”ბის მáƒáƒ¥áƒ¡áƒ˜áƒ›áƒáƒšáƒ£áƒ ი ზáƒáƒ›áƒ ბáƒáƒ˜áƒ¢áƒ”ბში (ნáƒáƒ’ულისხმევი: %d)</translation> </message> <message> - <location line="+2"/> - <source>Set the number of script verification threads (up to 16, 0 = auto, <0 = leave that many cores free, default: 0)</source> - <translation>სკრიპტის ვერიფიკáƒáƒªáƒ˜áƒ˜áƒ¡ ნáƒáƒ™áƒáƒ“ების რáƒáƒáƒ“ენáƒáƒ‘რ(16-მდე, 0 - áƒáƒ•áƒ¢áƒáƒ›áƒáƒ¢áƒ£áƒ ი, <0 - დáƒáƒ¡áƒáƒ¢áƒáƒ•áƒ”ბელი ბირთვების რáƒáƒáƒ“ენáƒáƒ‘áƒ, ნáƒáƒ’ულისხმევი: 0)</translation> - </message> - <message> - <location line="+89"/> + <location line="+102"/> <source>Information</source> <translation>ინფáƒáƒ მáƒáƒªáƒ˜áƒ</translation> </message> @@ -3751,7 +3880,17 @@ rpcpassword=%s <translation>დáƒáƒ£áƒ¨áƒ•áƒ”ბელი მნიშვნელáƒáƒ‘რ-mintxfee=<amount>: '%s'</translation> </message> <message> - <location line="+8"/> + <location line="+3"/> + <source>Limit size of signature cache to <n> entries (default: 50000)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+6"/> + <source>Log transaction priority and fee per kB when mining blocks (default: 0)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> <source>Maintain a full transaction index (default: 0)</source> <translation>ტრáƒáƒœáƒ¡áƒáƒ¥áƒªáƒ˜áƒ˜áƒ¡ სრული ინდექსი (ნáƒáƒ’ულისხმევი: 0)</translation> </message> @@ -3776,12 +3915,52 @@ rpcpassword=%s <translation>შეერთებრმხáƒáƒšáƒáƒ“ <net> ქსელის კვáƒáƒœáƒ«áƒ”ბთáƒáƒœ (IPv4, IPv6 áƒáƒœ Tor)</translation> </message> <message> - <location line="+9"/> + <location line="+4"/> + <source>Print block on startup, if found in block index</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>Print block tree on startup (default: 0)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>RPC SSL options: (see the Bitcoin Wiki for SSL setup instructions)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+2"/> + <source>RPC server options:</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>Randomly drop 1 of every <n> network messages</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>Randomly fuzz 1 of every <n> network messages</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+4"/> + <source>Run a thread to flush wallet periodically (default: 1)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+2"/> <source>SSL options: (see the Bitcoin Wiki for SSL setup instructions)</source> <translation>SSL áƒáƒžáƒªáƒ˜áƒ”ბი: (იხილე Bitcoin Wiki-ში SSL-ს მáƒáƒ¬áƒ§áƒáƒ‘ის ინსტრუქციები)</translation> </message> <message> - <location line="+4"/> + <location line="+2"/> + <source>Send command to Bitcoin Core</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+2"/> <source>Send trace/debug info to console instead of debug.log file</source> <translation>ტრáƒáƒ¡áƒ˜áƒ ების/დáƒáƒ®áƒ•áƒ”წის ინფáƒáƒ¡ გáƒáƒ’ზáƒáƒ•áƒœáƒ კáƒáƒœáƒ¡áƒáƒšáƒ–ე debug.log ფáƒáƒ˜áƒšáƒ˜áƒ¡ ნáƒáƒªáƒ•áƒšáƒáƒ“</translation> </message> @@ -3792,6 +3971,21 @@ rpcpassword=%s </message> <message> <location line="+2"/> + <source>Sets the DB_PRIVATE flag in the wallet db environment (default: 1)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>Show all debugging options (usage: --help -help-debug)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>Show benchmark information (default: 0)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> <source>Shrink debug.log file on client startup (default: 1 when no -debug)</source> <translation>debug.log ფáƒáƒ˜áƒšáƒ˜áƒ¡ შეკუმშვრგáƒáƒ¨áƒ•áƒ”ბისáƒáƒ¡ (ნáƒáƒ’ულისხმევიáƒ: 1 რáƒáƒªáƒ áƒáƒ áƒáƒ§áƒ”ნირ-debug)</translation> </message> @@ -3807,6 +4001,11 @@ rpcpassword=%s </message> <message> <location line="+6"/> + <source>Start Bitcoin Core Daemon</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> <source>System error: </source> <translation>სისტემური შეცდáƒáƒ›áƒ:</translation> </message> @@ -3852,6 +4051,16 @@ rpcpassword=%s </message> <message> <location line="+2"/> + <source>Zapping all transactions from wallet...</source> + <translation>ტრáƒáƒœáƒ¡áƒáƒ¥áƒªáƒ˜áƒ”ბის ჩáƒáƒ®áƒ¡áƒœáƒ სáƒáƒ¤áƒ£áƒšáƒ˜áƒ“áƒáƒœ...</translation> + </message> + <message> + <location line="+1"/> + <source>on startup</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> <source>version</source> <translation>ვერსიáƒ</translation> </message> @@ -3861,47 +4070,47 @@ rpcpassword=%s <translation>wallet.dat დáƒáƒ–იáƒáƒœáƒ”ბულიáƒ, áƒáƒ¦áƒ“გენრვერმáƒáƒ®áƒ”რხდáƒ</translation> </message> <message> - <location line="-58"/> + <location line="-71"/> <source>Password for JSON-RPC connections</source> <translation>პáƒáƒ áƒáƒšáƒ˜ JSON-RPC-შეერთებისáƒáƒ—ვის</translation> </message> <message> - <location line="-70"/> + <location line="-77"/> <source>Allow JSON-RPC connections from specified IP address</source> <translation>JSON-RPC-შეერთების ნებáƒáƒ თვრმითითებული IP მისáƒáƒ›áƒáƒ თიდáƒáƒœ</translation> </message> <message> - <location line="+80"/> + <location line="+94"/> <source>Send commands to node running on <ip> (default: 127.0.0.1)</source> <translation>კáƒáƒ›áƒáƒœáƒ“ის გáƒáƒ’ზáƒáƒ•áƒœáƒ კვáƒáƒœáƒ«áƒ˜áƒ¡áƒáƒ—ვის, რáƒáƒ›áƒ”ლიც გáƒáƒ¨áƒ•áƒ”ბულირმისáƒáƒ›áƒáƒ თზე <ip> (ნáƒáƒ’ულისხმევი: 127.0.0.1)</translation> </message> <message> - <location line="-132"/> + <location line="-163"/> <source>Execute command when the best block changes (%s in cmd is replaced by block hash)</source> <translation>კáƒáƒ›áƒáƒœáƒ“ის შესრულებრუკეთესი ბლáƒáƒ™áƒ˜áƒ¡ გáƒáƒ›áƒáƒ©áƒ”ნისáƒáƒ¡ (%s კáƒáƒ›áƒáƒœáƒ“áƒáƒ¨áƒ˜ ჩáƒáƒœáƒáƒªáƒ•áƒšáƒ“ებრბლáƒáƒ™áƒ˜áƒ¡ ჰეშით)</translation> </message> <message> - <location line="+161"/> + <location line="+196"/> <source>Upgrade wallet to latest format</source> <translation>სáƒáƒ¤áƒ£áƒšáƒ˜áƒ¡ ფáƒáƒ მáƒáƒ¢áƒ˜áƒ¡ გáƒáƒœáƒáƒ®áƒšáƒ”ბáƒ</translation> </message> <message> - <location line="-24"/> + <location line="-28"/> <source>Set key pool size to <n> (default: 100)</source> <translation>გáƒáƒ¡áƒáƒ¦áƒ”ბის პულის ზáƒáƒ›áƒ იქნებრ<n> (ნáƒáƒ’ულისხმევი: 100)</translation> </message> <message> - <location line="-11"/> + <location line="-12"/> <source>Rescan the block chain for missing wallet transactions</source> <translation>ბლáƒáƒ™áƒ”ბის ჯáƒáƒáƒ•áƒ˜áƒ¡ გáƒáƒ“áƒáƒ›áƒáƒ¬áƒ›áƒ”ბრსáƒáƒ¤áƒ£áƒšáƒ”ში გáƒáƒ›áƒáƒ ჩენილ ტრáƒáƒœáƒ¡áƒáƒ¥áƒªáƒ˜áƒ”ბზე</translation> </message> <message> - <location line="+38"/> + <location line="+43"/> <source>Use OpenSSL (https) for JSON-RPC connections</source> <translation>OpenSSL-ის (https) გáƒáƒ›áƒáƒ§áƒ”ნებრJSON-RPC-შეერთებებისáƒáƒ—ვის</translation> </message> <message> - <location line="-30"/> + <location line="-34"/> <source>Server certificate file (default: server.cert)</source> <translation>სერვერის სერტიფიკáƒáƒ¢áƒ˜áƒ¡ ფáƒáƒ˜áƒšáƒ˜ (ნáƒáƒ’ულისხმევი: server.cert)</translation> </message> @@ -3911,7 +4120,7 @@ rpcpassword=%s <translation>სერვერის პირáƒáƒ“ი გáƒáƒ¡áƒáƒ¦áƒ”ბი (ნáƒáƒ’ულისხმევი: server.pem)</translation> </message> <message> - <location line="+16"/> + <location line="+20"/> <source>This help message</source> <translation>ეს ტექსტი</translation> </message> @@ -3921,17 +4130,17 @@ rpcpassword=%s <translation>ვერხერხდებრმიბმრ%s-თáƒáƒœ áƒáƒ› კáƒáƒ›áƒžáƒ˜áƒ£áƒ¢áƒ”რზე (მიღებულირშეცდáƒáƒ›áƒ %d, %s)</translation> </message> <message> - <location line="-107"/> + <location line="-125"/> <source>Allow DNS lookups for -addnode, -seednode and -connect</source> <translation>DNS-ძებნის დáƒáƒ¨áƒ•áƒ”ბრ-addnode, -seednode დრ-connect-სáƒáƒ—ვის</translation> </message> <message> - <location line="+60"/> + <location line="+66"/> <source>Loading addresses...</source> <translation>მისáƒáƒ›áƒáƒ თების ჩáƒáƒ¢áƒ•áƒ˜áƒ თვáƒ...</translation> </message> <message> - <location line="-37"/> + <location line="-39"/> <source>Error loading wallet.dat: Wallet corrupted</source> <translation>áƒáƒ იტვირთებრwallet.dat: სáƒáƒ¤áƒ£áƒšáƒ” დáƒáƒ–იáƒáƒœáƒ”ბულიáƒ</translation> </message> @@ -3941,22 +4150,22 @@ rpcpassword=%s <translation>áƒáƒ იტვირთებრwallet.dat: სáƒáƒ¤áƒ£áƒšáƒ”ს სáƒáƒ˜áƒ დებრBitcoin-ის áƒáƒ®áƒáƒšáƒ˜ ვერსიáƒ</translation> </message> <message> - <location line="+98"/> + <location line="+112"/> <source>Wallet needed to be rewritten: restart Bitcoin to complete</source> <translation>სáƒáƒáƒ˜áƒ áƒáƒ სáƒáƒ¤áƒ£áƒšáƒ˜áƒ¡ áƒáƒ¦áƒ“გენáƒ: დáƒáƒáƒ ესტáƒáƒ ტეთ Bitcoin </translation> </message> <message> - <location line="-100"/> + <location line="-114"/> <source>Error loading wallet.dat</source> <translation>áƒáƒ იტვირთებრwallet.dat</translation> </message> <message> - <location line="+31"/> + <location line="+32"/> <source>Invalid -proxy address: '%s'</source> <translation>áƒáƒ áƒáƒ¡áƒ¬áƒáƒ ირმისáƒáƒ›áƒáƒ თი -proxy: '%s'</translation> </message> <message> - <location line="+56"/> + <location line="+69"/> <source>Unknown network specified in -onlynet: '%s'</source> <translation>-onlynet-ში მითითებულირუცნáƒáƒ‘ი ქსელი: '%s'</translation> </message> @@ -3966,7 +4175,7 @@ rpcpassword=%s <translation>მáƒáƒ—ხáƒáƒ•áƒœáƒ˜áƒšáƒ˜áƒ -socks პრáƒáƒ¥áƒ¡áƒ˜áƒ¡ უცნáƒáƒ‘ი ვერსიáƒ: %i</translation> </message> <message> - <location line="-101"/> + <location line="-119"/> <source>Cannot resolve -bind address: '%s'</source> <translation>ვერხერხდებრ-bind მისáƒáƒ›áƒáƒ თის გáƒáƒ კვევáƒ: '%s'</translation> </message> @@ -3976,7 +4185,7 @@ rpcpassword=%s <translation>ვერხერხდებრ-externalip მისáƒáƒ›áƒáƒ თის გáƒáƒ კვევáƒ: '%s'</translation> </message> <message> - <location line="+48"/> + <location line="+53"/> <source>Invalid amount for -paytxfee=<amount>: '%s'</source> <translation>დáƒáƒ£áƒ¨áƒ•áƒ”ბელი მნიშვნელáƒáƒ‘რ-paytxfee=<amount>: '%s'</translation> </message> @@ -3991,27 +4200,22 @@ rpcpassword=%s <translation>áƒáƒ áƒáƒ ის სáƒáƒ™áƒ›áƒáƒ ისი თáƒáƒœáƒ®áƒ</translation> </message> <message> - <location line="+10"/> + <location line="+11"/> <source>Loading block index...</source> <translation>ბლáƒáƒ™áƒ”ბის ინდექსის ჩáƒáƒ¢áƒ•áƒ˜áƒ თვáƒ...</translation> </message> <message> - <location line="-62"/> + <location line="-68"/> <source>Add a node to connect to and attempt to keep the connection open</source> <translation>მისáƒáƒ”რთებელი კვáƒáƒœáƒ«áƒ˜áƒ¡ დáƒáƒ›áƒáƒ¢áƒ”ბრდრმიერთების შეძლებისდáƒáƒ’ვáƒáƒ áƒáƒ“ შენáƒáƒ ჩუნებáƒ</translation> </message> <message> - <location line="-32"/> - <source>Unable to bind to %s on this computer. Bitcoin is probably already running.</source> - <translation>ვერხერხდებრმიბმრ%s-თáƒáƒœ áƒáƒ› კáƒáƒ›áƒžáƒ˜áƒ£áƒ¢áƒ”რზე. შეიძლებრBitcoin უკვე გáƒáƒ¨áƒ•áƒ”ბულიáƒ.</translation> - </message> - <message> - <location line="+95"/> + <location line="+69"/> <source>Loading wallet...</source> <translation>სáƒáƒ¤áƒ£áƒšáƒ˜áƒ¡ ჩáƒáƒ¢áƒ•áƒ˜áƒ თვáƒ...</translation> </message> <message> - <location line="-56"/> + <location line="-62"/> <source>Cannot downgrade wallet</source> <translation>სáƒáƒ¤áƒ£áƒšáƒ˜áƒ¡ ძველ ვერსიáƒáƒ–ე გáƒáƒ“áƒáƒ§áƒ•áƒáƒœáƒ შეუძლებელიáƒ</translation> </message> @@ -4021,27 +4225,27 @@ rpcpassword=%s <translation>ვერხერხდებრნáƒáƒ’ულისხმევი მისáƒáƒ›áƒáƒ თის ჩáƒáƒ¬áƒ”რáƒ</translation> </message> <message> - <location line="+67"/> + <location line="+80"/> <source>Rescanning...</source> <translation>სკáƒáƒœáƒ˜áƒ ებáƒ...</translation> </message> <message> - <location line="-58"/> + <location line="-67"/> <source>Done loading</source> <translation>ჩáƒáƒ¢áƒ•áƒ˜áƒ თვრდáƒáƒ¡áƒ ულებულიáƒ</translation> </message> <message> - <location line="+85"/> + <location line="+99"/> <source>To use the %s option</source> <translation>%s áƒáƒžáƒªáƒ˜áƒ˜áƒ¡ გáƒáƒ›áƒáƒ¡áƒáƒ§áƒ”ნებლáƒáƒ“</translation> </message> <message> - <location line="-77"/> + <location line="-91"/> <source>Error</source> <translation>შეცდáƒáƒ›áƒ</translation> </message> <message> - <location line="-35"/> + <location line="-41"/> <source>You must set rpcpassword=<password> in the configuration file: %s If the file does not exist, create it with owner-readable-only file permissions.</source> diff --git a/src/qt/locale/bitcoin_ky.ts b/src/qt/locale/bitcoin_ky.ts index 852e17c65a..fb0e9f7282 100644 --- a/src/qt/locale/bitcoin_ky.ts +++ b/src/qt/locale/bitcoin_ky.ts @@ -31,6 +31,12 @@ This product includes software developed by the OpenSSL Project for use in the O <source>The Bitcoin Core developers</source> <translation type="unfinished"/> </message> + <message> + <location line="+12"/> + <location line="+2"/> + <source>(%1-bit)</source> + <translation type="unfinished"/> + </message> </context> <context> <name>AddressBookPage</name> @@ -60,7 +66,7 @@ This product includes software developed by the OpenSSL Project for use in the O <translation type="unfinished"/> </message> <message> - <location line="+52"/> + <location line="+58"/> <source>C&lose</source> <translation type="unfinished"/> </message> @@ -70,7 +76,7 @@ This product includes software developed by the OpenSSL Project for use in the O <translation type="unfinished"/> </message> <message> - <location filename="../forms/addressbookpage.ui" line="-41"/> + <location filename="../forms/addressbookpage.ui" line="-47"/> <source>Delete the currently selected address from the list</source> <translation type="unfinished"/> </message> @@ -317,7 +323,7 @@ This product includes software developed by the OpenSSL Project for use in the O <context> <name>BitcoinGUI</name> <message> - <location filename="../bitcoingui.cpp" line="+295"/> + <location filename="../bitcoingui.cpp" line="+294"/> <source>Sign &message...</source> <translation type="unfinished"/> </message> @@ -332,12 +338,12 @@ This product includes software developed by the OpenSSL Project for use in the O <translation type="unfinished"/> </message> <message> - <location line="-137"/> + <location line="-136"/> <source>Node</source> <translation type="unfinished"/> </message> <message> - <location line="+138"/> + <location line="+137"/> <source>Show general overview of wallet</source> <translation type="unfinished"/> </message> @@ -458,17 +464,17 @@ This product includes software developed by the OpenSSL Project for use in the O <translation>Билдирүүнү &текшерүү...</translation> </message> <message> - <location line="+430"/> + <location line="+440"/> <source>Bitcoin</source> <translation>Bitcoin</translation> </message> <message> - <location line="-643"/> + <location line="-652"/> <source>Wallet</source> <translation>Капчык</translation> </message> <message> - <location line="+146"/> + <location line="+145"/> <source>&Send</source> <translation type="unfinished"/> </message> @@ -524,18 +530,18 @@ This product includes software developed by the OpenSSL Project for use in the O <translation type="unfinished"/> </message> <message> - <location line="-284"/> - <location line="+376"/> + <location line="-283"/> + <location line="+375"/> <source>[testnet]</source> <translation type="unfinished"/> </message> <message> - <location line="-401"/> + <location line="-400"/> <source>Bitcoin Core</source> <translation type="unfinished"/> </message> <message> - <location line="+163"/> + <location line="+162"/> <source>Request payments (generates QR codes and bitcoin: URIs)</source> <translation type="unfinished"/> </message> @@ -597,7 +603,7 @@ This product includes software developed by the OpenSSL Project for use in the O <translation type="unfinished"/> </message> <message numerus="yes"> - <location line="+23"/> + <location line="+27"/> <source>%n hour(s)</source> <translation type="unfinished"><numerusform></numerusform></translation> </message> @@ -608,10 +614,21 @@ This product includes software developed by the OpenSSL Project for use in the O </message> <message numerus="yes"> <location line="+4"/> + <location line="+6"/> <source>%n week(s)</source> <translation type="unfinished"><numerusform></numerusform></translation> </message> <message> + <location line="+0"/> + <source>%1 and %2</source> + <translation type="unfinished"/> + </message> + <message numerus="yes"> + <location line="+0"/> + <source>%n year(s)</source> + <translation type="unfinished"><numerusform></numerusform></translation> + </message> + <message> <location line="+4"/> <source>%1 behind</source> <translation type="unfinished"/> @@ -642,12 +659,12 @@ This product includes software developed by the OpenSSL Project for use in the O <translation>Маалымат</translation> </message> <message> - <location line="-85"/> + <location line="-95"/> <source>Up to date</source> <translation>Жаңыланган</translation> </message> <message> - <location line="+34"/> + <location line="+44"/> <source>Catching up...</source> <translation type="unfinished"/> </message> @@ -681,7 +698,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location filename="../bitcoin.cpp" line="+438"/> + <location filename="../bitcoin.cpp" line="+443"/> <source>A fatal error occurred. Bitcoin can no longer continue safely and will quit.</source> <translation type="unfinished"/> </message> @@ -689,7 +706,7 @@ Address: %4 <context> <name>ClientModel</name> <message> - <location filename="../clientmodel.cpp" line="+119"/> + <location filename="../clientmodel.cpp" line="+128"/> <source>Network Alert</source> <translation type="unfinished"/> </message> @@ -742,7 +759,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+63"/> + <location line="+56"/> <source>(un)select all</source> <translation type="unfinished"/> </message> @@ -757,7 +774,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+52"/> + <location line="+53"/> <source>Amount</source> <translation type="unfinished"/> </message> @@ -787,7 +804,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location filename="../coincontroldialog.cpp" line="+42"/> + <location filename="../coincontroldialog.cpp" line="+41"/> <source>Copy address</source> <translation type="unfinished"/> </message> @@ -853,7 +870,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+323"/> + <location line="+332"/> <source>highest</source> <translation type="unfinished"/> </message> @@ -903,12 +920,12 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+31"/> + <location line="+32"/> <source>none</source> <translation>жок</translation> </message> <message> - <location line="+140"/> + <location line="+141"/> <source>Dust</source> <translation type="unfinished"/> </message> @@ -971,12 +988,12 @@ Address: %4 </message> <message> <location line="+43"/> - <location line="+66"/> + <location line="+61"/> <source>(no label)</source> <translation>(аты жок)</translation> </message> <message> - <location line="-9"/> + <location line="-7"/> <source>change from %1 (%2)</source> <translation type="unfinished"/> </message> @@ -1057,7 +1074,7 @@ Address: %4 <context> <name>FreespaceChecker</name> <message> - <location filename="../intro.cpp" line="+65"/> + <location filename="../intro.cpp" line="+68"/> <source>A new data directory will be created.</source> <translation type="unfinished"/> </message> @@ -1090,7 +1107,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location filename="../utilitydialog.cpp" line="+38"/> + <location filename="../utilitydialog.cpp" line="+24"/> <source>Bitcoin Core</source> <translation type="unfinished"/> </message> @@ -1115,7 +1132,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+1"/> + <location line="+2"/> <source>Set language, for example "de_DE" (default: system locale)</source> <translation type="unfinished"/> </message> @@ -1126,11 +1143,16 @@ Address: %4 </message> <message> <location line="+1"/> - <source>Show splash screen on startup (default: 1)</source> + <source>Set SSL root certificates for payment request (default: -system-)</source> <translation type="unfinished"/> </message> <message> <location line="+1"/> + <source>Show splash screen on startup (default: 1)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="-4"/> <source>Choose data directory on startup (default: 0)</source> <translation type="unfinished"/> </message> @@ -1168,7 +1190,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location filename="../intro.cpp" line="+85"/> + <location filename="../intro.cpp" line="+82"/> <source>Bitcoin</source> <translation>Bitcoin</translation> </message> @@ -1178,7 +1200,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+19"/> + <location line="+24"/> <source>Error</source> <translation>Ката</translation> </message> @@ -1234,7 +1256,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+6"/> + <location line="+116"/> <source>Optional transaction fee per kB that helps make sure your transactions are processed quickly. Most transactions are 1 kB.</source> <translation type="unfinished"/> </message> @@ -1244,7 +1266,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+31"/> + <location line="-125"/> <source>Automatically start Bitcoin after logging in to the system.</source> <translation type="unfinished"/> </message> @@ -1259,12 +1281,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+13"/> - <source>Set database cache size in megabytes (default: 25)</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+13"/> + <location line="+16"/> <source>MB</source> <translation>МБ</translation> </message> @@ -1274,12 +1291,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+13"/> - <source>Set the number of script verification threads (up to 16, 0 = auto, <0 = leave that many cores free, default: 0)</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+58"/> + <location line="+160"/> <source>Connect to the Bitcoin network through a SOCKS proxy.</source> <translation type="unfinished"/> </message> @@ -1294,7 +1306,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+224"/> + <location line="+214"/> <source>Active command-line options that override above options:</source> <translation type="unfinished"/> </message> @@ -1309,12 +1321,42 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="-323"/> + <location line="-313"/> <source>&Network</source> <translation>&Тармак</translation> </message> <message> - <location line="+6"/> + <location line="-131"/> + <source>(0 = auto, <0 = leave that many cores free)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+36"/> + <source>W&allet</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+65"/> + <source>Expert</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+9"/> + <source>Enable coin &control features</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+7"/> + <source>If you disable the spending of unconfirmed change, the change from a transaction cannot be used until that transaction has at least one confirmation. This also affects how your balance is computed.</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+3"/> + <source>&Spend unconfirmed change</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+17"/> <source>Automatically open the Bitcoin client port on the router. This only works when your router supports UPnP and it is enabled.</source> <translation type="unfinished"/> </message> @@ -1409,17 +1451,12 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+7"/> + <location line="-262"/> <source>Whether to show coin control features or not.</source> <translation type="unfinished"/> </message> <message> - <location line="+3"/> - <source>Display coin &control features (experts only)</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+136"/> + <location line="+398"/> <source>&OK</source> <translation>&Жарайт</translation> </message> @@ -1429,17 +1466,17 @@ Address: %4 <translation>&Жокко чыгаруу</translation> </message> <message> - <location filename="../optionsdialog.cpp" line="+67"/> + <location filename="../optionsdialog.cpp" line="+72"/> <source>default</source> <translation>жарыÑланбаган</translation> </message> <message> - <location line="+57"/> + <location line="+58"/> <source>none</source> <translation>жок</translation> </message> <message> - <location line="+75"/> + <location line="+80"/> <source>Confirm options reset</source> <translation type="unfinished"/> </message> @@ -1479,18 +1516,13 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="-155"/> - <source>Unconfirmed:</source> - <translation type="unfinished"/> - </message> - <message> - <location line="-83"/> + <location line="-238"/> <source>Wallet</source> <translation>Капчык</translation> </message> <message> <location line="+51"/> - <source>Confirmed:</source> + <source>Available:</source> <translation type="unfinished"/> </message> <message> @@ -1499,7 +1531,12 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+32"/> + <location line="+16"/> + <source>Pending:</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+16"/> <source>Total of transactions that have yet to be confirmed, and do not yet count toward the spendable balance</source> <translation type="unfinished"/> </message> @@ -1632,23 +1669,29 @@ Address: %4 <context> <name>QObject</name> <message> - <location filename="../bitcoin.cpp" line="+71"/> - <location line="+11"/> + <location filename="../bitcoin.cpp" line="+63"/> + <location line="+7"/> + <location line="+13"/> <source>Bitcoin</source> <translation>Bitcoin</translation> </message> <message> - <location line="+1"/> + <location line="-19"/> <source>Error: Specified data directory "%1" does not exist.</source> <translation type="unfinished"/> </message> <message> - <location line="-12"/> + <location line="+7"/> + <source>Error: Cannot parse configuration file: %1. Only use key=value syntax.</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+12"/> <source>Error: Invalid combination of -regtest and -testnet.</source> <translation type="unfinished"/> </message> <message> - <location filename="../guiutil.cpp" line="+82"/> + <location filename="../guiutil.cpp" line="+89"/> <source>Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source> <translation type="unfinished"/> </message> @@ -1694,7 +1737,7 @@ Address: %4 <location line="+36"/> <location line="+23"/> <location line="+23"/> - <location filename="../rpcconsole.cpp" line="+359"/> + <location filename="../rpcconsole.cpp" line="+373"/> <source>N/A</source> <translation type="unfinished"/> </message> @@ -1790,11 +1833,13 @@ Address: %4 </message> <message> <location line="+64"/> + <location filename="../rpcconsole.cpp" line="-10"/> <source>In:</source> <translation type="unfinished"/> </message> <message> <location line="+80"/> + <location filename="../rpcconsole.cpp" line="+1"/> <source>Out:</source> <translation type="unfinished"/> </message> @@ -1819,7 +1864,7 @@ Address: %4 <translation>КонÑолду тазалоо</translation> </message> <message> - <location filename="../rpcconsole.cpp" line="-30"/> + <location filename="../rpcconsole.cpp" line="-35"/> <source>Welcome to the Bitcoin RPC console.</source> <translation type="unfinished"/> </message> @@ -1834,7 +1879,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+122"/> + <location line="+136"/> <source>%1 B</source> <translation type="unfinished"/> </message> @@ -1950,7 +1995,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+11"/> + <location line="+14"/> <source>Remove the selected entries from the list</source> <translation type="unfinished"/> </message> @@ -1960,7 +2005,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location filename="../receivecoinsdialog.cpp" line="+38"/> + <location filename="../receivecoinsdialog.cpp" line="+39"/> <source>Copy label</source> <translation type="unfinished"/> </message> @@ -2181,12 +2226,12 @@ Address: %4 <translation>&Бардыгын тазалоо</translation> </message> <message> - <location line="+52"/> + <location line="+58"/> <source>Balance:</source> <translation type="unfinished"/> </message> <message> - <location line="-78"/> + <location line="-84"/> <source>Confirm the send action</source> <translation type="unfinished"/> </message> @@ -2431,7 +2476,7 @@ Address: %4 <context> <name>ShutdownWindow</name> <message> - <location filename="../utilitydialog.cpp" line="+48"/> + <location filename="../utilitydialog.cpp" line="+52"/> <source>Bitcoin Core is shutting down...</source> <translation type="unfinished"/> </message> @@ -2631,7 +2676,7 @@ Address: %4 <context> <name>SplashScreen</name> <message> - <location filename="../splashscreen.cpp" line="+28"/> + <location filename="../splashscreen.cpp" line="+32"/> <source>Bitcoin Core</source> <translation type="unfinished"/> </message> @@ -2663,6 +2708,11 @@ Address: %4 </message> <message> <location line="+6"/> + <source>conflicted</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+2"/> <source>%1/offline</source> <translation>%1/тармакта ÑмеÑ</translation> </message> @@ -2824,12 +2874,12 @@ Address: %4 <translation type="unfinished"/> </message> <message numerus="yes"> - <location line="-35"/> + <location line="-37"/> <source>Open for %n more block(s)</source> <translation type="unfinished"><numerusform></numerusform></translation> </message> <message> - <location line="+70"/> + <location line="+72"/> <source>unknown</source> <translation type="unfinished"/> </message> @@ -2870,12 +2920,12 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+59"/> + <location line="+78"/> <source>Immature (%1 confirmations, will be available after %2)</source> <translation type="unfinished"/> </message> <message numerus="yes"> - <location line="+16"/> + <location line="-21"/> <source>Open for %n more block(s)</source> <translation type="unfinished"><numerusform></numerusform></translation> </message> @@ -2885,33 +2935,42 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+3"/> - <source>Offline (%1 confirmations)</source> + <location line="+12"/> + <source>Confirmed (%1 confirmations)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+9"/> + <source>This block was not received by any other nodes and will probably not be accepted!</source> <translation type="unfinished"/> </message> <message> <location line="+3"/> - <source>Unconfirmed (%1 of %2 confirmations)</source> + <source>Generated but not accepted</source> <translation type="unfinished"/> </message> <message> - <location line="-22"/> - <location line="+25"/> - <source>Confirmed (%1 confirmations)</source> + <location line="-21"/> + <source>Offline</source> <translation type="unfinished"/> </message> <message> - <location line="-22"/> - <source>This block was not received by any other nodes and will probably not be accepted!</source> + <location line="+3"/> + <source>Unconfirmed</source> <translation type="unfinished"/> </message> <message> <location line="+3"/> - <source>Generated but not accepted</source> + <source>Confirming (%1 of %2 recommended confirmations)</source> <translation type="unfinished"/> </message> <message> - <location line="+62"/> + <location line="+6"/> + <source>Conflicted</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+51"/> <source>Received with</source> <translation type="unfinished"/> </message> @@ -2941,7 +3000,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+199"/> + <location line="+190"/> <source>Transaction status. Hover over this field to show number of confirmations.</source> <translation type="unfinished"/> </message> @@ -3070,7 +3129,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+142"/> + <location line="+140"/> <source>Export Transaction History</source> <translation type="unfinished"/> </message> @@ -3164,7 +3223,7 @@ Address: %4 <context> <name>WalletView</name> <message> - <location filename="../walletview.cpp" line="+43"/> + <location filename="../walletview.cpp" line="+44"/> <source>&Export</source> <translation type="unfinished"/> </message> @@ -3174,7 +3233,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+181"/> + <location line="+184"/> <source>Backup Wallet</source> <translation type="unfinished"/> </message> @@ -3207,12 +3266,12 @@ Address: %4 <context> <name>bitcoin-core</name> <message> - <location filename="../bitcoinstrings.cpp" line="+221"/> + <location filename="../bitcoinstrings.cpp" line="+261"/> <source>Usage:</source> <translation type="unfinished"/> </message> <message> - <location line="-54"/> + <location line="-66"/> <source>List commands</source> <translation type="unfinished"/> </message> @@ -3222,12 +3281,12 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+26"/> + <location line="+27"/> <source>Options:</source> <translation type="unfinished"/> </message> <message> - <location line="+22"/> + <location line="+32"/> <source>Specify configuration file (default: bitcoin.conf)</source> <translation type="unfinished"/> </message> @@ -3242,72 +3301,72 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="-9"/> - <source>Set database cache size in megabytes (default: 25)</source> - <translation type="unfinished"/> - </message> - <message> - <location line="-26"/> + <location line="-46"/> <source>Listen for connections on <port> (default: 8333 or testnet: 18333)</source> <translation type="unfinished"/> </message> <message> - <location line="+5"/> + <location line="+6"/> <source>Maintain at most <n> connections to peers (default: 125)</source> <translation type="unfinished"/> </message> <message> - <location line="-51"/> + <location line="-57"/> <source>Connect to a node to retrieve peer addresses, and disconnect</source> <translation type="unfinished"/> </message> <message> - <location line="+84"/> + <location line="+100"/> <source>Specify your own public address</source> <translation type="unfinished"/> </message> <message> - <location line="+5"/> + <location line="+6"/> <source>Threshold for disconnecting misbehaving peers (default: 100)</source> <translation type="unfinished"/> </message> <message> - <location line="-148"/> + <location line="-172"/> <source>Number of seconds to keep misbehaving peers from reconnecting (default: 86400)</source> <translation type="unfinished"/> </message> <message> - <location line="-36"/> + <location line="-52"/> <source>An error occurred while setting up the RPC port %u for listening on IPv4: %s</source> <translation type="unfinished"/> </message> <message> - <location line="+34"/> + <location line="+50"/> <source>Listen for JSON-RPC connections on <port> (default: 8332 or testnet: 18332)</source> <translation type="unfinished"/> </message> <message> - <location line="+45"/> + <location line="+51"/> <source>Accept command line and JSON-RPC commands</source> <translation type="unfinished"/> </message> <message> - <location line="+80"/> + <location line="+7"/> + <source>Bitcoin Core RPC client version</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+87"/> <source>Run in the background as a daemon and accept commands</source> <translation type="unfinished"/> </message> <message> - <location line="+39"/> + <location line="+43"/> <source>Use the test network</source> <translation type="unfinished"/> </message> <message> - <location line="-118"/> + <location line="-136"/> <source>Accept connections from outside (default: 1 if no -proxy or -connect)</source> <translation type="unfinished"/> </message> <message> - <location line="-95"/> + <location line="-117"/> <source>%s, you must set a rpcpassword in the configuration file: %s It is recommended you use the following random password: @@ -3337,8 +3396,8 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+3"/> - <source>Cannot obtain a lock on data directory %s. Bitcoin is probably already running.</source> + <location line="+6"/> + <source>Continuously rate-limit free transactions to <n>*1000 bytes per minute (default:15)</source> <translation type="unfinished"/> </message> <message> @@ -3353,6 +3412,11 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. </message> <message> <location line="+3"/> + <source>Error: Listening for incoming connections failed (listen returned error %d)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+2"/> <source>Error: The transaction was rejected! This might happen if some of the coins in your wallet were already spent, such as if you used a copy of wallet.dat and coins were spent in the copy but not marked as spent here.</source> <translation type="unfinished"/> </message> @@ -3367,12 +3431,47 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+18"/> + <location line="+6"/> + <source>Fees smaller than this are considered zero fee (for transaction creation) (default:</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+3"/> + <source>Flush database activity from memory pool to disk log every <n> megabytes (default: 100)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+3"/> + <source>How thorough the block verification of -checkblocks is (0-4, default: 3)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+2"/> + <source>In this mode -genproclimit controls how many blocks are generated immediately.</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+12"/> + <source>Set the number of script verification threads (%u to %d, 0 = auto, <0 = leave that many cores free, default: %d)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+3"/> + <source>Set the processor limit for when generation is on (-1 = unlimited, default: -1)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+3"/> <source>This is a pre-release test build - use at your own risk - do not use for mining or merchant applications</source> <translation type="unfinished"/> </message> <message> - <location line="+5"/> + <location line="+3"/> + <source>Unable to bind to %s on this computer. Bitcoin Core is probably already running.</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+3"/> <source>Use separate SOCKS5 proxy to reach peers via Tor hidden services (default: -proxy)</source> <translation type="unfinished"/> </message> @@ -3408,6 +3507,16 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. </message> <message> <location line="+9"/> + <source>(default: 1)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>(default: wallet.dat)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> <source><category> can be:</source> <translation type="unfinished"/> </message> @@ -3422,17 +3531,17 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+1"/> - <source>Bitcoin RPC client version</source> + <location line="+2"/> + <source>Block creation options:</source> <translation type="unfinished"/> </message> <message> - <location line="+1"/> - <source>Block creation options:</source> + <location line="+5"/> + <source>Clear list of wallet transactions (diagnostic tool; implies -rescan)</source> <translation type="unfinished"/> </message> <message> - <location line="+5"/> + <location line="+1"/> <source>Connect only to the specified node(s)</source> <translation type="unfinished"/> </message> @@ -3448,11 +3557,26 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. </message> <message> <location line="+2"/> + <source>Connection options:</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> <source>Corrupted block database detected</source> <translation type="unfinished"/> </message> <message> <location line="+1"/> + <source>Debugging/Testing options:</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>Disable safemode, override a real safe mode event (default: 0)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> <source>Discover own IP address (default: 1 when listening and no -externalip)</source> <translation type="unfinished"/> </message> @@ -3563,22 +3687,27 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. </message> <message> <location line="+1"/> - <source>Find peers using DNS lookup (default: 1 unless -connect)</source> + <source>Fees smaller than this are considered zero fee (for relaying) (default:</source> <translation type="unfinished"/> </message> <message> <location line="+1"/> - <source>Generate coins (default: 0)</source> + <source>Find peers using DNS lookup (default: 1 unless -connect)</source> <translation type="unfinished"/> </message> <message> - <location line="+2"/> - <source>How many blocks to check at startup (default: 288, 0 = all)</source> + <location line="+1"/> + <source>Force safe mode (default: 0)</source> <translation type="unfinished"/> </message> <message> <location line="+1"/> - <source>How thorough the block verification is (0-4, default: 3)</source> + <source>Generate coins (default: 0)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+2"/> + <source>How many blocks to check at startup (default: 288, 0 = all)</source> <translation type="unfinished"/> </message> <message> @@ -3597,7 +3726,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+15"/> + <location line="+17"/> <source>Not enough file descriptors available.</source> <translation type="unfinished"/> </message> @@ -3607,27 +3736,27 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+1"/> + <location line="+4"/> <source>RPC client options:</source> <translation type="unfinished"/> </message> <message> - <location line="+1"/> + <location line="+4"/> <source>Rebuild block chain index from current blk000??.dat files</source> <translation type="unfinished"/> </message> <message> - <location line="+5"/> + <location line="+6"/> <source>Select SOCKS version for -proxy (4 or 5, default: 5)</source> <translation type="unfinished"/> </message> <message> - <location line="+1"/> - <source>Send command to Bitcoin server</source> + <location line="+6"/> + <source>Set database cache size in megabytes (%d to %d, default: %d)</source> <translation type="unfinished"/> </message> <message> - <location line="+7"/> + <location line="+2"/> <source>Set maximum block size in bytes (default: %d)</source> <translation type="unfinished"/> </message> @@ -3637,17 +3766,17 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+7"/> + <location line="+10"/> <source>Specify wallet file (within data directory)</source> <translation type="unfinished"/> </message> <message> <location line="+2"/> - <source>Start Bitcoin server</source> + <source>Spend unconfirmed change when sending transactions (default: 1)</source> <translation type="unfinished"/> </message> <message> - <location line="+3"/> + <location line="+4"/> <source>This is intended for regression testing tools and app development.</source> <translation type="unfinished"/> </message> @@ -3692,32 +3821,32 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="-79"/> + <location line="-92"/> <source>Imports blocks from external blk000??.dat file</source> <translation type="unfinished"/> </message> <message> - <location line="-105"/> - <source>Execute command when a relevant alert is received or we see a really long fork (%s in cmd is replaced by message)</source> + <location line="-149"/> + <source>Cannot obtain a lock on data directory %s. Bitcoin Core is probably already running.</source> <translation type="unfinished"/> </message> <message> - <location line="+14"/> - <source>Output debugging information (default: 0, supplying <category> is optional)</source> + <location line="+22"/> + <source>Execute command when a relevant alert is received or we see a really long fork (%s in cmd is replaced by message)</source> <translation type="unfinished"/> </message> <message> - <location line="+2"/> - <source>Set maximum size of high-priority/low-fee transactions in bytes (default: %d)</source> + <location line="+25"/> + <source>Output debugging information (default: 0, supplying <category> is optional)</source> <translation type="unfinished"/> </message> <message> <location line="+2"/> - <source>Set the number of script verification threads (up to 16, 0 = auto, <0 = leave that many cores free, default: 0)</source> + <source>Set maximum size of high-priority/low-fee transactions in bytes (default: %d)</source> <translation type="unfinished"/> </message> <message> - <location line="+89"/> + <location line="+102"/> <source>Information</source> <translation>Маалымат</translation> </message> @@ -3732,7 +3861,17 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+8"/> + <location line="+3"/> + <source>Limit size of signature cache to <n> entries (default: 50000)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+6"/> + <source>Log transaction priority and fee per kB when mining blocks (default: 0)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> <source>Maintain a full transaction index (default: 0)</source> <translation type="unfinished"/> </message> @@ -3757,12 +3896,52 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+9"/> - <source>SSL options: (see the Bitcoin Wiki for SSL setup instructions)</source> + <location line="+4"/> + <source>Print block on startup, if found in block index</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>Print block tree on startup (default: 0)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>RPC SSL options: (see the Bitcoin Wiki for SSL setup instructions)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+2"/> + <source>RPC server options:</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>Randomly drop 1 of every <n> network messages</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>Randomly fuzz 1 of every <n> network messages</source> <translation type="unfinished"/> </message> <message> <location line="+4"/> + <source>Run a thread to flush wallet periodically (default: 1)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+2"/> + <source>SSL options: (see the Bitcoin Wiki for SSL setup instructions)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+2"/> + <source>Send command to Bitcoin Core</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+2"/> <source>Send trace/debug info to console instead of debug.log file</source> <translation type="unfinished"/> </message> @@ -3773,6 +3952,21 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. </message> <message> <location line="+2"/> + <source>Sets the DB_PRIVATE flag in the wallet db environment (default: 1)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>Show all debugging options (usage: --help -help-debug)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>Show benchmark information (default: 0)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> <source>Shrink debug.log file on client startup (default: 1 when no -debug)</source> <translation type="unfinished"/> </message> @@ -3788,6 +3982,11 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. </message> <message> <location line="+6"/> + <source>Start Bitcoin Core Daemon</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> <source>System error: </source> <translation type="unfinished"/> </message> @@ -3833,6 +4032,16 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. </message> <message> <location line="+2"/> + <source>Zapping all transactions from wallet...</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>on startup</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> <source>version</source> <translation>верÑиÑ</translation> </message> @@ -3842,47 +4051,47 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="-58"/> + <location line="-71"/> <source>Password for JSON-RPC connections</source> <translation type="unfinished"/> </message> <message> - <location line="-70"/> + <location line="-77"/> <source>Allow JSON-RPC connections from specified IP address</source> <translation type="unfinished"/> </message> <message> - <location line="+80"/> + <location line="+94"/> <source>Send commands to node running on <ip> (default: 127.0.0.1)</source> <translation type="unfinished"/> </message> <message> - <location line="-132"/> + <location line="-163"/> <source>Execute command when the best block changes (%s in cmd is replaced by block hash)</source> <translation type="unfinished"/> </message> <message> - <location line="+161"/> + <location line="+196"/> <source>Upgrade wallet to latest format</source> <translation type="unfinished"/> </message> <message> - <location line="-24"/> + <location line="-28"/> <source>Set key pool size to <n> (default: 100)</source> <translation type="unfinished"/> </message> <message> - <location line="-11"/> + <location line="-12"/> <source>Rescan the block chain for missing wallet transactions</source> <translation type="unfinished"/> </message> <message> - <location line="+38"/> + <location line="+43"/> <source>Use OpenSSL (https) for JSON-RPC connections</source> <translation type="unfinished"/> </message> <message> - <location line="-30"/> + <location line="-34"/> <source>Server certificate file (default: server.cert)</source> <translation type="unfinished"/> </message> @@ -3892,7 +4101,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+16"/> + <location line="+20"/> <source>This help message</source> <translation type="unfinished"/> </message> @@ -3902,17 +4111,17 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="-107"/> + <location line="-125"/> <source>Allow DNS lookups for -addnode, -seednode and -connect</source> <translation type="unfinished"/> </message> <message> - <location line="+60"/> + <location line="+66"/> <source>Loading addresses...</source> <translation type="unfinished"/> </message> <message> - <location line="-37"/> + <location line="-39"/> <source>Error loading wallet.dat: Wallet corrupted</source> <translation type="unfinished"/> </message> @@ -3922,22 +4131,22 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+98"/> + <location line="+112"/> <source>Wallet needed to be rewritten: restart Bitcoin to complete</source> <translation type="unfinished"/> </message> <message> - <location line="-100"/> + <location line="-114"/> <source>Error loading wallet.dat</source> <translation type="unfinished"/> </message> <message> - <location line="+31"/> + <location line="+32"/> <source>Invalid -proxy address: '%s'</source> <translation type="unfinished"/> </message> <message> - <location line="+56"/> + <location line="+69"/> <source>Unknown network specified in -onlynet: '%s'</source> <translation type="unfinished"/> </message> @@ -3947,7 +4156,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="-101"/> + <location line="-119"/> <source>Cannot resolve -bind address: '%s'</source> <translation type="unfinished"/> </message> @@ -3957,7 +4166,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+48"/> + <location line="+53"/> <source>Invalid amount for -paytxfee=<amount>: '%s'</source> <translation type="unfinished"/> </message> @@ -3972,27 +4181,22 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+10"/> + <location line="+11"/> <source>Loading block index...</source> <translation type="unfinished"/> </message> <message> - <location line="-62"/> + <location line="-68"/> <source>Add a node to connect to and attempt to keep the connection open</source> <translation type="unfinished"/> </message> <message> - <location line="-32"/> - <source>Unable to bind to %s on this computer. Bitcoin is probably already running.</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+95"/> + <location line="+69"/> <source>Loading wallet...</source> <translation type="unfinished"/> </message> <message> - <location line="-56"/> + <location line="-62"/> <source>Cannot downgrade wallet</source> <translation type="unfinished"/> </message> @@ -4002,27 +4206,27 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+67"/> + <location line="+80"/> <source>Rescanning...</source> <translation type="unfinished"/> </message> <message> - <location line="-58"/> + <location line="-67"/> <source>Done loading</source> <translation type="unfinished"/> </message> <message> - <location line="+85"/> + <location line="+99"/> <source>To use the %s option</source> <translation type="unfinished"/> </message> <message> - <location line="-77"/> + <location line="-91"/> <source>Error</source> <translation>Ката</translation> </message> <message> - <location line="-35"/> + <location line="-41"/> <source>You must set rpcpassword=<password> in the configuration file: %s If the file does not exist, create it with owner-readable-only file permissions.</source> diff --git a/src/qt/locale/bitcoin_nb.ts b/src/qt/locale/bitcoin_nb.ts index 12333e3997..6c2095deea 100644 --- a/src/qt/locale/bitcoin_nb.ts +++ b/src/qt/locale/bitcoin_nb.ts @@ -1,4 +1,4 @@ -<?xml version="1.0" ?><!DOCTYPE TS><TS language="nb" version="2.0"> +<?xml version="1.0" ?><!DOCTYPE TS><TS language="nb" version="2.1"> <context> <name>AboutDialog</name> <message> @@ -24,7 +24,7 @@ Dette er eksperimentell programvare. Distribuert under MIT/X11 programvarelisensen, se medfølgende fil COPYING eller http://www.opensource.org/licenses/mit-license.php. -Dette produktet inneholder programvare utviklet av OpenSSL prosjektet for bruk i OpenSSL Toolkit (http://www.openssl.org/) og kryptografisk programvare skrevet av Eric Young (eay@cryptsoft.com) og UPnP programvare skrevet av Thomas Bernard.</translation> +Dette produktet inneholder programvare utviklet av OpenSSL Project for bruk i OpenSSL Toolkit (http://www.openssl.org/), kryptografisk programvare skrevet av Eric Young (eay@cryptsoft.com) og UPnP programvare skrevet av Thomas Bernard.</translation> </message> <message> <location filename="../utilitydialog.cpp" line="+29"/> @@ -40,7 +40,7 @@ Dette produktet inneholder programvare utviklet av OpenSSL prosjektet for bruk i <location line="+12"/> <location line="+2"/> <source> (%1-bit)</source> - <translation type="unfinished"/> + <translation>(%1-bit)</translation> </message> </context> <context> @@ -71,7 +71,7 @@ Dette produktet inneholder programvare utviklet av OpenSSL prosjektet for bruk i <translation>&Kopier</translation> </message> <message> - <location line="+52"/> + <location line="+58"/> <source>C&lose</source> <translation>&Lukk</translation> </message> @@ -81,7 +81,7 @@ Dette produktet inneholder programvare utviklet av OpenSSL prosjektet for bruk i <translation>&Kopier Adresse</translation> </message> <message> - <location filename="../forms/addressbookpage.ui" line="-41"/> + <location filename="../forms/addressbookpage.ui" line="-47"/> <source>Delete the currently selected address from the list</source> <translation>Slett den valgte adressen fra listen.</translation> </message> @@ -93,7 +93,7 @@ Dette produktet inneholder programvare utviklet av OpenSSL prosjektet for bruk i <message> <location line="+3"/> <source>&Export</source> - <translation>&Eksporter...</translation> + <translation>&Eksporter</translation> </message> <message> <location line="-27"/> @@ -128,12 +128,12 @@ Dette produktet inneholder programvare utviklet av OpenSSL prosjektet for bruk i <message> <location line="+7"/> <source>These are your Bitcoin addresses for sending payments. Always check the amount and the receiving address before sending coins.</source> - <translation>Dette er dine Bitcoin adresser for Ã¥ sende betalinger. Alltid sjekk mengden og mottaker adresse før sending av mynter.</translation> + <translation>Dette er dine Bitcoin-adresser for Ã¥ sende betalinger. Alltid sjekk beløp og mottakeradresse før sending av mynter.</translation> </message> <message> <location line="+4"/> <source>These are your Bitcoin addresses for receiving payments. It is recommended to use a new receiving address for each transaction.</source> - <translation>Dette er dine Bitcoin adresser for Ã¥ sende betalinger. Det er anbefalt Ã¥ bruk en ny mottaksadresse for hver transaksjon.</translation> + <translation>Dette er dine Bitcoin-adresser for Ã¥ sende betalinger. Det er anbefalt Ã¥ bruk en ny mottaksadresse for hver transaksjon.</translation> </message> <message> <location line="+7"/> @@ -163,7 +163,7 @@ Dette produktet inneholder programvare utviklet av OpenSSL prosjektet for bruk i <message> <location line="+1"/> <source>There was an error trying to save the address list to %1.</source> - <translation type="unfinished"/> + <translation>En feil oppstod ved lagring av adresselisten til %1.</translation> </message> </context> <context> @@ -264,13 +264,13 @@ Dette produktet inneholder programvare utviklet av OpenSSL prosjektet for bruk i <message> <location line="+15"/> <source>IMPORTANT: Any previous backups you have made of your wallet file should be replaced with the newly generated, encrypted wallet file. For security reasons, previous backups of the unencrypted wallet file will become useless as soon as you start using the new, encrypted wallet.</source> - <translation>VIKTIG: Tidligere sikkerhetskopier av din lommebok-fil, bør erstattes med den nylig genererte, krypterte filen, da de blir ugyldiggjort av sikkerhetshensyn sÃ¥ snart du begynner Ã¥ bruke den nye krypterte lommeboken.</translation> + <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> <message> <location line="+100"/> <location line="+24"/> <source>Warning: The Caps Lock key is on!</source> - <translation>Advarsel: Caps Lock er pÃ¥ !</translation> + <translation>Advarsel: Caps Lock er pÃ¥!</translation> </message> <message> <location line="-130"/> @@ -328,7 +328,7 @@ Dette produktet inneholder programvare utviklet av OpenSSL prosjektet for bruk i <context> <name>BitcoinGUI</name> <message> - <location filename="../bitcoingui.cpp" line="+295"/> + <location filename="../bitcoingui.cpp" line="+294"/> <source>Sign &message...</source> <translation>Signer &melding...</translation> </message> @@ -343,12 +343,12 @@ Dette produktet inneholder programvare utviklet av OpenSSL prosjektet for bruk i <translation>&Oversikt</translation> </message> <message> - <location line="-137"/> + <location line="-136"/> <source>Node</source> <translation>Node</translation> </message> <message> - <location line="+138"/> + <location line="+137"/> <source>Show general overview of wallet</source> <translation>Vis generell oversikt over lommeboken</translation> </message> @@ -411,17 +411,17 @@ Dette produktet inneholder programvare utviklet av OpenSSL prosjektet for bruk i <message> <location line="+10"/> <source>&Sending addresses...</source> - <translation type="unfinished"/> + <translation>&Utsendingsadresser...</translation> </message> <message> <location line="+2"/> <source>&Receiving addresses...</source> - <translation type="unfinished"/> + <translation>&Mottaksadresser...</translation> </message> <message> <location line="+3"/> <source>Open &URI...</source> - <translation>Ã…pne %URI...</translation> + <translation>Ã…pne &URI...</translation> </message> <message> <location line="+325"/> @@ -431,7 +431,7 @@ Dette produktet inneholder programvare utviklet av OpenSSL prosjektet for bruk i <message> <location line="+3"/> <source>Reindexing blocks on disk...</source> - <translation>Re-indekserer blokker pÃ¥ disk...</translation> + <translation>Reindekserer blokker pÃ¥ harddisk...</translation> </message> <message> <location line="-405"/> @@ -446,7 +446,7 @@ Dette produktet inneholder programvare utviklet av OpenSSL prosjektet for bruk i <message> <location line="+12"/> <source>Backup wallet to another location</source> - <translation>Sikkerhetskopiér lommebok til annet sted</translation> + <translation>Sikkerhetskopier lommebok til annet sted</translation> </message> <message> <location line="+2"/> @@ -469,17 +469,17 @@ Dette produktet inneholder programvare utviklet av OpenSSL prosjektet for bruk i <translation>&Verifiser melding...</translation> </message> <message> - <location line="+430"/> + <location line="+440"/> <source>Bitcoin</source> <translation>Bitcoin</translation> </message> <message> - <location line="-643"/> + <location line="-652"/> <source>Wallet</source> <translation>Lommebok</translation> </message> <message> - <location line="+146"/> + <location line="+145"/> <source>&Send</source> <translation>&Send</translation> </message> @@ -492,7 +492,7 @@ Dette produktet inneholder programvare utviklet av OpenSSL prosjektet for bruk i <location line="+46"/> <location line="+2"/> <source>&Show / Hide</source> - <translation>&Gjem / vis</translation> + <translation>&Vis / Skjul</translation> </message> <message> <location line="+1"/> @@ -507,7 +507,7 @@ Dette produktet inneholder programvare utviklet av OpenSSL prosjektet for bruk i <message> <location line="+7"/> <source>Sign messages with your Bitcoin addresses to prove you own them</source> - <translation>Signér en melding for Ã¥ bevise at du eier denne adressen</translation> + <translation>Signer en melding med Bitcoin-adressene dine for Ã¥ bevise at du eier dem</translation> </message> <message> <location line="+2"/> @@ -535,20 +535,20 @@ Dette produktet inneholder programvare utviklet av OpenSSL prosjektet for bruk i <translation>Verktøylinje for faner</translation> </message> <message> - <location line="-284"/> - <location line="+376"/> + <location line="-283"/> + <location line="+375"/> <source>[testnet]</source> <translation>[testnett]</translation> </message> <message> - <location line="-401"/> + <location line="-400"/> <source>Bitcoin Core</source> - <translation>Bitcoin Kjerne</translation> + <translation>Bitcoin Core</translation> </message> <message> - <location line="+163"/> + <location line="+162"/> <source>Request payments (generates QR codes and bitcoin: URIs)</source> - <translation>Forespør betalinger (genererer QR koder og bitcoin: URIs)</translation> + <translation>Forespør betalinger (genererer QR-koder og bitcoin: URIer)</translation> </message> <message> <location line="+29"/> @@ -569,7 +569,7 @@ Dette produktet inneholder programvare utviklet av OpenSSL prosjektet for bruk i <message> <location line="+3"/> <source>Open a bitcoin: URI or payment request</source> - <translation>Ã…pne en bitcoin: URI eller betalingsetterspørring</translation> + <translation>Ã…pne en Bitcoin: URI eller betalingsetterspørring</translation> </message> <message> <location line="+2"/> @@ -579,13 +579,13 @@ Dette produktet inneholder programvare utviklet av OpenSSL prosjektet for bruk i <message> <location line="+1"/> <source>Show the Bitcoin Core help message to get a list with possible Bitcoin command-line options</source> - <translation type="unfinished"/> + <translation>Vis Bitcoin Core hjelpemeldingen for Ã¥ fÃ¥ en liste med mulige kommandolinjevalg</translation> </message> <message> <location line="+159"/> <location line="+5"/> <source>Bitcoin client</source> - <translation>Bitcoinklient</translation> + <translation>Bitcoin-klienten</translation> </message> <message numerus="yes"> <location line="+142"/> @@ -595,7 +595,7 @@ Dette produktet inneholder programvare utviklet av OpenSSL prosjektet for bruk i <message> <location line="+22"/> <source>No block source available...</source> - <translation>Ingen blokk-kilde tilgjengelig...</translation> + <translation>Ingen kilde for blokker tilgjengelig...</translation> </message> <message> <location line="+12"/> @@ -608,7 +608,7 @@ Dette produktet inneholder programvare utviklet av OpenSSL prosjektet for bruk i <translation>Lastet %1 blokker med transaksjonshistorikk.</translation> </message> <message numerus="yes"> - <location line="+23"/> + <location line="+27"/> <source>%n hour(s)</source> <translation><numerusform>%n time</numerusform><numerusform>%n timer</numerusform></translation> </message> @@ -619,18 +619,19 @@ Dette produktet inneholder programvare utviklet av OpenSSL prosjektet for bruk i </message> <message numerus="yes"> <location line="+4"/> + <location line="+6"/> <source>%n week(s)</source> <translation><numerusform>%n uke</numerusform><numerusform>%n uker</numerusform></translation> </message> <message> <location line="+0"/> <source>%1 and %2</source> - <translation type="unfinished"/> + <translation>%1 og %2</translation> </message> <message numerus="yes"> <location line="+0"/> <source>%n year(s)</source> - <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation> + <translation><numerusform>%n Ã¥r</numerusform><numerusform>%n Ã¥r</numerusform></translation> </message> <message> <location line="+4"/> @@ -663,12 +664,12 @@ Dette produktet inneholder programvare utviklet av OpenSSL prosjektet for bruk i <translation>Informasjon</translation> </message> <message> - <location line="-85"/> + <location line="-95"/> <source>Up to date</source> <translation>Ajour</translation> </message> <message> - <location line="+34"/> + <location line="+44"/> <source>Catching up...</source> <translation>Kommer ajour...</translation> </message> @@ -706,7 +707,7 @@ Adresse: %4 <translation>Lommeboken er <b>kryptert</b> og for tiden <b>lÃ¥st</b></translation> </message> <message> - <location filename="../bitcoin.cpp" line="+435"/> + <location filename="../bitcoin.cpp" line="+441"/> <source>A fatal error occurred. Bitcoin can no longer continue safely and will quit.</source> <translation>En fatal feil har inntruffet. Det er ikke trygt Ã¥ fortsette og Bitcoin mÃ¥ derfor avslutte.</translation> </message> @@ -714,7 +715,7 @@ Adresse: %4 <context> <name>ClientModel</name> <message> - <location filename="../clientmodel.cpp" line="+119"/> + <location filename="../clientmodel.cpp" line="+128"/> <source>Network Alert</source> <translation>Nettverksvarsel</translation> </message> @@ -724,7 +725,7 @@ Adresse: %4 <message> <location filename="../forms/coincontroldialog.ui" line="+14"/> <source>Coin Control Address Selection</source> - <translation>Mynt Kontroll Adresse Valg</translation> + <translation>Myntkontroll Adresse Valg</translation> </message> <message> <location line="+34"/> @@ -759,27 +760,27 @@ Adresse: %4 <message> <location line="+48"/> <source>After Fee:</source> - <translation>Etter Avgift:</translation> + <translation>Etter Gebyr:</translation> </message> <message> <location line="+32"/> <source>Change:</source> - <translation>Endring:</translation> + <translation>Veksel:</translation> </message> <message> <location line="+56"/> <source>(un)select all</source> - <translation>Fjern alt valgt</translation> + <translation>velg (fjern) alt</translation> </message> <message> <location line="+13"/> <source>Tree mode</source> - <translation>Tre modus</translation> + <translation>Tremodus</translation> </message> <message> <location line="+16"/> <source>List mode</source> - <translation>Liste modus</translation> + <translation>Listemodus</translation> </message> <message> <location line="+53"/> @@ -812,7 +813,7 @@ Adresse: %4 <translation>Prioritet</translation> </message> <message> - <location filename="../coincontroldialog.cpp" line="+42"/> + <location filename="../coincontroldialog.cpp" line="+41"/> <source>Copy address</source> <translation>Kopier adresse</translation> </message> @@ -825,7 +826,7 @@ Adresse: %4 <location line="+1"/> <location line="+26"/> <source>Copy amount</source> - <translation>Kopiér beløp</translation> + <translation>Kopier beløp</translation> </message> <message> <location line="-25"/> @@ -835,12 +836,12 @@ Adresse: %4 <message> <location line="+1"/> <source>Lock unspent</source> - <translation type="unfinished"/> + <translation>LÃ¥s ubrukte</translation> </message> <message> <location line="+1"/> <source>Unlock unspent</source> - <translation type="unfinished"/> + <translation>LÃ¥s opp ubrukte</translation> </message> <message> <location line="+22"/> @@ -855,30 +856,30 @@ Adresse: %4 <message> <location line="+1"/> <source>Copy after fee</source> - <translation type="unfinished"/> + <translation>Kopier fra gebyr</translation> </message> <message> <location line="+1"/> <source>Copy bytes</source> - <translation type="unfinished"/> + <translation>Kopier bytes</translation> </message> <message> <location line="+1"/> <source>Copy priority</source> - <translation type="unfinished"/> + <translation>Kopier prioritet</translation> </message> <message> <location line="+1"/> <source>Copy low output</source> - <translation type="unfinished"/> + <translation>Kopier svake utdata</translation> </message> <message> <location line="+1"/> <source>Copy change</source> - <translation type="unfinished"/> + <translation>Kopier veksel</translation> </message> <message> - <location line="+323"/> + <location line="+332"/> <source>highest</source> <translation>høyest</translation> </message> @@ -956,7 +957,7 @@ Adresse: %4 <location line="+1"/> <location line="+5"/> <source>This means a fee of at least %1 per kB is required.</source> - <translation>Dette betyr at en avgift pÃ¥ minst %1 per KB er pÃ¥krevd.</translation> + <translation>Dette betyr at et gebyr pÃ¥ minst %1 per KB er pÃ¥krevd.</translation> </message> <message> <location line="-4"/> @@ -971,23 +972,23 @@ Adresse: %4 <message> <location line="+1"/> <source>This label turns red, if the priority is smaller than "medium".</source> - <translation type="unfinished"/> + <translation>Denne merkelappen blir rød, hvis prioriteten er mindre enn "medium".</translation> </message> <message> <location line="+3"/> <source>This label turns red, if any recipient receives an amount smaller than %1.</source> - <translation>Denne merkelappen blir rød, hvis noen mottaker mottar en mengde pÃ¥ mindre enn %1.</translation> + <translation>Denne merkelappen blir rød, hvis en mottaker mottar en mengde pÃ¥ mindre enn %1.</translation> </message> <message> <location line="+1"/> <location line="+4"/> <source>This means a fee of at least %1 is required.</source> - <translation>Dette betyr at en avgift pÃ¥ minst %1 er pÃ¥krevd.</translation> + <translation>Dette betyr at et gebyr pÃ¥ minst %1 er pÃ¥krevd.</translation> </message> <message> <location line="-3"/> <source>Amounts below 0.546 times the minimum relay fee are shown as dust.</source> - <translation>Mengder under 0.546 ganger minimum relé avgiften er vist som støv.</translation> + <translation>Mengder under 0.546 ganger minimum relégebyr er vist som støv.</translation> </message> <message> <location line="+2"/> @@ -996,19 +997,19 @@ Adresse: %4 </message> <message> <location line="+43"/> - <location line="+66"/> + <location line="+63"/> <source>(no label)</source> <translation>(ingen merkelapp)</translation> </message> <message> <location line="-9"/> <source>change from %1 (%2)</source> - <translation>endring fra %1 (%2)</translation> + <translation>veksel fra %1 (%2)</translation> </message> <message> <location line="+1"/> <source>(change)</source> - <translation>(endring)</translation> + <translation>(veksel)</translation> </message> </context> <context> @@ -1084,7 +1085,7 @@ Adresse: %4 <message> <location filename="../intro.cpp" line="+65"/> <source>A new data directory will be created.</source> - <translation>En ny data mappe vil bli laget.</translation> + <translation>En ny datamappe vil bli laget.</translation> </message> <message> <location line="+22"/> @@ -1099,12 +1100,12 @@ Adresse: %4 <message> <location line="+3"/> <source>Path already exists, and is not a directory.</source> - <translation>Sti finnes allerede, og er ikke en mappe.</translation> + <translation>Snarvei finnes allerede, og er ikke en mappe.</translation> </message> <message> <location line="+7"/> <source>Cannot create data directory here.</source> - <translation>Kan ikke laget data mappe her.</translation> + <translation>Kan ikke lage datamappe her.</translation> </message> </context> <context> @@ -1112,12 +1113,12 @@ Adresse: %4 <message> <location filename="../forms/helpmessagedialog.ui" line="+19"/> <source>Bitcoin Core - Command-line options</source> - <translation type="unfinished"/> + <translation>Bitcoin Core - Kommandolinjevalg</translation> </message> <message> <location filename="../utilitydialog.cpp" line="+24"/> <source>Bitcoin Core</source> - <translation>Bitcoin Kjerne</translation> + <translation>Bitcoin Core</translation> </message> <message> <location line="+0"/> @@ -1147,8 +1148,7 @@ Adresse: %4 <message> <location line="+1"/> <source>Start minimized</source> - <translation>Start minimert -</translation> + <translation>Start minimert</translation> </message> <message> <location line="+1"/> @@ -1158,7 +1158,7 @@ Adresse: %4 <message> <location line="+1"/> <source>Choose data directory on startup (default: 0)</source> - <translation>Velg data mappe ved oppstart (standard: 0)</translation> + <translation>Velg datamappe ved oppstart (standard: 0)</translation> </message> </context> <context> @@ -1176,32 +1176,32 @@ Adresse: %4 <message> <location line="+26"/> <source>As this is the first time the program is launched, you can choose where Bitcoin Core will store its data.</source> - <translation>Siden dette er første gang programmet starter, kan du velge hvor Bitcoin Core skal lagre sine data.</translation> + <translation>Siden dette er første gang programmet starter, kan du nÃ¥ velge hvor Bitcoin Core skal lagre sine data.</translation> </message> <message> <location line="+10"/> <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 vil laste ned og lagre en kopi av Bitcoins blokk kjede. Minst %1GB av data vil bli lagret i denne mappen, og det vil vokse over tid. Lommeboken vil ogsÃ¥ bli lagret i denne mappen.</translation> + <translation>Bitcoin Core vil laste ned og lagre en kopi av Bitcoin sin blokkjede. Minst %1GB av data vil bli lagret i denne mappen, og det vil vokse over tid. Lommeboken vil ogsÃ¥ bli lagret i denne mappen.</translation> </message> <message> <location line="+10"/> <source>Use the default data directory</source> - <translation>Bruk standard data mappe</translation> + <translation>Bruk standard datamappe</translation> </message> <message> <location line="+7"/> <source>Use a custom data directory:</source> - <translation>Bruk en egendefinert data mappe:</translation> + <translation>Bruk en egendefinert datamappe:</translation> </message> <message> - <location filename="../intro.cpp" line="+85"/> + <location filename="../intro.cpp" line="+82"/> <source>Bitcoin</source> <translation>Bitcoin</translation> </message> <message> <location line="+1"/> <source>Error: Specified data directory "%1" can not be created.</source> - <translation>Feil: Spesifisert data mappe "%1" kan ikke opprettes.</translation> + <translation>Feil: Spesifisert datamappe "%1" kan ikke opprettes.</translation> </message> <message> <location line="+19"/> @@ -1211,7 +1211,7 @@ Adresse: %4 <message> <location line="+9"/> <source>GB of free space available</source> - <translation>GB av ledig lagringsplass</translation> + <translation>GB ledig lagringsplass</translation> </message> <message> <location line="+3"/> @@ -1224,7 +1224,7 @@ Adresse: %4 <message> <location filename="../forms/openuridialog.ui" line="+14"/> <source>Open URI</source> - <translation>Open URI</translation> + <translation>Ã…pne URI</translation> </message> <message> <location line="+6"/> @@ -1239,12 +1239,12 @@ Adresse: %4 <message> <location line="+11"/> <source>Select payment request file</source> - <translation>Velg betalingsetterspørring fil</translation> + <translation>Velg fil for betalingsetterspørring</translation> </message> <message> <location filename="../openuridialog.cpp" line="+47"/> <source>Select payment request file to open</source> - <translation>Velg betalingsetterspørrings fil Ã¥ Ã¥pne</translation> + <translation>Velg fil for betalingsetterspørring Ã¥ Ã¥pne</translation> </message> </context> <context> @@ -1267,7 +1267,7 @@ Adresse: %4 <message> <location line="+15"/> <source>Pay transaction &fee</source> - <translation>Betal transaksjons&gebyr</translation> + <translation>Betal &transaksjonsgebyr</translation> </message> <message> <location line="-131"/> @@ -1282,7 +1282,7 @@ Adresse: %4 <message> <location line="+9"/> <source>Size of &database cache</source> - <translation type="unfinished"/> + <translation>Størrelse pÃ¥ &database hurtigbuffer</translation> </message> <message> <location line="+16"/> @@ -1292,20 +1292,15 @@ Adresse: %4 <message> <location line="+27"/> <source>Number of script &verification threads</source> - <translation type="unfinished"/> + <translation>Antall script &verifikasjonstrÃ¥der</translation> </message> <message> <location line="+13"/> <source>Set the number of script verification threads (up to 16, 0 = auto, <0 = leave that many cores free, default: 0)</source> - <translation type="unfinished"/> + <translation>Sett antall script verifikasjonstrÃ¥der (opp til 16, 0 = automatisk, <0 = la sÃ¥ mange kjerner være ledig, standardvalg: 0)</translation> </message> <message> - <location line="+107"/> - <source>&Spend unconfirmed change (experts only)</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+37"/> + <location line="+153"/> <source>Connect to the Bitcoin network through a SOCKS proxy.</source> <translation>Koble til Bitcoin-nettverket gjennom en SOCKS proxy.</translation> </message> @@ -1317,12 +1312,12 @@ Adresse: %4 <message> <location line="+34"/> <source>IP address of the proxy (e.g. IPv4: 127.0.0.1 / IPv6: ::1)</source> - <translation type="unfinished"/> + <translation>IP-adressen til proxyen (f.eks. IPv4: 127.0.0.1 / IPv6: ::1)</translation> </message> <message> - <location line="+224"/> + <location line="+214"/> <source>Active command-line options that override above options:</source> - <translation type="unfinished"/> + <translation>Aktive kommandolinjevalg som overstyrer valgene ovenfor:</translation> </message> <message> <location line="+43"/> @@ -1335,29 +1330,44 @@ Adresse: %4 <translation>&Tilbakestill Instillinger</translation> </message> <message> - <location line="-323"/> + <location line="-313"/> <source>&Network</source> <translation>&Nettverk</translation> </message> <message> - <location line="-86"/> + <location line="-95"/> <source>W&allet</source> - <translation type="unfinished"/> + <translation>L&ommebok</translation> </message> <message> - <location line="+52"/> + <location line="+65"/> + <source>Expert</source> + <translation>Ekspert</translation> + </message> + <message> + <location line="+9"/> + <source>Enable coin &control features</source> + <translation>Aktiver &myntkontroll funksjoner</translation> + </message> + <message> + <location line="+7"/> <source>If you disable the spending of unconfirmed change, the change from a transaction cannot be used until that transaction has at least one confirmation. This also affects how your balance is computed.</source> - <translation type="unfinished"/> + <translation>Hvis du sperrer for bruk av ubekreftet veksel, kan ikke vekselen fra transaksjonen bli brukt før transaksjonen har minimum en bekreftelse. Dette pÃ¥virker ogsÃ¥ hvordan balansen din blir beregnet.</translation> </message> <message> - <location line="+40"/> + <location line="+3"/> + <source>&Spend unconfirmed change</source> + <translation>&Bruk ubekreftet veksel</translation> + </message> + <message> + <location line="+17"/> <source>Automatically open the Bitcoin client port on the router. This only works when your router supports UPnP and it is enabled.</source> <translation>Ã…pne automatisk Bitcoin klientporten pÃ¥ ruteren. Dette virker kun om din ruter støtter UPnP og dette er pÃ¥slÃ¥tt.</translation> </message> <message> <location line="+3"/> <source>Map port using &UPnP</source> - <translation>Sett opp port vha. &UPnP</translation> + <translation>Sett opp port ved hjelp av &UPnP</translation> </message> <message> <location line="+19"/> @@ -1445,17 +1455,12 @@ Adresse: %4 <translation>&Vis adresser i transaksjonslisten</translation> </message> <message> - <location line="+7"/> + <location line="-262"/> <source>Whether to show coin control features or not.</source> - <translation>Skal mynt kontroll funksjoner vises eller ikke.</translation> + <translation>Skal myntkontroll funksjoner vises eller ikke.</translation> </message> <message> - <location line="+3"/> - <source>Display coin &control features (experts only)</source> - <translation>Vis mynt &kontroll funksjoner (kun for eksperter)</translation> - </message> - <message> - <location line="+136"/> + <location line="+398"/> <source>&OK</source> <translation>&OK</translation> </message> @@ -1477,7 +1482,7 @@ Adresse: %4 <message> <location line="+78"/> <source>Confirm options reset</source> - <translation>Bekreft innstillings tilbakestilling</translation> + <translation>Bekreft tilbakestilling av innstillinger</translation> </message> <message> <location line="+1"/> @@ -1488,7 +1493,7 @@ Adresse: %4 <message> <location line="-29"/> <source>Client will be shutdown, do you want to proceed?</source> - <translation type="unfinished"/> + <translation>Klienten vil bli lukket, vil du fortsette?</translation> </message> <message> <location line="+33"/> @@ -1522,7 +1527,7 @@ Adresse: %4 <message> <location line="+51"/> <source>Available:</source> - <translation type="unfinished"/> + <translation>Tilgjengelig:</translation> </message> <message> <location line="+16"/> @@ -1532,7 +1537,7 @@ Adresse: %4 <message> <location line="+16"/> <source>Pending:</source> - <translation type="unfinished"/> + <translation>Under behandling:</translation> </message> <message> <location line="+16"/> @@ -1577,7 +1582,7 @@ Adresse: %4 <location filename="../paymentserver.cpp" line="+403"/> <location line="+13"/> <source>URI handling</source> - <translation>URI hÃ¥ndtering</translation> + <translation>URI-hÃ¥ndtering</translation> </message> <message> <location line="+1"/> @@ -1607,32 +1612,32 @@ Adresse: %4 <message> <location line="+58"/> <source>Net manager warning</source> - <translation type="unfinished"/> + <translation>Nettleder advarsel</translation> </message> <message> <location line="+1"/> <source>Your active proxy doesn't support SOCKS5, which is required for payment requests via proxy.</source> - <translation type="unfinished"/> + <translation>Din aktive proxy har ikke støtte for SOCKS5, som er pÃ¥krevd for betalingsforespørsler via proxy.</translation> </message> <message> <location line="+52"/> <source>Payment request fetch URL is invalid: %1</source> - <translation type="unfinished"/> + <translation>Hentelenke for betalingsforespørsel er ugyldig: %1</translation> </message> <message> <location line="+27"/> <source>Payment request file handling</source> - <translation type="unfinished"/> + <translation>FilhÃ¥ndtering for betalingsforespørsel</translation> </message> <message> <location line="+1"/> <source>Payment request file can not be read or processed! This can be caused by an invalid payment request file.</source> - <translation type="unfinished"/> + <translation>Fil for betalingsforespørsel kan ikke leses eller behandles! Dette kan skyldes en ugyldig fil for betalingsforespørsel.</translation> </message> <message> <location line="+73"/> <source>Unverified payment requests to custom payment scripts are unsupported.</source> - <translation type="unfinished"/> + <translation>Uverifiserte betalingsforespørsler til egentilpassede betalingscript er ikke støttet.</translation> </message> <message> <location line="+59"/> @@ -1642,12 +1647,12 @@ Adresse: %4 <message> <location line="+43"/> <source>Error communicating with %1: %2</source> - <translation>Feil ved Ã¥ kommunisere med %1: %2</translation> + <translation>Feil i kommunikasjonen med %1: %2</translation> </message> <message> <location line="+24"/> <source>Payment request can not be parsed or processed!</source> - <translation type="unfinished"/> + <translation>Betalingsforespørsler kan ikke analyseres eller behandles!</translation> </message> <message> <location line="+11"/> @@ -1668,25 +1673,25 @@ Adresse: %4 <context> <name>QObject</name> <message> - <location filename="../bitcoin.cpp" line="+71"/> - <location line="+11"/> + <location filename="../bitcoin.cpp" line="+63"/> + <location line="+14"/> <source>Bitcoin</source> <translation>Bitcoin</translation> </message> <message> - <location line="+1"/> + <location line="-13"/> <source>Error: Specified data directory "%1" does not exist.</source> - <translation>Feil: Spesifisert data mappe "%1" finnes ikke.</translation> + <translation>Feil: Spesifisert datamappe "%1" finnes ikke.</translation> </message> <message> - <location line="-12"/> + <location line="+13"/> <source>Error: Invalid combination of -regtest and -testnet.</source> <translation>Feil: Ugyldig kombinasjon av -regtest og -testnet.</translation> </message> <message> <location filename="../guiutil.cpp" line="+82"/> <source>Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source> - <translation>Skriv inn en Bitcoin adresse (f.eks. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation> + <translation>Skriv inn en Bitcoin-adresse (f.eks. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation> </message> </context> <context> @@ -1694,7 +1699,7 @@ Adresse: %4 <message> <location filename="../receiverequestdialog.cpp" line="+36"/> <source>&Save Image...</source> - <translation>&Lagre bilde...</translation> + <translation>&Lagre Bilde...</translation> </message> <message> <location line="+3"/> @@ -1704,12 +1709,12 @@ Adresse: %4 <message> <location line="+28"/> <source>Save QR Code</source> - <translation>Lagre QR Kode</translation> + <translation>Lagre QR-kode</translation> </message> <message> <location line="+0"/> <source>PNG Image (*.png)</source> - <translation>PNG Bilde (*.png)</translation> + <translation>PNG-bilde (*.png)</translation> </message> </context> <context> @@ -1730,7 +1735,7 @@ Adresse: %4 <location line="+36"/> <location line="+23"/> <location line="+23"/> - <location filename="../rpcconsole.cpp" line="+359"/> + <location filename="../rpcconsole.cpp" line="+373"/> <source>N/A</source> <translation>-</translation> </message> @@ -1747,7 +1752,7 @@ Adresse: %4 <message> <location line="-10"/> <source>Debug window</source> - <translation>Debug vindu</translation> + <translation>Feilsøkingsvindu</translation> </message> <message> <location line="+25"/> @@ -1826,11 +1831,13 @@ Adresse: %4 </message> <message> <location line="+64"/> + <location filename="../rpcconsole.cpp" line="-10"/> <source>In:</source> <translation>Inn:</translation> </message> <message> <location line="+80"/> + <location filename="../rpcconsole.cpp" line="+1"/> <source>Out:</source> <translation>Ut:</translation> </message> @@ -1847,7 +1854,7 @@ Adresse: %4 <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>Ã…pne Bitcoin loggfil for feilsøk fra datamappen. Dette kan ta noen sekunder for store loggfiler.</translation> + <translation>Ã…pne Bitcoin sin loggfil for feilsøk fra den gjeldende datamappen. Dette kan ta noen sekunder for store loggfiler.</translation> </message> <message> <location line="+76"/> @@ -1855,9 +1862,9 @@ Adresse: %4 <translation>Tøm konsoll</translation> </message> <message> - <location filename="../rpcconsole.cpp" line="-30"/> + <location filename="../rpcconsole.cpp" line="-35"/> <source>Welcome to the Bitcoin RPC console.</source> - <translation>Velkommen til Bitcoin RPC konsoll.</translation> + <translation>Velkommen til Bitcoin sin RPC-konsoll.</translation> </message> <message> <location line="+1"/> @@ -1870,7 +1877,7 @@ Adresse: %4 <translation>Skriv <b>help</b> for en oversikt over kommandoer.</translation> </message> <message> - <location line="+122"/> + <location line="+136"/> <source>%1 B</source> <translation>%1 B</translation> </message> @@ -1925,7 +1932,7 @@ Adresse: %4 <message> <location line="-20"/> <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>Gjenbruk en av de tidligere brukte mottaksadressene. Gjenbruk av adresser har sikkerhets og personverns utfordringer. Ikke bruk dette med unntak for Ã¥ gjennopprette en betalingsforespørsel som ble gjort tidligere.</translation> + <translation>Gjenbruk en av de tidligere brukte mottaksadressene. Gjenbruk av adresser har sikkerhets- og personvernsutfordringer. Ikke bruk dette med unntak for Ã¥ gjennopprette en betalingsforespørsel som ble gjort tidligere.</translation> </message> <message> <location line="+3"/> @@ -1936,29 +1943,29 @@ Adresse: %4 <location line="+14"/> <location line="+23"/> <source>An optional message to attach to the payment request, which will be displayed when the request is opened. Note: The message will not be sent with the payment over the Bitcoin network.</source> - <translation type="unfinished"/> + <translation>En valgfri melding Ã¥ tilknytte betalingsforespørselen, som vil bli vist nÃ¥r forespørselen er Ã¥pnet. Meldingen vil ikke bli sendt med betalingen over Bitcoin-nettverket.</translation> </message> <message> <location line="-7"/> <location line="+21"/> <source>An optional label to associate with the new receiving address.</source> - <translation type="unfinished"/> + <translation>En valgfri merkelapp Ã¥ tilknytte den nye mottakeradressen.</translation> </message> <message> <location line="-7"/> <source>Use this form to request payments. All fields are <b>optional</b>.</source> - <translation type="unfinished"/> + <translation>Bruk dette skjemaet til betalingsforespørsler. Alle felt er <b>valgfrie</b>.</translation> </message> <message> <location line="+23"/> <location line="+22"/> <source>An optional amount to request. Leave this empty or zero to not request a specific amount.</source> - <translation type="unfinished"/> + <translation>Et valgfritt beløp Ã¥ etterspørre. La stÃ¥ tomt eller null for ikke Ã¥ etterspørre et spesifikt beløp.</translation> </message> <message> <location line="+32"/> <source>Clear all fields of the form.</source> - <translation>Fjern alle felter fra formen.</translation> + <translation>Fjern alle felter fra skjemaet.</translation> </message> <message> <location line="+3"/> @@ -1968,17 +1975,17 @@ Adresse: %4 <message> <location line="+78"/> <source>Requested payments history</source> - <translation type="unfinished"/> + <translation>Etterspurt betalingshistorikk</translation> </message> <message> <location line="-98"/> <source>&Request payment</source> - <translation>Ette&rspør betaling</translation> + <translation>&Etterspør betaling</translation> </message> <message> <location line="+120"/> <source>Show the selected request (does the same as double clicking an entry)</source> - <translation>Vis den valgte etterspørringen (gjør det samme som Ã¥ dobbelklikke en oppføring)</translation> + <translation>Vis den valgte etterspørringen (gjør det samme som Ã¥ dobbelklikke pÃ¥ en oppføring)</translation> </message> <message> <location line="+3"/> @@ -1986,9 +1993,9 @@ Adresse: %4 <translation>Vis</translation> </message> <message> - <location line="+11"/> + <location line="+14"/> <source>Remove the selected entries from the list</source> - <translation>Fjern den valgte oppføringen fra listen</translation> + <translation>Fjern de valgte oppføringene fra listen</translation> </message> <message> <location line="+3"/> @@ -1996,7 +2003,7 @@ Adresse: %4 <translation>Fjern</translation> </message> <message> - <location filename="../receivecoinsdialog.cpp" line="+38"/> + <location filename="../receivecoinsdialog.cpp" line="+39"/> <source>Copy label</source> <translation>Kopier merkelapp</translation> </message> @@ -2008,7 +2015,7 @@ Adresse: %4 <message> <location line="+1"/> <source>Copy amount</source> - <translation>Kopiér beløp</translation> + <translation>Kopier beløp</translation> </message> </context> <context> @@ -2016,7 +2023,7 @@ Adresse: %4 <message> <location filename="../forms/receiverequestdialog.ui" line="+29"/> <source>QR Code</source> - <translation>QR Kode</translation> + <translation>QR-kode</translation> </message> <message> <location line="+46"/> @@ -2031,7 +2038,7 @@ Adresse: %4 <message> <location line="+7"/> <source>&Save Image...</source> - <translation>&Lagre bilde...</translation> + <translation>&Lagre Bilde...</translation> </message> <message> <location filename="../receiverequestdialog.cpp" line="+56"/> @@ -2071,12 +2078,12 @@ Adresse: %4 <message> <location line="+10"/> <source>Resulting URI too long, try to reduce the text for label / message.</source> - <translation>Resulterende URI for lang, prøv Ã¥ redusere teksten for merkelapp / melding.</translation> + <translation>Resultat URI for lang, prøv Ã¥ redusere teksten for merkelapp / melding.</translation> </message> <message> <location line="+5"/> <source>Error encoding URI into QR Code.</source> - <translation>Feil ved koding av URI i QR kode.</translation> + <translation>Feil ved koding av URI til QR-kode.</translation> </message> </context> <context> @@ -2114,7 +2121,7 @@ Adresse: %4 <message> <location line="+8"/> <source>(no amount)</source> - <translation>(inget beløp)</translation> + <translation>(intet beløp)</translation> </message> </context> <context> @@ -2129,7 +2136,7 @@ Adresse: %4 <message> <location line="+76"/> <source>Coin Control Features</source> - <translation>Mynt Kontroll Funksjoner</translation> + <translation>Myntkontroll Funksjoner</translation> </message> <message> <location line="+20"/> @@ -2169,47 +2176,47 @@ Adresse: %4 <message> <location line="+48"/> <source>Fee:</source> - <translation>Avgift:</translation> + <translation>Gebyr:</translation> </message> <message> <location line="+32"/> <source>Low Output:</source> - <translation>Lav Utdata:</translation> + <translation>Svak Utdata:</translation> </message> <message> <location line="+48"/> <source>After Fee:</source> - <translation>Etter Avgift:</translation> + <translation>Etter Gebyr:</translation> </message> <message> <location line="+32"/> <source>Change:</source> - <translation>Endring:</translation> + <translation>Veksel:</translation> </message> <message> <location line="+44"/> <source>If this is activated, but the change address is empty or invalid, change will be sent to a newly generated address.</source> - <translation type="unfinished"/> + <translation>Hvis dette er aktivert, men adressen for veksel er tom eller ugyldig, vil veksel bli sendt til en nylig generert adresse.</translation> </message> <message> <location line="+3"/> <source>Custom change address</source> - <translation type="unfinished"/> + <translation>Egendefinert adresse for veksel</translation> </message> <message> <location line="+164"/> <source>Send to multiple recipients at once</source> - <translation>Send til flere enn én mottaker</translation> + <translation>Send til flere enn en mottaker</translation> </message> <message> <location line="+3"/> <source>Add &Recipient</source> - <translation>&Legg til Mottaker</translation> + <translation>Legg til &Mottaker</translation> </message> <message> <location line="-23"/> <source>Clear all fields of the form.</source> - <translation>Fjern alle felter fra formen.</translation> + <translation>Fjern alle felter fra skjemaet.</translation> </message> <message> <location line="+3"/> @@ -2217,12 +2224,12 @@ Adresse: %4 <translation>Fjern &Alt</translation> </message> <message> - <location line="+52"/> + <location line="+58"/> <source>Balance:</source> <translation>Saldo:</translation> </message> <message> - <location line="-78"/> + <location line="-84"/> <source>Confirm the send action</source> <translation>Bekreft sending</translation> </message> @@ -2252,7 +2259,7 @@ Adresse: %4 <message> <location line="+1"/> <source>Copy amount</source> - <translation>Kopiér beløp</translation> + <translation>Kopier beløp</translation> </message> <message> <location line="+1"/> @@ -2262,32 +2269,32 @@ Adresse: %4 <message> <location line="+1"/> <source>Copy after fee</source> - <translation type="unfinished"/> + <translation>Kopier fra gebyr</translation> </message> <message> <location line="+1"/> <source>Copy bytes</source> - <translation type="unfinished"/> + <translation>Kopier bytes</translation> </message> <message> <location line="+1"/> <source>Copy priority</source> - <translation type="unfinished"/> + <translation>Kopier prioritet</translation> </message> <message> <location line="+1"/> <source>Copy low output</source> - <translation type="unfinished"/> + <translation>Kopier svake utdata</translation> </message> <message> <location line="+1"/> <source>Copy change</source> - <translation type="unfinished"/> + <translation>Kopier veksel</translation> </message> <message> <location line="+170"/> <source>Total Amount %1 (= %2)</source> - <translation>Total Mengde %1 (= %2)</translation> + <translation>Totalt Beløp %1 (= %2)</translation> </message> <message> <location line="+2"/> @@ -2302,7 +2309,7 @@ Adresse: %4 <message> <location line="+3"/> <source>The amount to pay must be larger than 0.</source> - <translation>Beløpen som skal betales mÃ¥ være over 0.</translation> + <translation>Beløpet som skal betales mÃ¥ være over 0.</translation> </message> <message> <location line="+3"/> @@ -2317,7 +2324,7 @@ Adresse: %4 <message> <location line="+3"/> <source>Duplicate address found, can only send to each address once per send operation.</source> - <translation>Duplikate adresser funnet. Kan bare sende én gang til hver adresse per operasjon.</translation> + <translation>Doble antall adresser funnet. Kan bare sende en gang til hver adresse per operasjon.</translation> </message> <message> <location line="+3"/> @@ -2327,12 +2334,12 @@ Adresse: %4 <message> <location line="+4"/> <source>The transaction was rejected! This might happen if some of the coins in your wallet were already spent, such as if you used a copy of wallet.dat and coins were spent in the copy but not marked as spent here.</source> - <translation>Transaksjonen ble avvist. Dette kan skje hvis noen av myntene i lommeboken allerede er brukt, f.eks. hvis du kopierte wallet.dat og mynter ble brukt i kopien uten Ã¥ bli markert som brukt her.</translation> + <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> <location line="+113"/> <source>Warning: Invalid Bitcoin address</source> - <translation>Advarsel: Ugyldig Bitcoin adresse</translation> + <translation>Advarsel: Ugyldig Bitcoin-adresse</translation> </message> <message> <location line="+20"/> @@ -2342,7 +2349,7 @@ Adresse: %4 <message> <location line="-11"/> <source>Warning: Unknown change address</source> - <translation>Advarsel: Ukjent adresse for vekslepenger</translation> + <translation>Advarsel: Ukjent adresse for veksel</translation> </message> <message> <location line="-367"/> @@ -2444,7 +2451,7 @@ Adresse: %4 <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> - <translation type="unfinished"/> + <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> <location line="+426"/> @@ -2469,7 +2476,7 @@ Adresse: %4 <message> <location filename="../utilitydialog.cpp" line="+48"/> <source>Bitcoin Core is shutting down...</source> - <translation type="unfinished"/> + <translation>Bitcoin Core lukker...</translation> </message> <message> <location line="+1"/> @@ -2482,17 +2489,17 @@ Adresse: %4 <message> <location filename="../forms/signverifymessagedialog.ui" line="+14"/> <source>Signatures - Sign / Verify a Message</source> - <translation>Signaturer - Signer / Verifiser en melding</translation> + <translation>Signaturer - Signer / Verifiser en Melding</translation> </message> <message> <location line="+10"/> <source>&Sign Message</source> - <translation>&Signér Melding</translation> + <translation>&Signer Melding</translation> </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>Du kan signere meldinger med dine adresser for Ã¥ bevise at du eier dem. Ikke signér vage meldinger da phishing-angrep kan prøve Ã¥ lure deg til Ã¥ signere din identitet over til andre. Signér kun fullt detaljerte utsagn som du er enig i.</translation> + <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> <location line="+18"/> @@ -2544,7 +2551,7 @@ Adresse: %4 <message> <location line="+3"/> <source>Sign &Message</source> - <translation>Signér &Melding</translation> + <translation>Signer &Melding</translation> </message> <message> <location line="+14"/> @@ -2580,7 +2587,7 @@ Adresse: %4 <message> <location line="+3"/> <source>Verify &Message</source> - <translation>&Verifiser Melding</translation> + <translation>Verifiser &Melding</translation> </message> <message> <location line="+14"/> @@ -2590,7 +2597,7 @@ Adresse: %4 <message> <location filename="../signverifymessagedialog.cpp" line="+30"/> <source>Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source> - <translation>Skriv inn en Bitcoin adresse (f.eks. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation> + <translation>Skriv inn en Bitcoin-adresse (f.eks. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation> </message> <message> <location line="-1"/> @@ -2669,7 +2676,7 @@ Adresse: %4 <message> <location filename="../splashscreen.cpp" line="+28"/> <source>Bitcoin Core</source> - <translation>Bitcoin Kjerne</translation> + <translation>Bitcoin Core</translation> </message> <message> <location line="+2"/> @@ -2700,7 +2707,7 @@ Adresse: %4 <message> <location line="+6"/> <source>conflicted</source> - <translation type="unfinished"/> + <translation>konflikt</translation> </message> <message> <location line="+2"/> @@ -2827,7 +2834,7 @@ Adresse: %4 <message> <location line="+7"/> <source>Generated coins must mature %1 blocks before they can be spent. When you generated this block, it was broadcast to the network to be added to the block chain. If it fails to get into the chain, its state will change to "not accepted" and it won't be spendable. This may occasionally happen if another node generates a block within a few seconds of yours.</source> - <translation type="unfinished"/> + <translation>Genererte bitcoins mÃ¥ modnes %1 blokker før de kan brukes. Da du genererte denne blokken ble den kringkastet pÃ¥ nettverket for Ã¥ bli lagt til i kjeden av blokker. Hvis den ikke kommer med i kjeden vil den endre seg til "ikke akseptert" og pengene vil ikke kunne brukes. Dette vil noen ganger skje hvis en annen node genererer en blokk noen sekunder i tid fra din egen.</translation> </message> <message> <location line="+8"/> @@ -2862,7 +2869,7 @@ Adresse: %4 <message> <location line="-232"/> <source>, has not been successfully broadcast yet</source> - <translation>, har ikke blitt kringkastet uten problemer enda.</translation> + <translation>, har ikke blitt kringkastet med hell enda</translation> </message> <message numerus="yes"> <location line="-37"/> @@ -2913,7 +2920,7 @@ Adresse: %4 <message> <location line="+78"/> <source>Immature (%1 confirmations, will be available after %2)</source> - <translation type="unfinished"/> + <translation>Umoden (%1 bekreftelser, vil være tilgjengelig etter %2)</translation> </message> <message numerus="yes"> <location line="-21"/> @@ -2943,22 +2950,22 @@ Adresse: %4 <message> <location line="-21"/> <source>Offline</source> - <translation type="unfinished"/> + <translation>Frakoblet</translation> </message> <message> <location line="+3"/> <source>Unconfirmed</source> - <translation type="unfinished"/> + <translation>Ubekreftet</translation> </message> <message> <location line="+3"/> <source>Confirming (%1 of %2 recommended confirmations)</source> - <translation type="unfinished"/> + <translation>Bekrefter (%1 av %2 anbefalte bekreftelser)</translation> </message> <message> <location line="+6"/> <source>Conflicted</source> - <translation type="unfinished"/> + <translation>Konflikt</translation> </message> <message> <location line="+51"/> @@ -3008,7 +3015,7 @@ Adresse: %4 <message> <location line="+2"/> <source>Destination address of transaction.</source> - <translation>Mottaksadresse for transaksjonen</translation> + <translation>Mottaksadresse for transaksjonen.</translation> </message> <message> <location line="+2"/> @@ -3102,7 +3109,7 @@ Adresse: %4 <message> <location line="+1"/> <source>Copy amount</source> - <translation>Kopiér beløp</translation> + <translation>Kopier beløp</translation> </message> <message> <location line="+1"/> @@ -3120,7 +3127,7 @@ Adresse: %4 <translation>Vis transaksjonsdetaljer</translation> </message> <message> - <location line="+142"/> + <location line="+140"/> <source>Export Transaction History</source> <translation>Eksporter Transaksjonshistorikk</translation> </message> @@ -3216,7 +3223,7 @@ Adresse: %4 <message> <location filename="../walletview.cpp" line="+43"/> <source>&Export</source> - <translation>&Eksporter...</translation> + <translation>&Eksporter</translation> </message> <message> <location line="+1"/> @@ -3226,7 +3233,7 @@ Adresse: %4 <message> <location line="+181"/> <source>Backup Wallet</source> - <translation>Sikkerhetskopier lommebok</translation> + <translation>Sikkerhetskopier Lommebok</translation> </message> <message> <location line="+1"/> @@ -3236,7 +3243,7 @@ Adresse: %4 <message> <location line="+6"/> <source>Backup Failed</source> - <translation>Sikkerhetskopiering feilet</translation> + <translation>Sikkerhetskopiering Feilet</translation> </message> <message> <location line="+0"/> @@ -3251,13 +3258,13 @@ Adresse: %4 <message> <location line="+0"/> <source>Backup Successful</source> - <translation>Sikkerhetskopiering fullført</translation> + <translation>Sikkerhetskopiering Fullført</translation> </message> </context> <context> <name>bitcoin-core</name> <message> - <location filename="../bitcoinstrings.cpp" line="+223"/> + <location filename="../bitcoinstrings.cpp" line="+226"/> <source>Usage:</source> <translation>Bruk:</translation> </message> @@ -3292,14 +3299,9 @@ Adresse: %4 <translation>Angi mappe for datafiler</translation> </message> <message> - <location line="-9"/> - <source>Set database cache size in megabytes (default: 25)</source> - <translation>Sett størrelse pÃ¥ mellomlager for database i megabytes (standardverdi: 25)</translation> - </message> - <message> - <location line="-26"/> + <location line="-35"/> <source>Listen for connections on <port> (default: 8333 or testnet: 18333)</source> - <translation>Lytt etter tilkoblinger pÃ¥ <port> (standardverdi: 8333 eller testnet: 18333)</translation> + <translation>Lytt etter tilkoblinger pÃ¥ <port> (standardverdi: 8333 eller testnett: 18333)</translation> </message> <message> <location line="+5"/> @@ -3322,22 +3324,22 @@ Adresse: %4 <translation>Grenseverdi for Ã¥ koble fra noder med dÃ¥rlig oppførsel (standardverdi: 100)</translation> </message> <message> - <location line="-150"/> + <location line="-151"/> <source>Number of seconds to keep misbehaving peers from reconnecting (default: 86400)</source> <translation>Antall sekunder noder med dÃ¥rlig oppførsel hindres fra Ã¥ koble til pÃ¥ nytt (standardverdi: 86400)</translation> </message> <message> - <location line="-36"/> + <location line="-38"/> <source>An error occurred while setting up the RPC port %u for listening on IPv4: %s</source> - <translation>En feil oppstod ved opprettelse av RPC port %u for lytting: %s</translation> + <translation>En feil oppstod ved opprettelse av RPC-port %u for IPv4: %s</translation> </message> <message> - <location line="+34"/> + <location line="+36"/> <source>Listen for JSON-RPC connections on <port> (default: 8332 or testnet: 18332)</source> - <translation>Lytt etter JSON-RPC tilkoblinger pÃ¥ <port> (standardverdi: 8332 or testnet: 18332)</translation> + <translation>Lytt etter JSON-RPC tilkoblinger pÃ¥ <port> (standardverdi: 8332 eller testnett: 18332)</translation> </message> <message> - <location line="+45"/> + <location line="+46"/> <source>Accept command line and JSON-RPC commands</source> <translation>Ta imot kommandolinje- og JSON-RPC-kommandoer</translation> </message> @@ -3357,7 +3359,7 @@ Adresse: %4 <translation>Ta imot tilkoblinger fra utsiden (standardverdi: 1 hvis uten -proxy eller -connect)</translation> </message> <message> - <location line="-95"/> + <location line="-98"/> <source>%s, you must set a rpcpassword in the configuration file: %s It is recommended you use the following random password: @@ -3378,7 +3380,7 @@ rpcpassord=%s 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> +For eksempel: varselmelding=echo %%s | mail -s "Bitcoin Varsel" admin@foo.com</translation> </message> <message> <location line="+12"/> @@ -3388,7 +3390,7 @@ For eksempel: varselmelding=echo %%s | mail -s "Bitcoin varsel" admin@ <message> <location line="+5"/> <source>An error occurred while setting up the RPC port %u for listening on IPv6, falling back to IPv4: %s</source> - <translation>En feil oppstod under oppsettet av RPC port %u for IPv6, tilbakestilles til IPv4: %s</translation> + <translation>En feil oppstod under oppsettet av RPC-port %u for IPv6, tilbakestilles til IPv4: %s</translation> </message> <message> <location line="+3"/> @@ -3396,42 +3398,47 @@ For eksempel: varselmelding=echo %%s | mail -s "Bitcoin varsel" admin@ <translation>Bind til angitt adresse. Bruk [vertsmaskin]:port notasjon for IPv6</translation> </message> <message> - <location line="+3"/> - <source>Cannot obtain a lock on data directory %s. Bitcoin is probably already running.</source> - <translation>Kan ikke skaffe lÃ¥s pÃ¥ denne datamappen %s. Bitcoin kjører sansynlig alerede.</translation> - </message> - <message> - <location line="+3"/> + <location line="+6"/> <source>Enter regression test mode, which uses a special chain in which blocks can be solved instantly. This is intended for regression testing tools and app development.</source> - <translation type="unfinished"/> + <translation>GÃ¥ til modus for regresjonstesting, som bruker en spesiell blokkjede der blokker kan bli løst momentant. Dette er tenkt til verktøy for regresjonstesting og apputvikling.</translation> </message> <message> <location line="+4"/> <source>Enter regression test mode, which uses a special chain in which blocks can be solved instantly.</source> - <translation type="unfinished"/> + <translation>GÃ¥ til modus for regresjonstesting, som bruker en spesiell blokkjede der blokker kan bli løst momentant.</translation> </message> <message> <location line="+3"/> + <source>Error: Listening for incoming connections failed (listen returned error %d)</source> + <translation>Feil: Lytting etter innkommende tilkoblinger feilet (lytting returnerte feil %d)</translation> + </message> + <message> + <location line="+2"/> <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 alerede er blit brukt, som om du brukte en kopi av wallet.dat og myntene ble brukt i kopien, men ikke markert som brukt her.</translation> + <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> <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>Feil: Denne transaksjonen trenger en gebyr pÃ¥ minst %s pÃ¥ grunn av beløpet, kompleksiteten, eller bruk av allerede mottatte penger.</translation> + <translation>Feil: Denne transaksjonen trenger en gebyr pÃ¥ minst %s pÃ¥ grunn av beløpet, kompleksiteten eller bruk av allerede mottatte penger!</translation> </message> <message> <location line="+6"/> <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 cmd er erstattet med TxID)</translation> + <translation>Kjør kommando nÃ¥r en lommeboktransaksjon endres (%s i kommando er erstattet med TxID)</translation> </message> <message> <location line="+18"/> <source>This is a pre-release test build - use at your own risk - do not use for mining or merchant applications</source> - <translation>Dette er en forhÃ¥nds-sluppet test versjon - bruk pÃ¥ egen risiko - ikke for bruk av "Mining" (utvinning) eller markedsføring applikasjoner.</translation> + <translation>Dette er en forhÃ¥ndssluppet testversjon - bruk pÃ¥ egen risiko - ikke for bruk til blokkutvinning eller bedriftsapplikasjoner</translation> </message> <message> - <location line="+5"/> + <location line="+3"/> + <source>Unable to bind to %s on this computer. Bitcoin Core is probably already running.</source> + <translation>Ute av stand til Ã¥ binde til %s pÃ¥ denne datamaskinen. Bitcoin Core kjører sannsynligvis allerede.</translation> + </message> + <message> + <location line="+3"/> <source>Use separate SOCKS5 proxy to reach peers via Tor hidden services (default: -proxy)</source> <translation>Bruk separate SOCKS5 proxyer for Ã¥ nÃ¥ noder via Tor skjulte tjenester (standardverdi: -proxy)</translation> </message> @@ -3448,17 +3455,17 @@ For eksempel: varselmelding=echo %%s | mail -s "Bitcoin varsel" admin@ <message> <location line="+3"/> <source>Warning: The network does not appear to fully agree! Some miners appear to be experiencing issues.</source> - <translation>Advarsel: Nettverket ser ikke ut til Ã¥ vær enig! Noen minere ser ut til Ã¥ ha problemer.</translation> + <translation>Advarsel: Nettverket ser ikke ut til Ã¥ være enig! Noen minere ser ut til Ã¥ ha problemer.</translation> </message> <message> <location line="+3"/> <source>Warning: We do not appear to fully agree with our peers! You may need to upgrade, or other nodes may need to upgrade.</source> - <translation>Advarsel: Vi ser ikke ut til Ã¥ være enige med vÃ¥re noder! Du mÃ¥ oppgradere, eller andre nodes mÃ¥ oppgradere.</translation> + <translation>Advarsel: Vi ser ikke ut til Ã¥ være enige med vÃ¥re noder! Du mÃ¥ oppgradere, eller andre noder mÃ¥ oppgradere.</translation> </message> <message> <location line="+3"/> <source>Warning: error reading wallet.dat! All keys read correctly, but transaction data or address book entries might be missing or incorrect.</source> - <translation>Advarsel: Feil ved lesing av wallet.dat! Alle taster lest riktig, men transaksjon dataene eller adresse innlegg er kanskje manglende eller feil.</translation> + <translation>Advarsel: Feil ved lesing av wallet.dat! Alle nøkler lest riktig, men transaksjonsdataene eller oppføringer i adresseboken mangler kanskje eller er feil.</translation> </message> <message> <location line="+3"/> @@ -3478,7 +3485,7 @@ For eksempel: varselmelding=echo %%s | mail -s "Bitcoin varsel" admin@ <message> <location line="+1"/> <source>Bitcoin Core Daemon</source> - <translation type="unfinished"/> + <translation>Bitcoin Core Daemon</translation> </message> <message> <location line="+1"/> @@ -3493,7 +3500,7 @@ For eksempel: varselmelding=echo %%s | mail -s "Bitcoin varsel" admin@ <message> <location line="+5"/> <source>Clear list of wallet transactions (diagnostic tool; implies -rescan)</source> - <translation type="unfinished"/> + <translation>Tøm listen over transaksjoner i lommeboken (diagnoseverktøy; impliserer -rescan)</translation> </message> <message> <location line="+1"/> @@ -3523,7 +3530,7 @@ For eksempel: varselmelding=echo %%s | mail -s "Bitcoin varsel" admin@ <message> <location line="+1"/> <source>Do not load the wallet and disable wallet RPC calls</source> - <translation type="unfinished"/> + <translation>Ikke last inn lommeboken og deaktiver RPC-kall</translation> </message> <message> <location line="+1"/> @@ -3538,7 +3545,7 @@ For eksempel: varselmelding=echo %%s | mail -s "Bitcoin varsel" admin@ <message> <location line="+1"/> <source>Error initializing wallet database environment %s!</source> - <translation>Feil under oppstart av lommebokdatabasemiljø %s!</translation> + <translation>Feil under oppstart av lommeboken sitt databasemiljø %s!</translation> </message> <message> <location line="+1"/> @@ -3553,7 +3560,7 @@ For eksempel: varselmelding=echo %%s | mail -s "Bitcoin varsel" admin@ <message> <location line="+2"/> <source>Error: Disk space is low!</source> - <translation>Feil: lite ledig lagringsplass!</translation> + <translation>Feil: Lite ledig lagringsplass!</translation> </message> <message> <location line="+1"/> @@ -3608,7 +3615,7 @@ For eksempel: varselmelding=echo %%s | mail -s "Bitcoin varsel" admin@ <message> <location line="+1"/> <source>Failed to write to coin database</source> - <translation>Feil ved skriving av bitcoin database</translation> + <translation>Feil ved skriving til bitcoin sin database</translation> </message> <message> <location line="+1"/> @@ -3618,7 +3625,7 @@ For eksempel: varselmelding=echo %%s | mail -s "Bitcoin varsel" admin@ <message> <location line="+1"/> <source>Failed to write undo data</source> - <translation>Feil ved skriving av angre-data</translation> + <translation>Feil ved skriving av angredata</translation> </message> <message> <location line="+1"/> @@ -3628,12 +3635,12 @@ For eksempel: varselmelding=echo %%s | mail -s "Bitcoin varsel" admin@ <message> <location line="+1"/> <source>Find peers using DNS lookup (default: 1 unless -connect)</source> - <translation>Finn andre noder gjennom DNS-oppslag (standardverdi: 1 med mindre -connect er oppgit)</translation> + <translation>Finn andre noder gjennom DNS-oppslag (standardverdi: 1 med mindre -connect er oppgitt)</translation> </message> <message> <location line="+1"/> <source>Generate coins (default: 0)</source> - <translation>Generér bitcoins (standardverdi: 0)</translation> + <translation>Generer bitcoins (standardverdi: 0)</translation> </message> <message> <location line="+2"/> @@ -3648,12 +3655,12 @@ For eksempel: varselmelding=echo %%s | mail -s "Bitcoin varsel" admin@ <message> <location line="+1"/> <source>If <category> is not supplied, output all debugging information.</source> - <translation type="unfinished"/> + <translation>Hvis <category> ikke er oppgitt, ta ut all informasjon om feilsøking.</translation> </message> <message> <location line="+2"/> <source>Incorrect or no genesis block found. Wrong datadir for network?</source> - <translation>Ugyldig eller ingen skaperblokk funnet. Feil datadir for nettverk?</translation> + <translation>Ugyldig eller ingen skaperblokk funnet. Feil datamappe for nettverk?</translation> </message> <message> <location line="+3"/> @@ -3668,57 +3675,62 @@ For eksempel: varselmelding=echo %%s | mail -s "Bitcoin varsel" admin@ <message> <location line="+5"/> <source>Prepend debug output with timestamp (default: 1)</source> - <translation type="unfinished"/> + <translation>Sett inn tidsstempel i front av feilsøkingsdata (standardverdi: 1)</translation> </message> <message> <location line="+1"/> <source>RPC client options:</source> - <translation>RPC klient innstillinger:</translation> + <translation>Innstillinger for RPC-klient:</translation> </message> <message> <location line="+1"/> <source>Rebuild block chain index from current blk000??.dat files</source> - <translation>Gjenopprett blokkjedeindex fra blk000??.dat filer</translation> + <translation>Gjenopprett blokkjedeindeks fra blk000??.dat filer</translation> </message> <message> <location line="+5"/> <source>Select SOCKS version for -proxy (4 or 5, default: 5)</source> - <translation>Velg versjon av SOCKS proxy (4 eller 5, standardverdi: 5)</translation> + <translation>Velg versjon av SOCKS -proxy (4 eller 5, standardverdi: 5)</translation> </message> <message> <location line="+1"/> <source>Send command to Bitcoin server</source> - <translation>Send kommando til Bitcoin tjener</translation> + <translation>Send kommando til Bitcoin-tjener</translation> </message> <message> - <location line="+7"/> + <location line="+5"/> + <source>Set database cache size in megabytes (%d to %d, default: %d)</source> + <translation>Sett databasen sin størrelse pÃ¥ hurtigbufferen i megabytes (%d til %d, standardverdi: %d)</translation> + </message> + <message> + <location line="+2"/> <source>Set maximum block size in bytes (default: %d)</source> <translation>Sett maks blokkstørrelse i bytes (standardverdi: %d)</translation> </message> <message> <location line="+2"/> <source>Set the number of threads to service RPC calls (default: 4)</source> - <translation>Sett nummer av trÃ¥der til betjening av RPC kall (standardverdi: 4)</translation> + <translation>Sett nummer av trÃ¥der til betjening av RPC-kall (standardverdi: 4)</translation> </message> <message> <location line="+7"/> <source>Specify wallet file (within data directory)</source> - <translation>Angi lommebok fil (inne i data mappe)</translation> + <translation>Angi lommebokfil (inne i datamappe)</translation> </message> <message> <location line="+2"/> <source>Spend unconfirmed change when sending transactions (default: 1)</source> - <translation type="unfinished"/> + <translation>Bruk ubekreftet veksel ved sending av transaksjoner (standardverdi: 1)</translation> </message> <message> <location line="+1"/> <source>Start Bitcoin server</source> - <translation>Start Bitcoin tjener</translation> + <translation>Start Bitcoin-tjener</translation> </message> <message> <location line="+3"/> <source>This is intended for regression testing tools and app development.</source> - <translation type="unfinished"/> + <translation>Dette er tiltenkt verktøy for regresjonstesting og apputvikling.</translation> </message> <message> <location line="+10"/> @@ -3738,12 +3750,12 @@ For eksempel: varselmelding=echo %%s | mail -s "Bitcoin varsel" admin@ <message> <location line="+1"/> <source>Wait for RPC server to start</source> - <translation>Vent pÃ¥ start av RPV tjeneren</translation> + <translation>Vent pÃ¥ start av RPC-tjeneren</translation> </message> <message> <location line="+1"/> <source>Wallet %s resides outside data directory %s</source> - <translation>Lommebok %s befinner seg utenfor data mappe %s</translation> + <translation>Lommebok %s befinner seg utenfor datamappe %s</translation> </message> <message> <location line="+2"/> @@ -3753,7 +3765,7 @@ For eksempel: varselmelding=echo %%s | mail -s "Bitcoin varsel" admin@ <message> <location line="+2"/> <source>Warning: Deprecated argument -debugnet ignored, use -debug=net</source> - <translation type="unfinished"/> + <translation>Advarsel: Utløpt argument -debugnet ignorert, bruk -debug=net</translation> </message> <message> <location line="+2"/> @@ -3763,42 +3775,47 @@ For eksempel: varselmelding=echo %%s | mail -s "Bitcoin varsel" admin@ <message> <location line="-80"/> <source>Imports blocks from external blk000??.dat file</source> - <translation>Importerer blokker fra ekstern blk000?.dat fil</translation> + <translation>Importerer blokker fra ekstern fil blk000??.dat</translation> </message> <message> - <location line="-106"/> + <location line="-126"/> + <source>Cannot obtain a lock on data directory %s. Bitcoin Core is probably already running.</source> + <translation>Ute av stand til Ã¥ lÃ¥se datamappen %s. Bitcoin Core kjører sannsynligvis allerede.</translation> + </message> + <message> + <location line="+19"/> <source>Execute command when a relevant alert is received or we see a really long fork (%s in cmd is replaced by message)</source> - <translation type="unfinished"/> + <translation>Utfør kommando nÃ¥r et relevant varsel er mottatt eller vi ser en veldig lang gaffel (%s i kommando er erstattet med melding)</translation> </message> <message> <location line="+14"/> <source>Output debugging information (default: 0, supplying <category> is optional)</source> - <translation type="unfinished"/> + <translation>Ta ut feilsøkingsinformasjon (standardverdi: 0, bruk av <category> er valgfritt)</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>Sett maksimum størrelse for transaksjoner med høy prioritet / lavt gebyr, i bytes (standardverdi: %d)</translation> </message> <message> <location line="+2"/> <source>Set the number of script verification threads (up to 16, 0 = auto, <0 = leave that many cores free, default: 0)</source> - <translation type="unfinished"/> + <translation>Sett antall script verifikasjonstrÃ¥der (opp til 16, 0 = automatisk, <0 = la sÃ¥ mange kjerner være ledig, standardvalg: 0)</translation> </message> <message> - <location line="+90"/> + <location line="+91"/> <source>Information</source> <translation>Informasjon</translation> </message> <message> <location line="+4"/> <source>Invalid amount for -minrelaytxfee=<amount>: '%s'</source> - <translation>Ugyldig mengde for -minrelaytxfee=<amount>: '%s'</translation> + <translation>Ugyldig mengde for -minrelaytxfee=<beløp>: '%s'</translation> </message> <message> <location line="+1"/> <source>Invalid amount for -mintxfee=<amount>: '%s'</source> - <translation>Ugyldig mengde for -mintxfee=<amount>: '%s'</translation> + <translation>Ugyldig mengde for -mintxfee=<beløp>: '%s'</translation> </message> <message> <location line="+8"/> @@ -3833,7 +3850,7 @@ For eksempel: varselmelding=echo %%s | mail -s "Bitcoin varsel" admin@ <message> <location line="+4"/> <source>Send trace/debug info to console instead of debug.log file</source> - <translation>Send spor/debug informasjon til konsollet istedenfor debug.log filen</translation> + <translation>Send spor-/feilsøkingsinformasjon til konsollen istedenfor filen debug.log</translation> </message> <message> <location line="+6"/> @@ -3843,7 +3860,7 @@ For eksempel: varselmelding=echo %%s | mail -s "Bitcoin varsel" admin@ <message> <location line="+2"/> <source>Shrink debug.log file on client startup (default: 1 when no -debug)</source> - <translation>Krymp debug.log filen nÃ¥r klienten starter (standardverdi: 1 hvis uten -debug)</translation> + <translation>Krymp filen debug.log nÃ¥r klienten starter (standardverdi: 1 hvis uten -debug)</translation> </message> <message> <location line="+1"/> @@ -3868,7 +3885,7 @@ For eksempel: varselmelding=echo %%s | mail -s "Bitcoin varsel" admin@ <message> <location line="+1"/> <source>Transaction amounts must be positive</source> - <translation>Transaksjonsmengden mÃ¥ være positiv</translation> + <translation>Transaksjonsbeløpet mÃ¥ være positivt</translation> </message> <message> <location line="+1"/> @@ -3903,7 +3920,7 @@ For eksempel: varselmelding=echo %%s | mail -s "Bitcoin varsel" admin@ <message> <location line="+2"/> <source>Zapping all transactions from wallet...</source> - <translation type="unfinished"/> + <translation>Zapper alle transaksjoner fra lommeboken...</translation> </message> <message> <location line="+1"/> @@ -3931,24 +3948,24 @@ For eksempel: varselmelding=echo %%s | mail -s "Bitcoin varsel" admin@ <translation>Send kommandoer til node pÃ¥ <ip> (standardverdi: 127.0.0.1)</translation> </message> <message> - <location line="-133"/> + <location line="-134"/> <source>Execute command when the best block changes (%s in cmd is replaced by block hash)</source> - <translation>Eksekvér kommando nÃ¥r beste blokk endrer seg (%s i kommandoen erstattes med blokkens hash)</translation> + <translation>Utfør kommando nÃ¥r beste blokk endrer seg (%s i kommandoen erstattes med blokkens hash)</translation> </message> <message> - <location line="+163"/> + <location line="+164"/> <source>Upgrade wallet to latest format</source> - <translation>Oppgradér lommebok til nyeste format</translation> + <translation>Oppgrader lommebok til nyeste format</translation> </message> <message> <location line="-25"/> <source>Set key pool size to <n> (default: 100)</source> - <translation>Angi størrelse pÃ¥ nøkkel-lager til <n> (standardverdi: 100)</translation> + <translation>Angi størrelsen pÃ¥ nøkkellageret til <n> (standardverdi: 100)</translation> </message> <message> <location line="-11"/> <source>Rescan the block chain for missing wallet transactions</source> - <translation>Se gjennom blokk-kjeden etter manglende lommeboktransaksjoner</translation> + <translation>Se gjennom blokkjeden etter manglende lommeboktransaksjoner</translation> </message> <message> <location line="+39"/> @@ -3978,7 +3995,7 @@ For eksempel: varselmelding=echo %%s | mail -s "Bitcoin varsel" admin@ <message> <location line="-109"/> <source>Allow DNS lookups for -addnode, -seednode and -connect</source> - <translation>Tillat DNS oppslag for -addnode, -seednode og -connect</translation> + <translation>Tillat oppslag i DNS for -addnode, -seednode og -connect</translation> </message> <message> <location line="+61"/> @@ -4018,7 +4035,7 @@ For eksempel: varselmelding=echo %%s | mail -s "Bitcoin varsel" admin@ <message> <location line="-1"/> <source>Unknown -socks proxy version requested: %i</source> - <translation>Ukjent -socks proxy versjon angitt: %i</translation> + <translation>Ukjent -socks proxyversjon angitt: %i</translation> </message> <message> <location line="-103"/> @@ -4056,12 +4073,7 @@ For eksempel: varselmelding=echo %%s | mail -s "Bitcoin varsel" admin@ <translation>Legg til node for tilkobling og hold forbindelsen Ã¥pen</translation> </message> <message> - <location line="-32"/> - <source>Unable to bind to %s on this computer. Bitcoin is probably already running.</source> - <translation>Kan ikke binde til %s pÃ¥ denne datamaskinen. Sannsynligvis kjører Bitcoin allerede.</translation> - </message> - <message> - <location line="+96"/> + <location line="+64"/> <source>Loading wallet...</source> <translation>Laster lommebok...</translation> </message> diff --git a/src/qt/locale/bitcoin_nl.ts b/src/qt/locale/bitcoin_nl.ts index 348af62d2c..11fc596765 100644 --- a/src/qt/locale/bitcoin_nl.ts +++ b/src/qt/locale/bitcoin_nl.ts @@ -36,13 +36,19 @@ Dit product bevat software ontwikkeld door het OpenSSL Project voor gebruik in d <source>The Bitcoin Core developers</source> <translation>De Bitcoin Core ontwikkelaars</translation> </message> + <message> + <location line="+12"/> + <location line="+2"/> + <source>(%1-bit)</source> + <translation>(%1-bit)</translation> + </message> </context> <context> <name>AddressBookPage</name> <message> <location filename="../forms/addressbookpage.ui" line="+30"/> <source>Double-click to edit address or label</source> - <translation>Dubbelklik om het adres of label te wijzigen</translation> + <translation>Dubbelklik om adres of label te wijzigen</translation> </message> <message> <location line="+27"/> @@ -65,7 +71,7 @@ Dit product bevat software ontwikkeld door het OpenSSL Project voor gebruik in d <translation>&Kopieer</translation> </message> <message> - <location line="+52"/> + <location line="+58"/> <source>C&lose</source> <translation>S&luiten</translation> </message> @@ -75,7 +81,7 @@ Dit product bevat software ontwikkeld door het OpenSSL Project voor gebruik in d <translation>&Kopiëer Adres</translation> </message> <message> - <location filename="../forms/addressbookpage.ui" line="-41"/> + <location filename="../forms/addressbookpage.ui" line="-47"/> <source>Delete the currently selected address from the list</source> <translation>Verwijder het geselecteerde adres van de lijst</translation> </message> @@ -127,7 +133,7 @@ Dit product bevat software ontwikkeld door het OpenSSL Project voor gebruik in d <message> <location line="+4"/> <source>These are your Bitcoin addresses for receiving payments. It is recommended to use a new receiving address for each transaction.</source> - <translation>Dit zijn je Bitcoin adressen waar je ermee kunt betalen. We raden je aan om een nieuw ontvangstadres voor elke transactie te gebruiken.</translation> + <translation>Dit zijn uw Bitcoin-adressen waarmee u kunt betalen. We raden u aan om een nieuw ontvangstadres voor elke transactie te gebruiken.</translation> </message> <message> <location line="+7"/> @@ -157,7 +163,7 @@ Dit product bevat software ontwikkeld door het OpenSSL Project voor gebruik in d <message> <location line="+1"/> <source>There was an error trying to save the address list to %1.</source> - <translation type="unfinished"/> + <translation>Een fout is opgetreden tijdens het opslaan van deze adreslijst naar %1.</translation> </message> </context> <context> @@ -198,12 +204,12 @@ Dit product bevat software ontwikkeld door het OpenSSL Project voor gebruik in d <message> <location line="+14"/> <source>Repeat new passphrase</source> - <translation>Herhaal wachtwoord</translation> + <translation>Herhaal nieuw wachtwoord</translation> </message> <message> <location filename="../askpassphrasedialog.cpp" line="+40"/> <source>Enter the new passphrase to the wallet.<br/>Please use a passphrase of <b>10 or more random characters</b>, or <b>eight or more words</b>.</source> - <translation>Vul een nieuw wachtwoord in voor uw portemonnee. <br/> Gebruik een wachtwoord van <b>10 of meer lukrake karakters</b>, of <b> acht of meer woorden</b> . </translation> + <translation>Vul een nieuw wachtwoord in voor uw portemonnee. <br/> Gebruik een wachtwoord van <b>10 of meer lukrake karakters</b>, of <b>acht of meer woorden</b> . </translation> </message> <message> <location line="+1"/> @@ -322,7 +328,7 @@ Dit product bevat software ontwikkeld door het OpenSSL Project voor gebruik in d <context> <name>BitcoinGUI</name> <message> - <location filename="../bitcoingui.cpp" line="+295"/> + <location filename="../bitcoingui.cpp" line="+294"/> <source>Sign &message...</source> <translation>&Onderteken bericht...</translation> </message> @@ -337,12 +343,12 @@ Dit product bevat software ontwikkeld door het OpenSSL Project voor gebruik in d <translation>&Overzicht</translation> </message> <message> - <location line="-137"/> + <location line="-136"/> <source>Node</source> - <translation type="unfinished"/> + <translation>Node</translation> </message> <message> - <location line="+138"/> + <location line="+137"/> <source>Show general overview of wallet</source> <translation>Toon algemeen overzicht van de portemonnee</translation> </message> @@ -463,17 +469,17 @@ Dit product bevat software ontwikkeld door het OpenSSL Project voor gebruik in d <translation>&Verifiëer bericht...</translation> </message> <message> - <location line="+430"/> + <location line="+440"/> <source>Bitcoin</source> <translation>Bitcoin</translation> </message> <message> - <location line="-643"/> + <location line="-652"/> <source>Wallet</source> <translation>Portemonnee</translation> </message> <message> - <location line="+146"/> + <location line="+145"/> <source>&Send</source> <translation>&Versturen</translation> </message> @@ -529,18 +535,18 @@ Dit product bevat software ontwikkeld door het OpenSSL Project voor gebruik in d <translation>Tab-werkbalk</translation> </message> <message> - <location line="-284"/> - <location line="+376"/> + <location line="-283"/> + <location line="+375"/> <source>[testnet]</source> <translation>[testnetwerk]</translation> </message> <message> - <location line="-401"/> + <location line="-400"/> <source>Bitcoin Core</source> <translation>Bitcoin Kern</translation> </message> <message> - <location line="+163"/> + <location line="+162"/> <source>Request payments (generates QR codes and bitcoin: URIs)</source> <translation>Vraag betaling aan (genereert QR codes en bitcoin: URIs)</translation> </message> @@ -573,7 +579,7 @@ Dit product bevat software ontwikkeld door het OpenSSL Project voor gebruik in d <message> <location line="+1"/> <source>Show the Bitcoin Core help message to get a list with possible Bitcoin command-line options</source> - <translation type="unfinished"/> + <translation>Toon het Bitcoin Core hulpbericht om een lijst te krijgen met mogelijke Bitcoin commandoregelopties</translation> </message> <message> <location line="+159"/> @@ -602,7 +608,7 @@ Dit product bevat software ontwikkeld door het OpenSSL Project voor gebruik in d <translation>%1 blokken van transactiehistorie verwerkt.</translation> </message> <message numerus="yes"> - <location line="+23"/> + <location line="+27"/> <source>%n hour(s)</source> <translation><numerusform>%n uur</numerusform><numerusform>%n uur</numerusform></translation> </message> @@ -613,10 +619,21 @@ Dit product bevat software ontwikkeld door het OpenSSL Project voor gebruik in d </message> <message numerus="yes"> <location line="+4"/> + <location line="+6"/> <source>%n week(s)</source> <translation><numerusform>%n week</numerusform><numerusform>%n weken</numerusform></translation> </message> <message> + <location line="+0"/> + <source>%1 and %2</source> + <translation>%1 en %2</translation> + </message> + <message numerus="yes"> + <location line="+0"/> + <source>%n year(s)</source> + <translation><numerusform>%n jaar</numerusform><numerusform>%n jaar</numerusform></translation> + </message> + <message> <location line="+4"/> <source>%1 behind</source> <translation>%1 achter</translation> @@ -647,12 +664,12 @@ Dit product bevat software ontwikkeld door het OpenSSL Project voor gebruik in d <translation>Informatie</translation> </message> <message> - <location line="-85"/> + <location line="-95"/> <source>Up to date</source> <translation>Bijgewerkt</translation> </message> <message> - <location line="+34"/> + <location line="+44"/> <source>Catching up...</source> <translation>Aan het bijwerken...</translation> </message> @@ -690,7 +707,7 @@ Adres: %4 <translation>Portemonnee is <b>versleuteld</b> en momenteel <b>gesloten</b></translation> </message> <message> - <location filename="../bitcoin.cpp" line="+438"/> + <location filename="../bitcoin.cpp" line="+443"/> <source>A fatal error occurred. Bitcoin can no longer continue safely and will quit.</source> <translation>Er is een fatale fout opgetreden. Bitcoin kan niet meer veilig doorgaan en zal nu afgesloten worden.</translation> </message> @@ -698,7 +715,7 @@ Adres: %4 <context> <name>ClientModel</name> <message> - <location filename="../clientmodel.cpp" line="+119"/> + <location filename="../clientmodel.cpp" line="+128"/> <source>Network Alert</source> <translation>Netwerkwaarschuwing</translation> </message> @@ -748,10 +765,10 @@ Adres: %4 <message> <location line="+32"/> <source>Change:</source> - <translation>Wijzigen:</translation> + <translation>Wisselgeld:</translation> </message> <message> - <location line="+63"/> + <location line="+56"/> <source>(un)select all</source> <translation>(de)selecteer alles</translation> </message> @@ -766,7 +783,7 @@ Adres: %4 <translation>Lijst modus</translation> </message> <message> - <location line="+52"/> + <location line="+53"/> <source>Amount</source> <translation>Bedrag</translation> </message> @@ -796,7 +813,7 @@ Adres: %4 <translation>Prioriteit</translation> </message> <message> - <location filename="../coincontroldialog.cpp" line="+42"/> + <location filename="../coincontroldialog.cpp" line="+41"/> <source>Copy address</source> <translation>Kopieer adres</translation> </message> @@ -859,10 +876,10 @@ Adres: %4 <message> <location line="+1"/> <source>Copy change</source> - <translation>Kopieer wijzig</translation> + <translation>Kopieer wisselgeld</translation> </message> <message> - <location line="+323"/> + <location line="+332"/> <source>highest</source> <translation>hoogste</translation> </message> @@ -912,12 +929,12 @@ Adres: %4 <translation>(%1 geblokeerd)</translation> </message> <message> - <location line="+31"/> + <location line="+32"/> <source>none</source> <translation>geen</translation> </message> <message> - <location line="+140"/> + <location line="+141"/> <source>Dust</source> <translation>Stof</translation> </message> @@ -980,12 +997,12 @@ Adres: %4 </message> <message> <location line="+43"/> - <location line="+66"/> + <location line="+61"/> <source>(no label)</source> <translation>(geen label)</translation> </message> <message> - <location line="-9"/> + <location line="-7"/> <source>change from %1 (%2)</source> <translation>wijzig van %1 (%2)</translation> </message> @@ -1066,7 +1083,7 @@ Adres: %4 <context> <name>FreespaceChecker</name> <message> - <location filename="../intro.cpp" line="+65"/> + <location filename="../intro.cpp" line="+68"/> <source>A new data directory will be created.</source> <translation>Een nieuwe gegevensmap wordt aangemaakt.</translation> </message> @@ -1099,7 +1116,7 @@ Adres: %4 <translation>Bitcoin Core - Commandoregel-opties</translation> </message> <message> - <location filename="../utilitydialog.cpp" line="+38"/> + <location filename="../utilitydialog.cpp" line="+24"/> <source>Bitcoin Core</source> <translation>Bitcoin Kern</translation> </message> @@ -1124,7 +1141,7 @@ Adres: %4 <translation>gebruikersinterfaceopties</translation> </message> <message> - <location line="+1"/> + <location line="+2"/> <source>Set language, for example "de_DE" (default: system locale)</source> <translation>Stel taal in, bijvoorbeeld ''de_DE" (standaard: systeeminstellingen)</translation> </message> @@ -1135,13 +1152,18 @@ Adres: %4 </message> <message> <location line="+1"/> + <source>Set SSL root certificates for payment request (default: -system-)</source> + <translation>Zet SSL root certificaten voor betalingsverzoek (standaard: -sytem-)</translation> + </message> + <message> + <location line="+1"/> <source>Show splash screen on startup (default: 1)</source> <translation>Laat laadscherm zien bij het opstarten. (standaard: 1)</translation> </message> <message> - <location line="+1"/> + <location line="-4"/> <source>Choose data directory on startup (default: 0)</source> - <translation>Kies de gegevensmap tijdens het opstarten (default: 0)</translation> + <translation>Kies de gegevensmap tijdens het opstarten (standaard: 0)</translation> </message> </context> <context> @@ -1159,12 +1181,12 @@ Adres: %4 <message> <location line="+26"/> <source>As this is the first time the program is launched, you can choose where Bitcoin Core will store its data.</source> - <translation>Omdat dit de eerste keer is dat het programma gestart is, kan je nu kiezen waar Bitcoin Core de data moet opslaan.</translation> + <translation>Omdat dit de eerste keer is dat het programma gestart is, kunt u nu kiezen waar Bitcoin Core de data moet opslaan.</translation> </message> <message> <location line="+10"/> <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 zal een kopie van de Bitcoin blok keten downloaden en opslaan. Tenminste %1 GB aan data wordt opgeslagen in deze map en het zal groeien in de tijd. De portemonnee ook in deze map.</translation> + <translation>Bitcoin Core zal een kopie van de Bitcoin blokketen downloaden en opslaan. Tenminste %1 GB aan data wordt opgeslagen in deze map en het zal groeien in de tijd. De portemonnee wordt ook in deze map opgeslagen.</translation> </message> <message> <location line="+10"/> @@ -1177,7 +1199,7 @@ Adres: %4 <translation>Gebruik een persoonlijke gegevensmap:</translation> </message> <message> - <location filename="../intro.cpp" line="+85"/> + <location filename="../intro.cpp" line="+82"/> <source>Bitcoin</source> <translation>Bitcoin</translation> </message> @@ -1187,7 +1209,7 @@ Adres: %4 <translation>Fout: Opgegeven gegevensmap "%1" kan niet aangemaakt worden.</translation> </message> <message> - <location line="+19"/> + <location line="+24"/> <source>Error</source> <translation>Fout</translation> </message> @@ -1243,7 +1265,7 @@ Adres: %4 <translation>&Algemeen</translation> </message> <message> - <location line="+6"/> + <location line="+116"/> <source>Optional transaction fee per kB that helps make sure your transactions are processed quickly. Most transactions are 1 kB.</source> <translation>Optionele transactiekosten per kB. Transactiekosten helpen ervoor te zorgen dat uw transacties snel verwerkt worden. De meeste transacties zijn 1kB.</translation> </message> @@ -1253,7 +1275,7 @@ Adres: %4 <translation>Betaal &transactiekosten</translation> </message> <message> - <location line="+31"/> + <location line="-125"/> <source>Automatically start Bitcoin after logging in to the system.</source> <translation>Start Bitcoin automatisch na inloggen in het systeem</translation> </message> @@ -1268,34 +1290,24 @@ Adres: %4 <translation>Grootte van de &database cache</translation> </message> <message> - <location line="+13"/> - <source>Set database cache size in megabytes (default: 25)</source> - <translation>Stel databankcachegrootte in in megabytes (standaard: 25)</translation> - </message> - <message> - <location line="+13"/> + <location line="+16"/> <source>MB</source> <translation>MB</translation> </message> <message> <location line="+27"/> <source>Number of script &verification threads</source> - <translation type="unfinished"/> + <translation>Aantal threads voor &scriptverificatie</translation> </message> <message> - <location line="+13"/> - <source>Set the number of script verification threads (up to 16, 0 = auto, <0 = leave that many cores free, default: 0)</source> - <translation>Stel het aantal threads voor scriptverificatie in (max 16, 0 = auto, <0 = laat zoveel cores vrij, standaard: 0)</translation> - </message> - <message> - <location line="+58"/> + <location line="+160"/> <source>Connect to the Bitcoin network through a SOCKS proxy.</source> <translation>Verbind met het Bitcoin-netwerk via een SOCKS-proxy.</translation> </message> <message> <location line="+3"/> <source>&Connect through SOCKS proxy (default proxy):</source> - <translation type="unfinished"/> + <translation>&Verbind via een SOCKS-proxy (standaardproxy):</translation> </message> <message> <location line="+34"/> @@ -1303,9 +1315,9 @@ Adres: %4 <translation>IP-adres van de proxy (bijv. IPv4: 127.0.0.1 / IPv6: ::1)</translation> </message> <message> - <location line="+224"/> + <location line="+214"/> <source>Active command-line options that override above options:</source> - <translation type="unfinished"/> + <translation>Actieve commandoregelopties die bovenstaande opties overschrijven:</translation> </message> <message> <location line="+43"/> @@ -1318,12 +1330,42 @@ Adres: %4 <translation>&Reset Opties</translation> </message> <message> - <location line="-323"/> + <location line="-313"/> <source>&Network</source> <translation>&Netwerk</translation> </message> <message> - <location line="+6"/> + <location line="-131"/> + <source>(0 = auto, <0 = leave that many cores free)</source> + <translation>(0 = auto, <0 = laat dit aantal kernen vrij)</translation> + </message> + <message> + <location line="+36"/> + <source>W&allet</source> + <translation>W&allet</translation> + </message> + <message> + <location line="+65"/> + <source>Expert</source> + <translation>Expert</translation> + </message> + <message> + <location line="+9"/> + <source>Enable coin &control features</source> + <translation>Coin &Control activeren</translation> + </message> + <message> + <location line="+7"/> + <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>Indien het uitgeven van onbevestigd wisselgeld uitgeschakeld wordt dan kan het wisselgeld van een transactie niet worden gebruikt totdat de transactie ten minste een bevestiging heeft. Dit heeft ook invloed op de manier waarop uw saldo wordt berekend.</translation> + </message> + <message> + <location line="+3"/> + <source>&Spend unconfirmed change</source> + <translation>&Spendeer onbevestigd wisselgeld</translation> + </message> + <message> + <location line="+17"/> <source>Automatically open the Bitcoin client port on the router. This only works when your router supports UPnP and it is enabled.</source> <translation>Open de Bitcoin-poort automatisch op de router. Dit werkt alleen als de router UPnP ondersteunt en het aanstaat.</translation> </message> @@ -1418,17 +1460,12 @@ Adres: %4 <translation>Toon a&dressen in de transactielijst</translation> </message> <message> - <location line="+7"/> + <location line="-262"/> <source>Whether to show coin control features or not.</source> <translation>Munt controle functies weergeven of niet.</translation> </message> <message> - <location line="+3"/> - <source>Display coin &control features (experts only)</source> - <translation>Toon munt &controle functions (alleen voor experts)</translation> - </message> - <message> - <location line="+136"/> + <location line="+398"/> <source>&OK</source> <translation>&OK</translation> </message> @@ -1438,17 +1475,17 @@ Adres: %4 <translation>Ann&uleren</translation> </message> <message> - <location filename="../optionsdialog.cpp" line="+67"/> + <location filename="../optionsdialog.cpp" line="+72"/> <source>default</source> <translation>standaard</translation> </message> <message> - <location line="+57"/> + <location line="+58"/> <source>none</source> <translation>geen</translation> </message> <message> - <location line="+75"/> + <location line="+80"/> <source>Confirm options reset</source> <translation>Bevestig reset opties</translation> </message> @@ -1466,7 +1503,7 @@ Adres: %4 <message> <location line="+33"/> <source>This change would require a client restart.</source> - <translation type="unfinished"/> + <translation>Om dit aan te passen moet de client opnieuw gestart worden.</translation> </message> <message> <location line="+34"/> @@ -1488,19 +1525,14 @@ Adres: %4 <translation>De weergegeven informatie kan verouderd zijn. Uw portemonnee synchroniseert automaticsh met het Bitcoinnetwerk nadat een verbinding is gelegd, maar dit proces is nog niet voltooid.</translation> </message> <message> - <location line="-155"/> - <source>Unconfirmed:</source> - <translation>Onbevestigd:</translation> - </message> - <message> - <location line="-83"/> + <location line="-238"/> <source>Wallet</source> <translation>Portemonnee</translation> </message> <message> <location line="+51"/> - <source>Confirmed:</source> - <translation>Bevestigd:</translation> + <source>Available:</source> + <translation>Beschikbaar:</translation> </message> <message> <location line="+16"/> @@ -1508,7 +1540,12 @@ Adres: %4 <translation>Uw beschikbare saldo</translation> </message> <message> - <location line="+32"/> + <location line="+16"/> + <source>Pending:</source> + <translation>Afwachtend:</translation> + </message> + <message> + <location line="+16"/> <source>Total of transactions that have yet to be confirmed, and do not yet count toward the spendable balance</source> <translation>De som van de transacties die nog bevestigd moeten worden, en nog niet meetellen in uw beschikbare saldo</translation> </message> @@ -1560,7 +1597,7 @@ Adres: %4 <message> <location line="+96"/> <source>Requested payment amount of %1 is too small (considered dust).</source> - <translation>Het gevraagde betalingsbedrag van 1% is te weinig (beschouwd als stof).</translation> + <translation>Het gevraagde betalingsbedrag van %1 is te weinig (beschouwd als stof).</translation> </message> <message> <location line="-221"/> @@ -1580,27 +1617,27 @@ Adres: %4 <message> <location line="+58"/> <source>Net manager warning</source> - <translation type="unfinished"/> + <translation>Netmanager waarschuwing</translation> </message> <message> <location line="+1"/> <source>Your active proxy doesn't support SOCKS5, which is required for payment requests via proxy.</source> - <translation type="unfinished"/> + <translation>Uw actieve proxy ondersteunt geen SOCKS5, dewelke vereist is voor betalingsverzoeken via proxy.</translation> </message> <message> <location line="+52"/> <source>Payment request fetch URL is invalid: %1</source> - <translation type="unfinished"/> + <translation>URL om betalingsverzoek te verkrijgen is ongeldig: %1</translation> </message> <message> <location line="+27"/> <source>Payment request file handling</source> - <translation type="unfinished"/> + <translation>Betalingsverzoek bestandsafhandeling</translation> </message> <message> <location line="+1"/> <source>Payment request file can not be read or processed! This can be caused by an invalid payment request file.</source> - <translation type="unfinished"/> + <translation>Betalingsverzoek-bestand kan niet gelezen of verwerkt worden! Dit kan veroorzaakt worden door een ongeldig betalingsverzoek-bestand.</translation> </message> <message> <location line="+73"/> @@ -1610,7 +1647,7 @@ Adres: %4 <message> <location line="+59"/> <source>Refund from %1</source> - <translation>Restitutie van 1%</translation> + <translation>Restitutie van %1</translation> </message> <message> <location line="+43"/> @@ -1620,7 +1657,7 @@ Adres: %4 <message> <location line="+24"/> <source>Payment request can not be parsed or processed!</source> - <translation type="unfinished"/> + <translation>Betalingsverzoek kan niet juist worden ontleed of verwerkt!</translation> </message> <message> <location line="+11"/> @@ -1641,23 +1678,29 @@ Adres: %4 <context> <name>QObject</name> <message> - <location filename="../bitcoin.cpp" line="+71"/> - <location line="+11"/> + <location filename="../bitcoin.cpp" line="+63"/> + <location line="+7"/> + <location line="+13"/> <source>Bitcoin</source> <translation>Bitcoin</translation> </message> <message> - <location line="+1"/> + <location line="-19"/> <source>Error: Specified data directory "%1" does not exist.</source> <translation>Fout: Opgegeven gegevensmap "%1" bestaat niet.</translation> </message> <message> - <location line="-12"/> + <location line="+7"/> + <source>Error: Cannot parse configuration file: %1. Only use key=value syntax.</source> + <translation>Fout: Kan configuratiebestand niet parsen: %1. Gebruik enkel de key=value syntax.</translation> + </message> + <message> + <location line="+12"/> <source>Error: Invalid combination of -regtest and -testnet.</source> <translation>Fout: Ongeldige combinatie van -regtest en -testnet</translation> </message> <message> - <location filename="../guiutil.cpp" line="+82"/> + <location filename="../guiutil.cpp" line="+89"/> <source>Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source> <translation>Vul een Bitcoinadres in (bijv. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation> </message> @@ -1703,7 +1746,7 @@ Adres: %4 <location line="+36"/> <location line="+23"/> <location line="+23"/> - <location filename="../rpcconsole.cpp" line="+359"/> + <location filename="../rpcconsole.cpp" line="+373"/> <source>N/A</source> <translation>N.v.t.</translation> </message> @@ -1799,11 +1842,13 @@ Adres: %4 </message> <message> <location line="+64"/> + <location filename="../rpcconsole.cpp" line="-10"/> <source>In:</source> <translation>In;</translation> </message> <message> <location line="+80"/> + <location filename="../rpcconsole.cpp" line="+1"/> <source>Out:</source> <translation>Uit:</translation> </message> @@ -1828,7 +1873,7 @@ Adres: %4 <translation>Maak console leeg</translation> </message> <message> - <location filename="../rpcconsole.cpp" line="-30"/> + <location filename="../rpcconsole.cpp" line="-35"/> <source>Welcome to the Bitcoin RPC console.</source> <translation>Welkom bij de Bitcoin RPC-console.</translation> </message> @@ -1843,7 +1888,7 @@ Adres: %4 <translation>Typ <b>help</b> voor een overzicht van de beschikbare commando's.</translation> </message> <message> - <location line="+122"/> + <location line="+136"/> <source>%1 B</source> <translation>%1 B</translation> </message> @@ -1875,7 +1920,7 @@ Adres: %4 <message> <location line="+2"/> <source>%1 h %2 m</source> - <translation>%</translation> + <translation>%1 h %2 m</translation> </message> </context> <context> @@ -1909,7 +1954,7 @@ Adres: %4 <location line="+14"/> <location line="+23"/> <source>An optional message to attach to the payment request, which will be displayed when the request is opened. Note: The message will not be sent with the payment over the Bitcoin network.</source> - <translation type="unfinished"/> + <translation>Een optioneel bericht om bij te voegen aan het betalingsverzoek, dewelke zal getoond worden wanneer het verzoek is geopend. Opermerking: Het bericht zal niet worden verzonden met de betaling over het Bitcoin netwerk.</translation> </message> <message> <location line="-7"/> @@ -1920,13 +1965,13 @@ Adres: %4 <message> <location line="-7"/> <source>Use this form to request payments. All fields are <b>optional</b>.</source> - <translation type="unfinished"/> + <translation>Gebruik dit formulier om te verzoeken tot betaling. Alle velden zijn <b>optioneel</b>.</translation> </message> <message> <location line="+23"/> <location line="+22"/> <source>An optional amount to request. Leave this empty or zero to not request a specific amount.</source> - <translation type="unfinished"/> + <translation>Een optioneel te verzoeken bedrag. Laat dit leeg, of nul, om geen specifiek bedrag aan te vragen.</translation> </message> <message> <location line="+32"/> @@ -1959,9 +2004,9 @@ Adres: %4 <translation>Toon</translation> </message> <message> - <location line="+11"/> + <location line="+14"/> <source>Remove the selected entries from the list</source> - <translation>Verwijder de geselecteerd items van de lijst</translation> + <translation>Verwijder de geselecteerde items van de lijst</translation> </message> <message> <location line="+3"/> @@ -1969,7 +2014,7 @@ Adres: %4 <translation>Verwijder</translation> </message> <message> - <location filename="../receivecoinsdialog.cpp" line="+38"/> + <location filename="../receivecoinsdialog.cpp" line="+39"/> <source>Copy label</source> <translation>Kopieer label</translation> </message> @@ -2004,7 +2049,7 @@ Adres: %4 <message> <location line="+7"/> <source>&Save Image...</source> - <translation>&Sla plaatje om...</translation> + <translation>&Sla afbeelding op...</translation> </message> <message> <location filename="../receiverequestdialog.cpp" line="+56"/> @@ -2087,7 +2132,7 @@ Adres: %4 <message> <location line="+8"/> <source>(no amount)</source> - <translation type="unfinished"/> + <translation>(geen bedrag)</translation> </message> </context> <context> @@ -2157,17 +2202,17 @@ Adres: %4 <message> <location line="+32"/> <source>Change:</source> - <translation>Wijzigen:</translation> + <translation>Wisselgeld:</translation> </message> <message> <location line="+44"/> <source>If this is activated, but the change address is empty or invalid, change will be sent to a newly generated address.</source> - <translation>Als dit is geactiveerd, maar het wijzigingsadres is leeg of ongeldig, dan wordt de wijziging verzonden naar een nieuw gegenereerde adres.</translation> + <translation>Als dit is geactiveerd, maar het wisselgeldadres is leeg of ongeldig, dan wordt het wisselgeld verzonden naar een nieuw gegenereerd adres.</translation> </message> <message> <location line="+3"/> <source>Custom change address</source> - <translation>Maatwerk wijzig adres</translation> + <translation>Aangepast wisselgeldadres</translation> </message> <message> <location line="+164"/> @@ -2190,12 +2235,12 @@ Adres: %4 <translation>Verwijder &Alles</translation> </message> <message> - <location line="+52"/> + <location line="+58"/> <source>Balance:</source> <translation>Saldo:</translation> </message> <message> - <location line="-78"/> + <location line="-84"/> <source>Confirm the send action</source> <translation>Bevestig de verstuuractie</translation> </message> @@ -2255,7 +2300,7 @@ Adres: %4 <message> <location line="+1"/> <source>Copy change</source> - <translation>Kopieer wijzig</translation> + <translation>Kopieer wijziging</translation> </message> <message> <location line="+170"/> @@ -2315,7 +2360,7 @@ Adres: %4 <message> <location line="-11"/> <source>Warning: Unknown change address</source> - <translation>Waarschuwing: Onbekende adres wijziging</translation> + <translation>Waarschuwing: Onbekend wisselgeldadres</translation> </message> <message> <location line="-367"/> @@ -2417,12 +2462,12 @@ Adres: %4 <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> - <translation type="unfinished"/> + <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> <location line="+426"/> <source>This is an unverified payment request.</source> - <translation>Dit is een ongeverifieerde betalingsverzoek.</translation> + <translation>Dit is een ongeverifieerd betalingsverzoek.</translation> </message> <message> <location line="+18"/> @@ -2440,7 +2485,7 @@ Adres: %4 <context> <name>ShutdownWindow</name> <message> - <location filename="../utilitydialog.cpp" line="+48"/> + <location filename="../utilitydialog.cpp" line="+52"/> <source>Bitcoin Core is shutting down...</source> <translation>Bitcoin Core is aan het afsluiten...</translation> </message> @@ -2640,7 +2685,7 @@ Adres: %4 <context> <name>SplashScreen</name> <message> - <location filename="../splashscreen.cpp" line="+28"/> + <location filename="../splashscreen.cpp" line="+32"/> <source>Bitcoin Core</source> <translation>Bitcoin Kern</translation> </message> @@ -2672,6 +2717,11 @@ Adres: %4 </message> <message> <location line="+6"/> + <source>conflicted</source> + <translation>conflicterend</translation> + </message> + <message> + <location line="+2"/> <source>%1/offline</source> <translation>%1/offline</translation> </message> @@ -2795,7 +2845,7 @@ Adres: %4 <message> <location line="+7"/> <source>Generated coins must mature %1 blocks before they can be spent. When you generated this block, it was broadcast to the network to be added to the block chain. If it fails to get into the chain, its state will change to "not accepted" and it won't be spendable. This may occasionally happen if another node generates a block within a few seconds of yours.</source> - <translation>Gegenereerde munten moeten % 1 blokken rijpen voordat ze kunnen worden besteed. Toen dit blok gegenereerd werd, werd het uitgezonden naar het netwerk om aan de blok keten toegevoegd te worden. Als het niet lukt om in de keten toe te voegen, zal de status te veranderen naar "niet geaccepteerd" en het zal deze niet besteedbaar zijn. Dit kan soms gebeuren als een ander knooppunt een blok genereert binnen een paar seconden na die van jou.</translation> + <translation>Gegenereerde munten moeten %1 blokken rijpen voordat ze kunnen worden besteed. Toen dit blok gegenereerd werd, werd het uitgezonden naar het netwerk om aan de blokketen toegevoegd te worden. Als het niet lukt om in de keten toegevoegd te worden, zal de status te veranderen naar "niet geaccepteerd" en het zal deze niet besteedbaar zijn. Dit kan soms gebeuren als een ander knooppunt een blok genereert binnen een paar seconden na die van u.</translation> </message> <message> <location line="+8"/> @@ -2833,12 +2883,12 @@ Adres: %4 <translation>, is nog niet met succes uitgezonden</translation> </message> <message numerus="yes"> - <location line="-35"/> + <location line="-37"/> <source>Open for %n more block(s)</source> <translation><numerusform>Open voor nog %n blok</numerusform><numerusform>Open voor nog %n blokken</numerusform></translation> </message> <message> - <location line="+70"/> + <location line="+72"/> <source>unknown</source> <translation>onbekend</translation> </message> @@ -2879,12 +2929,12 @@ Adres: %4 <translation>Bedrag</translation> </message> <message> - <location line="+59"/> + <location line="+78"/> <source>Immature (%1 confirmations, will be available after %2)</source> - <translation type="unfinished"/> + <translation>immatuur (%1 bevestigingen, zal beschikbaar zijn na %2)</translation> </message> <message numerus="yes"> - <location line="+16"/> + <location line="-21"/> <source>Open for %n more block(s)</source> <translation><numerusform>Open voor nog %n blok</numerusform><numerusform>Open voor nog %n blokken</numerusform></translation> </message> @@ -2894,23 +2944,12 @@ Adres: %4 <translation>Open tot %1</translation> </message> <message> - <location line="+3"/> - <source>Offline (%1 confirmations)</source> - <translation>Niet verbonden (%1 bevestigingen)</translation> - </message> - <message> - <location line="+3"/> - <source>Unconfirmed (%1 of %2 confirmations)</source> - <translation>Onbevestigd (%1 van %2 bevestigd)</translation> - </message> - <message> - <location line="-22"/> - <location line="+25"/> + <location line="+12"/> <source>Confirmed (%1 confirmations)</source> <translation>Bevestigd (%1 bevestigingen)</translation> </message> <message> - <location line="-22"/> + <location line="+9"/> <source>This block was not received by any other nodes and will probably not be accepted!</source> <translation>Dit blok is niet ontvangen bij andere nodes en zal waarschijnlijk niet worden geaccepteerd!</translation> </message> @@ -2920,7 +2959,27 @@ Adres: %4 <translation>Gegenereerd maar niet geaccepteerd</translation> </message> <message> - <location line="+62"/> + <location line="-21"/> + <source>Offline</source> + <translation>Niet verbonden</translation> + </message> + <message> + <location line="+3"/> + <source>Unconfirmed</source> + <translation>Onbevestigd</translation> + </message> + <message> + <location line="+3"/> + <source>Confirming (%1 of %2 recommended confirmations)</source> + <translation>Bevestigen (%1 van %2 aanbevolen bevestigingen)</translation> + </message> + <message> + <location line="+6"/> + <source>Conflicted</source> + <translation>Conflicterend</translation> + </message> + <message> + <location line="+51"/> <source>Received with</source> <translation>Ontvangen met</translation> </message> @@ -2950,7 +3009,7 @@ Adres: %4 <translation>(nvt)</translation> </message> <message> - <location line="+199"/> + <location line="+190"/> <source>Transaction status. Hover over this field to show number of confirmations.</source> <translation>Transactiestatus. Houd de muiscursor boven dit veld om het aantal bevestigingen te laten zien.</translation> </message> @@ -3079,7 +3138,7 @@ Adres: %4 <translation>Toon transactiedetails</translation> </message> <message> - <location line="+142"/> + <location line="+140"/> <source>Export Transaction History</source> <translation>Exporteer Transactieverleden</translation> </message> @@ -3173,7 +3232,7 @@ Adres: %4 <context> <name>WalletView</name> <message> - <location filename="../walletview.cpp" line="+43"/> + <location filename="../walletview.cpp" line="+44"/> <source>&Export</source> <translation>&Exporteer</translation> </message> @@ -3183,7 +3242,7 @@ Adres: %4 <translation>Exporteer de data in de huidige tab naar een bestand</translation> </message> <message> - <location line="+181"/> + <location line="+184"/> <source>Backup Wallet</source> <translation>Portemonnee backuppen</translation> </message> @@ -3216,12 +3275,12 @@ Adres: %4 <context> <name>bitcoin-core</name> <message> - <location filename="../bitcoinstrings.cpp" line="+221"/> + <location filename="../bitcoinstrings.cpp" line="+261"/> <source>Usage:</source> <translation>Gebruik:</translation> </message> <message> - <location line="-54"/> + <location line="-66"/> <source>List commands</source> <translation>Lijst van commando's</translation> </message> @@ -3231,12 +3290,12 @@ Adres: %4 <translation>Toon hulp voor een commando</translation> </message> <message> - <location line="+26"/> + <location line="+27"/> <source>Options:</source> <translation>Opties:</translation> </message> <message> - <location line="+22"/> + <location line="+32"/> <source>Specify configuration file (default: bitcoin.conf)</source> <translation>Specificeer configuratiebestand (standaard: bitcoin.conf) </translation> @@ -3253,72 +3312,72 @@ Adres: %4 <translation>Stel datamap in</translation> </message> <message> - <location line="-9"/> - <source>Set database cache size in megabytes (default: 25)</source> - <translation>Stel databankcachegrootte in in megabytes (standaard: 25)</translation> - </message> - <message> - <location line="-26"/> + <location line="-46"/> <source>Listen for connections on <port> (default: 8333 or testnet: 18333)</source> <translation>Luister voor verbindingen op <poort> (standaard: 8333 of testnet: 18333)</translation> </message> <message> - <location line="+5"/> + <location line="+6"/> <source>Maintain at most <n> connections to peers (default: 125)</source> <translation>Onderhoud maximaal <n> verbindingen naar peers (standaard: 125)</translation> </message> <message> - <location line="-51"/> + <location line="-57"/> <source>Connect to a node to retrieve peer addresses, and disconnect</source> <translation>Verbind naar een node om adressen van anderen op te halen, en verbreek vervolgens de verbinding</translation> </message> <message> - <location line="+84"/> + <location line="+100"/> <source>Specify your own public address</source> <translation>Specificeer uw eigen publieke adres</translation> </message> <message> - <location line="+5"/> + <location line="+6"/> <source>Threshold for disconnecting misbehaving peers (default: 100)</source> <translation>Drempel om verbinding te verbreken naar zich misdragende peers (standaard: 100)</translation> </message> <message> - <location line="-148"/> + <location line="-172"/> <source>Number of seconds to keep misbehaving peers from reconnecting (default: 86400)</source> <translation>Aantal seconden dat zich misdragende peers niet opnieuw mogen verbinden (standaard: 86400)</translation> </message> <message> - <location line="-36"/> + <location line="-52"/> <source>An error occurred while setting up the RPC port %u for listening on IPv4: %s</source> <translation>Er is een fout opgetreden tijdens het instellen van de inkomende RPC-poort %u op IPv4: %s</translation> </message> <message> - <location line="+34"/> + <location line="+50"/> <source>Listen for JSON-RPC connections on <port> (default: 8332 or testnet: 18332)</source> <translation>Wacht op JSON-RPC-connecties op poort <port> (standaard: 8332 of testnet: 18332)</translation> </message> <message> - <location line="+45"/> + <location line="+51"/> <source>Accept command line and JSON-RPC commands</source> <translation>Aanvaard commandoregel- en JSON-RPC-commando's</translation> </message> <message> - <location line="+80"/> + <location line="+7"/> + <source>Bitcoin Core RPC client version</source> + <translation>Bitcoin Core RPC-client versie</translation> + </message> + <message> + <location line="+87"/> <source>Run in the background as a daemon and accept commands</source> <translation>Draai in de achtergrond als daemon en aanvaard commando's</translation> </message> <message> - <location line="+39"/> + <location line="+43"/> <source>Use the test network</source> <translation>Gebruik het testnetwerk</translation> </message> <message> - <location line="-118"/> + <location line="-136"/> <source>Accept connections from outside (default: 1 if no -proxy or -connect)</source> <translation>Accepteer verbindingen van buitenaf (standaard: 1 als geen -proxy of -connect is opgegeven)</translation> </message> <message> - <location line="-95"/> + <location line="-117"/> <source>%s, you must set a rpcpassword in the configuration file: %s It is recommended you use the following random password: @@ -3338,7 +3397,7 @@ rpcpassword=%s 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; -for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo.com</translation> +bijvoorbeeld: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo.com</translation> </message> <message> <location line="+12"/> @@ -3356,9 +3415,9 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Bind aan opgegeven adres en luister er altijd op. Gebruik [host]:port notatie voor IPv6</translation> </message> <message> - <location line="+3"/> - <source>Cannot obtain a lock on data directory %s. Bitcoin is probably already running.</source> - <translation>Kan geen lock op de datamap %s verkrijgen. Bitcoin draait vermoedelijk reeds.</translation> + <location line="+6"/> + <source>Continuously rate-limit free transactions to <n>*1000 bytes per minute (default:15)</source> + <translation>Doorlopend tarief-limiet op gratis transacties toepassen tot <n>*1000 bytes per minuut (standaard: 15)</translation> </message> <message> <location line="+3"/> @@ -3368,10 +3427,15 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <message> <location line="+4"/> <source>Enter regression test mode, which uses a special chain in which blocks can be solved instantly.</source> - <translation type="unfinished"/> + <translation>Schakel regressietest-modus in, die een speciale blokketen gebruikt waarin blokken onmiddellijk opgelost kunnen worden.</translation> </message> <message> <location line="+3"/> + <source>Error: Listening for incoming connections failed (listen returned error %d)</source> + <translation>Fout: Luisteren naar inkomende connecties mislukt (listen geeft fout terug %d)</translation> + </message> + <message> + <location line="+2"/> <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> </message> @@ -3386,12 +3450,47 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Voer opdracht uit zodra een portemonneetransactie verandert (%s in cmd wordt vervangen door TxID)</translation> </message> <message> - <location line="+18"/> + <location line="+6"/> + <source>Fees smaller than this are considered zero fee (for transaction creation) (default:</source> + <translation>Toeslagen kleiner dan dit worden beschouwd als geen vergoeding (voor transactie aanmaak) (standaard:</translation> + </message> + <message> + <location line="+3"/> + <source>Flush database activity from memory pool to disk log every <n> megabytes (default: 100)</source> + <translation>Leeg database-activiteit uit de geheugenpool naar schijf log elke <n> megabytes (standaard: 100) </translation> + </message> + <message> + <location line="+3"/> + <source>How thorough the block verification of -checkblocks is (0-4, default: 3)</source> + <translation>Hoe grondig de blokverificatie van -checkblocks is (0-4, standaard: 3)</translation> + </message> + <message> + <location line="+2"/> + <source>In this mode -genproclimit controls how many blocks are generated immediately.</source> + <translation>In deze modus, -genproclimit controleert hoeveel blokken er onmiddellijk worden gegenereerd.</translation> + </message> + <message> + <location line="+12"/> + <source>Set the number of script verification threads (%u to %d, 0 = auto, <0 = leave that many cores free, default: %d)</source> + <translation>Kies het aantal script verificatie processen (%u tot %d, 0 = auto, <0 = laat dit aantal kernen vrij, standaard: %d)</translation> + </message> + <message> + <location line="+3"/> + <source>Set the processor limit for when generation is on (-1 = unlimited, default: -1)</source> + <translation>Kies de processorlimiet wanneer generation is aan (-1 = ongelimiteerd, standaard: -1)</translation> + </message> + <message> + <location line="+3"/> <source>This is a pre-release test build - use at your own risk - do not use for mining or merchant applications</source> <translation>Dit is een pre-release testversie - gebruik op eigen risico! Gebruik deze niet voor het delven van munten of handelsdoeleinden</translation> </message> <message> - <location line="+5"/> + <location line="+3"/> + <source>Unable to bind to %s on this computer. Bitcoin Core is probably already running.</source> + <translation>Niet in staat om %s te verbinden op deze computer. Bitcoin Core draait waarschijnlijk al.</translation> + </message> + <message> + <location line="+3"/> <source>Use separate SOCKS5 proxy to reach peers via Tor hidden services (default: -proxy)</source> <translation>Gebruik een aparte SOCKS5 proxy om 'Tor hidden services' te bereiken (standaard: hetzelfde als -proxy)</translation> </message> @@ -3427,6 +3526,16 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. </message> <message> <location line="+9"/> + <source>(default: 1)</source> + <translation>(standaard: 1)</translation> + </message> + <message> + <location line="+1"/> + <source>(default: wallet.dat)</source> + <translation>(standaard: wallet.dat)</translation> + </message> + <message> + <location line="+1"/> <source><category> can be:</source> <translation><category> kan zijn:</translation> </message> @@ -3441,17 +3550,17 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Bitcoin Core Daemon</translation> </message> <message> - <location line="+1"/> - <source>Bitcoin RPC client version</source> - <translation>Bitcoin RPC desktop versie</translation> - </message> - <message> - <location line="+1"/> + <location line="+2"/> <source>Block creation options:</source> <translation>Blokcreatie-opties:</translation> </message> <message> <location line="+5"/> + <source>Clear list of wallet transactions (diagnostic tool; implies -rescan)</source> + <translation>Leeg lijst met wallet transacties (diagnostisch instrument; impliceert -rescan)</translation> + </message> + <message> + <location line="+1"/> <source>Connect only to the specified node(s)</source> <translation>Verbind alleen naar de gespecificeerde node(s)</translation> </message> @@ -3467,18 +3576,33 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. </message> <message> <location line="+2"/> + <source>Connection options:</source> + <translation>Verbindingsopties:</translation> + </message> + <message> + <location line="+1"/> <source>Corrupted block database detected</source> <translation>Corrupte blokkendatabase gedetecteerd</translation> </message> <message> <location line="+1"/> + <source>Debugging/Testing options:</source> + <translation>Foutopsporing/Testopties:</translation> + </message> + <message> + <location line="+1"/> + <source>Disable safemode, override a real safe mode event (default: 0)</source> + <translation>Veilige modus uitschakelen, hef een echte veilige modus gebeurtenis uit (default: 0)</translation> + </message> + <message> + <location line="+1"/> <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> <location line="+1"/> <source>Do not load the wallet and disable wallet RPC calls</source> - <translation type="unfinished"/> + <translation>Laad de wallet niet en schakel wallet RPC oproepen uit</translation> </message> <message> <location line="+1"/> @@ -3582,11 +3706,21 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. </message> <message> <location line="+1"/> + <source>Fees smaller than this are considered zero fee (for relaying) (default:</source> + <translation>Toeslagen kleiner dan dit worden beschouwd als geen vergoeding (voor relaying) (standaard:</translation> + </message> + <message> + <location line="+1"/> <source>Find peers using DNS lookup (default: 1 unless -connect)</source> <translation>Vind andere nodes d.m.v. DNS-naslag (standaard: 1 tenzij -connect)</translation> </message> <message> <location line="+1"/> + <source>Force safe mode (default: 0)</source> + <translation>Forceer veilige modus (default: 0)</translation> + </message> + <message> + <location line="+1"/> <source>Generate coins (default: 0)</source> <translation>Genereer munten (standaard: 0)</translation> </message> @@ -3597,11 +3731,6 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. </message> <message> <location line="+1"/> - <source>How thorough the block verification is (0-4, default: 3)</source> - <translation>Hoe grondig de blokverificatie is (0-4, standaard: 3)</translation> - </message> - <message> - <location line="+1"/> <source>If <category> is not supplied, output all debugging information.</source> <translation>Als er geen <category> is opgegeven, laat dan alle debugging informatie zien.</translation> </message> @@ -3616,7 +3745,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Ongeldig -onion adres '%s'</translation> </message> <message> - <location line="+15"/> + <location line="+17"/> <source>Not enough file descriptors available.</source> <translation>Niet genoeg file descriptors beschikbaar.</translation> </message> @@ -3626,27 +3755,27 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Prepend debug output met tijdstempel (standaard: 1)</translation> </message> <message> - <location line="+1"/> + <location line="+4"/> <source>RPC client options:</source> <translation>RPC client opties:</translation> </message> <message> - <location line="+1"/> + <location line="+4"/> <source>Rebuild block chain index from current blk000??.dat files</source> - <translation>Blok keten opnieuw opbouwen met behulp van huidige blk000??.dat-bestanden</translation> + <translation>Blokketen opnieuw opbouwen met behulp van huidige blk000??.dat-bestanden</translation> </message> <message> - <location line="+5"/> + <location line="+6"/> <source>Select SOCKS version for -proxy (4 or 5, default: 5)</source> <translation>Selecteer de versie van de SOCKS-proxy om te gebruiken (4 of 5, standaard is 5)</translation> </message> <message> - <location line="+1"/> - <source>Send command to Bitcoin server</source> - <translation>Stuur commando naar Bitcoin server</translation> + <location line="+6"/> + <source>Set database cache size in megabytes (%d to %d, default: %d)</source> + <translation>Zet database cache grootte in megabytes (%d tot %d, standaard: %d)</translation> </message> <message> - <location line="+7"/> + <location line="+2"/> <source>Set maximum block size in bytes (default: %d)</source> <translation>Stel maximum blokgrootte in in bytes (standaard: %d)</translation> </message> @@ -3656,19 +3785,19 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Stel het aantal threads in om RPC-aanvragen mee te bedienen (standaard: 4)</translation> </message> <message> - <location line="+7"/> + <location line="+10"/> <source>Specify wallet file (within data directory)</source> <translation>Specificeer het portemonnee bestand (vanuit de gegevensmap)</translation> </message> <message> <location line="+2"/> - <source>Start Bitcoin server</source> - <translation>Start Bitcoin server</translation> + <source>Spend unconfirmed change when sending transactions (default: 1)</source> + <translation>Spendeer onbevestigd wisselgeld wanneer transacties verstuurd worden (standaard: 1)</translation> </message> <message> - <location line="+3"/> + <location line="+4"/> <source>This is intended for regression testing tools and app development.</source> - <translation type="unfinished"/> + <translation>Dit is bedoeld voor regressie test toepassingen en applicatie onwikkeling.</translation> </message> <message> <location line="+10"/> @@ -3698,12 +3827,12 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <message> <location line="+2"/> <source>Wallet options:</source> - <translation type="unfinished"/> + <translation>Portemonnee instellingen:</translation> </message> <message> <location line="+2"/> <source>Warning: Deprecated argument -debugnet ignored, use -debug=net</source> - <translation>Waarschuwing: Afgekeurd argument -debugnet ignored, use -debug=net</translation> + <translation>Waarschuwing: Afgekeurd argument -debugnet genegeerd, use -debug=net</translation> </message> <message> <location line="+2"/> @@ -3711,17 +3840,22 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Om -txindex te kunnen veranderen dient u de database opnieuw te bouwen met gebruik van -reindex.</translation> </message> <message> - <location line="-79"/> + <location line="-92"/> <source>Imports blocks from external blk000??.dat file</source> <translation>Importeert blokken van extern blk000??.dat bestand</translation> </message> <message> - <location line="-105"/> + <location line="-149"/> + <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> + <location line="+22"/> <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> - <location line="+14"/> + <location line="+25"/> <source>Output debugging information (default: 0, supplying <category> is optional)</source> <translation>Output extra debugginginformatie (standaard: 0, het leveren van <category> is optioneel)</translation> </message> @@ -3731,12 +3865,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Stel maximumgrootte in bytes in voor hoge-prioriteits-/lage-transactiekosten-transacties (standaard: %d)</translation> </message> <message> - <location line="+2"/> - <source>Set the number of script verification threads (up to 16, 0 = auto, <0 = leave that many cores free, default: 0)</source> - <translation>Stel het aantal threads voor scriptverificatie in (max 16, 0 = auto, <0 = laat zoveel cores vrij, standaard: 0)</translation> - </message> - <message> - <location line="+89"/> + <location line="+102"/> <source>Information</source> <translation>Informatie</translation> </message> @@ -3751,7 +3880,17 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Ongeldig bedrag voor -mintxfee=<bedrag>: '%s'</translation> </message> <message> - <location line="+8"/> + <location line="+3"/> + <source>Limit size of signature cache to <n> entries (default: 50000)</source> + <translation>Limiteer grootte van de handtekening cache tot <n> entries (default: 50000)</translation> + </message> + <message> + <location line="+6"/> + <source>Log transaction priority and fee per kB when mining blocks (default: 0)</source> + <translation>Log transactieprioriteit en vergoeding per kB bij mijnen blocks (standaard: 0)</translation> + </message> + <message> + <location line="+1"/> <source>Maintain a full transaction index (default: 0)</source> <translation>Onderhoud een volledige transactieindex (standaard: 0)</translation> </message> @@ -3776,12 +3915,52 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Verbind alleen naar nodes in netwerk <net> (IPv4, IPv6 of Tor)</translation> </message> <message> - <location line="+9"/> + <location line="+4"/> + <source>Print block on startup, if found in block index</source> + <translation>Toon block bij opstarten, wanneer gevonden in block index</translation> + </message> + <message> + <location line="+1"/> + <source>Print block tree on startup (default: 0)</source> + <translation>Toon block structuur bij opstarten (default: 0)</translation> + </message> + <message> + <location line="+1"/> + <source>RPC SSL options: (see the Bitcoin Wiki for SSL setup instructions)</source> + <translation>RPC SSL opties: (zie de Bitcoin Wiki voor SSL installatie-instructies)</translation> + </message> + <message> + <location line="+2"/> + <source>RPC server options:</source> + <translation>RPC server opties:</translation> + </message> + <message> + <location line="+1"/> + <source>Randomly drop 1 of every <n> network messages</source> + <translation>Laat willekeurig 1 elke <n> netwerkberichten vallen</translation> + </message> + <message> + <location line="+1"/> + <source>Randomly fuzz 1 of every <n> network messages</source> + <translation>Fuzz willekeurig 1 van elke <n> netwerkberichten</translation> + </message> + <message> + <location line="+4"/> + <source>Run a thread to flush wallet periodically (default: 1)</source> + <translation>Draai een proces om de wallet periodiek te flushen (default: 1)</translation> + </message> + <message> + <location line="+2"/> <source>SSL options: (see the Bitcoin Wiki for SSL setup instructions)</source> <translation>SSL-opties: (zie de Bitcoin wiki voor SSL-instructies)</translation> </message> <message> - <location line="+4"/> + <location line="+2"/> + <source>Send command to Bitcoin Core</source> + <translation>Stuur commando naar Bitcoin Core</translation> + </message> + <message> + <location line="+2"/> <source>Send trace/debug info to console instead of debug.log file</source> <translation>Stuur trace/debug-info naar de console in plaats van het debug.log bestand</translation> </message> @@ -3792,6 +3971,21 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. </message> <message> <location line="+2"/> + <source>Sets the DB_PRIVATE flag in the wallet db environment (default: 1)</source> + <translation>Plaatst de DB_PRIVATE vlag in de wallet db omgeving (default: 1)</translation> + </message> + <message> + <location line="+1"/> + <source>Show all debugging options (usage: --help -help-debug)</source> + <translation>Toon alle foutopsporingsopties (gebruik: --help -help-debug)</translation> + </message> + <message> + <location line="+1"/> + <source>Show benchmark information (default: 0)</source> + <translation>Toon benchmark-informatie (default: 0)</translation> + </message> + <message> + <location line="+1"/> <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> @@ -3807,6 +4001,11 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. </message> <message> <location line="+6"/> + <source>Start Bitcoin Core Daemon</source> + <translation>Start Bitcoin Core Daemon</translation> + </message> + <message> + <location line="+1"/> <source>System error: </source> <translation>Systeemfout:</translation> </message> @@ -3852,6 +4051,16 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. </message> <message> <location line="+2"/> + <source>Zapping all transactions from wallet...</source> + <translation>Bezig met het zappen van alle transacties van de portemonnee...</translation> + </message> + <message> + <location line="+1"/> + <source>on startup</source> + <translation>bij opstarten</translation> + </message> + <message> + <location line="+1"/> <source>version</source> <translation>versie</translation> </message> @@ -3861,47 +4070,47 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>wallet.dat corrupt, veiligstellen mislukt</translation> </message> <message> - <location line="-58"/> + <location line="-71"/> <source>Password for JSON-RPC connections</source> <translation>Wachtwoord voor JSON-RPC-verbindingen</translation> </message> <message> - <location line="-70"/> + <location line="-77"/> <source>Allow JSON-RPC connections from specified IP address</source> <translation>Sta JSON-RPC verbindingen van opgegeven IP-adres toe</translation> </message> <message> - <location line="+80"/> + <location line="+94"/> <source>Send commands to node running on <ip> (default: 127.0.0.1)</source> <translation>Verstuur commando's naar proces dat op <ip> draait (standaard: 127.0.0.1)</translation> </message> <message> - <location line="-132"/> + <location line="-163"/> <source>Execute command when the best block changes (%s in cmd is replaced by block hash)</source> <translation>Voer commando uit zodra het beste blok verandert (%s in cmd wordt vervangen door blockhash)</translation> </message> <message> - <location line="+161"/> + <location line="+196"/> <source>Upgrade wallet to latest format</source> <translation>Vernieuw portemonnee naar nieuwste versie</translation> </message> <message> - <location line="-24"/> + <location line="-28"/> <source>Set key pool size to <n> (default: 100)</source> <translation>Stel sleutelpoelgrootte in op <n> (standaard: 100)</translation> </message> <message> - <location line="-11"/> + <location line="-12"/> <source>Rescan the block chain for missing wallet transactions</source> <translation>Doorzoek de blokketen op ontbrekende portemonnee-transacties</translation> </message> <message> - <location line="+38"/> + <location line="+43"/> <source>Use OpenSSL (https) for JSON-RPC connections</source> <translation>Gebruik OpenSSL (https) voor JSON-RPC-verbindingen</translation> </message> <message> - <location line="-30"/> + <location line="-34"/> <source>Server certificate file (default: server.cert)</source> <translation>Certificaat-bestand voor server (standaard: server.cert)</translation> </message> @@ -3911,7 +4120,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Geheime sleutel voor server (standaard: server.pem)</translation> </message> <message> - <location line="+16"/> + <location line="+20"/> <source>This help message</source> <translation>Dit helpbericht</translation> </message> @@ -3921,17 +4130,17 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Niet in staat om aan %s te binden op deze computer (bind gaf error %d, %s)</translation> </message> <message> - <location line="-107"/> + <location line="-125"/> <source>Allow DNS lookups for -addnode, -seednode and -connect</source> <translation>Sta DNS-naslag toe voor -addnode, -seednode en -connect</translation> </message> <message> - <location line="+60"/> + <location line="+66"/> <source>Loading addresses...</source> <translation>Adressen aan het laden...</translation> </message> <message> - <location line="-37"/> + <location line="-39"/> <source>Error loading wallet.dat: Wallet corrupted</source> <translation>Fout bij laden wallet.dat: Portemonnee corrupt</translation> </message> @@ -3941,22 +4150,22 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Fout bij laden wallet.dat: Portemonnee vereist een nieuwere versie van Bitcoin</translation> </message> <message> - <location line="+98"/> + <location line="+112"/> <source>Wallet needed to be rewritten: restart Bitcoin to complete</source> <translation>Portemonnee moest herschreven worden: Herstart Bitcoin om te voltooien</translation> </message> <message> - <location line="-100"/> + <location line="-114"/> <source>Error loading wallet.dat</source> <translation>Fout bij laden wallet.dat</translation> </message> <message> - <location line="+31"/> + <location line="+32"/> <source>Invalid -proxy address: '%s'</source> <translation>Ongeldig -proxy adres: '%s'</translation> </message> <message> - <location line="+56"/> + <location line="+69"/> <source>Unknown network specified in -onlynet: '%s'</source> <translation>Onbekend netwerk gespecificeerd in -onlynet: '%s'</translation> </message> @@ -3966,7 +4175,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Onbekende -socks proxyversie aangegeven: %i</translation> </message> <message> - <location line="-101"/> + <location line="-119"/> <source>Cannot resolve -bind address: '%s'</source> <translation>Kan -bind adres niet herleiden: '%s'</translation> </message> @@ -3976,7 +4185,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Kan -externlip adres niet herleiden: '%s'</translation> </message> <message> - <location line="+48"/> + <location line="+53"/> <source>Invalid amount for -paytxfee=<amount>: '%s'</source> <translation>Ongeldig bedrag voor -paytxfee=<bedrag>: '%s'</translation> </message> @@ -3991,27 +4200,22 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Ontoereikend saldo</translation> </message> <message> - <location line="+10"/> + <location line="+11"/> <source>Loading block index...</source> <translation>Blokindex aan het laden...</translation> </message> <message> - <location line="-62"/> + <location line="-68"/> <source>Add a node to connect to and attempt to keep the connection open</source> <translation>Voeg een node om naar te verbinden toe en probeer de verbinding open te houden</translation> </message> <message> - <location line="-32"/> - <source>Unable to bind to %s on this computer. Bitcoin is probably already running.</source> - <translation>Niet in staat om aan %s te binden op deze computer. Bitcoin draait vermoedelijk reeds.</translation> - </message> - <message> - <location line="+95"/> + <location line="+69"/> <source>Loading wallet...</source> <translation>Portemonnee aan het laden...</translation> </message> <message> - <location line="-56"/> + <location line="-62"/> <source>Cannot downgrade wallet</source> <translation>Kan portemonnee niet downgraden</translation> </message> @@ -4021,27 +4225,27 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Kan standaardadres niet schrijven</translation> </message> <message> - <location line="+67"/> + <location line="+80"/> <source>Rescanning...</source> <translation>Blokketen aan het doorzoeken...</translation> </message> <message> - <location line="-58"/> + <location line="-67"/> <source>Done loading</source> <translation>Klaar met laden</translation> </message> <message> - <location line="+85"/> + <location line="+99"/> <source>To use the %s option</source> <translation>Om de %s optie te gebruiken</translation> </message> <message> - <location line="-77"/> + <location line="-91"/> <source>Error</source> <translation>Fout</translation> </message> <message> - <location line="-35"/> + <location line="-41"/> <source>You must set rpcpassword=<password> in the configuration file: %s If the file does not exist, create it with owner-readable-only file permissions.</source> diff --git a/src/qt/locale/bitcoin_pl.ts b/src/qt/locale/bitcoin_pl.ts index ba399c396a..3c80c594dd 100644 --- a/src/qt/locale/bitcoin_pl.ts +++ b/src/qt/locale/bitcoin_pl.ts @@ -1,4 +1,4 @@ -<?xml version="1.0" ?><!DOCTYPE TS><TS language="pl" version="2.0"> +<?xml version="1.0" ?><!DOCTYPE TS><TS language="pl" version="2.1"> <context> <name>AboutDialog</name> <message> @@ -40,7 +40,7 @@ This product includes software developed by the OpenSSL Project for use in the O <location line="+12"/> <location line="+2"/> <source> (%1-bit)</source> - <translation type="unfinished"/> + <translation>(%1-bit)</translation> </message> </context> <context> @@ -71,7 +71,7 @@ This product includes software developed by the OpenSSL Project for use in the O <translation>&Kopiuj</translation> </message> <message> - <location line="+52"/> + <location line="+58"/> <source>C&lose</source> <translation>Z&amknij</translation> </message> @@ -81,7 +81,7 @@ This product includes software developed by the OpenSSL Project for use in the O <translation>&Kopiuj adres</translation> </message> <message> - <location filename="../forms/addressbookpage.ui" line="-41"/> + <location filename="../forms/addressbookpage.ui" line="-47"/> <source>Delete the currently selected address from the list</source> <translation>UsuÅ„ zaznaczony adres z listy</translation> </message> @@ -143,7 +143,7 @@ This product includes software developed by the OpenSSL Project for use in the O <message> <location line="+1"/> <source>&Edit</source> - <translation>&Edytuj</translation> + <translation>&Modyfikuj</translation> </message> <message> <location line="+194"/> @@ -328,7 +328,7 @@ This product includes software developed by the OpenSSL Project for use in the O <context> <name>BitcoinGUI</name> <message> - <location filename="../bitcoingui.cpp" line="+295"/> + <location filename="../bitcoingui.cpp" line="+294"/> <source>Sign &message...</source> <translation>Podpisz wiado&mość...</translation> </message> @@ -343,12 +343,12 @@ This product includes software developed by the OpenSSL Project for use in the O <translation>P&odsumowanie</translation> </message> <message> - <location line="-137"/> + <location line="-136"/> <source>Node</source> <translation type="unfinished"/> </message> <message> - <location line="+138"/> + <location line="+137"/> <source>Show general overview of wallet</source> <translation>Pokazuje ogólny zarys portfela</translation> </message> @@ -411,17 +411,17 @@ This product includes software developed by the OpenSSL Project for use in the O <message> <location line="+10"/> <source>&Sending addresses...</source> - <translation type="unfinished"/> + <translation>Adres wysyÅ‚ania</translation> </message> <message> <location line="+2"/> <source>&Receiving addresses...</source> - <translation type="unfinished"/> + <translation>Adres odbiorczy</translation> </message> <message> <location line="+3"/> <source>Open &URI...</source> - <translation type="unfinished"/> + <translation>Otwórz URI...</translation> </message> <message> <location line="+325"/> @@ -469,17 +469,17 @@ This product includes software developed by the OpenSSL Project for use in the O <translation>&Zweryfikuj wiadomość...</translation> </message> <message> - <location line="+430"/> + <location line="+440"/> <source>Bitcoin</source> <translation>Bitcoin</translation> </message> <message> - <location line="-643"/> + <location line="-652"/> <source>Wallet</source> <translation>Portfel</translation> </message> <message> - <location line="+146"/> + <location line="+145"/> <source>&Send</source> <translation>WyÅ›lij</translation> </message> @@ -535,18 +535,18 @@ This product includes software developed by the OpenSSL Project for use in the O <translation>Pasek zakÅ‚adek</translation> </message> <message> - <location line="-284"/> - <location line="+376"/> + <location line="-283"/> + <location line="+375"/> <source>[testnet]</source> <translation>[testnet]</translation> </message> <message> - <location line="-401"/> + <location line="-400"/> <source>Bitcoin Core</source> <translation>RdzeÅ„ BitCoin</translation> </message> <message> - <location line="+163"/> + <location line="+162"/> <source>Request payments (generates QR codes and bitcoin: URIs)</source> <translation>Żądaj pÅ‚atnoÅ›ci (generuje kod QR oraz bitcoin URI)</translation> </message> @@ -608,7 +608,7 @@ This product includes software developed by the OpenSSL Project for use in the O <translation>Pobrano %1 bloków z historiÄ… transakcji.</translation> </message> <message numerus="yes"> - <location line="+23"/> + <location line="+27"/> <source>%n hour(s)</source> <translation><numerusform>%n godzina</numerusform><numerusform>%n godzin</numerusform><numerusform>%n godzin</numerusform></translation> </message> @@ -619,13 +619,24 @@ This product includes software developed by the OpenSSL Project for use in the O </message> <message numerus="yes"> <location line="+4"/> + <location line="+6"/> <source>%n week(s)</source> <translation><numerusform>%n tydzieÅ„</numerusform><numerusform>%n tygodni</numerusform><numerusform>%n tygodni</numerusform></translation> </message> <message> + <location line="+0"/> + <source>%1 and %2</source> + <translation>%1 i %2</translation> + </message> + <message numerus="yes"> + <location line="+0"/> + <source>%n year(s)</source> + <translation><numerusform>%n rok</numerusform><numerusform>%n lata</numerusform><numerusform>%n lat</numerusform></translation> + </message> + <message> <location line="+4"/> <source>%1 behind</source> - <translation>%1 do tyÅ‚u</translation> + <translation>%1 wstecz</translation> </message> <message> <location line="+21"/> @@ -653,12 +664,12 @@ This product includes software developed by the OpenSSL Project for use in the O <translation>Informacja</translation> </message> <message> - <location line="-85"/> + <location line="-95"/> <source>Up to date</source> <translation>Aktualny</translation> </message> <message> - <location line="+34"/> + <location line="+44"/> <source>Catching up...</source> <translation>Åapanie bloków...</translation> </message> @@ -696,7 +707,7 @@ Adres: %4 <translation>Portfel jest <b>zaszyfrowany</b> i obecnie <b>zablokowany</b></translation> </message> <message> - <location filename="../bitcoin.cpp" line="+435"/> + <location filename="../bitcoin.cpp" line="+441"/> <source>A fatal error occurred. Bitcoin can no longer continue safely and will quit.</source> <translation>BÅ‚Ä…d krytyczny. Bitcoin nie może kontynuować bezpiecznie wiÄ™c zostanie zamkniÄ™ty.</translation> </message> @@ -704,7 +715,7 @@ Adres: %4 <context> <name>ClientModel</name> <message> - <location filename="../clientmodel.cpp" line="+119"/> + <location filename="../clientmodel.cpp" line="+128"/> <source>Network Alert</source> <translation>Sieć Alert</translation> </message> @@ -802,7 +813,7 @@ Adres: %4 <translation>Priorytet</translation> </message> <message> - <location filename="../coincontroldialog.cpp" line="+42"/> + <location filename="../coincontroldialog.cpp" line="+41"/> <source>Copy address</source> <translation>Kopiuj adres</translation> </message> @@ -868,7 +879,7 @@ Adres: %4 <translation>Skopiuj resztÄ™</translation> </message> <message> - <location line="+323"/> + <location line="+332"/> <source>highest</source> <translation>najwyższa</translation> </message> @@ -940,39 +951,39 @@ Adres: %4 <message> <location line="+10"/> <source>This label turns red, if the transaction size is greater than 1000 bytes.</source> - <translation type="unfinished"/> + <translation>Etykieta staje siÄ™ czerwona kiedy transakcja jest wiÄ™ksza niż 1000 bajtów.</translation> </message> <message> <location line="+1"/> <location line="+5"/> <source>This means a fee of at least %1 per kB is required.</source> - <translation type="unfinished"/> + <translation>Oznacza to wymaganÄ… opÅ‚atÄ™ minimum %1 na kB.</translation> </message> <message> <location line="-4"/> <source>Can vary +/- 1 byte per input.</source> - <translation type="unfinished"/> + <translation>Waha siÄ™ +/- 1 bajt na wejÅ›cie.</translation> </message> <message> <location line="+2"/> <source>Transactions with higher priority are more likely to get included into a block.</source> - <translation type="unfinished"/> + <translation>Transakcje o wyższym priorytecie zostajÄ… szybciej doÅ‚Ä…czone do bloku.</translation> </message> <message> <location line="+1"/> <source>This label turns red, if the priority is smaller than "medium".</source> - <translation type="unfinished"/> + <translation>Ta etykieta jest czerwona, jeżeli priorytet jest mniejszy niż "Å›redni"</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>Etykieta staje siÄ™ czerwona kiedy którykolwiek odbiorca otrzymuje kwotÄ™ mniejszÄ… niż %1.</translation> </message> <message> <location line="+1"/> <location line="+4"/> <source>This means a fee of at least %1 is required.</source> - <translation type="unfinished"/> + <translation>Oznacza to, że wymagana jest opÅ‚ata przynajmniej %1.</translation> </message> <message> <location line="-3"/> @@ -982,11 +993,11 @@ Adres: %4 <message> <location line="+2"/> <source>This label turns red, if the change is smaller than %1.</source> - <translation type="unfinished"/> + <translation>Etykieta staje siÄ™ czerwona kiedy reszta jest mniejsza niż %1.</translation> </message> <message> <location line="+43"/> - <location line="+66"/> + <location line="+63"/> <source>(no label)</source> <translation>(bez etykiety)</translation> </message> @@ -1006,7 +1017,7 @@ Adres: %4 <message> <location filename="../forms/editaddressdialog.ui" line="+14"/> <source>Edit Address</source> - <translation>Edytuj adres</translation> + <translation>ZmieÅ„ adres</translation> </message> <message> <location line="+11"/> @@ -1041,12 +1052,12 @@ Adres: %4 <message> <location line="+3"/> <source>Edit receiving address</source> - <translation>Edytuj adres odbioru</translation> + <translation>ZmieÅ„ adres odbioru</translation> </message> <message> <location line="+4"/> <source>Edit sending address</source> - <translation>Edytuj adres wysyÅ‚ania</translation> + <translation>ZmieÅ„ adres wysyÅ‚ania</translation> </message> <message> <location line="+76"/> @@ -1102,7 +1113,7 @@ Adres: %4 <message> <location filename="../forms/helpmessagedialog.ui" line="+19"/> <source>Bitcoin Core - Command-line options</source> - <translation type="unfinished"/> + <translation>Opcje konsoli</translation> </message> <message> <location filename="../utilitydialog.cpp" line="+24"/> @@ -1160,17 +1171,17 @@ Adres: %4 <message> <location line="+9"/> <source>Welcome to Bitcoin Core.</source> - <translation type="unfinished"/> + <translation>Witam w Bitcoin Core</translation> </message> <message> <location line="+26"/> <source>As this is the first time the program is launched, you can choose where Bitcoin Core will store its data.</source> - <translation type="unfinished"/> + <translation>Ponieważ jest to pierwsze uruchomienie programu, możesz wybrać gdzie bÄ™dÄ… przechowywane informacje.</translation> </message> <message> <location line="+10"/> <source>Bitcoin Core will download and store a copy of the Bitcoin block chain. At least %1GB of data will be stored in this directory, and it will grow over time. The wallet will also be stored in this directory.</source> - <translation type="unfinished"/> + <translation>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> </message> <message> <location line="+10"/> @@ -1183,7 +1194,7 @@ Adres: %4 <translation>Użyj wybranego folderu dla danych</translation> </message> <message> - <location filename="../intro.cpp" line="+85"/> + <location filename="../intro.cpp" line="+82"/> <source>Bitcoin</source> <translation>Bitcoin</translation> </message> @@ -1276,7 +1287,7 @@ Adres: %4 <message> <location line="+16"/> <source>MB</source> - <translation type="unfinished"/> + <translation>MB</translation> </message> <message> <location line="+27"/> @@ -1289,12 +1300,7 @@ Adres: %4 <translation>Ustaw liczbÄ™ wÄ…tków skryptu weryfikacji (do 16, 0 = auto, <0 = zostawia takÄ… ilość rdzenie wolnych, domyÅ›lnie: 0)</translation> </message> <message> - <location line="+107"/> - <source>&Spend unconfirmed change (experts only)</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+37"/> + <location line="+153"/> <source>Connect to the Bitcoin network through a SOCKS proxy.</source> <translation type="unfinished"/> </message> @@ -1309,7 +1315,7 @@ Adres: %4 <translation>Adres IP serwera proxy (np. IPv4: 127.0.0.1 / IPv6: ::1)</translation> </message> <message> - <location line="+224"/> + <location line="+214"/> <source>Active command-line options that override above options:</source> <translation type="unfinished"/> </message> @@ -1324,22 +1330,37 @@ Adres: %4 <translation>Z&resetuj Ustawienia</translation> </message> <message> - <location line="-323"/> + <location line="-313"/> <source>&Network</source> <translation>&Sieć</translation> </message> <message> - <location line="-86"/> + <location line="-95"/> <source>W&allet</source> + <translation>Portfel</translation> + </message> + <message> + <location line="+65"/> + <source>Expert</source> + <translation>Ekspert</translation> + </message> + <message> + <location line="+9"/> + <source>Enable coin &control features</source> <translation type="unfinished"/> </message> <message> - <location line="+52"/> + <location line="+7"/> <source>If you disable the spending of unconfirmed change, the change from a transaction cannot be used until that transaction has at least one confirmation. This also affects how your balance is computed.</source> <translation type="unfinished"/> </message> <message> - <location line="+40"/> + <location line="+3"/> + <source>&Spend unconfirmed change</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+17"/> <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> @@ -1434,17 +1455,12 @@ Adres: %4 <translation>&WyÅ›wietlaj adresy w liÅ›cie transakcji</translation> </message> <message> - <location line="+7"/> + <location line="-262"/> <source>Whether to show coin control features or not.</source> <translation type="unfinished"/> </message> <message> - <location line="+3"/> - <source>Display coin &control features (experts only)</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+136"/> + <location line="+398"/> <source>&OK</source> <translation>&OK</translation> </message> @@ -1482,7 +1498,7 @@ Adres: %4 <message> <location line="+33"/> <source>This change would require a client restart.</source> - <translation type="unfinished"/> + <translation>Ta zmiana może wymagać ponownego uruchomienia klienta.</translation> </message> <message> <location line="+34"/> @@ -1521,7 +1537,7 @@ Adres: %4 <message> <location line="+16"/> <source>Pending:</source> - <translation type="unfinished"/> + <translation>W toku:</translation> </message> <message> <location line="+16"/> @@ -1657,18 +1673,18 @@ Adres: %4 <context> <name>QObject</name> <message> - <location filename="../bitcoin.cpp" line="+71"/> - <location line="+11"/> + <location filename="../bitcoin.cpp" line="+63"/> + <location line="+14"/> <source>Bitcoin</source> <translation>Bitcoin</translation> </message> <message> - <location line="+1"/> + <location line="-13"/> <source>Error: Specified data directory "%1" does not exist.</source> <translation>BÅ‚Ä…d: OkreÅ›lony folder danych "%1" nie istnieje.</translation> </message> <message> - <location line="-12"/> + <location line="+13"/> <source>Error: Invalid combination of -regtest and -testnet.</source> <translation>BÅ‚Ä…d: Niepoprawna kombinacja -regtest i -testnet.</translation> </message> @@ -1719,7 +1735,7 @@ Adres: %4 <location line="+36"/> <location line="+23"/> <location line="+23"/> - <location filename="../rpcconsole.cpp" line="+359"/> + <location filename="../rpcconsole.cpp" line="+373"/> <source>N/A</source> <translation>NIEDOSTĘPNE</translation> </message> @@ -1815,11 +1831,13 @@ Adres: %4 </message> <message> <location line="+64"/> + <location filename="../rpcconsole.cpp" line="-10"/> <source>In:</source> <translation>WejÅ›cie:</translation> </message> <message> <location line="+80"/> + <location filename="../rpcconsole.cpp" line="+1"/> <source>Out:</source> <translation>WyjÅ›cie:</translation> </message> @@ -1844,7 +1862,7 @@ Adres: %4 <translation>Wyczyść konsolÄ™</translation> </message> <message> - <location filename="../rpcconsole.cpp" line="-30"/> + <location filename="../rpcconsole.cpp" line="-35"/> <source>Welcome to the Bitcoin RPC console.</source> <translation>Witam w konsoli Bitcoin RPC</translation> </message> @@ -1859,7 +1877,7 @@ Adres: %4 <translation>Wpisz <b>help</b> aby uzyskać listÄ™ dostÄ™pnych komend</translation> </message> <message> - <location line="+122"/> + <location line="+136"/> <source>%1 B</source> <translation>%1 B</translation> </message> @@ -1957,7 +1975,7 @@ Adres: %4 <message> <location line="+78"/> <source>Requested payments history</source> - <translation type="unfinished"/> + <translation>Żądanie historii pÅ‚atnoÅ›ci</translation> </message> <message> <location line="-98"/> @@ -1975,7 +1993,7 @@ Adres: %4 <translation>Pokaż</translation> </message> <message> - <location line="+11"/> + <location line="+14"/> <source>Remove the selected entries from the list</source> <translation>UsuÅ„ zaznaczone z listy</translation> </message> @@ -1985,7 +2003,7 @@ Adres: %4 <translation>UsuÅ„</translation> </message> <message> - <location filename="../receivecoinsdialog.cpp" line="+38"/> + <location filename="../receivecoinsdialog.cpp" line="+39"/> <source>Copy label</source> <translation>Kopiuj etykietÄ™</translation> </message> @@ -2098,7 +2116,7 @@ Adres: %4 <message> <location line="+9"/> <source>(no message)</source> - <translation type="unfinished"/> + <translation>(brak wiadomoÅ›ci)</translation> </message> <message> <location line="+8"/> @@ -2123,17 +2141,17 @@ Adres: %4 <message> <location line="+20"/> <source>Inputs...</source> - <translation type="unfinished"/> + <translation>WejÅ›cia...</translation> </message> <message> <location line="+7"/> <source>automatically selected</source> - <translation type="unfinished"/> + <translation>zaznaczone automatycznie</translation> </message> <message> <location line="+19"/> <source>Insufficient funds!</source> - <translation type="unfinished"/> + <translation>NiewystarczajÄ…ce Å›rodki</translation> </message> <message> <location line="+89"/> @@ -2178,7 +2196,7 @@ Adres: %4 <message> <location line="+44"/> <source>If this is activated, but the change address is empty or invalid, change will be sent to a newly generated address.</source> - <translation type="unfinished"/> + <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> </message> <message> <location line="+3"/> @@ -2206,12 +2224,12 @@ Adres: %4 <translation>Wyczyść &wszystko</translation> </message> <message> - <location line="+52"/> + <location line="+58"/> <source>Balance:</source> <translation>Saldo:</translation> </message> <message> - <location line="-78"/> + <location line="-84"/> <source>Confirm the send action</source> <translation>Potwierdź akcjÄ™ wysyÅ‚ania</translation> </message> @@ -2276,7 +2294,7 @@ Adres: %4 <message> <location line="+170"/> <source>Total Amount %1 (= %2)</source> - <translation type="unfinished"/> + <translation>ÅÄ…czna kwota %1 (= %2)</translation> </message> <message> <location line="+2"/> @@ -2316,7 +2334,7 @@ Adres: %4 <message> <location line="+4"/> <source>The transaction was rejected! This might happen if some of the coins in your wallet were already spent, such as if you used a copy of wallet.dat and coins were spent in the copy but not marked as spent here.</source> - <translation type="unfinished"/> + <translation>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> <location line="+113"/> @@ -2458,7 +2476,7 @@ Adres: %4 <message> <location filename="../utilitydialog.cpp" line="+48"/> <source>Bitcoin Core is shutting down...</source> - <translation type="unfinished"/> + <translation>Bitcoin Core siÄ™ zamyka...</translation> </message> <message> <location line="+1"/> @@ -3101,7 +3119,7 @@ Adres: %4 <message> <location line="+1"/> <source>Edit label</source> - <translation>Edytuj etykietÄ™</translation> + <translation>ZmieÅ„ etykietÄ™</translation> </message> <message> <location line="+1"/> @@ -3109,7 +3127,7 @@ Adres: %4 <translation>Pokaż szczegóły transakcji</translation> </message> <message> - <location line="+142"/> + <location line="+140"/> <source>Export Transaction History</source> <translation>Eksport historii transakcji</translation> </message> @@ -3230,12 +3248,12 @@ Adres: %4 <message> <location line="+0"/> <source>There was an error trying to save the wallet data to %1.</source> - <translation type="unfinished"/> + <translation>WystÄ…piÅ‚ bÅ‚Ä…d przy próbie zapisu pliku portfela do %1.</translation> </message> <message> <location line="+4"/> <source>The wallet data was successfully saved to %1.</source> - <translation type="unfinished"/> + <translation>Plik portfela zostaÅ‚ zapisany do %1.</translation> </message> <message> <location line="+0"/> @@ -3246,7 +3264,7 @@ Adres: %4 <context> <name>bitcoin-core</name> <message> - <location filename="../bitcoinstrings.cpp" line="+223"/> + <location filename="../bitcoinstrings.cpp" line="+226"/> <source>Usage:</source> <translation>Użycie:</translation> </message> @@ -3281,12 +3299,7 @@ Adres: %4 <translation>Wskaż folder danych</translation> </message> <message> - <location line="-9"/> - <source>Set database cache size in megabytes (default: 25)</source> - <translation>Ustaw rozmiar w megabajtach cache-u bazy danych (domyÅ›lnie: 25)</translation> - </message> - <message> - <location line="-26"/> + <location line="-35"/> <source>Listen for connections on <port> (default: 8333 or testnet: 18333)</source> <translation>NasÅ‚uchuj poÅ‚Ä…czeÅ„ na <port> (domyÅ›lnie: 8333 lub testnet: 18333)</translation> </message> @@ -3311,22 +3324,22 @@ Adres: %4 <translation>Próg po którym nastÄ…pi rozÅ‚Ä…czenie nietrzymajÄ…cych siÄ™ zasad peerów (domyÅ›lnie: 100)</translation> </message> <message> - <location line="-150"/> + <location line="-151"/> <source>Number of seconds to keep misbehaving peers from reconnecting (default: 86400)</source> <translation>Czas w sekundach, przez jaki nietrzymajÄ…cy siÄ™ zasad peerzy nie bÄ™dÄ… mogli ponownie siÄ™ podÅ‚Ä…czyć (domyÅ›lnie: 86400)</translation> </message> <message> - <location line="-36"/> + <location line="-38"/> <source>An error occurred while setting up the RPC port %u for listening on IPv4: %s</source> <translation>WystÄ…piÅ‚ bÅ‚Ä…d podczas ustawiania portu RPC %u w tryb nasÅ‚uchu: %s</translation> </message> <message> - <location line="+34"/> + <location line="+36"/> <source>Listen for JSON-RPC connections on <port> (default: 8332 or testnet: 18332)</source> <translation>NasÅ‚uchuj poÅ‚Ä…czeÅ„ JSON-RPC na <port> (domyÅ›lnie: 8332 or testnet: 18332)</translation> </message> <message> - <location line="+45"/> + <location line="+46"/> <source>Accept command line and JSON-RPC commands</source> <translation>Akceptuj liniÄ™ poleceÅ„ oraz polecenia JSON-RPC</translation> </message> @@ -3346,7 +3359,7 @@ Adres: %4 <translation>Akceptuj poÅ‚Ä…czenia z zewnÄ…trz (domyÅ›lnie: 1 jeÅ›li nie ustawiono -proxy lub -connect)</translation> </message> <message> - <location line="-95"/> + <location line="-98"/> <source>%s, you must set a rpcpassword in the configuration file: %s It is recommended you use the following random password: @@ -3385,12 +3398,7 @@ na przykÅ‚ad: alertnotify=echo %%s | mail -s "Alarm Bitcoin" admin@foo <translation>Skojarz z podanym adresem. Użyj formatu [host]:port dla IPv6 </translation> </message> <message> - <location line="+3"/> - <source>Cannot obtain a lock on data directory %s. Bitcoin is probably already running.</source> - <translation>Nie można zablokować folderu danych %s. Bitcoin prawdopodobnie już dziaÅ‚a.</translation> - </message> - <message> - <location line="+3"/> + <location line="+6"/> <source>Enter regression test mode, which uses a special chain in which blocks can be solved instantly. This is intended for regression testing tools and app development.</source> <translation>WejÅ›cie w tryb testów regresji, który wykorzystuje specjalny Å‚aÅ„cuch, w którym bloki można rozwiÄ…zać natychmiast. To jest przeznaczone dla narzÄ™dzi testowania regresji i rozwoju aplikacji.</translation> </message> @@ -3401,6 +3409,11 @@ na przykÅ‚ad: alertnotify=echo %%s | mail -s "Alarm Bitcoin" admin@foo </message> <message> <location line="+3"/> + <source>Error: Listening for incoming connections failed (listen returned error %d)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+2"/> <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> @@ -3420,7 +3433,12 @@ na przykÅ‚ad: alertnotify=echo %%s | mail -s "Alarm Bitcoin" admin@foo <translation>To jest testowa wersja - używaj na wÅ‚asne ryzyko - nie używaj do wykopywania oraz przy aplikacjach kupieckich</translation> </message> <message> - <location line="+5"/> + <location line="+3"/> + <source>Unable to bind to %s on this computer. Bitcoin Core is probably already running.</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+3"/> <source>Use separate SOCKS5 proxy to reach peers via Tor hidden services (default: -proxy)</source> <translation type="unfinished"/> </message> @@ -3680,7 +3698,12 @@ na przykÅ‚ad: alertnotify=echo %%s | mail -s "Alarm Bitcoin" admin@foo <translation>WyÅ›lij polecenie do serwera Bitcoin</translation> </message> <message> - <location line="+7"/> + <location line="+5"/> + <source>Set database cache size in megabytes (%d to %d, default: %d)</source> + <translation>Ustaw wielkość pamiÄ™ci podrÄ™cznej w megabajtach (%d do %d, domyÅ›lnie: %d)</translation> + </message> + <message> + <location line="+2"/> <source>Set maximum block size in bytes (default: %d)</source> <translation>Ustaw maksymalnÄ… wielkość bloku w bajtach (domyÅ›lnie: %d)</translation> </message> @@ -3755,7 +3778,12 @@ na przykÅ‚ad: alertnotify=echo %%s | mail -s "Alarm Bitcoin" admin@foo <translation>Importuj bloki z zewnÄ™trznego pliku blk000??.dat</translation> </message> <message> - <location line="-106"/> + <location line="-126"/> + <source>Cannot obtain a lock on data directory %s. Bitcoin Core is probably already running.</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+19"/> <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> @@ -3767,7 +3795,7 @@ na przykÅ‚ad: alertnotify=echo %%s | mail -s "Alarm Bitcoin" admin@foo <message> <location line="+2"/> <source>Set maximum size of high-priority/low-fee transactions in bytes (default: %d)</source> - <translation type="unfinished"/> + <translation>Ustaw maksymalny rozmiar transakcji o wysokim priorytecie/niskiej prowizji w bajtach (domyÅ›lnie: 27000)</translation> </message> <message> <location line="+2"/> @@ -3775,7 +3803,7 @@ na przykÅ‚ad: alertnotify=echo %%s | mail -s "Alarm Bitcoin" admin@foo <translation>Ustaw liczbÄ™ wÄ…tków skryptu weryfikacji (do 16, 0 = auto, <0 = zostawia takÄ… ilość rdzenie wolnych, domyÅ›lnie: 0)</translation> </message> <message> - <location line="+90"/> + <location line="+91"/> <source>Information</source> <translation>Informacja</translation> </message> @@ -3920,12 +3948,12 @@ na przykÅ‚ad: alertnotify=echo %%s | mail -s "Alarm Bitcoin" admin@foo <translation>WysyÅ‚aj polecenia do wÄ™zÅ‚a dziaÅ‚ajÄ…cego na <ip> (domyÅ›lnie: 127.0.0.1)</translation> </message> <message> - <location line="-133"/> + <location line="-134"/> <source>Execute command when the best block changes (%s in cmd is replaced by block hash)</source> <translation>Wykonaj polecenie kiedy najlepszy blok ulegnie zmianie (%s w komendzie zastanie zastÄ…pione przez hash bloku)</translation> </message> <message> - <location line="+163"/> + <location line="+164"/> <source>Upgrade wallet to latest format</source> <translation>Zaktualizuj portfel do najnowszego formatu.</translation> </message> @@ -4045,12 +4073,7 @@ na przykÅ‚ad: alertnotify=echo %%s | mail -s "Alarm Bitcoin" admin@foo <translation>Dodaj wÄ™zeÅ‚ do Å‚Ä…czenia siÄ™ and attempt to keep the connection open</translation> </message> <message> - <location line="-32"/> - <source>Unable to bind to %s on this computer. Bitcoin is probably already running.</source> - <translation>Nie można przywiÄ…zać %s na tym komputerze. Bitcoin prawdopodobnie już dziaÅ‚a.</translation> - </message> - <message> - <location line="+96"/> + <location line="+64"/> <source>Loading wallet...</source> <translation>Wczytywanie portfela...</translation> </message> diff --git a/src/qt/locale/bitcoin_ro_RO.ts b/src/qt/locale/bitcoin_ro_RO.ts index 205fa7244c..277571152b 100644 --- a/src/qt/locale/bitcoin_ro_RO.ts +++ b/src/qt/locale/bitcoin_ro_RO.ts @@ -1,4 +1,4 @@ -<?xml version="1.0" ?><!DOCTYPE TS><TS language="ro_RO" version="2.0"> +<?xml version="1.0" ?><!DOCTYPE TS><TS language="ro_RO" version="2.1"> <context> <name>AboutDialog</name> <message> @@ -71,7 +71,7 @@ Acest produs include programe dezvoltate de către OpenSSL Project pentru a fi f <translation>&Copiere</translation> </message> <message> - <location line="+52"/> + <location line="+58"/> <source>C&lose</source> <translation>&Inchidere</translation> </message> @@ -81,7 +81,7 @@ Acest produs include programe dezvoltate de către OpenSSL Project pentru a fi f <translation>&Copiază adresa</translation> </message> <message> - <location filename="../forms/addressbookpage.ui" line="-41"/> + <location filename="../forms/addressbookpage.ui" line="-47"/> <source>Delete the currently selected address from the list</source> <translation>Sterge adresele curent selectate din lista</translation> </message> @@ -328,7 +328,7 @@ Acest produs include programe dezvoltate de către OpenSSL Project pentru a fi f <context> <name>BitcoinGUI</name> <message> - <location filename="../bitcoingui.cpp" line="+295"/> + <location filename="../bitcoingui.cpp" line="+294"/> <source>Sign &message...</source> <translation>Semnează &mesaj...</translation> </message> @@ -343,12 +343,12 @@ Acest produs include programe dezvoltate de către OpenSSL Project pentru a fi f <translation>&Imagine de ansamblu</translation> </message> <message> - <location line="-137"/> + <location line="-136"/> <source>Node</source> <translation>Nod</translation> </message> <message> - <location line="+138"/> + <location line="+137"/> <source>Show general overview of wallet</source> <translation>Arată o stare generală de ansamblu a portofelului</translation> </message> @@ -469,17 +469,17 @@ Acest produs include programe dezvoltate de către OpenSSL Project pentru a fi f <translation>&Verifică mesajul...</translation> </message> <message> - <location line="+430"/> + <location line="+440"/> <source>Bitcoin</source> <translation>Bitcoin</translation> </message> <message> - <location line="-643"/> + <location line="-652"/> <source>Wallet</source> <translation>Portofelul</translation> </message> <message> - <location line="+146"/> + <location line="+145"/> <source>&Send</source> <translation>&Trimite</translation> </message> @@ -535,18 +535,18 @@ Acest produs include programe dezvoltate de către OpenSSL Project pentru a fi f <translation>Bara de file</translation> </message> <message> - <location line="-284"/> - <location line="+376"/> + <location line="-283"/> + <location line="+375"/> <source>[testnet]</source> <translation>[testnet]</translation> </message> <message> - <location line="-401"/> + <location line="-400"/> <source>Bitcoin Core</source> <translation>Bitcoin Core</translation> </message> <message> - <location line="+163"/> + <location line="+162"/> <source>Request payments (generates QR codes and bitcoin: URIs)</source> <translation>Cereti plati (genereaza coduri QR si bitcoin-uri: URls)</translation> </message> @@ -608,7 +608,7 @@ Acest produs include programe dezvoltate de către OpenSSL Project pentru a fi f <translation>S-au procesat %1 blocuri din istoricul tranzacÈ›iilor.</translation> </message> <message numerus="yes"> - <location line="+23"/> + <location line="+27"/> <source>%n hour(s)</source> <translation><numerusform>%n oră</numerusform><numerusform>%n ore</numerusform><numerusform>%n ore</numerusform></translation> </message> @@ -619,6 +619,7 @@ Acest produs include programe dezvoltate de către OpenSSL Project pentru a fi f </message> <message numerus="yes"> <location line="+4"/> + <location line="+6"/> <source>%n week(s)</source> <translation><numerusform>%n săptămână</numerusform><numerusform>%n săptămâni</numerusform><numerusform>%n de săptămâni</numerusform></translation> </message> @@ -663,12 +664,12 @@ Acest produs include programe dezvoltate de către OpenSSL Project pentru a fi f <translation>InformaÈ›ie</translation> </message> <message> - <location line="-85"/> + <location line="-95"/> <source>Up to date</source> <translation>Actualizat</translation> </message> <message> - <location line="+34"/> + <location line="+44"/> <source>Catching up...</source> <translation>Se actualizează...</translation> </message> @@ -706,7 +707,7 @@ Adresa: %4 <translation>Portofelul este <b>criptat</b> iar în momentul de față este <b>blocat</b></translation> </message> <message> - <location filename="../bitcoin.cpp" line="+435"/> + <location filename="../bitcoin.cpp" line="+441"/> <source>A fatal error occurred. Bitcoin can no longer continue safely and will quit.</source> <translation>A survenit o eroare fatala. Bitcoin nu mai poate continua in siguranta si se va opri.</translation> </message> @@ -714,7 +715,7 @@ Adresa: %4 <context> <name>ClientModel</name> <message> - <location filename="../clientmodel.cpp" line="+119"/> + <location filename="../clientmodel.cpp" line="+128"/> <source>Network Alert</source> <translation>Alertă reÈ›ea</translation> </message> @@ -812,7 +813,7 @@ Adresa: %4 <translation>Prioritate</translation> </message> <message> - <location filename="../coincontroldialog.cpp" line="+42"/> + <location filename="../coincontroldialog.cpp" line="+41"/> <source>Copy address</source> <translation>Copiază adresa</translation> </message> @@ -878,7 +879,7 @@ Adresa: %4 <translation>CopiaÅ£i schimb</translation> </message> <message> - <location line="+323"/> + <location line="+332"/> <source>highest</source> <translation>cel mai mare</translation> </message> @@ -930,7 +931,7 @@ Adresa: %4 <message> <location line="+31"/> <source>none</source> - <translation type="unfinished"/> + <translation>nimic</translation> </message> <message> <location line="+141"/> @@ -971,7 +972,7 @@ Adresa: %4 <message> <location line="+1"/> <source>This label turns red, if the priority is smaller than "medium".</source> - <translation type="unfinished"/> + <translation>Aceasta eticheta se face rosie daca prioritatea e mai mica decat media</translation> </message> <message> <location line="+3"/> @@ -996,7 +997,7 @@ Adresa: %4 </message> <message> <location line="+43"/> - <location line="+66"/> + <location line="+63"/> <source>(no label)</source> <translation>(fără etichetă)</translation> </message> @@ -1193,7 +1194,7 @@ Adresa: %4 <translation>FoloseÈ™te un dosar de date personalizat:</translation> </message> <message> - <location filename="../intro.cpp" line="+85"/> + <location filename="../intro.cpp" line="+82"/> <source>Bitcoin</source> <translation>Bitcoin</translation> </message> @@ -1299,12 +1300,7 @@ Adresa: %4 <translation type="unfinished"/> </message> <message> - <location line="+107"/> - <source>&Spend unconfirmed change (experts only)</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+37"/> + <location line="+153"/> <source>Connect to the Bitcoin network through a SOCKS proxy.</source> <translation>Conecteaza-te la reteaua Bitcoin printr-un proxy SOCKS</translation> </message> @@ -1319,7 +1315,7 @@ Adresa: %4 <translation type="unfinished"/> </message> <message> - <location line="+224"/> + <location line="+214"/> <source>Active command-line options that override above options:</source> <translation type="unfinished"/> </message> @@ -1334,22 +1330,37 @@ Adresa: %4 <translation>&Resetează opÈ›iunile</translation> </message> <message> - <location line="-323"/> + <location line="-313"/> <source>&Network</source> <translation>&Retea</translation> </message> <message> - <location line="-86"/> + <location line="-95"/> <source>W&allet</source> <translation type="unfinished"/> </message> <message> - <location line="+52"/> + <location line="+65"/> + <source>Expert</source> + <translation>expert</translation> + </message> + <message> + <location line="+9"/> + <source>Enable coin &control features</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+7"/> <source>If you disable the spending of unconfirmed change, the change from a transaction cannot be used until that transaction has at least one confirmation. This also affects how your balance is computed.</source> <translation type="unfinished"/> </message> <message> - <location line="+40"/> + <location line="+3"/> + <source>&Spend unconfirmed change</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+17"/> <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> </message> @@ -1444,17 +1455,12 @@ Adresa: %4 <translation>&AfiÅŸează adresele în lista de tranzacÅ£ii</translation> </message> <message> - <location line="+7"/> + <location line="-262"/> <source>Whether to show coin control features or not.</source> <translation>Dacă să se afiÅŸeze controlul caracteristicilor monedei sau nu.</translation> </message> <message> - <location line="+3"/> - <source>Display coin &control features (experts only)</source> - <translation>AfiÅŸeare controlul caracteristicilor monedei (doat pentru experÅ£i)</translation> - </message> - <message> - <location line="+136"/> + <location line="+398"/> <source>&OK</source> <translation>& OK</translation> </message> @@ -1471,7 +1477,7 @@ Adresa: %4 <message> <location line="+58"/> <source>none</source> - <translation type="unfinished"/> + <translation>nimic</translation> </message> <message> <location line="+78"/> @@ -1667,18 +1673,18 @@ Adresa: %4 <context> <name>QObject</name> <message> - <location filename="../bitcoin.cpp" line="+71"/> - <location line="+11"/> + <location filename="../bitcoin.cpp" line="+63"/> + <location line="+14"/> <source>Bitcoin</source> <translation>Bitcoin</translation> </message> <message> - <location line="+1"/> + <location line="-13"/> <source>Error: Specified data directory "%1" does not exist.</source> <translation>Eroare: Directorul datelor specificate "%1" nu exista.</translation> </message> <message> - <location line="-12"/> + <location line="+13"/> <source>Error: Invalid combination of -regtest and -testnet.</source> <translation>Eroare: combinaÈ›ie nevalidă de -regtest È™i -testnet.</translation> </message> @@ -1729,7 +1735,7 @@ Adresa: %4 <location line="+36"/> <location line="+23"/> <location line="+23"/> - <location filename="../rpcconsole.cpp" line="+359"/> + <location filename="../rpcconsole.cpp" line="+373"/> <source>N/A</source> <translation>N/A</translation> </message> @@ -1825,11 +1831,13 @@ Adresa: %4 </message> <message> <location line="+64"/> + <location filename="../rpcconsole.cpp" line="-10"/> <source>In:</source> <translation>în:</translation> </message> <message> <location line="+80"/> + <location filename="../rpcconsole.cpp" line="+1"/> <source>Out:</source> <translation>IeÈ™ire.</translation> </message> @@ -1854,7 +1862,7 @@ Adresa: %4 <translation>Curăță consola</translation> </message> <message> - <location filename="../rpcconsole.cpp" line="-30"/> + <location filename="../rpcconsole.cpp" line="-35"/> <source>Welcome to the Bitcoin RPC console.</source> <translation>Bun venit la consola bitcoin RPC</translation> </message> @@ -1869,7 +1877,7 @@ Adresa: %4 <translation>Scrie <b>help</b> pentru a vedea comenzile disponibile</translation> </message> <message> - <location line="+122"/> + <location line="+136"/> <source>%1 B</source> <translation>%1 B</translation> </message> @@ -1967,7 +1975,7 @@ Adresa: %4 <message> <location line="+78"/> <source>Requested payments history</source> - <translation type="unfinished"/> + <translation>Istoricul platilor a fost cerut</translation> </message> <message> <location line="-98"/> @@ -1985,7 +1993,7 @@ Adresa: %4 <translation>Arată</translation> </message> <message> - <location line="+11"/> + <location line="+14"/> <source>Remove the selected entries from the list</source> <translation type="unfinished"/> </message> @@ -1995,7 +2003,7 @@ Adresa: %4 <translation>Elimină</translation> </message> <message> - <location filename="../receivecoinsdialog.cpp" line="+38"/> + <location filename="../receivecoinsdialog.cpp" line="+39"/> <source>Copy label</source> <translation>Copiază eticheta</translation> </message> @@ -2216,12 +2224,12 @@ Adresa: %4 <translation>Șterge &tot</translation> </message> <message> - <location line="+52"/> + <location line="+58"/> <source>Balance:</source> <translation>Balanță:</translation> </message> <message> - <location line="-78"/> + <location line="-84"/> <source>Confirm the send action</source> <translation>Confirmă operaÈ›iunea de trimitere</translation> </message> @@ -2423,7 +2431,7 @@ Adresa: %4 <location line="+524"/> <location line="+536"/> <source>Remove this entry</source> - <translation type="unfinished"/> + <translation>Scoate aceasta introducere</translation> </message> <message> <location line="-1008"/> @@ -3119,7 +3127,7 @@ Adresa: %4 <translation>Arată detaliile tranzacÈ›iei</translation> </message> <message> - <location line="+142"/> + <location line="+140"/> <source>Export Transaction History</source> <translation>Exportare Istoric TranzacÅ£ii</translation> </message> @@ -3256,7 +3264,7 @@ Adresa: %4 <context> <name>bitcoin-core</name> <message> - <location filename="../bitcoinstrings.cpp" line="+223"/> + <location filename="../bitcoinstrings.cpp" line="+226"/> <source>Usage:</source> <translation>Uz:</translation> </message> @@ -3291,12 +3299,7 @@ Adresa: %4 <translation>Specifică dosarul de date</translation> </message> <message> - <location line="-9"/> - <source>Set database cache size in megabytes (default: 25)</source> - <translation>Setează mărimea cache a bazei de date în megabiÈ›i (implicit: 25)</translation> - </message> - <message> - <location line="-26"/> + <location line="-35"/> <source>Listen for connections on <port> (default: 8333 or testnet: 18333)</source> <translation>Ascultă pentru conectări pe <port> (implicit: 8333 sau testnet: 18333)</translation> </message> @@ -3321,22 +3324,22 @@ Adresa: %4 <translation>Prag pentru deconectarea partenerilor care nu funcÈ›ionează corect (implicit: 100)</translation> </message> <message> - <location line="-150"/> + <location line="-151"/> <source>Number of seconds to keep misbehaving peers from reconnecting (default: 86400)</source> <translation>Numărul de secunde pentru a preveni reconectarea partenerilor care nu funcÈ›ionează corect (implicit: 86400)</translation> </message> <message> - <location line="-36"/> + <location line="-38"/> <source>An error occurred while setting up the RPC port %u for listening on IPv4: %s</source> <translation>A intervenit o eroare in timp ce se seta portul RPC %u pentru ascultare pe IPv4: %s</translation> </message> <message> - <location line="+34"/> + <location line="+36"/> <source>Listen for JSON-RPC connections on <port> (default: 8332 or testnet: 18332)</source> <translation>Ascultă pentru conexiuni JSON-RPC pe <port> (implicit:8332 sau testnet: 18332)</translation> </message> <message> - <location line="+45"/> + <location line="+46"/> <source>Accept command line and JSON-RPC commands</source> <translation>Se acceptă comenzi din linia de comandă È™i comenzi JSON-RPC</translation> </message> @@ -3356,7 +3359,7 @@ Adresa: %4 <translation>Acceptă conexiuni din afară (implicit: 1 dacă nu se foloseÈ™te -proxy sau -connect)</translation> </message> <message> - <location line="-95"/> + <location line="-98"/> <source>%s, you must set a rpcpassword in the configuration file: %s It is recommended you use the following random password: @@ -3397,12 +3400,7 @@ spre exemplu: alertnotify=echo %%s | mail -s "Alerta Bitcoin" admin@fo <translation>Atasati adresei date si ascultati totdeauna pe ea. Folositi [host]:port notatia pentru IPv6</translation> </message> <message> - <location line="+3"/> - <source>Cannot obtain a lock on data directory %s. Bitcoin is probably already running.</source> - <translation>Nu se poate obÈ›ine o blocare a directorului de date %s. Bitcoin probabil rulează deja.</translation> - </message> - <message> - <location line="+3"/> + <location line="+6"/> <source>Enter regression test mode, which uses a special chain in which blocks can be solved instantly. This is intended for regression testing tools and app development.</source> <translation>Initiati modul de test al regresie, care foloseste un lant special in care block-urile pot fi rezolvate instantaneu. Acest lucru este facut pentru utilitare si aplicatii de dezvoltare pentru testarea regresiei.</translation> </message> @@ -3413,6 +3411,11 @@ spre exemplu: alertnotify=echo %%s | mail -s "Alerta Bitcoin" admin@fo </message> <message> <location line="+3"/> + <source>Error: Listening for incoming connections failed (listen returned error %d)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+2"/> <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> </message> @@ -3432,7 +3435,12 @@ spre exemplu: alertnotify=echo %%s | mail -s "Alerta Bitcoin" admin@fo <translation>Aceasta este o versiune de test preliminara - va asumati riscul folosind-o - nu folositi pentru minerit sau aplicatiile comerciantilor.</translation> </message> <message> - <location line="+5"/> + <location line="+3"/> + <source>Unable to bind to %s on this computer. Bitcoin Core is probably already running.</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+3"/> <source>Use separate SOCKS5 proxy to reach peers via Tor hidden services (default: -proxy)</source> <translation>Utilizare proxy SOCKS5 separat pentru a ajunge la servicii ascunse TOR (implicit: -proxy)</translation> </message> @@ -3692,7 +3700,12 @@ spre exemplu: alertnotify=echo %%s | mail -s "Alerta Bitcoin" admin@fo <translation>Trimite comanda la serverul Bitcoin</translation> </message> <message> - <location line="+7"/> + <location line="+5"/> + <source>Set database cache size in megabytes (%d to %d, default: %d)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+2"/> <source>Set maximum block size in bytes (default: %d)</source> <translation>SetaÅ£i dimensiunea maximă a unui block în bytes (implicit: %d)</translation> </message> @@ -3767,7 +3780,12 @@ spre exemplu: alertnotify=echo %%s | mail -s "Alerta Bitcoin" admin@fo <translation>Importă blocuri dintr-un fiÈ™ier extern blk000??.dat</translation> </message> <message> - <location line="-106"/> + <location line="-126"/> + <source>Cannot obtain a lock on data directory %s. Bitcoin Core is probably already running.</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+19"/> <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> </message> @@ -3787,7 +3805,7 @@ spre exemplu: alertnotify=echo %%s | mail -s "Alerta Bitcoin" admin@fo <translation type="unfinished"/> </message> <message> - <location line="+90"/> + <location line="+91"/> <source>Information</source> <translation>InformaÈ›ie</translation> </message> @@ -3932,12 +3950,12 @@ spre exemplu: alertnotify=echo %%s | mail -s "Alerta Bitcoin" admin@fo <translation>Trimite comenzi la nodul care rulează la <ip> (implicit: 127.0.0.1)</translation> </message> <message> - <location line="-133"/> + <location line="-134"/> <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> </message> <message> - <location line="+163"/> + <location line="+164"/> <source>Upgrade wallet to latest format</source> <translation>Actualizează portofelul la ultimul format</translation> </message> @@ -4057,12 +4075,7 @@ spre exemplu: alertnotify=echo %%s | mail -s "Alerta Bitcoin" admin@fo <translation>Adaugă un nod la care te poÈ›i conecta pentru a menÈ›ine conexiunea deschisă</translation> </message> <message> - <location line="-32"/> - <source>Unable to bind to %s on this computer. Bitcoin is probably already running.</source> - <translation>Imposibilitatea de a lega la% s pe acest computer. Bitcoin este, probabil, deja în execuÈ›ie.</translation> - </message> - <message> - <location line="+96"/> + <location line="+64"/> <source>Loading wallet...</source> <translation>ÃŽncarc portofel...</translation> </message> diff --git a/src/qt/locale/bitcoin_sah.ts b/src/qt/locale/bitcoin_sah.ts index c5a3361bad..677ba01c12 100644 --- a/src/qt/locale/bitcoin_sah.ts +++ b/src/qt/locale/bitcoin_sah.ts @@ -31,6 +31,12 @@ This product includes software developed by the OpenSSL Project for use in the O <source>The Bitcoin Core developers</source> <translation type="unfinished"/> </message> + <message> + <location line="+12"/> + <location line="+2"/> + <source>(%1-bit)</source> + <translation type="unfinished"/> + </message> </context> <context> <name>AddressBookPage</name> @@ -60,7 +66,7 @@ This product includes software developed by the OpenSSL Project for use in the O <translation type="unfinished"/> </message> <message> - <location line="+52"/> + <location line="+58"/> <source>C&lose</source> <translation type="unfinished"/> </message> @@ -70,7 +76,7 @@ This product includes software developed by the OpenSSL Project for use in the O <translation type="unfinished"/> </message> <message> - <location filename="../forms/addressbookpage.ui" line="-41"/> + <location filename="../forms/addressbookpage.ui" line="-47"/> <source>Delete the currently selected address from the list</source> <translation type="unfinished"/> </message> @@ -317,7 +323,7 @@ This product includes software developed by the OpenSSL Project for use in the O <context> <name>BitcoinGUI</name> <message> - <location filename="../bitcoingui.cpp" line="+295"/> + <location filename="../bitcoingui.cpp" line="+294"/> <source>Sign &message...</source> <translation type="unfinished"/> </message> @@ -332,12 +338,12 @@ This product includes software developed by the OpenSSL Project for use in the O <translation type="unfinished"/> </message> <message> - <location line="-137"/> + <location line="-136"/> <source>Node</source> <translation type="unfinished"/> </message> <message> - <location line="+138"/> + <location line="+137"/> <source>Show general overview of wallet</source> <translation type="unfinished"/> </message> @@ -458,17 +464,17 @@ This product includes software developed by the OpenSSL Project for use in the O <translation type="unfinished"/> </message> <message> - <location line="+430"/> + <location line="+440"/> <source>Bitcoin</source> <translation type="unfinished"/> </message> <message> - <location line="-643"/> + <location line="-652"/> <source>Wallet</source> <translation type="unfinished"/> </message> <message> - <location line="+146"/> + <location line="+145"/> <source>&Send</source> <translation type="unfinished"/> </message> @@ -524,18 +530,18 @@ This product includes software developed by the OpenSSL Project for use in the O <translation type="unfinished"/> </message> <message> - <location line="-284"/> - <location line="+376"/> + <location line="-283"/> + <location line="+375"/> <source>[testnet]</source> <translation type="unfinished"/> </message> <message> - <location line="-401"/> + <location line="-400"/> <source>Bitcoin Core</source> <translation type="unfinished"/> </message> <message> - <location line="+163"/> + <location line="+162"/> <source>Request payments (generates QR codes and bitcoin: URIs)</source> <translation type="unfinished"/> </message> @@ -597,7 +603,7 @@ This product includes software developed by the OpenSSL Project for use in the O <translation type="unfinished"/> </message> <message numerus="yes"> - <location line="+23"/> + <location line="+27"/> <source>%n hour(s)</source> <translation type="unfinished"><numerusform></numerusform></translation> </message> @@ -608,10 +614,21 @@ This product includes software developed by the OpenSSL Project for use in the O </message> <message numerus="yes"> <location line="+4"/> + <location line="+6"/> <source>%n week(s)</source> <translation type="unfinished"><numerusform></numerusform></translation> </message> <message> + <location line="+0"/> + <source>%1 and %2</source> + <translation type="unfinished"/> + </message> + <message numerus="yes"> + <location line="+0"/> + <source>%n year(s)</source> + <translation type="unfinished"><numerusform></numerusform></translation> + </message> + <message> <location line="+4"/> <source>%1 behind</source> <translation type="unfinished"/> @@ -642,12 +659,12 @@ This product includes software developed by the OpenSSL Project for use in the O <translation type="unfinished"/> </message> <message> - <location line="-85"/> + <location line="-95"/> <source>Up to date</source> <translation type="unfinished"/> </message> <message> - <location line="+34"/> + <location line="+44"/> <source>Catching up...</source> <translation type="unfinished"/> </message> @@ -681,7 +698,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location filename="../bitcoin.cpp" line="+438"/> + <location filename="../bitcoin.cpp" line="+443"/> <source>A fatal error occurred. Bitcoin can no longer continue safely and will quit.</source> <translation type="unfinished"/> </message> @@ -689,7 +706,7 @@ Address: %4 <context> <name>ClientModel</name> <message> - <location filename="../clientmodel.cpp" line="+119"/> + <location filename="../clientmodel.cpp" line="+128"/> <source>Network Alert</source> <translation type="unfinished"/> </message> @@ -742,7 +759,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+63"/> + <location line="+56"/> <source>(un)select all</source> <translation type="unfinished"/> </message> @@ -757,7 +774,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+52"/> + <location line="+53"/> <source>Amount</source> <translation type="unfinished"/> </message> @@ -787,7 +804,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location filename="../coincontroldialog.cpp" line="+42"/> + <location filename="../coincontroldialog.cpp" line="+41"/> <source>Copy address</source> <translation type="unfinished"/> </message> @@ -853,7 +870,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+323"/> + <location line="+332"/> <source>highest</source> <translation type="unfinished"/> </message> @@ -903,12 +920,12 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+31"/> + <location line="+32"/> <source>none</source> <translation type="unfinished"/> </message> <message> - <location line="+140"/> + <location line="+141"/> <source>Dust</source> <translation type="unfinished"/> </message> @@ -971,12 +988,12 @@ Address: %4 </message> <message> <location line="+43"/> - <location line="+66"/> + <location line="+61"/> <source>(no label)</source> <translation type="unfinished"/> </message> <message> - <location line="-9"/> + <location line="-7"/> <source>change from %1 (%2)</source> <translation type="unfinished"/> </message> @@ -1057,7 +1074,7 @@ Address: %4 <context> <name>FreespaceChecker</name> <message> - <location filename="../intro.cpp" line="+65"/> + <location filename="../intro.cpp" line="+68"/> <source>A new data directory will be created.</source> <translation type="unfinished"/> </message> @@ -1090,7 +1107,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location filename="../utilitydialog.cpp" line="+38"/> + <location filename="../utilitydialog.cpp" line="+24"/> <source>Bitcoin Core</source> <translation type="unfinished"/> </message> @@ -1115,7 +1132,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+1"/> + <location line="+2"/> <source>Set language, for example "de_DE" (default: system locale)</source> <translation type="unfinished"/> </message> @@ -1126,11 +1143,16 @@ Address: %4 </message> <message> <location line="+1"/> - <source>Show splash screen on startup (default: 1)</source> + <source>Set SSL root certificates for payment request (default: -system-)</source> <translation type="unfinished"/> </message> <message> <location line="+1"/> + <source>Show splash screen on startup (default: 1)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="-4"/> <source>Choose data directory on startup (default: 0)</source> <translation type="unfinished"/> </message> @@ -1168,7 +1190,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location filename="../intro.cpp" line="+85"/> + <location filename="../intro.cpp" line="+82"/> <source>Bitcoin</source> <translation type="unfinished"/> </message> @@ -1178,7 +1200,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+19"/> + <location line="+24"/> <source>Error</source> <translation type="unfinished"/> </message> @@ -1234,7 +1256,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+6"/> + <location line="+116"/> <source>Optional transaction fee per kB that helps make sure your transactions are processed quickly. Most transactions are 1 kB.</source> <translation type="unfinished"/> </message> @@ -1244,7 +1266,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+31"/> + <location line="-125"/> <source>Automatically start Bitcoin after logging in to the system.</source> <translation type="unfinished"/> </message> @@ -1259,12 +1281,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+13"/> - <source>Set database cache size in megabytes (default: 25)</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+13"/> + <location line="+16"/> <source>MB</source> <translation type="unfinished"/> </message> @@ -1274,12 +1291,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+13"/> - <source>Set the number of script verification threads (up to 16, 0 = auto, <0 = leave that many cores free, default: 0)</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+58"/> + <location line="+160"/> <source>Connect to the Bitcoin network through a SOCKS proxy.</source> <translation type="unfinished"/> </message> @@ -1294,7 +1306,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+224"/> + <location line="+214"/> <source>Active command-line options that override above options:</source> <translation type="unfinished"/> </message> @@ -1309,12 +1321,42 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="-323"/> + <location line="-313"/> <source>&Network</source> <translation type="unfinished"/> </message> <message> - <location line="+6"/> + <location line="-131"/> + <source>(0 = auto, <0 = leave that many cores free)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+36"/> + <source>W&allet</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+65"/> + <source>Expert</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+9"/> + <source>Enable coin &control features</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+7"/> + <source>If you disable the spending of unconfirmed change, the change from a transaction cannot be used until that transaction has at least one confirmation. This also affects how your balance is computed.</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+3"/> + <source>&Spend unconfirmed change</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+17"/> <source>Automatically open the Bitcoin client port on the router. This only works when your router supports UPnP and it is enabled.</source> <translation type="unfinished"/> </message> @@ -1409,17 +1451,12 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+7"/> + <location line="-262"/> <source>Whether to show coin control features or not.</source> <translation type="unfinished"/> </message> <message> - <location line="+3"/> - <source>Display coin &control features (experts only)</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+136"/> + <location line="+398"/> <source>&OK</source> <translation type="unfinished"/> </message> @@ -1429,17 +1466,17 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location filename="../optionsdialog.cpp" line="+67"/> + <location filename="../optionsdialog.cpp" line="+72"/> <source>default</source> <translation type="unfinished"/> </message> <message> - <location line="+57"/> + <location line="+58"/> <source>none</source> <translation type="unfinished"/> </message> <message> - <location line="+75"/> + <location line="+80"/> <source>Confirm options reset</source> <translation type="unfinished"/> </message> @@ -1479,18 +1516,13 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="-155"/> - <source>Unconfirmed:</source> - <translation type="unfinished"/> - </message> - <message> - <location line="-83"/> + <location line="-238"/> <source>Wallet</source> <translation type="unfinished"/> </message> <message> <location line="+51"/> - <source>Confirmed:</source> + <source>Available:</source> <translation type="unfinished"/> </message> <message> @@ -1499,7 +1531,12 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+32"/> + <location line="+16"/> + <source>Pending:</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+16"/> <source>Total of transactions that have yet to be confirmed, and do not yet count toward the spendable balance</source> <translation type="unfinished"/> </message> @@ -1632,23 +1669,29 @@ Address: %4 <context> <name>QObject</name> <message> - <location filename="../bitcoin.cpp" line="+71"/> - <location line="+11"/> + <location filename="../bitcoin.cpp" line="+63"/> + <location line="+7"/> + <location line="+13"/> <source>Bitcoin</source> <translation type="unfinished"/> </message> <message> - <location line="+1"/> + <location line="-19"/> <source>Error: Specified data directory "%1" does not exist.</source> <translation type="unfinished"/> </message> <message> - <location line="-12"/> + <location line="+7"/> + <source>Error: Cannot parse configuration file: %1. Only use key=value syntax.</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+12"/> <source>Error: Invalid combination of -regtest and -testnet.</source> <translation type="unfinished"/> </message> <message> - <location filename="../guiutil.cpp" line="+82"/> + <location filename="../guiutil.cpp" line="+89"/> <source>Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source> <translation type="unfinished"/> </message> @@ -1694,7 +1737,7 @@ Address: %4 <location line="+36"/> <location line="+23"/> <location line="+23"/> - <location filename="../rpcconsole.cpp" line="+359"/> + <location filename="../rpcconsole.cpp" line="+373"/> <source>N/A</source> <translation type="unfinished"/> </message> @@ -1790,11 +1833,13 @@ Address: %4 </message> <message> <location line="+64"/> + <location filename="../rpcconsole.cpp" line="-10"/> <source>In:</source> <translation type="unfinished"/> </message> <message> <location line="+80"/> + <location filename="../rpcconsole.cpp" line="+1"/> <source>Out:</source> <translation type="unfinished"/> </message> @@ -1819,7 +1864,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location filename="../rpcconsole.cpp" line="-30"/> + <location filename="../rpcconsole.cpp" line="-35"/> <source>Welcome to the Bitcoin RPC console.</source> <translation type="unfinished"/> </message> @@ -1834,7 +1879,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+122"/> + <location line="+136"/> <source>%1 B</source> <translation type="unfinished"/> </message> @@ -1950,7 +1995,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+11"/> + <location line="+14"/> <source>Remove the selected entries from the list</source> <translation type="unfinished"/> </message> @@ -1960,7 +2005,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location filename="../receivecoinsdialog.cpp" line="+38"/> + <location filename="../receivecoinsdialog.cpp" line="+39"/> <source>Copy label</source> <translation type="unfinished"/> </message> @@ -2181,12 +2226,12 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+52"/> + <location line="+58"/> <source>Balance:</source> <translation type="unfinished"/> </message> <message> - <location line="-78"/> + <location line="-84"/> <source>Confirm the send action</source> <translation type="unfinished"/> </message> @@ -2431,7 +2476,7 @@ Address: %4 <context> <name>ShutdownWindow</name> <message> - <location filename="../utilitydialog.cpp" line="+48"/> + <location filename="../utilitydialog.cpp" line="+52"/> <source>Bitcoin Core is shutting down...</source> <translation type="unfinished"/> </message> @@ -2631,7 +2676,7 @@ Address: %4 <context> <name>SplashScreen</name> <message> - <location filename="../splashscreen.cpp" line="+28"/> + <location filename="../splashscreen.cpp" line="+32"/> <source>Bitcoin Core</source> <translation type="unfinished"/> </message> @@ -2663,6 +2708,11 @@ Address: %4 </message> <message> <location line="+6"/> + <source>conflicted</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+2"/> <source>%1/offline</source> <translation type="unfinished"/> </message> @@ -2824,12 +2874,12 @@ Address: %4 <translation type="unfinished"/> </message> <message numerus="yes"> - <location line="-35"/> + <location line="-37"/> <source>Open for %n more block(s)</source> <translation type="unfinished"><numerusform></numerusform></translation> </message> <message> - <location line="+70"/> + <location line="+72"/> <source>unknown</source> <translation type="unfinished"/> </message> @@ -2870,12 +2920,12 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+59"/> + <location line="+78"/> <source>Immature (%1 confirmations, will be available after %2)</source> <translation type="unfinished"/> </message> <message numerus="yes"> - <location line="+16"/> + <location line="-21"/> <source>Open for %n more block(s)</source> <translation type="unfinished"><numerusform></numerusform></translation> </message> @@ -2885,33 +2935,42 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+3"/> - <source>Offline (%1 confirmations)</source> + <location line="+12"/> + <source>Confirmed (%1 confirmations)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+9"/> + <source>This block was not received by any other nodes and will probably not be accepted!</source> <translation type="unfinished"/> </message> <message> <location line="+3"/> - <source>Unconfirmed (%1 of %2 confirmations)</source> + <source>Generated but not accepted</source> <translation type="unfinished"/> </message> <message> - <location line="-22"/> - <location line="+25"/> - <source>Confirmed (%1 confirmations)</source> + <location line="-21"/> + <source>Offline</source> <translation type="unfinished"/> </message> <message> - <location line="-22"/> - <source>This block was not received by any other nodes and will probably not be accepted!</source> + <location line="+3"/> + <source>Unconfirmed</source> <translation type="unfinished"/> </message> <message> <location line="+3"/> - <source>Generated but not accepted</source> + <source>Confirming (%1 of %2 recommended confirmations)</source> <translation type="unfinished"/> </message> <message> - <location line="+62"/> + <location line="+6"/> + <source>Conflicted</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+51"/> <source>Received with</source> <translation type="unfinished"/> </message> @@ -2941,7 +3000,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+199"/> + <location line="+190"/> <source>Transaction status. Hover over this field to show number of confirmations.</source> <translation type="unfinished"/> </message> @@ -3070,7 +3129,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+142"/> + <location line="+140"/> <source>Export Transaction History</source> <translation type="unfinished"/> </message> @@ -3164,7 +3223,7 @@ Address: %4 <context> <name>WalletView</name> <message> - <location filename="../walletview.cpp" line="+43"/> + <location filename="../walletview.cpp" line="+44"/> <source>&Export</source> <translation type="unfinished"/> </message> @@ -3174,7 +3233,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+181"/> + <location line="+184"/> <source>Backup Wallet</source> <translation type="unfinished"/> </message> @@ -3207,12 +3266,12 @@ Address: %4 <context> <name>bitcoin-core</name> <message> - <location filename="../bitcoinstrings.cpp" line="+221"/> + <location filename="../bitcoinstrings.cpp" line="+261"/> <source>Usage:</source> <translation type="unfinished"/> </message> <message> - <location line="-54"/> + <location line="-66"/> <source>List commands</source> <translation type="unfinished"/> </message> @@ -3222,12 +3281,12 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+26"/> + <location line="+27"/> <source>Options:</source> <translation type="unfinished"/> </message> <message> - <location line="+22"/> + <location line="+32"/> <source>Specify configuration file (default: bitcoin.conf)</source> <translation type="unfinished"/> </message> @@ -3242,72 +3301,72 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="-9"/> - <source>Set database cache size in megabytes (default: 25)</source> - <translation type="unfinished"/> - </message> - <message> - <location line="-26"/> + <location line="-46"/> <source>Listen for connections on <port> (default: 8333 or testnet: 18333)</source> <translation type="unfinished"/> </message> <message> - <location line="+5"/> + <location line="+6"/> <source>Maintain at most <n> connections to peers (default: 125)</source> <translation type="unfinished"/> </message> <message> - <location line="-51"/> + <location line="-57"/> <source>Connect to a node to retrieve peer addresses, and disconnect</source> <translation type="unfinished"/> </message> <message> - <location line="+84"/> + <location line="+100"/> <source>Specify your own public address</source> <translation type="unfinished"/> </message> <message> - <location line="+5"/> + <location line="+6"/> <source>Threshold for disconnecting misbehaving peers (default: 100)</source> <translation type="unfinished"/> </message> <message> - <location line="-148"/> + <location line="-172"/> <source>Number of seconds to keep misbehaving peers from reconnecting (default: 86400)</source> <translation type="unfinished"/> </message> <message> - <location line="-36"/> + <location line="-52"/> <source>An error occurred while setting up the RPC port %u for listening on IPv4: %s</source> <translation type="unfinished"/> </message> <message> - <location line="+34"/> + <location line="+50"/> <source>Listen for JSON-RPC connections on <port> (default: 8332 or testnet: 18332)</source> <translation type="unfinished"/> </message> <message> - <location line="+45"/> + <location line="+51"/> <source>Accept command line and JSON-RPC commands</source> <translation type="unfinished"/> </message> <message> - <location line="+80"/> + <location line="+7"/> + <source>Bitcoin Core RPC client version</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+87"/> <source>Run in the background as a daemon and accept commands</source> <translation type="unfinished"/> </message> <message> - <location line="+39"/> + <location line="+43"/> <source>Use the test network</source> <translation type="unfinished"/> </message> <message> - <location line="-118"/> + <location line="-136"/> <source>Accept connections from outside (default: 1 if no -proxy or -connect)</source> <translation type="unfinished"/> </message> <message> - <location line="-95"/> + <location line="-117"/> <source>%s, you must set a rpcpassword in the configuration file: %s It is recommended you use the following random password: @@ -3337,8 +3396,8 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+3"/> - <source>Cannot obtain a lock on data directory %s. Bitcoin is probably already running.</source> + <location line="+6"/> + <source>Continuously rate-limit free transactions to <n>*1000 bytes per minute (default:15)</source> <translation type="unfinished"/> </message> <message> @@ -3353,6 +3412,11 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. </message> <message> <location line="+3"/> + <source>Error: Listening for incoming connections failed (listen returned error %d)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+2"/> <source>Error: The transaction was rejected! This might happen if some of the coins in your wallet were already spent, such as if you used a copy of wallet.dat and coins were spent in the copy but not marked as spent here.</source> <translation type="unfinished"/> </message> @@ -3367,12 +3431,47 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+18"/> + <location line="+6"/> + <source>Fees smaller than this are considered zero fee (for transaction creation) (default:</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+3"/> + <source>Flush database activity from memory pool to disk log every <n> megabytes (default: 100)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+3"/> + <source>How thorough the block verification of -checkblocks is (0-4, default: 3)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+2"/> + <source>In this mode -genproclimit controls how many blocks are generated immediately.</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+12"/> + <source>Set the number of script verification threads (%u to %d, 0 = auto, <0 = leave that many cores free, default: %d)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+3"/> + <source>Set the processor limit for when generation is on (-1 = unlimited, default: -1)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+3"/> <source>This is a pre-release test build - use at your own risk - do not use for mining or merchant applications</source> <translation type="unfinished"/> </message> <message> - <location line="+5"/> + <location line="+3"/> + <source>Unable to bind to %s on this computer. Bitcoin Core is probably already running.</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+3"/> <source>Use separate SOCKS5 proxy to reach peers via Tor hidden services (default: -proxy)</source> <translation type="unfinished"/> </message> @@ -3408,6 +3507,16 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. </message> <message> <location line="+9"/> + <source>(default: 1)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>(default: wallet.dat)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> <source><category> can be:</source> <translation type="unfinished"/> </message> @@ -3422,17 +3531,17 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+1"/> - <source>Bitcoin RPC client version</source> + <location line="+2"/> + <source>Block creation options:</source> <translation type="unfinished"/> </message> <message> - <location line="+1"/> - <source>Block creation options:</source> + <location line="+5"/> + <source>Clear list of wallet transactions (diagnostic tool; implies -rescan)</source> <translation type="unfinished"/> </message> <message> - <location line="+5"/> + <location line="+1"/> <source>Connect only to the specified node(s)</source> <translation type="unfinished"/> </message> @@ -3448,11 +3557,26 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. </message> <message> <location line="+2"/> + <source>Connection options:</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> <source>Corrupted block database detected</source> <translation type="unfinished"/> </message> <message> <location line="+1"/> + <source>Debugging/Testing options:</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>Disable safemode, override a real safe mode event (default: 0)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> <source>Discover own IP address (default: 1 when listening and no -externalip)</source> <translation type="unfinished"/> </message> @@ -3563,22 +3687,27 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. </message> <message> <location line="+1"/> - <source>Find peers using DNS lookup (default: 1 unless -connect)</source> + <source>Fees smaller than this are considered zero fee (for relaying) (default:</source> <translation type="unfinished"/> </message> <message> <location line="+1"/> - <source>Generate coins (default: 0)</source> + <source>Find peers using DNS lookup (default: 1 unless -connect)</source> <translation type="unfinished"/> </message> <message> - <location line="+2"/> - <source>How many blocks to check at startup (default: 288, 0 = all)</source> + <location line="+1"/> + <source>Force safe mode (default: 0)</source> <translation type="unfinished"/> </message> <message> <location line="+1"/> - <source>How thorough the block verification is (0-4, default: 3)</source> + <source>Generate coins (default: 0)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+2"/> + <source>How many blocks to check at startup (default: 288, 0 = all)</source> <translation type="unfinished"/> </message> <message> @@ -3597,7 +3726,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+15"/> + <location line="+17"/> <source>Not enough file descriptors available.</source> <translation type="unfinished"/> </message> @@ -3607,27 +3736,27 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+1"/> + <location line="+4"/> <source>RPC client options:</source> <translation type="unfinished"/> </message> <message> - <location line="+1"/> + <location line="+4"/> <source>Rebuild block chain index from current blk000??.dat files</source> <translation type="unfinished"/> </message> <message> - <location line="+5"/> + <location line="+6"/> <source>Select SOCKS version for -proxy (4 or 5, default: 5)</source> <translation type="unfinished"/> </message> <message> - <location line="+1"/> - <source>Send command to Bitcoin server</source> + <location line="+6"/> + <source>Set database cache size in megabytes (%d to %d, default: %d)</source> <translation type="unfinished"/> </message> <message> - <location line="+7"/> + <location line="+2"/> <source>Set maximum block size in bytes (default: %d)</source> <translation type="unfinished"/> </message> @@ -3637,17 +3766,17 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+7"/> + <location line="+10"/> <source>Specify wallet file (within data directory)</source> <translation type="unfinished"/> </message> <message> <location line="+2"/> - <source>Start Bitcoin server</source> + <source>Spend unconfirmed change when sending transactions (default: 1)</source> <translation type="unfinished"/> </message> <message> - <location line="+3"/> + <location line="+4"/> <source>This is intended for regression testing tools and app development.</source> <translation type="unfinished"/> </message> @@ -3692,32 +3821,32 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="-79"/> + <location line="-92"/> <source>Imports blocks from external blk000??.dat file</source> <translation type="unfinished"/> </message> <message> - <location line="-105"/> - <source>Execute command when a relevant alert is received or we see a really long fork (%s in cmd is replaced by message)</source> + <location line="-149"/> + <source>Cannot obtain a lock on data directory %s. Bitcoin Core is probably already running.</source> <translation type="unfinished"/> </message> <message> - <location line="+14"/> - <source>Output debugging information (default: 0, supplying <category> is optional)</source> + <location line="+22"/> + <source>Execute command when a relevant alert is received or we see a really long fork (%s in cmd is replaced by message)</source> <translation type="unfinished"/> </message> <message> - <location line="+2"/> - <source>Set maximum size of high-priority/low-fee transactions in bytes (default: %d)</source> + <location line="+25"/> + <source>Output debugging information (default: 0, supplying <category> is optional)</source> <translation type="unfinished"/> </message> <message> <location line="+2"/> - <source>Set the number of script verification threads (up to 16, 0 = auto, <0 = leave that many cores free, default: 0)</source> + <source>Set maximum size of high-priority/low-fee transactions in bytes (default: %d)</source> <translation type="unfinished"/> </message> <message> - <location line="+89"/> + <location line="+102"/> <source>Information</source> <translation type="unfinished"/> </message> @@ -3732,7 +3861,17 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+8"/> + <location line="+3"/> + <source>Limit size of signature cache to <n> entries (default: 50000)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+6"/> + <source>Log transaction priority and fee per kB when mining blocks (default: 0)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> <source>Maintain a full transaction index (default: 0)</source> <translation type="unfinished"/> </message> @@ -3757,12 +3896,52 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+9"/> - <source>SSL options: (see the Bitcoin Wiki for SSL setup instructions)</source> + <location line="+4"/> + <source>Print block on startup, if found in block index</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>Print block tree on startup (default: 0)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>RPC SSL options: (see the Bitcoin Wiki for SSL setup instructions)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+2"/> + <source>RPC server options:</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>Randomly drop 1 of every <n> network messages</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>Randomly fuzz 1 of every <n> network messages</source> <translation type="unfinished"/> </message> <message> <location line="+4"/> + <source>Run a thread to flush wallet periodically (default: 1)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+2"/> + <source>SSL options: (see the Bitcoin Wiki for SSL setup instructions)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+2"/> + <source>Send command to Bitcoin Core</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+2"/> <source>Send trace/debug info to console instead of debug.log file</source> <translation type="unfinished"/> </message> @@ -3773,6 +3952,21 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. </message> <message> <location line="+2"/> + <source>Sets the DB_PRIVATE flag in the wallet db environment (default: 1)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>Show all debugging options (usage: --help -help-debug)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>Show benchmark information (default: 0)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> <source>Shrink debug.log file on client startup (default: 1 when no -debug)</source> <translation type="unfinished"/> </message> @@ -3788,6 +3982,11 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. </message> <message> <location line="+6"/> + <source>Start Bitcoin Core Daemon</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> <source>System error: </source> <translation type="unfinished"/> </message> @@ -3833,6 +4032,16 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. </message> <message> <location line="+2"/> + <source>Zapping all transactions from wallet...</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>on startup</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> <source>version</source> <translation type="unfinished"/> </message> @@ -3842,47 +4051,47 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="-58"/> + <location line="-71"/> <source>Password for JSON-RPC connections</source> <translation type="unfinished"/> </message> <message> - <location line="-70"/> + <location line="-77"/> <source>Allow JSON-RPC connections from specified IP address</source> <translation type="unfinished"/> </message> <message> - <location line="+80"/> + <location line="+94"/> <source>Send commands to node running on <ip> (default: 127.0.0.1)</source> <translation type="unfinished"/> </message> <message> - <location line="-132"/> + <location line="-163"/> <source>Execute command when the best block changes (%s in cmd is replaced by block hash)</source> <translation type="unfinished"/> </message> <message> - <location line="+161"/> + <location line="+196"/> <source>Upgrade wallet to latest format</source> <translation type="unfinished"/> </message> <message> - <location line="-24"/> + <location line="-28"/> <source>Set key pool size to <n> (default: 100)</source> <translation type="unfinished"/> </message> <message> - <location line="-11"/> + <location line="-12"/> <source>Rescan the block chain for missing wallet transactions</source> <translation type="unfinished"/> </message> <message> - <location line="+38"/> + <location line="+43"/> <source>Use OpenSSL (https) for JSON-RPC connections</source> <translation type="unfinished"/> </message> <message> - <location line="-30"/> + <location line="-34"/> <source>Server certificate file (default: server.cert)</source> <translation type="unfinished"/> </message> @@ -3892,7 +4101,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+16"/> + <location line="+20"/> <source>This help message</source> <translation type="unfinished"/> </message> @@ -3902,17 +4111,17 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="-107"/> + <location line="-125"/> <source>Allow DNS lookups for -addnode, -seednode and -connect</source> <translation type="unfinished"/> </message> <message> - <location line="+60"/> + <location line="+66"/> <source>Loading addresses...</source> <translation type="unfinished"/> </message> <message> - <location line="-37"/> + <location line="-39"/> <source>Error loading wallet.dat: Wallet corrupted</source> <translation type="unfinished"/> </message> @@ -3922,22 +4131,22 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+98"/> + <location line="+112"/> <source>Wallet needed to be rewritten: restart Bitcoin to complete</source> <translation type="unfinished"/> </message> <message> - <location line="-100"/> + <location line="-114"/> <source>Error loading wallet.dat</source> <translation type="unfinished"/> </message> <message> - <location line="+31"/> + <location line="+32"/> <source>Invalid -proxy address: '%s'</source> <translation type="unfinished"/> </message> <message> - <location line="+56"/> + <location line="+69"/> <source>Unknown network specified in -onlynet: '%s'</source> <translation type="unfinished"/> </message> @@ -3947,7 +4156,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="-101"/> + <location line="-119"/> <source>Cannot resolve -bind address: '%s'</source> <translation type="unfinished"/> </message> @@ -3957,7 +4166,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+48"/> + <location line="+53"/> <source>Invalid amount for -paytxfee=<amount>: '%s'</source> <translation type="unfinished"/> </message> @@ -3972,27 +4181,22 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+10"/> + <location line="+11"/> <source>Loading block index...</source> <translation type="unfinished"/> </message> <message> - <location line="-62"/> + <location line="-68"/> <source>Add a node to connect to and attempt to keep the connection open</source> <translation type="unfinished"/> </message> <message> - <location line="-32"/> - <source>Unable to bind to %s on this computer. Bitcoin is probably already running.</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+95"/> + <location line="+69"/> <source>Loading wallet...</source> <translation type="unfinished"/> </message> <message> - <location line="-56"/> + <location line="-62"/> <source>Cannot downgrade wallet</source> <translation type="unfinished"/> </message> @@ -4002,27 +4206,27 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+67"/> + <location line="+80"/> <source>Rescanning...</source> <translation type="unfinished"/> </message> <message> - <location line="-58"/> + <location line="-67"/> <source>Done loading</source> <translation type="unfinished"/> </message> <message> - <location line="+85"/> + <location line="+99"/> <source>To use the %s option</source> <translation type="unfinished"/> </message> <message> - <location line="-77"/> + <location line="-91"/> <source>Error</source> <translation type="unfinished"/> </message> <message> - <location line="-35"/> + <location line="-41"/> <source>You must set rpcpassword=<password> in the configuration file: %s If the file does not exist, create it with owner-readable-only file permissions.</source> diff --git a/src/qt/locale/bitcoin_sk.ts b/src/qt/locale/bitcoin_sk.ts index fb385d733d..77472b017c 100644 --- a/src/qt/locale/bitcoin_sk.ts +++ b/src/qt/locale/bitcoin_sk.ts @@ -31,6 +31,12 @@ This product includes software developed by the OpenSSL Project for use in the O <source>The Bitcoin Core developers</source> <translation>Vývojári jadra Bitcoin</translation> </message> + <message> + <location line="+12"/> + <location line="+2"/> + <source>(%1-bit)</source> + <translation type="unfinished"/> + </message> </context> <context> <name>AddressBookPage</name> @@ -60,7 +66,7 @@ This product includes software developed by the OpenSSL Project for use in the O <translation>&KopÃrovaÅ¥</translation> </message> <message> - <location line="+52"/> + <location line="+58"/> <source>C&lose</source> <translation>ZatvoriÅ¥</translation> </message> @@ -70,7 +76,7 @@ This product includes software developed by the OpenSSL Project for use in the O <translation>&KopÃrovaÅ¥ adresu</translation> </message> <message> - <location filename="../forms/addressbookpage.ui" line="-41"/> + <location filename="../forms/addressbookpage.ui" line="-47"/> <source>Delete the currently selected address from the list</source> <translation type="unfinished"/> </message> @@ -317,7 +323,7 @@ This product includes software developed by the OpenSSL Project for use in the O <context> <name>BitcoinGUI</name> <message> - <location filename="../bitcoingui.cpp" line="+295"/> + <location filename="../bitcoingui.cpp" line="+294"/> <source>Sign &message...</source> <translation>PodpÃsaÅ¥ &správu...</translation> </message> @@ -332,12 +338,12 @@ This product includes software developed by the OpenSSL Project for use in the O <translation>&Prehľad</translation> </message> <message> - <location line="-137"/> + <location line="-136"/> <source>Node</source> <translation>Uzol</translation> </message> <message> - <location line="+138"/> + <location line="+137"/> <source>Show general overview of wallet</source> <translation>ZobraziÅ¥ celkový prehľad o peňaženke</translation> </message> @@ -458,17 +464,17 @@ This product includes software developed by the OpenSSL Project for use in the O <translation>OveriÅ¥ správu</translation> </message> <message> - <location line="+430"/> + <location line="+440"/> <source>Bitcoin</source> <translation>Bitcoin</translation> </message> <message> - <location line="-643"/> + <location line="-652"/> <source>Wallet</source> <translation>Peňaženka</translation> </message> <message> - <location line="+146"/> + <location line="+145"/> <source>&Send</source> <translation>&OdoslaÅ¥</translation> </message> @@ -524,18 +530,18 @@ This product includes software developed by the OpenSSL Project for use in the O <translation>LiÅ¡ta záložiek</translation> </message> <message> - <location line="-284"/> - <location line="+376"/> + <location line="-283"/> + <location line="+375"/> <source>[testnet]</source> <translation>[testovacia sieÅ¥]</translation> </message> <message> - <location line="-401"/> + <location line="-400"/> <source>Bitcoin Core</source> <translation>Jadro Bitcoin</translation> </message> <message> - <location line="+163"/> + <location line="+162"/> <source>Request payments (generates QR codes and bitcoin: URIs)</source> <translation type="unfinished"/> </message> @@ -597,7 +603,7 @@ This product includes software developed by the OpenSSL Project for use in the O <translation>Spracovaných %1 blokov transakÄnej histórie.</translation> </message> <message numerus="yes"> - <location line="+23"/> + <location line="+27"/> <source>%n hour(s)</source> <translation><numerusform>%n hodina</numerusform><numerusform>%n hodiny</numerusform><numerusform>%n hodÃn</numerusform></translation> </message> @@ -608,10 +614,21 @@ This product includes software developed by the OpenSSL Project for use in the O </message> <message numerus="yes"> <location line="+4"/> + <location line="+6"/> <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> + <location line="+0"/> + <source>%1 and %2</source> + <translation type="unfinished"/> + </message> + <message numerus="yes"> + <location line="+0"/> + <source>%n year(s)</source> + <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation> + </message> + <message> <location line="+4"/> <source>%1 behind</source> <translation>%1 za</translation> @@ -642,12 +659,12 @@ This product includes software developed by the OpenSSL Project for use in the O <translation>Informácia</translation> </message> <message> - <location line="-85"/> + <location line="-95"/> <source>Up to date</source> <translation>Aktualizovaný</translation> </message> <message> - <location line="+34"/> + <location line="+44"/> <source>Catching up...</source> <translation>SÅ¥ahujem...</translation> </message> @@ -684,7 +701,7 @@ Adresa: %4</translation> <translation>Peňaženka je <b>zaÅ¡ifrovaná</b> a momentálne <b>zamknutá</b></translation> </message> <message> - <location filename="../bitcoin.cpp" line="+438"/> + <location filename="../bitcoin.cpp" line="+443"/> <source>A fatal error occurred. Bitcoin can no longer continue safely and will quit.</source> <translation type="unfinished"/> </message> @@ -692,7 +709,7 @@ Adresa: %4</translation> <context> <name>ClientModel</name> <message> - <location filename="../clientmodel.cpp" line="+119"/> + <location filename="../clientmodel.cpp" line="+128"/> <source>Network Alert</source> <translation>Výstraha siete</translation> </message> @@ -745,7 +762,7 @@ Adresa: %4</translation> <translation>Zmena:</translation> </message> <message> - <location line="+63"/> + <location line="+56"/> <source>(un)select all</source> <translation type="unfinished"/> </message> @@ -760,7 +777,7 @@ Adresa: %4</translation> <translation>Zoznamový režim</translation> </message> <message> - <location line="+52"/> + <location line="+53"/> <source>Amount</source> <translation>Suma</translation> </message> @@ -790,7 +807,7 @@ Adresa: %4</translation> <translation>Priorita</translation> </message> <message> - <location filename="../coincontroldialog.cpp" line="+42"/> + <location filename="../coincontroldialog.cpp" line="+41"/> <source>Copy address</source> <translation>KopÃrovaÅ¥ adresu</translation> </message> @@ -856,7 +873,7 @@ Adresa: %4</translation> <translation>KopÃrovaÅ¥ zmenu</translation> </message> <message> - <location line="+323"/> + <location line="+332"/> <source>highest</source> <translation>najvyÅ¡Å¡ie</translation> </message> @@ -906,12 +923,12 @@ Adresa: %4</translation> <translation type="unfinished"/> </message> <message> - <location line="+31"/> + <location line="+32"/> <source>none</source> <translation>žiadne</translation> </message> <message> - <location line="+140"/> + <location line="+141"/> <source>Dust</source> <translation>Prach</translation> </message> @@ -974,12 +991,12 @@ Adresa: %4</translation> </message> <message> <location line="+43"/> - <location line="+66"/> + <location line="+61"/> <source>(no label)</source> <translation>(bez popisu)</translation> </message> <message> - <location line="-9"/> + <location line="-7"/> <source>change from %1 (%2)</source> <translation>zmena od %1 (%2)</translation> </message> @@ -1060,7 +1077,7 @@ Adresa: %4</translation> <context> <name>FreespaceChecker</name> <message> - <location filename="../intro.cpp" line="+65"/> + <location filename="../intro.cpp" line="+68"/> <source>A new data directory will be created.</source> <translation>Bude vytvorený nový dátový adresár.</translation> </message> @@ -1093,7 +1110,7 @@ Adresa: %4</translation> <translation type="unfinished"/> </message> <message> - <location filename="../utilitydialog.cpp" line="+38"/> + <location filename="../utilitydialog.cpp" line="+24"/> <source>Bitcoin Core</source> <translation>Jadro Bitcoin</translation> </message> @@ -1118,7 +1135,7 @@ Adresa: %4</translation> <translation>UI možnosti</translation> </message> <message> - <location line="+1"/> + <location line="+2"/> <source>Set language, for example "de_DE" (default: system locale)</source> <translation>NastaviÅ¥ jazyk, naprÃklad "sk_SK" (predvolené: systémový)</translation> </message> @@ -1129,11 +1146,16 @@ Adresa: %4</translation> </message> <message> <location line="+1"/> + <source>Set SSL root certificates for payment request (default: -system-)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> <source>Show splash screen on startup (default: 1)</source> <translation>ZobraziÅ¥ splash screen pri spustenà (predvolené: 1)</translation> </message> <message> - <location line="+1"/> + <location line="-4"/> <source>Choose data directory on startup (default: 0)</source> <translation type="unfinished"/> </message> @@ -1171,7 +1193,7 @@ Adresa: %4</translation> <translation>PoužiÅ¥ vlastný dátový adresár:</translation> </message> <message> - <location filename="../intro.cpp" line="+85"/> + <location filename="../intro.cpp" line="+82"/> <source>Bitcoin</source> <translation>Bitcoin</translation> </message> @@ -1181,7 +1203,7 @@ Adresa: %4</translation> <translation type="unfinished"/> </message> <message> - <location line="+19"/> + <location line="+24"/> <source>Error</source> <translation>Chyba</translation> </message> @@ -1237,7 +1259,7 @@ Adresa: %4</translation> <translation>&Hlavné</translation> </message> <message> - <location line="+6"/> + <location line="+116"/> <source>Optional transaction fee per kB that helps make sure your transactions are processed quickly. Most transactions are 1 kB.</source> <translation type="unfinished"/> </message> @@ -1247,7 +1269,7 @@ Adresa: %4</translation> <translation>ZaplatiÅ¥ transakÄné &poplatky</translation> </message> <message> - <location line="+31"/> + <location line="-125"/> <source>Automatically start Bitcoin after logging in to the system.</source> <translation>Automaticky spustiÅ¥ Bitcoin po zapnutà poÄÃtaÄa</translation> </message> @@ -1262,12 +1284,7 @@ Adresa: %4</translation> <translation type="unfinished"/> </message> <message> - <location line="+13"/> - <source>Set database cache size in megabytes (default: 25)</source> - <translation>VeľkosÅ¥ vyrovnávajúcej pamäte pre databázu v megabytoch (predvolené:25)</translation> - </message> - <message> - <location line="+13"/> + <location line="+16"/> <source>MB</source> <translation>MB</translation> </message> @@ -1277,12 +1294,7 @@ Adresa: %4</translation> <translation type="unfinished"/> </message> <message> - <location line="+13"/> - <source>Set the number of script verification threads (up to 16, 0 = auto, <0 = leave that many cores free, default: 0)</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+58"/> + <location line="+160"/> <source>Connect to the Bitcoin network through a SOCKS proxy.</source> <translation type="unfinished"/> </message> @@ -1297,7 +1309,7 @@ Adresa: %4</translation> <translation type="unfinished"/> </message> <message> - <location line="+224"/> + <location line="+214"/> <source>Active command-line options that override above options:</source> <translation type="unfinished"/> </message> @@ -1312,12 +1324,42 @@ Adresa: %4</translation> <translation>VynulovaÅ¥ voľby</translation> </message> <message> - <location line="-323"/> + <location line="-313"/> <source>&Network</source> <translation>SieÅ¥</translation> </message> <message> - <location line="+6"/> + <location line="-131"/> + <source>(0 = auto, <0 = leave that many cores free)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+36"/> + <source>W&allet</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+65"/> + <source>Expert</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+9"/> + <source>Enable coin &control features</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+7"/> + <source>If you disable the spending of unconfirmed change, the change from a transaction cannot be used until that transaction has at least one confirmation. This also affects how your balance is computed.</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+3"/> + <source>&Spend unconfirmed change</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+17"/> <source>Automatically open the Bitcoin client port on the router. This only works when your router supports UPnP and it is enabled.</source> <translation>Automaticky otvorit port pre Bitcoin na routeri. Toto funguje len ak router podporuje UPnP a je táto podpora aktivovaná.</translation> </message> @@ -1412,17 +1454,12 @@ Adresa: %4</translation> <translation>&ZobraziÅ¥ adresy zo zoznamu transakciÃ</translation> </message> <message> - <location line="+7"/> + <location line="-262"/> <source>Whether to show coin control features or not.</source> <translation type="unfinished"/> </message> <message> - <location line="+3"/> - <source>Display coin &control features (experts only)</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+136"/> + <location line="+398"/> <source>&OK</source> <translation>&OK</translation> </message> @@ -1432,17 +1469,17 @@ Adresa: %4</translation> <translation>ZruÅ¡iÅ¥</translation> </message> <message> - <location filename="../optionsdialog.cpp" line="+67"/> + <location filename="../optionsdialog.cpp" line="+72"/> <source>default</source> <translation>predvolené</translation> </message> <message> - <location line="+57"/> + <location line="+58"/> <source>none</source> <translation>žiadne</translation> </message> <message> - <location line="+75"/> + <location line="+80"/> <source>Confirm options reset</source> <translation type="unfinished"/> </message> @@ -1482,19 +1519,14 @@ Adresa: %4</translation> <translation type="unfinished"/> </message> <message> - <location line="-155"/> - <source>Unconfirmed:</source> - <translation>Nepotvrdené:</translation> - </message> - <message> - <location line="-83"/> + <location line="-238"/> <source>Wallet</source> <translation>Peňaženka</translation> </message> <message> <location line="+51"/> - <source>Confirmed:</source> - <translation>Potvrdené:</translation> + <source>Available:</source> + <translation type="unfinished"/> </message> <message> <location line="+16"/> @@ -1502,7 +1534,12 @@ Adresa: %4</translation> <translation type="unfinished"/> </message> <message> - <location line="+32"/> + <location line="+16"/> + <source>Pending:</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+16"/> <source>Total of transactions that have yet to be confirmed, and do not yet count toward the spendable balance</source> <translation type="unfinished"/> </message> @@ -1635,23 +1672,29 @@ Adresa: %4</translation> <context> <name>QObject</name> <message> - <location filename="../bitcoin.cpp" line="+71"/> - <location line="+11"/> + <location filename="../bitcoin.cpp" line="+63"/> + <location line="+7"/> + <location line="+13"/> <source>Bitcoin</source> <translation>Bitcoin</translation> </message> <message> - <location line="+1"/> + <location line="-19"/> <source>Error: Specified data directory "%1" does not exist.</source> <translation type="unfinished"/> </message> <message> - <location line="-12"/> + <location line="+7"/> + <source>Error: Cannot parse configuration file: %1. Only use key=value syntax.</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+12"/> <source>Error: Invalid combination of -regtest and -testnet.</source> <translation type="unfinished"/> </message> <message> - <location filename="../guiutil.cpp" line="+82"/> + <location filename="../guiutil.cpp" line="+89"/> <source>Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source> <translation>Zadajte Bitcoin adresu (napr. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation> </message> @@ -1697,7 +1740,7 @@ Adresa: %4</translation> <location line="+36"/> <location line="+23"/> <location line="+23"/> - <location filename="../rpcconsole.cpp" line="+359"/> + <location filename="../rpcconsole.cpp" line="+373"/> <source>N/A</source> <translation>nie je k dispozÃcii</translation> </message> @@ -1793,11 +1836,13 @@ Adresa: %4</translation> </message> <message> <location line="+64"/> + <location filename="../rpcconsole.cpp" line="-10"/> <source>In:</source> <translation>Dnu:</translation> </message> <message> <location line="+80"/> + <location filename="../rpcconsole.cpp" line="+1"/> <source>Out:</source> <translation>Von:</translation> </message> @@ -1822,7 +1867,7 @@ Adresa: %4</translation> <translation>VymazaÅ¥ konzolu</translation> </message> <message> - <location filename="../rpcconsole.cpp" line="-30"/> + <location filename="../rpcconsole.cpp" line="-35"/> <source>Welcome to the Bitcoin RPC console.</source> <translation type="unfinished"/> </message> @@ -1837,7 +1882,7 @@ Adresa: %4</translation> <translation type="unfinished"/> </message> <message> - <location line="+122"/> + <location line="+136"/> <source>%1 B</source> <translation>%1 B</translation> </message> @@ -1953,7 +1998,7 @@ Adresa: %4</translation> <translation>ZobraziÅ¥</translation> </message> <message> - <location line="+11"/> + <location line="+14"/> <source>Remove the selected entries from the list</source> <translation type="unfinished"/> </message> @@ -1963,7 +2008,7 @@ Adresa: %4</translation> <translation>OdstrániÅ¥</translation> </message> <message> - <location filename="../receivecoinsdialog.cpp" line="+38"/> + <location filename="../receivecoinsdialog.cpp" line="+39"/> <source>Copy label</source> <translation>KopÃrovaÅ¥ popis</translation> </message> @@ -2184,12 +2229,12 @@ Adresa: %4</translation> <translation>ZmazaÅ¥ &vÅ¡etko</translation> </message> <message> - <location line="+52"/> + <location line="+58"/> <source>Balance:</source> <translation>Zostatok:</translation> </message> <message> - <location line="-78"/> + <location line="-84"/> <source>Confirm the send action</source> <translation>PotvrÄte odoslanie</translation> </message> @@ -2434,7 +2479,7 @@ Adresa: %4</translation> <context> <name>ShutdownWindow</name> <message> - <location filename="../utilitydialog.cpp" line="+48"/> + <location filename="../utilitydialog.cpp" line="+52"/> <source>Bitcoin Core is shutting down...</source> <translation>Jadro Bitcoin sa ukonÄuje...</translation> </message> @@ -2634,7 +2679,7 @@ Adresa: %4</translation> <context> <name>SplashScreen</name> <message> - <location filename="../splashscreen.cpp" line="+28"/> + <location filename="../splashscreen.cpp" line="+32"/> <source>Bitcoin Core</source> <translation>Jadro Bitcoin</translation> </message> @@ -2666,6 +2711,11 @@ Adresa: %4</translation> </message> <message> <location line="+6"/> + <source>conflicted</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+2"/> <source>%1/offline</source> <translation>%1/offline</translation> </message> @@ -2827,12 +2877,12 @@ Adresa: %4</translation> <translation>, eÅ¡te nebola úspeÅ¡ne odoslaná</translation> </message> <message numerus="yes"> - <location line="-35"/> + <location line="-37"/> <source>Open for %n more block(s)</source> <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation> </message> <message> - <location line="+70"/> + <location line="+72"/> <source>unknown</source> <translation>neznámy</translation> </message> @@ -2873,12 +2923,12 @@ Adresa: %4</translation> <translation>Hodnota</translation> </message> <message> - <location line="+59"/> + <location line="+78"/> <source>Immature (%1 confirmations, will be available after %2)</source> <translation type="unfinished"/> </message> <message numerus="yes"> - <location line="+16"/> + <location line="-21"/> <source>Open for %n more block(s)</source> <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation> </message> @@ -2888,23 +2938,12 @@ Adresa: %4</translation> <translation>Otvorené do %1</translation> </message> <message> - <location line="+3"/> - <source>Offline (%1 confirmations)</source> - <translation>Offline (%1 potvrdenÃ)</translation> - </message> - <message> - <location line="+3"/> - <source>Unconfirmed (%1 of %2 confirmations)</source> - <translation>Nepotvrdené (%1 z %2 potvrdenÃ)</translation> - </message> - <message> - <location line="-22"/> - <location line="+25"/> + <location line="+12"/> <source>Confirmed (%1 confirmations)</source> <translation>Potvrdené (%1 potvrdenÃ)</translation> </message> <message> - <location line="-22"/> + <location line="+9"/> <source>This block was not received by any other nodes and will probably not be accepted!</source> <translation>Ten blok nebol prijatý žiadnou inou nódou a pravdepodobne nebude akceptovaný!</translation> </message> @@ -2914,7 +2953,27 @@ Adresa: %4</translation> <translation>VypoÄÃtané ale neakceptované</translation> </message> <message> - <location line="+62"/> + <location line="-21"/> + <source>Offline</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+3"/> + <source>Unconfirmed</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+3"/> + <source>Confirming (%1 of %2 recommended confirmations)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+6"/> + <source>Conflicted</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+51"/> <source>Received with</source> <translation>Prijaté s</translation> </message> @@ -2944,7 +3003,7 @@ Adresa: %4</translation> <translation>(n/a)</translation> </message> <message> - <location line="+199"/> + <location line="+190"/> <source>Transaction status. Hover over this field to show number of confirmations.</source> <translation>Status transakcie. Pohybujte myÅ¡ou nad týmto poľom a zjavà sa poÄet potvrdenÃ.</translation> </message> @@ -3073,7 +3132,7 @@ Adresa: %4</translation> <translation>ZobraziÅ¥ podrobnosti transakcie</translation> </message> <message> - <location line="+142"/> + <location line="+140"/> <source>Export Transaction History</source> <translation>ExportovaÅ¥ históriu transakciÃ</translation> </message> @@ -3167,7 +3226,7 @@ Adresa: %4</translation> <context> <name>WalletView</name> <message> - <location filename="../walletview.cpp" line="+43"/> + <location filename="../walletview.cpp" line="+44"/> <source>&Export</source> <translation>&ExportovaÅ¥...</translation> </message> @@ -3177,7 +3236,7 @@ Adresa: %4</translation> <translation>ExportovaÅ¥ tento náhľad do súboru</translation> </message> <message> - <location line="+181"/> + <location line="+184"/> <source>Backup Wallet</source> <translation>ZálohovaÅ¥ peňaženku</translation> </message> @@ -3210,12 +3269,12 @@ Adresa: %4</translation> <context> <name>bitcoin-core</name> <message> - <location filename="../bitcoinstrings.cpp" line="+221"/> + <location filename="../bitcoinstrings.cpp" line="+261"/> <source>Usage:</source> <translation>Použitie:</translation> </message> <message> - <location line="-54"/> + <location line="-66"/> <source>List commands</source> <translation>Zoznam prÃkazov</translation> </message> @@ -3225,12 +3284,12 @@ Adresa: %4</translation> <translation>DostaÅ¥ pomoc pre prÃkaz</translation> </message> <message> - <location line="+26"/> + <location line="+27"/> <source>Options:</source> <translation>Možnosti:</translation> </message> <message> - <location line="+22"/> + <location line="+32"/> <source>Specify configuration file (default: bitcoin.conf)</source> <translation>UrÄiÅ¥ súbor s nastaveniami (predvolené: bitcoin.conf)</translation> </message> @@ -3245,72 +3304,72 @@ Adresa: %4</translation> <translation>UrÄiÅ¥ prieÄinok s dátami</translation> </message> <message> - <location line="-9"/> - <source>Set database cache size in megabytes (default: 25)</source> - <translation>VeľkosÅ¥ vyrovnávajúcej pamäte pre databázu v megabytoch (predvolené:25)</translation> - </message> - <message> - <location line="-26"/> + <location line="-46"/> <source>Listen for connections on <port> (default: 8333 or testnet: 18333)</source> <translation>NaÄúvaÅ¥ spojeniam na <port> (prednastavené: 8333 alebo testovacia sieÅ¥: 18333)</translation> </message> <message> - <location line="+5"/> + <location line="+6"/> <source>Maintain at most <n> connections to peers (default: 125)</source> <translation>UdržiavaÅ¥ maximálne <n> spojenà (predvolené: 125)</translation> </message> <message> - <location line="-51"/> + <location line="-57"/> <source>Connect to a node to retrieve peer addresses, and disconnect</source> <translation type="unfinished"/> </message> <message> - <location line="+84"/> + <location line="+100"/> <source>Specify your own public address</source> <translation>UrÄite vaÅ¡u vlastnú verejnú adresu</translation> </message> <message> - <location line="+5"/> + <location line="+6"/> <source>Threshold for disconnecting misbehaving peers (default: 100)</source> <translation>Hranica pre odpojenie zle sa správajúcich peerov (predvolené: 100)</translation> </message> <message> - <location line="-148"/> + <location line="-172"/> <source>Number of seconds to keep misbehaving peers from reconnecting (default: 86400)</source> <translation>PoÄet sekúnd kedy sa zabráni zle sa správajúcim peerom znovupripojenie (predvolené: 86400)</translation> </message> <message> - <location line="-36"/> + <location line="-52"/> <source>An error occurred while setting up the RPC port %u for listening on IPv4: %s</source> <translation type="unfinished"/> </message> <message> - <location line="+34"/> + <location line="+50"/> <source>Listen for JSON-RPC connections on <port> (default: 8332 or testnet: 18332)</source> <translation>PoÄúvaÅ¥ JSON-RPC spojeniam na <port> (predvolené: 8332 or testnet: 18332)</translation> </message> <message> - <location line="+45"/> + <location line="+51"/> <source>Accept command line and JSON-RPC commands</source> <translation>PrijÃmaÅ¥ prÃkazy z prÃkazového riadku a JSON-RPC</translation> </message> <message> - <location line="+80"/> + <location line="+7"/> + <source>Bitcoin Core RPC client version</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+87"/> <source>Run in the background as a daemon and accept commands</source> <translation>BežaÅ¥ na pozadà ako démon a prijÃmaÅ¥ prÃkazy</translation> </message> <message> - <location line="+39"/> + <location line="+43"/> <source>Use the test network</source> <translation>PoužiÅ¥ testovaciu sieÅ¥</translation> </message> <message> - <location line="-118"/> + <location line="-136"/> <source>Accept connections from outside (default: 1 if no -proxy or -connect)</source> <translation type="unfinished"/> </message> <message> - <location line="-95"/> + <location line="-117"/> <source>%s, you must set a rpcpassword in the configuration file: %s It is recommended you use the following random password: @@ -3340,8 +3399,8 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+3"/> - <source>Cannot obtain a lock on data directory %s. Bitcoin is probably already running.</source> + <location line="+6"/> + <source>Continuously rate-limit free transactions to <n>*1000 bytes per minute (default:15)</source> <translation type="unfinished"/> </message> <message> @@ -3356,6 +3415,11 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. </message> <message> <location line="+3"/> + <source>Error: Listening for incoming connections failed (listen returned error %d)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+2"/> <source>Error: The transaction was rejected! This might happen if some of the coins in your wallet were already spent, such as if you used a copy of wallet.dat and coins were spent in the copy but not marked as spent here.</source> <translation type="unfinished"/> </message> @@ -3370,12 +3434,47 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+18"/> + <location line="+6"/> + <source>Fees smaller than this are considered zero fee (for transaction creation) (default:</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+3"/> + <source>Flush database activity from memory pool to disk log every <n> megabytes (default: 100)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+3"/> + <source>How thorough the block verification of -checkblocks is (0-4, default: 3)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+2"/> + <source>In this mode -genproclimit controls how many blocks are generated immediately.</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+12"/> + <source>Set the number of script verification threads (%u to %d, 0 = auto, <0 = leave that many cores free, default: %d)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+3"/> + <source>Set the processor limit for when generation is on (-1 = unlimited, default: -1)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+3"/> <source>This is a pre-release test build - use at your own risk - do not use for mining or merchant applications</source> <translation type="unfinished"/> </message> <message> - <location line="+5"/> + <location line="+3"/> + <source>Unable to bind to %s on this computer. Bitcoin Core is probably already running.</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+3"/> <source>Use separate SOCKS5 proxy to reach peers via Tor hidden services (default: -proxy)</source> <translation type="unfinished"/> </message> @@ -3411,6 +3510,16 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. </message> <message> <location line="+9"/> + <source>(default: 1)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>(default: wallet.dat)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> <source><category> can be:</source> <translation><category> môže byÅ¥:</translation> </message> @@ -3425,17 +3534,17 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+1"/> - <source>Bitcoin RPC client version</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+1"/> + <location line="+2"/> <source>Block creation options:</source> <translation>Voľby vytvorenia bloku:</translation> </message> <message> <location line="+5"/> + <source>Clear list of wallet transactions (diagnostic tool; implies -rescan)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> <source>Connect only to the specified node(s)</source> <translation>PripojiÅ¥ sa len k urÄenej nóde</translation> </message> @@ -3451,11 +3560,26 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. </message> <message> <location line="+2"/> + <source>Connection options:</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> <source>Corrupted block database detected</source> <translation>Zistená poÅ¡kodená databáza blokov</translation> </message> <message> <location line="+1"/> + <source>Debugging/Testing options:</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>Disable safemode, override a real safe mode event (default: 0)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> <source>Discover own IP address (default: 1 when listening and no -externalip)</source> <translation type="unfinished"/> </message> @@ -3566,22 +3690,27 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. </message> <message> <location line="+1"/> - <source>Find peers using DNS lookup (default: 1 unless -connect)</source> + <source>Fees smaller than this are considered zero fee (for relaying) (default:</source> <translation type="unfinished"/> </message> <message> <location line="+1"/> - <source>Generate coins (default: 0)</source> + <source>Find peers using DNS lookup (default: 1 unless -connect)</source> <translation type="unfinished"/> </message> <message> - <location line="+2"/> - <source>How many blocks to check at startup (default: 288, 0 = all)</source> + <location line="+1"/> + <source>Force safe mode (default: 0)</source> <translation type="unfinished"/> </message> <message> <location line="+1"/> - <source>How thorough the block verification is (0-4, default: 3)</source> + <source>Generate coins (default: 0)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+2"/> + <source>How many blocks to check at startup (default: 288, 0 = all)</source> <translation type="unfinished"/> </message> <message> @@ -3600,7 +3729,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+15"/> + <location line="+17"/> <source>Not enough file descriptors available.</source> <translation type="unfinished"/> </message> @@ -3610,27 +3739,27 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+1"/> + <location line="+4"/> <source>RPC client options:</source> <translation type="unfinished"/> </message> <message> - <location line="+1"/> + <location line="+4"/> <source>Rebuild block chain index from current blk000??.dat files</source> <translation type="unfinished"/> </message> <message> - <location line="+5"/> + <location line="+6"/> <source>Select SOCKS version for -proxy (4 or 5, default: 5)</source> <translation type="unfinished"/> </message> <message> - <location line="+1"/> - <source>Send command to Bitcoin server</source> - <translation>PoslaÅ¥ prÃkaz Bitcoin serveru</translation> + <location line="+6"/> + <source>Set database cache size in megabytes (%d to %d, default: %d)</source> + <translation type="unfinished"/> </message> <message> - <location line="+7"/> + <location line="+2"/> <source>Set maximum block size in bytes (default: %d)</source> <translation type="unfinished"/> </message> @@ -3640,17 +3769,17 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+7"/> + <location line="+10"/> <source>Specify wallet file (within data directory)</source> <translation type="unfinished"/> </message> <message> <location line="+2"/> - <source>Start Bitcoin server</source> - <translation>SpustiÅ¥ Bitcoin server</translation> + <source>Spend unconfirmed change when sending transactions (default: 1)</source> + <translation type="unfinished"/> </message> <message> - <location line="+3"/> + <location line="+4"/> <source>This is intended for regression testing tools and app development.</source> <translation type="unfinished"/> </message> @@ -3695,32 +3824,32 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="-79"/> + <location line="-92"/> <source>Imports blocks from external blk000??.dat file</source> <translation>Importuje bloky z externého súboru blk000??.dat</translation> </message> <message> - <location line="-105"/> - <source>Execute command when a relevant alert is received or we see a really long fork (%s in cmd is replaced by message)</source> + <location line="-149"/> + <source>Cannot obtain a lock on data directory %s. Bitcoin Core is probably already running.</source> <translation type="unfinished"/> </message> <message> - <location line="+14"/> - <source>Output debugging information (default: 0, supplying <category> is optional)</source> + <location line="+22"/> + <source>Execute command when a relevant alert is received or we see a really long fork (%s in cmd is replaced by message)</source> <translation type="unfinished"/> </message> <message> - <location line="+2"/> - <source>Set maximum size of high-priority/low-fee transactions in bytes (default: %d)</source> + <location line="+25"/> + <source>Output debugging information (default: 0, supplying <category> is optional)</source> <translation type="unfinished"/> </message> <message> <location line="+2"/> - <source>Set the number of script verification threads (up to 16, 0 = auto, <0 = leave that many cores free, default: 0)</source> + <source>Set maximum size of high-priority/low-fee transactions in bytes (default: %d)</source> <translation type="unfinished"/> </message> <message> - <location line="+89"/> + <location line="+102"/> <source>Information</source> <translation>Informácia</translation> </message> @@ -3735,7 +3864,17 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+8"/> + <location line="+3"/> + <source>Limit size of signature cache to <n> entries (default: 50000)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+6"/> + <source>Log transaction priority and fee per kB when mining blocks (default: 0)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> <source>Maintain a full transaction index (default: 0)</source> <translation type="unfinished"/> </message> @@ -3760,12 +3899,52 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+9"/> + <location line="+4"/> + <source>Print block on startup, if found in block index</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>Print block tree on startup (default: 0)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>RPC SSL options: (see the Bitcoin Wiki for SSL setup instructions)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+2"/> + <source>RPC server options:</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>Randomly drop 1 of every <n> network messages</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>Randomly fuzz 1 of every <n> network messages</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+4"/> + <source>Run a thread to flush wallet periodically (default: 1)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+2"/> <source>SSL options: (see the Bitcoin Wiki for SSL setup instructions)</source> <translation>SSL možnosÅ¥: (pozrite Bitcoin Wiki pre návod na nastavenie SSL)</translation> </message> <message> - <location line="+4"/> + <location line="+2"/> + <source>Send command to Bitcoin Core</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+2"/> <source>Send trace/debug info to console instead of debug.log file</source> <translation>OdoslaÅ¥ trace/debug informácie na konzolu namiesto debug.info žurnálu</translation> </message> @@ -3776,6 +3955,21 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. </message> <message> <location line="+2"/> + <source>Sets the DB_PRIVATE flag in the wallet db environment (default: 1)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>Show all debugging options (usage: --help -help-debug)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>Show benchmark information (default: 0)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> <source>Shrink debug.log file on client startup (default: 1 when no -debug)</source> <translation type="unfinished"/> </message> @@ -3791,6 +3985,11 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. </message> <message> <location line="+6"/> + <source>Start Bitcoin Core Daemon</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> <source>System error: </source> <translation>Systémová chyba:</translation> </message> @@ -3836,6 +4035,16 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. </message> <message> <location line="+2"/> + <source>Zapping all transactions from wallet...</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>on startup</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> <source>version</source> <translation>verzia</translation> </message> @@ -3845,47 +4054,47 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>wallet.dat je poÅ¡kodený, záchrana zlyhala</translation> </message> <message> - <location line="-58"/> + <location line="-71"/> <source>Password for JSON-RPC connections</source> <translation>Heslo pre JSON-rPC spojenia</translation> </message> <message> - <location line="-70"/> + <location line="-77"/> <source>Allow JSON-RPC connections from specified IP address</source> <translation>PovoliÅ¥ JSON-RPC spojenia z urÄenej IP adresy.</translation> </message> <message> - <location line="+80"/> + <location line="+94"/> <source>Send commands to node running on <ip> (default: 127.0.0.1)</source> <translation>PoslaÅ¥ prÃkaz nóde bežiacej na <ip> (predvolené: 127.0.0.1)</translation> </message> <message> - <location line="-132"/> + <location line="-163"/> <source>Execute command when the best block changes (%s in cmd is replaced by block hash)</source> <translation>Vykonaj prÃkaz, ak zmeny v najlepÅ¡om bloku (%s v prÃkaze nahradà blok hash)</translation> </message> <message> - <location line="+161"/> + <location line="+196"/> <source>Upgrade wallet to latest format</source> <translation>Aktualizuj peňaženku na najnovÅ¡Ã formát.</translation> </message> <message> - <location line="-24"/> + <location line="-28"/> <source>Set key pool size to <n> (default: 100)</source> <translation>NastaviÅ¥ zásobu adries na <n> (predvolené: 100)</translation> </message> <message> - <location line="-11"/> + <location line="-12"/> <source>Rescan the block chain for missing wallet transactions</source> <translation>Znovu skenovaÅ¥ reÅ¥az blokov pre chýbajúce transakcie</translation> </message> <message> - <location line="+38"/> + <location line="+43"/> <source>Use OpenSSL (https) for JSON-RPC connections</source> <translation>PoužiÅ¥ OpenSSL (https) pre JSON-RPC spojenia</translation> </message> <message> - <location line="-30"/> + <location line="-34"/> <source>Server certificate file (default: server.cert)</source> <translation>Súbor s certifikátom servra (predvolené: server.cert)</translation> </message> @@ -3895,7 +4104,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Súkromný kÄ¾ÃºÄ servra (predvolené: server.pem)</translation> </message> <message> - <location line="+16"/> + <location line="+20"/> <source>This help message</source> <translation>Táto pomocná správa</translation> </message> @@ -3905,17 +4114,17 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="-107"/> + <location line="-125"/> <source>Allow DNS lookups for -addnode, -seednode and -connect</source> <translation>PovoliÅ¥ vyhľadávanie DNS pre pridanie nódy a spojenie</translation> </message> <message> - <location line="+60"/> + <location line="+66"/> <source>Loading addresses...</source> <translation>NaÄÃtavanie adries...</translation> </message> <message> - <location line="-37"/> + <location line="-39"/> <source>Error loading wallet.dat: Wallet corrupted</source> <translation>Chyba naÄÃtania wallet.dat: Peňaženka je poÅ¡kodená</translation> </message> @@ -3925,22 +4134,22 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Chyba naÄÃtania wallet.dat: Peňaženka vyžaduje novÅ¡iu verziu Bitcoin</translation> </message> <message> - <location line="+98"/> + <location line="+112"/> <source>Wallet needed to be rewritten: restart Bitcoin to complete</source> <translation>Bolo potrebné prepÃsaÅ¥ peňaženku: dokonÄite reÅ¡tartovanÃm Bitcoin</translation> </message> <message> - <location line="-100"/> + <location line="-114"/> <source>Error loading wallet.dat</source> <translation>Chyba naÄÃtania wallet.dat</translation> </message> <message> - <location line="+31"/> + <location line="+32"/> <source>Invalid -proxy address: '%s'</source> <translation>Neplatná adresa proxy: '%s'</translation> </message> <message> - <location line="+56"/> + <location line="+69"/> <source>Unknown network specified in -onlynet: '%s'</source> <translation type="unfinished"/> </message> @@ -3950,7 +4159,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="-101"/> + <location line="-119"/> <source>Cannot resolve -bind address: '%s'</source> <translation type="unfinished"/> </message> @@ -3960,7 +4169,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+48"/> + <location line="+53"/> <source>Invalid amount for -paytxfee=<amount>: '%s'</source> <translation>Neplatná suma pre -paytxfee=<amount>: '%s'</translation> </message> @@ -3975,27 +4184,22 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Nedostatok prostriedkov</translation> </message> <message> - <location line="+10"/> + <location line="+11"/> <source>Loading block index...</source> <translation>NaÄÃtavanie zoznamu blokov...</translation> </message> <message> - <location line="-62"/> + <location line="-68"/> <source>Add a node to connect to and attempt to keep the connection open</source> <translation>PridaÅ¥ nód na pripojenie a pokus o udržanie pripojenia otvoreného</translation> </message> <message> - <location line="-32"/> - <source>Unable to bind to %s on this computer. Bitcoin is probably already running.</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+95"/> + <location line="+69"/> <source>Loading wallet...</source> <translation>NaÄÃtavam peňaženku...</translation> </message> <message> - <location line="-56"/> + <location line="-62"/> <source>Cannot downgrade wallet</source> <translation>Nie je možné prejsÅ¥ na nižšiu verziu peňaženky</translation> </message> @@ -4005,27 +4209,27 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>Nie je možné zapÃsaÅ¥ predvolenú adresu.</translation> </message> <message> - <location line="+67"/> + <location line="+80"/> <source>Rescanning...</source> <translation>Nové prehľadávanie...</translation> </message> <message> - <location line="-58"/> + <location line="-67"/> <source>Done loading</source> <translation>DokonÄené naÄÃtavanie</translation> </message> <message> - <location line="+85"/> + <location line="+99"/> <source>To use the %s option</source> <translation>PoužiÅ¥ %s možnosÅ¥.</translation> </message> <message> - <location line="-77"/> + <location line="-91"/> <source>Error</source> <translation>Chyba</translation> </message> <message> - <location line="-35"/> + <location line="-41"/> <source>You must set rpcpassword=<password> in the configuration file: %s If the file does not exist, create it with owner-readable-only file permissions.</source> diff --git a/src/qt/locale/bitcoin_ur_PK.ts b/src/qt/locale/bitcoin_ur_PK.ts index 78446a16b7..c773f8fa4d 100644 --- a/src/qt/locale/bitcoin_ur_PK.ts +++ b/src/qt/locale/bitcoin_ur_PK.ts @@ -31,6 +31,12 @@ This product includes software developed by the OpenSSL Project for use in the O <source>The Bitcoin Core developers</source> <translation type="unfinished"/> </message> + <message> + <location line="+12"/> + <location line="+2"/> + <source>(%1-bit)</source> + <translation type="unfinished"/> + </message> </context> <context> <name>AddressBookPage</name> @@ -60,7 +66,7 @@ This product includes software developed by the OpenSSL Project for use in the O <translation type="unfinished"/> </message> <message> - <location line="+52"/> + <location line="+58"/> <source>C&lose</source> <translation type="unfinished"/> </message> @@ -70,7 +76,7 @@ This product includes software developed by the OpenSSL Project for use in the O <translation type="unfinished"/> </message> <message> - <location filename="../forms/addressbookpage.ui" line="-41"/> + <location filename="../forms/addressbookpage.ui" line="-47"/> <source>Delete the currently selected address from the list</source> <translation type="unfinished"/> </message> @@ -317,7 +323,7 @@ This product includes software developed by the OpenSSL Project for use in the O <context> <name>BitcoinGUI</name> <message> - <location filename="../bitcoingui.cpp" line="+295"/> + <location filename="../bitcoingui.cpp" line="+294"/> <source>Sign &message...</source> <translation type="unfinished"/> </message> @@ -332,12 +338,12 @@ This product includes software developed by the OpenSSL Project for use in the O <translation type="unfinished"/> </message> <message> - <location line="-137"/> + <location line="-136"/> <source>Node</source> <translation type="unfinished"/> </message> <message> - <location line="+138"/> + <location line="+137"/> <source>Show general overview of wallet</source> <translation type="unfinished"/> </message> @@ -458,17 +464,17 @@ This product includes software developed by the OpenSSL Project for use in the O <translation type="unfinished"/> </message> <message> - <location line="+430"/> + <location line="+440"/> <source>Bitcoin</source> <translation type="unfinished"/> </message> <message> - <location line="-643"/> + <location line="-652"/> <source>Wallet</source> <translation type="unfinished"/> </message> <message> - <location line="+146"/> + <location line="+145"/> <source>&Send</source> <translation type="unfinished"/> </message> @@ -524,18 +530,18 @@ This product includes software developed by the OpenSSL Project for use in the O <translation type="unfinished"/> </message> <message> - <location line="-284"/> - <location line="+376"/> + <location line="-283"/> + <location line="+375"/> <source>[testnet]</source> <translation type="unfinished"/> </message> <message> - <location line="-401"/> + <location line="-400"/> <source>Bitcoin Core</source> <translation type="unfinished"/> </message> <message> - <location line="+163"/> + <location line="+162"/> <source>Request payments (generates QR codes and bitcoin: URIs)</source> <translation type="unfinished"/> </message> @@ -597,7 +603,7 @@ This product includes software developed by the OpenSSL Project for use in the O <translation type="unfinished"/> </message> <message numerus="yes"> - <location line="+23"/> + <location line="+27"/> <source>%n hour(s)</source> <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation> </message> @@ -608,10 +614,21 @@ This product includes software developed by the OpenSSL Project for use in the O </message> <message numerus="yes"> <location line="+4"/> + <location line="+6"/> <source>%n week(s)</source> <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation> </message> <message> + <location line="+0"/> + <source>%1 and %2</source> + <translation type="unfinished"/> + </message> + <message numerus="yes"> + <location line="+0"/> + <source>%n year(s)</source> + <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation> + </message> + <message> <location line="+4"/> <source>%1 behind</source> <translation type="unfinished"/> @@ -642,12 +659,12 @@ This product includes software developed by the OpenSSL Project for use in the O <translation type="unfinished"/> </message> <message> - <location line="-85"/> + <location line="-95"/> <source>Up to date</source> <translation type="unfinished"/> </message> <message> - <location line="+34"/> + <location line="+44"/> <source>Catching up...</source> <translation type="unfinished"/> </message> @@ -681,7 +698,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location filename="../bitcoin.cpp" line="+438"/> + <location filename="../bitcoin.cpp" line="+443"/> <source>A fatal error occurred. Bitcoin can no longer continue safely and will quit.</source> <translation type="unfinished"/> </message> @@ -689,7 +706,7 @@ Address: %4 <context> <name>ClientModel</name> <message> - <location filename="../clientmodel.cpp" line="+119"/> + <location filename="../clientmodel.cpp" line="+128"/> <source>Network Alert</source> <translation type="unfinished"/> </message> @@ -742,7 +759,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+63"/> + <location line="+56"/> <source>(un)select all</source> <translation type="unfinished"/> </message> @@ -757,7 +774,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+52"/> + <location line="+53"/> <source>Amount</source> <translation>رقم</translation> </message> @@ -787,7 +804,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location filename="../coincontroldialog.cpp" line="+42"/> + <location filename="../coincontroldialog.cpp" line="+41"/> <source>Copy address</source> <translation type="unfinished"/> </message> @@ -853,7 +870,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+323"/> + <location line="+332"/> <source>highest</source> <translation type="unfinished"/> </message> @@ -903,12 +920,12 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+31"/> + <location line="+32"/> <source>none</source> <translation type="unfinished"/> </message> <message> - <location line="+140"/> + <location line="+141"/> <source>Dust</source> <translation type="unfinished"/> </message> @@ -971,12 +988,12 @@ Address: %4 </message> <message> <location line="+43"/> - <location line="+66"/> + <location line="+61"/> <source>(no label)</source> <translation>Ú†Ù¹ Ú©Û’ بغیر</translation> </message> <message> - <location line="-9"/> + <location line="-7"/> <source>change from %1 (%2)</source> <translation type="unfinished"/> </message> @@ -1057,7 +1074,7 @@ Address: %4 <context> <name>FreespaceChecker</name> <message> - <location filename="../intro.cpp" line="+65"/> + <location filename="../intro.cpp" line="+68"/> <source>A new data directory will be created.</source> <translation type="unfinished"/> </message> @@ -1090,7 +1107,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location filename="../utilitydialog.cpp" line="+38"/> + <location filename="../utilitydialog.cpp" line="+24"/> <source>Bitcoin Core</source> <translation type="unfinished"/> </message> @@ -1115,7 +1132,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+1"/> + <location line="+2"/> <source>Set language, for example "de_DE" (default: system locale)</source> <translation type="unfinished"/> </message> @@ -1126,11 +1143,16 @@ Address: %4 </message> <message> <location line="+1"/> - <source>Show splash screen on startup (default: 1)</source> + <source>Set SSL root certificates for payment request (default: -system-)</source> <translation type="unfinished"/> </message> <message> <location line="+1"/> + <source>Show splash screen on startup (default: 1)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="-4"/> <source>Choose data directory on startup (default: 0)</source> <translation type="unfinished"/> </message> @@ -1168,7 +1190,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location filename="../intro.cpp" line="+85"/> + <location filename="../intro.cpp" line="+82"/> <source>Bitcoin</source> <translation type="unfinished"/> </message> @@ -1178,7 +1200,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+19"/> + <location line="+24"/> <source>Error</source> <translation>نقص</translation> </message> @@ -1234,7 +1256,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+6"/> + <location line="+116"/> <source>Optional transaction fee per kB that helps make sure your transactions are processed quickly. Most transactions are 1 kB.</source> <translation type="unfinished"/> </message> @@ -1244,7 +1266,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+31"/> + <location line="-125"/> <source>Automatically start Bitcoin after logging in to the system.</source> <translation type="unfinished"/> </message> @@ -1259,12 +1281,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+13"/> - <source>Set database cache size in megabytes (default: 25)</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+13"/> + <location line="+16"/> <source>MB</source> <translation type="unfinished"/> </message> @@ -1274,12 +1291,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+13"/> - <source>Set the number of script verification threads (up to 16, 0 = auto, <0 = leave that many cores free, default: 0)</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+58"/> + <location line="+160"/> <source>Connect to the Bitcoin network through a SOCKS proxy.</source> <translation type="unfinished"/> </message> @@ -1294,7 +1306,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+224"/> + <location line="+214"/> <source>Active command-line options that override above options:</source> <translation type="unfinished"/> </message> @@ -1309,12 +1321,42 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="-323"/> + <location line="-313"/> <source>&Network</source> <translation type="unfinished"/> </message> <message> - <location line="+6"/> + <location line="-131"/> + <source>(0 = auto, <0 = leave that many cores free)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+36"/> + <source>W&allet</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+65"/> + <source>Expert</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+9"/> + <source>Enable coin &control features</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+7"/> + <source>If you disable the spending of unconfirmed change, the change from a transaction cannot be used until that transaction has at least one confirmation. This also affects how your balance is computed.</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+3"/> + <source>&Spend unconfirmed change</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+17"/> <source>Automatically open the Bitcoin client port on the router. This only works when your router supports UPnP and it is enabled.</source> <translation type="unfinished"/> </message> @@ -1409,17 +1451,12 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+7"/> + <location line="-262"/> <source>Whether to show coin control features or not.</source> <translation type="unfinished"/> </message> <message> - <location line="+3"/> - <source>Display coin &control features (experts only)</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+136"/> + <location line="+398"/> <source>&OK</source> <translation type="unfinished"/> </message> @@ -1429,17 +1466,17 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location filename="../optionsdialog.cpp" line="+67"/> + <location filename="../optionsdialog.cpp" line="+72"/> <source>default</source> <translation type="unfinished"/> </message> <message> - <location line="+57"/> + <location line="+58"/> <source>none</source> <translation type="unfinished"/> </message> <message> - <location line="+75"/> + <location line="+80"/> <source>Confirm options reset</source> <translation type="unfinished"/> </message> @@ -1479,18 +1516,13 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="-155"/> - <source>Unconfirmed:</source> - <translation type="unfinished"/> - </message> - <message> - <location line="-83"/> + <location line="-238"/> <source>Wallet</source> <translation type="unfinished"/> </message> <message> <location line="+51"/> - <source>Confirmed:</source> + <source>Available:</source> <translation type="unfinished"/> </message> <message> @@ -1499,7 +1531,12 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+32"/> + <location line="+16"/> + <source>Pending:</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+16"/> <source>Total of transactions that have yet to be confirmed, and do not yet count toward the spendable balance</source> <translation type="unfinished"/> </message> @@ -1632,23 +1669,29 @@ Address: %4 <context> <name>QObject</name> <message> - <location filename="../bitcoin.cpp" line="+71"/> - <location line="+11"/> + <location filename="../bitcoin.cpp" line="+63"/> + <location line="+7"/> + <location line="+13"/> <source>Bitcoin</source> <translation type="unfinished"/> </message> <message> - <location line="+1"/> + <location line="-19"/> <source>Error: Specified data directory "%1" does not exist.</source> <translation type="unfinished"/> </message> <message> - <location line="-12"/> + <location line="+7"/> + <source>Error: Cannot parse configuration file: %1. Only use key=value syntax.</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+12"/> <source>Error: Invalid combination of -regtest and -testnet.</source> <translation type="unfinished"/> </message> <message> - <location filename="../guiutil.cpp" line="+82"/> + <location filename="../guiutil.cpp" line="+89"/> <source>Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source> <translation type="unfinished"/> </message> @@ -1694,7 +1737,7 @@ Address: %4 <location line="+36"/> <location line="+23"/> <location line="+23"/> - <location filename="../rpcconsole.cpp" line="+359"/> + <location filename="../rpcconsole.cpp" line="+373"/> <source>N/A</source> <translation type="unfinished"/> </message> @@ -1790,11 +1833,13 @@ Address: %4 </message> <message> <location line="+64"/> + <location filename="../rpcconsole.cpp" line="-10"/> <source>In:</source> <translation type="unfinished"/> </message> <message> <location line="+80"/> + <location filename="../rpcconsole.cpp" line="+1"/> <source>Out:</source> <translation type="unfinished"/> </message> @@ -1819,7 +1864,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location filename="../rpcconsole.cpp" line="-30"/> + <location filename="../rpcconsole.cpp" line="-35"/> <source>Welcome to the Bitcoin RPC console.</source> <translation type="unfinished"/> </message> @@ -1834,7 +1879,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+122"/> + <location line="+136"/> <source>%1 B</source> <translation type="unfinished"/> </message> @@ -1950,7 +1995,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+11"/> + <location line="+14"/> <source>Remove the selected entries from the list</source> <translation type="unfinished"/> </message> @@ -1960,7 +2005,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location filename="../receivecoinsdialog.cpp" line="+38"/> + <location filename="../receivecoinsdialog.cpp" line="+39"/> <source>Copy label</source> <translation type="unfinished"/> </message> @@ -2181,12 +2226,12 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+52"/> + <location line="+58"/> <source>Balance:</source> <translation>بیلنس:</translation> </message> <message> - <location line="-78"/> + <location line="-84"/> <source>Confirm the send action</source> <translation type="unfinished"/> </message> @@ -2431,7 +2476,7 @@ Address: %4 <context> <name>ShutdownWindow</name> <message> - <location filename="../utilitydialog.cpp" line="+48"/> + <location filename="../utilitydialog.cpp" line="+52"/> <source>Bitcoin Core is shutting down...</source> <translation type="unfinished"/> </message> @@ -2631,7 +2676,7 @@ Address: %4 <context> <name>SplashScreen</name> <message> - <location filename="../splashscreen.cpp" line="+28"/> + <location filename="../splashscreen.cpp" line="+32"/> <source>Bitcoin Core</source> <translation type="unfinished"/> </message> @@ -2663,6 +2708,11 @@ Address: %4 </message> <message> <location line="+6"/> + <source>conflicted</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+2"/> <source>%1/offline</source> <translation type="unfinished"/> </message> @@ -2824,12 +2874,12 @@ Address: %4 <translation type="unfinished"/> </message> <message numerus="yes"> - <location line="-35"/> + <location line="-37"/> <source>Open for %n more block(s)</source> <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation> </message> <message> - <location line="+70"/> + <location line="+72"/> <source>unknown</source> <translation type="unfinished"/> </message> @@ -2870,12 +2920,12 @@ Address: %4 <translation>رقم</translation> </message> <message> - <location line="+59"/> + <location line="+78"/> <source>Immature (%1 confirmations, will be available after %2)</source> <translation type="unfinished"/> </message> <message numerus="yes"> - <location line="+16"/> + <location line="-21"/> <source>Open for %n more block(s)</source> <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation> </message> @@ -2885,33 +2935,42 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+3"/> - <source>Offline (%1 confirmations)</source> + <location line="+12"/> + <source>Confirmed (%1 confirmations)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+9"/> + <source>This block was not received by any other nodes and will probably not be accepted!</source> <translation type="unfinished"/> </message> <message> <location line="+3"/> - <source>Unconfirmed (%1 of %2 confirmations)</source> + <source>Generated but not accepted</source> <translation type="unfinished"/> </message> <message> - <location line="-22"/> - <location line="+25"/> - <source>Confirmed (%1 confirmations)</source> + <location line="-21"/> + <source>Offline</source> <translation type="unfinished"/> </message> <message> - <location line="-22"/> - <source>This block was not received by any other nodes and will probably not be accepted!</source> + <location line="+3"/> + <source>Unconfirmed</source> <translation type="unfinished"/> </message> <message> <location line="+3"/> - <source>Generated but not accepted</source> + <source>Confirming (%1 of %2 recommended confirmations)</source> <translation type="unfinished"/> </message> <message> - <location line="+62"/> + <location line="+6"/> + <source>Conflicted</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+51"/> <source>Received with</source> <translation type="unfinished"/> </message> @@ -2941,7 +3000,7 @@ Address: %4 <translation>(N / A)</translation> </message> <message> - <location line="+199"/> + <location line="+190"/> <source>Transaction status. Hover over this field to show number of confirmations.</source> <translation type="unfinished"/> </message> @@ -3070,7 +3129,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+142"/> + <location line="+140"/> <source>Export Transaction History</source> <translation type="unfinished"/> </message> @@ -3164,7 +3223,7 @@ Address: %4 <context> <name>WalletView</name> <message> - <location filename="../walletview.cpp" line="+43"/> + <location filename="../walletview.cpp" line="+44"/> <source>&Export</source> <translation type="unfinished"/> </message> @@ -3174,7 +3233,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+181"/> + <location line="+184"/> <source>Backup Wallet</source> <translation type="unfinished"/> </message> @@ -3207,12 +3266,12 @@ Address: %4 <context> <name>bitcoin-core</name> <message> - <location filename="../bitcoinstrings.cpp" line="+221"/> + <location filename="../bitcoinstrings.cpp" line="+261"/> <source>Usage:</source> <translation type="unfinished"/> </message> <message> - <location line="-54"/> + <location line="-66"/> <source>List commands</source> <translation type="unfinished"/> </message> @@ -3222,12 +3281,12 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+26"/> + <location line="+27"/> <source>Options:</source> <translation type="unfinished"/> </message> <message> - <location line="+22"/> + <location line="+32"/> <source>Specify configuration file (default: bitcoin.conf)</source> <translation type="unfinished"/> </message> @@ -3242,72 +3301,72 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="-9"/> - <source>Set database cache size in megabytes (default: 25)</source> - <translation type="unfinished"/> - </message> - <message> - <location line="-26"/> + <location line="-46"/> <source>Listen for connections on <port> (default: 8333 or testnet: 18333)</source> <translation type="unfinished"/> </message> <message> - <location line="+5"/> + <location line="+6"/> <source>Maintain at most <n> connections to peers (default: 125)</source> <translation type="unfinished"/> </message> <message> - <location line="-51"/> + <location line="-57"/> <source>Connect to a node to retrieve peer addresses, and disconnect</source> <translation type="unfinished"/> </message> <message> - <location line="+84"/> + <location line="+100"/> <source>Specify your own public address</source> <translation type="unfinished"/> </message> <message> - <location line="+5"/> + <location line="+6"/> <source>Threshold for disconnecting misbehaving peers (default: 100)</source> <translation type="unfinished"/> </message> <message> - <location line="-148"/> + <location line="-172"/> <source>Number of seconds to keep misbehaving peers from reconnecting (default: 86400)</source> <translation type="unfinished"/> </message> <message> - <location line="-36"/> + <location line="-52"/> <source>An error occurred while setting up the RPC port %u for listening on IPv4: %s</source> <translation type="unfinished"/> </message> <message> - <location line="+34"/> + <location line="+50"/> <source>Listen for JSON-RPC connections on <port> (default: 8332 or testnet: 18332)</source> <translation type="unfinished"/> </message> <message> - <location line="+45"/> + <location line="+51"/> <source>Accept command line and JSON-RPC commands</source> <translation type="unfinished"/> </message> <message> - <location line="+80"/> + <location line="+7"/> + <source>Bitcoin Core RPC client version</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+87"/> <source>Run in the background as a daemon and accept commands</source> <translation type="unfinished"/> </message> <message> - <location line="+39"/> + <location line="+43"/> <source>Use the test network</source> <translation type="unfinished"/> </message> <message> - <location line="-118"/> + <location line="-136"/> <source>Accept connections from outside (default: 1 if no -proxy or -connect)</source> <translation type="unfinished"/> </message> <message> - <location line="-95"/> + <location line="-117"/> <source>%s, you must set a rpcpassword in the configuration file: %s It is recommended you use the following random password: @@ -3337,8 +3396,8 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+3"/> - <source>Cannot obtain a lock on data directory %s. Bitcoin is probably already running.</source> + <location line="+6"/> + <source>Continuously rate-limit free transactions to <n>*1000 bytes per minute (default:15)</source> <translation type="unfinished"/> </message> <message> @@ -3353,6 +3412,11 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. </message> <message> <location line="+3"/> + <source>Error: Listening for incoming connections failed (listen returned error %d)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+2"/> <source>Error: The transaction was rejected! This might happen if some of the coins in your wallet were already spent, such as if you used a copy of wallet.dat and coins were spent in the copy but not marked as spent here.</source> <translation type="unfinished"/> </message> @@ -3367,12 +3431,47 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+18"/> + <location line="+6"/> + <source>Fees smaller than this are considered zero fee (for transaction creation) (default:</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+3"/> + <source>Flush database activity from memory pool to disk log every <n> megabytes (default: 100)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+3"/> + <source>How thorough the block verification of -checkblocks is (0-4, default: 3)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+2"/> + <source>In this mode -genproclimit controls how many blocks are generated immediately.</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+12"/> + <source>Set the number of script verification threads (%u to %d, 0 = auto, <0 = leave that many cores free, default: %d)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+3"/> + <source>Set the processor limit for when generation is on (-1 = unlimited, default: -1)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+3"/> <source>This is a pre-release test build - use at your own risk - do not use for mining or merchant applications</source> <translation type="unfinished"/> </message> <message> - <location line="+5"/> + <location line="+3"/> + <source>Unable to bind to %s on this computer. Bitcoin Core is probably already running.</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+3"/> <source>Use separate SOCKS5 proxy to reach peers via Tor hidden services (default: -proxy)</source> <translation type="unfinished"/> </message> @@ -3408,6 +3507,16 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. </message> <message> <location line="+9"/> + <source>(default: 1)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>(default: wallet.dat)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> <source><category> can be:</source> <translation type="unfinished"/> </message> @@ -3422,17 +3531,17 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+1"/> - <source>Bitcoin RPC client version</source> + <location line="+2"/> + <source>Block creation options:</source> <translation type="unfinished"/> </message> <message> - <location line="+1"/> - <source>Block creation options:</source> + <location line="+5"/> + <source>Clear list of wallet transactions (diagnostic tool; implies -rescan)</source> <translation type="unfinished"/> </message> <message> - <location line="+5"/> + <location line="+1"/> <source>Connect only to the specified node(s)</source> <translation type="unfinished"/> </message> @@ -3448,11 +3557,26 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. </message> <message> <location line="+2"/> + <source>Connection options:</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> <source>Corrupted block database detected</source> <translation type="unfinished"/> </message> <message> <location line="+1"/> + <source>Debugging/Testing options:</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>Disable safemode, override a real safe mode event (default: 0)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> <source>Discover own IP address (default: 1 when listening and no -externalip)</source> <translation type="unfinished"/> </message> @@ -3563,22 +3687,27 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. </message> <message> <location line="+1"/> - <source>Find peers using DNS lookup (default: 1 unless -connect)</source> + <source>Fees smaller than this are considered zero fee (for relaying) (default:</source> <translation type="unfinished"/> </message> <message> <location line="+1"/> - <source>Generate coins (default: 0)</source> + <source>Find peers using DNS lookup (default: 1 unless -connect)</source> <translation type="unfinished"/> </message> <message> - <location line="+2"/> - <source>How many blocks to check at startup (default: 288, 0 = all)</source> + <location line="+1"/> + <source>Force safe mode (default: 0)</source> <translation type="unfinished"/> </message> <message> <location line="+1"/> - <source>How thorough the block verification is (0-4, default: 3)</source> + <source>Generate coins (default: 0)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+2"/> + <source>How many blocks to check at startup (default: 288, 0 = all)</source> <translation type="unfinished"/> </message> <message> @@ -3597,7 +3726,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+15"/> + <location line="+17"/> <source>Not enough file descriptors available.</source> <translation type="unfinished"/> </message> @@ -3607,27 +3736,27 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+1"/> + <location line="+4"/> <source>RPC client options:</source> <translation type="unfinished"/> </message> <message> - <location line="+1"/> + <location line="+4"/> <source>Rebuild block chain index from current blk000??.dat files</source> <translation type="unfinished"/> </message> <message> - <location line="+5"/> + <location line="+6"/> <source>Select SOCKS version for -proxy (4 or 5, default: 5)</source> <translation type="unfinished"/> </message> <message> - <location line="+1"/> - <source>Send command to Bitcoin server</source> + <location line="+6"/> + <source>Set database cache size in megabytes (%d to %d, default: %d)</source> <translation type="unfinished"/> </message> <message> - <location line="+7"/> + <location line="+2"/> <source>Set maximum block size in bytes (default: %d)</source> <translation type="unfinished"/> </message> @@ -3637,17 +3766,17 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+7"/> + <location line="+10"/> <source>Specify wallet file (within data directory)</source> <translation type="unfinished"/> </message> <message> <location line="+2"/> - <source>Start Bitcoin server</source> + <source>Spend unconfirmed change when sending transactions (default: 1)</source> <translation type="unfinished"/> </message> <message> - <location line="+3"/> + <location line="+4"/> <source>This is intended for regression testing tools and app development.</source> <translation type="unfinished"/> </message> @@ -3692,32 +3821,32 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="-79"/> + <location line="-92"/> <source>Imports blocks from external blk000??.dat file</source> <translation type="unfinished"/> </message> <message> - <location line="-105"/> - <source>Execute command when a relevant alert is received or we see a really long fork (%s in cmd is replaced by message)</source> + <location line="-149"/> + <source>Cannot obtain a lock on data directory %s. Bitcoin Core is probably already running.</source> <translation type="unfinished"/> </message> <message> - <location line="+14"/> - <source>Output debugging information (default: 0, supplying <category> is optional)</source> + <location line="+22"/> + <source>Execute command when a relevant alert is received or we see a really long fork (%s in cmd is replaced by message)</source> <translation type="unfinished"/> </message> <message> - <location line="+2"/> - <source>Set maximum size of high-priority/low-fee transactions in bytes (default: %d)</source> + <location line="+25"/> + <source>Output debugging information (default: 0, supplying <category> is optional)</source> <translation type="unfinished"/> </message> <message> <location line="+2"/> - <source>Set the number of script verification threads (up to 16, 0 = auto, <0 = leave that many cores free, default: 0)</source> + <source>Set maximum size of high-priority/low-fee transactions in bytes (default: %d)</source> <translation type="unfinished"/> </message> <message> - <location line="+89"/> + <location line="+102"/> <source>Information</source> <translation type="unfinished"/> </message> @@ -3732,7 +3861,17 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+8"/> + <location line="+3"/> + <source>Limit size of signature cache to <n> entries (default: 50000)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+6"/> + <source>Log transaction priority and fee per kB when mining blocks (default: 0)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> <source>Maintain a full transaction index (default: 0)</source> <translation type="unfinished"/> </message> @@ -3757,12 +3896,52 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+9"/> - <source>SSL options: (see the Bitcoin Wiki for SSL setup instructions)</source> + <location line="+4"/> + <source>Print block on startup, if found in block index</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>Print block tree on startup (default: 0)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>RPC SSL options: (see the Bitcoin Wiki for SSL setup instructions)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+2"/> + <source>RPC server options:</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>Randomly drop 1 of every <n> network messages</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>Randomly fuzz 1 of every <n> network messages</source> <translation type="unfinished"/> </message> <message> <location line="+4"/> + <source>Run a thread to flush wallet periodically (default: 1)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+2"/> + <source>SSL options: (see the Bitcoin Wiki for SSL setup instructions)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+2"/> + <source>Send command to Bitcoin Core</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+2"/> <source>Send trace/debug info to console instead of debug.log file</source> <translation type="unfinished"/> </message> @@ -3773,6 +3952,21 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. </message> <message> <location line="+2"/> + <source>Sets the DB_PRIVATE flag in the wallet db environment (default: 1)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>Show all debugging options (usage: --help -help-debug)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>Show benchmark information (default: 0)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> <source>Shrink debug.log file on client startup (default: 1 when no -debug)</source> <translation type="unfinished"/> </message> @@ -3788,6 +3982,11 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. </message> <message> <location line="+6"/> + <source>Start Bitcoin Core Daemon</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> <source>System error: </source> <translation type="unfinished"/> </message> @@ -3833,6 +4032,16 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. </message> <message> <location line="+2"/> + <source>Zapping all transactions from wallet...</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>on startup</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> <source>version</source> <translation type="unfinished"/> </message> @@ -3842,47 +4051,47 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="-58"/> + <location line="-71"/> <source>Password for JSON-RPC connections</source> <translation type="unfinished"/> </message> <message> - <location line="-70"/> + <location line="-77"/> <source>Allow JSON-RPC connections from specified IP address</source> <translation type="unfinished"/> </message> <message> - <location line="+80"/> + <location line="+94"/> <source>Send commands to node running on <ip> (default: 127.0.0.1)</source> <translation type="unfinished"/> </message> <message> - <location line="-132"/> + <location line="-163"/> <source>Execute command when the best block changes (%s in cmd is replaced by block hash)</source> <translation type="unfinished"/> </message> <message> - <location line="+161"/> + <location line="+196"/> <source>Upgrade wallet to latest format</source> <translation type="unfinished"/> </message> <message> - <location line="-24"/> + <location line="-28"/> <source>Set key pool size to <n> (default: 100)</source> <translation type="unfinished"/> </message> <message> - <location line="-11"/> + <location line="-12"/> <source>Rescan the block chain for missing wallet transactions</source> <translation type="unfinished"/> </message> <message> - <location line="+38"/> + <location line="+43"/> <source>Use OpenSSL (https) for JSON-RPC connections</source> <translation type="unfinished"/> </message> <message> - <location line="-30"/> + <location line="-34"/> <source>Server certificate file (default: server.cert)</source> <translation type="unfinished"/> </message> @@ -3892,7 +4101,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+16"/> + <location line="+20"/> <source>This help message</source> <translation>ÛŒÛ Ù…Ø¯Ø¯ کا پیغام</translation> </message> @@ -3902,17 +4111,17 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="-107"/> + <location line="-125"/> <source>Allow DNS lookups for -addnode, -seednode and -connect</source> <translation type="unfinished"/> </message> <message> - <location line="+60"/> + <location line="+66"/> <source>Loading addresses...</source> <translation type="unfinished"/> </message> <message> - <location line="-37"/> + <location line="-39"/> <source>Error loading wallet.dat: Wallet corrupted</source> <translation type="unfinished"/> </message> @@ -3922,22 +4131,22 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+98"/> + <location line="+112"/> <source>Wallet needed to be rewritten: restart Bitcoin to complete</source> <translation type="unfinished"/> </message> <message> - <location line="-100"/> + <location line="-114"/> <source>Error loading wallet.dat</source> <translation type="unfinished"/> </message> <message> - <location line="+31"/> + <location line="+32"/> <source>Invalid -proxy address: '%s'</source> <translation type="unfinished"/> </message> <message> - <location line="+56"/> + <location line="+69"/> <source>Unknown network specified in -onlynet: '%s'</source> <translation type="unfinished"/> </message> @@ -3947,7 +4156,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="-101"/> + <location line="-119"/> <source>Cannot resolve -bind address: '%s'</source> <translation type="unfinished"/> </message> @@ -3957,7 +4166,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+48"/> + <location line="+53"/> <source>Invalid amount for -paytxfee=<amount>: '%s'</source> <translation type="unfinished"/> </message> @@ -3972,27 +4181,22 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation>ناکاÙÛŒ Ùنڈز</translation> </message> <message> - <location line="+10"/> + <location line="+11"/> <source>Loading block index...</source> <translation type="unfinished"/> </message> <message> - <location line="-62"/> + <location line="-68"/> <source>Add a node to connect to and attempt to keep the connection open</source> <translation type="unfinished"/> </message> <message> - <location line="-32"/> - <source>Unable to bind to %s on this computer. Bitcoin is probably already running.</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+95"/> + <location line="+69"/> <source>Loading wallet...</source> <translation type="unfinished"/> </message> <message> - <location line="-56"/> + <location line="-62"/> <source>Cannot downgrade wallet</source> <translation type="unfinished"/> </message> @@ -4002,27 +4206,27 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+67"/> + <location line="+80"/> <source>Rescanning...</source> <translation type="unfinished"/> </message> <message> - <location line="-58"/> + <location line="-67"/> <source>Done loading</source> <translation type="unfinished"/> </message> <message> - <location line="+85"/> + <location line="+99"/> <source>To use the %s option</source> <translation type="unfinished"/> </message> <message> - <location line="-77"/> + <location line="-91"/> <source>Error</source> <translation>نقص</translation> </message> <message> - <location line="-35"/> + <location line="-41"/> <source>You must set rpcpassword=<password> in the configuration file: %s If the file does not exist, create it with owner-readable-only file permissions.</source> diff --git a/src/qt/locale/bitcoin_uz@Cyrl.ts b/src/qt/locale/bitcoin_uz@Cyrl.ts index 5afa9d1f54..4001b5b664 100644 --- a/src/qt/locale/bitcoin_uz@Cyrl.ts +++ b/src/qt/locale/bitcoin_uz@Cyrl.ts @@ -31,6 +31,12 @@ This product includes software developed by the OpenSSL Project for use in the O <source>The Bitcoin Core developers</source> <translation type="unfinished"/> </message> + <message> + <location line="+12"/> + <location line="+2"/> + <source>(%1-bit)</source> + <translation type="unfinished"/> + </message> </context> <context> <name>AddressBookPage</name> @@ -60,7 +66,7 @@ This product includes software developed by the OpenSSL Project for use in the O <translation type="unfinished"/> </message> <message> - <location line="+52"/> + <location line="+58"/> <source>C&lose</source> <translation type="unfinished"/> </message> @@ -70,7 +76,7 @@ This product includes software developed by the OpenSSL Project for use in the O <translation type="unfinished"/> </message> <message> - <location filename="../forms/addressbookpage.ui" line="-41"/> + <location filename="../forms/addressbookpage.ui" line="-47"/> <source>Delete the currently selected address from the list</source> <translation type="unfinished"/> </message> @@ -317,7 +323,7 @@ This product includes software developed by the OpenSSL Project for use in the O <context> <name>BitcoinGUI</name> <message> - <location filename="../bitcoingui.cpp" line="+295"/> + <location filename="../bitcoingui.cpp" line="+294"/> <source>Sign &message...</source> <translation type="unfinished"/> </message> @@ -332,12 +338,12 @@ This product includes software developed by the OpenSSL Project for use in the O <translation type="unfinished"/> </message> <message> - <location line="-137"/> + <location line="-136"/> <source>Node</source> <translation type="unfinished"/> </message> <message> - <location line="+138"/> + <location line="+137"/> <source>Show general overview of wallet</source> <translation type="unfinished"/> </message> @@ -458,17 +464,17 @@ This product includes software developed by the OpenSSL Project for use in the O <translation type="unfinished"/> </message> <message> - <location line="+430"/> + <location line="+440"/> <source>Bitcoin</source> <translation type="unfinished"/> </message> <message> - <location line="-643"/> + <location line="-652"/> <source>Wallet</source> <translation type="unfinished"/> </message> <message> - <location line="+146"/> + <location line="+145"/> <source>&Send</source> <translation type="unfinished"/> </message> @@ -524,18 +530,18 @@ This product includes software developed by the OpenSSL Project for use in the O <translation type="unfinished"/> </message> <message> - <location line="-284"/> - <location line="+376"/> + <location line="-283"/> + <location line="+375"/> <source>[testnet]</source> <translation type="unfinished"/> </message> <message> - <location line="-401"/> + <location line="-400"/> <source>Bitcoin Core</source> <translation type="unfinished"/> </message> <message> - <location line="+163"/> + <location line="+162"/> <source>Request payments (generates QR codes and bitcoin: URIs)</source> <translation type="unfinished"/> </message> @@ -597,7 +603,7 @@ This product includes software developed by the OpenSSL Project for use in the O <translation type="unfinished"/> </message> <message numerus="yes"> - <location line="+23"/> + <location line="+27"/> <source>%n hour(s)</source> <translation type="unfinished"><numerusform></numerusform></translation> </message> @@ -608,10 +614,21 @@ This product includes software developed by the OpenSSL Project for use in the O </message> <message numerus="yes"> <location line="+4"/> + <location line="+6"/> <source>%n week(s)</source> <translation type="unfinished"><numerusform></numerusform></translation> </message> <message> + <location line="+0"/> + <source>%1 and %2</source> + <translation type="unfinished"/> + </message> + <message numerus="yes"> + <location line="+0"/> + <source>%n year(s)</source> + <translation type="unfinished"><numerusform></numerusform></translation> + </message> + <message> <location line="+4"/> <source>%1 behind</source> <translation type="unfinished"/> @@ -642,12 +659,12 @@ This product includes software developed by the OpenSSL Project for use in the O <translation type="unfinished"/> </message> <message> - <location line="-85"/> + <location line="-95"/> <source>Up to date</source> <translation type="unfinished"/> </message> <message> - <location line="+34"/> + <location line="+44"/> <source>Catching up...</source> <translation type="unfinished"/> </message> @@ -681,7 +698,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location filename="../bitcoin.cpp" line="+438"/> + <location filename="../bitcoin.cpp" line="+443"/> <source>A fatal error occurred. Bitcoin can no longer continue safely and will quit.</source> <translation type="unfinished"/> </message> @@ -689,7 +706,7 @@ Address: %4 <context> <name>ClientModel</name> <message> - <location filename="../clientmodel.cpp" line="+119"/> + <location filename="../clientmodel.cpp" line="+128"/> <source>Network Alert</source> <translation type="unfinished"/> </message> @@ -742,7 +759,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+63"/> + <location line="+56"/> <source>(un)select all</source> <translation type="unfinished"/> </message> @@ -757,7 +774,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+52"/> + <location line="+53"/> <source>Amount</source> <translation type="unfinished"/> </message> @@ -787,7 +804,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location filename="../coincontroldialog.cpp" line="+42"/> + <location filename="../coincontroldialog.cpp" line="+41"/> <source>Copy address</source> <translation type="unfinished"/> </message> @@ -853,7 +870,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+323"/> + <location line="+332"/> <source>highest</source> <translation type="unfinished"/> </message> @@ -903,12 +920,12 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+31"/> + <location line="+32"/> <source>none</source> <translation type="unfinished"/> </message> <message> - <location line="+140"/> + <location line="+141"/> <source>Dust</source> <translation type="unfinished"/> </message> @@ -971,12 +988,12 @@ Address: %4 </message> <message> <location line="+43"/> - <location line="+66"/> + <location line="+61"/> <source>(no label)</source> <translation type="unfinished"/> </message> <message> - <location line="-9"/> + <location line="-7"/> <source>change from %1 (%2)</source> <translation type="unfinished"/> </message> @@ -1057,7 +1074,7 @@ Address: %4 <context> <name>FreespaceChecker</name> <message> - <location filename="../intro.cpp" line="+65"/> + <location filename="../intro.cpp" line="+68"/> <source>A new data directory will be created.</source> <translation type="unfinished"/> </message> @@ -1090,7 +1107,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location filename="../utilitydialog.cpp" line="+38"/> + <location filename="../utilitydialog.cpp" line="+24"/> <source>Bitcoin Core</source> <translation type="unfinished"/> </message> @@ -1115,7 +1132,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+1"/> + <location line="+2"/> <source>Set language, for example "de_DE" (default: system locale)</source> <translation type="unfinished"/> </message> @@ -1126,11 +1143,16 @@ Address: %4 </message> <message> <location line="+1"/> - <source>Show splash screen on startup (default: 1)</source> + <source>Set SSL root certificates for payment request (default: -system-)</source> <translation type="unfinished"/> </message> <message> <location line="+1"/> + <source>Show splash screen on startup (default: 1)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="-4"/> <source>Choose data directory on startup (default: 0)</source> <translation type="unfinished"/> </message> @@ -1168,7 +1190,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location filename="../intro.cpp" line="+85"/> + <location filename="../intro.cpp" line="+82"/> <source>Bitcoin</source> <translation type="unfinished"/> </message> @@ -1178,7 +1200,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+19"/> + <location line="+24"/> <source>Error</source> <translation type="unfinished"/> </message> @@ -1234,7 +1256,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+6"/> + <location line="+116"/> <source>Optional transaction fee per kB that helps make sure your transactions are processed quickly. Most transactions are 1 kB.</source> <translation type="unfinished"/> </message> @@ -1244,7 +1266,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+31"/> + <location line="-125"/> <source>Automatically start Bitcoin after logging in to the system.</source> <translation type="unfinished"/> </message> @@ -1259,12 +1281,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+13"/> - <source>Set database cache size in megabytes (default: 25)</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+13"/> + <location line="+16"/> <source>MB</source> <translation type="unfinished"/> </message> @@ -1274,12 +1291,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+13"/> - <source>Set the number of script verification threads (up to 16, 0 = auto, <0 = leave that many cores free, default: 0)</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+58"/> + <location line="+160"/> <source>Connect to the Bitcoin network through a SOCKS proxy.</source> <translation type="unfinished"/> </message> @@ -1294,7 +1306,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+224"/> + <location line="+214"/> <source>Active command-line options that override above options:</source> <translation type="unfinished"/> </message> @@ -1309,12 +1321,42 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="-323"/> + <location line="-313"/> <source>&Network</source> <translation type="unfinished"/> </message> <message> - <location line="+6"/> + <location line="-131"/> + <source>(0 = auto, <0 = leave that many cores free)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+36"/> + <source>W&allet</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+65"/> + <source>Expert</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+9"/> + <source>Enable coin &control features</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+7"/> + <source>If you disable the spending of unconfirmed change, the change from a transaction cannot be used until that transaction has at least one confirmation. This also affects how your balance is computed.</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+3"/> + <source>&Spend unconfirmed change</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+17"/> <source>Automatically open the Bitcoin client port on the router. This only works when your router supports UPnP and it is enabled.</source> <translation type="unfinished"/> </message> @@ -1409,17 +1451,12 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+7"/> + <location line="-262"/> <source>Whether to show coin control features or not.</source> <translation type="unfinished"/> </message> <message> - <location line="+3"/> - <source>Display coin &control features (experts only)</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+136"/> + <location line="+398"/> <source>&OK</source> <translation type="unfinished"/> </message> @@ -1429,17 +1466,17 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location filename="../optionsdialog.cpp" line="+67"/> + <location filename="../optionsdialog.cpp" line="+72"/> <source>default</source> <translation type="unfinished"/> </message> <message> - <location line="+57"/> + <location line="+58"/> <source>none</source> <translation type="unfinished"/> </message> <message> - <location line="+75"/> + <location line="+80"/> <source>Confirm options reset</source> <translation type="unfinished"/> </message> @@ -1479,18 +1516,13 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="-155"/> - <source>Unconfirmed:</source> - <translation type="unfinished"/> - </message> - <message> - <location line="-83"/> + <location line="-238"/> <source>Wallet</source> <translation type="unfinished"/> </message> <message> <location line="+51"/> - <source>Confirmed:</source> + <source>Available:</source> <translation type="unfinished"/> </message> <message> @@ -1499,7 +1531,12 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+32"/> + <location line="+16"/> + <source>Pending:</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+16"/> <source>Total of transactions that have yet to be confirmed, and do not yet count toward the spendable balance</source> <translation type="unfinished"/> </message> @@ -1632,23 +1669,29 @@ Address: %4 <context> <name>QObject</name> <message> - <location filename="../bitcoin.cpp" line="+71"/> - <location line="+11"/> + <location filename="../bitcoin.cpp" line="+63"/> + <location line="+7"/> + <location line="+13"/> <source>Bitcoin</source> <translation type="unfinished"/> </message> <message> - <location line="+1"/> + <location line="-19"/> <source>Error: Specified data directory "%1" does not exist.</source> <translation type="unfinished"/> </message> <message> - <location line="-12"/> + <location line="+7"/> + <source>Error: Cannot parse configuration file: %1. Only use key=value syntax.</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+12"/> <source>Error: Invalid combination of -regtest and -testnet.</source> <translation type="unfinished"/> </message> <message> - <location filename="../guiutil.cpp" line="+82"/> + <location filename="../guiutil.cpp" line="+89"/> <source>Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source> <translation type="unfinished"/> </message> @@ -1694,7 +1737,7 @@ Address: %4 <location line="+36"/> <location line="+23"/> <location line="+23"/> - <location filename="../rpcconsole.cpp" line="+359"/> + <location filename="../rpcconsole.cpp" line="+373"/> <source>N/A</source> <translation type="unfinished"/> </message> @@ -1790,11 +1833,13 @@ Address: %4 </message> <message> <location line="+64"/> + <location filename="../rpcconsole.cpp" line="-10"/> <source>In:</source> <translation type="unfinished"/> </message> <message> <location line="+80"/> + <location filename="../rpcconsole.cpp" line="+1"/> <source>Out:</source> <translation type="unfinished"/> </message> @@ -1819,7 +1864,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location filename="../rpcconsole.cpp" line="-30"/> + <location filename="../rpcconsole.cpp" line="-35"/> <source>Welcome to the Bitcoin RPC console.</source> <translation type="unfinished"/> </message> @@ -1834,7 +1879,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+122"/> + <location line="+136"/> <source>%1 B</source> <translation type="unfinished"/> </message> @@ -1950,7 +1995,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+11"/> + <location line="+14"/> <source>Remove the selected entries from the list</source> <translation type="unfinished"/> </message> @@ -1960,7 +2005,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location filename="../receivecoinsdialog.cpp" line="+38"/> + <location filename="../receivecoinsdialog.cpp" line="+39"/> <source>Copy label</source> <translation type="unfinished"/> </message> @@ -2181,12 +2226,12 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+52"/> + <location line="+58"/> <source>Balance:</source> <translation type="unfinished"/> </message> <message> - <location line="-78"/> + <location line="-84"/> <source>Confirm the send action</source> <translation type="unfinished"/> </message> @@ -2431,7 +2476,7 @@ Address: %4 <context> <name>ShutdownWindow</name> <message> - <location filename="../utilitydialog.cpp" line="+48"/> + <location filename="../utilitydialog.cpp" line="+52"/> <source>Bitcoin Core is shutting down...</source> <translation type="unfinished"/> </message> @@ -2631,7 +2676,7 @@ Address: %4 <context> <name>SplashScreen</name> <message> - <location filename="../splashscreen.cpp" line="+28"/> + <location filename="../splashscreen.cpp" line="+32"/> <source>Bitcoin Core</source> <translation type="unfinished"/> </message> @@ -2663,6 +2708,11 @@ Address: %4 </message> <message> <location line="+6"/> + <source>conflicted</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+2"/> <source>%1/offline</source> <translation type="unfinished"/> </message> @@ -2824,12 +2874,12 @@ Address: %4 <translation type="unfinished"/> </message> <message numerus="yes"> - <location line="-35"/> + <location line="-37"/> <source>Open for %n more block(s)</source> <translation type="unfinished"><numerusform></numerusform></translation> </message> <message> - <location line="+70"/> + <location line="+72"/> <source>unknown</source> <translation type="unfinished"/> </message> @@ -2870,12 +2920,12 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+59"/> + <location line="+78"/> <source>Immature (%1 confirmations, will be available after %2)</source> <translation type="unfinished"/> </message> <message numerus="yes"> - <location line="+16"/> + <location line="-21"/> <source>Open for %n more block(s)</source> <translation type="unfinished"><numerusform></numerusform></translation> </message> @@ -2885,33 +2935,42 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+3"/> - <source>Offline (%1 confirmations)</source> + <location line="+12"/> + <source>Confirmed (%1 confirmations)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+9"/> + <source>This block was not received by any other nodes and will probably not be accepted!</source> <translation type="unfinished"/> </message> <message> <location line="+3"/> - <source>Unconfirmed (%1 of %2 confirmations)</source> + <source>Generated but not accepted</source> <translation type="unfinished"/> </message> <message> - <location line="-22"/> - <location line="+25"/> - <source>Confirmed (%1 confirmations)</source> + <location line="-21"/> + <source>Offline</source> <translation type="unfinished"/> </message> <message> - <location line="-22"/> - <source>This block was not received by any other nodes and will probably not be accepted!</source> + <location line="+3"/> + <source>Unconfirmed</source> <translation type="unfinished"/> </message> <message> <location line="+3"/> - <source>Generated but not accepted</source> + <source>Confirming (%1 of %2 recommended confirmations)</source> <translation type="unfinished"/> </message> <message> - <location line="+62"/> + <location line="+6"/> + <source>Conflicted</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+51"/> <source>Received with</source> <translation type="unfinished"/> </message> @@ -2941,7 +3000,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+199"/> + <location line="+190"/> <source>Transaction status. Hover over this field to show number of confirmations.</source> <translation type="unfinished"/> </message> @@ -3070,7 +3129,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+142"/> + <location line="+140"/> <source>Export Transaction History</source> <translation type="unfinished"/> </message> @@ -3164,7 +3223,7 @@ Address: %4 <context> <name>WalletView</name> <message> - <location filename="../walletview.cpp" line="+43"/> + <location filename="../walletview.cpp" line="+44"/> <source>&Export</source> <translation type="unfinished"/> </message> @@ -3174,7 +3233,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+181"/> + <location line="+184"/> <source>Backup Wallet</source> <translation type="unfinished"/> </message> @@ -3207,12 +3266,12 @@ Address: %4 <context> <name>bitcoin-core</name> <message> - <location filename="../bitcoinstrings.cpp" line="+221"/> + <location filename="../bitcoinstrings.cpp" line="+261"/> <source>Usage:</source> <translation type="unfinished"/> </message> <message> - <location line="-54"/> + <location line="-66"/> <source>List commands</source> <translation type="unfinished"/> </message> @@ -3222,12 +3281,12 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+26"/> + <location line="+27"/> <source>Options:</source> <translation type="unfinished"/> </message> <message> - <location line="+22"/> + <location line="+32"/> <source>Specify configuration file (default: bitcoin.conf)</source> <translation type="unfinished"/> </message> @@ -3242,72 +3301,72 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="-9"/> - <source>Set database cache size in megabytes (default: 25)</source> - <translation type="unfinished"/> - </message> - <message> - <location line="-26"/> + <location line="-46"/> <source>Listen for connections on <port> (default: 8333 or testnet: 18333)</source> <translation type="unfinished"/> </message> <message> - <location line="+5"/> + <location line="+6"/> <source>Maintain at most <n> connections to peers (default: 125)</source> <translation type="unfinished"/> </message> <message> - <location line="-51"/> + <location line="-57"/> <source>Connect to a node to retrieve peer addresses, and disconnect</source> <translation type="unfinished"/> </message> <message> - <location line="+84"/> + <location line="+100"/> <source>Specify your own public address</source> <translation type="unfinished"/> </message> <message> - <location line="+5"/> + <location line="+6"/> <source>Threshold for disconnecting misbehaving peers (default: 100)</source> <translation type="unfinished"/> </message> <message> - <location line="-148"/> + <location line="-172"/> <source>Number of seconds to keep misbehaving peers from reconnecting (default: 86400)</source> <translation type="unfinished"/> </message> <message> - <location line="-36"/> + <location line="-52"/> <source>An error occurred while setting up the RPC port %u for listening on IPv4: %s</source> <translation type="unfinished"/> </message> <message> - <location line="+34"/> + <location line="+50"/> <source>Listen for JSON-RPC connections on <port> (default: 8332 or testnet: 18332)</source> <translation type="unfinished"/> </message> <message> - <location line="+45"/> + <location line="+51"/> <source>Accept command line and JSON-RPC commands</source> <translation type="unfinished"/> </message> <message> - <location line="+80"/> + <location line="+7"/> + <source>Bitcoin Core RPC client version</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+87"/> <source>Run in the background as a daemon and accept commands</source> <translation type="unfinished"/> </message> <message> - <location line="+39"/> + <location line="+43"/> <source>Use the test network</source> <translation type="unfinished"/> </message> <message> - <location line="-118"/> + <location line="-136"/> <source>Accept connections from outside (default: 1 if no -proxy or -connect)</source> <translation type="unfinished"/> </message> <message> - <location line="-95"/> + <location line="-117"/> <source>%s, you must set a rpcpassword in the configuration file: %s It is recommended you use the following random password: @@ -3337,8 +3396,8 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+3"/> - <source>Cannot obtain a lock on data directory %s. Bitcoin is probably already running.</source> + <location line="+6"/> + <source>Continuously rate-limit free transactions to <n>*1000 bytes per minute (default:15)</source> <translation type="unfinished"/> </message> <message> @@ -3353,6 +3412,11 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. </message> <message> <location line="+3"/> + <source>Error: Listening for incoming connections failed (listen returned error %d)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+2"/> <source>Error: The transaction was rejected! This might happen if some of the coins in your wallet were already spent, such as if you used a copy of wallet.dat and coins were spent in the copy but not marked as spent here.</source> <translation type="unfinished"/> </message> @@ -3367,12 +3431,47 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+18"/> + <location line="+6"/> + <source>Fees smaller than this are considered zero fee (for transaction creation) (default:</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+3"/> + <source>Flush database activity from memory pool to disk log every <n> megabytes (default: 100)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+3"/> + <source>How thorough the block verification of -checkblocks is (0-4, default: 3)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+2"/> + <source>In this mode -genproclimit controls how many blocks are generated immediately.</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+12"/> + <source>Set the number of script verification threads (%u to %d, 0 = auto, <0 = leave that many cores free, default: %d)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+3"/> + <source>Set the processor limit for when generation is on (-1 = unlimited, default: -1)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+3"/> <source>This is a pre-release test build - use at your own risk - do not use for mining or merchant applications</source> <translation type="unfinished"/> </message> <message> - <location line="+5"/> + <location line="+3"/> + <source>Unable to bind to %s on this computer. Bitcoin Core is probably already running.</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+3"/> <source>Use separate SOCKS5 proxy to reach peers via Tor hidden services (default: -proxy)</source> <translation type="unfinished"/> </message> @@ -3408,6 +3507,16 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. </message> <message> <location line="+9"/> + <source>(default: 1)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>(default: wallet.dat)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> <source><category> can be:</source> <translation type="unfinished"/> </message> @@ -3422,17 +3531,17 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+1"/> - <source>Bitcoin RPC client version</source> + <location line="+2"/> + <source>Block creation options:</source> <translation type="unfinished"/> </message> <message> - <location line="+1"/> - <source>Block creation options:</source> + <location line="+5"/> + <source>Clear list of wallet transactions (diagnostic tool; implies -rescan)</source> <translation type="unfinished"/> </message> <message> - <location line="+5"/> + <location line="+1"/> <source>Connect only to the specified node(s)</source> <translation type="unfinished"/> </message> @@ -3448,11 +3557,26 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. </message> <message> <location line="+2"/> + <source>Connection options:</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> <source>Corrupted block database detected</source> <translation type="unfinished"/> </message> <message> <location line="+1"/> + <source>Debugging/Testing options:</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>Disable safemode, override a real safe mode event (default: 0)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> <source>Discover own IP address (default: 1 when listening and no -externalip)</source> <translation type="unfinished"/> </message> @@ -3563,22 +3687,27 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. </message> <message> <location line="+1"/> - <source>Find peers using DNS lookup (default: 1 unless -connect)</source> + <source>Fees smaller than this are considered zero fee (for relaying) (default:</source> <translation type="unfinished"/> </message> <message> <location line="+1"/> - <source>Generate coins (default: 0)</source> + <source>Find peers using DNS lookup (default: 1 unless -connect)</source> <translation type="unfinished"/> </message> <message> - <location line="+2"/> - <source>How many blocks to check at startup (default: 288, 0 = all)</source> + <location line="+1"/> + <source>Force safe mode (default: 0)</source> <translation type="unfinished"/> </message> <message> <location line="+1"/> - <source>How thorough the block verification is (0-4, default: 3)</source> + <source>Generate coins (default: 0)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+2"/> + <source>How many blocks to check at startup (default: 288, 0 = all)</source> <translation type="unfinished"/> </message> <message> @@ -3597,7 +3726,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+15"/> + <location line="+17"/> <source>Not enough file descriptors available.</source> <translation type="unfinished"/> </message> @@ -3607,27 +3736,27 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+1"/> + <location line="+4"/> <source>RPC client options:</source> <translation type="unfinished"/> </message> <message> - <location line="+1"/> + <location line="+4"/> <source>Rebuild block chain index from current blk000??.dat files</source> <translation type="unfinished"/> </message> <message> - <location line="+5"/> + <location line="+6"/> <source>Select SOCKS version for -proxy (4 or 5, default: 5)</source> <translation type="unfinished"/> </message> <message> - <location line="+1"/> - <source>Send command to Bitcoin server</source> + <location line="+6"/> + <source>Set database cache size in megabytes (%d to %d, default: %d)</source> <translation type="unfinished"/> </message> <message> - <location line="+7"/> + <location line="+2"/> <source>Set maximum block size in bytes (default: %d)</source> <translation type="unfinished"/> </message> @@ -3637,17 +3766,17 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+7"/> + <location line="+10"/> <source>Specify wallet file (within data directory)</source> <translation type="unfinished"/> </message> <message> <location line="+2"/> - <source>Start Bitcoin server</source> + <source>Spend unconfirmed change when sending transactions (default: 1)</source> <translation type="unfinished"/> </message> <message> - <location line="+3"/> + <location line="+4"/> <source>This is intended for regression testing tools and app development.</source> <translation type="unfinished"/> </message> @@ -3692,32 +3821,32 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="-79"/> + <location line="-92"/> <source>Imports blocks from external blk000??.dat file</source> <translation type="unfinished"/> </message> <message> - <location line="-105"/> - <source>Execute command when a relevant alert is received or we see a really long fork (%s in cmd is replaced by message)</source> + <location line="-149"/> + <source>Cannot obtain a lock on data directory %s. Bitcoin Core is probably already running.</source> <translation type="unfinished"/> </message> <message> - <location line="+14"/> - <source>Output debugging information (default: 0, supplying <category> is optional)</source> + <location line="+22"/> + <source>Execute command when a relevant alert is received or we see a really long fork (%s in cmd is replaced by message)</source> <translation type="unfinished"/> </message> <message> - <location line="+2"/> - <source>Set maximum size of high-priority/low-fee transactions in bytes (default: %d)</source> + <location line="+25"/> + <source>Output debugging information (default: 0, supplying <category> is optional)</source> <translation type="unfinished"/> </message> <message> <location line="+2"/> - <source>Set the number of script verification threads (up to 16, 0 = auto, <0 = leave that many cores free, default: 0)</source> + <source>Set maximum size of high-priority/low-fee transactions in bytes (default: %d)</source> <translation type="unfinished"/> </message> <message> - <location line="+89"/> + <location line="+102"/> <source>Information</source> <translation type="unfinished"/> </message> @@ -3732,7 +3861,17 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+8"/> + <location line="+3"/> + <source>Limit size of signature cache to <n> entries (default: 50000)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+6"/> + <source>Log transaction priority and fee per kB when mining blocks (default: 0)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> <source>Maintain a full transaction index (default: 0)</source> <translation type="unfinished"/> </message> @@ -3757,12 +3896,52 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+9"/> - <source>SSL options: (see the Bitcoin Wiki for SSL setup instructions)</source> + <location line="+4"/> + <source>Print block on startup, if found in block index</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>Print block tree on startup (default: 0)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>RPC SSL options: (see the Bitcoin Wiki for SSL setup instructions)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+2"/> + <source>RPC server options:</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>Randomly drop 1 of every <n> network messages</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>Randomly fuzz 1 of every <n> network messages</source> <translation type="unfinished"/> </message> <message> <location line="+4"/> + <source>Run a thread to flush wallet periodically (default: 1)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+2"/> + <source>SSL options: (see the Bitcoin Wiki for SSL setup instructions)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+2"/> + <source>Send command to Bitcoin Core</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+2"/> <source>Send trace/debug info to console instead of debug.log file</source> <translation type="unfinished"/> </message> @@ -3773,6 +3952,21 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. </message> <message> <location line="+2"/> + <source>Sets the DB_PRIVATE flag in the wallet db environment (default: 1)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>Show all debugging options (usage: --help -help-debug)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>Show benchmark information (default: 0)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> <source>Shrink debug.log file on client startup (default: 1 when no -debug)</source> <translation type="unfinished"/> </message> @@ -3788,6 +3982,11 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. </message> <message> <location line="+6"/> + <source>Start Bitcoin Core Daemon</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> <source>System error: </source> <translation type="unfinished"/> </message> @@ -3833,6 +4032,16 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. </message> <message> <location line="+2"/> + <source>Zapping all transactions from wallet...</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>on startup</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> <source>version</source> <translation type="unfinished"/> </message> @@ -3842,47 +4051,47 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="-58"/> + <location line="-71"/> <source>Password for JSON-RPC connections</source> <translation type="unfinished"/> </message> <message> - <location line="-70"/> + <location line="-77"/> <source>Allow JSON-RPC connections from specified IP address</source> <translation type="unfinished"/> </message> <message> - <location line="+80"/> + <location line="+94"/> <source>Send commands to node running on <ip> (default: 127.0.0.1)</source> <translation type="unfinished"/> </message> <message> - <location line="-132"/> + <location line="-163"/> <source>Execute command when the best block changes (%s in cmd is replaced by block hash)</source> <translation type="unfinished"/> </message> <message> - <location line="+161"/> + <location line="+196"/> <source>Upgrade wallet to latest format</source> <translation type="unfinished"/> </message> <message> - <location line="-24"/> + <location line="-28"/> <source>Set key pool size to <n> (default: 100)</source> <translation type="unfinished"/> </message> <message> - <location line="-11"/> + <location line="-12"/> <source>Rescan the block chain for missing wallet transactions</source> <translation type="unfinished"/> </message> <message> - <location line="+38"/> + <location line="+43"/> <source>Use OpenSSL (https) for JSON-RPC connections</source> <translation type="unfinished"/> </message> <message> - <location line="-30"/> + <location line="-34"/> <source>Server certificate file (default: server.cert)</source> <translation type="unfinished"/> </message> @@ -3892,7 +4101,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+16"/> + <location line="+20"/> <source>This help message</source> <translation type="unfinished"/> </message> @@ -3902,17 +4111,17 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="-107"/> + <location line="-125"/> <source>Allow DNS lookups for -addnode, -seednode and -connect</source> <translation type="unfinished"/> </message> <message> - <location line="+60"/> + <location line="+66"/> <source>Loading addresses...</source> <translation type="unfinished"/> </message> <message> - <location line="-37"/> + <location line="-39"/> <source>Error loading wallet.dat: Wallet corrupted</source> <translation type="unfinished"/> </message> @@ -3922,22 +4131,22 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+98"/> + <location line="+112"/> <source>Wallet needed to be rewritten: restart Bitcoin to complete</source> <translation type="unfinished"/> </message> <message> - <location line="-100"/> + <location line="-114"/> <source>Error loading wallet.dat</source> <translation type="unfinished"/> </message> <message> - <location line="+31"/> + <location line="+32"/> <source>Invalid -proxy address: '%s'</source> <translation type="unfinished"/> </message> <message> - <location line="+56"/> + <location line="+69"/> <source>Unknown network specified in -onlynet: '%s'</source> <translation type="unfinished"/> </message> @@ -3947,7 +4156,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="-101"/> + <location line="-119"/> <source>Cannot resolve -bind address: '%s'</source> <translation type="unfinished"/> </message> @@ -3957,7 +4166,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+48"/> + <location line="+53"/> <source>Invalid amount for -paytxfee=<amount>: '%s'</source> <translation type="unfinished"/> </message> @@ -3972,27 +4181,22 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+10"/> + <location line="+11"/> <source>Loading block index...</source> <translation type="unfinished"/> </message> <message> - <location line="-62"/> + <location line="-68"/> <source>Add a node to connect to and attempt to keep the connection open</source> <translation type="unfinished"/> </message> <message> - <location line="-32"/> - <source>Unable to bind to %s on this computer. Bitcoin is probably already running.</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+95"/> + <location line="+69"/> <source>Loading wallet...</source> <translation type="unfinished"/> </message> <message> - <location line="-56"/> + <location line="-62"/> <source>Cannot downgrade wallet</source> <translation type="unfinished"/> </message> @@ -4002,27 +4206,27 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+67"/> + <location line="+80"/> <source>Rescanning...</source> <translation type="unfinished"/> </message> <message> - <location line="-58"/> + <location line="-67"/> <source>Done loading</source> <translation type="unfinished"/> </message> <message> - <location line="+85"/> + <location line="+99"/> <source>To use the %s option</source> <translation type="unfinished"/> </message> <message> - <location line="-77"/> + <location line="-91"/> <source>Error</source> <translation type="unfinished"/> </message> <message> - <location line="-35"/> + <location line="-41"/> <source>You must set rpcpassword=<password> in the configuration file: %s If the file does not exist, create it with owner-readable-only file permissions.</source> diff --git a/src/qt/locale/bitcoin_zh_CN.ts b/src/qt/locale/bitcoin_zh_CN.ts index e45b9242a1..8eb31a133f 100644 --- a/src/qt/locale/bitcoin_zh_CN.ts +++ b/src/qt/locale/bitcoin_zh_CN.ts @@ -39,8 +39,8 @@ This product includes software developed by the OpenSSL Project for use in the O <message> <location line="+12"/> <location line="+2"/> - <source> (%1-bit)</source> - <translation>(%1 -比特)</translation> + <source>(%1-bit)</source> + <translation type="unfinished"/> </message> </context> <context> @@ -71,7 +71,7 @@ This product includes software developed by the OpenSSL Project for use in the O <translation>å¤åˆ¶(&C)</translation> </message> <message> - <location line="+52"/> + <location line="+58"/> <source>C&lose</source> <translation>å…³é—(&C)</translation> </message> @@ -81,7 +81,7 @@ This product includes software developed by the OpenSSL Project for use in the O <translation>å¤åˆ¶åœ°å€(&C)</translation> </message> <message> - <location filename="../forms/addressbookpage.ui" line="-41"/> + <location filename="../forms/addressbookpage.ui" line="-47"/> <source>Delete the currently selected address from the list</source> <translation>从列表ä¸åˆ 除选ä¸çš„地å€</translation> </message> @@ -328,7 +328,7 @@ This product includes software developed by the OpenSSL Project for use in the O <context> <name>BitcoinGUI</name> <message> - <location filename="../bitcoingui.cpp" line="+295"/> + <location filename="../bitcoingui.cpp" line="+294"/> <source>Sign &message...</source> <translation>消æ¯ç¾å(&M)...</translation> </message> @@ -343,12 +343,12 @@ This product includes software developed by the OpenSSL Project for use in the O <translation>概况(&O)</translation> </message> <message> - <location line="-137"/> + <location line="-136"/> <source>Node</source> <translation>节点</translation> </message> <message> - <location line="+138"/> + <location line="+137"/> <source>Show general overview of wallet</source> <translation>显示钱包概况</translation> </message> @@ -469,17 +469,17 @@ This product includes software developed by the OpenSSL Project for use in the O <translation>验è¯æ¶ˆæ¯(&V)...</translation> </message> <message> - <location line="+430"/> + <location line="+440"/> <source>Bitcoin</source> <translation>比特å¸</translation> </message> <message> - <location line="-643"/> + <location line="-652"/> <source>Wallet</source> <translation>钱包</translation> </message> <message> - <location line="+146"/> + <location line="+145"/> <source>&Send</source> <translation>å‘é€(&S)</translation> </message> @@ -535,18 +535,18 @@ This product includes software developed by the OpenSSL Project for use in the O <translation>分页工具æ </translation> </message> <message> - <location line="-284"/> - <location line="+376"/> + <location line="-283"/> + <location line="+375"/> <source>[testnet]</source> <translation>[测试网络]</translation> </message> <message> - <location line="-401"/> + <location line="-400"/> <source>Bitcoin Core</source> <translation>比特å¸æ ¸å¿ƒ</translation> </message> <message> - <location line="+163"/> + <location line="+162"/> <source>Request payments (generates QR codes and bitcoin: URIs)</source> <translation>请求支付（生æˆäºŒç»´ç å’Œ bitcoin: URI）</translation> </message> @@ -595,7 +595,7 @@ This product includes software developed by the OpenSSL Project for use in the O <message> <location line="+22"/> <source>No block source available...</source> - <translation>No block source available...</translation> + <translation>沒有å¯ç”¨çš„区å—æ¥æº...</translation> </message> <message> <location line="+12"/> @@ -608,7 +608,7 @@ This product includes software developed by the OpenSSL Project for use in the O <translation>å·²å¤„ç† %1 个交易历å²æ•°æ®å—。</translation> </message> <message numerus="yes"> - <location line="+23"/> + <location line="+27"/> <source>%n hour(s)</source> <translation><numerusform>%n å°æ—¶å‰</numerusform></translation> </message> @@ -619,6 +619,7 @@ This product includes software developed by the OpenSSL Project for use in the O </message> <message numerus="yes"> <location line="+4"/> + <location line="+6"/> <source>%n week(s)</source> <translation><numerusform>%n 周å‰</numerusform></translation> </message> @@ -663,12 +664,12 @@ This product includes software developed by the OpenSSL Project for use in the O <translation>ä¿¡æ¯</translation> </message> <message> - <location line="-85"/> + <location line="-95"/> <source>Up to date</source> <translation>已是最新</translation> </message> <message> - <location line="+34"/> + <location line="+44"/> <source>Catching up...</source> <translation>æ›´æ–°ä¸...</translation> </message> @@ -706,7 +707,7 @@ Address: %4 <translation>钱包已被<b>åŠ å¯†</b>，当å‰ä¸º<b>é”定</b>状æ€</translation> </message> <message> - <location filename="../bitcoin.cpp" line="+435"/> + <location filename="../bitcoin.cpp" line="+443"/> <source>A fatal error occurred. Bitcoin can no longer continue safely and will quit.</source> <translation>å‘生严é‡é”™è¯¯ã€‚</translation> </message> @@ -714,7 +715,7 @@ Address: %4 <context> <name>ClientModel</name> <message> - <location filename="../clientmodel.cpp" line="+119"/> + <location filename="../clientmodel.cpp" line="+128"/> <source>Network Alert</source> <translation>网络è¦æŠ¥</translation> </message> @@ -812,7 +813,7 @@ Address: %4 <translation>优先级</translation> </message> <message> - <location filename="../coincontroldialog.cpp" line="+42"/> + <location filename="../coincontroldialog.cpp" line="+41"/> <source>Copy address</source> <translation>å¤åˆ¶åœ°å€</translation> </message> @@ -878,7 +879,7 @@ Address: %4 <translation>å¤åˆ¶é›¶é’±</translation> </message> <message> - <location line="+323"/> + <location line="+332"/> <source>highest</source> <translation>最高</translation> </message> @@ -928,7 +929,7 @@ Address: %4 <translation>(%1 é”定)</translation> </message> <message> - <location line="+31"/> + <location line="+32"/> <source>none</source> <translation>æ— </translation> </message> @@ -996,12 +997,12 @@ Address: %4 </message> <message> <location line="+43"/> - <location line="+66"/> + <location line="+61"/> <source>(no label)</source> <translation>(æ²¡æœ‰æ ‡ç¾)</translation> </message> <message> - <location line="-9"/> + <location line="-7"/> <source>change from %1 (%2)</source> <translation>æ¥è‡ª%1的零钱 (%2)</translation> </message> @@ -1082,7 +1083,7 @@ Address: %4 <context> <name>FreespaceChecker</name> <message> - <location filename="../intro.cpp" line="+65"/> + <location filename="../intro.cpp" line="+68"/> <source>A new data directory will be created.</source> <translation>一个新的数æ®ç›®å½•å°†è¢«åˆ›å»ºã€‚</translation> </message> @@ -1140,7 +1141,7 @@ Address: %4 <translation>UI选项</translation> </message> <message> - <location line="+1"/> + <location line="+2"/> <source>Set language, for example "de_DE" (default: system locale)</source> <translation>设置è¯è¨€, 例如“zh-TWâ€ï¼ˆé»˜è®¤ä¸ºç³»ç»Ÿè¯è¨€ï¼‰</translation> </message> @@ -1152,11 +1153,16 @@ Address: %4 </message> <message> <location line="+1"/> + <source>Set SSL root certificates for payment request (default: -system-)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> <source>Show splash screen on startup (default: 1)</source> <translation>å¯åŠ¨æ—¶æ˜¾ç¤ºç‰ˆæƒé¡µ (缺çœ: 1)</translation> </message> <message> - <location line="+1"/> + <location line="-4"/> <source>Choose data directory on startup (default: 0)</source> <translation>在å¯åŠ¨æ—¶é€‰æ‹©æ•°æ®ç›®å½•ï¼ˆé»˜è®¤ï¼š0）</translation> </message> @@ -1194,7 +1200,7 @@ Address: %4 <translation>使用自定义的数æ®ç›®å½•ï¼š</translation> </message> <message> - <location filename="../intro.cpp" line="+85"/> + <location filename="../intro.cpp" line="+82"/> <source>Bitcoin</source> <translation>比特å¸</translation> </message> @@ -1204,7 +1210,7 @@ Address: %4 <translation>错误：指定的数æ®ç›®å½•â€œ%1â€æ— 法创建。</translation> </message> <message> - <location line="+19"/> + <location line="+24"/> <source>Error</source> <translation>错误</translation> </message> @@ -1260,7 +1266,7 @@ Address: %4 <translation>主è¦(&M)</translation> </message> <message> - <location line="+122"/> + <location line="+116"/> <source>Optional transaction fee per kB that helps make sure your transactions are processed quickly. Most transactions are 1 kB.</source> <translation>å¯é€‰çš„æ¯ kB 交易费，这有助于您的交易被更快的处ç†ã€‚大多数交易都是 1 kB。</translation> </message> @@ -1270,7 +1276,7 @@ Address: %4 <translation>支付交易费用(&F)</translation> </message> <message> - <location line="-131"/> + <location line="-125"/> <source>Automatically start Bitcoin after logging in to the system.</source> <translation>登录系统åŽè‡ªåŠ¨å¼€å¯æ¯”特å¸å®¢æˆ·ç«¯</translation> </message> @@ -1295,17 +1301,7 @@ Address: %4 <translation>脚本&éªŒè¯ è¿›ç¨‹æ•° </translation> </message> <message> - <location line="+13"/> - <source>Set the number of script verification threads (up to 16, 0 = auto, <0 = leave that many cores free, default: 0)</source> - <translation>设置脚本验è¯çº¿ç¨‹æ•°é‡ï¼ˆæœ€å¤š16，0 = 自动，<0 = ç•™ä¸‹è®¸å¤šç©ºé—²æ ¸å¿ƒï¼Œé»˜è®¤ä¸º 0）</translation> - </message> - <message> - <location line="+107"/> - <source>&Spend unconfirmed change (experts only)</source> - <translation>&使用未确认的零钱 (ä»…é™ä¸“家使用) </translation> - </message> - <message> - <location line="+37"/> + <location line="+160"/> <source>Connect to the Bitcoin network through a SOCKS proxy.</source> <translation>通过 SOCKS 代ç†è¿žæŽ¥åˆ°æ¯”特å¸ç½‘络。</translation> </message> @@ -1320,7 +1316,7 @@ Address: %4 <translation>代ç†çš„ IP åœ°å€ (例如 IPv4: 127.0.0.1 / IPv6: ::1)</translation> </message> <message> - <location line="+224"/> + <location line="+214"/> <source>Active command-line options that override above options:</source> <translation>有效的命令行å‚数覆盖上述选项:</translation> </message> @@ -1335,22 +1331,42 @@ Address: %4 <translation>æ¢å¤ç¼ºçœè®¾ç½®(&R)</translation> </message> <message> - <location line="-323"/> + <location line="-313"/> <source>&Network</source> <translation>网络(&N)</translation> </message> <message> - <location line="-86"/> + <location line="-131"/> + <source>(0 = auto, <0 = leave that many cores free)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+36"/> <source>W&allet</source> <translation>&钱包</translation> </message> <message> - <location line="+52"/> + <location line="+65"/> + <source>Expert</source> + <translation>专家</translation> + </message> + <message> + <location line="+9"/> + <source>Enable coin &control features</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+7"/> <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> - <location line="+40"/> + <location line="+3"/> + <source>&Spend unconfirmed change</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+17"/> <source>Automatically open the Bitcoin client port on the router. This only works when your router supports UPnP and it is enabled.</source> <translation>自动在路由器ä¸æ‰“开比特å¸ç«¯å£ã€‚åªæœ‰å½“您的路由器开å¯äº† UPnP 选项时æ¤åŠŸèƒ½æ‰æœ‰æ•ˆã€‚</translation> </message> @@ -1445,17 +1461,12 @@ Address: %4 <translation>在交易清å•ä¸æ˜¾ç¤ºæ¯”特å¸åœ°å€(&D)</translation> </message> <message> - <location line="+7"/> + <location line="-262"/> <source>Whether to show coin control features or not.</source> <translation>是å¦éœ€è¦äº¤æ˜“æºåœ°å€æŽ§åˆ¶åŠŸèƒ½ã€‚</translation> </message> <message> - <location line="+3"/> - <source>Display coin &control features (experts only)</source> - <translation>使用交易æºåœ°å€æŽ§åˆ¶åŠŸèƒ½ (ä»…é™ä¸“家使用) </translation> - </message> - <message> - <location line="+136"/> + <location line="+398"/> <source>&OK</source> <translation>确定(&O)</translation> </message> @@ -1465,7 +1476,7 @@ Address: %4 <translation>å–消(&C)</translation> </message> <message> - <location filename="../optionsdialog.cpp" line="+70"/> + <location filename="../optionsdialog.cpp" line="+72"/> <source>default</source> <translation>默认</translation> </message> @@ -1475,7 +1486,7 @@ Address: %4 <translation>æ— </translation> </message> <message> - <location line="+78"/> + <location line="+80"/> <source>Confirm options reset</source> <translation>确认æ¢å¤ç¼ºçœè®¾ç½®</translation> </message> @@ -1668,23 +1679,29 @@ Address: %4 <context> <name>QObject</name> <message> - <location filename="../bitcoin.cpp" line="+71"/> - <location line="+11"/> + <location filename="../bitcoin.cpp" line="+63"/> + <location line="+7"/> + <location line="+13"/> <source>Bitcoin</source> <translation>比特å¸</translation> </message> <message> - <location line="+1"/> + <location line="-19"/> <source>Error: Specified data directory "%1" does not exist.</source> <translation>错误：指定的数æ®ç›®å½•â€œ%1â€ä¸å˜åœ¨ã€‚</translation> </message> <message> - <location line="-12"/> + <location line="+7"/> + <source>Error: Cannot parse configuration file: %1. Only use key=value syntax.</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+12"/> <source>Error: Invalid combination of -regtest and -testnet.</source> <translation>é”™è¯¯ï¼šæ— æ•ˆçš„ -regtest 与 -testnet 结åˆä½“。</translation> </message> <message> - <location filename="../guiutil.cpp" line="+82"/> + <location filename="../guiutil.cpp" line="+89"/> <source>Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source> <translation>请输入比特å¸åœ°å€ï¼ˆä¾‹å¦‚: 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L）</translation> </message> @@ -1730,7 +1747,7 @@ Address: %4 <location line="+36"/> <location line="+23"/> <location line="+23"/> - <location filename="../rpcconsole.cpp" line="+359"/> + <location filename="../rpcconsole.cpp" line="+373"/> <source>N/A</source> <translation>ä¸å¯ç”¨</translation> </message> @@ -1826,11 +1843,13 @@ Address: %4 </message> <message> <location line="+64"/> + <location filename="../rpcconsole.cpp" line="-10"/> <source>In:</source> <translation>输入：</translation> </message> <message> <location line="+80"/> + <location filename="../rpcconsole.cpp" line="+1"/> <source>Out:</source> <translation>输出：</translation> </message> @@ -1855,7 +1874,7 @@ Address: %4 <translation>清空控制å°</translation> </message> <message> - <location filename="../rpcconsole.cpp" line="-30"/> + <location filename="../rpcconsole.cpp" line="-35"/> <source>Welcome to the Bitcoin RPC console.</source> <translation>欢迎æ¥åˆ° RPC 控制å°ã€‚</translation> </message> @@ -1870,7 +1889,7 @@ Address: %4 <translation>使用 <b>help</b> 命令显示帮助信æ¯ã€‚</translation> </message> <message> - <location line="+122"/> + <location line="+136"/> <source>%1 B</source> <translation>%1 å—节</translation> </message> @@ -1986,7 +2005,7 @@ Address: %4 <translation>显示</translation> </message> <message> - <location line="+11"/> + <location line="+14"/> <source>Remove the selected entries from the list</source> <translation>从列表ä¸ç§»é™¤é€‰ä¸çš„æ¡ç›®</translation> </message> @@ -1996,7 +2015,7 @@ Address: %4 <translation>移除</translation> </message> <message> - <location filename="../receivecoinsdialog.cpp" line="+38"/> + <location filename="../receivecoinsdialog.cpp" line="+39"/> <source>Copy label</source> <translation>å¤åˆ¶æ ‡ç¾</translation> </message> @@ -2217,12 +2236,12 @@ Address: %4 <translation>清除所有(&A)</translation> </message> <message> - <location line="+52"/> + <location line="+58"/> <source>Balance:</source> <translation>ä½™é¢ï¼š</translation> </message> <message> - <location line="-78"/> + <location line="-84"/> <source>Confirm the send action</source> <translation>确认并å‘é€è´§å¸</translation> </message> @@ -2467,7 +2486,7 @@ Address: %4 <context> <name>ShutdownWindow</name> <message> - <location filename="../utilitydialog.cpp" line="+48"/> + <location filename="../utilitydialog.cpp" line="+52"/> <source>Bitcoin Core is shutting down...</source> <translation>比特å¸æ ¸å¿ƒæ£åœ¨å…³æœº...</translation> </message> @@ -2667,7 +2686,7 @@ Address: %4 <context> <name>SplashScreen</name> <message> - <location filename="../splashscreen.cpp" line="+28"/> + <location filename="../splashscreen.cpp" line="+32"/> <source>Bitcoin Core</source> <translation>比特å¸æ ¸å¿ƒ</translation> </message> @@ -3120,7 +3139,7 @@ Address: %4 <translation>显示交易详情</translation> </message> <message> - <location line="+142"/> + <location line="+140"/> <source>Export Transaction History</source> <translation>导出交易历å²</translation> </message> @@ -3214,7 +3233,7 @@ Address: %4 <context> <name>WalletView</name> <message> - <location filename="../walletview.cpp" line="+43"/> + <location filename="../walletview.cpp" line="+44"/> <source>&Export</source> <translation>导出(&E)</translation> </message> @@ -3224,7 +3243,7 @@ Address: %4 <translation>导出当å‰æ•°æ®åˆ°æ–‡ä»¶</translation> </message> <message> - <location line="+181"/> + <location line="+184"/> <source>Backup Wallet</source> <translation>备份钱包</translation> </message> @@ -3257,12 +3276,12 @@ Address: %4 <context> <name>bitcoin-core</name> <message> - <location filename="../bitcoinstrings.cpp" line="+223"/> + <location filename="../bitcoinstrings.cpp" line="+261"/> <source>Usage:</source> <translation>使用：</translation> </message> <message> - <location line="-55"/> + <location line="-66"/> <source>List commands</source> <translation>列出命令 </translation> @@ -3274,13 +3293,13 @@ Address: %4 </translation> </message> <message> - <location line="+26"/> + <location line="+27"/> <source>Options:</source> <translation>选项： </translation> </message> <message> - <location line="+22"/> + <location line="+32"/> <source>Specify configuration file (default: bitcoin.conf)</source> <translation>指定é…置文件 (默认为 bitcoin.conf) </translation> @@ -3298,27 +3317,22 @@ Address: %4 </translation> </message> <message> - <location line="-9"/> - <source>Set database cache size in megabytes (default: 25)</source> - <translation>设置数æ®åº“ç¼“å†²åŒºå¤§å° (缺çœ: 25MB)</translation> - </message> - <message> - <location line="-26"/> + <location line="-46"/> <source>Listen for connections on <port> (default: 8333 or testnet: 18333)</source> <translation>监å¬ç«¯å£è¿žæŽ¥ <port>（缺çœ: 8333 或测试网络: 18333）</translation> </message> <message> - <location line="+5"/> + <location line="+6"/> <source>Maintain at most <n> connections to peers (default: 125)</source> <translation>最大连接数 <n> （缺çœ: 125）</translation> </message> <message> - <location line="-51"/> + <location line="-57"/> <source>Connect to a node to retrieve peer addresses, and disconnect</source> <translation>连接一个节点并获å–对端地å€ï¼Œç„¶åŽæ–开连接</translation> </message> <message> - <location line="+84"/> + <location line="+100"/> <source>Specify your own public address</source> <translation>指定您的公共地å€</translation> </message> @@ -3328,46 +3342,51 @@ Address: %4 <translation>æ–开行为ä¸ç«¯å¯¹ç«¯é˜€å€¼ï¼ˆç¼ºçœ: 100）</translation> </message> <message> - <location line="-150"/> + <location line="-172"/> <source>Number of seconds to keep misbehaving peers from reconnecting (default: 86400)</source> - <translation>Number of seconds to keep misbehaving peers from reconnecting (缺çœ: 86400)</translation> + <translation>é‡æ–°è¿žæŽ¥å¼‚常节点的秒数(缺çœ: 86400)</translation> </message> <message> - <location line="-36"/> + <location line="-52"/> <source>An error occurred while setting up the RPC port %u for listening on IPv4: %s</source> <translation>设置RPC监å¬ç«¯å£%uæ—¶å‘生错误, IPv4:%s</translation> </message> <message> - <location line="+34"/> + <location line="+50"/> <source>Listen for JSON-RPC connections on <port> (default: 8332 or testnet: 18332)</source> <translation>JSON-RPC连接监å¬ç«¯å£<port> (缺çœï¼š8332　testnet：18332)</translation> </message> <message> - <location line="+45"/> + <location line="+51"/> <source>Accept command line and JSON-RPC commands</source> <translation>接å—命令行和 JSON-RPC 命令 </translation> </message> <message> - <location line="+81"/> + <location line="+7"/> + <source>Bitcoin Core RPC client version</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+87"/> <source>Run in the background as a daemon and accept commands</source> <translation>在åŽå°è¿è¡Œå¹¶æŽ¥å—命令 </translation> </message> <message> - <location line="+40"/> + <location line="+43"/> <source>Use the test network</source> <translation>使用测试网络 </translation> </message> <message> - <location line="-120"/> + <location line="-136"/> <source>Accept connections from outside (default: 1 if no -proxy or -connect)</source> <translation>接å—æ¥è‡ªå¤–部的连接 (缺çœ: 如果ä¸å¸¦ -proxy or -connect å‚数设置为1)</translation> </message> <message> - <location line="-95"/> + <location line="-117"/> <source>%s, you must set a rpcpassword in the configuration file: %s It is recommended you use the following random password: @@ -3407,9 +3426,9 @@ rpcpassword=%s <translation>绑定指定的IP地å€å¼€å§‹ç›‘å¬ã€‚IPv6地å€è¯·ä½¿ç”¨[host]:port æ ¼å¼</translation> </message> <message> - <location line="+3"/> - <source>Cannot obtain a lock on data directory %s. Bitcoin is probably already running.</source> - <translation>æ— æ³•ç»™æ•°æ®ç›®å½• %s上é”。本软件å¯èƒ½å·²ç»åœ¨è¿è¡Œã€‚</translation> + <location line="+6"/> + <source>Continuously rate-limit free transactions to <n>*1000 bytes per minute (default:15)</source> + <translation type="unfinished"/> </message> <message> <location line="+3"/> @@ -3423,6 +3442,11 @@ rpcpassword=%s </message> <message> <location line="+3"/> + <source>Error: Listening for incoming connections failed (listen returned error %d)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+2"/> <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> @@ -3437,12 +3461,47 @@ rpcpassword=%s <translation>当最佳区å—å˜åŒ–时执行命令 (命令行ä¸çš„ %s 会被替æ¢æˆåŒºå—哈希值)</translation> </message> <message> - <location line="+18"/> + <location line="+6"/> + <source>Fees smaller than this are considered zero fee (for transaction creation) (default:</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+3"/> + <source>Flush database activity from memory pool to disk log every <n> megabytes (default: 100)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+3"/> + <source>How thorough the block verification of -checkblocks is (0-4, default: 3)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+2"/> + <source>In this mode -genproclimit controls how many blocks are generated immediately.</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+12"/> + <source>Set the number of script verification threads (%u to %d, 0 = auto, <0 = leave that many cores free, default: %d)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+3"/> + <source>Set the processor limit for when generation is on (-1 = unlimited, default: -1)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+3"/> <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> - <location line="+5"/> + <location line="+3"/> + <source>Unable to bind to %s on this computer. Bitcoin Core is probably already running.</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+3"/> <source>Use separate SOCKS5 proxy to reach peers via Tor hidden services (default: -proxy)</source> <translation>连接至 Toréšè—æœåŠ¡å™¨æ—¶ 使用ä¸åŒçš„SOCKS5ä»£ç† (缺çœ: -proxy) </translation> </message> @@ -3478,6 +3537,16 @@ rpcpassword=%s </message> <message> <location line="+9"/> + <source>(default: 1)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>(default: wallet.dat)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> <source><category> can be:</source> <translation><category> å¯èƒ½æ˜¯ï¼š</translation> </message> @@ -3492,12 +3561,7 @@ rpcpassword=%s <translation>比特å¸æ ¸å¿ƒ 守护程åº</translation> </message> <message> - <location line="+1"/> - <source>Bitcoin RPC client version</source> - <translation>Bitcoin RPC 客户端版本</translation> - </message> - <message> - <location line="+1"/> + <location line="+2"/> <source>Block creation options:</source> <translation>æ•°æ®å—创建选项：</translation> </message> @@ -3523,11 +3587,26 @@ rpcpassword=%s </message> <message> <location line="+2"/> + <source>Connection options:</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> <source>Corrupted block database detected</source> <translation>检测å‘现数æ®å—æ•°æ®åº“æŸå。请使用 -reindexå‚æ•°é‡å¯å®¢æˆ·ç«¯ã€‚</translation> </message> <message> <location line="+1"/> + <source>Debugging/Testing options:</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>Disable safemode, override a real safe mode event (default: 0)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> <source>Discover own IP address (default: 1 when listening and no -externalip)</source> <translation>å‘现自己的IP地å€(缺çœ:ä¸å¸¦ -externalip å‚数监å¬æ—¶è®¾ç½®ä¸º1)</translation> </message> @@ -3638,11 +3717,21 @@ rpcpassword=%s </message> <message> <location line="+1"/> + <source>Fees smaller than this are considered zero fee (for relaying) (default:</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> <source>Find peers using DNS lookup (default: 1 unless -connect)</source> <translation>通过DNS查找节点(缺çœï¼š1 除éžä½¿ç”¨ -connect 选项)</translation> </message> <message> <location line="+1"/> + <source>Force safe mode (default: 0)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> <source>Generate coins (default: 0)</source> <translation>生æˆæ¯”特å¸ï¼ˆé»˜è®¤ä¸º 0）</translation> </message> @@ -3653,11 +3742,6 @@ rpcpassword=%s </message> <message> <location line="+1"/> - <source>How thorough the block verification is (0-4, default: 3)</source> - <translation>How thorough the block verification is (0-4, default: 3)</translation> - </message> - <message> - <location line="+1"/> <source>If <category> is not supplied, output all debugging information.</source> <translation>如果<category>未æ供，将输出所有调试信æ¯ã€‚</translation> </message> @@ -3672,7 +3756,7 @@ rpcpassword=%s <translation>æ— æ•ˆçš„ -onion 地å€ï¼šâ€œ%sâ€</translation> </message> <message> - <location line="+15"/> + <location line="+17"/> <source>Not enough file descriptors available.</source> <translation>没有足够的文件æ述符å¯ç”¨ã€‚</translation> </message> @@ -3682,27 +3766,27 @@ rpcpassword=%s <translation>调试信æ¯è¾“出时，å‰é¢åŠ 上时间戳 (缺çœ: 1)</translation> </message> <message> - <location line="+1"/> + <location line="+4"/> <source>RPC client options:</source> <translation>RPC 客户端选项：</translation> </message> <message> - <location line="+1"/> + <location line="+4"/> <source>Rebuild block chain index from current blk000??.dat files</source> <translation>é‡æ–°ä¸ºå½“å‰çš„blk000??.dat文件建立索引</translation> </message> <message> - <location line="+5"/> + <location line="+6"/> <source>Select SOCKS version for -proxy (4 or 5, default: 5)</source> <translation>用 -proxy 选择 SOCKS 版本（4 或 5，默认为 5）</translation> </message> <message> - <location line="+1"/> - <source>Send command to Bitcoin server</source> - <translation>å‘é€å‘½ä»¤åˆ°æ¯”特å¸æœåŠ¡å™¨</translation> + <location line="+6"/> + <source>Set database cache size in megabytes (%d to %d, default: %d)</source> + <translation type="unfinished"/> </message> <message> - <location line="+7"/> + <location line="+2"/> <source>Set maximum block size in bytes (default: %d)</source> <translation>设置最大区å—å¤§å° (默认: %d，å•ä½å—节)</translation> </message> @@ -3712,7 +3796,7 @@ rpcpassword=%s <translation>设置使用调用æœåŠ¡ RPC 的线程数é‡ï¼ˆé»˜è®¤ï¼š4）</translation> </message> <message> - <location line="+7"/> + <location line="+10"/> <source>Specify wallet file (within data directory)</source> <translation>指定钱包文件（数æ®ç›®å½•å†…）</translation> </message> @@ -3722,12 +3806,7 @@ rpcpassword=%s <translation>付款时å…许使用未确认的零钱 (缺çœ: 1)</translation> </message> <message> - <location line="+1"/> - <source>Start Bitcoin server</source> - <translation>å¯åŠ¨æ¯”特å¸æœåŠ¡å™¨</translation> - </message> - <message> - <location line="+3"/> + <location line="+4"/> <source>This is intended for regression testing tools and app development.</source> <translation>这是用于回归测试和应用开å‘目的。</translation> </message> @@ -3772,17 +3851,22 @@ rpcpassword=%s <translation>您需è¦å°† -reindex 改为 -txindex 以é‡å»ºæ•°æ®åº“</translation> </message> <message> - <location line="-80"/> + <location line="-92"/> <source>Imports blocks from external blk000??.dat file</source> <translation>从blk000??.dat文件导入数æ®å—</translation> </message> <message> - <location line="-106"/> + <location line="-149"/> + <source>Cannot obtain a lock on data directory %s. Bitcoin Core is probably already running.</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+22"/> <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> - <location line="+14"/> + <location line="+25"/> <source>Output debugging information (default: 0, supplying <category> is optional)</source> <translation>输出调试信æ¯ï¼ˆé»˜è®¤ä¸º0，æä¾› <category> 是å¯é€‰çš„）</translation> </message> @@ -3792,12 +3876,7 @@ rpcpassword=%s <translation>设置 高优先级/低交易费 交易的最大å—节 (缺çœ: %d)</translation> </message> <message> - <location line="+2"/> - <source>Set the number of script verification threads (up to 16, 0 = auto, <0 = leave that many cores free, default: 0)</source> - <translation>设置脚本验è¯çº¿ç¨‹æ•°é‡ï¼ˆæœ€å¤š16，0 = 自动，<0 = ç•™ä¸‹è®¸å¤šç©ºé—²æ ¸å¿ƒï¼Œé»˜è®¤ä¸º 0）</translation> - </message> - <message> - <location line="+90"/> + <location line="+102"/> <source>Information</source> <translation>ä¿¡æ¯</translation> </message> @@ -3812,7 +3891,17 @@ rpcpassword=%s <translation>-mintxfee=<amount>: '%s' æ— æ•ˆçš„é‡‘é¢</translation> </message> <message> - <location line="+8"/> + <location line="+3"/> + <source>Limit size of signature cache to <n> entries (default: 50000)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+6"/> + <source>Log transaction priority and fee per kB when mining blocks (default: 0)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> <source>Maintain a full transaction index (default: 0)</source> <translation>维护一份完整的交易索引(缺çœï¼š0)</translation> </message> @@ -3837,12 +3926,52 @@ rpcpassword=%s <translation>仅连接至指定网络的节点<net>(IPv4, IPv6 或者 Tor)</translation> </message> <message> - <location line="+9"/> + <location line="+4"/> + <source>Print block on startup, if found in block index</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>Print block tree on startup (default: 0)</source> + <translation>å¯åŠ¨æ—¶æ‰“å°å—æ ‘ (默认: 0)</translation> + </message> + <message> + <location line="+1"/> + <source>RPC SSL options: (see the Bitcoin Wiki for SSL setup instructions)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+2"/> + <source>RPC server options:</source> + <translation>RPC æœåŠ¡å™¨é€‰é¡¹ï¼š</translation> + </message> + <message> + <location line="+1"/> + <source>Randomly drop 1 of every <n> network messages</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>Randomly fuzz 1 of every <n> network messages</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+4"/> + <source>Run a thread to flush wallet periodically (default: 1)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+2"/> <source>SSL options: (see the Bitcoin Wiki for SSL setup instructions)</source> <translation>SSL选项：(å‚è§Bitcoin Wiki关于SSL设置æ ç›®)</translation> </message> <message> - <location line="+4"/> + <location line="+2"/> + <source>Send command to Bitcoin Core</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+2"/> <source>Send trace/debug info to console instead of debug.log file</source> <translation>跟踪/调试信æ¯è¾“出到控制å°ï¼Œä¸è¾“出到 debug.log 文件</translation> </message> @@ -3853,6 +3982,21 @@ rpcpassword=%s </message> <message> <location line="+2"/> + <source>Sets the DB_PRIVATE flag in the wallet db environment (default: 1)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>Show all debugging options (usage: --help -help-debug)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>Show benchmark information (default: 0)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> <source>Shrink debug.log file on client startup (default: 1 when no -debug)</source> <translation>客户端å¯åŠ¨æ—¶åŽ‹ç¼©debug.log文件(缺çœï¼šno-debug模å¼æ—¶ä¸º1)</translation> </message> @@ -3867,7 +4011,12 @@ rpcpassword=%s <translation>设置连接超时时间(缺çœï¼š5000毫秒)</translation> </message> <message> - <location line="+7"/> + <location line="+6"/> + <source>Start Bitcoin Core Daemon</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> <source>System error: </source> <translation>系统错误：</translation> </message> @@ -3918,6 +4067,11 @@ rpcpassword=%s </message> <message> <location line="+1"/> + <source>on startup</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> <source>version</source> <translation>版本</translation> </message> @@ -3927,49 +4081,49 @@ rpcpassword=%s <translation>钱包文件wallet.datæŸå，抢救备份失败</translation> </message> <message> - <location line="-60"/> + <location line="-71"/> <source>Password for JSON-RPC connections</source> <translation>JSON-RPC 连接密ç </translation> </message> <message> - <location line="-71"/> + <location line="-77"/> <source>Allow JSON-RPC connections from specified IP address</source> <translation>å…许从指定IP接å—到的 JSON-RPC 连接</translation> </message> <message> - <location line="+81"/> + <location line="+94"/> <source>Send commands to node running on <ip> (default: 127.0.0.1)</source> <translation>å‘IP地å€ä¸º <ip> 的节点å‘é€æŒ‡ä»¤ (缺çœ: 127.0.0.1)</translation> </message> <message> - <location line="-133"/> + <location line="-163"/> <source>Execute command when the best block changes (%s in cmd is replaced by block hash)</source> <translation>当最佳数æ®å—å˜åŒ–时执行命令 (命令行ä¸çš„ %s 会被替æ¢æˆæ•°æ®å—哈希值)</translation> </message> <message> - <location line="+163"/> + <location line="+196"/> <source>Upgrade wallet to latest format</source> <translation>将钱包å‡çº§åˆ°æœ€æ–°çš„æ ¼å¼</translation> </message> <message> - <location line="-25"/> + <location line="-28"/> <source>Set key pool size to <n> (default: 100)</source> <translation>è®¾ç½®å¯†é’¥æ± å¤§å°ä¸º <n> (缺çœ: 100) </translation> </message> <message> - <location line="-11"/> + <location line="-12"/> <source>Rescan the block chain for missing wallet transactions</source> <translation>é‡æ–°æ‰«æ区å—链以查找é—æ¼çš„钱包交易</translation> </message> <message> - <location line="+39"/> + <location line="+43"/> <source>Use OpenSSL (https) for JSON-RPC connections</source> <translation>为 JSON-RPC 连接使用 OpenSSL (https) 连接</translation> </message> <message> - <location line="-31"/> + <location line="-34"/> <source>Server certificate file (default: server.cert)</source> <translation>æœåŠ¡å™¨è¯ä¹¦ (默认为 server.cert) </translation> @@ -3981,7 +4135,7 @@ rpcpassword=%s </translation> </message> <message> - <location line="+17"/> + <location line="+20"/> <source>This help message</source> <translation>æœ¬å¸®åŠ©ä¿¡æ¯ </translation> @@ -3992,17 +4146,17 @@ rpcpassword=%s <translation>æ— æ³•ç»‘å®šæœ¬æœºç«¯å£ %s (è¿”å›žé”™è¯¯æ¶ˆæ¯ %d, %s)</translation> </message> <message> - <location line="-109"/> + <location line="-125"/> <source>Allow DNS lookups for -addnode, -seednode and -connect</source> <translation>使用 -addnode, -seednode å’Œ -connect 选项时å…许查询DNS</translation> </message> <message> - <location line="+61"/> + <location line="+66"/> <source>Loading addresses...</source> <translation>æ£åœ¨åŠ 载地å€ç°¿...</translation> </message> <message> - <location line="-37"/> + <location line="-39"/> <source>Error loading wallet.dat: Wallet corrupted</source> <translation>wallet.dat é’±åŒ…æ–‡ä»¶åŠ è½½å‡ºé”™ï¼šé’±åŒ…æŸå</translation> </message> @@ -4012,22 +4166,22 @@ rpcpassword=%s <translation>wallet.dat é’±åŒ…æ–‡ä»¶åŠ è½½é”™è¯¯ï¼šè¯·å‡çº§åˆ°æœ€æ–°ç‰ˆBitcoin客户端</translation> </message> <message> - <location line="+99"/> + <location line="+112"/> <source>Wallet needed to be rewritten: restart Bitcoin to complete</source> <translation>钱包文件需è¦è¢«é‡å†™ï¼šè¯·é€€å‡ºå¹¶é‡æ–°å¯åŠ¨Bitcoin客户端</translation> </message> <message> - <location line="-101"/> + <location line="-114"/> <source>Error loading wallet.dat</source> <translation>wallet.dat é’±åŒ…æ–‡ä»¶åŠ è½½å‡ºé”™</translation> </message> <message> - <location line="+31"/> + <location line="+32"/> <source>Invalid -proxy address: '%s'</source> <translation>æ— æ•ˆçš„ä»£ç†åœ°å€ï¼š%s</translation> </message> <message> - <location line="+57"/> + <location line="+69"/> <source>Unknown network specified in -onlynet: '%s'</source> <translation>-onlynet 指定的是未知网络：%s</translation> </message> @@ -4037,7 +4191,7 @@ rpcpassword=%s <translation>被指定的是未知socks代ç†ç‰ˆæœ¬: %i</translation> </message> <message> - <location line="-103"/> + <location line="-119"/> <source>Cannot resolve -bind address: '%s'</source> <translation>æ— æ³•è§£æž -bind 端å£åœ°å€: '%s'</translation> </message> @@ -4047,7 +4201,7 @@ rpcpassword=%s <translation>æ— æ³•è§£æž -externalip 地å€: '%s'</translation> </message> <message> - <location line="+49"/> + <location line="+53"/> <source>Invalid amount for -paytxfee=<amount>: '%s'</source> <translation>éžæ³•é‡‘é¢ -paytxfee=<amount>: '%s'</translation> </message> @@ -4062,27 +4216,22 @@ rpcpassword=%s <translation>金é¢ä¸è¶³</translation> </message> <message> - <location line="+10"/> + <location line="+11"/> <source>Loading block index...</source> <translation>æ£åœ¨åŠ 载数æ®å—索引...</translation> </message> <message> - <location line="-63"/> + <location line="-68"/> <source>Add a node to connect to and attempt to keep the connection open</source> <translation>æ·»åŠ èŠ‚ç‚¹å¹¶ä¸Žå…¶ä¿æŒè¿žæŽ¥</translation> </message> <message> - <location line="-32"/> - <source>Unable to bind to %s on this computer. Bitcoin is probably already running.</source> - <translation>æ— æ³•åœ¨æœ¬æœºç»‘å®š %s 端å£ã€‚比特å¸å®¢æˆ·ç«¯è½¯ä»¶å¯èƒ½å·²ç»åœ¨è¿è¡Œã€‚</translation> - </message> - <message> - <location line="+96"/> + <location line="+69"/> <source>Loading wallet...</source> <translation>æ£åœ¨åŠ 载钱包...</translation> </message> <message> - <location line="-57"/> + <location line="-62"/> <source>Cannot downgrade wallet</source> <translation>æ— æ³•é™çº§é’±åŒ…</translation> </message> @@ -4092,27 +4241,27 @@ rpcpassword=%s <translation>æ— æ³•å†™å…¥é»˜è®¤åœ°å€</translation> </message> <message> - <location line="+68"/> + <location line="+80"/> <source>Rescanning...</source> <translation>æ£åœ¨é‡æ–°æ‰«æ...</translation> </message> <message> - <location line="-58"/> + <location line="-67"/> <source>Done loading</source> <translation>åŠ è½½å®Œæˆ</translation> </message> <message> - <location line="+86"/> + <location line="+99"/> <source>To use the %s option</source> <translation>使用 %s 选项</translation> </message> <message> - <location line="-78"/> + <location line="-91"/> <source>Error</source> <translation>错误</translation> </message> <message> - <location line="-36"/> + <location line="-41"/> <source>You must set rpcpassword=<password> in the configuration file: %s If the file does not exist, create it with owner-readable-only file permissions.</source> diff --git a/src/qt/locale/bitcoin_zh_HK.ts b/src/qt/locale/bitcoin_zh_HK.ts index dc8b56c007..1b5ef0e98c 100644 --- a/src/qt/locale/bitcoin_zh_HK.ts +++ b/src/qt/locale/bitcoin_zh_HK.ts @@ -31,6 +31,12 @@ This product includes software developed by the OpenSSL Project for use in the O <source>The Bitcoin Core developers</source> <translation type="unfinished"/> </message> + <message> + <location line="+12"/> + <location line="+2"/> + <source>(%1-bit)</source> + <translation type="unfinished"/> + </message> </context> <context> <name>AddressBookPage</name> @@ -60,7 +66,7 @@ This product includes software developed by the OpenSSL Project for use in the O <translation type="unfinished"/> </message> <message> - <location line="+52"/> + <location line="+58"/> <source>C&lose</source> <translation type="unfinished"/> </message> @@ -70,7 +76,7 @@ This product includes software developed by the OpenSSL Project for use in the O <translation type="unfinished"/> </message> <message> - <location filename="../forms/addressbookpage.ui" line="-41"/> + <location filename="../forms/addressbookpage.ui" line="-47"/> <source>Delete the currently selected address from the list</source> <translation type="unfinished"/> </message> @@ -317,7 +323,7 @@ This product includes software developed by the OpenSSL Project for use in the O <context> <name>BitcoinGUI</name> <message> - <location filename="../bitcoingui.cpp" line="+295"/> + <location filename="../bitcoingui.cpp" line="+294"/> <source>Sign &message...</source> <translation type="unfinished"/> </message> @@ -332,12 +338,12 @@ This product includes software developed by the OpenSSL Project for use in the O <translation type="unfinished"/> </message> <message> - <location line="-137"/> + <location line="-136"/> <source>Node</source> <translation type="unfinished"/> </message> <message> - <location line="+138"/> + <location line="+137"/> <source>Show general overview of wallet</source> <translation type="unfinished"/> </message> @@ -458,17 +464,17 @@ This product includes software developed by the OpenSSL Project for use in the O <translation type="unfinished"/> </message> <message> - <location line="+430"/> + <location line="+440"/> <source>Bitcoin</source> <translation type="unfinished"/> </message> <message> - <location line="-643"/> + <location line="-652"/> <source>Wallet</source> <translation type="unfinished"/> </message> <message> - <location line="+146"/> + <location line="+145"/> <source>&Send</source> <translation type="unfinished"/> </message> @@ -524,18 +530,18 @@ This product includes software developed by the OpenSSL Project for use in the O <translation type="unfinished"/> </message> <message> - <location line="-284"/> - <location line="+376"/> + <location line="-283"/> + <location line="+375"/> <source>[testnet]</source> <translation type="unfinished"/> </message> <message> - <location line="-401"/> + <location line="-400"/> <source>Bitcoin Core</source> <translation type="unfinished"/> </message> <message> - <location line="+163"/> + <location line="+162"/> <source>Request payments (generates QR codes and bitcoin: URIs)</source> <translation type="unfinished"/> </message> @@ -597,7 +603,7 @@ This product includes software developed by the OpenSSL Project for use in the O <translation type="unfinished"/> </message> <message numerus="yes"> - <location line="+23"/> + <location line="+27"/> <source>%n hour(s)</source> <translation type="unfinished"><numerusform></numerusform></translation> </message> @@ -608,10 +614,21 @@ This product includes software developed by the OpenSSL Project for use in the O </message> <message numerus="yes"> <location line="+4"/> + <location line="+6"/> <source>%n week(s)</source> <translation type="unfinished"><numerusform></numerusform></translation> </message> <message> + <location line="+0"/> + <source>%1 and %2</source> + <translation type="unfinished"/> + </message> + <message numerus="yes"> + <location line="+0"/> + <source>%n year(s)</source> + <translation type="unfinished"><numerusform></numerusform></translation> + </message> + <message> <location line="+4"/> <source>%1 behind</source> <translation type="unfinished"/> @@ -642,12 +659,12 @@ This product includes software developed by the OpenSSL Project for use in the O <translation type="unfinished"/> </message> <message> - <location line="-85"/> + <location line="-95"/> <source>Up to date</source> <translation type="unfinished"/> </message> <message> - <location line="+34"/> + <location line="+44"/> <source>Catching up...</source> <translation type="unfinished"/> </message> @@ -681,7 +698,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location filename="../bitcoin.cpp" line="+438"/> + <location filename="../bitcoin.cpp" line="+443"/> <source>A fatal error occurred. Bitcoin can no longer continue safely and will quit.</source> <translation type="unfinished"/> </message> @@ -689,7 +706,7 @@ Address: %4 <context> <name>ClientModel</name> <message> - <location filename="../clientmodel.cpp" line="+119"/> + <location filename="../clientmodel.cpp" line="+128"/> <source>Network Alert</source> <translation type="unfinished"/> </message> @@ -742,7 +759,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+63"/> + <location line="+56"/> <source>(un)select all</source> <translation type="unfinished"/> </message> @@ -757,7 +774,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+52"/> + <location line="+53"/> <source>Amount</source> <translation type="unfinished"/> </message> @@ -787,7 +804,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location filename="../coincontroldialog.cpp" line="+42"/> + <location filename="../coincontroldialog.cpp" line="+41"/> <source>Copy address</source> <translation type="unfinished"/> </message> @@ -853,7 +870,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+323"/> + <location line="+332"/> <source>highest</source> <translation type="unfinished"/> </message> @@ -903,12 +920,12 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+31"/> + <location line="+32"/> <source>none</source> <translation type="unfinished"/> </message> <message> - <location line="+140"/> + <location line="+141"/> <source>Dust</source> <translation type="unfinished"/> </message> @@ -971,12 +988,12 @@ Address: %4 </message> <message> <location line="+43"/> - <location line="+66"/> + <location line="+61"/> <source>(no label)</source> <translation type="unfinished"/> </message> <message> - <location line="-9"/> + <location line="-7"/> <source>change from %1 (%2)</source> <translation type="unfinished"/> </message> @@ -1057,7 +1074,7 @@ Address: %4 <context> <name>FreespaceChecker</name> <message> - <location filename="../intro.cpp" line="+65"/> + <location filename="../intro.cpp" line="+68"/> <source>A new data directory will be created.</source> <translation type="unfinished"/> </message> @@ -1090,7 +1107,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location filename="../utilitydialog.cpp" line="+38"/> + <location filename="../utilitydialog.cpp" line="+24"/> <source>Bitcoin Core</source> <translation type="unfinished"/> </message> @@ -1115,7 +1132,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+1"/> + <location line="+2"/> <source>Set language, for example "de_DE" (default: system locale)</source> <translation type="unfinished"/> </message> @@ -1126,11 +1143,16 @@ Address: %4 </message> <message> <location line="+1"/> - <source>Show splash screen on startup (default: 1)</source> + <source>Set SSL root certificates for payment request (default: -system-)</source> <translation type="unfinished"/> </message> <message> <location line="+1"/> + <source>Show splash screen on startup (default: 1)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="-4"/> <source>Choose data directory on startup (default: 0)</source> <translation type="unfinished"/> </message> @@ -1168,7 +1190,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location filename="../intro.cpp" line="+85"/> + <location filename="../intro.cpp" line="+82"/> <source>Bitcoin</source> <translation type="unfinished"/> </message> @@ -1178,7 +1200,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+19"/> + <location line="+24"/> <source>Error</source> <translation type="unfinished"/> </message> @@ -1234,7 +1256,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+6"/> + <location line="+116"/> <source>Optional transaction fee per kB that helps make sure your transactions are processed quickly. Most transactions are 1 kB.</source> <translation type="unfinished"/> </message> @@ -1244,7 +1266,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+31"/> + <location line="-125"/> <source>Automatically start Bitcoin after logging in to the system.</source> <translation type="unfinished"/> </message> @@ -1259,12 +1281,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+13"/> - <source>Set database cache size in megabytes (default: 25)</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+13"/> + <location line="+16"/> <source>MB</source> <translation type="unfinished"/> </message> @@ -1274,12 +1291,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+13"/> - <source>Set the number of script verification threads (up to 16, 0 = auto, <0 = leave that many cores free, default: 0)</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+58"/> + <location line="+160"/> <source>Connect to the Bitcoin network through a SOCKS proxy.</source> <translation type="unfinished"/> </message> @@ -1294,7 +1306,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+224"/> + <location line="+214"/> <source>Active command-line options that override above options:</source> <translation type="unfinished"/> </message> @@ -1309,12 +1321,42 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="-323"/> + <location line="-313"/> <source>&Network</source> <translation type="unfinished"/> </message> <message> - <location line="+6"/> + <location line="-131"/> + <source>(0 = auto, <0 = leave that many cores free)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+36"/> + <source>W&allet</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+65"/> + <source>Expert</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+9"/> + <source>Enable coin &control features</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+7"/> + <source>If you disable the spending of unconfirmed change, the change from a transaction cannot be used until that transaction has at least one confirmation. This also affects how your balance is computed.</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+3"/> + <source>&Spend unconfirmed change</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+17"/> <source>Automatically open the Bitcoin client port on the router. This only works when your router supports UPnP and it is enabled.</source> <translation type="unfinished"/> </message> @@ -1409,17 +1451,12 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+7"/> + <location line="-262"/> <source>Whether to show coin control features or not.</source> <translation type="unfinished"/> </message> <message> - <location line="+3"/> - <source>Display coin &control features (experts only)</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+136"/> + <location line="+398"/> <source>&OK</source> <translation type="unfinished"/> </message> @@ -1429,17 +1466,17 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location filename="../optionsdialog.cpp" line="+67"/> + <location filename="../optionsdialog.cpp" line="+72"/> <source>default</source> <translation type="unfinished"/> </message> <message> - <location line="+57"/> + <location line="+58"/> <source>none</source> <translation type="unfinished"/> </message> <message> - <location line="+75"/> + <location line="+80"/> <source>Confirm options reset</source> <translation type="unfinished"/> </message> @@ -1479,18 +1516,13 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="-155"/> - <source>Unconfirmed:</source> - <translation type="unfinished"/> - </message> - <message> - <location line="-83"/> + <location line="-238"/> <source>Wallet</source> <translation type="unfinished"/> </message> <message> <location line="+51"/> - <source>Confirmed:</source> + <source>Available:</source> <translation type="unfinished"/> </message> <message> @@ -1499,7 +1531,12 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+32"/> + <location line="+16"/> + <source>Pending:</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+16"/> <source>Total of transactions that have yet to be confirmed, and do not yet count toward the spendable balance</source> <translation type="unfinished"/> </message> @@ -1632,23 +1669,29 @@ Address: %4 <context> <name>QObject</name> <message> - <location filename="../bitcoin.cpp" line="+71"/> - <location line="+11"/> + <location filename="../bitcoin.cpp" line="+63"/> + <location line="+7"/> + <location line="+13"/> <source>Bitcoin</source> <translation type="unfinished"/> </message> <message> - <location line="+1"/> + <location line="-19"/> <source>Error: Specified data directory "%1" does not exist.</source> <translation type="unfinished"/> </message> <message> - <location line="-12"/> + <location line="+7"/> + <source>Error: Cannot parse configuration file: %1. Only use key=value syntax.</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+12"/> <source>Error: Invalid combination of -regtest and -testnet.</source> <translation type="unfinished"/> </message> <message> - <location filename="../guiutil.cpp" line="+82"/> + <location filename="../guiutil.cpp" line="+89"/> <source>Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source> <translation type="unfinished"/> </message> @@ -1694,7 +1737,7 @@ Address: %4 <location line="+36"/> <location line="+23"/> <location line="+23"/> - <location filename="../rpcconsole.cpp" line="+359"/> + <location filename="../rpcconsole.cpp" line="+373"/> <source>N/A</source> <translation type="unfinished"/> </message> @@ -1790,11 +1833,13 @@ Address: %4 </message> <message> <location line="+64"/> + <location filename="../rpcconsole.cpp" line="-10"/> <source>In:</source> <translation type="unfinished"/> </message> <message> <location line="+80"/> + <location filename="../rpcconsole.cpp" line="+1"/> <source>Out:</source> <translation type="unfinished"/> </message> @@ -1819,7 +1864,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location filename="../rpcconsole.cpp" line="-30"/> + <location filename="../rpcconsole.cpp" line="-35"/> <source>Welcome to the Bitcoin RPC console.</source> <translation type="unfinished"/> </message> @@ -1834,7 +1879,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+122"/> + <location line="+136"/> <source>%1 B</source> <translation type="unfinished"/> </message> @@ -1950,7 +1995,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+11"/> + <location line="+14"/> <source>Remove the selected entries from the list</source> <translation type="unfinished"/> </message> @@ -1960,7 +2005,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location filename="../receivecoinsdialog.cpp" line="+38"/> + <location filename="../receivecoinsdialog.cpp" line="+39"/> <source>Copy label</source> <translation type="unfinished"/> </message> @@ -2181,12 +2226,12 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+52"/> + <location line="+58"/> <source>Balance:</source> <translation type="unfinished"/> </message> <message> - <location line="-78"/> + <location line="-84"/> <source>Confirm the send action</source> <translation type="unfinished"/> </message> @@ -2431,7 +2476,7 @@ Address: %4 <context> <name>ShutdownWindow</name> <message> - <location filename="../utilitydialog.cpp" line="+48"/> + <location filename="../utilitydialog.cpp" line="+52"/> <source>Bitcoin Core is shutting down...</source> <translation type="unfinished"/> </message> @@ -2631,7 +2676,7 @@ Address: %4 <context> <name>SplashScreen</name> <message> - <location filename="../splashscreen.cpp" line="+28"/> + <location filename="../splashscreen.cpp" line="+32"/> <source>Bitcoin Core</source> <translation type="unfinished"/> </message> @@ -2663,6 +2708,11 @@ Address: %4 </message> <message> <location line="+6"/> + <source>conflicted</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+2"/> <source>%1/offline</source> <translation type="unfinished"/> </message> @@ -2824,12 +2874,12 @@ Address: %4 <translation type="unfinished"/> </message> <message numerus="yes"> - <location line="-35"/> + <location line="-37"/> <source>Open for %n more block(s)</source> <translation type="unfinished"><numerusform></numerusform></translation> </message> <message> - <location line="+70"/> + <location line="+72"/> <source>unknown</source> <translation type="unfinished"/> </message> @@ -2870,12 +2920,12 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+59"/> + <location line="+78"/> <source>Immature (%1 confirmations, will be available after %2)</source> <translation type="unfinished"/> </message> <message numerus="yes"> - <location line="+16"/> + <location line="-21"/> <source>Open for %n more block(s)</source> <translation type="unfinished"><numerusform></numerusform></translation> </message> @@ -2885,33 +2935,42 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+3"/> - <source>Offline (%1 confirmations)</source> + <location line="+12"/> + <source>Confirmed (%1 confirmations)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+9"/> + <source>This block was not received by any other nodes and will probably not be accepted!</source> <translation type="unfinished"/> </message> <message> <location line="+3"/> - <source>Unconfirmed (%1 of %2 confirmations)</source> + <source>Generated but not accepted</source> <translation type="unfinished"/> </message> <message> - <location line="-22"/> - <location line="+25"/> - <source>Confirmed (%1 confirmations)</source> + <location line="-21"/> + <source>Offline</source> <translation type="unfinished"/> </message> <message> - <location line="-22"/> - <source>This block was not received by any other nodes and will probably not be accepted!</source> + <location line="+3"/> + <source>Unconfirmed</source> <translation type="unfinished"/> </message> <message> <location line="+3"/> - <source>Generated but not accepted</source> + <source>Confirming (%1 of %2 recommended confirmations)</source> <translation type="unfinished"/> </message> <message> - <location line="+62"/> + <location line="+6"/> + <source>Conflicted</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+51"/> <source>Received with</source> <translation type="unfinished"/> </message> @@ -2941,7 +3000,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+199"/> + <location line="+190"/> <source>Transaction status. Hover over this field to show number of confirmations.</source> <translation type="unfinished"/> </message> @@ -3070,7 +3129,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+142"/> + <location line="+140"/> <source>Export Transaction History</source> <translation type="unfinished"/> </message> @@ -3164,7 +3223,7 @@ Address: %4 <context> <name>WalletView</name> <message> - <location filename="../walletview.cpp" line="+43"/> + <location filename="../walletview.cpp" line="+44"/> <source>&Export</source> <translation type="unfinished"/> </message> @@ -3174,7 +3233,7 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+181"/> + <location line="+184"/> <source>Backup Wallet</source> <translation type="unfinished"/> </message> @@ -3207,12 +3266,12 @@ Address: %4 <context> <name>bitcoin-core</name> <message> - <location filename="../bitcoinstrings.cpp" line="+221"/> + <location filename="../bitcoinstrings.cpp" line="+261"/> <source>Usage:</source> <translation type="unfinished"/> </message> <message> - <location line="-54"/> + <location line="-66"/> <source>List commands</source> <translation type="unfinished"/> </message> @@ -3222,12 +3281,12 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="+26"/> + <location line="+27"/> <source>Options:</source> <translation type="unfinished"/> </message> <message> - <location line="+22"/> + <location line="+32"/> <source>Specify configuration file (default: bitcoin.conf)</source> <translation type="unfinished"/> </message> @@ -3242,72 +3301,72 @@ Address: %4 <translation type="unfinished"/> </message> <message> - <location line="-9"/> - <source>Set database cache size in megabytes (default: 25)</source> - <translation type="unfinished"/> - </message> - <message> - <location line="-26"/> + <location line="-46"/> <source>Listen for connections on <port> (default: 8333 or testnet: 18333)</source> <translation type="unfinished"/> </message> <message> - <location line="+5"/> + <location line="+6"/> <source>Maintain at most <n> connections to peers (default: 125)</source> <translation type="unfinished"/> </message> <message> - <location line="-51"/> + <location line="-57"/> <source>Connect to a node to retrieve peer addresses, and disconnect</source> <translation type="unfinished"/> </message> <message> - <location line="+84"/> + <location line="+100"/> <source>Specify your own public address</source> <translation type="unfinished"/> </message> <message> - <location line="+5"/> + <location line="+6"/> <source>Threshold for disconnecting misbehaving peers (default: 100)</source> <translation type="unfinished"/> </message> <message> - <location line="-148"/> + <location line="-172"/> <source>Number of seconds to keep misbehaving peers from reconnecting (default: 86400)</source> <translation type="unfinished"/> </message> <message> - <location line="-36"/> + <location line="-52"/> <source>An error occurred while setting up the RPC port %u for listening on IPv4: %s</source> <translation type="unfinished"/> </message> <message> - <location line="+34"/> + <location line="+50"/> <source>Listen for JSON-RPC connections on <port> (default: 8332 or testnet: 18332)</source> <translation type="unfinished"/> </message> <message> - <location line="+45"/> + <location line="+51"/> <source>Accept command line and JSON-RPC commands</source> <translation type="unfinished"/> </message> <message> - <location line="+80"/> + <location line="+7"/> + <source>Bitcoin Core RPC client version</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+87"/> <source>Run in the background as a daemon and accept commands</source> <translation type="unfinished"/> </message> <message> - <location line="+39"/> + <location line="+43"/> <source>Use the test network</source> <translation type="unfinished"/> </message> <message> - <location line="-118"/> + <location line="-136"/> <source>Accept connections from outside (default: 1 if no -proxy or -connect)</source> <translation type="unfinished"/> </message> <message> - <location line="-95"/> + <location line="-117"/> <source>%s, you must set a rpcpassword in the configuration file: %s It is recommended you use the following random password: @@ -3337,8 +3396,8 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+3"/> - <source>Cannot obtain a lock on data directory %s. Bitcoin is probably already running.</source> + <location line="+6"/> + <source>Continuously rate-limit free transactions to <n>*1000 bytes per minute (default:15)</source> <translation type="unfinished"/> </message> <message> @@ -3353,6 +3412,11 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. </message> <message> <location line="+3"/> + <source>Error: Listening for incoming connections failed (listen returned error %d)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+2"/> <source>Error: The transaction was rejected! This might happen if some of the coins in your wallet were already spent, such as if you used a copy of wallet.dat and coins were spent in the copy but not marked as spent here.</source> <translation type="unfinished"/> </message> @@ -3367,12 +3431,47 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+18"/> + <location line="+6"/> + <source>Fees smaller than this are considered zero fee (for transaction creation) (default:</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+3"/> + <source>Flush database activity from memory pool to disk log every <n> megabytes (default: 100)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+3"/> + <source>How thorough the block verification of -checkblocks is (0-4, default: 3)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+2"/> + <source>In this mode -genproclimit controls how many blocks are generated immediately.</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+12"/> + <source>Set the number of script verification threads (%u to %d, 0 = auto, <0 = leave that many cores free, default: %d)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+3"/> + <source>Set the processor limit for when generation is on (-1 = unlimited, default: -1)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+3"/> <source>This is a pre-release test build - use at your own risk - do not use for mining or merchant applications</source> <translation type="unfinished"/> </message> <message> - <location line="+5"/> + <location line="+3"/> + <source>Unable to bind to %s on this computer. Bitcoin Core is probably already running.</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+3"/> <source>Use separate SOCKS5 proxy to reach peers via Tor hidden services (default: -proxy)</source> <translation type="unfinished"/> </message> @@ -3408,6 +3507,16 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. </message> <message> <location line="+9"/> + <source>(default: 1)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>(default: wallet.dat)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> <source><category> can be:</source> <translation type="unfinished"/> </message> @@ -3422,17 +3531,17 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+1"/> - <source>Bitcoin RPC client version</source> + <location line="+2"/> + <source>Block creation options:</source> <translation type="unfinished"/> </message> <message> - <location line="+1"/> - <source>Block creation options:</source> + <location line="+5"/> + <source>Clear list of wallet transactions (diagnostic tool; implies -rescan)</source> <translation type="unfinished"/> </message> <message> - <location line="+5"/> + <location line="+1"/> <source>Connect only to the specified node(s)</source> <translation type="unfinished"/> </message> @@ -3448,11 +3557,26 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. </message> <message> <location line="+2"/> + <source>Connection options:</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> <source>Corrupted block database detected</source> <translation type="unfinished"/> </message> <message> <location line="+1"/> + <source>Debugging/Testing options:</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>Disable safemode, override a real safe mode event (default: 0)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> <source>Discover own IP address (default: 1 when listening and no -externalip)</source> <translation type="unfinished"/> </message> @@ -3563,22 +3687,27 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. </message> <message> <location line="+1"/> - <source>Find peers using DNS lookup (default: 1 unless -connect)</source> + <source>Fees smaller than this are considered zero fee (for relaying) (default:</source> <translation type="unfinished"/> </message> <message> <location line="+1"/> - <source>Generate coins (default: 0)</source> + <source>Find peers using DNS lookup (default: 1 unless -connect)</source> <translation type="unfinished"/> </message> <message> - <location line="+2"/> - <source>How many blocks to check at startup (default: 288, 0 = all)</source> + <location line="+1"/> + <source>Force safe mode (default: 0)</source> <translation type="unfinished"/> </message> <message> <location line="+1"/> - <source>How thorough the block verification is (0-4, default: 3)</source> + <source>Generate coins (default: 0)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+2"/> + <source>How many blocks to check at startup (default: 288, 0 = all)</source> <translation type="unfinished"/> </message> <message> @@ -3597,7 +3726,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+15"/> + <location line="+17"/> <source>Not enough file descriptors available.</source> <translation type="unfinished"/> </message> @@ -3607,27 +3736,27 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+1"/> + <location line="+4"/> <source>RPC client options:</source> <translation type="unfinished"/> </message> <message> - <location line="+1"/> + <location line="+4"/> <source>Rebuild block chain index from current blk000??.dat files</source> <translation type="unfinished"/> </message> <message> - <location line="+5"/> + <location line="+6"/> <source>Select SOCKS version for -proxy (4 or 5, default: 5)</source> <translation type="unfinished"/> </message> <message> - <location line="+1"/> - <source>Send command to Bitcoin server</source> + <location line="+6"/> + <source>Set database cache size in megabytes (%d to %d, default: %d)</source> <translation type="unfinished"/> </message> <message> - <location line="+7"/> + <location line="+2"/> <source>Set maximum block size in bytes (default: %d)</source> <translation type="unfinished"/> </message> @@ -3637,17 +3766,17 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+7"/> + <location line="+10"/> <source>Specify wallet file (within data directory)</source> <translation type="unfinished"/> </message> <message> <location line="+2"/> - <source>Start Bitcoin server</source> + <source>Spend unconfirmed change when sending transactions (default: 1)</source> <translation type="unfinished"/> </message> <message> - <location line="+3"/> + <location line="+4"/> <source>This is intended for regression testing tools and app development.</source> <translation type="unfinished"/> </message> @@ -3692,32 +3821,32 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="-79"/> + <location line="-92"/> <source>Imports blocks from external blk000??.dat file</source> <translation type="unfinished"/> </message> <message> - <location line="-105"/> - <source>Execute command when a relevant alert is received or we see a really long fork (%s in cmd is replaced by message)</source> + <location line="-149"/> + <source>Cannot obtain a lock on data directory %s. Bitcoin Core is probably already running.</source> <translation type="unfinished"/> </message> <message> - <location line="+14"/> - <source>Output debugging information (default: 0, supplying <category> is optional)</source> + <location line="+22"/> + <source>Execute command when a relevant alert is received or we see a really long fork (%s in cmd is replaced by message)</source> <translation type="unfinished"/> </message> <message> - <location line="+2"/> - <source>Set maximum size of high-priority/low-fee transactions in bytes (default: %d)</source> + <location line="+25"/> + <source>Output debugging information (default: 0, supplying <category> is optional)</source> <translation type="unfinished"/> </message> <message> <location line="+2"/> - <source>Set the number of script verification threads (up to 16, 0 = auto, <0 = leave that many cores free, default: 0)</source> + <source>Set maximum size of high-priority/low-fee transactions in bytes (default: %d)</source> <translation type="unfinished"/> </message> <message> - <location line="+89"/> + <location line="+102"/> <source>Information</source> <translation type="unfinished"/> </message> @@ -3732,7 +3861,17 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+8"/> + <location line="+3"/> + <source>Limit size of signature cache to <n> entries (default: 50000)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+6"/> + <source>Log transaction priority and fee per kB when mining blocks (default: 0)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> <source>Maintain a full transaction index (default: 0)</source> <translation type="unfinished"/> </message> @@ -3757,12 +3896,52 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+9"/> - <source>SSL options: (see the Bitcoin Wiki for SSL setup instructions)</source> + <location line="+4"/> + <source>Print block on startup, if found in block index</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>Print block tree on startup (default: 0)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>RPC SSL options: (see the Bitcoin Wiki for SSL setup instructions)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+2"/> + <source>RPC server options:</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>Randomly drop 1 of every <n> network messages</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>Randomly fuzz 1 of every <n> network messages</source> <translation type="unfinished"/> </message> <message> <location line="+4"/> + <source>Run a thread to flush wallet periodically (default: 1)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+2"/> + <source>SSL options: (see the Bitcoin Wiki for SSL setup instructions)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+2"/> + <source>Send command to Bitcoin Core</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+2"/> <source>Send trace/debug info to console instead of debug.log file</source> <translation type="unfinished"/> </message> @@ -3773,6 +3952,21 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. </message> <message> <location line="+2"/> + <source>Sets the DB_PRIVATE flag in the wallet db environment (default: 1)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>Show all debugging options (usage: --help -help-debug)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>Show benchmark information (default: 0)</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> <source>Shrink debug.log file on client startup (default: 1 when no -debug)</source> <translation type="unfinished"/> </message> @@ -3788,6 +3982,11 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. </message> <message> <location line="+6"/> + <source>Start Bitcoin Core Daemon</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> <source>System error: </source> <translation type="unfinished"/> </message> @@ -3833,6 +4032,16 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. </message> <message> <location line="+2"/> + <source>Zapping all transactions from wallet...</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> + <source>on startup</source> + <translation type="unfinished"/> + </message> + <message> + <location line="+1"/> <source>version</source> <translation type="unfinished"/> </message> @@ -3842,47 +4051,47 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="-58"/> + <location line="-71"/> <source>Password for JSON-RPC connections</source> <translation type="unfinished"/> </message> <message> - <location line="-70"/> + <location line="-77"/> <source>Allow JSON-RPC connections from specified IP address</source> <translation type="unfinished"/> </message> <message> - <location line="+80"/> + <location line="+94"/> <source>Send commands to node running on <ip> (default: 127.0.0.1)</source> <translation type="unfinished"/> </message> <message> - <location line="-132"/> + <location line="-163"/> <source>Execute command when the best block changes (%s in cmd is replaced by block hash)</source> <translation type="unfinished"/> </message> <message> - <location line="+161"/> + <location line="+196"/> <source>Upgrade wallet to latest format</source> <translation type="unfinished"/> </message> <message> - <location line="-24"/> + <location line="-28"/> <source>Set key pool size to <n> (default: 100)</source> <translation type="unfinished"/> </message> <message> - <location line="-11"/> + <location line="-12"/> <source>Rescan the block chain for missing wallet transactions</source> <translation type="unfinished"/> </message> <message> - <location line="+38"/> + <location line="+43"/> <source>Use OpenSSL (https) for JSON-RPC connections</source> <translation type="unfinished"/> </message> <message> - <location line="-30"/> + <location line="-34"/> <source>Server certificate file (default: server.cert)</source> <translation type="unfinished"/> </message> @@ -3892,7 +4101,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+16"/> + <location line="+20"/> <source>This help message</source> <translation type="unfinished"/> </message> @@ -3902,17 +4111,17 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="-107"/> + <location line="-125"/> <source>Allow DNS lookups for -addnode, -seednode and -connect</source> <translation type="unfinished"/> </message> <message> - <location line="+60"/> + <location line="+66"/> <source>Loading addresses...</source> <translation type="unfinished"/> </message> <message> - <location line="-37"/> + <location line="-39"/> <source>Error loading wallet.dat: Wallet corrupted</source> <translation type="unfinished"/> </message> @@ -3922,22 +4131,22 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+98"/> + <location line="+112"/> <source>Wallet needed to be rewritten: restart Bitcoin to complete</source> <translation type="unfinished"/> </message> <message> - <location line="-100"/> + <location line="-114"/> <source>Error loading wallet.dat</source> <translation type="unfinished"/> </message> <message> - <location line="+31"/> + <location line="+32"/> <source>Invalid -proxy address: '%s'</source> <translation type="unfinished"/> </message> <message> - <location line="+56"/> + <location line="+69"/> <source>Unknown network specified in -onlynet: '%s'</source> <translation type="unfinished"/> </message> @@ -3947,7 +4156,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="-101"/> + <location line="-119"/> <source>Cannot resolve -bind address: '%s'</source> <translation type="unfinished"/> </message> @@ -3957,7 +4166,7 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+48"/> + <location line="+53"/> <source>Invalid amount for -paytxfee=<amount>: '%s'</source> <translation type="unfinished"/> </message> @@ -3972,27 +4181,22 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+10"/> + <location line="+11"/> <source>Loading block index...</source> <translation type="unfinished"/> </message> <message> - <location line="-62"/> + <location line="-68"/> <source>Add a node to connect to and attempt to keep the connection open</source> <translation type="unfinished"/> </message> <message> - <location line="-32"/> - <source>Unable to bind to %s on this computer. Bitcoin is probably already running.</source> - <translation type="unfinished"/> - </message> - <message> - <location line="+95"/> + <location line="+69"/> <source>Loading wallet...</source> <translation type="unfinished"/> </message> <message> - <location line="-56"/> + <location line="-62"/> <source>Cannot downgrade wallet</source> <translation type="unfinished"/> </message> @@ -4002,27 +4206,27 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo. <translation type="unfinished"/> </message> <message> - <location line="+67"/> + <location line="+80"/> <source>Rescanning...</source> <translation type="unfinished"/> </message> <message> - <location line="-58"/> + <location line="-67"/> <source>Done loading</source> <translation type="unfinished"/> </message> <message> - <location line="+85"/> + <location line="+99"/> <source>To use the %s option</source> <translation type="unfinished"/> </message> <message> - <location line="-77"/> + <location line="-91"/> <source>Error</source> <translation type="unfinished"/> </message> <message> - <location line="-35"/> + <location line="-41"/> <source>You must set rpcpassword=<password> in the configuration file: %s If the file does not exist, create it with owner-readable-only file permissions.</source> diff --git a/src/qt/locale/bitcoin_zh_TW.ts b/src/qt/locale/bitcoin_zh_TW.ts index cf7b71a2b7..dab228dac8 100644 --- a/src/qt/locale/bitcoin_zh_TW.ts +++ b/src/qt/locale/bitcoin_zh_TW.ts @@ -9,7 +9,7 @@ <message> <location line="+39"/> <source><b>Bitcoin Core</b> version</source> - <translation><b>ä½å…ƒå¹£æ ¸å¿ƒ</b>版本</translation> + <translation><b>ä½å…ƒå¹£æ ¸å¿ƒ</b> 版本</translation> </message> <message> <location line="+57"/> @@ -38,6 +38,12 @@ This product includes software developed by the OpenSSL Project for use in the O <source>The Bitcoin Core developers</source> <translation>ä½å…ƒå¹£æ ¸å¿ƒé–‹ç™¼äººå“¡</translation> </message> + <message> + <location line="+12"/> + <location line="+2"/> + <source>(%1-bit)</source> + <translation>(%1 ä½å…ƒ)</translation> + </message> </context> <context> <name>AddressBookPage</name> @@ -67,7 +73,7 @@ This product includes software developed by the OpenSSL Project for use in the O <translation>複製</translation> </message> <message> - <location line="+52"/> + <location line="+58"/> <source>C&lose</source> <translation>關閉</translation> </message> @@ -77,7 +83,7 @@ This product includes software developed by the OpenSSL Project for use in the O <translation>複製ä½å€</translation> </message> <message> - <location filename="../forms/addressbookpage.ui" line="-41"/> + <location filename="../forms/addressbookpage.ui" line="-47"/> <source>Delete the currently selected address from the list</source> <translation>把目å‰é¸æ“‡çš„ä½å€å¾žåˆ—表ä¸åˆªæŽ‰</translation> </message> @@ -324,7 +330,7 @@ This product includes software developed by the OpenSSL Project for use in the O <context> <name>BitcoinGUI</name> <message> - <location filename="../bitcoingui.cpp" line="+295"/> + <location filename="../bitcoingui.cpp" line="+294"/> <source>Sign &message...</source> <translation>簽署訊æ¯...</translation> </message> @@ -339,12 +345,12 @@ This product includes software developed by the OpenSSL Project for use in the O <translation>總覽</translation> </message> <message> - <location line="-137"/> + <location line="-136"/> <source>Node</source> <translation>節點</translation> </message> <message> - <location line="+138"/> + <location line="+137"/> <source>Show general overview of wallet</source> <translation>顯示錢包一般總覽</translation> </message> @@ -465,17 +471,17 @@ This product includes software developed by the OpenSSL Project for use in the O <translation>é©—è‰è¨Šæ¯...</translation> </message> <message> - <location line="+430"/> + <location line="+440"/> <source>Bitcoin</source> <translation>ä½å…ƒå¹£</translation> </message> <message> - <location line="-643"/> + <location line="-652"/> <source>Wallet</source> <translation>錢包</translation> </message> <message> - <location line="+146"/> + <location line="+145"/> <source>&Send</source> <translation>付款</translation> </message> @@ -531,18 +537,18 @@ This product includes software developed by the OpenSSL Project for use in the O <translation>分é 工具列</translation> </message> <message> - <location line="-284"/> - <location line="+376"/> + <location line="-283"/> + <location line="+375"/> <source>[testnet]</source> <translation>[testnet]</translation> </message> <message> - <location line="-401"/> + <location line="-400"/> <source>Bitcoin Core</source> <translation>ä½å…ƒå¹£æ ¸å¿ƒ</translation> </message> <message> - <location line="+163"/> + <location line="+162"/> <source>Request payments (generates QR codes and bitcoin: URIs)</source> <translation>è¦æ±‚付款(產生 QR Code å’Œä½å…ƒå¹£ä»˜æ¬¾å”è°çš„ URI)</translation> </message> @@ -604,7 +610,7 @@ This product includes software developed by the OpenSSL Project for use in the O <translation>已處ç†äº† %1 個å€å¡Šçš„交易紀錄。</translation> </message> <message numerus="yes"> - <location line="+23"/> + <location line="+27"/> <source>%n hour(s)</source> <translation><numerusform>%n 個å°æ™‚</numerusform></translation> </message> @@ -615,10 +621,21 @@ This product includes software developed by the OpenSSL Project for use in the O </message> <message numerus="yes"> <location line="+4"/> + <location line="+6"/> <source>%n week(s)</source> <translation><numerusform>%n 個星期</numerusform></translation> </message> <message> + <location line="+0"/> + <source>%1 and %2</source> + <translation>%1åˆ %2</translation> + </message> + <message numerus="yes"> + <location line="+0"/> + <source>%n year(s)</source> + <translation><numerusform>%n å¹´</numerusform></translation> + </message> + <message> <location line="+4"/> <source>%1 behind</source> <translation>è½å¾Œ %1</translation> @@ -649,12 +666,12 @@ This product includes software developed by the OpenSSL Project for use in the O <translation>資訊</translation> </message> <message> - <location line="-85"/> + <location line="-95"/> <source>Up to date</source> <translation>最新狀態</translation> </message> <message> - <location line="+34"/> + <location line="+44"/> <source>Catching up...</source> <translation>æ£åœ¨è¶•é€²åº¦...</translation> </message> @@ -692,7 +709,7 @@ Address: %4 <translation>錢包<b>å·²åŠ å¯†</b>並且<b>上鎖ä¸</b></translation> </message> <message> - <location filename="../bitcoin.cpp" line="+438"/> + <location filename="../bitcoin.cpp" line="+443"/> <source>A fatal error occurred. Bitcoin can no longer continue safely and will quit.</source> <translation>發生了致命的錯誤。ä½å…ƒå¹£è»Ÿé«”沒辦法å†ç¹¼çºŒå®‰å…¨åŸ·è¡Œï¼Œåªå¥½çµæŸã€‚</translation> </message> @@ -700,7 +717,7 @@ Address: %4 <context> <name>ClientModel</name> <message> - <location filename="../clientmodel.cpp" line="+119"/> + <location filename="../clientmodel.cpp" line="+128"/> <source>Network Alert</source> <translation>網路è¦å ±</translation> </message> @@ -753,7 +770,7 @@ Address: %4 <translation>找零金é¡:</translation> </message> <message> - <location line="+63"/> + <location line="+56"/> <source>(un)select all</source> <translation>å…¨é¸æˆ–å…¨ä¸é¸</translation> </message> @@ -768,7 +785,7 @@ Address: %4 <translation>列表模å¼</translation> </message> <message> - <location line="+52"/> + <location line="+53"/> <source>Amount</source> <translation>金é¡</translation> </message> @@ -790,7 +807,7 @@ Address: %4 <message> <location line="+3"/> <source>Confirmed</source> - <translation>已確定</translation> + <translation>已確èª</translation> </message> <message> <location line="+5"/> @@ -798,7 +815,7 @@ Address: %4 <translation>優先度</translation> </message> <message> - <location filename="../coincontroldialog.cpp" line="+42"/> + <location filename="../coincontroldialog.cpp" line="+41"/> <source>Copy address</source> <translation>複製ä½å€</translation> </message> @@ -864,7 +881,7 @@ Address: %4 <translation>複製找零金é¡</translation> </message> <message> - <location line="+323"/> + <location line="+332"/> <source>highest</source> <translation>最高</translation> </message> @@ -914,12 +931,12 @@ Address: %4 <translation>(鎖定 %1 æžš)</translation> </message> <message> - <location line="+31"/> + <location line="+32"/> <source>none</source> <translation>ç„¡</translation> </message> <message> - <location line="+140"/> + <location line="+141"/> <source>Dust</source> <translation>零散錢</translation> </message> @@ -973,7 +990,7 @@ Address: %4 <message> <location line="-3"/> <source>Amounts below 0.546 times the minimum relay fee are shown as dust.</source> - <translation>當金é¡ä½Žæ–¼æœ€å°‘轉發手續費乘以 0.546 時，會顯示æˆé›¶æ•£éŒ¢ã€‚</translation> + <translation>當金é¡ä½Žæ–¼æœ€ä½Žè½‰ç™¼æ‰‹çºŒè²»ä¹˜ä»¥ 0.546 時，會顯示æˆé›¶æ•£éŒ¢ã€‚</translation> </message> <message> <location line="+2"/> @@ -982,12 +999,12 @@ Address: %4 </message> <message> <location line="+43"/> - <location line="+66"/> + <location line="+61"/> <source>(no label)</source> <translation>(無標記)</translation> </message> <message> - <location line="-9"/> + <location line="-7"/> <source>change from %1 (%2)</source> <translation>找零å‰æ˜¯ %1 (%2)</translation> </message> @@ -1068,7 +1085,7 @@ Address: %4 <context> <name>FreespaceChecker</name> <message> - <location filename="../intro.cpp" line="+65"/> + <location filename="../intro.cpp" line="+68"/> <source>A new data directory will be created.</source> <translation>å°±è¦é€ 出新的資料目錄。</translation> </message> @@ -1101,7 +1118,7 @@ Address: %4 <translation>ä½å…ƒå¹£æ ¸å¿ƒ - 命令列é¸é …</translation> </message> <message> - <location filename="../utilitydialog.cpp" line="+38"/> + <location filename="../utilitydialog.cpp" line="+24"/> <source>Bitcoin Core</source> <translation>ä½å…ƒå¹£æ ¸å¿ƒ</translation> </message> @@ -1126,7 +1143,7 @@ Address: %4 <translation>使用界é¢é¸é …</translation> </message> <message> - <location line="+1"/> + <location line="+2"/> <source>Set language, for example "de_DE" (default: system locale)</source> <translation>è¨å®šèªžè¨€ï¼Œæ¯”如說 de_DE (é è¨å€¼: 系統語系)</translation> </message> @@ -1137,11 +1154,16 @@ Address: %4 </message> <message> <location line="+1"/> + <source>Set SSL root certificates for payment request (default: -system-)</source> + <translation>è¨å®šä»˜æ¬¾è«‹æ±‚時所使用的 SSL æ ¹æ†‘è‰ (é è¨å€¼: 系統憑è‰åº«)</translation> + </message> + <message> + <location line="+1"/> <source>Show splash screen on startup (default: 1)</source> <translation>顯示啓動畫é¢(é è¨å€¼: 1)</translation> </message> <message> - <location line="+1"/> + <location line="-4"/> <source>Choose data directory on startup (default: 0)</source> <translation>啓動時é¸æ“‡è³‡æ–™ç›®éŒ„(é è¨å€¼: 0)</translation> </message> @@ -1179,7 +1201,7 @@ Address: %4 <translation>使用自定的資料目錄:</translation> </message> <message> - <location filename="../intro.cpp" line="+85"/> + <location filename="../intro.cpp" line="+82"/> <source>Bitcoin</source> <translation>ä½å…ƒå¹£</translation> </message> @@ -1189,7 +1211,7 @@ Address: %4 <translation>錯誤: æ²’è¾¦æ³•é€ å‡ºæŒ‡å®šçš„è³‡æ–™ç›®éŒ„ %1 。</translation> </message> <message> - <location line="+19"/> + <location line="+24"/> <source>Error</source> <translation>錯誤</translation> </message> @@ -1245,7 +1267,7 @@ Address: %4 <translation>主è¦</translation> </message> <message> - <location line="+6"/> + <location line="+116"/> <source>Optional transaction fee per kB that helps make sure your transactions are processed quickly. Most transactions are 1 kB.</source> <translation>æ¯ä¸€åƒä½å…ƒçµ„(kB)è¦ä»˜çš„交易手續費，如果有付å¯ä»¥åŠ 速網路處ç†ä½ 的交易。大部份交易資料的大å°æ˜¯ 1 kB.</translation> </message> @@ -1255,7 +1277,7 @@ Address: %4 <translation>付交易手續費</translation> </message> <message> - <location line="+31"/> + <location line="-125"/> <source>Automatically start Bitcoin after logging in to the system.</source> <translation>在登入系統後自動啓動ä½å…ƒå¹£è»Ÿé«”。</translation> </message> @@ -1270,12 +1292,7 @@ Address: %4 <translation>資料庫快å–大å°</translation> </message> <message> - <location line="+13"/> - <source>Set database cache size in megabytes (default: 25)</source> - <translation>è¨å®šè³‡æ–™åº«å¿«å–的大å°æ˜¯å¤šå°‘百è¬ä½å…ƒçµ„(é è¨å€¼: 25)</translation> - </message> - <message> - <location line="+13"/> + <location line="+16"/> <source>MB</source> <translation>MB (百è¬ä½å…ƒçµ„)</translation> </message> @@ -1285,12 +1302,7 @@ Address: %4 <translation>指令碼驗è‰åŸ·è¡Œç·’數目</translation> </message> <message> - <location line="+13"/> - <source>Set the number of script verification threads (up to 16, 0 = auto, <0 = leave that many cores free, default: 0)</source> - <translation>è¨å®šé©—è‰æŒ‡ä»¤ç¢¼çš„執行緒數目(最多 16 個, 若是 0 表示程å¼è‡ªå‹•æ±ºå®šï¼Œå°æ–¼ 0 是ä¿ç•™ä¸ç”¨çš„處ç†å™¨æ ¸å¿ƒæ•¸ç›®ï¼Œé è¨å€¼: 0)</translation> - </message> - <message> - <location line="+58"/> + <location line="+160"/> <source>Connect to the Bitcoin network through a SOCKS proxy.</source> <translation>é€éŽ SOCKS 代ç†ä¼ºæœå™¨ä¾†é€£ç·šåˆ°ä½å…ƒå¹£ç¶²è·¯ã€‚</translation> </message> @@ -1305,29 +1317,59 @@ Address: %4 <translation>代ç†ä¼ºæœå™¨çš„網際網路ä½å€(åƒæ˜¯ IPv4 çš„ 127.0.0.1 或 IPv6 çš„ ::1)</translation> </message> <message> - <location line="+224"/> + <location line="+214"/> <source>Active command-line options that override above options:</source> <translation>從命令列å–代掉以上è¨å®šçš„é¸é …有:</translation> </message> <message> <location line="+43"/> <source>Reset all client options to default.</source> - <translation>回復所有客戶端軟體é¸é …æˆé è¨å€¼ã€‚</translation> + <translation>é‡è¨æ‰€æœ‰å®¢æˆ¶ç«¯è»Ÿé«”é¸é …æˆé è¨å€¼ã€‚</translation> </message> <message> <location line="+3"/> <source>&Reset Options</source> - <translation>é¸é …回復</translation> + <translation>é‡è¨é¸é …</translation> </message> <message> - <location line="-323"/> + <location line="-313"/> <source>&Network</source> <translation>網路</translation> </message> <message> - <location line="+6"/> + <location line="-131"/> + <source>(0 = auto, <0 = leave that many cores free)</source> + <translation>(0 表示程å¼è‡ªå‹•æ±ºå®šï¼Œå°æ–¼ 0 表示ä¿ç•™è™•ç†å™¨æ ¸å¿ƒä¸ç”¨çš„數目)</translation> + </message> + <message> + <location line="+36"/> + <source>W&allet</source> + <translation>錢包</translation> + </message> + <message> + <location line="+65"/> + <source>Expert</source> + <translation>專家</translation> + </message> + <message> + <location line="+9"/> + <source>Enable coin &control features</source> + <translation>開啟錢幣控制功能</translation> + </message> + <message> + <location line="+7"/> + <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>å¦‚æžœä½ é—œæŽ‰ã€Œå¯ä»¥èŠ±é‚„沒確èªçš„零錢ã€ï¼Œé‚£éº¼äº¤æ˜“ä¸æ‰¾é›¶çš„é›¶éŒ¢å°±å¿…é ˆè¦ç‰äº¤æ˜“至少有一次確èªå¾Œï¼Œæ‰èƒ½å¤ 使用。這也會影響餘é¡çš„計算方å¼ã€‚</translation> + </message> + <message> + <location line="+3"/> + <source>&Spend unconfirmed change</source> + <translation>å¯ä»¥èŠ±é‚„沒確èªçš„零錢</translation> + </message> + <message> + <location line="+17"/> <source>Automatically open the Bitcoin client port on the router. This only works when your router supports UPnP and it is enabled.</source> - <translation>自動在路由器上開放ä½å…ƒå¹£çš„å®¢æˆ¶ç«¯é€šè¨ŠåŸ ã€‚åªæœ‰åœ¨ä½ 的路由器支æ´ä¸”開啓通用å³æ’å³ç”¨(UPnP)å”定時æ‰æœ‰ä½œç”¨ã€‚</translation> + <translation>自動在路由器上開放ä½å…ƒå¹£çš„å®¢æˆ¶ç«¯é€šè¨ŠåŸ ã€‚åªæœ‰åœ¨ä½ 的路由器支æ´ä¸”開啓「通用å³æ’å³ç”¨ã€å”定(UPnP)時æ‰æœ‰ä½œç”¨ã€‚</translation> </message> <message> <location line="+3"/> @@ -1420,17 +1462,12 @@ Address: %4 <translation>在交易列表顯示ä½å€</translation> </message> <message> - <location line="+7"/> + <location line="-262"/> <source>Whether to show coin control features or not.</source> <translation>是å¦è¦é¡¯ç¤ºéŒ¢å¹£æŽ§åˆ¶åŠŸèƒ½ã€‚</translation> </message> <message> - <location line="+3"/> - <source>Display coin &control features (experts only)</source> - <translation>顯示錢幣控制功能(專家用)</translation> - </message> - <message> - <location line="+136"/> + <location line="+398"/> <source>&OK</source> <translation>好</translation> </message> @@ -1440,19 +1477,19 @@ Address: %4 <translation>å–消</translation> </message> <message> - <location filename="../optionsdialog.cpp" line="+67"/> + <location filename="../optionsdialog.cpp" line="+72"/> <source>default</source> <translation>é è¨å€¼</translation> </message> <message> - <location line="+57"/> + <location line="+58"/> <source>none</source> <translation>ç„¡</translation> </message> <message> - <location line="+75"/> + <location line="+80"/> <source>Confirm options reset</source> - <translation>確èªå›žå¾©é¸é …</translation> + <translation>確èªé‡è¨é¸é …</translation> </message> <message> <location line="+1"/> @@ -1490,19 +1527,14 @@ Address: %4 <translation>顯示的資訊å¯èƒ½æ˜¯éŽæœŸçš„。跟ä½å…ƒå¹£ç¶²è·¯çš„é€£ç·šå»ºç«‹å¾Œï¼Œä½ çš„éŒ¢åŒ…æœƒè‡ªå‹•å’Œç¶²è·¯åŒæ¥ï¼Œä½†æ˜¯é€™å€‹æ¥é©Ÿé‚„沒完æˆã€‚</translation> </message> <message> - <location line="-155"/> - <source>Unconfirmed:</source> - <translation>未確定金é¡:</translation> - </message> - <message> - <location line="-83"/> + <location line="-238"/> <source>Wallet</source> <translation>錢包</translation> </message> <message> <location line="+51"/> - <source>Confirmed:</source> - <translation>已確定金é¡:</translation> + <source>Available:</source> + <translation>å¯ç”¨é‡‘é¡:</translation> </message> <message> <location line="+16"/> @@ -1510,9 +1542,14 @@ Address: %4 <translation>ç›®å‰å¯ç”¨é¤˜é¡</translation> </message> <message> - <location line="+32"/> + <location line="+16"/> + <source>Pending:</source> + <translation>未定金é¡:</translation> + </message> + <message> + <location line="+16"/> <source>Total of transactions that have yet to be confirmed, and do not yet count toward the spendable balance</source> - <translation>還沒確定的交易的總金é¡ï¼Œå¯ç”¨é¤˜é¡ä¸åŒ…å«é€™äº›é‡‘é¡</translation> + <translation>還沒被確èªçš„交易的總金é¡ï¼Œå¯ç”¨é¤˜é¡ä¸åŒ…å«é€™äº›é‡‘é¡</translation> </message> <message> <location line="+16"/> @@ -1643,23 +1680,29 @@ Address: %4 <context> <name>QObject</name> <message> - <location filename="../bitcoin.cpp" line="+71"/> - <location line="+11"/> + <location filename="../bitcoin.cpp" line="+63"/> + <location line="+7"/> + <location line="+13"/> <source>Bitcoin</source> <translation>ä½å…ƒå¹£</translation> </message> <message> - <location line="+1"/> + <location line="-19"/> <source>Error: Specified data directory "%1" does not exist.</source> <translation>錯誤: 沒有指定的資料目錄 %1 。</translation> </message> <message> - <location line="-12"/> + <location line="+7"/> + <source>Error: Cannot parse configuration file: %1. Only use key=value syntax.</source> + <translation>錯誤: 沒辦法解æžè¨å®šæª”: %1。請åªç”¨ã€Œå稱=è¨å®šå€¼ã€é€™ç¨®èªžæ³•ã€‚</translation> + </message> + <message> + <location line="+12"/> <source>Error: Invalid combination of -regtest and -testnet.</source> <translation>錯誤: -regtest å’Œ -testnet 的使用組åˆç„¡æ•ˆã€‚</translation> </message> <message> - <location filename="../guiutil.cpp" line="+82"/> + <location filename="../guiutil.cpp" line="+89"/> <source>Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source> <translation>請輸å…¥ä½å…ƒå¹£ä½å€(åƒæ˜¯ 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation> </message> @@ -1705,7 +1748,7 @@ Address: %4 <location line="+36"/> <location line="+23"/> <location line="+23"/> - <location filename="../rpcconsole.cpp" line="+359"/> + <location filename="../rpcconsole.cpp" line="+373"/> <source>N/A</source> <translation>未知</translation> </message> @@ -1792,7 +1835,7 @@ Address: %4 <message> <location line="+52"/> <source>&Clear</source> - <translation>清除</translation> + <translation>清掉</translation> </message> <message> <location line="+13"/> @@ -1801,11 +1844,13 @@ Address: %4 </message> <message> <location line="+64"/> + <location filename="../rpcconsole.cpp" line="-10"/> <source>In:</source> <translation>輸入:</translation> </message> <message> <location line="+80"/> + <location filename="../rpcconsole.cpp" line="+1"/> <source>Out:</source> <translation>輸出:</translation> </message> @@ -1830,14 +1875,14 @@ Address: %4 <translation>清主控å°</translation> </message> <message> - <location filename="../rpcconsole.cpp" line="-30"/> + <location filename="../rpcconsole.cpp" line="-35"/> <source>Welcome to the Bitcoin RPC console.</source> <translation>æ¡è¿Žä½¿ç”¨ä½å…ƒå¹£ RPC 主控å°ã€‚</translation> </message> <message> <location line="+1"/> <source>Use up and down arrows to navigate history, and <b>Ctrl-L</b> to clear screen.</source> - <translation>請用上下游標éµä¾†ç€è¦½å…ˆå‰æŒ‡ä»¤çš„紀錄，並用 <b>Ctrl-L</b> 來清ç†ç•«é¢ã€‚</translation> + <translation>請用上下游標éµä¾†ç€è¦½å…ˆå‰æŒ‡ä»¤çš„紀錄，並用 <b>Ctrl-L</b> 來清畫é¢ã€‚</translation> </message> <message> <location line="+1"/> @@ -1845,7 +1890,7 @@ Address: %4 <translation>請打 <b>help</b> 來看å¯ç”¨æŒ‡ä»¤çš„簡介。</translation> </message> <message> - <location line="+122"/> + <location line="+136"/> <source>%1 B</source> <translation>%1 B (ä½å…ƒçµ„)</translation> </message> @@ -1867,7 +1912,7 @@ Address: %4 <message> <location line="+7"/> <source>%1 m</source> - <translation>%1 分</translation> + <translation>%1 分é˜</translation> </message> <message> <location line="+5"/> @@ -1933,12 +1978,12 @@ Address: %4 <message> <location line="+32"/> <source>Clear all fields of the form.</source> - <translation>清除表單ä¸çš„所有欄ä½ã€‚</translation> + <translation>把表單ä¸çš„所有欄ä½æ¸…空。</translation> </message> <message> <location line="+3"/> <source>Clear</source> - <translation>清除</translation> + <translation>清空</translation> </message> <message> <location line="+78"/> @@ -1961,7 +2006,7 @@ Address: %4 <translation>顯示</translation> </message> <message> - <location line="+11"/> + <location line="+14"/> <source>Remove the selected entries from the list</source> <translation>從列表ä¸åˆªæŽ‰é¸æ“‡çš„é …ç›®</translation> </message> @@ -1971,7 +2016,7 @@ Address: %4 <translation>刪掉</translation> </message> <message> - <location filename="../receivecoinsdialog.cpp" line="+38"/> + <location filename="../receivecoinsdialog.cpp" line="+39"/> <source>Copy label</source> <translation>複製標記</translation> </message> @@ -2184,7 +2229,7 @@ Address: %4 <message> <location line="-23"/> <source>Clear all fields of the form.</source> - <translation>清除表單ä¸çš„所有欄ä½ã€‚</translation> + <translation>把表單ä¸çš„所有欄ä½æ¸…空。</translation> </message> <message> <location line="+3"/> @@ -2192,12 +2237,12 @@ Address: %4 <translation>全部清掉</translation> </message> <message> - <location line="+52"/> + <location line="+58"/> <source>Balance:</source> <translation>餘é¡:</translation> </message> <message> - <location line="-78"/> + <location line="-84"/> <source>Confirm the send action</source> <translation>確èªä»˜æ¬¾å‹•ä½œ</translation> </message> @@ -2442,7 +2487,7 @@ Address: %4 <context> <name>ShutdownWindow</name> <message> - <location filename="../utilitydialog.cpp" line="+48"/> + <location filename="../utilitydialog.cpp" line="+52"/> <source>Bitcoin Core is shutting down...</source> <translation>ä½å…ƒå¹£æ ¸å¿ƒæ£åœ¨é—œé–‰ä¸...</translation> </message> @@ -2524,7 +2569,7 @@ Address: %4 <message> <location line="+14"/> <source>Reset all sign message fields</source> - <translation>é‡ç½®æ‰€æœ‰è¨Šæ¯ç°½ç½²æ¬„ä½</translation> + <translation>é‡è¨æ‰€æœ‰è¨Šæ¯ç°½ç½²æ¬„ä½</translation> </message> <message> <location line="+3"/> @@ -2560,7 +2605,7 @@ Address: %4 <message> <location line="+14"/> <source>Reset all verify message fields</source> - <translation>é‡ç½®æ‰€æœ‰è¨Šæ¯é©—è‰æ¬„ä½</translation> + <translation>é‡è¨æ‰€æœ‰è¨Šæ¯é©—è‰æ¬„ä½</translation> </message> <message> <location filename="../signverifymessagedialog.cpp" line="+30"/> @@ -2642,7 +2687,7 @@ Address: %4 <context> <name>SplashScreen</name> <message> - <location filename="../splashscreen.cpp" line="+28"/> + <location filename="../splashscreen.cpp" line="+32"/> <source>Bitcoin Core</source> <translation>ä½å…ƒå¹£æ ¸å¿ƒ</translation> </message> @@ -2670,22 +2715,27 @@ Address: %4 <message> <location filename="../transactiondesc.cpp" line="+28"/> <source>Open until %1</source> - <translation>è¦åˆ° %1 æ‰ç¢ºå®š</translation> + <translation>到 %1 å‰å¯ä¿®æ”¹</translation> </message> <message> <location line="+6"/> + <source>conflicted</source> + <translation>有è¡çª</translation> + </message> + <message> + <location line="+2"/> <source>%1/offline</source> - <translation>%1/離線ä¸</translation> + <translation>%1 次/離線ä¸</translation> </message> <message> <location line="+2"/> <source>%1/unconfirmed</source> - <translation>%1/未確定</translation> + <translation>%1 次/未確èª</translation> </message> <message> <location line="+2"/> <source>%1 confirmations</source> - <translation>%1 次確èª</translation> + <translation>ç¢ºèª %1 次</translation> </message> <message> <location line="+18"/> @@ -2835,12 +2885,12 @@ Address: %4 <translation>，還沒æˆåŠŸå…¬å‘Šå‡ºåŽ»</translation> </message> <message numerus="yes"> - <location line="-35"/> + <location line="-37"/> <source>Open for %n more block(s)</source> - <translation><numerusform>å†ç‰ %n 個å€å¡Šç”Ÿå‡ºä¾†å¾Œæ‰ç¢ºå®š</numerusform></translation> + <translation><numerusform>到下 %n 個å€å¡Šç”Ÿå‡ºä¾†å‰å¯ä¿®æ”¹</numerusform></translation> </message> <message> - <location line="+70"/> + <location line="+72"/> <source>unknown</source> <translation>未知</translation> </message> @@ -2881,38 +2931,27 @@ Address: %4 <translation>金é¡</translation> </message> <message> - <location line="+59"/> + <location line="+78"/> <source>Immature (%1 confirmations, will be available after %2)</source> - <translation>未æˆç†Ÿ(%1 次確èªï¼Œæœƒåœ¨ %2 次確èªå¾Œå¯ç”¨)</translation> + <translation>未æˆç†Ÿ(ç¢ºèª %1 次，會在 %2 次後å¯ç”¨)</translation> </message> <message numerus="yes"> - <location line="+16"/> + <location line="-21"/> <source>Open for %n more block(s)</source> - <translation><numerusform>å†ç‰ %n 個å€å¡Šç”Ÿå‡ºä¾†å¾Œæ‰ç¢ºå®š</numerusform></translation> + <translation><numerusform>到下 %n 個å€å¡Šç”Ÿå‡ºä¾†å‰å¯ä¿®æ”¹</numerusform></translation> </message> <message> <location line="+3"/> <source>Open until %1</source> - <translation>è¦åˆ° %1 æ‰ç¢ºå®š</translation> - </message> - <message> - <location line="+3"/> - <source>Offline (%1 confirmations)</source> - <translation>離線ä¸(%1 次確èª)</translation> + <translation>到 %1 å‰å¯ä¿®æ”¹</translation> </message> <message> - <location line="+3"/> - <source>Unconfirmed (%1 of %2 confirmations)</source> - <translation>未確定(%1 次確èªï¼Œæ‡‰ %2 次)</translation> - </message> - <message> - <location line="-22"/> - <location line="+25"/> + <location line="+12"/> <source>Confirmed (%1 confirmations)</source> - <translation>已確定(%1 次確èª)</translation> + <translation>已確èª(%1 次)</translation> </message> <message> - <location line="-22"/> + <location line="+9"/> <source>This block was not received by any other nodes and will probably not be accepted!</source> <translation>沒有其他節點收到這個å€å¡Šï¼Œä¹Ÿè¨±å®ƒä¸æœƒè¢«æŽ¥å—ï¼</translation> </message> @@ -2922,7 +2961,27 @@ Address: %4 <translation>生產出來但是ä¸è¢«æŽ¥å—</translation> </message> <message> - <location line="+62"/> + <location line="-21"/> + <source>Offline</source> + <translation>離線ä¸</translation> + </message> + <message> + <location line="+3"/> + <source>Unconfirmed</source> + <translation>未確èª</translation> + </message> + <message> + <location line="+3"/> + <source>Confirming (%1 of %2 recommended confirmations)</source> + <translation>確èªä¸(已經 %1 次，建è°è‡³å°‘ %2 次)</translation> + </message> + <message> + <location line="+6"/> + <source>Conflicted</source> + <translation>有è¡çª</translation> + </message> + <message> + <location line="+51"/> <source>Received with</source> <translation>收款在</translation> </message> @@ -2952,7 +3011,7 @@ Address: %4 <translation>(ä¸é©ç”¨)</translation> </message> <message> - <location line="+199"/> + <location line="+190"/> <source>Transaction status. Hover over this field to show number of confirmations.</source> <translation>交易狀態。把游標åœåœ¨æ¬„ä½ä¸Šæœƒé¡¯ç¤ºç¢ºèªæ¬¡æ•¸ã€‚</translation> </message> @@ -3081,7 +3140,7 @@ Address: %4 <translation>顯示交易明細</translation> </message> <message> - <location line="+142"/> + <location line="+140"/> <source>Export Transaction History</source> <translation>匯出交易記錄</translation> </message> @@ -3113,7 +3172,7 @@ Address: %4 <message> <location line="+9"/> <source>Confirmed</source> - <translation>已確定</translation> + <translation>已確èª</translation> </message> <message> <location line="+1"/> @@ -3175,7 +3234,7 @@ Address: %4 <context> <name>WalletView</name> <message> - <location filename="../walletview.cpp" line="+43"/> + <location filename="../walletview.cpp" line="+44"/> <source>&Export</source> <translation>匯出</translation> </message> @@ -3185,7 +3244,7 @@ Address: %4 <translation>把目å‰åˆ†é 的資料匯出å˜æˆæª”案</translation> </message> <message> - <location line="+181"/> + <location line="+184"/> <source>Backup Wallet</source> <translation>備份錢包</translation> </message> @@ -3218,12 +3277,12 @@ Address: %4 <context> <name>bitcoin-core</name> <message> - <location filename="../bitcoinstrings.cpp" line="+221"/> + <location filename="../bitcoinstrings.cpp" line="+261"/> <source>Usage:</source> <translation>用法:</translation> </message> <message> - <location line="-54"/> + <location line="-66"/> <source>List commands</source> <translation>列出指令</translation> </message> @@ -3233,12 +3292,12 @@ Address: %4 <translation>å–得指令說明</translation> </message> <message> - <location line="+26"/> + <location line="+27"/> <source>Options:</source> <translation>é¸é …:</translation> </message> <message> - <location line="+22"/> + <location line="+32"/> <source>Specify configuration file (default: bitcoin.conf)</source> <translation>指定è¨å®šæª”(é è¨å€¼: bitcoin.conf)</translation> </message> @@ -3253,73 +3312,73 @@ Address: %4 <translation>指定資料目錄</translation> </message> <message> - <location line="-9"/> - <source>Set database cache size in megabytes (default: 25)</source> - <translation>è¨å®šè³‡æ–™åº«å¿«å–大å°æˆå¤šå°‘百è¬ä½å…ƒçµ„(MBï¼›é è¨å€¼: 25)</translation> - </message> - <message> - <location line="-26"/> + <location line="-46"/> <source>Listen for connections on <port> (default: 8333 or testnet: 18333)</source> <translation>åœ¨é€šè¨ŠåŸ <port> è½å€™é€£ç·š(é è¨å€¼: 8333, 或若是測試網路: 18333)</translation> </message> <message> - <location line="+5"/> + <location line="+6"/> <source>Maintain at most <n> connections to peers (default: 125)</source> <translation>ç¶æŒé€£ç·šç¯€é»žæ•¸çš„上é™ç‚º <n> 個(é è¨å€¼: 125)</translation> </message> <message> - <location line="-51"/> + <location line="-57"/> <source>Connect to a node to retrieve peer addresses, and disconnect</source> <translation>連線到æŸå€‹ç¯€é»žä¾†å–得其它節點的ä½å€ï¼Œç„¶å¾Œæ–·ç·š</translation> </message> <message> - <location line="+84"/> + <location line="+100"/> <source>Specify your own public address</source> <translation>指定自己的公開ä½å€</translation> </message> <message> - <location line="+5"/> + <location line="+6"/> <source>Threshold for disconnecting misbehaving peers (default: 100)</source> <translation>把異常節點斷線的臨界值(é è¨å€¼: 100)</translation> </message> <message> - <location line="-148"/> + <location line="-172"/> <source>Number of seconds to keep misbehaving peers from reconnecting (default: 86400)</source> <translation>拒絕跟異常節點連線的秒數(é è¨å€¼: 86400)</translation> </message> <message> - <location line="-36"/> + <location line="-52"/> <source>An error occurred while setting up the RPC port %u for listening on IPv4: %s</source> <translation>è¨å®šåœ¨ IPv4 ç¶²è·¯ä¸Šä»¥é€šè¨ŠåŸ %u è½å– RPC 連線時發生錯誤: %s</translation> </message> <message> - <location line="+34"/> + <location line="+50"/> <source>Listen for JSON-RPC connections on <port> (default: 8332 or testnet: 18332)</source> <translation>åœ¨é€šè¨ŠåŸ <port> è½å€™ JSON-RPC 連線(é è¨å€¼: 8332, 或若是測試網路: 18332)</translation> </message> <message> - <location line="+45"/> + <location line="+51"/> <source>Accept command line and JSON-RPC commands</source> <translation>接å—指令列和 JSON-RPC 指令 </translation> </message> <message> - <location line="+80"/> + <location line="+7"/> + <source>Bitcoin Core RPC client version</source> + <translation>ä½å…ƒå¹£æ ¸å¿ƒ RPC 客戶端軟體版本</translation> + </message> + <message> + <location line="+87"/> <source>Run in the background as a daemon and accept commands</source> <translation>用è·éˆæ¨¡å¼åœ¨èƒŒå¾ŒåŸ·è¡Œä¸¦æŽ¥å—指令</translation> </message> <message> - <location line="+39"/> + <location line="+43"/> <source>Use the test network</source> <translation>使用測試網路</translation> </message> <message> - <location line="-118"/> + <location line="-136"/> <source>Accept connections from outside (default: 1 if no -proxy or -connect)</source> <translation>是å¦æŽ¥å—外來連線(é è¨å€¼: 當沒有 -proxy 或 -connect 時為 1)</translation> </message> <message> - <location line="-95"/> + <location line="-117"/> <source>%s, you must set a rpcpassword in the configuration file: %s It is recommended you use the following random password: @@ -3359,9 +3418,9 @@ alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo.com</translat <translation>和指定的ä½å€ç¹«çµï¼Œä¸¦ç¸½æ˜¯åœ¨æŒ‡å®šä½å€è½å€™é€£ç·šã€‚IPv6 請用 [主機]:é€šè¨ŠåŸ é€™ç¨®æ ¼å¼</translation> </message> <message> - <location line="+3"/> - <source>Cannot obtain a lock on data directory %s. Bitcoin is probably already running.</source> - <translation>沒辦法鎖定 %s 這個資料目錄。也許ä½å…ƒå¹£è»Ÿé«”已經在執行了。</translation> + <location line="+6"/> + <source>Continuously rate-limit free transactions to <n>*1000 bytes per minute (default:15)</source> + <translation>å°æ²’付手續費的交易æŒçºŒé™åˆ¶ä¸€åˆ†é˜å…§æœ€å¤šåªèƒ½æœ‰ <n> åƒä½å…ƒçµ„ (é è¨å€¼: 15)</translation> </message> <message> <location line="+3"/> @@ -3375,6 +3434,11 @@ alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo.com</translat </message> <message> <location line="+3"/> + <source>Error: Listening for incoming connections failed (listen returned error %d)</source> + <translation>錯誤: è½å€™å¤–來連線失敗(回傳錯誤 %d)</translation> + </message> + <message> + <location line="+2"/> <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> @@ -3389,12 +3453,47 @@ alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo.com</translat <translation>當錢包有交易改變時è¦åŸ·è¡Œçš„指令(指令ä¸çš„ %s 會被å–代æˆäº¤æ˜“è˜åˆ¥ç¢¼)</translation> </message> <message> - <location line="+18"/> + <location line="+6"/> + <source>Fees smaller than this are considered zero fee (for transaction creation) (default:</source> + <translation>手續費低於這個時會被èªç‚ºæ˜¯æ²’付手續費(產生交易用)(é è¨å€¼:</translation> + </message> + <message> + <location line="+3"/> + <source>Flush database activity from memory pool to disk log every <n> megabytes (default: 100)</source> + <translation>æ¯ç•¶ç´¯ç©åˆ° <n> 百è¬ä½å…ƒçµ„(MB)時，æ‰å°‡è³‡æ–™åº«çš„變動從記憶體暫å˜æ± ä¸å¯«é€²ç£ç¢Ÿç´€éŒ„檔 (é è¨å€¼: 100)</translation> + </message> + <message> + <location line="+3"/> + <source>How thorough the block verification of -checkblocks is (0-4, default: 3)</source> + <translation>使用 -checkblocks 檢查å€å¡Šçš„仔細程度 (0 到 4，é è¨å€¼: 3)</translation> + </message> + <message> + <location line="+2"/> + <source>In this mode -genproclimit controls how many blocks are generated immediately.</source> + <translation>在這個é‹ä½œæ¨¡å¼ä¸‹ï¼Œ-genproclimit é¸é …控制立刻產生出的å€å¡Šæ•¸ç›®ã€‚</translation> + </message> + <message> + <location line="+12"/> + <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 表示ä¿ç•™è™•ç†å™¨æ ¸å¿ƒä¸ç”¨çš„數目，é è¨å€¼: 0)</translation> + </message> + <message> + <location line="+3"/> + <source>Set the processor limit for when generation is on (-1 = unlimited, default: -1)</source> + <translation>當生產ä½å…ƒå¹£æ‰“開時，è¨å®šè™•ç†å™¨ä½¿ç”¨æ•¸ç›®é™åˆ¶ (-1 表示ä¸é™åˆ¶ï¼Œé è¨å€¼: -1)</translation> + </message> + <message> + <location line="+3"/> <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> - <location line="+5"/> + <location line="+3"/> + <source>Unable to bind to %s on this computer. Bitcoin Core is probably already running.</source> + <translation>沒辦法繫çµåœ¨é€™å°é›»è…¦ä¸Šçš„ %s 。ä½å…ƒå¹£æ ¸å¿ƒå¯èƒ½å·²ç¶“在執行了。</translation> + </message> + <message> + <location line="+3"/> <source>Use separate SOCKS5 proxy to reach peers via Tor hidden services (default: -proxy)</source> <translation>使用å¦å¤–çš„ SOCK5 代ç†ä¼ºæœå™¨ï¼Œä¾†é€éŽ Tor éš±è—æœå‹™è·Ÿç¯€é»žè¯ç¹«(é è¨å€¼: åŒ -proxy)</translation> </message> @@ -3430,6 +3529,16 @@ alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo.com</translat </message> <message> <location line="+9"/> + <source>(default: 1)</source> + <translation>(é è¨å€¼: 1)</translation> + </message> + <message> + <location line="+1"/> + <source>(default: wallet.dat)</source> + <translation>(é è¨å€¼: wallet.dat)</translation> + </message> + <message> + <location line="+1"/> <source><category> can be:</source> <translation><category> å¯ä»¥æ˜¯:</translation> </message> @@ -3444,17 +3553,17 @@ alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo.com</translat <translation>ä½å…ƒå¹£æ ¸å¿ƒè·éˆ</translation> </message> <message> - <location line="+1"/> - <source>Bitcoin RPC client version</source> - <translation>ä½å…ƒå¹£ RPC 客戶端軟體版本</translation> - </message> - <message> - <location line="+1"/> + <location line="+2"/> <source>Block creation options:</source> <translation>å€å¡Šè£½é€ é¸é …:</translation> </message> <message> <location line="+5"/> + <source>Clear list of wallet transactions (diagnostic tool; implies -rescan)</source> + <translation>清掉錢包裡交易的列表(診斷用的工具; ä¹Ÿæœƒåš -rescan)</translation> + </message> + <message> + <location line="+1"/> <source>Connect only to the specified node(s)</source> <translation>åªé€£ç·šåˆ°æŒ‡å®šç¯€é»ž(å¯å¤šå€‹)</translation> </message> @@ -3470,11 +3579,26 @@ alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo.com</translat </message> <message> <location line="+2"/> + <source>Connection options:</source> + <translation>連線é¸é …:</translation> + </message> + <message> + <location line="+1"/> <source>Corrupted block database detected</source> <translation>發ç¾å€å¡Šè³‡æ–™åº«å£žæŽ‰äº†</translation> </message> <message> <location line="+1"/> + <source>Debugging/Testing options:</source> + <translation>除錯與測試é¸é …</translation> + </message> + <message> + <location line="+1"/> + <source>Disable safemode, override a real safe mode event (default: 0)</source> + <translation>ä¸é€²å…¥å®‰å…¨æ¨¡å¼ï¼Œç”¨åœ¨çœŸçš„發生需è¦é€²å…¥å®‰å…¨æ¨¡å¼çš„事件時，強制ä¸é€²å…¥ (é è¨å€¼: 0)</translation> + </message> + <message> + <location line="+1"/> <source>Discover own IP address (default: 1 when listening and no -externalip)</source> <translation>找出自己的網際網路ä½å€(é è¨å€¼: 當有è½å€™é€£ç·šä¸”沒有 -externalip 時為 1)</translation> </message> @@ -3585,11 +3709,21 @@ alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo.com</translat </message> <message> <location line="+1"/> + <source>Fees smaller than this are considered zero fee (for relaying) (default:</source> + <translation>手續費比這個低時會被èªç‚ºæ˜¯æ²’付手續費(轉發用)(é è¨å€¼:</translation> + </message> + <message> + <location line="+1"/> <source>Find peers using DNS lookup (default: 1 unless -connect)</source> <translation>是å¦å…許在找節點時使用域å查詢(é è¨å€¼: 當沒用 -connect 時為 1)</translation> </message> <message> <location line="+1"/> + <source>Force safe mode (default: 0)</source> + <translation>å¼·åˆ¶é€²å…¥å®‰å…¨æ¨¡å¼ (é è¨å€¼: 0)</translation> + </message> + <message> + <location line="+1"/> <source>Generate coins (default: 0)</source> <translation>生產ä½å…ƒå¹£(é è¨å€¼: 0)</translation> </message> @@ -3600,11 +3734,6 @@ alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo.com</translat </message> <message> <location line="+1"/> - <source>How thorough the block verification is (0-4, default: 3)</source> - <translation>å€å¡Šæª¢æŸ¥çš„仔細程度(0 到 4, é è¨å€¼: 3)</translation> - </message> - <message> - <location line="+1"/> <source>If <category> is not supplied, output all debugging information.</source> <translation>如果沒有æä¾› <category> 就會輸出所有的除錯資訊。</translation> </message> @@ -3619,7 +3748,7 @@ alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo.com</translat <translation>無效的 -onion ä½å€: '%s'</translation> </message> <message> - <location line="+15"/> + <location line="+17"/> <source>Not enough file descriptors available.</source> <translation>檔案æè¿°å…ƒä¸è¶³ã€‚</translation> </message> @@ -3629,27 +3758,27 @@ alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo.com</translat <translation>在除錯輸出內容å‰é™„åŠ æ™‚é–“(é è¨å€¼: 1)</translation> </message> <message> - <location line="+1"/> + <location line="+4"/> <source>RPC client options:</source> <translation>RPC 客戶端é¸é …:</translation> </message> <message> - <location line="+1"/> + <location line="+4"/> <source>Rebuild block chain index from current blk000??.dat files</source> <translation>從目å‰çš„å€å¡Šæª” blk000??.dat é‡å»ºå€å¡Šéˆçš„索引</translation> </message> <message> - <location line="+5"/> + <location line="+6"/> <source>Select SOCKS version for -proxy (4 or 5, default: 5)</source> <translation>é¸æ“‡ -proxy 指定代ç†ä¼ºæœå™¨çš„ SOCKS å”定版本(4 或 5, é è¨å€¼: 5)</translation> </message> <message> - <location line="+1"/> - <source>Send command to Bitcoin server</source> - <translation>傳é€æŒ‡ä»¤çµ¦ä½å…ƒå¹£ä¼ºæœå™¨</translation> + <location line="+6"/> + <source>Set database cache size in megabytes (%d to %d, default: %d)</source> + <translation>è¨å®šè³‡æ–™åº«å¿«å–大å°æ˜¯å¤šå°‘百è¬ä½å…ƒçµ„(MB，範åœ: %d 到 %d，é è¨å€¼: %d)</translation> </message> <message> - <location line="+7"/> + <location line="+2"/> <source>Set maximum block size in bytes (default: %d)</source> <translation>è¨å®šå€å¡Šå¤§å°ä¸Šé™æˆå¤šå°‘ä½å…ƒçµ„(é è¨å€¼: %d)</translation> </message> @@ -3659,17 +3788,17 @@ alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo.com</translat <translation>è¨å®šè™•ç† RPC æœå‹™è«‹æ±‚的執行緒數目(é è¨å€¼: 4)</translation> </message> <message> - <location line="+7"/> + <location line="+10"/> <source>Specify wallet file (within data directory)</source> <translation>指定錢包檔(會在資料目錄ä¸)</translation> </message> <message> <location line="+2"/> - <source>Start Bitcoin server</source> - <translation>å•Ÿå‹•ä½å…ƒå¹£ä¼ºæœå™¨</translation> + <source>Spend unconfirmed change when sending transactions (default: 1)</source> + <translation>傳é€äº¤æ˜“時å¯ä»¥èŠ±é‚„沒確èªçš„零錢(é è¨å€¼: 1)</translation> </message> <message> - <location line="+3"/> + <location line="+4"/> <source>This is intended for regression testing tools and app development.</source> <translation>這是è¨è¨ˆç”¨ä¾†çµ¦å›žæ¸æ¸¬è©¦å·¥å…·å’Œæ‡‰ç”¨ç¨‹å¼é–‹ç™¼ç”¨çš„。</translation> </message> @@ -3714,17 +3843,22 @@ alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo.com</translat <translation>改變 -txindex åƒæ•¸å¾Œï¼Œå¿…é ˆè¦ç”¨ -reindex åƒæ•¸ä¾†é‡å»ºè³‡æ–™åº«</translation> </message> <message> - <location line="-79"/> + <location line="-92"/> <source>Imports blocks from external blk000??.dat file</source> <translation>從其它來æºçš„ blk000??.dat 檔匯入å€å¡Š</translation> </message> <message> - <location line="-105"/> + <location line="-149"/> + <source>Cannot obtain a lock on data directory %s. Bitcoin Core is probably already running.</source> + <translation>沒辦法鎖定資料目錄 %s。ä½å…ƒå¹£æ ¸å¿ƒå¯èƒ½å·²ç¶“在執行了。</translation> + </message> + <message> + <location line="+22"/> <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> - <location line="+14"/> + <location line="+25"/> <source>Output debugging information (default: 0, supplying <category> is optional)</source> <translation>輸出除錯資訊(é è¨å€¼: 0, å¯ä»¥ä¸æŒ‡å®š <category>)</translation> </message> @@ -3734,19 +3868,14 @@ alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo.com</translat <translation>è¨å®šé«˜å„ªå…ˆåº¦æˆ–低手續費的交易資料大å°ä¸Šé™æˆå¤šå°‘ä½å…ƒçµ„(é è¨å€¼: %d)</translation> </message> <message> - <location line="+2"/> - <source>Set the number of script verification threads (up to 16, 0 = auto, <0 = leave that many cores free, default: 0)</source> - <translation>è¨å®šæŒ‡ä»¤ç¢¼é©—è‰çš„執行緒數目(最多為 16, 若為 0 表示程å¼è‡ªå‹•æ±ºå®šï¼Œå°æ–¼ 0 表示ä¿ç•™ä¸ç”¨çš„處ç†å™¨æ ¸å¿ƒæ•¸ç›®ï¼Œé è¨å€¼: 0)</translation> - </message> - <message> - <location line="+89"/> + <location line="+102"/> <source>Information</source> <translation>資訊</translation> </message> <message> <location line="+4"/> <source>Invalid amount for -minrelaytxfee=<amount>: '%s'</source> - <translation>è¨å®šæœ€å°‘è½‰ç™¼é‡‘é¡ -minrelaytxfee=<金é¡> 的金é¡ç„¡æ•ˆ: '%s'</translation> + <translation>è¨å®šæœ€ä½Žè½‰ç™¼æ‰‹çºŒè²» -minrelaytxfee=<金é¡> 的金é¡ç„¡æ•ˆ: '%s'</translation> </message> <message> <location line="+1"/> @@ -3754,7 +3883,17 @@ alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo.com</translat <translation>è¨å®š -mintxfee=<金é¡> 的金é¡ç„¡æ•ˆ: '%s'</translation> </message> <message> - <location line="+8"/> + <location line="+3"/> + <source>Limit size of signature cache to <n> entries (default: 50000)</source> + <translation>é™åˆ¶ç°½ç« å¿«å–大å°ç‚º <n> ç† (é è¨å€¼: 50000)</translation> + </message> + <message> + <location line="+6"/> + <source>Log transaction priority and fee per kB when mining blocks (default: 0)</source> + <translation>開採å€å¡Šçš„時候紀錄交易的優先度以åŠæ¯åƒä½å…ƒçµ„(kB)的手續費 (é è¨å€¼: 0)</translation> + </message> + <message> + <location line="+1"/> <source>Maintain a full transaction index (default: 0)</source> <translation>ç¶è·å…¨éƒ¨äº¤æ˜“的索引(é è¨å€¼: 0)</translation> </message> @@ -3779,12 +3918,52 @@ alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo.com</translat <translation>åªå’Œ <net> 網路上的節點連線(IPv4, IPv6, 或 Tor)</translation> </message> <message> - <location line="+9"/> + <location line="+4"/> + <source>Print block on startup, if found in block index</source> + <translation>啟動時輸出指定的å€å¡Šå…§å®¹ï¼Œå¦‚果有在å€å¡Šç´¢å¼•ä¸æ‰¾åˆ°çš„話</translation> + </message> + <message> + <location line="+1"/> + <source>Print block tree on startup (default: 0)</source> + <translation>啟動時輸出å€å¡Šæ¨¹ (é è¨å€¼: 0)</translation> + </message> + <message> + <location line="+1"/> + <source>RPC SSL options: (see the Bitcoin Wiki for SSL setup instructions)</source> + <translation>RPC SSL é¸é …: (SSL è¨å®šç¨‹åºè«‹è¦‹ Bitcoin Wiki)</translation> + </message> + <message> + <location line="+2"/> + <source>RPC server options:</source> + <translation>RPC 伺æœå™¨é¸é …:</translation> + </message> + <message> + <location line="+1"/> + <source>Randomly drop 1 of every <n> network messages</source> + <translation>隨機丟掉 <n> 分之一的網路訊æ¯</translation> + </message> + <message> + <location line="+1"/> + <source>Randomly fuzz 1 of every <n> network messages</source> + <translation>隨機亂動 <n> 分之一的網路訊æ¯è£¡çš„資料</translation> + </message> + <message> + <location line="+4"/> + <source>Run a thread to flush wallet periodically (default: 1)</source> + <translation>啟用定期將變動寫入錢包檔的執行緒 (é è¨å€¼: 1)</translation> + </message> + <message> + <location line="+2"/> <source>SSL options: (see the Bitcoin Wiki for SSL setup instructions)</source> <translation>SSL é¸é …: (SSL è¨å®šç¨‹åºè«‹è¦‹ Bitcoin Wiki)</translation> </message> <message> - <location line="+4"/> + <location line="+2"/> + <source>Send command to Bitcoin Core</source> + <translation>傳é€æŒ‡ä»¤çµ¦ä½å…ƒå¹£æ ¸å¿ƒ</translation> + </message> + <message> + <location line="+2"/> <source>Send trace/debug info to console instead of debug.log file</source> <translation>在終端機顯示追蹤或除錯資訊，而ä¸æ˜¯å¯«åˆ°æª”案 debug.log ä¸</translation> </message> @@ -3795,6 +3974,21 @@ alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo.com</translat </message> <message> <location line="+2"/> + <source>Sets the DB_PRIVATE flag in the wallet db environment (default: 1)</source> + <translation>在錢包資料庫環境變數è¨å®š DB_PRIVATE 旗標 (é è¨å€¼: 1)</translation> + </message> + <message> + <location line="+1"/> + <source>Show all debugging options (usage: --help -help-debug)</source> + <translation>顯示所有的除錯é¸é … (用法: --help --help-debug)</translation> + </message> + <message> + <location line="+1"/> + <source>Show benchmark information (default: 0)</source> + <translation>顯示效能評比資訊 (é è¨å€¼: 0)</translation> + </message> + <message> + <location line="+1"/> <source>Shrink debug.log file on client startup (default: 1 when no -debug)</source> <translation>客戶端軟體啓動時把 debug.log 檔縮å°(é è¨å€¼: 當沒有 -debug 時為 1)</translation> </message> @@ -3810,6 +4004,11 @@ alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo.com</translat </message> <message> <location line="+6"/> + <source>Start Bitcoin Core Daemon</source> + <translation>å•Ÿå‹•ä½å…ƒå¹£æ ¸å¿ƒè·éˆ</translation> + </message> + <message> + <location line="+1"/> <source>System error: </source> <translation>系統錯誤:</translation> </message> @@ -3831,12 +4030,12 @@ alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo.com</translat <message> <location line="+8"/> <source>Use UPnP to map the listening port (default: 0)</source> - <translation>是å¦è¦ä½¿ç”¨é€šç”¨å³æ’å³ç”¨(UPnP)å”定，來è¨å®šè½å€™é€£ç·šçš„é€šè¨ŠåŸ çš„å°æ‡‰(é è¨å€¼: 0)</translation> + <translation>是å¦è¦ä½¿ç”¨ã€Œé€šç”¨å³æ’å³ç”¨ã€å”定(UPnP)，來è¨å®šè½å€™é€£ç·šçš„é€šè¨ŠåŸ çš„å°æ‡‰(é è¨å€¼: 0)</translation> </message> <message> <location line="+1"/> <source>Use UPnP to map the listening port (default: 1 when listening)</source> - <translation>是å¦è¦ä½¿ç”¨é€šç”¨å³æ’å³ç”¨(UPnP)å”定，來è¨å®šè½å€™é€£ç·šçš„é€šè¨ŠåŸ çš„å°æ‡‰(é è¨å€¼: 當有è½å€™é€£ç·šæ™‚為 1)</translation> + <translation>是å¦è¦ä½¿ç”¨ã€Œé€šç”¨å³æ’å³ç”¨ã€å”定(UPnP)，來è¨å®šè½å€™é€£ç·šçš„é€šè¨ŠåŸ çš„å°æ‡‰(é è¨å€¼: 當有è½å€™é€£ç·šæ™‚為 1)</translation> </message> <message> <location line="+2"/> @@ -3855,6 +4054,16 @@ alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo.com</translat </message> <message> <location line="+2"/> + <source>Zapping all transactions from wallet...</source> + <translation>æ£åœ¨ç 掉錢包ä¸çš„所有交易...</translation> + </message> + <message> + <location line="+1"/> + <source>on startup</source> + <translation>當啟動時</translation> + </message> + <message> + <location line="+1"/> <source>version</source> <translation>版本</translation> </message> @@ -3864,47 +4073,47 @@ alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo.com</translat <translation>錢包檔 weallet.dat 壞掉了，拯救失敗</translation> </message> <message> - <location line="-58"/> + <location line="-71"/> <source>Password for JSON-RPC connections</source> <translation>JSON-RPC 連線密碼</translation> </message> <message> - <location line="-70"/> + <location line="-77"/> <source>Allow JSON-RPC connections from specified IP address</source> <translation>å…è¨±æŒ‡å®šçš„ä¾†æº IP ä½å€é€²è¡Œ JSON-RPC 連線</translation> </message> <message> - <location line="+80"/> + <location line="+94"/> <source>Send commands to node running on <ip> (default: 127.0.0.1)</source> <translation>傳é€æŒ‡ä»¤çµ¦åœ¨ <ip> 的節點(é è¨å€¼: 127.0.0.1)</translation> </message> <message> - <location line="-132"/> + <location line="-163"/> <source>Execute command when the best block changes (%s in cmd is replaced by block hash)</source> <translation>當最新å€å¡Šæ”¹è®Šæ™‚è¦åŸ·è¡Œçš„指令(指令ä¸çš„ %s 會被å–代æˆå€å¡Šé›œæ¹Šå€¼)</translation> </message> <message> - <location line="+161"/> + <location line="+196"/> <source>Upgrade wallet to latest format</source> <translation>把錢包檔案å‡ç´šæˆæœ€æ–°çš„æ ¼å¼</translation> </message> <message> - <location line="-24"/> + <location line="-28"/> <source>Set key pool size to <n> (default: 100)</source> <translation>è¨å®šå¯†é‘°æ± 大å°æˆ <n> (é è¨å€¼: 100)</translation> </message> <message> - <location line="-11"/> + <location line="-12"/> <source>Rescan the block chain for missing wallet transactions</source> <translation>é‡æ–°æŽƒæå€å¡Šéˆï¼Œä¾†å°‹æ‰¾éŒ¢åŒ…å¯èƒ½æ¼æŽ‰çš„交易。</translation> </message> <message> - <location line="+38"/> + <location line="+43"/> <source>Use OpenSSL (https) for JSON-RPC connections</source> <translation>在 JSON-RPC 連線使用 OpenSSL (https)</translation> </message> <message> - <location line="-30"/> + <location line="-34"/> <source>Server certificate file (default: server.cert)</source> <translation>伺æœå™¨æ†‘è‰æª”(é è¨å€¼: server.cert)</translation> </message> @@ -3914,7 +4123,7 @@ alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo.com</translat <translation>伺æœå™¨ç§é‘°æª”(é è¨å€¼: server.pem)</translation> </message> <message> - <location line="+16"/> + <location line="+20"/> <source>This help message</source> <translation>這些說明訊æ¯</translation> </message> @@ -3924,17 +4133,17 @@ alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo.com</translat <translation>沒辦法和這å°é›»è…¦ä¸Šçš„ %s 繫çµ(回傳錯誤 %d, %s)</translation> </message> <message> - <location line="-107"/> + <location line="-125"/> <source>Allow DNS lookups for -addnode, -seednode and -connect</source> <translation>å…è¨±å° -addnode, -seednode, -connect çš„åƒæ•¸ä½¿ç”¨åŸŸå查詢 </translation> </message> <message> - <location line="+60"/> + <location line="+66"/> <source>Loading addresses...</source> <translation>æ£åœ¨è¼‰å…¥ä½å€è³‡æ–™...</translation> </message> <message> - <location line="-37"/> + <location line="-39"/> <source>Error loading wallet.dat: Wallet corrupted</source> <translation>載入檔案 wallet.dat 時發生錯誤: 錢包æ毀了</translation> </message> @@ -3944,22 +4153,22 @@ alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo.com</translat <translation>載入 wallet.dat 檔案時發生錯誤: 這個錢包需è¦æ–°ç‰ˆçš„ä½å…ƒå¹£è»Ÿé«”</translation> </message> <message> - <location line="+98"/> + <location line="+112"/> <source>Wallet needed to be rewritten: restart Bitcoin to complete</source> <translation>錢包需è¦é‡å¯«: è«‹é‡æ–°å•“å‹•ä½å…ƒå¹£è»Ÿé«”來完æˆ</translation> </message> <message> - <location line="-100"/> + <location line="-114"/> <source>Error loading wallet.dat</source> <translation>載入錢包檔 wallet.dat 時發生錯誤</translation> </message> <message> - <location line="+31"/> + <location line="+32"/> <source>Invalid -proxy address: '%s'</source> <translation>無效的 -proxy ä½å€: '%s'</translation> </message> <message> - <location line="+56"/> + <location line="+69"/> <source>Unknown network specified in -onlynet: '%s'</source> <translation>在 -onlynet 指定了ä¸æ˜Žçš„網路別: '%s'</translation> </message> @@ -3969,7 +4178,7 @@ alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo.com</translat <translation>在 -socks 指定了ä¸æ˜Žçš„代ç†å”定版本: %i</translation> </message> <message> - <location line="-101"/> + <location line="-119"/> <source>Cannot resolve -bind address: '%s'</source> <translation>æ²’è¾¦æ³•è§£æž -bind ä½å€: '%s'</translation> </message> @@ -3979,7 +4188,7 @@ alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo.com</translat <translation>æ²’è¾¦æ³•è§£æž -externalip ä½å€: '%s'</translation> </message> <message> - <location line="+48"/> + <location line="+53"/> <source>Invalid amount for -paytxfee=<amount>: '%s'</source> <translation>è¨å®š -paytxfee=<金é¡> 的金é¡ç„¡æ•ˆ: '%s'</translation> </message> @@ -3994,27 +4203,22 @@ alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo.com</translat <translation>ç´¯ç©é‡‘é¡ä¸è¶³</translation> </message> <message> - <location line="+10"/> + <location line="+11"/> <source>Loading block index...</source> <translation>æ£åœ¨è¼‰å…¥å€å¡Šç´¢å¼•...</translation> </message> <message> - <location line="-62"/> + <location line="-68"/> <source>Add a node to connect to and attempt to keep the connection open</source> <translation>å¢žåŠ ä¸€å€‹è¦é€£ç·šçš„節線，並試著ä¿æŒå°å®ƒçš„連線暢通</translation> </message> <message> - <location line="-32"/> - <source>Unable to bind to %s on this computer. Bitcoin is probably already running.</source> - <translation>沒辦法和這å°é›»è…¦ä¸Šçš„ %s 繫çµã€‚也許ä½å…ƒå¹£è»Ÿé«”已經在執行了。</translation> - </message> - <message> - <location line="+95"/> + <location line="+69"/> <source>Loading wallet...</source> <translation>æ£åœ¨è¼‰å…¥éŒ¢åŒ…資料...</translation> </message> <message> - <location line="-56"/> + <location line="-62"/> <source>Cannot downgrade wallet</source> <translation>æ²’è¾¦æ³•æŠŠéŒ¢åŒ…æ ¼å¼é™ç´š</translation> </message> @@ -4024,27 +4228,27 @@ alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo.com</translat <translation>沒辦法把é è¨ä½å€å¯«é€²åŽ»</translation> </message> <message> - <location line="+67"/> + <location line="+80"/> <source>Rescanning...</source> <translation>æ£åœ¨é‡æ–°æŽƒæ...</translation> </message> <message> - <location line="-58"/> + <location line="-67"/> <source>Done loading</source> <translation>載入完æˆ</translation> </message> <message> - <location line="+85"/> + <location line="+99"/> <source>To use the %s option</source> <translation>為了è¦ä½¿ç”¨ %s é¸é …</translation> </message> <message> - <location line="-77"/> + <location line="-91"/> <source>Error</source> <translation>錯誤</translation> </message> <message> - <location line="-35"/> + <location line="-41"/> <source>You must set rpcpassword=<password> in the configuration file: %s If the file does not exist, create it with owner-readable-only file permissions.</source> diff --git a/src/qt/optionsdialog.cpp b/src/qt/optionsdialog.cpp index 394b5f3aea..96464d2cc0 100644 --- a/src/qt/optionsdialog.cpp +++ b/src/qt/optionsdialog.cpp @@ -96,6 +96,9 @@ OptionsDialog::OptionsDialog(QWidget *parent) : #endif } } +#if QT_VERSION >= 0x040700 + ui->thirdPartyTxUrls->setPlaceholderText("https://example.com/tx/%s"); +#endif ui->unit->setModel(new BitcoinUnits(this)); ui->transactionFee->setSingleStep(CTransaction::nMinTxFee); @@ -151,6 +154,7 @@ void OptionsDialog::setModel(OptionsModel *model) connect(ui->connectSocks, SIGNAL(clicked(bool)), this, SLOT(showRestartWarning())); /* Display */ connect(ui->lang, SIGNAL(valueChanged()), this, SLOT(showRestartWarning())); + connect(ui->thirdPartyTxUrls, SIGNAL(textChanged(const QString &)), this, SLOT(showRestartWarning())); } void OptionsDialog::setMapper() @@ -183,6 +187,7 @@ void OptionsDialog::setMapper() mapper->addMapping(ui->lang, OptionsModel::Language); mapper->addMapping(ui->unit, OptionsModel::DisplayUnit); mapper->addMapping(ui->displayAddresses, OptionsModel::DisplayAddresses); + mapper->addMapping(ui->thirdPartyTxUrls, OptionsModel::ThirdPartyTxUrls); } void OptionsDialog::enableOkButton() diff --git a/src/qt/optionsmodel.cpp b/src/qt/optionsmodel.cpp index 9abe9351bb..74c6b10ce2 100644 --- a/src/qt/optionsmodel.cpp +++ b/src/qt/optionsmodel.cpp @@ -63,6 +63,10 @@ void OptionsModel::Init() settings.setValue("bDisplayAddresses", false); bDisplayAddresses = settings.value("bDisplayAddresses", false).toBool(); + if (!settings.contains("strThirdPartyTxUrls")) + settings.setValue("strThirdPartyTxUrls", ""); + strThirdPartyTxUrls = settings.value("strThirdPartyTxUrls", "").toString(); + if (!settings.contains("fCoinControlFeatures")) settings.setValue("fCoinControlFeatures", false); fCoinControlFeatures = settings.value("fCoinControlFeatures", false).toBool(); @@ -203,6 +207,8 @@ QVariant OptionsModel::data(const QModelIndex & index, int role) const return nDisplayUnit; case DisplayAddresses: return bDisplayAddresses; + case ThirdPartyTxUrls: + return strThirdPartyTxUrls; case Language: return settings.value("language"); case CoinControlFeatures: @@ -304,6 +310,13 @@ bool OptionsModel::setData(const QModelIndex & index, const QVariant & value, in bDisplayAddresses = value.toBool(); settings.setValue("bDisplayAddresses", bDisplayAddresses); break; + case ThirdPartyTxUrls: + if (strThirdPartyTxUrls != value.toString()) { + strThirdPartyTxUrls = value.toString(); + settings.setValue("strThirdPartyTxUrls", strThirdPartyTxUrls); + setRestartRequired(true); + } + break; case Language: if (settings.value("language") != value) { settings.setValue("language", value); diff --git a/src/qt/optionsmodel.h b/src/qt/optionsmodel.h index ece5ef78a4..f05e3e92de 100644 --- a/src/qt/optionsmodel.h +++ b/src/qt/optionsmodel.h @@ -36,6 +36,7 @@ public: Fee, // qint64 DisplayUnit, // BitcoinUnits::Unit DisplayAddresses, // bool + ThirdPartyTxUrls, // QString Language, // QString CoinControlFeatures, // bool ThreadsScriptVerif, // int @@ -56,6 +57,7 @@ public: bool getMinimizeOnClose() { return fMinimizeOnClose; } int getDisplayUnit() { return nDisplayUnit; } bool getDisplayAddresses() { return bDisplayAddresses; } + QString getThirdPartyTxUrls() { return strThirdPartyTxUrls; } bool getProxySettings(QNetworkProxy& proxy) const; bool getCoinControlFeatures() { return fCoinControlFeatures; } const QString& getOverriddenByCommandLine() { return strOverriddenByCommandLine; } @@ -71,6 +73,7 @@ private: QString language; int nDisplayUnit; bool bDisplayAddresses; + QString strThirdPartyTxUrls; bool fCoinControlFeatures; /* settings that were overriden by command-line */ QString strOverriddenByCommandLine; diff --git a/src/qt/transactiondesc.cpp b/src/qt/transactiondesc.cpp index 4aebaa1e7f..45fb3d40c2 100644 --- a/src/qt/transactiondesc.cpp +++ b/src/qt/transactiondesc.cpp @@ -20,6 +20,7 @@ QString TransactionDesc::FormatTxStatus(const CWalletTx& wtx) { + AssertLockHeld(cs_main); if (!IsFinalTx(wtx, chainActive.Height() + 1)) { if (wtx.nLockTime < LOCKTIME_THRESHOLD) @@ -45,263 +46,258 @@ QString TransactionDesc::toHTML(CWallet *wallet, CWalletTx &wtx, int vout, int u { QString strHTML; + LOCK2(cs_main, wallet->cs_wallet); + strHTML.reserve(4000); + strHTML += "<html><font face='verdana, arial, helvetica, sans-serif'>"; + + int64_t nTime = wtx.GetTxTime(); + int64_t nCredit = wtx.GetCredit(); + int64_t nDebit = wtx.GetDebit(); + int64_t nNet = nCredit - nDebit; + + strHTML += "<b>" + tr("Status") + ":</b> " + FormatTxStatus(wtx); + int nRequests = wtx.GetRequestCount(); + if (nRequests != -1) { - LOCK(wallet->cs_wallet); - strHTML.reserve(4000); - strHTML += "<html><font face='verdana, arial, helvetica, sans-serif'>"; - - int64_t nTime = wtx.GetTxTime(); - int64_t nCredit = wtx.GetCredit(); - int64_t nDebit = wtx.GetDebit(); - int64_t nNet = nCredit - nDebit; - - strHTML += "<b>" + tr("Status") + ":</b> " + FormatTxStatus(wtx); - int nRequests = wtx.GetRequestCount(); - if (nRequests != -1) - { - if (nRequests == 0) - strHTML += tr(", has not been successfully broadcast yet"); - else if (nRequests > 0) - strHTML += tr(", broadcast through %n node(s)", "", nRequests); - } - strHTML += "<br>"; + if (nRequests == 0) + strHTML += tr(", has not been successfully broadcast yet"); + else if (nRequests > 0) + strHTML += tr(", broadcast through %n node(s)", "", nRequests); + } + strHTML += "<br>"; - strHTML += "<b>" + tr("Date") + ":</b> " + (nTime ? GUIUtil::dateTimeStr(nTime) : "") + "<br>"; + strHTML += "<b>" + tr("Date") + ":</b> " + (nTime ? GUIUtil::dateTimeStr(nTime) : "") + "<br>"; - // - // From - // - if (wtx.IsCoinBase()) - { - strHTML += "<b>" + tr("Source") + ":</b> " + tr("Generated") + "<br>"; - } - else if (wtx.mapValue.count("from") && !wtx.mapValue["from"].empty()) - { - // Online transaction - strHTML += "<b>" + tr("From") + ":</b> " + GUIUtil::HtmlEscape(wtx.mapValue["from"]) + "<br>"; - } - else + // + // From + // + if (wtx.IsCoinBase()) + { + strHTML += "<b>" + tr("Source") + ":</b> " + tr("Generated") + "<br>"; + } + else if (wtx.mapValue.count("from") && !wtx.mapValue["from"].empty()) + { + // Online transaction + strHTML += "<b>" + tr("From") + ":</b> " + GUIUtil::HtmlEscape(wtx.mapValue["from"]) + "<br>"; + } + else + { + // Offline transaction + if (nNet > 0) { - // Offline transaction - if (nNet > 0) + // Credit + BOOST_FOREACH(const CTxOut& txout, wtx.vout) { - // Credit - BOOST_FOREACH(const CTxOut& txout, wtx.vout) + if (wallet->IsMine(txout)) { - if (wallet->IsMine(txout)) + CTxDestination address; + if (ExtractDestination(txout.scriptPubKey, address) && IsMine(*wallet, address)) { - CTxDestination address; - if (ExtractDestination(txout.scriptPubKey, address) && IsMine(*wallet, address)) + if (wallet->mapAddressBook.count(address)) { - if (wallet->mapAddressBook.count(address)) - { - strHTML += "<b>" + tr("From") + ":</b> " + tr("unknown") + "<br>"; - strHTML += "<b>" + tr("To") + ":</b> "; - strHTML += GUIUtil::HtmlEscape(CBitcoinAddress(address).ToString()); - if (!wallet->mapAddressBook[address].name.empty()) - strHTML += " (" + tr("own address") + ", " + tr("label") + ": " + GUIUtil::HtmlEscape(wallet->mapAddressBook[address].name) + ")"; - else - strHTML += " (" + tr("own address") + ")"; - strHTML += "<br>"; - } + strHTML += "<b>" + tr("From") + ":</b> " + tr("unknown") + "<br>"; + strHTML += "<b>" + tr("To") + ":</b> "; + strHTML += GUIUtil::HtmlEscape(CBitcoinAddress(address).ToString()); + if (!wallet->mapAddressBook[address].name.empty()) + strHTML += " (" + tr("own address") + ", " + tr("label") + ": " + GUIUtil::HtmlEscape(wallet->mapAddressBook[address].name) + ")"; + else + strHTML += " (" + tr("own address") + ")"; + strHTML += "<br>"; } - break; } + break; } } } + } + + // + // To + // + if (wtx.mapValue.count("to") && !wtx.mapValue["to"].empty()) + { + // Online transaction + std::string strAddress = wtx.mapValue["to"]; + strHTML += "<b>" + tr("To") + ":</b> "; + CTxDestination dest = CBitcoinAddress(strAddress).Get(); + if (wallet->mapAddressBook.count(dest) && !wallet->mapAddressBook[dest].name.empty()) + strHTML += GUIUtil::HtmlEscape(wallet->mapAddressBook[dest].name) + " "; + strHTML += GUIUtil::HtmlEscape(strAddress) + "<br>"; + } + // + // Amount + // + if (wtx.IsCoinBase() && nCredit == 0) + { // - // To + // Coinbase // - if (wtx.mapValue.count("to") && !wtx.mapValue["to"].empty()) - { - // Online transaction - std::string strAddress = wtx.mapValue["to"]; - strHTML += "<b>" + tr("To") + ":</b> "; - CTxDestination dest = CBitcoinAddress(strAddress).Get(); - if (wallet->mapAddressBook.count(dest) && !wallet->mapAddressBook[dest].name.empty()) - strHTML += GUIUtil::HtmlEscape(wallet->mapAddressBook[dest].name) + " "; - strHTML += GUIUtil::HtmlEscape(strAddress) + "<br>"; - } - + int64_t nUnmatured = 0; + BOOST_FOREACH(const CTxOut& txout, wtx.vout) + nUnmatured += wallet->GetCredit(txout); + strHTML += "<b>" + tr("Credit") + ":</b> "; + if (wtx.IsInMainChain()) + strHTML += BitcoinUnits::formatWithUnit(unit, nUnmatured)+ " (" + tr("matures in %n more block(s)", "", wtx.GetBlocksToMaturity()) + ")"; + else + strHTML += "(" + tr("not accepted") + ")"; + strHTML += "<br>"; + } + else if (nNet > 0) + { // - // Amount + // Credit // - if (wtx.IsCoinBase() && nCredit == 0) - { - // - // Coinbase - // - int64_t nUnmatured = 0; - BOOST_FOREACH(const CTxOut& txout, wtx.vout) - nUnmatured += wallet->GetCredit(txout); - strHTML += "<b>" + tr("Credit") + ":</b> "; - if (wtx.IsInMainChain()) - strHTML += BitcoinUnits::formatWithUnit(unit, nUnmatured)+ " (" + tr("matures in %n more block(s)", "", wtx.GetBlocksToMaturity()) + ")"; - else - strHTML += "(" + tr("not accepted") + ")"; - strHTML += "<br>"; - } - else if (nNet > 0) + strHTML += "<b>" + tr("Credit") + ":</b> " + BitcoinUnits::formatWithUnit(unit, nNet) + "<br>"; + } + else + { + bool fAllFromMe = true; + BOOST_FOREACH(const CTxIn& txin, wtx.vin) + fAllFromMe = fAllFromMe && wallet->IsMine(txin); + + bool fAllToMe = true; + BOOST_FOREACH(const CTxOut& txout, wtx.vout) + fAllToMe = fAllToMe && wallet->IsMine(txout); + + if (fAllFromMe) { // - // Credit + // Debit // - strHTML += "<b>" + tr("Credit") + ":</b> " + BitcoinUnits::formatWithUnit(unit, nNet) + "<br>"; - } - else - { - bool fAllFromMe = true; - BOOST_FOREACH(const CTxIn& txin, wtx.vin) - fAllFromMe = fAllFromMe && wallet->IsMine(txin); - - bool fAllToMe = true; BOOST_FOREACH(const CTxOut& txout, wtx.vout) - fAllToMe = fAllToMe && wallet->IsMine(txout); - - if (fAllFromMe) { - // - // Debit - // - BOOST_FOREACH(const CTxOut& txout, wtx.vout) - { - if (wallet->IsMine(txout)) - continue; + if (wallet->IsMine(txout)) + continue; - if (!wtx.mapValue.count("to") || wtx.mapValue["to"].empty()) + if (!wtx.mapValue.count("to") || wtx.mapValue["to"].empty()) + { + // Offline transaction + CTxDestination address; + if (ExtractDestination(txout.scriptPubKey, address)) { - // Offline transaction - CTxDestination address; - if (ExtractDestination(txout.scriptPubKey, address)) - { - strHTML += "<b>" + tr("To") + ":</b> "; - if (wallet->mapAddressBook.count(address) && !wallet->mapAddressBook[address].name.empty()) - strHTML += GUIUtil::HtmlEscape(wallet->mapAddressBook[address].name) + " "; - strHTML += GUIUtil::HtmlEscape(CBitcoinAddress(address).ToString()); - strHTML += "<br>"; - } + strHTML += "<b>" + tr("To") + ":</b> "; + if (wallet->mapAddressBook.count(address) && !wallet->mapAddressBook[address].name.empty()) + strHTML += GUIUtil::HtmlEscape(wallet->mapAddressBook[address].name) + " "; + strHTML += GUIUtil::HtmlEscape(CBitcoinAddress(address).ToString()); + strHTML += "<br>"; } - - strHTML += "<b>" + tr("Debit") + ":</b> " + BitcoinUnits::formatWithUnit(unit, -txout.nValue) + "<br>"; - } - - if (fAllToMe) - { - // Payment to self - int64_t nChange = wtx.GetChange(); - int64_t nValue = nCredit - nChange; - strHTML += "<b>" + tr("Debit") + ":</b> " + BitcoinUnits::formatWithUnit(unit, -nValue) + "<br>"; - strHTML += "<b>" + tr("Credit") + ":</b> " + BitcoinUnits::formatWithUnit(unit, nValue) + "<br>"; } - int64_t nTxFee = nDebit - wtx.GetValueOut(); - if (nTxFee > 0) - strHTML += "<b>" + tr("Transaction fee") + ":</b> " + BitcoinUnits::formatWithUnit(unit, -nTxFee) + "<br>"; + strHTML += "<b>" + tr("Debit") + ":</b> " + BitcoinUnits::formatWithUnit(unit, -txout.nValue) + "<br>"; } - else + + if (fAllToMe) { - // - // Mixed debit transaction - // - BOOST_FOREACH(const CTxIn& txin, wtx.vin) - if (wallet->IsMine(txin)) - strHTML += "<b>" + tr("Debit") + ":</b> " + BitcoinUnits::formatWithUnit(unit, -wallet->GetDebit(txin)) + "<br>"; - BOOST_FOREACH(const CTxOut& txout, wtx.vout) - if (wallet->IsMine(txout)) - strHTML += "<b>" + tr("Credit") + ":</b> " + BitcoinUnits::formatWithUnit(unit, wallet->GetCredit(txout)) + "<br>"; + // Payment to self + int64_t nChange = wtx.GetChange(); + int64_t nValue = nCredit - nChange; + strHTML += "<b>" + tr("Debit") + ":</b> " + BitcoinUnits::formatWithUnit(unit, -nValue) + "<br>"; + strHTML += "<b>" + tr("Credit") + ":</b> " + BitcoinUnits::formatWithUnit(unit, nValue) + "<br>"; } + + int64_t nTxFee = nDebit - wtx.GetValueOut(); + if (nTxFee > 0) + strHTML += "<b>" + tr("Transaction fee") + ":</b> " + BitcoinUnits::formatWithUnit(unit, -nTxFee) + "<br>"; } + else + { + // + // Mixed debit transaction + // + BOOST_FOREACH(const CTxIn& txin, wtx.vin) + if (wallet->IsMine(txin)) + strHTML += "<b>" + tr("Debit") + ":</b> " + BitcoinUnits::formatWithUnit(unit, -wallet->GetDebit(txin)) + "<br>"; + BOOST_FOREACH(const CTxOut& txout, wtx.vout) + if (wallet->IsMine(txout)) + strHTML += "<b>" + tr("Credit") + ":</b> " + BitcoinUnits::formatWithUnit(unit, wallet->GetCredit(txout)) + "<br>"; + } + } - strHTML += "<b>" + tr("Net amount") + ":</b> " + BitcoinUnits::formatWithUnit(unit, nNet, true) + "<br>"; + strHTML += "<b>" + tr("Net amount") + ":</b> " + BitcoinUnits::formatWithUnit(unit, nNet, true) + "<br>"; - // - // Message - // - if (wtx.mapValue.count("message") && !wtx.mapValue["message"].empty()) - strHTML += "<br><b>" + tr("Message") + ":</b><br>" + GUIUtil::HtmlEscape(wtx.mapValue["message"], true) + "<br>"; - if (wtx.mapValue.count("comment") && !wtx.mapValue["comment"].empty()) - strHTML += "<br><b>" + tr("Comment") + ":</b><br>" + GUIUtil::HtmlEscape(wtx.mapValue["comment"], true) + "<br>"; + // + // Message + // + if (wtx.mapValue.count("message") && !wtx.mapValue["message"].empty()) + strHTML += "<br><b>" + tr("Message") + ":</b><br>" + GUIUtil::HtmlEscape(wtx.mapValue["message"], true) + "<br>"; + if (wtx.mapValue.count("comment") && !wtx.mapValue["comment"].empty()) + strHTML += "<br><b>" + tr("Comment") + ":</b><br>" + GUIUtil::HtmlEscape(wtx.mapValue["comment"], true) + "<br>"; - strHTML += "<b>" + tr("Transaction ID") + ":</b> " + TransactionRecord::formatSubTxId(wtx.GetHash(), vout) + "<br>"; + strHTML += "<b>" + tr("Transaction ID") + ":</b> " + TransactionRecord::formatSubTxId(wtx.GetHash(), vout) + "<br>"; - // Message from normal bitcoin:URI (bitcoin:123...?message=example) - foreach (const PAIRTYPE(string, string)& r, wtx.vOrderForm) - if (r.first == "Message") - strHTML += "<br><b>" + tr("Message") + ":</b><br>" + GUIUtil::HtmlEscape(r.second, true) + "<br>"; + // Message from normal bitcoin:URI (bitcoin:123...?message=example) + foreach (const PAIRTYPE(string, string)& r, wtx.vOrderForm) + if (r.first == "Message") + strHTML += "<br><b>" + tr("Message") + ":</b><br>" + GUIUtil::HtmlEscape(r.second, true) + "<br>"; - // - // PaymentRequest info: - // - foreach (const PAIRTYPE(string, string)& r, wtx.vOrderForm) + // + // PaymentRequest info: + // + foreach (const PAIRTYPE(string, string)& r, wtx.vOrderForm) + { + if (r.first == "PaymentRequest") { - if (r.first == "PaymentRequest") - { - PaymentRequestPlus req; - req.parse(QByteArray::fromRawData(r.second.data(), r.second.size())); - QString merchant; - if (req.getMerchant(PaymentServer::getCertStore(), merchant)) - strHTML += "<b>" + tr("Merchant") + ":</b> " + GUIUtil::HtmlEscape(merchant) + "<br>"; - } + PaymentRequestPlus req; + req.parse(QByteArray::fromRawData(r.second.data(), r.second.size())); + QString merchant; + if (req.getMerchant(PaymentServer::getCertStore(), merchant)) + strHTML += "<b>" + tr("Merchant") + ":</b> " + GUIUtil::HtmlEscape(merchant) + "<br>"; } + } - if (wtx.IsCoinBase()) - { - quint32 numBlocksToMaturity = COINBASE_MATURITY + 1; - strHTML += "<br>" + tr("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.").arg(QString::number(numBlocksToMaturity)) + "<br>"; - } + if (wtx.IsCoinBase()) + { + quint32 numBlocksToMaturity = COINBASE_MATURITY + 1; + strHTML += "<br>" + tr("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.").arg(QString::number(numBlocksToMaturity)) + "<br>"; + } - // - // Debug view - // - if (fDebug) - { - strHTML += "<hr><br>" + tr("Debug information") + "<br><br>"; - BOOST_FOREACH(const CTxIn& txin, wtx.vin) - if(wallet->IsMine(txin)) - strHTML += "<b>" + tr("Debit") + ":</b> " + BitcoinUnits::formatWithUnit(unit, -wallet->GetDebit(txin)) + "<br>"; - BOOST_FOREACH(const CTxOut& txout, wtx.vout) - if(wallet->IsMine(txout)) - strHTML += "<b>" + tr("Credit") + ":</b> " + BitcoinUnits::formatWithUnit(unit, wallet->GetCredit(txout)) + "<br>"; + // + // Debug view + // + if (fDebug) + { + strHTML += "<hr><br>" + tr("Debug information") + "<br><br>"; + BOOST_FOREACH(const CTxIn& txin, wtx.vin) + if(wallet->IsMine(txin)) + strHTML += "<b>" + tr("Debit") + ":</b> " + BitcoinUnits::formatWithUnit(unit, -wallet->GetDebit(txin)) + "<br>"; + BOOST_FOREACH(const CTxOut& txout, wtx.vout) + if(wallet->IsMine(txout)) + strHTML += "<b>" + tr("Credit") + ":</b> " + BitcoinUnits::formatWithUnit(unit, wallet->GetCredit(txout)) + "<br>"; + + strHTML += "<br><b>" + tr("Transaction") + ":</b><br>"; + strHTML += GUIUtil::HtmlEscape(wtx.ToString(), true); - strHTML += "<br><b>" + tr("Transaction") + ":</b><br>"; - strHTML += GUIUtil::HtmlEscape(wtx.ToString(), true); + strHTML += "<br><b>" + tr("Inputs") + ":</b>"; + strHTML += "<ul>"; - strHTML += "<br><b>" + tr("Inputs") + ":</b>"; - strHTML += "<ul>"; + BOOST_FOREACH(const CTxIn& txin, wtx.vin) + { + COutPoint prevout = txin.prevout; + CCoins prev; + if(pcoinsTip->GetCoins(prevout.hash, prev)) { - LOCK(wallet->cs_wallet); - BOOST_FOREACH(const CTxIn& txin, wtx.vin) + if (prevout.n < prev.vout.size()) { - COutPoint prevout = txin.prevout; - - CCoins prev; - if(pcoinsTip->GetCoins(prevout.hash, prev)) + strHTML += "<li>"; + const CTxOut &vout = prev.vout[prevout.n]; + CTxDestination address; + if (ExtractDestination(vout.scriptPubKey, address)) { - if (prevout.n < prev.vout.size()) - { - strHTML += "<li>"; - const CTxOut &vout = prev.vout[prevout.n]; - CTxDestination address; - if (ExtractDestination(vout.scriptPubKey, address)) - { - if (wallet->mapAddressBook.count(address) && !wallet->mapAddressBook[address].name.empty()) - strHTML += GUIUtil::HtmlEscape(wallet->mapAddressBook[address].name) + " "; - strHTML += QString::fromStdString(CBitcoinAddress(address).ToString()); - } - strHTML = strHTML + " " + tr("Amount") + "=" + BitcoinUnits::formatWithUnit(unit, vout.nValue); - strHTML = strHTML + " IsMine=" + (wallet->IsMine(vout) ? tr("true") : tr("false")) + "</li>"; - } + if (wallet->mapAddressBook.count(address) && !wallet->mapAddressBook[address].name.empty()) + strHTML += GUIUtil::HtmlEscape(wallet->mapAddressBook[address].name) + " "; + strHTML += QString::fromStdString(CBitcoinAddress(address).ToString()); } + strHTML = strHTML + " " + tr("Amount") + "=" + BitcoinUnits::formatWithUnit(unit, vout.nValue); + strHTML = strHTML + " IsMine=" + (wallet->IsMine(vout) ? tr("true") : tr("false")) + "</li>"; } } - - strHTML += "</ul>"; } - strHTML += "</font></html>"; + strHTML += "</ul>"; } + + strHTML += "</font></html>"; return strHTML; } diff --git a/src/qt/transactionrecord.cpp b/src/qt/transactionrecord.cpp index 703a2b4e79..5a3728f498 100644 --- a/src/qt/transactionrecord.cpp +++ b/src/qt/transactionrecord.cpp @@ -150,6 +150,7 @@ QList<TransactionRecord> TransactionRecord::decomposeTransaction(const CWallet * void TransactionRecord::updateStatus(const CWalletTx &wtx) { + AssertLockHeld(cs_main); // Determine transaction status // Find the block the tx is in @@ -234,6 +235,7 @@ void TransactionRecord::updateStatus(const CWalletTx &wtx) bool TransactionRecord::statusUpdateNeeded() { + AssertLockHeld(cs_main); return status.cur_num_blocks != chainActive.Height(); } diff --git a/src/qt/transactiontablemodel.cpp b/src/qt/transactiontablemodel.cpp index 959987461f..8cf2b0a1b1 100644 --- a/src/qt/transactiontablemodel.cpp +++ b/src/qt/transactiontablemodel.cpp @@ -24,7 +24,6 @@ #include <QDebug> #include <QIcon> #include <QList> -#include <QTimer> // Amount column is right-aligned it contains numbers static int column_alignments[] = { @@ -78,7 +77,7 @@ public: qDebug() << "TransactionTablePriv::refreshWallet"; cachedWallet.clear(); { - LOCK(wallet->cs_wallet); + LOCK2(cs_main, wallet->cs_wallet); for(std::map<uint256, CWalletTx>::iterator it = wallet->mapWallet.begin(); it != wallet->mapWallet.end(); ++it) { if(TransactionRecord::showTransaction(it->second)) @@ -96,7 +95,7 @@ public: { qDebug() << "TransactionTablePriv::updateWallet : " + QString::fromStdString(hash.ToString()) + " " + QString::number(status); { - LOCK(wallet->cs_wallet); + LOCK2(cs_main, wallet->cs_wallet); // Find transaction in wallet std::map<uint256, CWalletTx>::iterator mi = wallet->mapWallet.find(hash); @@ -187,13 +186,19 @@ public: { TransactionRecord *rec = &cachedWallet[idx]; + // Get required locks upfront. This avoids the GUI from getting + // stuck if the core is holding the locks for a longer time - for + // example, during a wallet rescan. + // // If a status update is needed (blocks came in since last check), // update the status of this transaction from the wallet. Otherwise, // simply re-use the cached status. - if(rec->statusUpdateNeeded()) + TRY_LOCK(cs_main, lockMain); + if(lockMain) { + TRY_LOCK(wallet->cs_wallet, lockWallet); + if(lockWallet && rec->statusUpdateNeeded()) { - LOCK(wallet->cs_wallet); std::map<uint256, CWalletTx>::iterator mi = wallet->mapWallet.find(rec->hash); if(mi != wallet->mapWallet.end()) @@ -213,7 +218,7 @@ public: QString describe(TransactionRecord *rec, int unit) { { - LOCK(wallet->cs_wallet); + LOCK2(cs_main, wallet->cs_wallet); std::map<uint256, CWalletTx>::iterator mi = wallet->mapWallet.find(rec->hash); if(mi != wallet->mapWallet.end()) { @@ -228,17 +233,12 @@ TransactionTableModel::TransactionTableModel(CWallet* wallet, WalletModel *paren QAbstractTableModel(parent), wallet(wallet), walletModel(parent), - priv(new TransactionTablePriv(wallet, this)), - cachedNumBlocks(0) + priv(new TransactionTablePriv(wallet, this)) { columns << QString() << tr("Date") << tr("Type") << tr("Address") << tr("Amount"); priv->refreshWallet(); - QTimer *timer = new QTimer(this); - connect(timer, SIGNAL(timeout()), this, SLOT(updateConfirmations())); - timer->start(MODEL_UPDATE_DELAY); - connect(walletModel->getOptionsModel(), SIGNAL(displayUnitChanged(int)), this, SLOT(updateDisplayUnit())); } @@ -257,16 +257,12 @@ void TransactionTableModel::updateTransaction(const QString &hash, int status) void TransactionTableModel::updateConfirmations() { - if(chainActive.Height() != cachedNumBlocks) - { - cachedNumBlocks = chainActive.Height(); - // Blocks came in since last poll. - // Invalidate status (number of confirmations) and (possibly) description - // for all rows. Qt is smart enough to only actually request the data for the - // visible rows. - emit dataChanged(index(0, Status), index(priv->size()-1, Status)); - emit dataChanged(index(0, ToAddress), index(priv->size()-1, ToAddress)); - } + // Blocks came in since last poll. + // Invalidate status (number of confirmations) and (possibly) description + // for all rows. Qt is smart enough to only actually request the data for the + // visible rows. + emit dataChanged(index(0, Status), index(priv->size()-1, Status)); + emit dataChanged(index(0, ToAddress), index(priv->size()-1, ToAddress)); } int TransactionTableModel::rowCount(const QModelIndex &parent) const @@ -568,6 +564,8 @@ QVariant TransactionTableModel::data(const QModelIndex &index, int role) const return rec->credit + rec->debit; case TxIDRole: return rec->getTxID(); + case TxHashRole: + return QString::fromStdString(rec->hash.ToString()); case ConfirmedRole: return rec->status.countsForBalance; case FormattedAmountRole: diff --git a/src/qt/transactiontablemodel.h b/src/qt/transactiontablemodel.h index 7b9cf09cbe..333e6bc6ed 100644 --- a/src/qt/transactiontablemodel.h +++ b/src/qt/transactiontablemodel.h @@ -50,6 +50,8 @@ public: AmountRole, /** Unique identifier */ TxIDRole, + /** Transaction hash */ + TxHashRole, /** Is transaction confirmed? */ ConfirmedRole, /** Formatted amount, without brackets when unconfirmed */ @@ -69,7 +71,6 @@ private: WalletModel *walletModel; QStringList columns; TransactionTablePriv *priv; - int cachedNumBlocks; QString lookupAddress(const std::string &address, bool tooltip) const; QVariant addressColor(const TransactionRecord *wtx) const; diff --git a/src/qt/transactionview.cpp b/src/qt/transactionview.cpp index a363150919..d4d29416ca 100644 --- a/src/qt/transactionview.cpp +++ b/src/qt/transactionview.cpp @@ -20,6 +20,7 @@ #include <QComboBox> #include <QDateTimeEdit> +#include <QDesktopServices> #include <QDoubleValidator> #include <QHBoxLayout> #include <QHeaderView> @@ -28,7 +29,9 @@ #include <QMenu> #include <QPoint> #include <QScrollBar> +#include <QSignalMapper> #include <QTableView> +#include <QUrl> #include <QVBoxLayout> TransactionView::TransactionView(QWidget *parent) : @@ -138,7 +141,11 @@ TransactionView::TransactionView(QWidget *parent) : contextMenu->addAction(editLabelAction); contextMenu->addAction(showDetailsAction); + mapperThirdPartyTxUrls = new QSignalMapper(this); + // Connect actions + connect(mapperThirdPartyTxUrls, SIGNAL(mapped(QString)), this, SLOT(openThirdPartyTxUrl(QString))); + connect(dateWidget, SIGNAL(activated(int)), this, SLOT(chooseDate(int))); connect(typeWidget, SIGNAL(activated(int)), this, SLOT(chooseType(int))); connect(addressWidget, SIGNAL(textChanged(QString)), this, SLOT(changedPrefix(QString))); @@ -183,6 +190,25 @@ void TransactionView::setModel(WalletModel *model) transactionView->setColumnWidth(TransactionTableModel::Amount, AMOUNT_MINIMUM_COLUMN_WIDTH); columnResizingFixer = new GUIUtil::TableViewLastColumnResizingFixer(transactionView, AMOUNT_MINIMUM_COLUMN_WIDTH, MINIMUM_COLUMN_WIDTH); + + if (model->getOptionsModel()) + { + // Add third party transaction URLs to context menu + QStringList listUrls = model->getOptionsModel()->getThirdPartyTxUrls().split("|", QString::SkipEmptyParts); + for (int i = 0; i < listUrls.size(); ++i) + { + QString host = QUrl(listUrls[i].trimmed(), QUrl::StrictMode).host(); + if (!host.isEmpty()) + { + QAction *thirdPartyTxUrlAction = new QAction(host, this); // use host as menu item label + if (i == 0) + contextMenu->addSeparator(); + contextMenu->addAction(thirdPartyTxUrlAction); + connect(thirdPartyTxUrlAction, SIGNAL(triggered()), mapperThirdPartyTxUrls, SLOT(map())); + mapperThirdPartyTxUrls->setMapping(thirdPartyTxUrlAction, listUrls[i].trimmed()); + } + } + } } } @@ -383,6 +409,15 @@ void TransactionView::showDetails() } } +void TransactionView::openThirdPartyTxUrl(QString url) +{ + if(!transactionView || !transactionView->selectionModel()) + return; + QModelIndexList selection = transactionView->selectionModel()->selectedRows(0); + if(!selection.isEmpty()) + QDesktopServices::openUrl(QUrl::fromUserInput(url.replace("%s", selection.at(0).data(TransactionTableModel::TxHashRole).toString()))); +} + QWidget *TransactionView::createDateRangeWidget() { dateRangeWidget = new QFrame(); diff --git a/src/qt/transactionview.h b/src/qt/transactionview.h index ef4f9d6f34..7a89fa11ca 100644 --- a/src/qt/transactionview.h +++ b/src/qt/transactionview.h @@ -19,6 +19,7 @@ class QFrame; class QLineEdit; class QMenu; class QModelIndex; +class QSignalMapper; class QTableView; QT_END_NAMESPACE @@ -65,6 +66,7 @@ private: QLineEdit *amountWidget; QMenu *contextMenu; + QSignalMapper *mapperThirdPartyTxUrls; QFrame *dateRangeWidget; QDateTimeEdit *dateFrom; @@ -85,6 +87,7 @@ private slots: void copyLabel(); void copyAmount(); void copyTxID(); + void openThirdPartyTxUrl(QString url); signals: void doubleClicked(const QModelIndex&); diff --git a/src/qt/walletmodel.cpp b/src/qt/walletmodel.cpp index 424c9ee279..37d82ec063 100644 --- a/src/qt/walletmodel.cpp +++ b/src/qt/walletmodel.cpp @@ -98,11 +98,24 @@ void WalletModel::updateStatus() void WalletModel::pollBalanceChanged() { + // Get required locks upfront. This avoids the GUI from getting stuck on + // periodical polls if the core is holding the locks for a longer time - + // for example, during a wallet rescan. + TRY_LOCK(cs_main, lockMain); + if(!lockMain) + return; + TRY_LOCK(wallet->cs_wallet, lockWallet); + if(!lockWallet) + return; + if(chainActive.Height() != cachedNumBlocks) { // Balance and number of transactions might have changed cachedNumBlocks = chainActive.Height(); + checkBalanceChanged(); + if(transactionTableModel) + transactionTableModel->updateConfirmations(); } } @@ -520,7 +533,7 @@ bool WalletModel::getPubKey(const CKeyID &address, CPubKey& vchPubKeyOut) const // returns a list of COutputs from COutPoints void WalletModel::getOutputs(const std::vector<COutPoint>& vOutpoints, std::vector<COutput>& vOutputs) { - LOCK(wallet->cs_wallet); + LOCK2(cs_main, wallet->cs_wallet); BOOST_FOREACH(const COutPoint& outpoint, vOutpoints) { if (!wallet->mapWallet.count(outpoint.hash)) continue; @@ -533,7 +546,7 @@ void WalletModel::getOutputs(const std::vector<COutPoint>& vOutpoints, std::vect bool WalletModel::isSpent(const COutPoint& outpoint) const { - LOCK(wallet->cs_wallet); + LOCK2(cs_main, wallet->cs_wallet); return wallet->IsSpent(outpoint.hash, outpoint.n); } @@ -543,7 +556,7 @@ void WalletModel::listCoins(std::map<QString, std::vector<COutput> >& mapCoins) std::vector<COutput> vCoins; wallet->AvailableCoins(vCoins); - LOCK(wallet->cs_wallet); // ListLockedCoins, mapWallet + LOCK2(cs_main, wallet->cs_wallet); // ListLockedCoins, mapWallet std::vector<COutPoint> vLockedCoins; wallet->ListLockedCoins(vLockedCoins); @@ -575,25 +588,25 @@ void WalletModel::listCoins(std::map<QString, std::vector<COutput> >& mapCoins) bool WalletModel::isLockedCoin(uint256 hash, unsigned int n) const { - LOCK(wallet->cs_wallet); + LOCK2(cs_main, wallet->cs_wallet); return wallet->IsLockedCoin(hash, n); } void WalletModel::lockCoin(COutPoint& output) { - LOCK(wallet->cs_wallet); + LOCK2(cs_main, wallet->cs_wallet); wallet->LockCoin(output); } void WalletModel::unlockCoin(COutPoint& output) { - LOCK(wallet->cs_wallet); + LOCK2(cs_main, wallet->cs_wallet); wallet->UnlockCoin(output); } void WalletModel::listLockedCoins(std::vector<COutPoint>& vOutpts) { - LOCK(wallet->cs_wallet); + LOCK2(cs_main, wallet->cs_wallet); wallet->ListLockedCoins(vOutpts); } diff --git a/src/qt/winshutdownmonitor.cpp b/src/qt/winshutdownmonitor.cpp new file mode 100644 index 0000000000..b7526f0ae4 --- /dev/null +++ b/src/qt/winshutdownmonitor.cpp @@ -0,0 +1,57 @@ +// Copyright (c) 2014 The Bitcoin developers +// Distributed under the MIT/X11 software license, see the accompanying +// file COPYING or http://www.opensource.org/licenses/mit-license.php. + +#include "winshutdownmonitor.h" + +#if defined(Q_OS_WIN) && QT_VERSION >= 0x050000 +#include "init.h" + +#include <windows.h> + +#include <QDebug> + +// If we don't want a message to be processed by Qt, return true and set result to +// the value that the window procedure should return. Otherwise return false. +bool WinShutdownMonitor::nativeEventFilter(const QByteArray &eventType, void *pMessage, long *pnResult) +{ + Q_UNUSED(eventType); + + MSG *pMsg = static_cast<MSG *>(pMessage); + + switch(pMsg->message) + { + case WM_QUERYENDSESSION: + { + // Initiate a client shutdown after receiving a WM_QUERYENDSESSION and block + // Windows session end until we have finished client shutdown. + StartShutdown(); + *pnResult = FALSE; + return true; + } + + case WM_ENDSESSION: + { + *pnResult = FALSE; + return true; + } + } + + return false; +} + +void WinShutdownMonitor::registerShutdownBlockReason(const QString& strReason, const HWND& mainWinId) +{ + typedef BOOL (WINAPI *PSHUTDOWNBRCREATE)(HWND, LPCWSTR); + PSHUTDOWNBRCREATE shutdownBRCreate = (PSHUTDOWNBRCREATE)GetProcAddress(GetModuleHandleA("User32.dll"), "ShutdownBlockReasonCreate"); + if (shutdownBRCreate == NULL) { + qDebug() << "registerShutdownBlockReason : GetProcAddress for ShutdownBlockReasonCreate failed"; + return; + } + + if (shutdownBRCreate(mainWinId, strReason.toStdWString().c_str())) + qDebug() << "registerShutdownBlockReason : Successfully registered: " + strReason; + else + qDebug() << "registerShutdownBlockReason : Failed to register: " + strReason; +} +#endif diff --git a/src/qt/winshutdownmonitor.h b/src/qt/winshutdownmonitor.h new file mode 100644 index 0000000000..4c76d2c816 --- /dev/null +++ b/src/qt/winshutdownmonitor.h @@ -0,0 +1,29 @@ +// Copyright (c) 2014 The Bitcoin developers +// Distributed under the MIT/X11 software license, see the accompanying +// file COPYING or http://www.opensource.org/licenses/mit-license.php. + +#ifndef WINSHUTDOWNMONITOR_H +#define WINSHUTDOWNMONITOR_H + +#ifdef WIN32 +#include <QByteArray> +#include <QString> + +#if QT_VERSION >= 0x050000 +#include <windef.h> // for HWND + +#include <QAbstractNativeEventFilter> + +class WinShutdownMonitor : public QAbstractNativeEventFilter +{ +public: + /** Implements QAbstractNativeEventFilter interface for processing Windows messages */ + bool nativeEventFilter(const QByteArray &eventType, void *pMessage, long *pnResult); + + /** Register the reason for blocking shutdown on Windows to allow clean client exit */ + static void registerShutdownBlockReason(const QString& strReason, const HWND& mainWinId); +}; +#endif +#endif + +#endif // WINSHUTDOWNMONITOR_H diff --git a/src/rpcdump.cpp b/src/rpcdump.cpp index 9a24a99c17..593e0d2b6b 100644 --- a/src/rpcdump.cpp +++ b/src/rpcdump.cpp @@ -153,7 +153,7 @@ Value importwallet(const Array& params, bool fHelp) EnsureWalletIsUnlocked(); ifstream file; - file.open(params[0].get_str().c_str()); + file.open(params[0].get_str().c_str(), std::ios::in | std::ios::ate); if (!file.is_open()) throw JSONRPCError(RPC_INVALID_PARAMETER, "Cannot open wallet dump file"); @@ -161,7 +161,12 @@ Value importwallet(const Array& params, bool fHelp) bool fGood = true; + int64_t nFilesize = std::max((int64_t)1, (int64_t)file.tellg()); + file.seekg(0, file.beg); + + pwalletMain->ShowProgress(_("Importing..."), 0); // show progress dialog in GUI while (file.good()) { + pwalletMain->ShowProgress("", std::max(1, std::min(99, (int)(((double)file.tellg() / (double)nFilesize) * 100)))); std::string line; std::getline(file, line); if (line.empty() || line[0] == '#') @@ -207,6 +212,7 @@ Value importwallet(const Array& params, bool fHelp) nTimeBegin = std::min(nTimeBegin, nTime); } file.close(); + pwalletMain->ShowProgress("", 100); // hide progress dialog in GUI CBlockIndex *pindex = chainActive.Tip(); while (pindex && pindex->pprev && pindex->nTime > nTimeBegin - 7200) diff --git a/src/rpcrawtransaction.cpp b/src/rpcrawtransaction.cpp index f0267cf8ab..4b7dd617e0 100644 --- a/src/rpcrawtransaction.cpp +++ b/src/rpcrawtransaction.cpp @@ -536,7 +536,7 @@ Value signrawtransaction(const Array& params, bool fHelp) " \"privatekey\" (string) private key in base58-encoding\n" " ,...\n" " ]\n" - "4. \"sighashtype\" (string, optional, default=ALL) The signature has type. Must be one of\n" + "4. \"sighashtype\" (string, optional, default=ALL) The signature hash type. Must be one of\n" " \"ALL\"\n" " \"NONE\"\n" " \"SINGLE\"\n" diff --git a/src/test/rpc_wallet_tests.cpp b/src/test/rpc_wallet_tests.cpp index af34e496e2..eea249b114 100644 --- a/src/test/rpc_wallet_tests.cpp +++ b/src/test/rpc_wallet_tests.cpp @@ -65,7 +65,7 @@ BOOST_AUTO_TEST_CASE(rpc_wallet) // Test RPC calls for various wallet statistics Value r; - LOCK(pwalletMain->cs_wallet); + LOCK2(cs_main, pwalletMain->cs_wallet); BOOST_CHECK_NO_THROW(CallRPC("listunspent")); BOOST_CHECK_THROW(CallRPC("listunspent string"), runtime_error); diff --git a/src/test/script_P2SH_tests.cpp b/src/test/script_P2SH_tests.cpp index 03dbdde57b..9b1290e0ea 100644 --- a/src/test/script_P2SH_tests.cpp +++ b/src/test/script_P2SH_tests.cpp @@ -50,6 +50,7 @@ BOOST_AUTO_TEST_SUITE(script_P2SH_tests) BOOST_AUTO_TEST_CASE(sign) { + LOCK(cs_main); // Pay-to-script-hash looks like this: // scriptSig: <sig> <sig...> <serialized_script> // scriptPubKey: HASH160 <hash> EQUAL @@ -147,6 +148,7 @@ BOOST_AUTO_TEST_CASE(norecurse) BOOST_AUTO_TEST_CASE(set) { + LOCK(cs_main); // Test the CScript::Set* methods CBasicKeyStore keystore; CKey key[4]; @@ -250,6 +252,7 @@ BOOST_AUTO_TEST_CASE(switchover) BOOST_AUTO_TEST_CASE(AreInputsStandard) { + LOCK(cs_main); CCoinsView coinsDummy; CCoinsViewCache coins(coinsDummy); CBasicKeyStore keystore; diff --git a/src/test/transaction_tests.cpp b/src/test/transaction_tests.cpp index 2ebb652f00..24647950c4 100644 --- a/src/test/transaction_tests.cpp +++ b/src/test/transaction_tests.cpp @@ -254,6 +254,7 @@ BOOST_AUTO_TEST_CASE(test_Get) BOOST_AUTO_TEST_CASE(test_IsStandard) { + LOCK(cs_main); CBasicKeyStore keystore; CCoinsView coinsDummy; CCoinsViewCache coins(coinsDummy); diff --git a/src/txdb.cpp b/src/txdb.cpp index d06639a112..cb92922a35 100644 --- a/src/txdb.cpp +++ b/src/txdb.cpp @@ -148,7 +148,7 @@ bool CCoinsViewDB::GetStats(CCoinsStats &stats) { } pcursor->Next(); } catch (std::exception &e) { - return error("%s : Deserialize or I/O error - %s", __PRETTY_FUNCTION__, e.what()); + return error("%s : Deserialize or I/O error - %s", __func__, e.what()); } } delete pcursor; @@ -226,7 +226,7 @@ bool CBlockTreeDB::LoadBlockIndexGuts() break; // if shutdown requested or finished loading block index } } catch (std::exception &e) { - return error("%s : Deserialize or I/O error - %s", __PRETTY_FUNCTION__, e.what()); + return error("%s : Deserialize or I/O error - %s", __func__, e.what()); } } delete pcursor; diff --git a/src/version.cpp b/src/version.cpp index 904451ac59..51e34aa9c9 100644 --- a/src/version.cpp +++ b/src/version.cpp @@ -40,6 +40,9 @@ const std::string CLIENT_NAME("Satoshi"); # define GIT_COMMIT_DATE "$Format:%cD$" #endif +#define BUILD_DESC_WITH_SUFFIX(maj,min,rev,build,suffix) \ + "v" DO_STRINGIZE(maj) "." DO_STRINGIZE(min) "." DO_STRINGIZE(rev) "." DO_STRINGIZE(build) "-" DO_STRINGIZE(suffix) + #define BUILD_DESC_FROM_COMMIT(maj,min,rev,build,commit) \ "v" DO_STRINGIZE(maj) "." DO_STRINGIZE(min) "." DO_STRINGIZE(rev) "." DO_STRINGIZE(build) "-g" commit @@ -47,7 +50,9 @@ const std::string CLIENT_NAME("Satoshi"); "v" DO_STRINGIZE(maj) "." DO_STRINGIZE(min) "." DO_STRINGIZE(rev) "." DO_STRINGIZE(build) "-unk" #ifndef BUILD_DESC -# ifdef GIT_COMMIT_ID +# ifdef BUILD_SUFFIX +# define BUILD_DESC BUILD_DESC_WITH_SUFFIX(CLIENT_VERSION_MAJOR, CLIENT_VERSION_MINOR, CLIENT_VERSION_REVISION, CLIENT_VERSION_BUILD, BUILD_SUFFIX) +# elif defined(GIT_COMMIT_ID) # define BUILD_DESC BUILD_DESC_FROM_COMMIT(CLIENT_VERSION_MAJOR, CLIENT_VERSION_MINOR, CLIENT_VERSION_REVISION, CLIENT_VERSION_BUILD, GIT_COMMIT_ID) # else # define BUILD_DESC BUILD_DESC_FROM_UNKNOWN(CLIENT_VERSION_MAJOR, CLIENT_VERSION_MINOR, CLIENT_VERSION_REVISION, CLIENT_VERSION_BUILD) diff --git a/src/wallet.cpp b/src/wallet.cpp index 775eb8f580..7cf2361096 100644 --- a/src/wallet.cpp +++ b/src/wallet.cpp @@ -471,6 +471,7 @@ bool CWallet::AddToWallet(const CWalletTx& wtxIn, bool fFromLoadWallet) if (fFromLoadWallet) { mapWallet[hash] = wtxIn; + mapWallet[hash].BindWallet(this); AddToSpends(hash); } else @@ -606,7 +607,7 @@ bool CWallet::AddToWalletIfInvolvingMe(const uint256 &hash, const CTransaction& void CWallet::SyncTransaction(const uint256 &hash, const CTransaction& tx, const CBlock* pblock) { - LOCK(cs_wallet); + LOCK2(cs_main, cs_wallet); if (!AddToWalletIfInvolvingMe(hash, tx, pblock, true)) return; // Not one of ours @@ -834,7 +835,7 @@ int CWallet::ScanForWalletTransactions(CBlockIndex* pindexStart, bool fUpdate) CBlockIndex* pindex = pindexStart; { - LOCK(cs_wallet); + LOCK2(cs_main, cs_wallet); // no need to read and scan block, if block was created before // our wallet birthday (as adjusted for block time variability) @@ -869,7 +870,7 @@ int CWallet::ScanForWalletTransactions(CBlockIndex* pindexStart, bool fUpdate) void CWallet::ReacceptWalletTransactions() { - LOCK(cs_wallet); + LOCK2(cs_main, cs_wallet); BOOST_FOREACH(PAIRTYPE(const uint256, CWalletTx)& item, mapWallet) { const uint256& wtxid = item.first; @@ -964,7 +965,7 @@ int64_t CWallet::GetBalance() const { int64_t nTotal = 0; { - LOCK(cs_wallet); + LOCK2(cs_main, cs_wallet); for (map<uint256, CWalletTx>::const_iterator it = mapWallet.begin(); it != mapWallet.end(); ++it) { const CWalletTx* pcoin = &(*it).second; @@ -980,7 +981,7 @@ int64_t CWallet::GetUnconfirmedBalance() const { int64_t nTotal = 0; { - LOCK(cs_wallet); + LOCK2(cs_main, cs_wallet); for (map<uint256, CWalletTx>::const_iterator it = mapWallet.begin(); it != mapWallet.end(); ++it) { const CWalletTx* pcoin = &(*it).second; @@ -995,7 +996,7 @@ int64_t CWallet::GetImmatureBalance() const { int64_t nTotal = 0; { - LOCK(cs_wallet); + LOCK2(cs_main, cs_wallet); for (map<uint256, CWalletTx>::const_iterator it = mapWallet.begin(); it != mapWallet.end(); ++it) { const CWalletTx* pcoin = &(*it).second; diff --git a/src/walletdb.cpp b/src/walletdb.cpp index b57ea0b518..359a1cef61 100644 --- a/src/walletdb.cpp +++ b/src/walletdb.cpp @@ -352,9 +352,7 @@ ReadKeyValue(CWallet* pwallet, CDataStream& ssKey, CDataStream& ssValue, CWalletTx wtx; ssValue >> wtx; CValidationState state; - if (CheckTransaction(wtx, state) && (wtx.GetHash() == hash) && state.IsValid()) - wtx.BindWallet(pwallet); - else + if (!(CheckTransaction(wtx, state) && (wtx.GetHash() == hash) && state.IsValid())) return false; // Undo serialize changes in 31600 |
