diff options
702 files changed, 24177 insertions, 26520 deletions
diff --git a/.travis.yml b/.travis.yml index bdb76220ab..aafdc2e89d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -15,7 +15,9 @@ env: global: - MAKEJOBS=-j3 - RUN_TESTS=false + - RUN_BENCH=false # Set to true for any one job that has debug enabled, to quickly check bench is not crashing or hitting assertions - DOCKER_NAME_TAG=ubuntu:18.04 + - LC_ALL=C.UTF-8 - BOOST_TEST_RANDOM=1$TRAVIS_BUILD_ID - CCACHE_SIZE=100M - CCACHE_TEMPDIR=/tmp/.ccache-temp @@ -25,16 +27,58 @@ env: - SDK_URL=https://bitcoincore.org/depends-sources/sdks - WINEDEBUG=fixme-all - DOCKER_PACKAGES="build-essential libtool autotools-dev automake pkg-config bsdmainutils curl git ca-certificates ccache" - matrix: +before_install: + - export PATH=$(echo $PATH | tr ':' "\n" | sed '/\/opt\/python/d' | tr "\n" ":" | sed "s|::|:|g") + - BEGIN_FOLD () { echo ""; CURRENT_FOLD_NAME=$1; echo "travis_fold:start:${CURRENT_FOLD_NAME}"; } + - END_FOLD () { RET=$?; echo "travis_fold:end:${CURRENT_FOLD_NAME}"; return $RET; } +install: + - travis_retry docker pull $DOCKER_NAME_TAG + - env | grep -E '^(CCACHE_|WINEDEBUG|LC_ALL|BOOST_TEST_RANDOM|CONFIG_SHELL)' | tee /tmp/env + - if [[ $HOST = *-mingw32 ]]; then DOCKER_ADMIN="--cap-add SYS_ADMIN"; fi + - DOCKER_ID=$(docker run $DOCKER_ADMIN -idt --mount type=bind,src=$TRAVIS_BUILD_DIR,dst=$TRAVIS_BUILD_DIR --mount type=bind,src=$CCACHE_DIR,dst=$CCACHE_DIR -w $TRAVIS_BUILD_DIR --env-file /tmp/env $DOCKER_NAME_TAG) + - DOCKER_EXEC () { docker exec $DOCKER_ID bash -c "cd $PWD && $*"; } + - if [ -n "$DPKG_ADD_ARCH" ]; then DOCKER_EXEC dpkg --add-architecture "$DPKG_ADD_ARCH" ; fi + - travis_retry DOCKER_EXEC apt-get update + - travis_retry DOCKER_EXEC apt-get install --no-install-recommends --no-upgrade -qq $PACKAGES $DOCKER_PACKAGES +before_script: + - DOCKER_EXEC echo \> \$HOME/.bitcoin # Make sure default datadir does not exist and is never read by creating a dummy file + - mkdir -p depends/SDKs depends/sdk-sources + - if [ -n "$OSX_SDK" -a ! -f depends/sdk-sources/MacOSX${OSX_SDK}.sdk.tar.gz ]; then curl --location --fail $SDK_URL/MacOSX${OSX_SDK}.sdk.tar.gz -o depends/sdk-sources/MacOSX${OSX_SDK}.sdk.tar.gz; fi + - if [ -n "$OSX_SDK" -a -f depends/sdk-sources/MacOSX${OSX_SDK}.sdk.tar.gz ]; then tar -C depends/SDKs -xf depends/sdk-sources/MacOSX${OSX_SDK}.sdk.tar.gz; fi + - if [[ $HOST = *-mingw32 ]]; then DOCKER_EXEC update-alternatives --set $HOST-g++ \$\(which $HOST-g++-posix\); fi + - if [ -z "$NO_DEPENDS" ]; then DOCKER_EXEC CONFIG_SHELL= make $MAKEJOBS -C depends HOST=$HOST $DEP_OPTS; fi +script: + - export TRAVIS_COMMIT_LOG=`git log --format=fuller -1` + - OUTDIR=$BASE_OUTDIR/$TRAVIS_PULL_REQUEST/$TRAVIS_JOB_NUMBER-$HOST + - BITCOIN_CONFIG_ALL="--disable-dependency-tracking --prefix=$TRAVIS_BUILD_DIR/depends/$HOST --bindir=$OUTDIR/bin --libdir=$OUTDIR/lib" + - if [ -z "$NO_DEPENDS" ]; then DOCKER_EXEC ccache --max-size=$CCACHE_SIZE; fi + - BEGIN_FOLD autogen; test -n "$CONFIG_SHELL" && DOCKER_EXEC "$CONFIG_SHELL" -c "./autogen.sh" || DOCKER_EXEC ./autogen.sh; END_FOLD + - mkdir build && cd build + - BEGIN_FOLD configure; DOCKER_EXEC ../configure --cache-file=config.cache $BITCOIN_CONFIG_ALL $BITCOIN_CONFIG || ( cat config.log && false); END_FOLD + - BEGIN_FOLD distdir; DOCKER_EXEC make distdir VERSION=$HOST; END_FOLD + - cd bitcoin-$HOST + - BEGIN_FOLD configure; DOCKER_EXEC ./configure --cache-file=../config.cache $BITCOIN_CONFIG_ALL $BITCOIN_CONFIG || ( cat config.log && false); END_FOLD + - BEGIN_FOLD build; DOCKER_EXEC make $MAKEJOBS $GOAL || ( echo "Build failure. Verbose build follows." && DOCKER_EXEC make $GOAL V=1 ; false ); END_FOLD + - if [ "$RUN_TESTS" = "true" ]; then BEGIN_FOLD unit-tests; DOCKER_EXEC LD_LIBRARY_PATH=$TRAVIS_BUILD_DIR/depends/$HOST/lib make $MAKEJOBS check VERBOSE=1; END_FOLD; fi + - if [ "$RUN_BENCH" = "true" ]; then BEGIN_FOLD bench; DOCKER_EXEC LD_LIBRARY_PATH=$TRAVIS_BUILD_DIR/depends/$HOST/lib $OUTDIR/bin/bench_bitcoin -scaling=0.001 ; END_FOLD; fi + - if [ "$TRAVIS_EVENT_TYPE" = "cron" ]; then extended="--extended --exclude feature_pruning,feature_dbcrash"; fi + - if [ "$RUN_TESTS" = "true" ]; then BEGIN_FOLD functional-tests; DOCKER_EXEC test/functional/test_runner.py --combinedlogslen=4000 --coverage --quiet --failfast ${extended}; END_FOLD; fi +after_script: + - echo $TRAVIS_COMMIT_RANGE + - echo $TRAVIS_COMMIT_LOG +jobs: + include: # ARM - - >- + - stage: test + env: >- HOST=arm-linux-gnueabihf PACKAGES="g++-arm-linux-gnueabihf" DEP_OPTS="NO_QT=1" GOAL="install" BITCOIN_CONFIG="--enable-glibc-back-compat --enable-reduce-exports" # Win32 - - >- + - stage: test + env: >- HOST=i686-w64-mingw32 DPKG_ADD_ARCH="i386" DEP_OPTS="NO_QT=1" @@ -43,7 +87,8 @@ env: GOAL="install" BITCOIN_CONFIG="--enable-reduce-exports" # Win64 - - >- + - stage: test + env: >- HOST=x86_64-w64-mingw32 DEP_OPTS="NO_QT=1" PACKAGES="python3 nsis g++-mingw-w64-x86-64 wine-binfmt wine64" @@ -51,7 +96,8 @@ env: GOAL="install" BITCOIN_CONFIG="--enable-reduce-exports" # 32-bit + dash - - >- + - stage: test + env: >- HOST=i686-pc-linux-gnu PACKAGES="g++-multilib python3-zmq" DEP_OPTS="NO_QT=1" @@ -60,15 +106,18 @@ env: BITCOIN_CONFIG="--enable-zmq --enable-glibc-back-compat --enable-reduce-exports LDFLAGS=-static-libstdc++" CONFIG_SHELL="/bin/dash" # x86_64 Linux (uses qt5 dev package instead of depends Qt to speed up build and avoid timeout) - - >- + - stage: test + env: >- HOST=x86_64-unknown-linux-gnu PACKAGES="python3-zmq qtbase5-dev qttools5-dev-tools protobuf-compiler libdbus-1-dev libharfbuzz-dev libprotobuf-dev" DEP_OPTS="NO_QT=1 NO_UPNP=1 DEBUG=1 ALLOW_HOST_PACKAGES=1" RUN_TESTS=true + RUN_BENCH=true GOAL="install" BITCOIN_CONFIG="--enable-zmq --with-gui=qt5 --enable-glibc-back-compat --enable-reduce-exports --enable-debug CXXFLAGS=\"-g0 -O2\"" # x86_64 Linux (Qt5 & system libs) - - >- + - stage: test + env: >- HOST=x86_64-unknown-linux-gnu PACKAGES="python3-zmq qtbase5-dev qttools5-dev-tools libssl1.0-dev libevent-dev bsdmainutils libboost-system-dev libboost-filesystem-dev libboost-chrono-dev libboost-test-dev libboost-thread-dev libdb5.3++-dev libminiupnpc-dev libzmq3-dev libprotobuf-dev protobuf-compiler libqrencode-dev" NO_DEPENDS=1 @@ -76,7 +125,8 @@ env: GOAL="install" BITCOIN_CONFIG="--enable-zmq --with-incompatible-bdb --enable-glibc-back-compat --enable-reduce-exports --with-gui=qt5 CPPFLAGS=-DDEBUG_LOCKORDER" # x86_64 Linux, No wallet - - >- + - stage: test + env: >- HOST=x86_64-unknown-linux-gnu PACKAGES="python3" DEP_OPTS="NO_WALLET=1" @@ -84,54 +134,13 @@ env: GOAL="install" BITCOIN_CONFIG="--enable-glibc-back-compat --enable-reduce-exports" # Cross-Mac - - >- + - stage: test + env: >- HOST=x86_64-apple-darwin14 PACKAGES="cmake imagemagick libcap-dev librsvg2-bin libz-dev libbz2-dev libtiff-tools python-dev python3-setuptools-git" - BITCOIN_CONFIG="--enable-gui --enable-reduce-exports --enable-werror" OSX_SDK=10.11 GOAL="all deploy" - -before_install: - - export PATH=$(echo $PATH | tr ':' "\n" | sed '/\/opt\/python/d' | tr "\n" ":" | sed "s|::|:|g") - - BEGIN_FOLD () { echo ""; CURRENT_FOLD_NAME=$1; echo "travis_fold:start:${CURRENT_FOLD_NAME}"; } - - END_FOLD () { RET=$?; echo "travis_fold:end:${CURRENT_FOLD_NAME}"; return $RET; } -install: - - travis_retry docker pull $DOCKER_NAME_TAG - - env | grep -E '^(CCACHE_|WINEDEBUG|BOOST_TEST_RANDOM|CONFIG_SHELL)' | tee /tmp/env - - if [[ $HOST = *-mingw32 ]]; then DOCKER_ADMIN="--cap-add SYS_ADMIN"; fi - - DOCKER_ID=$(docker run $DOCKER_ADMIN -idt --mount type=bind,src=$TRAVIS_BUILD_DIR,dst=$TRAVIS_BUILD_DIR --mount type=bind,src=$CCACHE_DIR,dst=$CCACHE_DIR -w $TRAVIS_BUILD_DIR --env-file /tmp/env $DOCKER_NAME_TAG) - - DOCKER_EXEC () { docker exec $DOCKER_ID bash -c "cd $PWD && $*"; } - - if [ -n "$DPKG_ADD_ARCH" ]; then DOCKER_EXEC dpkg --add-architecture "$DPKG_ADD_ARCH" ; fi - - travis_retry DOCKER_EXEC apt-get update - - travis_retry DOCKER_EXEC apt-get install --no-install-recommends --no-upgrade -qq $PACKAGES $DOCKER_PACKAGES -before_script: - - DOCKER_EXEC echo \> \$HOME/.bitcoin # Make sure default datadir does not exist and is never read by creating a dummy file - - mkdir -p depends/SDKs depends/sdk-sources - - if [ -n "$OSX_SDK" -a ! -f depends/sdk-sources/MacOSX${OSX_SDK}.sdk.tar.gz ]; then curl --location --fail $SDK_URL/MacOSX${OSX_SDK}.sdk.tar.gz -o depends/sdk-sources/MacOSX${OSX_SDK}.sdk.tar.gz; fi - - if [ -n "$OSX_SDK" -a -f depends/sdk-sources/MacOSX${OSX_SDK}.sdk.tar.gz ]; then tar -C depends/SDKs -xf depends/sdk-sources/MacOSX${OSX_SDK}.sdk.tar.gz; fi - - if [[ $HOST = *-mingw32 ]]; then DOCKER_EXEC update-alternatives --set $HOST-g++ \$\(which $HOST-g++-posix\); fi - - if [ -z "$NO_DEPENDS" ]; then DOCKER_EXEC CONFIG_SHELL= make $MAKEJOBS -C depends HOST=$HOST $DEP_OPTS; fi -script: - - export TRAVIS_COMMIT_LOG=`git log --format=fuller -1` - - OUTDIR=$BASE_OUTDIR/$TRAVIS_PULL_REQUEST/$TRAVIS_JOB_NUMBER-$HOST - - BITCOIN_CONFIG_ALL="--disable-dependency-tracking --prefix=$TRAVIS_BUILD_DIR/depends/$HOST --bindir=$OUTDIR/bin --libdir=$OUTDIR/lib" - - if [ -z "$NO_DEPENDS" ]; then DOCKER_EXEC ccache --max-size=$CCACHE_SIZE; fi - - BEGIN_FOLD autogen; test -n "$CONFIG_SHELL" && DOCKER_EXEC "$CONFIG_SHELL" -c "./autogen.sh" || DOCKER_EXEC ./autogen.sh; END_FOLD - - mkdir build && cd build - - BEGIN_FOLD configure; DOCKER_EXEC ../configure --cache-file=config.cache $BITCOIN_CONFIG_ALL $BITCOIN_CONFIG || ( cat config.log && false); END_FOLD - - BEGIN_FOLD distdir; DOCKER_EXEC make distdir VERSION=$HOST; END_FOLD - - cd bitcoin-$HOST - - BEGIN_FOLD configure; DOCKER_EXEC ./configure --cache-file=../config.cache $BITCOIN_CONFIG_ALL $BITCOIN_CONFIG || ( cat config.log && false); END_FOLD - - BEGIN_FOLD build; DOCKER_EXEC make $MAKEJOBS $GOAL || ( echo "Build failure. Verbose build follows." && DOCKER_EXEC make $GOAL V=1 ; false ); END_FOLD - - if [ "$RUN_TESTS" = "true" ]; then BEGIN_FOLD unit-tests; DOCKER_EXEC LD_LIBRARY_PATH=$TRAVIS_BUILD_DIR/depends/$HOST/lib make $MAKEJOBS check VERBOSE=1; END_FOLD; fi - - if [ "$TRAVIS_EVENT_TYPE" = "cron" ]; then extended="--extended --exclude feature_pruning,feature_dbcrash"; fi - - if [ "$RUN_TESTS" = "true" ]; then BEGIN_FOLD functional-tests; DOCKER_EXEC test/functional/test_runner.py --combinedlogslen=4000 --coverage --quiet --failfast ${extended}; END_FOLD; fi -after_script: - - echo $TRAVIS_COMMIT_RANGE - - echo $TRAVIS_COMMIT_LOG - -jobs: - include: + BITCOIN_CONFIG="--enable-gui --enable-reduce-exports --enable-werror" - stage: lint env: sudo: false diff --git a/.tx/config b/.tx/config index 3a7c825a76..c0931c0f34 100644 --- a/.tx/config +++ b/.tx/config @@ -1,7 +1,7 @@ [main] host = https://www.transifex.com -[bitcoin.qt-translation-016x] +[bitcoin.qt-translation-017x] file_filter = src/qt/locale/bitcoin_<lang>.ts source_file = src/qt/locale/bitcoin_en.ts source_lang = en diff --git a/appveyor.yml b/appveyor.yml new file mode 100644 index 0000000000..c6a5a91ba5 --- /dev/null +++ b/appveyor.yml @@ -0,0 +1,37 @@ +version: '{branch}.{build}' +skip_tags: true +image: Visual Studio 2017 +configuration: Release +platform: x64 +environment: + APPVEYOR_SAVE_CACHE_ON_ERROR: true +cache: C:\tools\vcpkg\installed\ +before_build: +- ps: >- + $packages = @( + "boost-filesystem", + "boost-signals2", + "boost-interprocess", + "boost-test", + "libevent", + "openssl", + "zeromq", + "berkeleydb", + "secp256k1", + "leveldb" + ) + + for ($i=0; $i -lt $packages.length; $i++) { + $all_packages += $packages[$i] + ":" + $env:PLATFORM + "-windows-static " + } + + git -C C:\Tools\vcpkg pull # This is a temporary fix, can be removed after appveyor update its image to include Microsoft/vcpkg#4046 + + Invoke-Expression -Command "vcpkg install $all_packages" +build: + project: build_msvc\bitcoin.sln + parallel: true + verbosity: minimal +test_script: +- cmd: build_msvc\%PLATFORM%\Release\test_bitcoin.exe +deploy: off diff --git a/build_msvc/.gitignore b/build_msvc/.gitignore new file mode 100644 index 0000000000..fbcd1077b3 --- /dev/null +++ b/build_msvc/.gitignore @@ -0,0 +1,10 @@ +# Build directories +Debug/* +Release/* +.vs +packages/* +*/Obj +*/Debug +*/Release +*/x64 +*.vcxproj.user diff --git a/build_msvc/README.md b/build_msvc/README.md new file mode 100644 index 0000000000..6de464e92f --- /dev/null +++ b/build_msvc/README.md @@ -0,0 +1,50 @@ +Building Bitcoin Core with Visual Studio +======================================== + +Introduction +--------------------- +Solution and project files to build the Bitcoin Core applications (except Qt dependent ones) with Visual Studio 2017 can be found in the build_msvc directory. + +Building with Visual Studio is an alternative to the Linux based [cross-compiler build](https://github.com/bitcoin/bitcoin/blob/master/doc/build-windows.md). + +Dependencies +--------------------- +A number of [open source libraries](https://github.com/bitcoin/bitcoin/blob/master/doc/dependencies.md) are required in order to be able to build Bitcoin. + +Options for installing the dependencies in a Visual Studio compatible manner are: + +- Use Microsoft's [vcpkg](https://docs.microsoft.com/en-us/cpp/vcpkg) to download the source packages and build locally. This is the recommended approach. +- Download the source code, build each dependency, add the required include paths, link libraries and binary tools to the Visual Studio project files. +- Use [nuget](https://www.nuget.org/) packages with the understanding that any binary files have been compiled by an untrusted third party. + +The external dependencies required for the Visual Studio build are (see the [dependencies doc](https://github.com/bitcoin/bitcoin/blob/master/doc/dependencies.md) for versions): + +- Berkeley DB, +- OpenSSL, +- Boost, +- libevent, +- ZeroMQ + +Additional dependencies required from the [bitcoin-core](https://github.com/bitcoin-core) github repository are: +- SECP256K1, +- LevelDB + +Building +--------------------- +The instructions below use vcpkg to install the dependencies. + +- Clone and vcpkg from the [github repository](https://github.com/Microsoft/vcpkg) and install as per the instructions in the main README.md. +- Install the required packages (replace x64 with x86 as required): +- Install the required dependencies with vcpkg: + +``` + PS >.\vcpkg install boost:x64-windows-static ` + libevent:x64-windows-static ` + openssl:x64-windows-static ` + zeromq:x64-windows-static ` + berkeleydb:x64-windows-static ` + secp256k1:x64-windows-static ` + leveldb:x64-windows-static +``` + +- Build in Visual Studio.
\ No newline at end of file diff --git a/build_msvc/bench_bitcoin/bench_bitcoin.vcxproj b/build_msvc/bench_bitcoin/bench_bitcoin.vcxproj new file mode 100644 index 0000000000..b987a337c0 --- /dev/null +++ b/build_msvc/bench_bitcoin/bench_bitcoin.vcxproj @@ -0,0 +1,217 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <Import Label="configInitTarget" Project="..\common.init.vcxproj" /> + <ItemGroup Label="ProjectConfigurations"> + <ProjectConfiguration Include="Debug|Win32"> + <Configuration>Debug</Configuration> + <Platform>Win32</Platform> + </ProjectConfiguration> + <ProjectConfiguration Include="Release|Win32"> + <Configuration>Release</Configuration> + <Platform>Win32</Platform> + </ProjectConfiguration> + <ProjectConfiguration Include="Debug|x64"> + <Configuration>Debug</Configuration> + <Platform>x64</Platform> + </ProjectConfiguration> + <ProjectConfiguration Include="Release|x64"> + <Configuration>Release</Configuration> + <Platform>x64</Platform> + </ProjectConfiguration> + </ItemGroup> + <ItemGroup> + <ClCompile Include="..\..\src\bench\base58.cpp" /> + <ClCompile Include="..\..\src\bench\bech32.cpp" /> + <ClCompile Include="..\..\src\bench\bench.cpp" /> + <ClCompile Include="..\..\src\bench\bench_bitcoin.cpp" /> + <ClCompile Include="..\..\src\bench\ccoins_caching.cpp" /> + <ClCompile Include="..\..\src\bench\checkblock.cpp" /> + <ClCompile Include="..\..\src\bench\checkqueue.cpp" /> + <ClCompile Include="..\..\src\bench\coin_selection.cpp" /> + <ClCompile Include="..\..\src\bench\crypto_hash.cpp" /> + <ClCompile Include="..\..\src\bench\examples.cpp" /> + <ClCompile Include="..\..\src\bench\lockedpool.cpp" /> + <ClCompile Include="..\..\src\bench\mempool_eviction.cpp" /> + <ClCompile Include="..\..\src\bench\merkle_root.cpp" /> + <ClCompile Include="..\..\src\bench\rollingbloom.cpp" /> + <ClCompile Include="..\..\src\bench\verify_script.cpp" /> + </ItemGroup> + <ItemGroup> + <ProjectReference Include="..\libbitcoinconsensus\libbitcoinconsensus.vcxproj"> + <Project>{2b384fa8-9ee1-4544-93cb-0d733c25e8ce}</Project> + </ProjectReference> + <ProjectReference Include="..\libbitcoin_common\libbitcoin_common.vcxproj"> + <Project>{7c87e378-df58-482e-aa2f-1bc129bc19ce}</Project> + </ProjectReference> + <ProjectReference Include="..\libbitcoin_crypto\libbitcoin_crypto.vcxproj"> + <Project>{6190199c-6cf4-4dad-bfbd-93fa72a760c1}</Project> + </ProjectReference> + <ProjectReference Include="..\libbitcoin_server\libbitcoin_server.vcxproj"> + <Project>{460fee33-1fe1-483f-b3bf-931ff8e969a5}</Project> + </ProjectReference> + <ProjectReference Include="..\libbitcoin_util\libbitcoin_util.vcxproj"> + <Project>{b53a5535-ee9d-4c6f-9a26-f79ee3bc3754}</Project> + </ProjectReference> + <ProjectReference Include="..\libbitcoin_wallet\libbitcoin_wallet.vcxproj"> + <Project>{93b86837-b543-48a5-a89b-7c87abb77df2}</Project> + </ProjectReference> + <ProjectReference Include="..\libbitcoin_zmq\libbitcoin_zmq.vcxproj"> + <Project>{792d487f-f14c-49fc-a9de-3fc150f31c3f}</Project> + </ProjectReference> + <ProjectReference Include="..\libunivalue\libunivalue.vcxproj"> + <Project>{5724ba7d-a09a-4ba8-800b-c4c1561b3d69}</Project> + </ProjectReference> + </ItemGroup> + <PropertyGroup Label="Globals"> + <VCProjectVersion>15.0</VCProjectVersion> + <ProjectGuid>{1125654E-E1B2-4431-8B5C-62EA9A2FEECB}</ProjectGuid> + <Keyword>Win32Proj</Keyword> + <RootNamespace>bench_bitcoin</RootNamespace> + <VcpkgTriplet Condition="'$(Platform)'=='Win32'">x86-windows-static</VcpkgTriplet> + <VcpkgTriplet Condition="'$(Platform)'=='x64'">x64-windows-static</VcpkgTriplet> + </PropertyGroup> + <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> + <ConfigurationType>Application</ConfigurationType> + <UseDebugLibraries>true</UseDebugLibraries> + <PlatformToolset>v141</PlatformToolset> + <CharacterSet>Unicode</CharacterSet> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> + <ConfigurationType>Application</ConfigurationType> + <UseDebugLibraries>false</UseDebugLibraries> + <PlatformToolset>v141</PlatformToolset> + <WholeProgramOptimization>true</WholeProgramOptimization> + <CharacterSet>Unicode</CharacterSet> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration"> + <ConfigurationType>Application</ConfigurationType> + <UseDebugLibraries>true</UseDebugLibraries> + <PlatformToolset>v141</PlatformToolset> + <CharacterSet>Unicode</CharacterSet> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration"> + <ConfigurationType>Application</ConfigurationType> + <UseDebugLibraries>false</UseDebugLibraries> + <PlatformToolset>v141</PlatformToolset> + <WholeProgramOptimization>true</WholeProgramOptimization> + <CharacterSet>Unicode</CharacterSet> + </PropertyGroup> + <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> + <ImportGroup Label="ExtensionSettings"> + </ImportGroup> + <ImportGroup Label="Shared"> + </ImportGroup> + <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> + <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> + </ImportGroup> + <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> + <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> + </ImportGroup> + <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> + <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> + </ImportGroup> + <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> + <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> + </ImportGroup> + <PropertyGroup Label="UserMacros" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> + <LinkIncremental>false</LinkIncremental> + <Linkage-secp256k1>static</Linkage-secp256k1> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> + <LinkIncremental>true</LinkIncremental> + <Linkage-secp256k1>static</Linkage-secp256k1> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> + <LinkIncremental>true</LinkIncremental> + <Linkage-secp256k1>static</Linkage-secp256k1> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> + <LinkIncremental>false</LinkIncremental> + <Linkage-secp256k1>static</Linkage-secp256k1> + </PropertyGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> + <ClCompile> + <PrecompiledHeader>NotUsing</PrecompiledHeader> + <WarningLevel>Level3</WarningLevel> + <Optimization>MaxSpeed</Optimization> + <FunctionLevelLinking>true</FunctionLevelLinking> + <IntrinsicFunctions>true</IntrinsicFunctions> + <PreprocessorDefinitions>NOMINMAX;HAVE_CONFIG_H;_SCL_SECURE_NO_WARNINGS;WIN32;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <SDLCheck>true</SDLCheck> + <AdditionalIncludeDirectories>..\..\src;</AdditionalIncludeDirectories> + <RuntimeLibrary>MultiThreaded</RuntimeLibrary> + </ClCompile> + <Link> + <SubSystem>Console</SubSystem> + <EnableCOMDATFolding>true</EnableCOMDATFolding> + <OptimizeReferences>true</OptimizeReferences> + <GenerateDebugInformation>true</GenerateDebugInformation> + <AdditionalDependencies>crypt32.lib;Iphlpapi.lib;ws2_32.lib;Shlwapi.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies> + </Link> + </ItemDefinitionGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> + <ClCompile> + <PrecompiledHeader>NotUsing</PrecompiledHeader> + <WarningLevel>Level3</WarningLevel> + <Optimization>Disabled</Optimization> + <PreprocessorDefinitions>NOMINMAX;HAVE_CONFIG_H;_SCL_SECURE_NO_WARNINGS;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <SDLCheck>true</SDLCheck> + <AdditionalIncludeDirectories>..\..\src;</AdditionalIncludeDirectories> + <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary> + </ClCompile> + <Link> + <SubSystem>Console</SubSystem> + <GenerateDebugInformation>true</GenerateDebugInformation> + <AdditionalDependencies>crypt32.lib;Iphlpapi.lib;ws2_32.lib;Shlwapi.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies> + </Link> + </ItemDefinitionGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> + <ClCompile> + <PrecompiledHeader>NotUsing</PrecompiledHeader> + <WarningLevel>Level3</WarningLevel> + <Optimization>Disabled</Optimization> + <PreprocessorDefinitions>NOMINMAX;HAVE_CONFIG_H;_SCL_SECURE_NO_WARNINGS;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <SDLCheck>true</SDLCheck> + <AdditionalIncludeDirectories>..\..\src;</AdditionalIncludeDirectories> + <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary> + </ClCompile> + <Link> + <SubSystem>Console</SubSystem> + <GenerateDebugInformation>true</GenerateDebugInformation> + <AdditionalDependencies>crypt32.lib;Iphlpapi.lib;ws2_32.lib;Shlwapi.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies> + </Link> + </ItemDefinitionGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> + <ClCompile> + <PrecompiledHeader>NotUsing</PrecompiledHeader> + <WarningLevel>Level3</WarningLevel> + <Optimization>MaxSpeed</Optimization> + <FunctionLevelLinking>true</FunctionLevelLinking> + <IntrinsicFunctions>true</IntrinsicFunctions> + <PreprocessorDefinitions>NOMINMAX;HAVE_CONFIG_H;_SCL_SECURE_NO_WARNINGS;WIN32;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <SDLCheck>true</SDLCheck> + <AdditionalIncludeDirectories>..\..\src;</AdditionalIncludeDirectories> + <RuntimeLibrary>MultiThreaded</RuntimeLibrary> + </ClCompile> + <Link> + <SubSystem>Console</SubSystem> + <EnableCOMDATFolding>true</EnableCOMDATFolding> + <OptimizeReferences>true</OptimizeReferences> + <GenerateDebugInformation>true</GenerateDebugInformation> + <AdditionalDependencies>crypt32.lib;Iphlpapi.lib;ws2_32.lib;Shlwapi.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies> + </Link> + </ItemDefinitionGroup> + <Target Name="RawBenchHeaderGen" BeforeTargets="PrepareForBuild"> + <PropertyGroup> + <ErrorText>There was an error executing the raw bench header generation task.</ErrorText> + </PropertyGroup> + <ItemGroup> + <RawBenchFile Include="..\..\src\bench\data\*.raw" /> + </ItemGroup> + <HeaderFromHexdump RawFilePath="%(RawBenchFile.FullPath)" HeaderFilePath="%(RawBenchFile.FullPath).h" SourceHeader="static unsigned const char %(RawBenchFile.Filename)[] = {" SourceFooter="};" /> + </Target> + <Import Label="configTarget" Project="..\common.vcxproj" /> + <Import Label="hexdumpTarget" Project="..\msbuild\tasks\hexdump.targets" /> +</Project> diff --git a/build_msvc/bitcoin-cli/bitcoin-cli.vcxproj b/build_msvc/bitcoin-cli/bitcoin-cli.vcxproj new file mode 100644 index 0000000000..32f0354fad --- /dev/null +++ b/build_msvc/bitcoin-cli/bitcoin-cli.vcxproj @@ -0,0 +1,180 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <Import Label="configInitTarget" Project="..\common.init.vcxproj" /> + <ItemGroup Label="ProjectConfigurations"> + <ProjectConfiguration Include="Debug|Win32"> + <Configuration>Debug</Configuration> + <Platform>Win32</Platform> + </ProjectConfiguration> + <ProjectConfiguration Include="Release|Win32"> + <Configuration>Release</Configuration> + <Platform>Win32</Platform> + </ProjectConfiguration> + <ProjectConfiguration Include="Debug|x64"> + <Configuration>Debug</Configuration> + <Platform>x64</Platform> + </ProjectConfiguration> + <ProjectConfiguration Include="Release|x64"> + <Configuration>Release</Configuration> + <Platform>x64</Platform> + </ProjectConfiguration> + </ItemGroup> + <ItemGroup> + <ClCompile Include="..\..\src\bitcoin-cli.cpp" /> + </ItemGroup> + <ItemGroup> + <None Include="packages.config" /> + </ItemGroup> + <ItemGroup> + <ProjectReference Include="..\libbitcoin_cli\libbitcoin_cli.vcxproj"> + <Project>{0667528c-d734-4009-adf9-c0d6c4a5a5a6}</Project> + </ProjectReference> + <ProjectReference Include="..\libbitcoin_crypto\libbitcoin_crypto.vcxproj"> + <Project>{6190199c-6cf4-4dad-bfbd-93fa72a760c1}</Project> + </ProjectReference> + <ProjectReference Include="..\libbitcoin_util\libbitcoin_util.vcxproj"> + <Project>{b53a5535-ee9d-4c6f-9a26-f79ee3bc3754}</Project> + </ProjectReference> + <ProjectReference Include="..\libunivalue\libunivalue.vcxproj"> + <Project>{5724ba7d-a09a-4ba8-800b-c4c1561b3d69}</Project> + </ProjectReference> + </ItemGroup> + <PropertyGroup Label="Globals"> + <VCProjectVersion>15.0</VCProjectVersion> + <ProjectGuid>{0B2D7431-F876-4A58-87BF-F748338CD3BF}</ProjectGuid> + <Keyword>Win32Proj</Keyword> + <RootNamespace>bitcoincli</RootNamespace> + <VcpkgTriplet Condition="'$(Platform)'=='Win32'">x86-windows-static</VcpkgTriplet> + <VcpkgTriplet Condition="'$(Platform)'=='x64'">x64-windows-static</VcpkgTriplet> + </PropertyGroup> + <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> + <ConfigurationType>Application</ConfigurationType> + <UseDebugLibraries>true</UseDebugLibraries> + <PlatformToolset>v141</PlatformToolset> + <CharacterSet>Unicode</CharacterSet> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> + <ConfigurationType>Application</ConfigurationType> + <UseDebugLibraries>false</UseDebugLibraries> + <PlatformToolset>v141</PlatformToolset> + <WholeProgramOptimization>true</WholeProgramOptimization> + <CharacterSet>Unicode</CharacterSet> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration"> + <ConfigurationType>Application</ConfigurationType> + <UseDebugLibraries>true</UseDebugLibraries> + <PlatformToolset>v141</PlatformToolset> + <CharacterSet>Unicode</CharacterSet> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration"> + <ConfigurationType>Application</ConfigurationType> + <UseDebugLibraries>false</UseDebugLibraries> + <PlatformToolset>v141</PlatformToolset> + <WholeProgramOptimization>true</WholeProgramOptimization> + <CharacterSet>Unicode</CharacterSet> + </PropertyGroup> + <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> + <ImportGroup Label="ExtensionSettings"> + </ImportGroup> + <ImportGroup Label="Shared"> + </ImportGroup> + <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> + <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> + </ImportGroup> + <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> + <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> + </ImportGroup> + <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> + <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> + </ImportGroup> + <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> + <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> + </ImportGroup> + <PropertyGroup Label="UserMacros" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> + <LinkIncremental>false</LinkIncremental> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> + <LinkIncremental>true</LinkIncremental> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> + <LinkIncremental>true</LinkIncremental> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> + <LinkIncremental>false</LinkIncremental> + </PropertyGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> + <ClCompile> + <PrecompiledHeader>NotUsing</PrecompiledHeader> + <WarningLevel>Level3</WarningLevel> + <Optimization>MaxSpeed</Optimization> + <FunctionLevelLinking>true</FunctionLevelLinking> + <IntrinsicFunctions>true</IntrinsicFunctions> + <PreprocessorDefinitions>HAVE_CONFIG_H;_SCL_SECURE_NO_WARNINGS;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <SDLCheck>true</SDLCheck> + <AdditionalIncludeDirectories>..\..\src;..\..\src\univalue\include;</AdditionalIncludeDirectories> + <RuntimeLibrary>MultiThreaded</RuntimeLibrary> + </ClCompile> + <Link> + <SubSystem>Console</SubSystem> + <EnableCOMDATFolding>true</EnableCOMDATFolding> + <OptimizeReferences>true</OptimizeReferences> + <GenerateDebugInformation>true</GenerateDebugInformation> + <AdditionalDependencies>crypt32.lib;Iphlpapi.lib;ws2_32.lib;Shlwapi.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies> + </Link> + </ItemDefinitionGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> + <ClCompile> + <PrecompiledHeader>NotUsing</PrecompiledHeader> + <WarningLevel>Level3</WarningLevel> + <Optimization>Disabled</Optimization> + <PreprocessorDefinitions>HAVE_CONFIG_H;_SCL_SECURE_NO_WARNINGS;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <SDLCheck>true</SDLCheck> + <AdditionalIncludeDirectories>..\..\src;..\..\src\univalue\include;</AdditionalIncludeDirectories> + <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary> + </ClCompile> + <Link> + <SubSystem>Console</SubSystem> + <GenerateDebugInformation>true</GenerateDebugInformation> + <AdditionalDependencies>crypt32.lib;Iphlpapi.lib;ws2_32.lib;Shlwapi.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies> + </Link> + </ItemDefinitionGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> + <ClCompile> + <PrecompiledHeader>NotUsing</PrecompiledHeader> + <WarningLevel>Level3</WarningLevel> + <Optimization>Disabled</Optimization> + <PreprocessorDefinitions>HAVE_CONFIG_H;_SCL_SECURE_NO_WARNINGS;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <SDLCheck>true</SDLCheck> + <AdditionalIncludeDirectories>..\..\src;..\..\src\univalue\include;</AdditionalIncludeDirectories> + <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary> + </ClCompile> + <Link> + <SubSystem>Console</SubSystem> + <GenerateDebugInformation>true</GenerateDebugInformation> + <AdditionalDependencies>crypt32.lib;Iphlpapi.lib;ws2_32.lib;Shlwapi.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies> + </Link> + </ItemDefinitionGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> + <ClCompile> + <PrecompiledHeader>NotUsing</PrecompiledHeader> + <WarningLevel>Level3</WarningLevel> + <Optimization>MaxSpeed</Optimization> + <FunctionLevelLinking>true</FunctionLevelLinking> + <IntrinsicFunctions>true</IntrinsicFunctions> + <PreprocessorDefinitions>HAVE_CONFIG_H;_SCL_SECURE_NO_WARNINGS;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <SDLCheck>true</SDLCheck> + <AdditionalIncludeDirectories>..\..\src;..\..\src\univalue\include;</AdditionalIncludeDirectories> + <RuntimeLibrary>MultiThreaded</RuntimeLibrary> + </ClCompile> + <Link> + <SubSystem>Console</SubSystem> + <EnableCOMDATFolding>true</EnableCOMDATFolding> + <OptimizeReferences>true</OptimizeReferences> + <GenerateDebugInformation>true</GenerateDebugInformation> + <AdditionalDependencies>crypt32.lib;Iphlpapi.lib;ws2_32.lib;Shlwapi.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies> + </Link> + </ItemDefinitionGroup> + <Import Label="configTarget" Project="..\common.vcxproj" /> +</Project> diff --git a/build_msvc/bitcoin-tx/bitcoin-tx.vcxproj b/build_msvc/bitcoin-tx/bitcoin-tx.vcxproj new file mode 100644 index 0000000000..a9fae6b739 --- /dev/null +++ b/build_msvc/bitcoin-tx/bitcoin-tx.vcxproj @@ -0,0 +1,180 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <Import Label="configInitTarget" Project="..\common.init.vcxproj" /> + <ItemGroup Label="ProjectConfigurations"> + <ProjectConfiguration Include="Debug|Win32"> + <Configuration>Debug</Configuration> + <Platform>Win32</Platform> + </ProjectConfiguration> + <ProjectConfiguration Include="Release|Win32"> + <Configuration>Release</Configuration> + <Platform>Win32</Platform> + </ProjectConfiguration> + <ProjectConfiguration Include="Debug|x64"> + <Configuration>Debug</Configuration> + <Platform>x64</Platform> + </ProjectConfiguration> + <ProjectConfiguration Include="Release|x64"> + <Configuration>Release</Configuration> + <Platform>x64</Platform> + </ProjectConfiguration> + </ItemGroup> + <ItemGroup> + <ClCompile Include="..\..\src\bitcoin-tx.cpp" /> + </ItemGroup> + <ItemGroup> + <ProjectReference Include="..\libbitcoinconsensus\libbitcoinconsensus.vcxproj"> + <Project>{2b384fa8-9ee1-4544-93cb-0d733c25e8ce}</Project> + </ProjectReference> + <ProjectReference Include="..\libbitcoin_common\libbitcoin_common.vcxproj"> + <Project>{7c87e378-df58-482e-aa2f-1bc129bc19ce}</Project> + </ProjectReference> + <ProjectReference Include="..\libbitcoin_crypto\libbitcoin_crypto.vcxproj"> + <Project>{6190199c-6cf4-4dad-bfbd-93fa72a760c1}</Project> + </ProjectReference> + <ProjectReference Include="..\libbitcoin_util\libbitcoin_util.vcxproj"> + <Project>{b53a5535-ee9d-4c6f-9a26-f79ee3bc3754}</Project> + </ProjectReference> + <ProjectReference Include="..\libunivalue\libunivalue.vcxproj"> + <Project>{5724ba7d-a09a-4ba8-800b-c4c1561b3d69}</Project> + </ProjectReference> + </ItemGroup> + <PropertyGroup Label="Globals"> + <VCProjectVersion>15.0</VCProjectVersion> + <ProjectGuid>{D3022AF6-AD33-4CE3-B358-87CB6A1B29CF}</ProjectGuid> + <Keyword>Win32Proj</Keyword> + <RootNamespace>bitcointx</RootNamespace> + <VcpkgTriplet Condition="'$(Platform)'=='Win32'">x86-windows-static</VcpkgTriplet> + <VcpkgTriplet Condition="'$(Platform)'=='x64'">x64-windows-static</VcpkgTriplet> + </PropertyGroup> + <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> + <ConfigurationType>Application</ConfigurationType> + <UseDebugLibraries>true</UseDebugLibraries> + <PlatformToolset>v141</PlatformToolset> + <CharacterSet>Unicode</CharacterSet> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> + <ConfigurationType>Application</ConfigurationType> + <UseDebugLibraries>false</UseDebugLibraries> + <PlatformToolset>v141</PlatformToolset> + <WholeProgramOptimization>true</WholeProgramOptimization> + <CharacterSet>Unicode</CharacterSet> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration"> + <ConfigurationType>Application</ConfigurationType> + <UseDebugLibraries>true</UseDebugLibraries> + <PlatformToolset>v141</PlatformToolset> + <CharacterSet>Unicode</CharacterSet> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration"> + <ConfigurationType>Application</ConfigurationType> + <UseDebugLibraries>false</UseDebugLibraries> + <PlatformToolset>v141</PlatformToolset> + <WholeProgramOptimization>true</WholeProgramOptimization> + <CharacterSet>Unicode</CharacterSet> + </PropertyGroup> + <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> + <ImportGroup Label="ExtensionSettings"> + </ImportGroup> + <ImportGroup Label="Shared"> + </ImportGroup> + <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> + <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> + </ImportGroup> + <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> + <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> + </ImportGroup> + <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> + <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> + </ImportGroup> + <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> + <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> + </ImportGroup> + <PropertyGroup Label="UserMacros" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> + <LinkIncremental>false</LinkIncremental> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> + <LinkIncremental>true</LinkIncremental> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> + <LinkIncremental>true</LinkIncremental> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> + <LinkIncremental>false</LinkIncremental> + </PropertyGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> + <ClCompile> + <PrecompiledHeader>NotUsing</PrecompiledHeader> + <WarningLevel>Level3</WarningLevel> + <Optimization>MaxSpeed</Optimization> + <FunctionLevelLinking>true</FunctionLevelLinking> + <IntrinsicFunctions>true</IntrinsicFunctions> + <PreprocessorDefinitions>HAVE_CONFIG_H;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <SDLCheck>true</SDLCheck> + <AdditionalIncludeDirectories>..\..\src;..\..\src\univalue\include;</AdditionalIncludeDirectories> + <RuntimeLibrary>MultiThreaded</RuntimeLibrary> + </ClCompile> + <Link> + <SubSystem>Console</SubSystem> + <EnableCOMDATFolding>true</EnableCOMDATFolding> + <OptimizeReferences>true</OptimizeReferences> + <GenerateDebugInformation>true</GenerateDebugInformation> + <AdditionalDependencies>crypt32.lib;Iphlpapi.lib;ws2_32.lib;Shlwapi.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies> + </Link> + </ItemDefinitionGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> + <ClCompile> + <PrecompiledHeader>NotUsing</PrecompiledHeader> + <WarningLevel>Level3</WarningLevel> + <Optimization>Disabled</Optimization> + <PreprocessorDefinitions>HAVE_CONFIG_H;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <SDLCheck>true</SDLCheck> + <AdditionalIncludeDirectories>..\..\src;..\..\src\univalue\include;</AdditionalIncludeDirectories> + <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary> + </ClCompile> + <Link> + <SubSystem>Console</SubSystem> + <GenerateDebugInformation>true</GenerateDebugInformation> + <AdditionalDependencies>crypt32.lib;Iphlpapi.lib;ws2_32.lib;Shlwapi.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies> + </Link> + </ItemDefinitionGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> + <ClCompile> + <PrecompiledHeader>NotUsing</PrecompiledHeader> + <WarningLevel>Level3</WarningLevel> + <Optimization>Disabled</Optimization> + <PreprocessorDefinitions>HAVE_CONFIG_H;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <SDLCheck>true</SDLCheck> + <AdditionalIncludeDirectories>..\..\src;..\..\src\univalue\include;</AdditionalIncludeDirectories> + <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary> + </ClCompile> + <Link> + <SubSystem>Console</SubSystem> + <GenerateDebugInformation>true</GenerateDebugInformation> + <AdditionalDependencies>crypt32.lib;Iphlpapi.lib;ws2_32.lib;Shlwapi.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies> + </Link> + </ItemDefinitionGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> + <ClCompile> + <PrecompiledHeader>NotUsing</PrecompiledHeader> + <WarningLevel>Level3</WarningLevel> + <Optimization>MaxSpeed</Optimization> + <FunctionLevelLinking>true</FunctionLevelLinking> + <IntrinsicFunctions>true</IntrinsicFunctions> + <PreprocessorDefinitions>HAVE_CONFIG_H;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <SDLCheck>true</SDLCheck> + <AdditionalIncludeDirectories>..\..\src;..\..\src\univalue\include;</AdditionalIncludeDirectories> + <RuntimeLibrary>MultiThreaded</RuntimeLibrary> + </ClCompile> + <Link> + <SubSystem>Console</SubSystem> + <EnableCOMDATFolding>true</EnableCOMDATFolding> + <OptimizeReferences>true</OptimizeReferences> + <GenerateDebugInformation>true</GenerateDebugInformation> + <AdditionalDependencies>crypt32.lib;Iphlpapi.lib;ws2_32.lib;Shlwapi.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies> + </Link> + </ItemDefinitionGroup> + <Import Label="configTarget" Project="..\common.vcxproj" /> +</Project> diff --git a/build_msvc/bitcoin.sln b/build_msvc/bitcoin.sln new file mode 100644 index 0000000000..32068d81f6 --- /dev/null +++ b/build_msvc/bitcoin.sln @@ -0,0 +1,172 @@ +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio 15 +VisualStudioVersion = 15.0.27130.2027 +MinimumVisualStudioVersion = 10.0.40219.1 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libbitcoin_consensus", "libbitcoinconsensus\libbitcoinconsensus.vcxproj", "{2B384FA8-9EE1-4544-93CB-0D733C25E8CE}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_libbitcoinconsensus", "testconsensus\testconsensus.vcxproj", "{E78473E9-B850-456C-9120-276301E04C06}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "bitcoind", "bitcoind\bitcoind.vcxproj", "{D4513DDF-6013-44DC-ADCC-12EAF6D1F038}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libbitcoin_util", "libbitcoin_util\libbitcoin_util.vcxproj", "{B53A5535-EE9D-4C6F-9A26-F79EE3BC3754}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libbitcoin_common", "libbitcoin_common\libbitcoin_common.vcxproj", "{7C87E378-DF58-482E-AA2F-1BC129BC19CE}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libbitcoin_crypto", "libbitcoin_crypto\libbitcoin_crypto.vcxproj", "{6190199C-6CF4-4DAD-BFBD-93FA72A760C1}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libbitcoin_server", "libbitcoin_server\libbitcoin_server.vcxproj", "{460FEE33-1FE1-483F-B3BF-931FF8E969A5}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libunivalue", "libunivalue\libunivalue.vcxproj", "{5724BA7D-A09A-4BA8-800B-C4C1561B3D69}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libbitcoin_wallet", "libbitcoin_wallet\libbitcoin_wallet.vcxproj", "{93B86837-B543-48A5-A89B-7C87ABB77DF2}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libbitcoin_zmq", "libbitcoin_zmq\libbitcoin_zmq.vcxproj", "{792D487F-F14C-49FC-A9DE-3FC150F31C3F}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_bitcoin", "test_bitcoin\test_bitcoin.vcxproj", "{A56B73DB-D46D-4882-8374-1FE3FFA08F07}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libbitcoin_cli", "libbitcoin_cli\libbitcoin_cli.vcxproj", "{0667528C-D734-4009-ADF9-C0D6C4A5A5A6}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "bitcoin-cli", "bitcoin-cli\bitcoin-cli.vcxproj", "{0B2D7431-F876-4A58-87BF-F748338CD3BF}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "bench_bitcoin", "bench_bitcoin\bench_bitcoin.vcxproj", "{1125654E-E1B2-4431-8B5C-62EA9A2FEECB}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "bitcoin-tx", "bitcoin-tx\bitcoin-tx.vcxproj", "{D3022AF6-AD33-4CE3-B358-87CB6A1B29CF}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|x64 = Debug|x64 + Debug|x86 = Debug|x86 + Release|x64 = Release|x64 + Release|x86 = Release|x86 + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {2B384FA8-9EE1-4544-93CB-0D733C25E8CE}.Debug|x64.ActiveCfg = Debug|x64 + {2B384FA8-9EE1-4544-93CB-0D733C25E8CE}.Debug|x64.Build.0 = Debug|x64 + {2B384FA8-9EE1-4544-93CB-0D733C25E8CE}.Debug|x86.ActiveCfg = Debug|Win32 + {2B384FA8-9EE1-4544-93CB-0D733C25E8CE}.Debug|x86.Build.0 = Debug|Win32 + {2B384FA8-9EE1-4544-93CB-0D733C25E8CE}.Release|x64.ActiveCfg = Release|x64 + {2B384FA8-9EE1-4544-93CB-0D733C25E8CE}.Release|x64.Build.0 = Release|x64 + {2B384FA8-9EE1-4544-93CB-0D733C25E8CE}.Release|x86.ActiveCfg = Release|Win32 + {2B384FA8-9EE1-4544-93CB-0D733C25E8CE}.Release|x86.Build.0 = Release|Win32 + {E78473E9-B850-456C-9120-276301E04C06}.Debug|x64.ActiveCfg = Debug|x64 + {E78473E9-B850-456C-9120-276301E04C06}.Debug|x64.Build.0 = Debug|x64 + {E78473E9-B850-456C-9120-276301E04C06}.Debug|x86.ActiveCfg = Debug|Win32 + {E78473E9-B850-456C-9120-276301E04C06}.Debug|x86.Build.0 = Debug|Win32 + {E78473E9-B850-456C-9120-276301E04C06}.Release|x64.ActiveCfg = Release|x64 + {E78473E9-B850-456C-9120-276301E04C06}.Release|x64.Build.0 = Release|x64 + {E78473E9-B850-456C-9120-276301E04C06}.Release|x86.ActiveCfg = Release|Win32 + {E78473E9-B850-456C-9120-276301E04C06}.Release|x86.Build.0 = Release|Win32 + {D4513DDF-6013-44DC-ADCC-12EAF6D1F038}.Debug|x64.ActiveCfg = Debug|x64 + {D4513DDF-6013-44DC-ADCC-12EAF6D1F038}.Debug|x64.Build.0 = Debug|x64 + {D4513DDF-6013-44DC-ADCC-12EAF6D1F038}.Debug|x86.ActiveCfg = Debug|Win32 + {D4513DDF-6013-44DC-ADCC-12EAF6D1F038}.Debug|x86.Build.0 = Debug|Win32 + {D4513DDF-6013-44DC-ADCC-12EAF6D1F038}.Release|x64.ActiveCfg = Release|x64 + {D4513DDF-6013-44DC-ADCC-12EAF6D1F038}.Release|x64.Build.0 = Release|x64 + {D4513DDF-6013-44DC-ADCC-12EAF6D1F038}.Release|x86.ActiveCfg = Release|Win32 + {D4513DDF-6013-44DC-ADCC-12EAF6D1F038}.Release|x86.Build.0 = Release|Win32 + {B53A5535-EE9D-4C6F-9A26-F79EE3BC3754}.Debug|x64.ActiveCfg = Debug|x64 + {B53A5535-EE9D-4C6F-9A26-F79EE3BC3754}.Debug|x64.Build.0 = Debug|x64 + {B53A5535-EE9D-4C6F-9A26-F79EE3BC3754}.Debug|x86.ActiveCfg = Debug|Win32 + {B53A5535-EE9D-4C6F-9A26-F79EE3BC3754}.Debug|x86.Build.0 = Debug|Win32 + {B53A5535-EE9D-4C6F-9A26-F79EE3BC3754}.Release|x64.ActiveCfg = Release|x64 + {B53A5535-EE9D-4C6F-9A26-F79EE3BC3754}.Release|x64.Build.0 = Release|x64 + {B53A5535-EE9D-4C6F-9A26-F79EE3BC3754}.Release|x86.ActiveCfg = Release|Win32 + {B53A5535-EE9D-4C6F-9A26-F79EE3BC3754}.Release|x86.Build.0 = Release|Win32 + {7C87E378-DF58-482E-AA2F-1BC129BC19CE}.Debug|x64.ActiveCfg = Debug|x64 + {7C87E378-DF58-482E-AA2F-1BC129BC19CE}.Debug|x64.Build.0 = Debug|x64 + {7C87E378-DF58-482E-AA2F-1BC129BC19CE}.Debug|x86.ActiveCfg = Debug|Win32 + {7C87E378-DF58-482E-AA2F-1BC129BC19CE}.Debug|x86.Build.0 = Debug|Win32 + {7C87E378-DF58-482E-AA2F-1BC129BC19CE}.Release|x64.ActiveCfg = Release|x64 + {7C87E378-DF58-482E-AA2F-1BC129BC19CE}.Release|x64.Build.0 = Release|x64 + {7C87E378-DF58-482E-AA2F-1BC129BC19CE}.Release|x86.ActiveCfg = Release|Win32 + {7C87E378-DF58-482E-AA2F-1BC129BC19CE}.Release|x86.Build.0 = Release|Win32 + {6190199C-6CF4-4DAD-BFBD-93FA72A760C1}.Debug|x64.ActiveCfg = Debug|x64 + {6190199C-6CF4-4DAD-BFBD-93FA72A760C1}.Debug|x64.Build.0 = Debug|x64 + {6190199C-6CF4-4DAD-BFBD-93FA72A760C1}.Debug|x86.ActiveCfg = Debug|Win32 + {6190199C-6CF4-4DAD-BFBD-93FA72A760C1}.Debug|x86.Build.0 = Debug|Win32 + {6190199C-6CF4-4DAD-BFBD-93FA72A760C1}.Release|x64.ActiveCfg = Release|x64 + {6190199C-6CF4-4DAD-BFBD-93FA72A760C1}.Release|x64.Build.0 = Release|x64 + {6190199C-6CF4-4DAD-BFBD-93FA72A760C1}.Release|x86.ActiveCfg = Release|Win32 + {6190199C-6CF4-4DAD-BFBD-93FA72A760C1}.Release|x86.Build.0 = Release|Win32 + {460FEE33-1FE1-483F-B3BF-931FF8E969A5}.Debug|x64.ActiveCfg = Debug|x64 + {460FEE33-1FE1-483F-B3BF-931FF8E969A5}.Debug|x64.Build.0 = Debug|x64 + {460FEE33-1FE1-483F-B3BF-931FF8E969A5}.Debug|x86.ActiveCfg = Debug|Win32 + {460FEE33-1FE1-483F-B3BF-931FF8E969A5}.Debug|x86.Build.0 = Debug|Win32 + {460FEE33-1FE1-483F-B3BF-931FF8E969A5}.Release|x64.ActiveCfg = Release|x64 + {460FEE33-1FE1-483F-B3BF-931FF8E969A5}.Release|x64.Build.0 = Release|x64 + {460FEE33-1FE1-483F-B3BF-931FF8E969A5}.Release|x86.ActiveCfg = Release|Win32 + {460FEE33-1FE1-483F-B3BF-931FF8E969A5}.Release|x86.Build.0 = Release|Win32 + {5724BA7D-A09A-4BA8-800B-C4C1561B3D69}.Debug|x64.ActiveCfg = Debug|x64 + {5724BA7D-A09A-4BA8-800B-C4C1561B3D69}.Debug|x64.Build.0 = Debug|x64 + {5724BA7D-A09A-4BA8-800B-C4C1561B3D69}.Debug|x86.ActiveCfg = Debug|Win32 + {5724BA7D-A09A-4BA8-800B-C4C1561B3D69}.Debug|x86.Build.0 = Debug|Win32 + {5724BA7D-A09A-4BA8-800B-C4C1561B3D69}.Release|x64.ActiveCfg = Release|x64 + {5724BA7D-A09A-4BA8-800B-C4C1561B3D69}.Release|x64.Build.0 = Release|x64 + {5724BA7D-A09A-4BA8-800B-C4C1561B3D69}.Release|x86.ActiveCfg = Release|Win32 + {5724BA7D-A09A-4BA8-800B-C4C1561B3D69}.Release|x86.Build.0 = Release|Win32 + {93B86837-B543-48A5-A89B-7C87ABB77DF2}.Debug|x64.ActiveCfg = Debug|x64 + {93B86837-B543-48A5-A89B-7C87ABB77DF2}.Debug|x64.Build.0 = Debug|x64 + {93B86837-B543-48A5-A89B-7C87ABB77DF2}.Debug|x86.ActiveCfg = Debug|Win32 + {93B86837-B543-48A5-A89B-7C87ABB77DF2}.Debug|x86.Build.0 = Debug|Win32 + {93B86837-B543-48A5-A89B-7C87ABB77DF2}.Release|x64.ActiveCfg = Release|x64 + {93B86837-B543-48A5-A89B-7C87ABB77DF2}.Release|x64.Build.0 = Release|x64 + {93B86837-B543-48A5-A89B-7C87ABB77DF2}.Release|x86.ActiveCfg = Release|Win32 + {93B86837-B543-48A5-A89B-7C87ABB77DF2}.Release|x86.Build.0 = Release|Win32 + {792D487F-F14C-49FC-A9DE-3FC150F31C3F}.Debug|x64.ActiveCfg = Debug|x64 + {792D487F-F14C-49FC-A9DE-3FC150F31C3F}.Debug|x64.Build.0 = Debug|x64 + {792D487F-F14C-49FC-A9DE-3FC150F31C3F}.Debug|x86.ActiveCfg = Debug|Win32 + {792D487F-F14C-49FC-A9DE-3FC150F31C3F}.Debug|x86.Build.0 = Debug|Win32 + {792D487F-F14C-49FC-A9DE-3FC150F31C3F}.Release|x64.ActiveCfg = Release|x64 + {792D487F-F14C-49FC-A9DE-3FC150F31C3F}.Release|x64.Build.0 = Release|x64 + {792D487F-F14C-49FC-A9DE-3FC150F31C3F}.Release|x86.ActiveCfg = Release|Win32 + {792D487F-F14C-49FC-A9DE-3FC150F31C3F}.Release|x86.Build.0 = Release|Win32 + {A56B73DB-D46D-4882-8374-1FE3FFA08F07}.Debug|x64.ActiveCfg = Debug|x64 + {A56B73DB-D46D-4882-8374-1FE3FFA08F07}.Debug|x64.Build.0 = Debug|x64 + {A56B73DB-D46D-4882-8374-1FE3FFA08F07}.Debug|x86.ActiveCfg = Debug|Win32 + {A56B73DB-D46D-4882-8374-1FE3FFA08F07}.Debug|x86.Build.0 = Debug|Win32 + {A56B73DB-D46D-4882-8374-1FE3FFA08F07}.Release|x64.ActiveCfg = Release|x64 + {A56B73DB-D46D-4882-8374-1FE3FFA08F07}.Release|x64.Build.0 = Release|x64 + {A56B73DB-D46D-4882-8374-1FE3FFA08F07}.Release|x86.ActiveCfg = Release|Win32 + {A56B73DB-D46D-4882-8374-1FE3FFA08F07}.Release|x86.Build.0 = Release|Win32 + {0667528C-D734-4009-ADF9-C0D6C4A5A5A6}.Debug|x64.ActiveCfg = Debug|x64 + {0667528C-D734-4009-ADF9-C0D6C4A5A5A6}.Debug|x64.Build.0 = Debug|x64 + {0667528C-D734-4009-ADF9-C0D6C4A5A5A6}.Debug|x86.ActiveCfg = Debug|Win32 + {0667528C-D734-4009-ADF9-C0D6C4A5A5A6}.Debug|x86.Build.0 = Debug|Win32 + {0667528C-D734-4009-ADF9-C0D6C4A5A5A6}.Release|x64.ActiveCfg = Release|x64 + {0667528C-D734-4009-ADF9-C0D6C4A5A5A6}.Release|x64.Build.0 = Release|x64 + {0667528C-D734-4009-ADF9-C0D6C4A5A5A6}.Release|x86.ActiveCfg = Release|Win32 + {0667528C-D734-4009-ADF9-C0D6C4A5A5A6}.Release|x86.Build.0 = Release|Win32 + {0B2D7431-F876-4A58-87BF-F748338CD3BF}.Debug|x64.ActiveCfg = Debug|x64 + {0B2D7431-F876-4A58-87BF-F748338CD3BF}.Debug|x64.Build.0 = Debug|x64 + {0B2D7431-F876-4A58-87BF-F748338CD3BF}.Debug|x86.ActiveCfg = Debug|Win32 + {0B2D7431-F876-4A58-87BF-F748338CD3BF}.Debug|x86.Build.0 = Debug|Win32 + {0B2D7431-F876-4A58-87BF-F748338CD3BF}.Release|x64.ActiveCfg = Release|x64 + {0B2D7431-F876-4A58-87BF-F748338CD3BF}.Release|x64.Build.0 = Release|x64 + {0B2D7431-F876-4A58-87BF-F748338CD3BF}.Release|x86.ActiveCfg = Release|Win32 + {0B2D7431-F876-4A58-87BF-F748338CD3BF}.Release|x86.Build.0 = Release|Win32 + {1125654E-E1B2-4431-8B5C-62EA9A2FEECB}.Debug|x64.ActiveCfg = Debug|x64 + {1125654E-E1B2-4431-8B5C-62EA9A2FEECB}.Debug|x64.Build.0 = Debug|x64 + {1125654E-E1B2-4431-8B5C-62EA9A2FEECB}.Debug|x86.ActiveCfg = Debug|Win32 + {1125654E-E1B2-4431-8B5C-62EA9A2FEECB}.Debug|x86.Build.0 = Debug|Win32 + {1125654E-E1B2-4431-8B5C-62EA9A2FEECB}.Release|x64.ActiveCfg = Release|x64 + {1125654E-E1B2-4431-8B5C-62EA9A2FEECB}.Release|x64.Build.0 = Release|x64 + {1125654E-E1B2-4431-8B5C-62EA9A2FEECB}.Release|x86.ActiveCfg = Release|Win32 + {1125654E-E1B2-4431-8B5C-62EA9A2FEECB}.Release|x86.Build.0 = Release|Win32 + {D3022AF6-AD33-4CE3-B358-87CB6A1B29CF}.Debug|x64.ActiveCfg = Debug|x64 + {D3022AF6-AD33-4CE3-B358-87CB6A1B29CF}.Debug|x64.Build.0 = Debug|x64 + {D3022AF6-AD33-4CE3-B358-87CB6A1B29CF}.Debug|x86.ActiveCfg = Debug|Win32 + {D3022AF6-AD33-4CE3-B358-87CB6A1B29CF}.Debug|x86.Build.0 = Debug|Win32 + {D3022AF6-AD33-4CE3-B358-87CB6A1B29CF}.Release|x64.ActiveCfg = Release|x64 + {D3022AF6-AD33-4CE3-B358-87CB6A1B29CF}.Release|x64.Build.0 = Release|x64 + {D3022AF6-AD33-4CE3-B358-87CB6A1B29CF}.Release|x86.ActiveCfg = Release|Win32 + {D3022AF6-AD33-4CE3-B358-87CB6A1B29CF}.Release|x86.Build.0 = Release|Win32 + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection + GlobalSection(ExtensibilityGlobals) = postSolution + SolutionGuid = {4ABD1207-9A90-4EC9-A8EB-203638A2605D} + SolutionGuid = {2FB733C9-24CB-4BA5-A26B-F43DAD7996B7} + SolutionGuid = {D0CAE2D0-8DB1-4A0B-80EE-800AA6C64323} + SolutionGuid = {DA7D16A6-E5F0-45B3-B194-C3FE64F1BFCD} + EndGlobalSection diff --git a/build_msvc/bitcoin_config.h b/build_msvc/bitcoin_config.h new file mode 100644 index 0000000000..4ac27dae3f --- /dev/null +++ b/build_msvc/bitcoin_config.h @@ -0,0 +1,424 @@ +#ifndef BITCOIN_BITCOIN_CONFIG_H +#define BITCOIN_BITCOIN_CONFIG_H + +/* Define if building universal (internal helper macro) */ +/* #undef AC_APPLE_UNIVERSAL_BUILD */ + +/* Version Build */ +#define CLIENT_VERSION_BUILD 0 + +/* Version is release */ +#define CLIENT_VERSION_IS_RELEASE false + +/* Major version */ +#define CLIENT_VERSION_MAJOR 1 + +/* Minor version */ +#define CLIENT_VERSION_MINOR 17 + +/* Build revision */ +#define CLIENT_VERSION_REVISION 99 + +/* Copyright holder(s) before %s replacement */ +#define COPYRIGHT_HOLDERS "The %s developers" + +/* Copyright holder(s) */ +#define COPYRIGHT_HOLDERS_FINAL "The Bitcoin Core developers" + +/* Replacement for %s in copyright holders string */ +#define COPYRIGHT_HOLDERS_SUBSTITUTION "Bitcoin Core" + +/* Copyright year */ +#define COPYRIGHT_YEAR 2018 + +/* Define to 1 to enable wallet functions */ +#define ENABLE_WALLET 1 + +/* Define to 1 to enable ZMQ functions */ +#define ENABLE_ZMQ 1 + +/* parameter and return value type for __fdelt_chk */ +/* #undef FDELT_TYPE */ + +/* define if the Boost library is available */ +#define HAVE_BOOST /**/ + +/* define if the Boost::Chrono library is available */ +#define HAVE_BOOST_CHRONO /**/ + +/* define if the Boost::Filesystem library is available */ +#define HAVE_BOOST_FILESYSTEM /**/ + +/* define if the Boost::PROGRAM_OPTIONS library is available */ +#define HAVE_BOOST_PROGRAM_OPTIONS /**/ + +/* define if the Boost::System library is available */ +#define HAVE_BOOST_SYSTEM /**/ + +/* define if the Boost::Thread library is available */ +#define HAVE_BOOST_THREAD /**/ + +/* define if the Boost::Unit_Test_Framework library is available */ +#define HAVE_BOOST_UNIT_TEST_FRAMEWORK /**/ + +/* Define to 1 if you have the <byteswap.h> header file. */ +/* #undef HAVE_BYTESWAP_H */ + +/* Define this symbol if the consensus lib has been built */ +#define HAVE_CONSENSUS_LIB 1 + +/* define if the compiler supports basic C++11 syntax */ +#define HAVE_CXX11 1 + +/* Define to 1 if you have the declaration of `be16toh', and to 0 if you + don't. */ +#define HAVE_DECL_BE16TOH 0 + +/* Define to 1 if you have the declaration of `be32toh', and to 0 if you + don't. */ +#define HAVE_DECL_BE32TOH 0 + +/* Define to 1 if you have the declaration of `be64toh', and to 0 if you + don't. */ +#define HAVE_DECL_BE64TOH 0 + +/* Define to 1 if you have the declaration of `bswap_16', and to 0 if you + don't. */ +#define HAVE_DECL_BSWAP_16 0 + +/* Define to 1 if you have the declaration of `bswap_32', and to 0 if you + don't. */ +#define HAVE_DECL_BSWAP_32 0 + +/* Define to 1 if you have the declaration of `bswap_64', and to 0 if you + don't. */ +#define HAVE_DECL_BSWAP_64 0 + +/* Define to 1 if you have the declaration of `daemon', and to 0 if you don't. + */ +#define HAVE_DECL_DAEMON 0 + +/* Define to 1 if you have the declaration of `EVP_MD_CTX_new', and to 0 if + you don't. */ +//#define HAVE_DECL_EVP_MD_CTX_NEW 1 + +/* Define to 1 if you have the declaration of `htobe16', and to 0 if you + don't. */ +#define HAVE_DECL_HTOBE16 0 + +/* Define to 1 if you have the declaration of `htobe32', and to 0 if you + don't. */ +#define HAVE_DECL_HTOBE32 0 + +/* Define to 1 if you have the declaration of `htobe64', and to 0 if you + don't. */ +#define HAVE_DECL_HTOBE64 0 + +/* Define to 1 if you have the declaration of `htole16', and to 0 if you + don't. */ +#define HAVE_DECL_HTOLE16 0 + +/* Define to 1 if you have the declaration of `htole32', and to 0 if you + don't. */ +#define HAVE_DECL_HTOLE32 0 + +/* Define to 1 if you have the declaration of `htole64', and to 0 if you + don't. */ +#define HAVE_DECL_HTOLE64 0 + +/* Define to 1 if you have the declaration of `le16toh', and to 0 if you + don't. */ +#define HAVE_DECL_LE16TOH 0 + +/* Define to 1 if you have the declaration of `le32toh', and to 0 if you + don't. */ +#define HAVE_DECL_LE32TOH 0 + +/* Define to 1 if you have the declaration of `le64toh', and to 0 if you + don't. */ +#define HAVE_DECL_LE64TOH 0 + +/* Define to 1 if you have the declaration of `strerror_r', and to 0 if you + don't. */ +#define HAVE_DECL_STRERROR_R 0 + +/* Define to 1 if you have the declaration of `strnlen', and to 0 if you + don't. */ +#define HAVE_DECL_STRNLEN 1 + +/* Define to 1 if you have the declaration of `__builtin_clz', and to 0 if you + don't. */ +//#define HAVE_DECL___BUILTIN_CLZ 1 + +/* Define to 1 if you have the declaration of `__builtin_clzl', and to 0 if + you don't. */ +//#define HAVE_DECL___BUILTIN_CLZL 1 + +/* Define to 1 if you have the declaration of `__builtin_clzll', and to 0 if + you don't. */ +//#define HAVE_DECL___BUILTIN_CLZLL 1 + +/* Define to 1 if you have the <dlfcn.h> header file. */ +/* #undef HAVE_DLFCN_H */ + +/* Define to 1 if you have the <endian.h> header file. */ +/* #undef HAVE_ENDIAN_H */ + +/* Define to 1 if the system has the `dllexport' function attribute */ +#define HAVE_FUNC_ATTRIBUTE_DLLEXPORT 1 + +/* Define to 1 if the system has the `dllimport' function attribute */ +#define HAVE_FUNC_ATTRIBUTE_DLLIMPORT 1 + +/* Define to 1 if the system has the `visibility' function attribute */ +#define HAVE_FUNC_ATTRIBUTE_VISIBILITY 1 + +/* Define this symbol if the BSD getentropy system call is available */ +/* #undef HAVE_GETENTROPY */ + +/* Define this symbol if the BSD getentropy system call is available with + sys/random.h */ +/* #undef HAVE_GETENTROPY_RAND */ + +/* Define to 1 if you have the <inttypes.h> header file. */ +#define HAVE_INTTYPES_H 1 + +/* Define to 1 if you have the `advapi32' library (-ladvapi32). */ +#define HAVE_LIBADVAPI32 1 + +/* Define to 1 if you have the `comctl32' library (-lcomctl32). */ +#define HAVE_LIBCOMCTL32 1 + +/* Define to 1 if you have the `comdlg32' library (-lcomdlg32). */ +#define HAVE_LIBCOMDLG32 1 + +/* Define to 1 if you have the `crypt32' library (-lcrypt32). */ +#define HAVE_LIBCRYPT32 1 + +/* Define to 1 if you have the `gdi32' library (-lgdi32). */ +#define HAVE_LIBGDI32 1 + +/* Define to 1 if you have the `imm32' library (-limm32). */ +#define HAVE_LIBIMM32 1 + +/* Define to 1 if you have the `iphlpapi' library (-liphlpapi). */ +#define HAVE_LIBIPHLPAPI 1 + +/* Define to 1 if you have the `kernel32' library (-lkernel32). */ +#define HAVE_LIBKERNEL32 1 + +/* Define to 1 if you have the `mingwthrd' library (-lmingwthrd). */ +#define HAVE_LIBMINGWTHRD 1 + +/* Define to 1 if you have the `mswsock' library (-lmswsock). */ +#define HAVE_LIBMSWSOCK 1 + +/* Define to 1 if you have the `ole32' library (-lole32). */ +#define HAVE_LIBOLE32 1 + +/* Define to 1 if you have the `oleaut32' library (-loleaut32). */ +#define HAVE_LIBOLEAUT32 1 + +/* Define to 1 if you have the `rpcrt4' library (-lrpcrt4). */ +#define HAVE_LIBRPCRT4 1 + +/* Define to 1 if you have the `rt' library (-lrt). */ +/* #undef HAVE_LIBRT */ + +/* Define to 1 if you have the `shell32' library (-lshell32). */ +#define HAVE_LIBSHELL32 1 + +/* Define to 1 if you have the `shlwapi' library (-lshlwapi). */ +#define HAVE_LIBSHLWAPI 1 + +/* Define to 1 if you have the `ssp' library (-lssp). */ +#define HAVE_LIBSSP 1 + +/* Define to 1 if you have the `user32' library (-luser32). */ +#define HAVE_LIBUSER32 1 + +/* Define to 1 if you have the `uuid' library (-luuid). */ +#define HAVE_LIBUUID 1 + +/* Define to 1 if you have the `winmm' library (-lwinmm). */ +#define HAVE_LIBWINMM 1 + +/* Define to 1 if you have the `winspool' library (-lwinspool). */ +#define HAVE_LIBWINSPOOL 1 + +/* Define to 1 if you have the `ws2_32' library (-lws2_32). */ +#define HAVE_LIBWS2_32 1 + +/* Define to 1 if you have the `z ' library (-lz ). */ +#define HAVE_LIBZ_ 1 + +/* Define this symbol if you have malloc_info */ +/* #undef HAVE_MALLOC_INFO */ + +/* Define this symbol if you have mallopt with M_ARENA_MAX */ +/* #undef HAVE_MALLOPT_ARENA_MAX */ + +/* Define to 1 if you have the <memory.h> header file. */ +#define HAVE_MEMORY_H 1 + +/* Define to 1 if you have the <miniupnpc/miniupnpc.h> header file. */ +#define HAVE_MINIUPNPC_MINIUPNPC_H 1 + +/* Define to 1 if you have the <miniupnpc/miniwget.h> header file. */ +#define HAVE_MINIUPNPC_MINIWGET_H 1 + +/* Define to 1 if you have the <miniupnpc/upnpcommands.h> header file. */ +#define HAVE_MINIUPNPC_UPNPCOMMANDS_H 1 + +/* Define to 1 if you have the <miniupnpc/upnperrors.h> header file. */ +#define HAVE_MINIUPNPC_UPNPERRORS_H 1 + +/* Define this symbol if you have MSG_DONTWAIT */ +/* #undef HAVE_MSG_DONTWAIT */ + +/* Define this symbol if you have MSG_NOSIGNAL */ +/* #undef HAVE_MSG_NOSIGNAL */ + +/* Define if you have POSIX threads libraries and header files. */ +//#define HAVE_PTHREAD 1 + +/* Have PTHREAD_PRIO_INHERIT. */ +//#define HAVE_PTHREAD_PRIO_INHERIT 1 + +/* Define to 1 if you have the <stdint.h> header file. */ +#define HAVE_STDINT_H 1 + +/* Define to 1 if you have the <stdio.h> header file. */ +#define HAVE_STDIO_H 1 + +/* Define to 1 if you have the <stdlib.h> header file. */ +#define HAVE_STDLIB_H 1 + +/* Define to 1 if you have the `strerror_r' function. */ +/* #undef HAVE_STRERROR_R */ + +/* Define to 1 if you have the <strings.h> header file. */ +#define HAVE_STRINGS_H 1 + +/* Define to 1 if you have the <string.h> header file. */ +#define HAVE_STRING_H 1 + +/* Define this symbol if the BSD sysctl(KERN_ARND) is available */ +/* #undef HAVE_SYSCTL_ARND */ + +/* Define to 1 if you have the <sys/endian.h> header file. */ +/* #undef HAVE_SYS_ENDIAN_H */ + +/* Define this symbol if the Linux getrandom system call is available */ +/* #undef HAVE_SYS_GETRANDOM */ + +/* Define to 1 if you have the <sys/prctl.h> header file. */ +/* #undef HAVE_SYS_PRCTL_H */ + +/* Define to 1 if you have the <sys/select.h> header file. */ +/* #undef HAVE_SYS_SELECT_H */ + +/* Define to 1 if you have the <sys/stat.h> header file. */ +#define HAVE_SYS_STAT_H 1 + +/* Define to 1 if you have the <sys/types.h> header file. */ +#define HAVE_SYS_TYPES_H 1 + +/* Define to 1 if you have the <unistd.h> header file. */ +//#define HAVE_UNISTD_H 1 + +/* Define if the visibility attribute is supported. */ +#define HAVE_VISIBILITY_ATTRIBUTE 1 + +/* Define this symbol if boost sleep works */ +/* #undef HAVE_WORKING_BOOST_SLEEP */ + +/* Define this symbol if boost sleep_for works */ +#define HAVE_WORKING_BOOST_SLEEP_FOR 1 + +/* Define to the sub-directory where libtool stores uninstalled libraries. */ +#define LT_OBJDIR ".libs/" + +/* Define to the address where bug reports for this package should be sent. */ +#define PACKAGE_BUGREPORT "https://github.com/bitcoin/bitcoin/issues" + +/* Define to the full name of this package. */ +#define PACKAGE_NAME "Bitcoin Core" + +/* Define to the full name and version of this package. */ +#define PACKAGE_STRING "Bitcoin Core 0.17.99" + +/* Define to the one symbol short name of this package. */ +#define PACKAGE_TARNAME "bitcoin" + +/* Define to the home page for this package. */ +#define PACKAGE_URL "https://bitcoincore.org/" + +/* Define to the version of this package. */ +#define PACKAGE_VERSION "0.17.99" + +/* Define to necessary symbol if this constant uses a non-standard name on + your system. */ +/* #undef PTHREAD_CREATE_JOINABLE */ + +/* Define this symbol if the qt platform is cocoa */ +/* #undef QT_QPA_PLATFORM_COCOA */ + +/* Define this symbol if the minimal qt platform exists */ +#define QT_QPA_PLATFORM_MINIMAL 1 + +/* Define this symbol if the qt platform is windows */ +#define QT_QPA_PLATFORM_WINDOWS 1 + +/* Define this symbol if the qt platform is xcb */ +/* #undef QT_QPA_PLATFORM_XCB */ + +/* Define this symbol if qt plugins are static */ +#define QT_STATICPLUGIN 1 + +/* Define to 1 if you have the ANSI C header files. */ +#define STDC_HEADERS 1 + +/* Define to 1 if strerror_r returns char *. */ +/* #undef STRERROR_R_CHAR_P */ + +/* Define this symbol to build in assembly routines */ +//#define USE_ASM 1 + +/* Define this symbol if coverage is enabled */ +/* #undef USE_COVERAGE */ + +/* Define if dbus support should be compiled in */ +/* #undef USE_DBUS */ + +/* Define if QR support should be compiled in */ +//#define USE_QRCODE 1 + +/* UPnP support not compiled if undefined, otherwise value (0 or 1) determines + default state */ +//#define USE_UPNP 0 + +/* Define WORDS_BIGENDIAN to 1 if your processor stores words with the most + significant byte first (like Motorola and SPARC, unlike Intel). */ +#if defined AC_APPLE_UNIVERSAL_BUILD +# if defined __BIG_ENDIAN__ +# define WORDS_BIGENDIAN 1 +# endif +#else +# ifndef WORDS_BIGENDIAN +/* # undef WORDS_BIGENDIAN */ +# endif +#endif + +/* Enable large inode numbers on Mac OS X 10.5. */ +#ifndef _DARWIN_USE_64_BIT_INODE +# define _DARWIN_USE_64_BIT_INODE 1 +#endif + +/* Number of bits in a file offset, on hosts where this is settable. */ +#define _FILE_OFFSET_BITS 64 + +/* Define for large files, on AIX-style hosts. */ +/* #undef _LARGE_FILES */ + +#endif //BITCOIN_BITCOIN_CONFIG_H diff --git a/build_msvc/bitcoind/bitcoind.vcxproj b/build_msvc/bitcoind/bitcoind.vcxproj new file mode 100644 index 0000000000..bb43d9821e --- /dev/null +++ b/build_msvc/bitcoind/bitcoind.vcxproj @@ -0,0 +1,185 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <Import Label="configInitTarget" Project="..\common.init.vcxproj" /> + <ItemGroup Label="ProjectConfigurations"> + <ProjectConfiguration Include="Debug|Win32"> + <Configuration>Debug</Configuration> + <Platform>Win32</Platform> + </ProjectConfiguration> + <ProjectConfiguration Include="Release|Win32"> + <Configuration>Release</Configuration> + <Platform>Win32</Platform> + </ProjectConfiguration> + <ProjectConfiguration Include="Debug|x64"> + <Configuration>Debug</Configuration> + <Platform>x64</Platform> + </ProjectConfiguration> + <ProjectConfiguration Include="Release|x64"> + <Configuration>Release</Configuration> + <Platform>x64</Platform> + </ProjectConfiguration> + </ItemGroup> + <PropertyGroup Label="Globals"> + <VCProjectVersion>15.0</VCProjectVersion> + <ProjectGuid>{D4513DDF-6013-44DC-ADCC-12EAF6D1F038}</ProjectGuid> + <Keyword>Win32Proj</Keyword> + <RootNamespace>bitcoind</RootNamespace> + <VcpkgTriplet Condition="'$(Platform)'=='Win32'">x86-windows-static</VcpkgTriplet> + <VcpkgTriplet Condition="'$(Platform)'=='x64'">x64-windows-static</VcpkgTriplet> + </PropertyGroup> + <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> + <ConfigurationType>Application</ConfigurationType> + <UseDebugLibraries>true</UseDebugLibraries> + <PlatformToolset>v141</PlatformToolset> + <CharacterSet>Unicode</CharacterSet> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> + <ConfigurationType>Application</ConfigurationType> + <UseDebugLibraries>false</UseDebugLibraries> + <PlatformToolset>v141</PlatformToolset> + <WholeProgramOptimization>true</WholeProgramOptimization> + <CharacterSet>Unicode</CharacterSet> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration"> + <ConfigurationType>Application</ConfigurationType> + <UseDebugLibraries>true</UseDebugLibraries> + <PlatformToolset>v141</PlatformToolset> + <CharacterSet>Unicode</CharacterSet> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration"> + <ConfigurationType>Application</ConfigurationType> + <UseDebugLibraries>false</UseDebugLibraries> + <PlatformToolset>v141</PlatformToolset> + <WholeProgramOptimization>true</WholeProgramOptimization> + <CharacterSet>Unicode</CharacterSet> + </PropertyGroup> + <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> + <ImportGroup Label="ExtensionSettings"> + </ImportGroup> + <ImportGroup Label="Shared"> + </ImportGroup> + <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> + <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> + </ImportGroup> + <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> + <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> + </ImportGroup> + <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> + <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> + </ImportGroup> + <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> + <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> + </ImportGroup> + <PropertyGroup Label="UserMacros" /> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> + <ClCompile> + <PrecompiledHeader>NotUsing</PrecompiledHeader> + <WarningLevel>Level3</WarningLevel> + <Optimization>Disabled</Optimization> + <PreprocessorDefinitions>WIN32;HAVE_CONFIG_H;_SCL_SECURE_NO_WARNINGS;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <SDLCheck>true</SDLCheck> + <AdditionalIncludeDirectories>..\..\src;..\..\src\univalue\include;</AdditionalIncludeDirectories> + <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary> + </ClCompile> + <Link> + <SubSystem>Console</SubSystem> + <GenerateDebugInformation>true</GenerateDebugInformation> + <AdditionalDependencies>crypt32.lib;Iphlpapi.lib;ws2_32.lib;Shlwapi.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies> + <SuppressStartupBanner>false</SuppressStartupBanner> + </Link> + </ItemDefinitionGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> + <ClCompile> + <PrecompiledHeader>NotUsing</PrecompiledHeader> + <WarningLevel>Level3</WarningLevel> + <Optimization>Disabled</Optimization> + <PreprocessorDefinitions>WIN32;HAVE_CONFIG_H;_SCL_SECURE_NO_WARNINGS;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <SDLCheck>true</SDLCheck> + <AdditionalIncludeDirectories>..\..\src;..\..\src\univalue\include;</AdditionalIncludeDirectories> + <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary> + </ClCompile> + <Link> + <SubSystem>Console</SubSystem> + <GenerateDebugInformation>true</GenerateDebugInformation> + <AdditionalDependencies>crypt32.lib;Iphlpapi.lib;ws2_32.lib;Shlwapi.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies> + <SuppressStartupBanner>false</SuppressStartupBanner> + </Link> + </ItemDefinitionGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> + <ClCompile> + <PrecompiledHeader>NotUsing</PrecompiledHeader> + <WarningLevel>Level3</WarningLevel> + <Optimization>MaxSpeed</Optimization> + <FunctionLevelLinking>true</FunctionLevelLinking> + <IntrinsicFunctions>true</IntrinsicFunctions> + <PreprocessorDefinitions>WIN32;HAVE_CONFIG_H;_SCL_SECURE_NO_WARNINGS;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <SDLCheck>true</SDLCheck> + <AdditionalIncludeDirectories>..\..\src;..\..\src\univalue\include;</AdditionalIncludeDirectories> + <RuntimeLibrary>MultiThreaded</RuntimeLibrary> + </ClCompile> + <Link> + <SubSystem>Console</SubSystem> + <EnableCOMDATFolding>true</EnableCOMDATFolding> + <OptimizeReferences>true</OptimizeReferences> + <GenerateDebugInformation>true</GenerateDebugInformation> + <AdditionalLibraryDirectories> + </AdditionalLibraryDirectories> + <AdditionalDependencies>crypt32.lib;Iphlpapi.lib;ws2_32.lib;Shlwapi.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies> + <SuppressStartupBanner>false</SuppressStartupBanner> + </Link> + </ItemDefinitionGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> + <ClCompile> + <PrecompiledHeader>NotUsing</PrecompiledHeader> + <WarningLevel>Level3</WarningLevel> + <Optimization>MaxSpeed</Optimization> + <FunctionLevelLinking>true</FunctionLevelLinking> + <IntrinsicFunctions>true</IntrinsicFunctions> + <PreprocessorDefinitions>WIN32;HAVE_CONFIG_H;_SCL_SECURE_NO_WARNINGS;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <SDLCheck>true</SDLCheck> + <AdditionalIncludeDirectories>..\..\src;..\..\src\univalue\include;</AdditionalIncludeDirectories> + <RuntimeLibrary>MultiThreaded</RuntimeLibrary> + </ClCompile> + <Link> + <SubSystem>Console</SubSystem> + <EnableCOMDATFolding>true</EnableCOMDATFolding> + <OptimizeReferences>true</OptimizeReferences> + <GenerateDebugInformation>true</GenerateDebugInformation> + <AdditionalLibraryDirectories> + </AdditionalLibraryDirectories> + <AdditionalDependencies>crypt32.lib;Iphlpapi.lib;ws2_32.lib;Shlwapi.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies> + <SuppressStartupBanner>false</SuppressStartupBanner> + </Link> + </ItemDefinitionGroup> + <ItemGroup> + <ClCompile Include="..\..\src\bitcoind.cpp" /> + </ItemGroup> + <ItemGroup> + <ProjectReference Include="..\libbitcoinconsensus\libbitcoinconsensus.vcxproj"> + <Project>{2b384fa8-9ee1-4544-93cb-0d733c25e8ce}</Project> + </ProjectReference> + <ProjectReference Include="..\libbitcoin_common\libbitcoin_common.vcxproj"> + <Project>{7c87e378-df58-482e-aa2f-1bc129bc19ce}</Project> + </ProjectReference> + <ProjectReference Include="..\libbitcoin_crypto\libbitcoin_crypto.vcxproj"> + <Project>{6190199c-6cf4-4dad-bfbd-93fa72a760c1}</Project> + </ProjectReference> + <ProjectReference Include="..\libbitcoin_server\libbitcoin_server.vcxproj"> + <Project>{460fee33-1fe1-483f-b3bf-931ff8e969a5}</Project> + </ProjectReference> + <ProjectReference Include="..\libbitcoin_util\libbitcoin_util.vcxproj"> + <Project>{b53a5535-ee9d-4c6f-9a26-f79ee3bc3754}</Project> + </ProjectReference> + <ProjectReference Include="..\libbitcoin_wallet\libbitcoin_wallet.vcxproj"> + <Project>{93b86837-b543-48a5-a89b-7c87abb77df2}</Project> + </ProjectReference> + <ProjectReference Include="..\libbitcoin_zmq\libbitcoin_zmq.vcxproj"> + <Project>{792d487f-f14c-49fc-a9de-3fc150f31c3f}</Project> + </ProjectReference> + <ProjectReference Include="..\libunivalue\libunivalue.vcxproj"> + <Project>{5724ba7d-a09a-4ba8-800b-c4c1561b3d69}</Project> + </ProjectReference> + </ItemGroup> + <Import Label="configTarget" Project="..\common.vcxproj" /> +</Project> diff --git a/build_msvc/common.init.vcxproj b/build_msvc/common.init.vcxproj new file mode 100644 index 0000000000..c3c0f665c2 --- /dev/null +++ b/build_msvc/common.init.vcxproj @@ -0,0 +1,14 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <PropertyGroup Condition="'$(WindowsTargetPlatformVersion)'=='' and !Exists('$(WindowsSdkDir)\DesignTime\CommonConfiguration\Neutral\Windows.props')"> + <WindowsTargetPlatformVersion_10 Condition="'$(WindowsTargetPlatformVersion_10)' == ''">$(Registry:HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Microsoft SDKs\Windows\v10.0@ProductVersion)</WindowsTargetPlatformVersion_10> + <WindowsTargetPlatformVersion_10 Condition="'$(WindowsTargetPlatformVersion_10)' == ''">$(Registry:HKEY_LOCAL_MACHINE\SOFTWARE\Wow6432Node\Microsoft\Microsoft SDKs\Windows\v10.0@ProductVersion)</WindowsTargetPlatformVersion_10> + <!-- Sometimes the version in the registry has to .0 suffix, and sometimes it doesn't. Check and add it --> + <WindowsTargetPlatformVersion_10 Condition="'$(WindowsTargetPlatformVersion_10)' != '' and !$(WindowsTargetPlatformVersion_10.EndsWith('.0'))">$(WindowsTargetPlatformVersion_10).0</WindowsTargetPlatformVersion_10> + + <WindowsTargetPlatformVersion>$(WindowsTargetPlatformVersion_10)</WindowsTargetPlatformVersion> + </PropertyGroup> + <PropertyGroup> + <Platform Condition="'$(Platform)' == ''">Win32</Platform> + </PropertyGroup> +</Project>
\ No newline at end of file diff --git a/build_msvc/common.vcxproj b/build_msvc/common.vcxproj new file mode 100644 index 0000000000..3a53f3bad3 --- /dev/null +++ b/build_msvc/common.vcxproj @@ -0,0 +1,15 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> + <PropertyGroup> + <BuildDependsOn> + CopyConfig; + $(BuildDependsOn); + </BuildDependsOn> + </PropertyGroup> + <Target Name="CopyConfig" + Inputs="$(MSBuildThisFileDirectory)bitcoin_config.h" + Outputs="$(MSBuildThisFileDirectory)..\src\config\bitcoin-config.h"> + <Copy SourceFiles="$(MSBuildThisFileDirectory)bitcoin_config.h" DestinationFiles="$(MSBuildThisFileDirectory)..\src\config\bitcoin-config.h" /> + </Target> +</Project>
\ No newline at end of file diff --git a/build_msvc/libbitcoin_cli/libbitcoin_cli.vcxproj b/build_msvc/libbitcoin_cli/libbitcoin_cli.vcxproj new file mode 100644 index 0000000000..623d24da10 --- /dev/null +++ b/build_msvc/libbitcoin_cli/libbitcoin_cli.vcxproj @@ -0,0 +1,162 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <Import Label="configInitTarget" Project="..\common.init.vcxproj" /> + <ItemGroup Label="ProjectConfigurations"> + <ProjectConfiguration Include="Debug|Win32"> + <Configuration>Debug</Configuration> + <Platform>Win32</Platform> + </ProjectConfiguration> + <ProjectConfiguration Include="Release|Win32"> + <Configuration>Release</Configuration> + <Platform>Win32</Platform> + </ProjectConfiguration> + <ProjectConfiguration Include="Debug|x64"> + <Configuration>Debug</Configuration> + <Platform>x64</Platform> + </ProjectConfiguration> + <ProjectConfiguration Include="Release|x64"> + <Configuration>Release</Configuration> + <Platform>x64</Platform> + </ProjectConfiguration> + </ItemGroup> + <ItemGroup> + <ClCompile Include="..\..\src\rpc\client.cpp" /> + </ItemGroup> + <ItemGroup> + <None Include="packages.config" /> + </ItemGroup> + <PropertyGroup Label="Globals"> + <VCProjectVersion>15.0</VCProjectVersion> + <ProjectGuid>{0667528C-D734-4009-ADF9-C0D6C4A5A5A6}</ProjectGuid> + <Keyword>Win32Proj</Keyword> + <RootNamespace>libbitcoin_cli</RootNamespace> + <VcpkgTriplet Condition="'$(Platform)'=='Win32'">x86-windows-static</VcpkgTriplet> + <VcpkgTriplet Condition="'$(Platform)'=='x64'">x64-windows-static</VcpkgTriplet> + </PropertyGroup> + <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> + <ConfigurationType>StaticLibrary</ConfigurationType> + <UseDebugLibraries>true</UseDebugLibraries> + <PlatformToolset>v141</PlatformToolset> + <CharacterSet>Unicode</CharacterSet> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> + <ConfigurationType>StaticLibrary</ConfigurationType> + <UseDebugLibraries>false</UseDebugLibraries> + <PlatformToolset>v141</PlatformToolset> + <WholeProgramOptimization>true</WholeProgramOptimization> + <CharacterSet>Unicode</CharacterSet> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration"> + <ConfigurationType>StaticLibrary</ConfigurationType> + <UseDebugLibraries>true</UseDebugLibraries> + <PlatformToolset>v141</PlatformToolset> + <CharacterSet>Unicode</CharacterSet> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration"> + <ConfigurationType>StaticLibrary</ConfigurationType> + <UseDebugLibraries>false</UseDebugLibraries> + <PlatformToolset>v141</PlatformToolset> + <WholeProgramOptimization>true</WholeProgramOptimization> + <CharacterSet>Unicode</CharacterSet> + </PropertyGroup> + <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> + <ImportGroup Label="ExtensionSettings"> + </ImportGroup> + <ImportGroup Label="Shared"> + </ImportGroup> + <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> + <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> + </ImportGroup> + <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> + <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> + </ImportGroup> + <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> + <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> + </ImportGroup> + <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> + <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> + </ImportGroup> + <PropertyGroup Label="UserMacros" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> + <LinkIncremental>false</LinkIncremental> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> + <LinkIncremental>true</LinkIncremental> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> + <LinkIncremental>true</LinkIncremental> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> + <LinkIncremental>false</LinkIncremental> + </PropertyGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> + <ClCompile> + <PrecompiledHeader>NotUsing</PrecompiledHeader> + <WarningLevel>Level3</WarningLevel> + <Optimization>MaxSpeed</Optimization> + <FunctionLevelLinking>true</FunctionLevelLinking> + <IntrinsicFunctions>true</IntrinsicFunctions> + <PreprocessorDefinitions>_SCL_SECURE_NO_WARNINGS;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <SDLCheck>true</SDLCheck> + <AdditionalIncludeDirectories>..\..\src;..\..\src\univalue\include;</AdditionalIncludeDirectories> + <RuntimeLibrary>MultiThreaded</RuntimeLibrary> + </ClCompile> + <Link> + <SubSystem>Console</SubSystem> + <EnableCOMDATFolding>true</EnableCOMDATFolding> + <OptimizeReferences>true</OptimizeReferences> + <GenerateDebugInformation>true</GenerateDebugInformation> + </Link> + </ItemDefinitionGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> + <ClCompile> + <PrecompiledHeader>NotUsing</PrecompiledHeader> + <WarningLevel>Level3</WarningLevel> + <Optimization>Disabled</Optimization> + <PreprocessorDefinitions>_SCL_SECURE_NO_WARNINGS;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <SDLCheck>true</SDLCheck> + <AdditionalIncludeDirectories>..\..\src;..\..\src\univalue\include;</AdditionalIncludeDirectories> + <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary> + </ClCompile> + <Link> + <SubSystem>Console</SubSystem> + <GenerateDebugInformation>true</GenerateDebugInformation> + </Link> + </ItemDefinitionGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> + <ClCompile> + <PrecompiledHeader>NotUsing</PrecompiledHeader> + <WarningLevel>Level3</WarningLevel> + <Optimization>Disabled</Optimization> + <PreprocessorDefinitions>_SCL_SECURE_NO_WARNINGS;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <SDLCheck>true</SDLCheck> + <AdditionalIncludeDirectories>..\..\src;..\..\src\univalue\include;</AdditionalIncludeDirectories> + <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary> + </ClCompile> + <Link> + <SubSystem>Console</SubSystem> + <GenerateDebugInformation>true</GenerateDebugInformation> + </Link> + </ItemDefinitionGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> + <ClCompile> + <PrecompiledHeader>NotUsing</PrecompiledHeader> + <WarningLevel>Level3</WarningLevel> + <Optimization>MaxSpeed</Optimization> + <FunctionLevelLinking>true</FunctionLevelLinking> + <IntrinsicFunctions>true</IntrinsicFunctions> + <PreprocessorDefinitions>_SCL_SECURE_NO_WARNINGS;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <SDLCheck>true</SDLCheck> + <AdditionalIncludeDirectories>..\..\src;..\..\src\univalue\include;</AdditionalIncludeDirectories> + <RuntimeLibrary>MultiThreaded</RuntimeLibrary> + </ClCompile> + <Link> + <SubSystem>Console</SubSystem> + <EnableCOMDATFolding>true</EnableCOMDATFolding> + <OptimizeReferences>true</OptimizeReferences> + <GenerateDebugInformation>true</GenerateDebugInformation> + </Link> + </ItemDefinitionGroup> + <Import Label="configTarget" Project="..\common.vcxproj" /> +</Project> diff --git a/build_msvc/libbitcoin_common/libbitcoin_common.vcxproj b/build_msvc/libbitcoin_common/libbitcoin_common.vcxproj new file mode 100644 index 0000000000..e6d95ed5f3 --- /dev/null +++ b/build_msvc/libbitcoin_common/libbitcoin_common.vcxproj @@ -0,0 +1,210 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <Import Label="configInitTarget" Project="..\common.init.vcxproj" /> + <ItemGroup Label="ProjectConfigurations"> + <ProjectConfiguration Include="Debug|Win32"> + <Configuration>Debug</Configuration> + <Platform>Win32</Platform> + </ProjectConfiguration> + <ProjectConfiguration Include="Release|Win32"> + <Configuration>Release</Configuration> + <Platform>Win32</Platform> + </ProjectConfiguration> + <ProjectConfiguration Include="Debug|x64"> + <Configuration>Debug</Configuration> + <Platform>x64</Platform> + </ProjectConfiguration> + <ProjectConfiguration Include="Release|x64"> + <Configuration>Release</Configuration> + <Platform>x64</Platform> + </ProjectConfiguration> + </ItemGroup> + <PropertyGroup Label="Globals"> + <VCProjectVersion>15.0</VCProjectVersion> + <ProjectGuid>{7C87E378-DF58-482E-AA2F-1BC129BC19CE}</ProjectGuid> + <Keyword>Win32Proj</Keyword> + <RootNamespace>libbitcoin_common</RootNamespace> + <VcpkgTriplet Condition="'$(Platform)'=='Win32'">x86-windows-static</VcpkgTriplet> + <VcpkgTriplet Condition="'$(Platform)'=='x64'">x64-windows-static</VcpkgTriplet> + </PropertyGroup> + <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> + <ConfigurationType>StaticLibrary</ConfigurationType> + <UseDebugLibraries>true</UseDebugLibraries> + <PlatformToolset>v141</PlatformToolset> + <CharacterSet>Unicode</CharacterSet> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> + <ConfigurationType>StaticLibrary</ConfigurationType> + <UseDebugLibraries>false</UseDebugLibraries> + <PlatformToolset>v141</PlatformToolset> + <WholeProgramOptimization>true</WholeProgramOptimization> + <CharacterSet>Unicode</CharacterSet> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration"> + <ConfigurationType>StaticLibrary</ConfigurationType> + <UseDebugLibraries>true</UseDebugLibraries> + <PlatformToolset>v141</PlatformToolset> + <CharacterSet>Unicode</CharacterSet> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration"> + <ConfigurationType>StaticLibrary</ConfigurationType> + <UseDebugLibraries>false</UseDebugLibraries> + <PlatformToolset>v141</PlatformToolset> + <WholeProgramOptimization>true</WholeProgramOptimization> + <CharacterSet>Unicode</CharacterSet> + </PropertyGroup> + <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> + <ImportGroup Label="ExtensionSettings"> + </ImportGroup> + <ImportGroup Label="Shared"> + </ImportGroup> + <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> + <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> + </ImportGroup> + <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> + <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> + </ImportGroup> + <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> + <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> + </ImportGroup> + <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> + <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> + </ImportGroup> + <PropertyGroup Label="UserMacros" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> + <LinkIncremental>true</LinkIncremental> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> + <LinkIncremental>true</LinkIncremental> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> + <LinkIncremental>false</LinkIncremental> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> + <LinkIncremental>false</LinkIncremental> + </PropertyGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> + <ClCompile> + <PrecompiledHeader>NotUsing</PrecompiledHeader> + <WarningLevel>Level3</WarningLevel> + <Optimization>Disabled</Optimization> + <PreprocessorDefinitions>WIN32;HAVE_CONFIG_H;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <SDLCheck>true</SDLCheck> + <AdditionalIncludeDirectories>..\..\src;..\..\src\univalue\include;</AdditionalIncludeDirectories> + <SuppressStartupBanner>false</SuppressStartupBanner> + <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary> + </ClCompile> + <Link> + <SubSystem>Console</SubSystem> + <GenerateDebugInformation>true</GenerateDebugInformation> + <AdditionalLibraryDirectories> + </AdditionalLibraryDirectories> + </Link> + </ItemDefinitionGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> + <ClCompile> + <PrecompiledHeader>NotUsing</PrecompiledHeader> + <WarningLevel>Level3</WarningLevel> + <Optimization>Disabled</Optimization> + <PreprocessorDefinitions>WIN32;HAVE_CONFIG_H;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <SDLCheck>true</SDLCheck> + <AdditionalIncludeDirectories>..\..\src;..\..\src\univalue\include;</AdditionalIncludeDirectories> + <SuppressStartupBanner>false</SuppressStartupBanner> + <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary> + </ClCompile> + <Link> + <SubSystem>Console</SubSystem> + <GenerateDebugInformation>true</GenerateDebugInformation> + <AdditionalLibraryDirectories> + </AdditionalLibraryDirectories> + </Link> + </ItemDefinitionGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> + <ClCompile> + <PrecompiledHeader>NotUsing</PrecompiledHeader> + <WarningLevel>Level3</WarningLevel> + <Optimization>MaxSpeed</Optimization> + <FunctionLevelLinking>true</FunctionLevelLinking> + <IntrinsicFunctions>true</IntrinsicFunctions> + <PreprocessorDefinitions>WIN32;HAVE_CONFIG_H;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <SDLCheck>true</SDLCheck> + <AdditionalIncludeDirectories>..\..\src;..\..\src\univalue\include;</AdditionalIncludeDirectories> + <SuppressStartupBanner>false</SuppressStartupBanner> + <RuntimeLibrary>MultiThreaded</RuntimeLibrary> + </ClCompile> + <Link> + <SubSystem>Console</SubSystem> + <EnableCOMDATFolding>true</EnableCOMDATFolding> + <OptimizeReferences>true</OptimizeReferences> + <GenerateDebugInformation>true</GenerateDebugInformation> + <AdditionalLibraryDirectories> + </AdditionalLibraryDirectories> + </Link> + </ItemDefinitionGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> + <ClCompile> + <PrecompiledHeader>NotUsing</PrecompiledHeader> + <WarningLevel>Level3</WarningLevel> + <Optimization>MaxSpeed</Optimization> + <FunctionLevelLinking>true</FunctionLevelLinking> + <IntrinsicFunctions>true</IntrinsicFunctions> + <PreprocessorDefinitions>WIN32;HAVE_CONFIG_H;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <SDLCheck>true</SDLCheck> + <AdditionalIncludeDirectories>..\..\src;..\..\src\univalue\include;</AdditionalIncludeDirectories> + <SuppressStartupBanner>false</SuppressStartupBanner> + <RuntimeLibrary>MultiThreaded</RuntimeLibrary> + </ClCompile> + <Link> + <SubSystem>Console</SubSystem> + <EnableCOMDATFolding>true</EnableCOMDATFolding> + <OptimizeReferences>true</OptimizeReferences> + <GenerateDebugInformation>true</GenerateDebugInformation> + <AdditionalLibraryDirectories> + </AdditionalLibraryDirectories> + </Link> + </ItemDefinitionGroup> + <ItemGroup> + <ClInclude Include="..\..\src\base58.h" /> + <ClInclude Include="..\..\src\bech32.h" /> + <ClInclude Include="..\..\src\chainparams.h" /> + <ClInclude Include="..\..\src\coins.h" /> + <ClInclude Include="..\..\src\compressor.h" /> + <ClInclude Include="..\..\src\key.h" /> + <ClInclude Include="..\..\src\keystore.h" /> + <ClInclude Include="..\..\src\netaddress.h" /> + <ClInclude Include="..\..\src\netbase.h" /> + <ClInclude Include="..\..\src\policy\feerate.h" /> + <ClInclude Include="..\..\src\protocol.h" /> + <ClInclude Include="..\..\src\scheduler.h" /> + <ClInclude Include="..\..\src\script\sign.h" /> + <ClInclude Include="..\..\src\script\standard.h" /> + <ClInclude Include="..\..\src\warnings.h" /> + </ItemGroup> + <ItemGroup> + <ClCompile Include="..\..\src\base58.cpp" /> + <ClCompile Include="..\..\src\bech32.cpp" /> + <ClCompile Include="..\..\src\chainparams.cpp" /> + <ClCompile Include="..\..\src\coins.cpp" /> + <ClCompile Include="..\..\src\compressor.cpp" /> + <ClCompile Include="..\..\src\core_read.cpp" /> + <ClCompile Include="..\..\src\core_write.cpp" /> + <ClCompile Include="..\..\src\key.cpp" /> + <ClCompile Include="..\..\src\key_io.cpp" /> + <ClCompile Include="..\..\src\keystore.cpp" /> + <ClCompile Include="..\..\src\netaddress.cpp" /> + <ClCompile Include="..\..\src\netbase.cpp" /> + <ClCompile Include="..\..\src\policy\feerate.cpp" /> + <ClCompile Include="..\..\src\protocol.cpp" /> + <ClCompile Include="..\..\src\scheduler.cpp" /> + <ClCompile Include="..\..\src\script\descriptor.cpp" /> + <ClCompile Include="..\..\src\script\sign.cpp" /> + <ClCompile Include="..\..\src\script\ismine.cpp" /> + <ClCompile Include="..\..\src\script\standard.cpp" /> + <ClCompile Include="..\..\src\warnings.cpp" /> + </ItemGroup> + <ItemGroup> + <None Include="packages.config" /> + </ItemGroup> + <Import Label="configTarget" Project="..\common.vcxproj" /> +</Project> diff --git a/build_msvc/libbitcoin_crypto/libbitcoin_crypto.vcxproj b/build_msvc/libbitcoin_crypto/libbitcoin_crypto.vcxproj new file mode 100644 index 0000000000..50519d045f --- /dev/null +++ b/build_msvc/libbitcoin_crypto/libbitcoin_crypto.vcxproj @@ -0,0 +1,175 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <Import Label="configInitTarget" Project="..\common.init.vcxproj" /> + <ItemGroup Label="ProjectConfigurations"> + <ProjectConfiguration Include="Debug|Win32"> + <Configuration>Debug</Configuration> + <Platform>Win32</Platform> + </ProjectConfiguration> + <ProjectConfiguration Include="Release|Win32"> + <Configuration>Release</Configuration> + <Platform>Win32</Platform> + </ProjectConfiguration> + <ProjectConfiguration Include="Debug|x64"> + <Configuration>Debug</Configuration> + <Platform>x64</Platform> + </ProjectConfiguration> + <ProjectConfiguration Include="Release|x64"> + <Configuration>Release</Configuration> + <Platform>x64</Platform> + </ProjectConfiguration> + </ItemGroup> + <PropertyGroup Label="Globals"> + <VCProjectVersion>15.0</VCProjectVersion> + <ProjectGuid>{6190199C-6CF4-4DAD-BFBD-93FA72A760C1}</ProjectGuid> + <Keyword>Win32Proj</Keyword> + <RootNamespace>libbitcoin_crypto</RootNamespace> + </PropertyGroup> + <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> + <ConfigurationType>StaticLibrary</ConfigurationType> + <UseDebugLibraries>true</UseDebugLibraries> + <PlatformToolset>v141</PlatformToolset> + <CharacterSet>Unicode</CharacterSet> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> + <ConfigurationType>StaticLibrary</ConfigurationType> + <UseDebugLibraries>false</UseDebugLibraries> + <PlatformToolset>v141</PlatformToolset> + <WholeProgramOptimization>true</WholeProgramOptimization> + <CharacterSet>Unicode</CharacterSet> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration"> + <ConfigurationType>StaticLibrary</ConfigurationType> + <UseDebugLibraries>true</UseDebugLibraries> + <PlatformToolset>v141</PlatformToolset> + <CharacterSet>Unicode</CharacterSet> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration"> + <ConfigurationType>StaticLibrary</ConfigurationType> + <UseDebugLibraries>false</UseDebugLibraries> + <PlatformToolset>v141</PlatformToolset> + <WholeProgramOptimization>true</WholeProgramOptimization> + <CharacterSet>Unicode</CharacterSet> + </PropertyGroup> + <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> + <ImportGroup Label="ExtensionSettings"> + </ImportGroup> + <ImportGroup Label="Shared"> + </ImportGroup> + <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> + <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> + </ImportGroup> + <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> + <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> + </ImportGroup> + <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> + <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> + </ImportGroup> + <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> + <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> + </ImportGroup> + <PropertyGroup Label="UserMacros" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> + <LinkIncremental>true</LinkIncremental> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> + <LinkIncremental>true</LinkIncremental> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> + <LinkIncremental>false</LinkIncremental> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> + <LinkIncremental>false</LinkIncremental> + </PropertyGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> + <ClCompile> + <PrecompiledHeader>NotUsing</PrecompiledHeader> + <WarningLevel>Level3</WarningLevel> + <Optimization>Disabled</Optimization> + <PreprocessorDefinitions>_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <SDLCheck>true</SDLCheck> + <AdditionalIncludeDirectories>..\..\src</AdditionalIncludeDirectories> + <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary> + </ClCompile> + <Link> + <SubSystem>Console</SubSystem> + <GenerateDebugInformation>true</GenerateDebugInformation> + </Link> + </ItemDefinitionGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> + <ClCompile> + <PrecompiledHeader>NotUsing</PrecompiledHeader> + <WarningLevel>Level3</WarningLevel> + <Optimization>Disabled</Optimization> + <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <SDLCheck>true</SDLCheck> + <AdditionalIncludeDirectories>..\..\src</AdditionalIncludeDirectories> + <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary> + </ClCompile> + <Link> + <SubSystem>Console</SubSystem> + <GenerateDebugInformation>true</GenerateDebugInformation> + </Link> + </ItemDefinitionGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> + <ClCompile> + <PrecompiledHeader>NotUsing</PrecompiledHeader> + <WarningLevel>Level3</WarningLevel> + <Optimization>MaxSpeed</Optimization> + <FunctionLevelLinking>true</FunctionLevelLinking> + <IntrinsicFunctions>true</IntrinsicFunctions> + <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <SDLCheck>true</SDLCheck> + <AdditionalIncludeDirectories>..\..\src</AdditionalIncludeDirectories> + <RuntimeLibrary>MultiThreaded</RuntimeLibrary> + </ClCompile> + <Link> + <SubSystem>Console</SubSystem> + <EnableCOMDATFolding>true</EnableCOMDATFolding> + <OptimizeReferences>true</OptimizeReferences> + <GenerateDebugInformation>true</GenerateDebugInformation> + </Link> + </ItemDefinitionGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> + <ClCompile> + <PrecompiledHeader>NotUsing</PrecompiledHeader> + <WarningLevel>Level3</WarningLevel> + <Optimization>MaxSpeed</Optimization> + <FunctionLevelLinking>true</FunctionLevelLinking> + <IntrinsicFunctions>true</IntrinsicFunctions> + <PreprocessorDefinitions>NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <SDLCheck>true</SDLCheck> + <AdditionalIncludeDirectories>..\..\src</AdditionalIncludeDirectories> + <RuntimeLibrary>MultiThreaded</RuntimeLibrary> + </ClCompile> + <Link> + <SubSystem>Console</SubSystem> + <EnableCOMDATFolding>true</EnableCOMDATFolding> + <OptimizeReferences>true</OptimizeReferences> + <GenerateDebugInformation>true</GenerateDebugInformation> + </Link> + </ItemDefinitionGroup> + <ItemGroup> + <ClInclude Include="..\..\src\crypto\aes.h" /> + <ClInclude Include="..\..\src\crypto\chacha20.h" /> + <ClInclude Include="..\..\src\crypto\common.h" /> + <ClInclude Include="..\..\src\crypto\hmac_sha256.h" /> + <ClInclude Include="..\..\src\crypto\hmac_sha512.h" /> + <ClInclude Include="..\..\src\crypto\ripemd160.h" /> + <ClInclude Include="..\..\src\crypto\sha1.h" /> + <ClInclude Include="..\..\src\crypto\sha256.h" /> + <ClInclude Include="..\..\src\crypto\sha512.h" /> + </ItemGroup> + <ItemGroup> + <ClCompile Include="..\..\src\crypto\aes.cpp" /> + <ClCompile Include="..\..\src\crypto\chacha20.cpp" /> + <ClCompile Include="..\..\src\crypto\hmac_sha256.cpp" /> + <ClCompile Include="..\..\src\crypto\hmac_sha512.cpp" /> + <ClCompile Include="..\..\src\crypto\ripemd160.cpp" /> + <ClCompile Include="..\..\src\crypto\sha1.cpp" /> + <ClCompile Include="..\..\src\crypto\sha256.cpp" /> + <ClCompile Include="..\..\src\crypto\sha512.cpp" /> + </ItemGroup> + <Import Label="configTarget" Project="..\common.vcxproj" /> +</Project> diff --git a/build_msvc/libbitcoin_qt/libbitcoin_qt.vcxproj b/build_msvc/libbitcoin_qt/libbitcoin_qt.vcxproj new file mode 100644 index 0000000000..2e8ecb2d2c --- /dev/null +++ b/build_msvc/libbitcoin_qt/libbitcoin_qt.vcxproj @@ -0,0 +1,955 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <Import Label="configInitTarget" Project="..\common.init.vcxproj" /> + <ItemGroup Label="ProjectConfigurations"> + <ProjectConfiguration Include="Debug|Win32"> + <Configuration>Debug</Configuration> + <Platform>Win32</Platform> + </ProjectConfiguration> + <ProjectConfiguration Include="Release|Win32"> + <Configuration>Release</Configuration> + <Platform>Win32</Platform> + </ProjectConfiguration> + <ProjectConfiguration Include="Debug|x64"> + <Configuration>Debug</Configuration> + <Platform>x64</Platform> + </ProjectConfiguration> + <ProjectConfiguration Include="Release|x64"> + <Configuration>Release</Configuration> + <Platform>x64</Platform> + </ProjectConfiguration> + </ItemGroup> + <PropertyGroup Label="Globals"> + <VCProjectVersion>15.0</VCProjectVersion> + <VcpkgTriplet Condition="'$(Platform)'=='Win32'">x86-windows-static</VcpkgTriplet> + <VcpkgTriplet Condition="'$(Platform)'=='x64'">x64-windows-static</VcpkgTriplet> + <ProjectGuid>{2B4ABFF8-D1FD-4845-88C9-1F3C0A6512BF}</ProjectGuid> + </PropertyGroup> + <ItemGroup> + <CustomBuild Include="..\..\src\qt\bitcoin.qrc"> + <Command>"$(QTDIR)\bincc.exe" -name bitcoin "%(Fullpath)" -o .\GeneratedFiles\qrc_bitcoin.cpp</Command> + <Message>Qt rcc generation for %(Identity)</Message> + <Outputs>.\GeneratedFiles\qrc_bitcoin.cpp</Outputs> + <AdditionalInputs>(QTDIR)\bincc.exe</AdditionalInputs> + </CustomBuild> + <CustomBuild Include="..\..\src\qt\bitcoin_locale.qrc"> + <Command>"$(QTDIR)\bincc.exe" -name bitcoin_locale "%(Fullpath)" -o .\GeneratedFiles\qrc_bitcoin_locale.cpp</Command> + <Message>Qt rcc generation for %(Identity)</Message> + <Outputs>.\GeneratedFiles\qrc_bitcoin_locale.cpp</Outputs> + <AdditionalInputs>(QTDIR)\bincc.exe</AdditionalInputs> + </CustomBuild> + <None Include="..\..\src\qt\forms\addressbookpage.ui" /> + <None Include="..\..\src\qt\forms\askpassphrasedialog.ui" /> + <None Include="..\..\src\qt\forms\coincontroldialog.ui" /> + <None Include="..\..\src\qt\forms\debugwindow.ui" /> + <None Include="..\..\src\qt\forms\editaddressdialog.ui" /> + <None Include="..\..\src\qt\forms\helpmessagedialog.ui" /> + <None Include="..\..\src\qt\forms\intro.ui" /> + <None Include="..\..\src\qt\forms\modaloverlay.ui" /> + <None Include="..\..\src\qt\forms\openuridialog.ui" /> + <None Include="..\..\src\qt\forms\optionsdialog.ui" /> + <None Include="..\..\src\qt\forms\overviewpage.ui" /> + <None Include="..\..\src\qt\formseceivecoinsdialog.ui" /> + <None Include="..\..\src\qt\formseceiverequestdialog.ui" /> + <None Include="..\..\src\qt\forms\sendcoinsdialog.ui" /> + <None Include="..\..\src\qt\forms\sendcoinsentry.ui" /> + <None Include="..\..\src\qt\forms\signverifymessagedialog.ui" /> + <None Include="..\..\src\qt\forms\transactiondescdialog.ui" /> + <None Include="..\..\src\qt\locale\bitcoin_af.ts"> + <DeploymentContent>true</DeploymentContent> + </None> + <None Include="..\..\src\qt\locale\bitcoin_af_ZA.ts"> + <DeploymentContent>true</DeploymentContent> + </None> + <None Include="..\..\src\qt\locale\bitcoin_ar.ts"> + <DeploymentContent>true</DeploymentContent> + </None> + <None Include="..\..\src\qt\locale\bitcoin_be_BY.ts"> + <DeploymentContent>true</DeploymentContent> + </None> + <None Include="..\..\src\qt\locale\bitcoin_bg.ts"> + <DeploymentContent>true</DeploymentContent> + </None> + <None Include="..\..\src\qt\locale\bitcoin_bg_BG.ts"> + <DeploymentContent>true</DeploymentContent> + </None> + <None Include="..\..\src\qt\locale\bitcoin_ca%40valencia.ts"> + <DeploymentContent>true</DeploymentContent> + </None> + <None Include="..\..\src\qt\locale\bitcoin_ca.ts"> + <DeploymentContent>true</DeploymentContent> + </None> + <None Include="..\..\src\qt\locale\bitcoin_ca_ES.ts"> + <DeploymentContent>true</DeploymentContent> + </None> + <None Include="..\..\src\qt\locale\bitcoin_cs.ts"> + <DeploymentContent>true</DeploymentContent> + </None> + <None Include="..\..\src\qt\locale\bitcoin_cy.ts"> + <DeploymentContent>true</DeploymentContent> + </None> + <None Include="..\..\src\qt\locale\bitcoin_da.ts"> + <DeploymentContent>true</DeploymentContent> + </None> + <None Include="..\..\src\qt\locale\bitcoin_de.ts"> + <DeploymentContent>true</DeploymentContent> + </None> + <None Include="..\..\src\qt\locale\bitcoin_el.ts"> + <DeploymentContent>true</DeploymentContent> + </None> + <None Include="..\..\src\qt\locale\bitcoin_el_GR.ts"> + <DeploymentContent>true</DeploymentContent> + </None> + <None Include="..\..\src\qt\locale\bitcoin_en.ts"> + <DeploymentContent>true</DeploymentContent> + </None> + <None Include="..\..\src\qt\locale\bitcoin_en_GB.ts"> + <DeploymentContent>true</DeploymentContent> + </None> + <None Include="..\..\src\qt\locale\bitcoin_eo.ts"> + <DeploymentContent>true</DeploymentContent> + </None> + <None Include="..\..\src\qt\locale\bitcoin_es.ts"> + <DeploymentContent>true</DeploymentContent> + </None> + <None Include="..\..\src\qt\locale\bitcoin_es_AR.ts"> + <DeploymentContent>true</DeploymentContent> + </None> + <None Include="..\..\src\qt\locale\bitcoin_es_CL.ts"> + <DeploymentContent>true</DeploymentContent> + </None> + <None Include="..\..\src\qt\locale\bitcoin_es_CO.ts"> + <DeploymentContent>true</DeploymentContent> + </None> + <None Include="..\..\src\qt\locale\bitcoin_es_DO.ts"> + <DeploymentContent>true</DeploymentContent> + </None> + <None Include="..\..\src\qt\locale\bitcoin_es_ES.ts"> + <DeploymentContent>true</DeploymentContent> + </None> + <None Include="..\..\src\qt\locale\bitcoin_es_MX.ts"> + <DeploymentContent>true</DeploymentContent> + </None> + <None Include="..\..\src\qt\locale\bitcoin_es_UY.ts"> + <DeploymentContent>true</DeploymentContent> + </None> + <None Include="..\..\src\qt\locale\bitcoin_es_VE.ts"> + <DeploymentContent>true</DeploymentContent> + </None> + <None Include="..\..\src\qt\locale\bitcoin_et.ts"> + <DeploymentContent>true</DeploymentContent> + </None> + <None Include="..\..\src\qt\locale\bitcoin_et_EE.ts"> + <DeploymentContent>true</DeploymentContent> + </None> + <None Include="..\..\src\qt\locale\bitcoin_eu_ES.ts"> + <DeploymentContent>true</DeploymentContent> + </None> + <None Include="..\..\src\qt\locale\bitcoin_fa.ts"> + <DeploymentContent>true</DeploymentContent> + </None> + <None Include="..\..\src\qt\locale\bitcoin_fa_IR.ts"> + <DeploymentContent>true</DeploymentContent> + </None> + <None Include="..\..\src\qt\locale\bitcoin_fi.ts"> + <DeploymentContent>true</DeploymentContent> + </None> + <None Include="..\..\src\qt\locale\bitcoin_fr.ts"> + <DeploymentContent>true</DeploymentContent> + </None> + <None Include="..\..\src\qt\locale\bitcoin_fr_CA.ts"> + <DeploymentContent>true</DeploymentContent> + </None> + <None Include="..\..\src\qt\locale\bitcoin_fr_FR.ts"> + <DeploymentContent>true</DeploymentContent> + </None> + <None Include="..\..\src\qt\locale\bitcoin_gl.ts"> + <DeploymentContent>true</DeploymentContent> + </None> + <None Include="..\..\src\qt\locale\bitcoin_he.ts"> + <DeploymentContent>true</DeploymentContent> + </None> + <None Include="..\..\src\qt\locale\bitcoin_hi_IN.ts"> + <DeploymentContent>true</DeploymentContent> + </None> + <None Include="..\..\src\qt\locale\bitcoin_hr.ts"> + <DeploymentContent>true</DeploymentContent> + </None> + <None Include="..\..\src\qt\locale\bitcoin_hu.ts"> + <DeploymentContent>true</DeploymentContent> + </None> + <None Include="..\..\src\qt\locale\bitcoin_id_ID.ts"> + <DeploymentContent>true</DeploymentContent> + </None> + <None Include="..\..\src\qt\locale\bitcoin_it.ts"> + <DeploymentContent>true</DeploymentContent> + </None> + <None Include="..\..\src\qt\locale\bitcoin_it_IT.ts"> + <DeploymentContent>true</DeploymentContent> + </None> + <None Include="..\..\src\qt\locale\bitcoin_ja.ts"> + <DeploymentContent>true</DeploymentContent> + </None> + <None Include="..\..\src\qt\locale\bitcoin_ka.ts"> + <DeploymentContent>true</DeploymentContent> + </None> + <None Include="..\..\src\qt\locale\bitcoin_kk_KZ.ts"> + <DeploymentContent>true</DeploymentContent> + </None> + <None Include="..\..\src\qt\locale\bitcoin_ko_KR.ts"> + <DeploymentContent>true</DeploymentContent> + </None> + <None Include="..\..\src\qt\locale\bitcoin_ku_IQ.ts"> + <DeploymentContent>true</DeploymentContent> + </None> + <None Include="..\..\src\qt\locale\bitcoin_ky.ts"> + <DeploymentContent>true</DeploymentContent> + </None> + <None Include="..\..\src\qt\locale\bitcoin_la.ts"> + <DeploymentContent>true</DeploymentContent> + </None> + <None Include="..\..\src\qt\locale\bitcoin_lt.ts"> + <DeploymentContent>true</DeploymentContent> + </None> + <None Include="..\..\src\qt\locale\bitcoin_lv_LV.ts"> + <DeploymentContent>true</DeploymentContent> + </None> + <None Include="..\..\src\qt\locale\bitcoin_mk_MK.ts"> + <DeploymentContent>true</DeploymentContent> + </None> + <None Include="..\..\src\qt\locale\bitcoin_mn.ts"> + <DeploymentContent>true</DeploymentContent> + </None> + <None Include="..\..\src\qt\locale\bitcoin_ms_MY.ts"> + <DeploymentContent>true</DeploymentContent> + </None> + <None Include="..\..\src\qt\locale\bitcoin_nb.ts"> + <DeploymentContent>true</DeploymentContent> + </None> + <None Include="..\..\src\qt\locale\bitcoin_ne.ts"> + <DeploymentContent>true</DeploymentContent> + </None> + <None Include="..\..\src\qt\locale\bitcoin_nl.ts"> + <DeploymentContent>true</DeploymentContent> + </None> + <None Include="..\..\src\qt\locale\bitcoin_pam.ts"> + <DeploymentContent>true</DeploymentContent> + </None> + <None Include="..\..\src\qt\locale\bitcoin_pl.ts"> + <DeploymentContent>true</DeploymentContent> + </None> + <None Include="..\..\src\qt\locale\bitcoin_pt_BR.ts"> + <DeploymentContent>true</DeploymentContent> + </None> + <None Include="..\..\src\qt\locale\bitcoin_pt_PT.ts"> + <DeploymentContent>true</DeploymentContent> + </None> + <None Include="..\..\src\qt\locale\bitcoin_ro.ts"> + <DeploymentContent>true</DeploymentContent> + </None> + <None Include="..\..\src\qt\locale\bitcoin_ro_RO.ts"> + <DeploymentContent>true</DeploymentContent> + </None> + <None Include="..\..\src\qt\locale\bitcoin_ru.ts"> + <DeploymentContent>true</DeploymentContent> + </None> + <None Include="..\..\src\qt\locale\bitcoin_ru_RU.ts"> + <DeploymentContent>true</DeploymentContent> + </None> + <None Include="..\..\src\qt\locale\bitcoin_sk.ts"> + <DeploymentContent>true</DeploymentContent> + </None> + <None Include="..\..\src\qt\locale\bitcoin_sl_SI.ts"> + <DeploymentContent>true</DeploymentContent> + </None> + <None Include="..\..\src\qt\locale\bitcoin_sq.ts"> + <DeploymentContent>true</DeploymentContent> + </None> + <None Include="..\..\src\qt\locale\bitcoin_sr%40latin.ts"> + <DeploymentContent>true</DeploymentContent> + </None> + <None Include="..\..\src\qt\locale\bitcoin_sr.ts"> + <DeploymentContent>true</DeploymentContent> + </None> + <None Include="..\..\src\qt\locale\bitcoin_sv.ts"> + <DeploymentContent>true</DeploymentContent> + </None> + <None Include="..\..\src\qt\locale\bitcoin_ta.ts"> + <DeploymentContent>true</DeploymentContent> + </None> + <None Include="..\..\src\qt\locale\bitcoin_th_TH.ts"> + <DeploymentContent>true</DeploymentContent> + </None> + <None Include="..\..\src\qt\locale\bitcoin_tr.ts"> + <DeploymentContent>true</DeploymentContent> + </None> + <None Include="..\..\src\qt\locale\bitcoin_tr_TR.ts"> + <DeploymentContent>true</DeploymentContent> + </None> + <None Include="..\..\src\qt\locale\bitcoin_uk.ts"> + <DeploymentContent>true</DeploymentContent> + </None> + <None Include="..\..\src\qt\locale\bitcoin_ur_PK.ts"> + <DeploymentContent>true</DeploymentContent> + </None> + <None Include="..\..\src\qt\locale\bitcoin_uz%40Cyrl.ts"> + <DeploymentContent>true</DeploymentContent> + </None> + <None Include="..\..\src\qt\locale\bitcoin_vi.ts"> + <DeploymentContent>true</DeploymentContent> + </None> + <None Include="..\..\src\qt\locale\bitcoin_vi_VN.ts"> + <DeploymentContent>true</DeploymentContent> + </None> + <None Include="..\..\src\qt\locale\bitcoin_zh.ts"> + <DeploymentContent>true</DeploymentContent> + </None> + <None Include="..\..\src\qt\locale\bitcoin_zh_CN.ts"> + <DeploymentContent>true</DeploymentContent> + </None> + <None Include="..\..\src\qt\locale\bitcoin_zh_HK.ts"> + <DeploymentContent>true</DeploymentContent> + </None> + <None Include="..\..\src\qt\locale\bitcoin_zh_TW.ts"> + <DeploymentContent>true</DeploymentContent> + </None> + <CustomBuild Include="..\..\src\qt\paymentrequest.proto"> + <FileType>Document</FileType> + <Command>F:\Dependencies\protobuf-cpp-3.4.1\protobuf-3.4.1\cmake\build\vs\Debug\protoc.exe --proto_path=%(RootDir)%(Directory) %(Fullpath) --cpp_out=.\GeneratedFiles</Command> + <Message>ProtoBuf source generation %(RootDir)%(Directory) %(Filename)</Message> + <Outputs>.\GeneratedFiles\%(Filename).pb.h;.\GeneratedFiles\(%Filename).pb.cc</Outputs> + <AdditionalInputs>F:\Dependencies\protobuf-cpp-3.4.1\protobuf-3.4.1\cmake\build\vs\Debug\protoc.exe</AdditionalInputs> + <LinkObjects>false</LinkObjects> + <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">F:\deps\protobuf\protobuf-3.4.1\cmake\build\vs\Debug\protoc.exe --proto_path=%(RootDir)%(Directory) %(Fullpath) --cpp_out=.\GeneratedFiles</Command> + <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">F:\deps\protobuf\protobuf-3.4.1\cmake\build\vs\Debug\protoc.exe</AdditionalInputs> + </CustomBuild> + <None Include="..\..\src\qt\macdockiconhandler.mm" /> + <None Include="..\..\src\qt\macnotificationhandler.mm" /> + <None Include="..\..\src\qtes\icons\bitcoin.icns"> + <DeploymentContent>true</DeploymentContent> + </None> + <None Include="..\..\src\qtes\src\bitcoin.svg"> + <DeploymentContent>true</DeploymentContent> + </None> + <None Include="..\..\src\qtes\src\clock_0.svg"> + <DeploymentContent>true</DeploymentContent> + </None> + <None Include="..\..\src\qtes\src\clock_1.svg"> + <DeploymentContent>true</DeploymentContent> + </None> + <None Include="..\..\src\qtes\src\clock_2.svg"> + <DeploymentContent>true</DeploymentContent> + </None> + <None Include="..\..\src\qtes\src\clock_3.svg"> + <DeploymentContent>true</DeploymentContent> + </None> + <None Include="..\..\src\qtes\src\clock_4.svg"> + <DeploymentContent>true</DeploymentContent> + </None> + <None Include="..\..\src\qtes\src\connect-0.svg"> + <DeploymentContent>true</DeploymentContent> + </None> + <None Include="..\..\src\qtes\src\connect-1.svg"> + <DeploymentContent>true</DeploymentContent> + </None> + <None Include="..\..\src\qtes\src\connect-2.svg"> + <DeploymentContent>true</DeploymentContent> + </None> + <None Include="..\..\src\qtes\src\connect-3.svg"> + <DeploymentContent>true</DeploymentContent> + </None> + <None Include="..\..\src\qtes\src\connect-4.svg"> + <DeploymentContent>true</DeploymentContent> + </None> + <None Include="..\..\src\qtes\src\hd_disabled.svg"> + <DeploymentContent>true</DeploymentContent> + </None> + <None Include="..\..\src\qtes\src\hd_enabled.svg"> + <DeploymentContent>true</DeploymentContent> + </None> + <None Include="..\..\src\qtes\src\mine.svg"> + <DeploymentContent>true</DeploymentContent> + </None> + <None Include="..\..\src\qtes\src\network_disabled.svg"> + <DeploymentContent>true</DeploymentContent> + </None> + <None Include="..\..\src\qtes\src\qt.svg"> + <DeploymentContent>true</DeploymentContent> + </None> + <None Include="..\..\src\qtes\src\transaction0.svg"> + <DeploymentContent>true</DeploymentContent> + </None> + <None Include="..\..\src\qtes\src\tx_in.svg"> + <DeploymentContent>true</DeploymentContent> + </None> + <None Include="..\..\src\qtes\src\tx_inout.svg"> + <DeploymentContent>true</DeploymentContent> + </None> + <None Include="..\..\src\qtes\src\verify.svg"> + <DeploymentContent>true</DeploymentContent> + </None> + <None Include="GeneratedFiles\bitcoin.moc" /> + <None Include="GeneratedFiles\bitcoinamountfield.moc" /> + <None Include="GeneratedFiles\intro.moc" /> + <None Include="GeneratedFiles\overviewpage.moc" /> + <None Include="GeneratedFilespcconsole.moc" /> + </ItemGroup> + <ItemGroup> + <Image Include="..\..\src\qtes\icons\about.png"> + <DeploymentContent>true</DeploymentContent> + </Image> + <Image Include="..\..\src\qtes\icons\about_qt.png"> + <DeploymentContent>true</DeploymentContent> + </Image> + <Image Include="..\..\src\qtes\icons\add.png"> + <DeploymentContent>true</DeploymentContent> + </Image> + <Image Include="..\..\src\qtes\icons\address-book.png"> + <DeploymentContent>true</DeploymentContent> + </Image> + <Image Include="..\..\src\qtes\icons\bitcoin.ico"> + <DeploymentContent>true</DeploymentContent> + </Image> + <Image Include="..\..\src\qtes\icons\bitcoin.png"> + <DeploymentContent>true</DeploymentContent> + </Image> + <Image Include="..\..\src\qtes\icons\bitcoin_testnet.ico"> + <DeploymentContent>true</DeploymentContent> + </Image> + <Image Include="..\..\src\qtes\icons\chevron.png"> + <DeploymentContent>true</DeploymentContent> + </Image> + <Image Include="..\..\src\qtes\icons\clock1.png"> + <DeploymentContent>true</DeploymentContent> + </Image> + <Image Include="..\..\src\qtes\icons\clock2.png"> + <DeploymentContent>true</DeploymentContent> + </Image> + <Image Include="..\..\src\qtes\icons\clock3.png"> + <DeploymentContent>true</DeploymentContent> + </Image> + <Image Include="..\..\src\qtes\icons\clock4.png"> + <DeploymentContent>true</DeploymentContent> + </Image> + <Image Include="..\..\src\qtes\icons\clock5.png"> + <DeploymentContent>true</DeploymentContent> + </Image> + <Image Include="..\..\src\qtes\icons\configure.png"> + <DeploymentContent>true</DeploymentContent> + </Image> + <Image Include="..\..\src\qtes\icons\connect0.png"> + <DeploymentContent>true</DeploymentContent> + </Image> + <Image Include="..\..\src\qtes\icons\connect1.png"> + <DeploymentContent>true</DeploymentContent> + </Image> + <Image Include="..\..\src\qtes\icons\connect2.png"> + <DeploymentContent>true</DeploymentContent> + </Image> + <Image Include="..\..\src\qtes\icons\connect3.png"> + <DeploymentContent>true</DeploymentContent> + </Image> + <Image Include="..\..\src\qtes\icons\connect4.png"> + <DeploymentContent>true</DeploymentContent> + </Image> + <Image Include="..\..\src\qtes\icons\debugwindow.png"> + <DeploymentContent>true</DeploymentContent> + </Image> + <Image Include="..\..\src\qtes\icons\edit.png"> + <DeploymentContent>true</DeploymentContent> + </Image> + <Image Include="..\..\src\qtes\icons\editcopy.png"> + <DeploymentContent>true</DeploymentContent> + </Image> + <Image Include="..\..\src\qtes\icons\editpaste.png"> + <DeploymentContent>true</DeploymentContent> + </Image> + <Image Include="..\..\src\qtes\icons\export.png"> + <DeploymentContent>true</DeploymentContent> + </Image> + <Image Include="..\..\src\qtes\icons\eye.png"> + <DeploymentContent>true</DeploymentContent> + </Image> + <Image Include="..\..\src\qtes\icons\eye_minus.png"> + <DeploymentContent>true</DeploymentContent> + </Image> + <Image Include="..\..\src\qtes\icons\eye_plus.png"> + <DeploymentContent>true</DeploymentContent> + </Image> + <Image Include="..\..\src\qtes\icons\filesave.png"> + <DeploymentContent>true</DeploymentContent> + </Image> + <Image Include="..\..\src\qtes\icons\fontbigger.png"> + <DeploymentContent>true</DeploymentContent> + </Image> + <Image Include="..\..\src\qtes\icons\fontsmaller.png"> + <DeploymentContent>true</DeploymentContent> + </Image> + <Image Include="..\..\src\qtes\icons\hd_disabled.png"> + <DeploymentContent>true</DeploymentContent> + </Image> + <Image Include="..\..\src\qtes\icons\hd_enabled.png"> + <DeploymentContent>true</DeploymentContent> + </Image> + <Image Include="..\..\src\qtes\icons\history.png"> + <DeploymentContent>true</DeploymentContent> + </Image> + <Image Include="..\..\src\qtes\icons\info.png"> + <DeploymentContent>true</DeploymentContent> + </Image> + <Image Include="..\..\src\qtes\icons\key.png"> + <DeploymentContent>true</DeploymentContent> + </Image> + <Image Include="..\..\src\qtes\icons\lock_closed.png"> + <DeploymentContent>true</DeploymentContent> + </Image> + <Image Include="..\..\src\qtes\icons\lock_open.png"> + <DeploymentContent>true</DeploymentContent> + </Image> + <Image Include="..\..\src\qtes\icons\network_disabled.png"> + <DeploymentContent>true</DeploymentContent> + </Image> + <Image Include="..\..\src\qtes\icons\open.png"> + <DeploymentContent>true</DeploymentContent> + </Image> + <Image Include="..\..\src\qtes\icons\overview.png"> + <DeploymentContent>true</DeploymentContent> + </Image> + <Image Include="..\..\src\qtes\icons\quit.png"> + <DeploymentContent>true</DeploymentContent> + </Image> + <Image Include="..\..\src\qtes\iconseceive.png"> + <DeploymentContent>true</DeploymentContent> + </Image> + <Image Include="..\..\src\qtes\iconsemove.png"> + <DeploymentContent>true</DeploymentContent> + </Image> + <Image Include="..\..\src\qtes\icons\send.png"> + <DeploymentContent>true</DeploymentContent> + </Image> + <Image Include="..\..\src\qtes\icons\synced.png"> + <DeploymentContent>true</DeploymentContent> + </Image> + <Image Include="..\..\src\qtes\icons\transaction0.png"> + <DeploymentContent>true</DeploymentContent> + </Image> + <Image Include="..\..\src\qtes\icons\transaction2.png"> + <DeploymentContent>true</DeploymentContent> + </Image> + <Image Include="..\..\src\qtes\icons\transaction_abandoned.png"> + <DeploymentContent>true</DeploymentContent> + </Image> + <Image Include="..\..\src\qtes\icons\transaction_conflicted.png"> + <DeploymentContent>true</DeploymentContent> + </Image> + <Image Include="..\..\src\qtes\icons\tx_inout.png"> + <DeploymentContent>true</DeploymentContent> + </Image> + <Image Include="..\..\src\qtes\icons\tx_input.png"> + <DeploymentContent>true</DeploymentContent> + </Image> + <Image Include="..\..\src\qtes\icons\tx_mined.png"> + <DeploymentContent>true</DeploymentContent> + </Image> + <Image Include="..\..\src\qtes\icons\tx_output.png"> + <DeploymentContent>true</DeploymentContent> + </Image> + <Image Include="..\..\src\qtes\icons\verify.png"> + <DeploymentContent>true</DeploymentContent> + </Image> + <Image Include="..\..\src\qtes\icons\warning.png"> + <DeploymentContent>true</DeploymentContent> + </Image> + <Image Include="..\..\src\qtes\movies\spinner-000.png"> + <DeploymentContent>true</DeploymentContent> + </Image> + <Image Include="..\..\src\qtes\movies\spinner-001.png"> + <DeploymentContent>true</DeploymentContent> + </Image> + <Image Include="..\..\src\qtes\movies\spinner-002.png"> + <DeploymentContent>true</DeploymentContent> + </Image> + <Image Include="..\..\src\qtes\movies\spinner-003.png"> + <DeploymentContent>true</DeploymentContent> + </Image> + <Image Include="..\..\src\qtes\movies\spinner-004.png"> + <DeploymentContent>true</DeploymentContent> + </Image> + <Image Include="..\..\src\qtes\movies\spinner-005.png"> + <DeploymentContent>true</DeploymentContent> + </Image> + <Image Include="..\..\src\qtes\movies\spinner-006.png"> + <DeploymentContent>true</DeploymentContent> + </Image> + <Image Include="..\..\src\qtes\movies\spinner-007.png"> + <DeploymentContent>true</DeploymentContent> + </Image> + <Image Include="..\..\src\qtes\movies\spinner-008.png"> + <DeploymentContent>true</DeploymentContent> + </Image> + <Image Include="..\..\src\qtes\movies\spinner-009.png"> + <DeploymentContent>true</DeploymentContent> + </Image> + <Image Include="..\..\src\qtes\movies\spinner-010.png"> + <DeploymentContent>true</DeploymentContent> + </Image> + <Image Include="..\..\src\qtes\movies\spinner-011.png"> + <DeploymentContent>true</DeploymentContent> + </Image> + <Image Include="..\..\src\qtes\movies\spinner-012.png"> + <DeploymentContent>true</DeploymentContent> + </Image> + <Image Include="..\..\src\qtes\movies\spinner-013.png"> + <DeploymentContent>true</DeploymentContent> + </Image> + <Image Include="..\..\src\qtes\movies\spinner-014.png"> + <DeploymentContent>true</DeploymentContent> + </Image> + <Image Include="..\..\src\qtes\movies\spinner-015.png"> + <DeploymentContent>true</DeploymentContent> + </Image> + <Image Include="..\..\src\qtes\movies\spinner-016.png"> + <DeploymentContent>true</DeploymentContent> + </Image> + <Image Include="..\..\src\qtes\movies\spinner-017.png"> + <DeploymentContent>true</DeploymentContent> + </Image> + <Image Include="..\..\src\qtes\movies\spinner-018.png"> + <DeploymentContent>true</DeploymentContent> + </Image> + <Image Include="..\..\src\qtes\movies\spinner-019.png"> + <DeploymentContent>true</DeploymentContent> + </Image> + <Image Include="..\..\src\qtes\movies\spinner-020.png"> + <DeploymentContent>true</DeploymentContent> + </Image> + <Image Include="..\..\src\qtes\movies\spinner-021.png"> + <DeploymentContent>true</DeploymentContent> + </Image> + <Image Include="..\..\src\qtes\movies\spinner-022.png"> + <DeploymentContent>true</DeploymentContent> + </Image> + <Image Include="..\..\src\qtes\movies\spinner-023.png"> + <DeploymentContent>true</DeploymentContent> + </Image> + <Image Include="..\..\src\qtes\movies\spinner-024.png"> + <DeploymentContent>true</DeploymentContent> + </Image> + <Image Include="..\..\src\qtes\movies\spinner-025.png"> + <DeploymentContent>true</DeploymentContent> + </Image> + <Image Include="..\..\src\qtes\movies\spinner-026.png"> + <DeploymentContent>true</DeploymentContent> + </Image> + <Image Include="..\..\src\qtes\movies\spinner-027.png"> + <DeploymentContent>true</DeploymentContent> + </Image> + <Image Include="..\..\src\qtes\movies\spinner-028.png"> + <DeploymentContent>true</DeploymentContent> + </Image> + <Image Include="..\..\src\qtes\movies\spinner-029.png"> + <DeploymentContent>true</DeploymentContent> + </Image> + <Image Include="..\..\src\qtes\movies\spinner-030.png"> + <DeploymentContent>true</DeploymentContent> + </Image> + <Image Include="..\..\src\qtes\movies\spinner-031.png"> + <DeploymentContent>true</DeploymentContent> + </Image> + <Image Include="..\..\src\qtes\movies\spinner-032.png"> + <DeploymentContent>true</DeploymentContent> + </Image> + <Image Include="..\..\src\qtes\movies\spinner-033.png"> + <DeploymentContent>true</DeploymentContent> + </Image> + <Image Include="..\..\src\qtes\movies\spinner-034.png"> + <DeploymentContent>true</DeploymentContent> + </Image> + <Image Include="..\..\src\qtes\movies\spinner-035.png"> + <DeploymentContent>true</DeploymentContent> + </Image> + <Image Include="..\..\src\qtes\src\spinner.png"> + <DeploymentContent>true</DeploymentContent> + </Image> + </ItemGroup> + <ItemGroup> + <ClCompile Include="GeneratedFiles\qrc_bitcoin.cpp" /> + <ClCompile Include="GeneratedFiles\qrc_bitcoin_locale.cpp" /> + <CustomBuild Include="..\..\src\qt\bitcoin.cpp"> + <Command>"$(QTDIR)\bin\moc.exe" "%(Fullpath)" -o .\GeneratedFiles\%(Filename).moc $(MOC_DEF)</Command> + <Message>Qt moc generation for %(Identity)</Message> + <Outputs>.\GeneratedFiles\%(Filename).moc</Outputs> + <AdditionalInputs>(QTDIR)\bin\moc.exe</AdditionalInputs> + </CustomBuild> + <CustomBuild Include="..\..\src\qt\bitcoinamountfield.cpp"> + <Command>"$(QTDIR)\bin\moc.exe" "%(Fullpath)" -o .\GeneratedFiles\%(Filename).moc $(MOC_DEF)</Command> + <Message>Qt moc generation for %(Identity)</Message> + <Outputs>.\GeneratedFiles\%(Filename).moc</Outputs> + <AdditionalInputs>(QTDIR)\bin\moc.exe</AdditionalInputs> + </CustomBuild> + <CustomBuild Include="..\..\src\qt\intro.cpp"> + <Command>"$(QTDIR)\bin\moc.exe" "%(Fullpath)" -o .\GeneratedFiles\%(Filename).moc $(MOC_DEF)</Command> + <Message>Qt moc generation for %(Identity)</Message> + <Outputs>.\GeneratedFiles\%(Filename).moc</Outputs> + <AdditionalInputs>(QTDIR)\bin\moc.exe</AdditionalInputs> + </CustomBuild> + <CustomBuild Include="..\..\src\qt\overviewpage.cpp"> + <Command>"$(QTDIR)\bin\moc.exe" "%(Fullpath)" -o .\GeneratedFiles\%(Filename).moc $(MOC_DEF)</Command> + <Message>Qt moc generation for %(Identity)</Message> + <Outputs>.\GeneratedFiles\%(Filename).moc</Outputs> + <AdditionalInputs>(QTDIR)\bin\moc.exe</AdditionalInputs> + </CustomBuild> + <CustomBuild Include="..\..\src\qtpcconsole.cpp"> + <Command>"$(QTDIR)\bin\moc.exe" "%(Fullpath)" -o .\GeneratedFiles\%(Filename).moc $(MOC_DEF)</Command> + <Message>Qt moc generation for %(Identity)</Message> + <Outputs>.\GeneratedFiles\%(Filename).moc</Outputs> + <AdditionalInputs>(QTDIR)\bin\moc.exe</AdditionalInputs> + </CustomBuild> + <ClCompile Include="GeneratedFiles\moc_addressbookpage.cpp" /> + <ClCompile Include="GeneratedFiles\moc_addresstablemodel.cpp" /> + <ClCompile Include="GeneratedFiles\moc_askpassphrasedialog.cpp" /> + <ClCompile Include="GeneratedFiles\moc_bantablemodel.cpp" /> + <ClCompile Include="GeneratedFiles\moc_bitcoinaddressvalidator.cpp" /> + <ClCompile Include="GeneratedFiles\moc_bitcoinamountfield.cpp" /> + <ClCompile Include="GeneratedFiles\moc_bitcoingui.cpp" /> + <ClCompile Include="GeneratedFiles\moc_bitcoinunits.cpp" /> + <ClCompile Include="GeneratedFiles\moc_callback.cpp" /> + <ClCompile Include="GeneratedFiles\moc_clientmodel.cpp" /> + <ClCompile Include="GeneratedFiles\moc_coincontroldialog.cpp" /> + <ClCompile Include="GeneratedFiles\moc_coincontroltreewidget.cpp" /> + <ClCompile Include="GeneratedFiles\moc_csvmodelwriter.cpp" /> + <ClCompile Include="GeneratedFiles\moc_editaddressdialog.cpp" /> + <ClCompile Include="GeneratedFiles\moc_guiconstants.cpp" /> + <ClCompile Include="GeneratedFiles\moc_guiutil.cpp" /> + <ClCompile Include="GeneratedFiles\moc_intro.cpp" /> + <ClCompile Include="GeneratedFiles\moc_macdockiconhandler.cpp" /> + <ClCompile Include="GeneratedFiles\moc_macnotificationhandler.cpp" /> + <ClCompile Include="GeneratedFiles\moc_modaloverlay.cpp" /> + <ClCompile Include="GeneratedFiles\moc_networkstyle.cpp" /> + <ClCompile Include="GeneratedFiles\moc_notificator.cpp" /> + <ClCompile Include="GeneratedFiles\moc_openuridialog.cpp" /> + <ClCompile Include="GeneratedFiles\moc_optionsdialog.cpp" /> + <ClCompile Include="GeneratedFiles\moc_optionsmodel.cpp" /> + <ClCompile Include="GeneratedFiles\moc_overviewpage.cpp" /> + <ClCompile Include="GeneratedFiles\moc_paymentrequestplus.cpp" /> + <ClCompile Include="GeneratedFiles\moc_paymentserver.cpp" /> + <ClCompile Include="GeneratedFiles\moc_peertablemodel.cpp" /> + <ClCompile Include="GeneratedFiles\moc_platformstyle.cpp" /> + <ClCompile Include="GeneratedFiles\moc_qvalidatedlineedit.cpp" /> + <ClCompile Include="GeneratedFiles\moc_qvaluecombobox.cpp" /> + <ClCompile Include="GeneratedFiles\moc_receivecoinsdialog.cpp" /> + <ClCompile Include="GeneratedFiles\moc_receiverequestdialog.cpp" /> + <ClCompile Include="GeneratedFiles\moc_recentrequeststablemodel.cpp" /> + <ClCompile Include="GeneratedFiles\moc_rpcconsole.cpp" /> + <ClCompile Include="GeneratedFiles\moc_sendcoinsdialog.cpp" /> + <ClCompile Include="GeneratedFiles\moc_sendcoinsentry.cpp" /> + <ClCompile Include="GeneratedFiles\moc_signverifymessagedialog.cpp" /> + <ClCompile Include="GeneratedFiles\moc_splashscreen.cpp" /> + <ClCompile Include="GeneratedFiles\moc_trafficgraphwidget.cpp" /> + <ClCompile Include="GeneratedFiles\moc_transactiondesc.cpp" /> + <ClCompile Include="GeneratedFiles\moc_transactiondescdialog.cpp" /> + <ClCompile Include="GeneratedFiles\moc_transactionfilterproxy.cpp" /> + <ClCompile Include="GeneratedFiles\moc_transactionrecord.cpp" /> + <ClCompile Include="GeneratedFiles\moc_transactiontablemodel.cpp" /> + <ClCompile Include="GeneratedFiles\moc_transactionview.cpp" /> + <ClCompile Include="GeneratedFiles\moc_utilitydialog.cpp" /> + <ClCompile Include="GeneratedFiles\moc_walletframe.cpp" /> + <ClCompile Include="GeneratedFiles\moc_walletmodel.cpp" /> + <ClCompile Include="GeneratedFiles\moc_walletmodeltransaction.cpp" /> + <ClCompile Include="GeneratedFiles\moc_walletview.cpp" /> + <ClCompile Include="GeneratedFiles\moc_winshutdownmonitor.cpp" /> + <ClCompile Include="GeneratedFiles\paymentrequest.pb.cc" /> + </ItemGroup> + <ItemGroup> + <ClInclude Include="GeneratedFiles\paymentrequest.pb.h" /> + <ClInclude Include="GeneratedFiles\ui_addressbookpage.h" /> + <ClInclude Include="GeneratedFiles\ui_askpassphrasedialog.h" /> + <ClInclude Include="GeneratedFiles\ui_coincontroldialog.h" /> + <ClInclude Include="GeneratedFiles\ui_debugwindow.h" /> + <ClInclude Include="GeneratedFiles\ui_editaddressdialog.h" /> + <ClInclude Include="GeneratedFiles\ui_helpmessagedialog.h" /> + <ClInclude Include="GeneratedFiles\ui_intro.h" /> + <ClInclude Include="GeneratedFiles\ui_modaloverlay.h" /> + <ClInclude Include="GeneratedFiles\ui_openuridialog.h" /> + <ClInclude Include="GeneratedFiles\ui_optionsdialog.h" /> + <ClInclude Include="GeneratedFiles\ui_overviewpage.h" /> + <ClInclude Include="GeneratedFiles\ui_receivecoinsdialog.h" /> + <ClInclude Include="GeneratedFiles\ui_receiverequestdialog.h" /> + <ClInclude Include="GeneratedFiles\ui_sendcoinsdialog.h" /> + <ClInclude Include="GeneratedFiles\ui_sendcoinsentry.h" /> + <ClInclude Include="GeneratedFiles\ui_signverifymessagedialog.h" /> + <ClInclude Include="GeneratedFiles\ui_transactiondescdialog.h" /> + </ItemGroup> + <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> + <ConfigurationType>StaticLibrary</ConfigurationType> + <UseDebugLibraries>true</UseDebugLibraries> + <PlatformToolset>v141</PlatformToolset> + <CharacterSet>Unicode</CharacterSet> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> + <ConfigurationType>StaticLibrary</ConfigurationType> + <UseDebugLibraries>false</UseDebugLibraries> + <PlatformToolset>v141</PlatformToolset> + <WholeProgramOptimization>true</WholeProgramOptimization> + <CharacterSet>Unicode</CharacterSet> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration"> + <ConfigurationType>StaticLibrary</ConfigurationType> + <UseDebugLibraries>true</UseDebugLibraries> + <PlatformToolset>v141</PlatformToolset> + <CharacterSet>Unicode</CharacterSet> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration"> + <ConfigurationType>StaticLibrary</ConfigurationType> + <UseDebugLibraries>false</UseDebugLibraries> + <PlatformToolset>v141</PlatformToolset> + <WholeProgramOptimization>true</WholeProgramOptimization> + <CharacterSet>Unicode</CharacterSet> + </PropertyGroup> + <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> + <ImportGroup Label="ExtensionSettings"> + </ImportGroup> + <ImportGroup Label="Shared"> + </ImportGroup> + <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> + <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> + </ImportGroup> + <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> + <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> + </ImportGroup> + <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> + <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> + </ImportGroup> + <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> + <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> + </ImportGroup> + <PropertyGroup Label="UserMacros" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> + <LinkIncremental>false</LinkIncremental> + <Linkage-protobuf>static</Linkage-protobuf> + <CustomBuildBeforeTargets>ClCompile</CustomBuildBeforeTargets> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> + <LinkIncremental>true</LinkIncremental> + <Linkage-protobuf>static</Linkage-protobuf> + <CustomBuildBeforeTargets>ClCompile</CustomBuildBeforeTargets> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> + <LinkIncremental>true</LinkIncremental> + <Linkage-protobuf>static</Linkage-protobuf> + <CustomBuildBeforeTargets>ClCompile</CustomBuildBeforeTargets> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> + <LinkIncremental>false</LinkIncremental> + <Linkage-protobuf>static</Linkage-protobuf> + <CustomBuildBeforeTargets>ClCompile</CustomBuildBeforeTargets> + </PropertyGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> + <ClCompile> + <PrecompiledHeader>NotUsing</PrecompiledHeader> + <WarningLevel>Level3</WarningLevel> + <Optimization>Disabled</Optimization> + <FunctionLevelLinking>true</FunctionLevelLinking> + <IntrinsicFunctions>false</IntrinsicFunctions> + <PreprocessorDefinitions>_X86_;WIN32;HAVE_CONFIG_H;_SCL_SECURE_NO_WARNINGS;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <SDLCheck>true</SDLCheck> + <AdditionalIncludeDirectories>.\GeneratedFiles;..\..\src;..\..\src\univalue\include;.\QtGenerated\mocheaders</AdditionalIncludeDirectories> + <RuntimeLibrary>MultiThreaded</RuntimeLibrary> + </ClCompile> + <Link> + <SubSystem>Console</SubSystem> + <EnableCOMDATFolding>true</EnableCOMDATFolding> + <OptimizeReferences>true</OptimizeReferences> + <GenerateDebugInformation>true</GenerateDebugInformation> + </Link> + </ItemDefinitionGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> + <ClCompile> + <PrecompiledHeader>NotUsing</PrecompiledHeader> + <WarningLevel>Level3</WarningLevel> + <Optimization>Disabled</Optimization> + <PreprocessorDefinitions>_X86_;WIN32;HAVE_CONFIG_H;_SCL_SECURE_NO_WARNINGS;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <SDLCheck>true</SDLCheck> + <AdditionalIncludeDirectories>.\GeneratedFiles;..\..\src;..\..\src\univalue\include;.\QtGenerated\mocheaders</AdditionalIncludeDirectories> + <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary> + </ClCompile> + <Link> + <SubSystem>Console</SubSystem> + <GenerateDebugInformation>true</GenerateDebugInformation> + </Link> + </ItemDefinitionGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> + <ClCompile> + <PrecompiledHeader>NotUsing</PrecompiledHeader> + <WarningLevel>Level3</WarningLevel> + <Optimization>Disabled</Optimization> + <PreprocessorDefinitions>WIN32;HAVE_CONFIG_H;_SCL_SECURE_NO_WARNINGS;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <SDLCheck>true</SDLCheck> + <AdditionalIncludeDirectories>.\GeneratedFiles;..\..\src;..\..\src\univalue\include;.\QtGenerated\mocheaders</AdditionalIncludeDirectories> + <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary> + </ClCompile> + <Link> + <SubSystem>Console</SubSystem> + <GenerateDebugInformation>true</GenerateDebugInformation> + </Link> + </ItemDefinitionGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> + <ClCompile> + <PrecompiledHeader>NotUsing</PrecompiledHeader> + <WarningLevel>Level3</WarningLevel> + <Optimization>MaxSpeed</Optimization> + <FunctionLevelLinking>true</FunctionLevelLinking> + <IntrinsicFunctions>true</IntrinsicFunctions> + <PreprocessorDefinitions>WIN32;HAVE_CONFIG_H;_SCL_SECURE_NO_WARNINGS;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <SDLCheck>true</SDLCheck> + <AdditionalIncludeDirectories>.\GeneratedFiles;..\..\src;..\..\src\univalue\include;.\QtGenerated\mocheaders</AdditionalIncludeDirectories> + <RuntimeLibrary>MultiThreaded</RuntimeLibrary> + </ClCompile> + <Link> + <SubSystem>Console</SubSystem> + <EnableCOMDATFolding>true</EnableCOMDATFolding> + <OptimizeReferences>true</OptimizeReferences> + <GenerateDebugInformation>true</GenerateDebugInformation> + </Link> + </ItemDefinitionGroup> + <Import Label="configTarget" Project="..\common.vcxproj" /> + <Target Name="QtHeadersMocCodeGeneration" BeforeTargets="PrepareForBuild"> + <PropertyGroup> + <ErrorText>There was an error executing the Qt headers moc code generation tasks.</ErrorText> + </PropertyGroup> + <ItemGroup> + <QtMocHeaderFiles Include="..\..\src\qt\*.h" /> + </ItemGroup> + <Exec Command="$(QTDIR)\bin\moc.exe "%(QtMocHeaderFiles.Identity)" -o .\GeneratedFiles\moc_%(Filename).cpp $(MOC_DEF)" /> + </Target> + <Target Name="QtFormsCodeGeneration" BeforeTargets="PrepareForBuild"> + <PropertyGroup> + <ErrorText>There was an error executing the Qt forms code generation tasks.</ErrorText> + </PropertyGroup> + <ItemGroup> + <QtFormFiles Include="..\..\src\qt\forms\*.ui" /> + </ItemGroup> + <Exec Command="$(QTDIR)\bin\uic.exe "%(QtFormFiles.Identity)" -o .\GeneratedFiles\ui_%(Filename).h" /> + </Target> + <Target Name="QtLocaleCodeGeneration" BeforeTargets="PrepareForBuild"> + <PropertyGroup> + <ErrorText>There was an error executing the Qt local code generation tasks.</ErrorText> + </PropertyGroup> + <ItemGroup> + <QtLocaleFiles Include="..\..\src\qt\locale\*.ts" /> + </ItemGroup> + <Exec Command="$(QTDIR)\bin\lrelease.exe "%(QtLocaleFiles.Identity)" -qm ..\..\src\qt\locale\%(Filename).qm" /> + </Target> + <ImportGroup Label="ExtensionTargets"> + <!--<Import Label="berkleyDbTarget" Project="f:\deps\db-4.8.30\db.targets" /> + <Import Label="opensslTarget" Project="f:\deps\openssl\1.0.2\openssl.targets" /> + <Import Label="qtTarget" Project="F:\deps\qt\5.9.2-git-ssl\vc141-x86elease\qt.targets" /> + <Import Label="protobufTarget" Project="f:\deps\protobuf\protobuf.targets" />--> + </ImportGroup> + <ProjectExtensions> + <VisualStudio> + <UserProperties MocDir=".\GeneratedFiles" UicDir=".\GeneratedFiles" RccDir=".\GeneratedFiles" lupdateOptions="" lupdateOnBuild="0" lreleaseOptions="" Qt5Version_x0020_Win32="5.9.1_vs140_x86" Qt5Version_x0020_x64="5.9.1_vs140_x86" MocOptions="DUNICODE -DWIN32 -DQT_DLL -DQT_CORE_LIB -DQT_GUI_LIB -DQT_WIDGETS_LIB "-I.\GeneratedFiles" "-I." "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtCore" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtWidgets"" /> + </VisualStudio> + </ProjectExtensions> +</Project> diff --git a/build_msvc/libbitcoin_server/libbitcoin_server.vcxproj b/build_msvc/libbitcoin_server/libbitcoin_server.vcxproj new file mode 100644 index 0000000000..9d4ac1a7f7 --- /dev/null +++ b/build_msvc/libbitcoin_server/libbitcoin_server.vcxproj @@ -0,0 +1,212 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <Import Label="configInitTarget" Project="..\common.init.vcxproj" /> + <ItemGroup Label="ProjectConfigurations"> + <ProjectConfiguration Include="Debug|Win32"> + <Configuration>Debug</Configuration> + <Platform>Win32</Platform> + </ProjectConfiguration> + <ProjectConfiguration Include="Release|Win32"> + <Configuration>Release</Configuration> + <Platform>Win32</Platform> + </ProjectConfiguration> + <ProjectConfiguration Include="Debug|x64"> + <Configuration>Debug</Configuration> + <Platform>x64</Platform> + </ProjectConfiguration> + <ProjectConfiguration Include="Release|x64"> + <Configuration>Release</Configuration> + <Platform>x64</Platform> + </ProjectConfiguration> + </ItemGroup> + <PropertyGroup Label="Globals"> + <VCProjectVersion>15.0</VCProjectVersion> + <ProjectGuid>{460FEE33-1FE1-483F-B3BF-931FF8E969A5}</ProjectGuid> + <Keyword>Win32Proj</Keyword> + <RootNamespace>libbitcoin_server</RootNamespace> + <VcpkgTriplet Condition="'$(Platform)'=='Win32'">x86-windows-static</VcpkgTriplet> + <VcpkgTriplet Condition="'$(Platform)'=='x64'">x64-windows-static</VcpkgTriplet> + </PropertyGroup> + <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> + <ConfigurationType>StaticLibrary</ConfigurationType> + <UseDebugLibraries>true</UseDebugLibraries> + <PlatformToolset>v141</PlatformToolset> + <CharacterSet>Unicode</CharacterSet> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> + <ConfigurationType>StaticLibrary</ConfigurationType> + <UseDebugLibraries>false</UseDebugLibraries> + <PlatformToolset>v141</PlatformToolset> + <WholeProgramOptimization>true</WholeProgramOptimization> + <CharacterSet>Unicode</CharacterSet> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration"> + <ConfigurationType>StaticLibrary</ConfigurationType> + <UseDebugLibraries>true</UseDebugLibraries> + <PlatformToolset>v141</PlatformToolset> + <CharacterSet>Unicode</CharacterSet> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration"> + <ConfigurationType>StaticLibrary</ConfigurationType> + <UseDebugLibraries>false</UseDebugLibraries> + <PlatformToolset>v141</PlatformToolset> + <WholeProgramOptimization>true</WholeProgramOptimization> + <CharacterSet>Unicode</CharacterSet> + </PropertyGroup> + <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> + <ImportGroup Label="ExtensionSettings"> + </ImportGroup> + <ImportGroup Label="Shared"> + </ImportGroup> + <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> + <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> + </ImportGroup> + <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> + <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> + </ImportGroup> + <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> + <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> + </ImportGroup> + <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> + <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> + </ImportGroup> + <PropertyGroup Label="UserMacros" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> + <LinkIncremental>true</LinkIncremental> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> + <LinkIncremental>true</LinkIncremental> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> + <LinkIncremental>false</LinkIncremental> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> + <LinkIncremental>false</LinkIncremental> + </PropertyGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> + <ClCompile> + <PrecompiledHeader>NotUsing</PrecompiledHeader> + <WarningLevel>Level3</WarningLevel> + <Optimization>Disabled</Optimization> + <PreprocessorDefinitions>WIN32;HAVE_CONFIG_H;_SCL_SECURE_NO_WARNINGS;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <SDLCheck>true</SDLCheck> + <AdditionalIncludeDirectories>..\..\src;..\..\src\univalue\include;</AdditionalIncludeDirectories> + <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary> + </ClCompile> + <Link> + <SubSystem>Console</SubSystem> + <GenerateDebugInformation>true</GenerateDebugInformation> + </Link> + </ItemDefinitionGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> + <ClCompile> + <PrecompiledHeader>NotUsing</PrecompiledHeader> + <WarningLevel>Level3</WarningLevel> + <Optimization>Disabled</Optimization> + <PreprocessorDefinitions>WIN32;HAVE_CONFIG_H;_SCL_SECURE_NO_WARNINGS;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <SDLCheck>true</SDLCheck> + <AdditionalIncludeDirectories>..\..\src;..\..\src\univalue\include;</AdditionalIncludeDirectories> + <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary> + <SuppressStartupBanner>false</SuppressStartupBanner> + </ClCompile> + <Link> + <SubSystem>Console</SubSystem> + <GenerateDebugInformation>true</GenerateDebugInformation> + </Link> + </ItemDefinitionGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> + <ClCompile> + <PrecompiledHeader>NotUsing</PrecompiledHeader> + <WarningLevel>Level3</WarningLevel> + <Optimization>MaxSpeed</Optimization> + <FunctionLevelLinking>true</FunctionLevelLinking> + <IntrinsicFunctions>true</IntrinsicFunctions> + <PreprocessorDefinitions>WIN32;HAVE_CONFIG_H;_SCL_SECURE_NO_WARNINGS;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <SDLCheck>true</SDLCheck> + <AdditionalIncludeDirectories>..\..\src;..\..\src\univalue\include;</AdditionalIncludeDirectories> + <RuntimeLibrary>MultiThreaded</RuntimeLibrary> + </ClCompile> + <Link> + <SubSystem>Console</SubSystem> + <EnableCOMDATFolding>true</EnableCOMDATFolding> + <OptimizeReferences>true</OptimizeReferences> + <GenerateDebugInformation>true</GenerateDebugInformation> + </Link> + </ItemDefinitionGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> + <ClCompile> + <PrecompiledHeader>NotUsing</PrecompiledHeader> + <WarningLevel>Level3</WarningLevel> + <Optimization>MaxSpeed</Optimization> + <FunctionLevelLinking>true</FunctionLevelLinking> + <IntrinsicFunctions>true</IntrinsicFunctions> + <PreprocessorDefinitions>WIN32;HAVE_CONFIG_H;_SCL_SECURE_NO_WARNINGS;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <SDLCheck>true</SDLCheck> + <AdditionalIncludeDirectories>..\..\src;..\..\src\univalue\include;</AdditionalIncludeDirectories> + <RuntimeLibrary>MultiThreaded</RuntimeLibrary> + </ClCompile> + <Link> + <SubSystem>Console</SubSystem> + <EnableCOMDATFolding>true</EnableCOMDATFolding> + <OptimizeReferences>true</OptimizeReferences> + <GenerateDebugInformation>true</GenerateDebugInformation> + </Link> + </ItemDefinitionGroup> + <ItemGroup> + <ClCompile Include="..\..\src\addrdb.cpp" /> + <ClCompile Include="..\..\src\addrman.cpp" /> + <ClCompile Include="..\..\src\blockencodings.cpp" /> + <ClCompile Include="..\..\src\bloom.cpp" /> + <ClCompile Include="..\..\src\chain.cpp" /> + <ClCompile Include="..\..\src\checkpoints.cpp" /> + <ClCompile Include="..\..\src\consensus\tx_verify.cpp" /> + <ClCompile Include="..\..\src\dbwrapper.cpp" /> + <ClCompile Include="..\..\src\httprpc.cpp" /> + <ClCompile Include="..\..\src\httpserver.cpp" /> + <ClCompile Include="..\..\src\index\base.cpp" /> + <ClCompile Include="..\..\src\init.cpp" /> + <ClCompile Include="..\..\src\merkleblock.cpp" /> + <ClCompile Include="..\..\src\miner.cpp" /> + <ClCompile Include="..\..\src\net.cpp" /> + <ClCompile Include="..\..\src\net_processing.cpp" /> + <ClCompile Include="..\..\src\noui.cpp" /> + <ClCompile Include="..\..\src\outputtype.cpp" /> + <ClCompile Include="..\..\src\policy\fees.cpp" /> + <ClCompile Include="..\..\src\policy\policy.cpp" /> + <ClCompile Include="..\..\src\policy\rbf.cpp" /> + <ClCompile Include="..\..\src\pow.cpp" /> + <ClCompile Include="..\..\src\rest.cpp" /> + <ClCompile Include="..\..\src\shutdown.cpp" /> + <ClCompile Include="..\..\src\rpc\blockchain.cpp" /> + <ClCompile Include="..\..\src\rpc\mining.cpp" /> + <ClCompile Include="..\..\src\rpc\misc.cpp" /> + <ClCompile Include="..\..\src\rpc\net.cpp"> + <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(IntDir)\netrpc.obj</ObjectFileName> + <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(IntDir)\netrpc.obj</ObjectFileName> + <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(IntDir)\netrpc.obj</ObjectFileName> + <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(IntDir)\netrpc.obj</ObjectFileName> + </ClCompile> + <ClCompile Include="..\..\src\rpc\rawtransaction.cpp" /> + <ClCompile Include="..\..\src\rpc\server.cpp" /> + <ClCompile Include="..\..\src\rpc\util.cpp" /> + <ClCompile Include="..\..\src\script\ismine.cpp" /> + <ClCompile Include="..\..\src\script\sigcache.cpp" /> + <ClCompile Include="..\..\src\timedata.cpp" /> + <ClCompile Include="..\..\src\torcontrol.cpp" /> + <ClCompile Include="..\..\src\txdb.cpp" /> + <ClCompile Include="..\..\src\txmempool.cpp" /> + <ClCompile Include="..\..\src\ui_interface.cpp" /> + <ClCompile Include="..\..\src\validation.cpp" /> + <ClCompile Include="..\..\src\validationinterface.cpp" /> + <ClCompile Include="..\..\src\versionbits.cpp" /> + <ClCompile Include="..\..\src\index\txindex.cpp" /> + </ItemGroup> + <ItemGroup> + <None Include="packages.config" /> + </ItemGroup> + <ItemGroup> + <ClInclude Include="..\..\srcpcegister.h" /> + </ItemGroup> + <Import Label="configTarget" Project="..\common.vcxproj" /> +</Project>
\ No newline at end of file diff --git a/build_msvc/libbitcoin_util/libbitcoin_util.vcxproj b/build_msvc/libbitcoin_util/libbitcoin_util.vcxproj new file mode 100644 index 0000000000..9e960682e5 --- /dev/null +++ b/build_msvc/libbitcoin_util/libbitcoin_util.vcxproj @@ -0,0 +1,196 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <Import Label="configInitTarget" Project="..\common.init.vcxproj" /> + <ItemGroup Label="ProjectConfigurations"> + <ProjectConfiguration Include="Debug|Win32"> + <Configuration>Debug</Configuration> + <Platform>Win32</Platform> + </ProjectConfiguration> + <ProjectConfiguration Include="Release|Win32"> + <Configuration>Release</Configuration> + <Platform>Win32</Platform> + </ProjectConfiguration> + <ProjectConfiguration Include="Debug|x64"> + <Configuration>Debug</Configuration> + <Platform>x64</Platform> + </ProjectConfiguration> + <ProjectConfiguration Include="Release|x64"> + <Configuration>Release</Configuration> + <Platform>x64</Platform> + </ProjectConfiguration> + </ItemGroup> + <PropertyGroup Label="Globals"> + <VCProjectVersion>15.0</VCProjectVersion> + <ProjectGuid>{B53A5535-EE9D-4C6F-9A26-F79EE3BC3754}</ProjectGuid> + <Keyword>Win32Proj</Keyword> + <RootNamespace>libbitcoin_util</RootNamespace> + <ProjectName>libbitcoin_util</ProjectName> + <VcpkgTriplet Condition="'$(Platform)'=='Win32'">x86-windows-static</VcpkgTriplet> + <VcpkgTriplet Condition="'$(Platform)'=='x64'">x64-windows-static</VcpkgTriplet> + </PropertyGroup> + <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> + <ConfigurationType>StaticLibrary</ConfigurationType> + <UseDebugLibraries>true</UseDebugLibraries> + <PlatformToolset>v141</PlatformToolset> + <CharacterSet>Unicode</CharacterSet> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> + <ConfigurationType>StaticLibrary</ConfigurationType> + <UseDebugLibraries>false</UseDebugLibraries> + <PlatformToolset>v141</PlatformToolset> + <WholeProgramOptimization>true</WholeProgramOptimization> + <CharacterSet>Unicode</CharacterSet> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration"> + <ConfigurationType>StaticLibrary</ConfigurationType> + <UseDebugLibraries>true</UseDebugLibraries> + <PlatformToolset>v141</PlatformToolset> + <CharacterSet>Unicode</CharacterSet> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration"> + <ConfigurationType>StaticLibrary</ConfigurationType> + <UseDebugLibraries>false</UseDebugLibraries> + <PlatformToolset>v141</PlatformToolset> + <WholeProgramOptimization>true</WholeProgramOptimization> + <CharacterSet>Unicode</CharacterSet> + </PropertyGroup> + <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> + <ImportGroup Label="ExtensionSettings"> + </ImportGroup> + <ImportGroup Label="Shared"> + </ImportGroup> + <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> + <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> + </ImportGroup> + <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> + <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> + </ImportGroup> + <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> + <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> + </ImportGroup> + <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> + <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> + </ImportGroup> + <PropertyGroup Label="UserMacros" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> + <LinkIncremental>true</LinkIncremental> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> + <LinkIncremental>true</LinkIncremental> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> + <LinkIncremental>false</LinkIncremental> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> + <LinkIncremental>false</LinkIncremental> + </PropertyGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> + <ClCompile> + <PrecompiledHeader>NotUsing</PrecompiledHeader> + <WarningLevel>Level3</WarningLevel> + <Optimization>Disabled</Optimization> + <PreprocessorDefinitions>HAVE_CONFIG_H;WIN32;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <SDLCheck>true</SDLCheck> + <AdditionalIncludeDirectories>..\..\src;..\..\src\univalue\include;</AdditionalIncludeDirectories> + <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary> + </ClCompile> + <Link> + <SubSystem>Console</SubSystem> + <GenerateDebugInformation>true</GenerateDebugInformation> + <AdditionalLibraryDirectories> + </AdditionalLibraryDirectories> + </Link> + <ProjectReference> + <LinkLibraryDependencies>false</LinkLibraryDependencies> + </ProjectReference> + </ItemDefinitionGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> + <ClCompile> + <PrecompiledHeader>NotUsing</PrecompiledHeader> + <WarningLevel>Level3</WarningLevel> + <Optimization>Disabled</Optimization> + <PreprocessorDefinitions>HAVE_CONFIG_H;WIN32;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <SDLCheck>true</SDLCheck> + <AdditionalIncludeDirectories>..\..\src;..\..\src\univalue\include;</AdditionalIncludeDirectories> + <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary> + </ClCompile> + <Link> + <SubSystem>Console</SubSystem> + <GenerateDebugInformation>true</GenerateDebugInformation> + <AdditionalLibraryDirectories> + </AdditionalLibraryDirectories> + </Link> + <ProjectReference> + <LinkLibraryDependencies>false</LinkLibraryDependencies> + </ProjectReference> + </ItemDefinitionGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> + <ClCompile> + <PrecompiledHeader>NotUsing</PrecompiledHeader> + <WarningLevel>Level3</WarningLevel> + <Optimization>MaxSpeed</Optimization> + <FunctionLevelLinking>true</FunctionLevelLinking> + <IntrinsicFunctions>true</IntrinsicFunctions> + <PreprocessorDefinitions>HAVE_CONFIG_H;WIN32;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <SDLCheck>true</SDLCheck> + <AdditionalIncludeDirectories>..\..\src;..\..\src\univalue\include;</AdditionalIncludeDirectories> + <RuntimeLibrary>MultiThreaded</RuntimeLibrary> + </ClCompile> + <Link> + <SubSystem>Console</SubSystem> + <EnableCOMDATFolding>true</EnableCOMDATFolding> + <OptimizeReferences>true</OptimizeReferences> + <GenerateDebugInformation>true</GenerateDebugInformation> + <AdditionalLibraryDirectories> + </AdditionalLibraryDirectories> + </Link> + <ProjectReference> + <LinkLibraryDependencies>false</LinkLibraryDependencies> + </ProjectReference> + </ItemDefinitionGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> + <ClCompile> + <PrecompiledHeader>NotUsing</PrecompiledHeader> + <WarningLevel>Level3</WarningLevel> + <Optimization>MaxSpeed</Optimization> + <FunctionLevelLinking>true</FunctionLevelLinking> + <IntrinsicFunctions>true</IntrinsicFunctions> + <PreprocessorDefinitions>HAVE_CONFIG_H;WIN32;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <SDLCheck>true</SDLCheck> + <AdditionalIncludeDirectories>..\..\src;..\..\src\univalue\include;</AdditionalIncludeDirectories> + <RuntimeLibrary>MultiThreaded</RuntimeLibrary> + </ClCompile> + <Link> + <SubSystem>Console</SubSystem> + <EnableCOMDATFolding>true</EnableCOMDATFolding> + <OptimizeReferences>true</OptimizeReferences> + <GenerateDebugInformation>true</GenerateDebugInformation> + <AdditionalLibraryDirectories> + </AdditionalLibraryDirectories> + </Link> + <ProjectReference> + <LinkLibraryDependencies>false</LinkLibraryDependencies> + </ProjectReference> + </ItemDefinitionGroup> + <ItemGroup> + <ClCompile Include="..\..\src\chainparamsbase.cpp" /> + <ClCompile Include="..\..\src\clientversion.cpp" /> + <ClCompile Include="..\..\src\compat\glibcxx_sanity.cpp" /> + <ClCompile Include="..\..\src\compat\glibc_sanity.cpp" /> + <ClCompile Include="..\..\src\compat\strnlen.cpp" /> + <ClCompile Include="..\..\src\fs.cpp" /> + <ClCompile Include="..\..\src\logging.cpp" /> + <ClCompile Include="..\..\src\random.cpp" /> + <ClCompile Include="..\..\src\rpc\protocol.cpp" /> + <ClCompile Include="..\..\src\support\cleanse.cpp" /> + <ClCompile Include="..\..\src\support\lockedpool.cpp" /> + <ClCompile Include="..\..\src\sync.cpp" /> + <ClCompile Include="..\..\src\threadinterrupt.cpp" /> + <ClCompile Include="..\..\src\util.cpp" /> + <ClCompile Include="..\..\src\utilmoneystr.cpp" /> + <ClCompile Include="..\..\src\utilstrencodings.cpp" /> + <ClCompile Include="..\..\src\utiltime.cpp" /> + </ItemGroup> + <Import Label="configTarget" Project="..\common.vcxproj" /> +</Project> diff --git a/build_msvc/libbitcoin_wallet/libbitcoin_wallet.vcxproj b/build_msvc/libbitcoin_wallet/libbitcoin_wallet.vcxproj new file mode 100644 index 0000000000..64f3e16289 --- /dev/null +++ b/build_msvc/libbitcoin_wallet/libbitcoin_wallet.vcxproj @@ -0,0 +1,177 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <Import Label="configInitTarget" Project="..\common.init.vcxproj" /> + <ItemGroup Label="ProjectConfigurations"> + <ProjectConfiguration Include="Debug|Win32"> + <Configuration>Debug</Configuration> + <Platform>Win32</Platform> + </ProjectConfiguration> + <ProjectConfiguration Include="Release|Win32"> + <Configuration>Release</Configuration> + <Platform>Win32</Platform> + </ProjectConfiguration> + <ProjectConfiguration Include="Debug|x64"> + <Configuration>Debug</Configuration> + <Platform>x64</Platform> + </ProjectConfiguration> + <ProjectConfiguration Include="Release|x64"> + <Configuration>Release</Configuration> + <Platform>x64</Platform> + </ProjectConfiguration> + </ItemGroup> + <ItemGroup> + <ClCompile Include="..\..\src\wallet\coinselection.cpp" /> + <ClCompile Include="..\..\src\wallet\coincontrol.cpp" /> + <ClCompile Include="..\..\src\wallet\crypter.cpp" /> + <ClCompile Include="..\..\src\wallet\db.cpp" /> + <ClCompile Include="..\..\src\wallet\feebumper.cpp" /> + <ClCompile Include="..\..\src\wallet\fees.cpp" /> + <ClCompile Include="..\..\src\wallet\init.cpp" /> + <ClCompile Include="..\..\src\wallet\rpcdump.cpp" /> + <ClCompile Include="..\..\src\wallet\rpcwallet.cpp" /> + <ClCompile Include="..\..\src\wallet\wallet.cpp" /> + <ClCompile Include="..\..\src\wallet\walletdb.cpp" /> + <ClCompile Include="..\..\src\wallet\walletutil.cpp" /> + </ItemGroup> + <ItemGroup> + <None Include="packages.config" /> + </ItemGroup> + <PropertyGroup Label="Globals"> + <VCProjectVersion>15.0</VCProjectVersion> + <ProjectGuid>{93B86837-B543-48A5-A89B-7C87ABB77DF2}</ProjectGuid> + <Keyword>Win32Proj</Keyword> + <RootNamespace>libbitcoin_wallet</RootNamespace> + <VcpkgTriplet Condition="'$(Platform)'=='Win32'">x86-windows-static</VcpkgTriplet> + <VcpkgTriplet Condition="'$(Platform)'=='x64'">x64-windows-static</VcpkgTriplet> + </PropertyGroup> + <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> + <ConfigurationType>StaticLibrary</ConfigurationType> + <UseDebugLibraries>true</UseDebugLibraries> + <PlatformToolset>v141</PlatformToolset> + <CharacterSet>Unicode</CharacterSet> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> + <ConfigurationType>StaticLibrary</ConfigurationType> + <UseDebugLibraries>false</UseDebugLibraries> + <PlatformToolset>v141</PlatformToolset> + <WholeProgramOptimization>true</WholeProgramOptimization> + <CharacterSet>Unicode</CharacterSet> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration"> + <ConfigurationType>StaticLibrary</ConfigurationType> + <UseDebugLibraries>true</UseDebugLibraries> + <PlatformToolset>v141</PlatformToolset> + <CharacterSet>Unicode</CharacterSet> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration"> + <ConfigurationType>StaticLibrary</ConfigurationType> + <UseDebugLibraries>false</UseDebugLibraries> + <PlatformToolset>v141</PlatformToolset> + <WholeProgramOptimization>true</WholeProgramOptimization> + <CharacterSet>Unicode</CharacterSet> + </PropertyGroup> + <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> + <ImportGroup Label="ExtensionSettings"> + </ImportGroup> + <ImportGroup Label="Shared"> + </ImportGroup> + <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> + <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> + </ImportGroup> + <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> + <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> + </ImportGroup> + <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> + <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> + </ImportGroup> + <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> + <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> + </ImportGroup> + <PropertyGroup Label="UserMacros" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> + <LinkIncremental>true</LinkIncremental> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> + <LinkIncremental>true</LinkIncremental> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> + <LinkIncremental>false</LinkIncremental> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> + <LinkIncremental>false</LinkIncremental> + </PropertyGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> + <ClCompile> + <PrecompiledHeader>NotUsing</PrecompiledHeader> + <WarningLevel>Level3</WarningLevel> + <Optimization>Disabled</Optimization> + <PreprocessorDefinitions>HAVE_CONFIG_H;_SCL_SECURE_NO_WARNINGS;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <SDLCheck>true</SDLCheck> + <AdditionalIncludeDirectories>..\..\src;..\..\src\wallet;..\..\src\univalue\include;</AdditionalIncludeDirectories> + <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary> + <AdditionalOptions>/bigobj %(AdditionalOptions)</AdditionalOptions> + </ClCompile> + <Link> + <SubSystem>Console</SubSystem> + <GenerateDebugInformation>true</GenerateDebugInformation> + </Link> + </ItemDefinitionGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> + <ClCompile> + <PrecompiledHeader>NotUsing</PrecompiledHeader> + <WarningLevel>Level3</WarningLevel> + <Optimization>Disabled</Optimization> + <PreprocessorDefinitions>HAVE_CONFIG_H;_SCL_SECURE_NO_WARNINGS;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <SDLCheck>true</SDLCheck> + <AdditionalIncludeDirectories>..\..\src;..\..\src\wallet;..\..\src\univalue\include;</AdditionalIncludeDirectories> + <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary> + <AdditionalOptions>/bigobj %(AdditionalOptions)</AdditionalOptions> + </ClCompile> + <Link> + <SubSystem>Console</SubSystem> + <GenerateDebugInformation>true</GenerateDebugInformation> + </Link> + </ItemDefinitionGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> + <ClCompile> + <PrecompiledHeader>NotUsing</PrecompiledHeader> + <WarningLevel>Level3</WarningLevel> + <Optimization>MaxSpeed</Optimization> + <FunctionLevelLinking>true</FunctionLevelLinking> + <IntrinsicFunctions>true</IntrinsicFunctions> + <PreprocessorDefinitions>HAVE_CONFIG_H;_SCL_SECURE_NO_WARNINGS;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <SDLCheck>true</SDLCheck> + <AdditionalIncludeDirectories>..\..\src;..\..\src\wallet;..\..\src\univalue\include;</AdditionalIncludeDirectories> + <RuntimeLibrary>MultiThreaded</RuntimeLibrary> + <AdditionalOptions>/bigobj %(AdditionalOptions)</AdditionalOptions> + </ClCompile> + <Link> + <SubSystem>Console</SubSystem> + <EnableCOMDATFolding>true</EnableCOMDATFolding> + <OptimizeReferences>true</OptimizeReferences> + <GenerateDebugInformation>true</GenerateDebugInformation> + </Link> + </ItemDefinitionGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> + <ClCompile> + <PrecompiledHeader>NotUsing</PrecompiledHeader> + <WarningLevel>Level3</WarningLevel> + <Optimization>MaxSpeed</Optimization> + <FunctionLevelLinking>true</FunctionLevelLinking> + <IntrinsicFunctions>true</IntrinsicFunctions> + <PreprocessorDefinitions>HAVE_CONFIG_H;_SCL_SECURE_NO_WARNINGS;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <SDLCheck>true</SDLCheck> + <AdditionalIncludeDirectories>..\..\src;..\..\src\wallet;..\..\src\univalue\include;</AdditionalIncludeDirectories> + <RuntimeLibrary>MultiThreaded</RuntimeLibrary> + <AdditionalOptions>/bigobj %(AdditionalOptions)</AdditionalOptions> + </ClCompile> + <Link> + <SubSystem>Console</SubSystem> + <EnableCOMDATFolding>true</EnableCOMDATFolding> + <OptimizeReferences>true</OptimizeReferences> + <GenerateDebugInformation>true</GenerateDebugInformation> + </Link> + </ItemDefinitionGroup> + <Import Label="configTarget" Project="..\common.vcxproj" /> +</Project> diff --git a/build_msvc/libbitcoin_zmq/libbitcoin_zmq.vcxproj b/build_msvc/libbitcoin_zmq/libbitcoin_zmq.vcxproj new file mode 100644 index 0000000000..d7fbdd94b7 --- /dev/null +++ b/build_msvc/libbitcoin_zmq/libbitcoin_zmq.vcxproj @@ -0,0 +1,169 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <Import Label="configInitTarget" Project="..\common.init.vcxproj" /> + <ItemGroup Label="ProjectConfigurations"> + <ProjectConfiguration Include="Debug|Win32"> + <Configuration>Debug</Configuration> + <Platform>Win32</Platform> + </ProjectConfiguration> + <ProjectConfiguration Include="Release|Win32"> + <Configuration>Release</Configuration> + <Platform>Win32</Platform> + </ProjectConfiguration> + <ProjectConfiguration Include="Debug|x64"> + <Configuration>Debug</Configuration> + <Platform>x64</Platform> + </ProjectConfiguration> + <ProjectConfiguration Include="Release|x64"> + <Configuration>Release</Configuration> + <Platform>x64</Platform> + </ProjectConfiguration> + </ItemGroup> + <ItemGroup> + <ClCompile Include="..\..\src\zmq\zmqabstractnotifier.cpp" /> + <ClCompile Include="..\..\src\zmq\zmqnotificationinterface.cpp" /> + <ClCompile Include="..\..\src\zmq\zmqpublishnotifier.cpp" /> + <ClCompile Include="..\..\src\zmq\zmqrpc.cpp" /> + </ItemGroup> + <ItemGroup> + <None Include="packages.config" /> + </ItemGroup> + <PropertyGroup Label="Globals"> + <VCProjectVersion>15.0</VCProjectVersion> + <ProjectGuid>{792D487F-F14C-49FC-A9DE-3FC150F31C3F}</ProjectGuid> + <Keyword>Win32Proj</Keyword> + <RootNamespace>libbitcoin_zmq</RootNamespace> + <VcpkgTriplet Condition="'$(Platform)'=='Win32'">x86-windows-static</VcpkgTriplet> + <VcpkgTriplet Condition="'$(Platform)'=='x64'">x64-windows-static</VcpkgTriplet> + </PropertyGroup> + <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> + <ConfigurationType>StaticLibrary</ConfigurationType> + <UseDebugLibraries>true</UseDebugLibraries> + <PlatformToolset>v141</PlatformToolset> + <CharacterSet>Unicode</CharacterSet> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> + <ConfigurationType>StaticLibrary</ConfigurationType> + <UseDebugLibraries>false</UseDebugLibraries> + <PlatformToolset>v141</PlatformToolset> + <WholeProgramOptimization>true</WholeProgramOptimization> + <CharacterSet>Unicode</CharacterSet> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration"> + <ConfigurationType>StaticLibrary</ConfigurationType> + <UseDebugLibraries>true</UseDebugLibraries> + <PlatformToolset>v141</PlatformToolset> + <CharacterSet>Unicode</CharacterSet> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration"> + <ConfigurationType>StaticLibrary</ConfigurationType> + <UseDebugLibraries>false</UseDebugLibraries> + <PlatformToolset>v141</PlatformToolset> + <WholeProgramOptimization>true</WholeProgramOptimization> + <CharacterSet>Unicode</CharacterSet> + </PropertyGroup> + <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> + <ImportGroup Label="ExtensionSettings"> + </ImportGroup> + <ImportGroup Label="Shared"> + </ImportGroup> + <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> + <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> + </ImportGroup> + <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> + <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> + </ImportGroup> + <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> + <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> + </ImportGroup> + <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> + <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> + </ImportGroup> + <PropertyGroup Label="UserMacros" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> + <LinkIncremental>true</LinkIncremental> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> + <LinkIncremental>true</LinkIncremental> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> + <LinkIncremental>false</LinkIncremental> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> + <LinkIncremental>false</LinkIncremental> + </PropertyGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> + <ClCompile> + <PrecompiledHeader>NotUsing</PrecompiledHeader> + <WarningLevel>Level3</WarningLevel> + <Optimization>Disabled</Optimization> + <PreprocessorDefinitions>NOMINMAX;ZMQ_STATIC;HAVE_CONFIG_H;_SCL_SECURE_NO_WARNINGS;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <SDLCheck>true</SDLCheck> + <AdditionalIncludeDirectories>..\..\src;..\..\src\univalue\include;</AdditionalIncludeDirectories> + <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary> + <SuppressStartupBanner>false</SuppressStartupBanner> + </ClCompile> + <Link> + <SubSystem>Console</SubSystem> + <GenerateDebugInformation>true</GenerateDebugInformation> + </Link> + </ItemDefinitionGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> + <ClCompile> + <PrecompiledHeader>NotUsing</PrecompiledHeader> + <WarningLevel>Level3</WarningLevel> + <Optimization>Disabled</Optimization> + <PreprocessorDefinitions>NOMINMAX;ZMQ_STATIC;HAVE_CONFIG_H;_SCL_SECURE_NO_WARNINGS;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <SDLCheck>true</SDLCheck> + <AdditionalIncludeDirectories>..\..\src;..\..\src\univalue\include;</AdditionalIncludeDirectories> + <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary> + <SuppressStartupBanner>false</SuppressStartupBanner> + </ClCompile> + <Link> + <SubSystem>Console</SubSystem> + <GenerateDebugInformation>true</GenerateDebugInformation> + </Link> + </ItemDefinitionGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> + <ClCompile> + <PrecompiledHeader>NotUsing</PrecompiledHeader> + <WarningLevel>Level3</WarningLevel> + <Optimization>MaxSpeed</Optimization> + <FunctionLevelLinking>true</FunctionLevelLinking> + <IntrinsicFunctions>true</IntrinsicFunctions> + <PreprocessorDefinitions>NOMINMAX;ZMQ_STATIC;HAVE_CONFIG_H;_SCL_SECURE_NO_WARNINGS;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <SDLCheck>true</SDLCheck> + <AdditionalIncludeDirectories>..\..\src;..\..\src\univalue\include;</AdditionalIncludeDirectories> + <RuntimeLibrary>MultiThreaded</RuntimeLibrary> + <SuppressStartupBanner>false</SuppressStartupBanner> + </ClCompile> + <Link> + <SubSystem>Console</SubSystem> + <EnableCOMDATFolding>true</EnableCOMDATFolding> + <OptimizeReferences>true</OptimizeReferences> + <GenerateDebugInformation>true</GenerateDebugInformation> + </Link> + </ItemDefinitionGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> + <ClCompile> + <PrecompiledHeader>NotUsing</PrecompiledHeader> + <WarningLevel>Level3</WarningLevel> + <Optimization>MaxSpeed</Optimization> + <FunctionLevelLinking>true</FunctionLevelLinking> + <IntrinsicFunctions>true</IntrinsicFunctions> + <PreprocessorDefinitions>NOMINMAX;ZMQ_STATIC;HAVE_CONFIG_H;_SCL_SECURE_NO_WARNINGS;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <SDLCheck>true</SDLCheck> + <AdditionalIncludeDirectories>..\..\src;..\..\src\univalue\include;</AdditionalIncludeDirectories> + <RuntimeLibrary>MultiThreaded</RuntimeLibrary> + <SuppressStartupBanner>false</SuppressStartupBanner> + </ClCompile> + <Link> + <SubSystem>Console</SubSystem> + <EnableCOMDATFolding>true</EnableCOMDATFolding> + <OptimizeReferences>true</OptimizeReferences> + <GenerateDebugInformation>true</GenerateDebugInformation> + </Link> + </ItemDefinitionGroup> + <Import Label="configTarget" Project="..\common.vcxproj" /> +</Project> diff --git a/build_msvc/libbitcoinconsensus/libbitcoinconsensus.vcxproj b/build_msvc/libbitcoinconsensus/libbitcoinconsensus.vcxproj new file mode 100644 index 0000000000..e6f4885e5e --- /dev/null +++ b/build_msvc/libbitcoinconsensus/libbitcoinconsensus.vcxproj @@ -0,0 +1,199 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <Import Label="configInitTarget" Project="..\common.init.vcxproj" /> + <ItemGroup Label="ProjectConfigurations"> + <ProjectConfiguration Include="Debug|Win32"> + <Configuration>Debug</Configuration> + <Platform>Win32</Platform> + </ProjectConfiguration> + <ProjectConfiguration Include="Release|Win32"> + <Configuration>Release</Configuration> + <Platform>Win32</Platform> + </ProjectConfiguration> + <ProjectConfiguration Include="Debug|x64"> + <Configuration>Debug</Configuration> + <Platform>x64</Platform> + </ProjectConfiguration> + <ProjectConfiguration Include="Release|x64"> + <Configuration>Release</Configuration> + <Platform>x64</Platform> + </ProjectConfiguration> + </ItemGroup> + <ItemGroup> + <ClCompile Include="..\..\src\arith_uint256.cpp" /> + <ClCompile Include="..\..\src\consensus\merkle.cpp" /> + <ClCompile Include="..\..\src\crypto\aes.cpp" /> + <ClCompile Include="..\..\src\crypto\chacha20.cpp" /> + <ClCompile Include="..\..\src\crypto\hmac_sha256.cpp" /> + <ClCompile Include="..\..\src\crypto\hmac_sha512.cpp" /> + <ClCompile Include="..\..\src\crypto\ripemd160.cpp" /> + <ClCompile Include="..\..\src\crypto\sha1.cpp" /> + <ClCompile Include="..\..\src\crypto\sha256.cpp" /> + <ClCompile Include="..\..\src\crypto\sha256_sse4.cpp" /> + <ClCompile Include="..\..\src\crypto\sha512.cpp" /> + <ClCompile Include="..\..\src\hash.cpp" /> + <ClCompile Include="..\..\src\primitives\block.cpp" /> + <ClCompile Include="..\..\src\primitives\transaction.cpp" /> + <ClCompile Include="..\..\src\pubkey.cpp" /> + <ClCompile Include="..\..\src\script\bitcoinconsensus.cpp" /> + <ClCompile Include="..\..\src\script\interpreter.cpp" /> + <ClCompile Include="..\..\src\script\script.cpp" /> + <ClCompile Include="..\..\src\script\script_error.cpp" /> + <ClCompile Include="..\..\src\uint256.cpp" /> + <ClCompile Include="..\..\src\utilstrencodings.cpp" /> + </ItemGroup> + <ItemGroup> + <None Include="packages.config" /> + </ItemGroup> + <PropertyGroup Label="Globals"> + <VCProjectVersion>15.0</VCProjectVersion> + <ProjectGuid>{2B384FA8-9EE1-4544-93CB-0D733C25E8CE}</ProjectGuid> + <Keyword>Win32Proj</Keyword> + <RootNamespace>bitcoind</RootNamespace> + <ProjectName>libbitcoin_consensus</ProjectName> + <VcpkgTriplet Condition="'$(Platform)'=='Win32'">x86-windows-static</VcpkgTriplet> + <VcpkgTriplet Condition="'$(Platform)'=='x64'">x64-windows-static</VcpkgTriplet> + </PropertyGroup> + <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> + <ConfigurationType>StaticLibrary</ConfigurationType> + <UseDebugLibraries>true</UseDebugLibraries> + <PlatformToolset>v141</PlatformToolset> + <CharacterSet>Unicode</CharacterSet> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> + <ConfigurationType>StaticLibrary</ConfigurationType> + <UseDebugLibraries>false</UseDebugLibraries> + <PlatformToolset>v141</PlatformToolset> + <WholeProgramOptimization>true</WholeProgramOptimization> + <CharacterSet>Unicode</CharacterSet> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration"> + <ConfigurationType>StaticLibrary</ConfigurationType> + <UseDebugLibraries>true</UseDebugLibraries> + <PlatformToolset>v141</PlatformToolset> + <CharacterSet>Unicode</CharacterSet> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration"> + <ConfigurationType>StaticLibrary</ConfigurationType> + <UseDebugLibraries>false</UseDebugLibraries> + <PlatformToolset>v141</PlatformToolset> + <WholeProgramOptimization>true</WholeProgramOptimization> + <CharacterSet>Unicode</CharacterSet> + </PropertyGroup> + <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> + <ImportGroup Label="ExtensionSettings"> + </ImportGroup> + <ImportGroup Label="Shared"> + </ImportGroup> + <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> + <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> + </ImportGroup> + <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> + <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> + </ImportGroup> + <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> + <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> + </ImportGroup> + <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> + <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> + </ImportGroup> + <PropertyGroup Label="UserMacros" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> + <LinkIncremental>true</LinkIncremental> + <Linkage-secp256k1> + </Linkage-secp256k1> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> + <LinkIncremental>true</LinkIncremental> + <Linkage-secp256k1> + </Linkage-secp256k1> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> + <LinkIncremental>true</LinkIncremental> + <Linkage-secp256k1> + </Linkage-secp256k1> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> + <LinkIncremental>true</LinkIncremental> + <Linkage-secp256k1> + </Linkage-secp256k1> + </PropertyGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> + <ClCompile> + <PrecompiledHeader>NotUsing</PrecompiledHeader> + <WarningLevel>Level3</WarningLevel> + <Optimization>Disabled</Optimization> + <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <SDLCheck>false</SDLCheck> + <AdditionalIncludeDirectories>..\..\src;</AdditionalIncludeDirectories> + <ExceptionHandling>false</ExceptionHandling> + <SuppressStartupBanner>false</SuppressStartupBanner> + <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary> + </ClCompile> + <Link> + <SubSystem>Console</SubSystem> + <GenerateDebugInformation>true</GenerateDebugInformation> + </Link> + </ItemDefinitionGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> + <ClCompile> + <PrecompiledHeader>NotUsing</PrecompiledHeader> + <WarningLevel>Level3</WarningLevel> + <Optimization>Disabled</Optimization> + <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <SDLCheck>false</SDLCheck> + <AdditionalIncludeDirectories>..\..\src;</AdditionalIncludeDirectories> + <ExceptionHandling>false</ExceptionHandling> + <SuppressStartupBanner>false</SuppressStartupBanner> + <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary> + </ClCompile> + <Link> + <SubSystem>Console</SubSystem> + <GenerateDebugInformation>true</GenerateDebugInformation> + </Link> + </ItemDefinitionGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> + <ClCompile> + <PrecompiledHeader>NotUsing</PrecompiledHeader> + <WarningLevel>Level3</WarningLevel> + <Optimization>MaxSpeed</Optimization> + <FunctionLevelLinking>true</FunctionLevelLinking> + <IntrinsicFunctions>true</IntrinsicFunctions> + <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <SDLCheck>false</SDLCheck> + <AdditionalIncludeDirectories>..\..\src;</AdditionalIncludeDirectories> + <ExceptionHandling>false</ExceptionHandling> + <SuppressStartupBanner>false</SuppressStartupBanner> + <RuntimeLibrary>MultiThreaded</RuntimeLibrary> + </ClCompile> + <Link> + <SubSystem>Console</SubSystem> + <EnableCOMDATFolding>true</EnableCOMDATFolding> + <OptimizeReferences>true</OptimizeReferences> + <GenerateDebugInformation>true</GenerateDebugInformation> + </Link> + </ItemDefinitionGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> + <ClCompile> + <PrecompiledHeader>NotUsing</PrecompiledHeader> + <WarningLevel>Level3</WarningLevel> + <Optimization>MaxSpeed</Optimization> + <FunctionLevelLinking>true</FunctionLevelLinking> + <IntrinsicFunctions>true</IntrinsicFunctions> + <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <SDLCheck>false</SDLCheck> + <AdditionalIncludeDirectories>..\..\src;</AdditionalIncludeDirectories> + <ExceptionHandling>false</ExceptionHandling> + <SuppressStartupBanner>false</SuppressStartupBanner> + <RuntimeLibrary>MultiThreaded</RuntimeLibrary> + </ClCompile> + <Link> + <SubSystem>Console</SubSystem> + <EnableCOMDATFolding>true</EnableCOMDATFolding> + <OptimizeReferences>true</OptimizeReferences> + <GenerateDebugInformation>true</GenerateDebugInformation> + </Link> + </ItemDefinitionGroup> + <Import Label="configTarget" Project="..\common.vcxproj" /> +</Project>
\ No newline at end of file diff --git a/build_msvc/libunivalue/libunivalue.vcxproj b/build_msvc/libunivalue/libunivalue.vcxproj new file mode 100644 index 0000000000..57d469debf --- /dev/null +++ b/build_msvc/libunivalue/libunivalue.vcxproj @@ -0,0 +1,160 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <Import Label="configInitTarget" Project="..\common.init.vcxproj" /> + <ItemGroup Label="ProjectConfigurations"> + <ProjectConfiguration Include="Debug|Win32"> + <Configuration>Debug</Configuration> + <Platform>Win32</Platform> + </ProjectConfiguration> + <ProjectConfiguration Include="Release|Win32"> + <Configuration>Release</Configuration> + <Platform>Win32</Platform> + </ProjectConfiguration> + <ProjectConfiguration Include="Debug|x64"> + <Configuration>Debug</Configuration> + <Platform>x64</Platform> + </ProjectConfiguration> + <ProjectConfiguration Include="Release|x64"> + <Configuration>Release</Configuration> + <Platform>x64</Platform> + </ProjectConfiguration> + </ItemGroup> + <ItemGroup> + <ClCompile Include="..\..\src\univalue\lib\univalue.cpp" /> + <ClCompile Include="..\..\src\univalue\lib\univalue_get.cpp" /> + <ClCompile Include="..\..\src\univalue\lib\univalue_read.cpp" /> + <ClCompile Include="..\..\src\univalue\lib\univalue_write.cpp" /> + </ItemGroup> + <PropertyGroup Label="Globals"> + <VCProjectVersion>15.0</VCProjectVersion> + <ProjectGuid>{5724BA7D-A09A-4BA8-800B-C4C1561B3D69}</ProjectGuid> + <Keyword>Win32Proj</Keyword> + <RootNamespace>libunivalue</RootNamespace> + </PropertyGroup> + <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> + <ConfigurationType>StaticLibrary</ConfigurationType> + <UseDebugLibraries>true</UseDebugLibraries> + <PlatformToolset>v141</PlatformToolset> + <CharacterSet>Unicode</CharacterSet> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> + <ConfigurationType>StaticLibrary</ConfigurationType> + <UseDebugLibraries>false</UseDebugLibraries> + <PlatformToolset>v141</PlatformToolset> + <WholeProgramOptimization>true</WholeProgramOptimization> + <CharacterSet>Unicode</CharacterSet> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration"> + <ConfigurationType>StaticLibrary</ConfigurationType> + <UseDebugLibraries>true</UseDebugLibraries> + <PlatformToolset>v141</PlatformToolset> + <CharacterSet>Unicode</CharacterSet> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration"> + <ConfigurationType>StaticLibrary</ConfigurationType> + <UseDebugLibraries>false</UseDebugLibraries> + <PlatformToolset>v141</PlatformToolset> + <WholeProgramOptimization>true</WholeProgramOptimization> + <CharacterSet>Unicode</CharacterSet> + </PropertyGroup> + <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> + <ImportGroup Label="ExtensionSettings"> + </ImportGroup> + <ImportGroup Label="Shared"> + </ImportGroup> + <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> + <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> + </ImportGroup> + <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> + <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> + </ImportGroup> + <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> + <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> + </ImportGroup> + <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> + <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> + </ImportGroup> + <PropertyGroup Label="UserMacros" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> + <LinkIncremental>true</LinkIncremental> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> + <LinkIncremental>true</LinkIncremental> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> + <LinkIncremental>false</LinkIncremental> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> + <LinkIncremental>false</LinkIncremental> + </PropertyGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> + <ClCompile> + <PrecompiledHeader>NotUsing</PrecompiledHeader> + <WarningLevel>Level3</WarningLevel> + <Optimization>Disabled</Optimization> + <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <SDLCheck>true</SDLCheck> + <AdditionalIncludeDirectories>..\..\src\univalue\include;</AdditionalIncludeDirectories> + <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary> + </ClCompile> + <Link> + <SubSystem>Console</SubSystem> + <GenerateDebugInformation>true</GenerateDebugInformation> + </Link> + </ItemDefinitionGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> + <ClCompile> + <PrecompiledHeader>NotUsing</PrecompiledHeader> + <WarningLevel>Level3</WarningLevel> + <Optimization>Disabled</Optimization> + <PreprocessorDefinitions>_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <SDLCheck>true</SDLCheck> + <AdditionalIncludeDirectories>..\..\src\univalue\include;</AdditionalIncludeDirectories> + <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary> + </ClCompile> + <Link> + <SubSystem>Console</SubSystem> + <GenerateDebugInformation>true</GenerateDebugInformation> + </Link> + </ItemDefinitionGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> + <ClCompile> + <PrecompiledHeader>NotUsing</PrecompiledHeader> + <WarningLevel>Level3</WarningLevel> + <Optimization>MaxSpeed</Optimization> + <FunctionLevelLinking>true</FunctionLevelLinking> + <IntrinsicFunctions>true</IntrinsicFunctions> + <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <SDLCheck>true</SDLCheck> + <AdditionalIncludeDirectories>..\..\src\univalue\include;</AdditionalIncludeDirectories> + <RuntimeLibrary>MultiThreaded</RuntimeLibrary> + </ClCompile> + <Link> + <SubSystem>Console</SubSystem> + <EnableCOMDATFolding>true</EnableCOMDATFolding> + <OptimizeReferences>true</OptimizeReferences> + <GenerateDebugInformation>true</GenerateDebugInformation> + </Link> + </ItemDefinitionGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> + <ClCompile> + <PrecompiledHeader>NotUsing</PrecompiledHeader> + <WarningLevel>Level3</WarningLevel> + <Optimization>MaxSpeed</Optimization> + <FunctionLevelLinking>true</FunctionLevelLinking> + <IntrinsicFunctions>true</IntrinsicFunctions> + <PreprocessorDefinitions>NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <SDLCheck>true</SDLCheck> + <AdditionalIncludeDirectories>..\..\src\univalue\include;</AdditionalIncludeDirectories> + <RuntimeLibrary>MultiThreaded</RuntimeLibrary> + </ClCompile> + <Link> + <SubSystem>Console</SubSystem> + <EnableCOMDATFolding>true</EnableCOMDATFolding> + <OptimizeReferences>true</OptimizeReferences> + <GenerateDebugInformation>true</GenerateDebugInformation> + </Link> + </ItemDefinitionGroup> + <Import Label="configTarget" Project="..\common.vcxproj" /> +</Project> diff --git a/build_msvc/msbuild/tasks/hexdump.targets b/build_msvc/msbuild/tasks/hexdump.targets new file mode 100644 index 0000000000..12868a9874 --- /dev/null +++ b/build_msvc/msbuild/tasks/hexdump.targets @@ -0,0 +1,53 @@ +<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <UsingTask + TaskName="HeaderFromHexdump" + TaskFactory="CodeTaskFactory" + AssemblyFile="$(MSBuildToolsPath)\Microsoft.Build.Tasks.Core.dll" > + <ParameterGroup> + <RawFilePath Required="true" /> + <HeaderFilePath Required="true" /> + <SourceHeader Required="true" /> + <SourceFooter Required="true" /> + </ParameterGroup> + <Task> + <Using Namespace="System"/> + <Using Namespace="System.IO"/> + <Code Type="Fragment" Language="cs"> +<![CDATA[ +Log.LogMessage("msbuild inline hexdump task for " + RawFilePath + "."); +if(File.Exists(RawFilePath) == false) { + Log.LogError("hexdump task could not locate " + RawFilePath + "."); +} +else { + FileInfo inFileInfo = new FileInfo(RawFilePath); + FileInfo outFileInfo = new FileInfo(HeaderFilePath); + + if (outFileInfo.Exists == false || inFileInfo.LastWriteTime > outFileInfo.LastWriteTime) + { + using (Stream inStm = File.OpenRead(RawFilePath)) + { + using (StreamWriter sw = new StreamWriter(HeaderFilePath)) + { + sw.WriteLine(SourceHeader); + int count = 0; + int rawChar = inStm.ReadByte(); + while(rawChar != -1) + { + sw.Write("0x{0:x2}, ", rawChar); + count++; + if(count % 8 == 0) + { + sw.WriteLine(); + } + rawChar = inStm.ReadByte(); + } + sw.WriteLine(SourceFooter); + } + } + } +} +]]> + </Code> + </Task> + </UsingTask> +</Project>
\ No newline at end of file diff --git a/build_msvc/test_bitcoin-qt/test_bitcoin-qt.vcxproj b/build_msvc/test_bitcoin-qt/test_bitcoin-qt.vcxproj new file mode 100644 index 0000000000..b2d4c118f3 --- /dev/null +++ b/build_msvc/test_bitcoin-qt/test_bitcoin-qt.vcxproj @@ -0,0 +1,146 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <Import Label="configInitTarget" Project="..\common.init.vcxproj" /> + <ItemGroup Label="ProjectConfigurations"> + <ProjectConfiguration Include="Debug|Win32"> + <Configuration>Debug</Configuration> + <Platform>Win32</Platform> + </ProjectConfiguration> + <ProjectConfiguration Include="Release|Win32"> + <Configuration>Release</Configuration> + <Platform>Win32</Platform> + </ProjectConfiguration> + <ProjectConfiguration Include="Debug|x64"> + <Configuration>Debug</Configuration> + <Platform>x64</Platform> + </ProjectConfiguration> + <ProjectConfiguration Include="Release|x64"> + <Configuration>Release</Configuration> + <Platform>x64</Platform> + </ProjectConfiguration> + </ItemGroup> + <PropertyGroup Label="Globals"> + <VCProjectVersion>15.0</VCProjectVersion> + <ProjectGuid>{51201D5E-D939-4854-AE9D-008F03FF518E}</ProjectGuid> + <Keyword>Win32Proj</Keyword> + <RootNamespace>test_bitcoinqt</RootNamespace> + </PropertyGroup> + <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> + <ConfigurationType>Application</ConfigurationType> + <UseDebugLibraries>true</UseDebugLibraries> + <PlatformToolset>v141</PlatformToolset> + <CharacterSet>Unicode</CharacterSet> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> + <ConfigurationType>Application</ConfigurationType> + <UseDebugLibraries>false</UseDebugLibraries> + <PlatformToolset>v141</PlatformToolset> + <WholeProgramOptimization>true</WholeProgramOptimization> + <CharacterSet>Unicode</CharacterSet> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration"> + <ConfigurationType>Application</ConfigurationType> + <UseDebugLibraries>true</UseDebugLibraries> + <PlatformToolset>v141</PlatformToolset> + <CharacterSet>Unicode</CharacterSet> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration"> + <ConfigurationType>Application</ConfigurationType> + <UseDebugLibraries>false</UseDebugLibraries> + <PlatformToolset>v141</PlatformToolset> + <WholeProgramOptimization>true</WholeProgramOptimization> + <CharacterSet>Unicode</CharacterSet> + </PropertyGroup> + <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> + <ImportGroup Label="ExtensionSettings"> + </ImportGroup> + <ImportGroup Label="Shared"> + </ImportGroup> + <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> + <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> + </ImportGroup> + <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> + <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> + </ImportGroup> + <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> + <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> + </ImportGroup> + <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> + <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> + </ImportGroup> + <PropertyGroup Label="UserMacros" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> + <LinkIncremental>false</LinkIncremental> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> + <LinkIncremental>true</LinkIncremental> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> + <LinkIncremental>true</LinkIncremental> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> + <LinkIncremental>false</LinkIncremental> + </PropertyGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> + <ClCompile> + <PrecompiledHeader>NotUsing</PrecompiledHeader> + <WarningLevel>Level3</WarningLevel> + <Optimization>MaxSpeed</Optimization> + <FunctionLevelLinking>true</FunctionLevelLinking> + <IntrinsicFunctions>true</IntrinsicFunctions> + <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <SDLCheck>true</SDLCheck> + </ClCompile> + <Link> + <SubSystem>Console</SubSystem> + <EnableCOMDATFolding>true</EnableCOMDATFolding> + <OptimizeReferences>true</OptimizeReferences> + <GenerateDebugInformation>true</GenerateDebugInformation> + </Link> + </ItemDefinitionGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> + <ClCompile> + <PrecompiledHeader>NotUsing</PrecompiledHeader> + <WarningLevel>Level3</WarningLevel> + <Optimization>Disabled</Optimization> + <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <SDLCheck>true</SDLCheck> + </ClCompile> + <Link> + <SubSystem>Console</SubSystem> + <GenerateDebugInformation>true</GenerateDebugInformation> + </Link> + </ItemDefinitionGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> + <ClCompile> + <PrecompiledHeader>NotUsing</PrecompiledHeader> + <WarningLevel>Level3</WarningLevel> + <Optimization>Disabled</Optimization> + <PreprocessorDefinitions>_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <SDLCheck>true</SDLCheck> + </ClCompile> + <Link> + <SubSystem>Console</SubSystem> + <GenerateDebugInformation>true</GenerateDebugInformation> + </Link> + </ItemDefinitionGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> + <ClCompile> + <PrecompiledHeader>NotUsing</PrecompiledHeader> + <WarningLevel>Level3</WarningLevel> + <Optimization>MaxSpeed</Optimization> + <FunctionLevelLinking>true</FunctionLevelLinking> + <IntrinsicFunctions>true</IntrinsicFunctions> + <PreprocessorDefinitions>NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <SDLCheck>true</SDLCheck> + </ClCompile> + <Link> + <SubSystem>Console</SubSystem> + <EnableCOMDATFolding>true</EnableCOMDATFolding> + <OptimizeReferences>true</OptimizeReferences> + <GenerateDebugInformation>true</GenerateDebugInformation> + </Link> + </ItemDefinitionGroup> + <Import Label="configTarget" Project="..\common.vcxproj" /> +</Project> diff --git a/build_msvc/test_bitcoin/test_bitcoin.vcxproj b/build_msvc/test_bitcoin/test_bitcoin.vcxproj new file mode 100644 index 0000000000..444a2ed725 --- /dev/null +++ b/build_msvc/test_bitcoin/test_bitcoin.vcxproj @@ -0,0 +1,207 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <Import Label="configInitTarget" Project="..\common.init.vcxproj" /> + <ItemGroup Label="ProjectConfigurations"> + <ProjectConfiguration Include="Debug|Win32"> + <Configuration>Debug</Configuration> + <Platform>Win32</Platform> + </ProjectConfiguration> + <ProjectConfiguration Include="Release|Win32"> + <Configuration>Release</Configuration> + <Platform>Win32</Platform> + </ProjectConfiguration> + <ProjectConfiguration Include="Debug|x64"> + <Configuration>Debug</Configuration> + <Platform>x64</Platform> + </ProjectConfiguration> + <ProjectConfiguration Include="Release|x64"> + <Configuration>Release</Configuration> + <Platform>x64</Platform> + </ProjectConfiguration> + </ItemGroup> + <ItemGroup> + <ClCompile Include="..\..\src\test\*_tests.cpp" /> + <ClCompile Include="..\..\src\wallet\test\*_tests.cpp" /> + <ClCompile Include="..\..\src\test\test_bitcoin.cpp" /> + <ClCompile Include="..\..\src\test\test_bitcoin_main.cpp" /> + <ClCompile Include="..\..\src\wallet\test\wallet_test_fixture.cpp" /> + </ItemGroup> + <ItemGroup> + <ProjectReference Include="..\libbitcoinconsensus\libbitcoinconsensus.vcxproj"> + <Project>{2b384fa8-9ee1-4544-93cb-0d733c25e8ce}</Project> + </ProjectReference> + <ProjectReference Include="..\libbitcoin_cli\libbitcoin_cli.vcxproj"> + <Project>{0667528c-d734-4009-adf9-c0d6c4a5a5a6}</Project> + </ProjectReference> + <ProjectReference Include="..\libbitcoin_common\libbitcoin_common.vcxproj"> + <Project>{7c87e378-df58-482e-aa2f-1bc129bc19ce}</Project> + </ProjectReference> + <ProjectReference Include="..\libbitcoin_crypto\libbitcoin_crypto.vcxproj"> + <Project>{6190199c-6cf4-4dad-bfbd-93fa72a760c1}</Project> + </ProjectReference> + <ProjectReference Include="..\libbitcoin_server\libbitcoin_server.vcxproj"> + <Project>{460fee33-1fe1-483f-b3bf-931ff8e969a5}</Project> + </ProjectReference> + <ProjectReference Include="..\libbitcoin_util\libbitcoin_util.vcxproj"> + <Project>{b53a5535-ee9d-4c6f-9a26-f79ee3bc3754}</Project> + </ProjectReference> + <ProjectReference Include="..\libbitcoin_wallet\libbitcoin_wallet.vcxproj"> + <Project>{93b86837-b543-48a5-a89b-7c87abb77df2}</Project> + </ProjectReference> + <ProjectReference Include="..\libbitcoin_zmq\libbitcoin_zmq.vcxproj"> + <Project>{792d487f-f14c-49fc-a9de-3fc150f31c3f}</Project> + </ProjectReference> + <ProjectReference Include="..\libunivalue\libunivalue.vcxproj"> + <Project>{5724ba7d-a09a-4ba8-800b-c4c1561b3d69}</Project> + </ProjectReference> + </ItemGroup> + <PropertyGroup Label="Globals"> + <VCProjectVersion>15.0</VCProjectVersion> + <ProjectGuid>{A56B73DB-D46D-4882-8374-1FE3FFA08F07}</ProjectGuid> + <Keyword>Win32Proj</Keyword> + <RootNamespace>test_bitcoin</RootNamespace> + <VcpkgTriplet Condition="'$(Platform)'=='Win32'">x86-windows-static</VcpkgTriplet> + <VcpkgTriplet Condition="'$(Platform)'=='x64'">x64-windows-static</VcpkgTriplet> + </PropertyGroup> + <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> + <ConfigurationType>Application</ConfigurationType> + <UseDebugLibraries>true</UseDebugLibraries> + <PlatformToolset>v141</PlatformToolset> + <CharacterSet>Unicode</CharacterSet> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> + <ConfigurationType>Application</ConfigurationType> + <UseDebugLibraries>false</UseDebugLibraries> + <PlatformToolset>v141</PlatformToolset> + <WholeProgramOptimization>true</WholeProgramOptimization> + <CharacterSet>Unicode</CharacterSet> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration"> + <ConfigurationType>Application</ConfigurationType> + <UseDebugLibraries>true</UseDebugLibraries> + <PlatformToolset>v141</PlatformToolset> + <CharacterSet>Unicode</CharacterSet> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration"> + <ConfigurationType>Application</ConfigurationType> + <UseDebugLibraries>false</UseDebugLibraries> + <PlatformToolset>v141</PlatformToolset> + <WholeProgramOptimization>true</WholeProgramOptimization> + <CharacterSet>Unicode</CharacterSet> + </PropertyGroup> + <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> + <ImportGroup Label="ExtensionSettings"> + </ImportGroup> + <ImportGroup Label="Shared"> + </ImportGroup> + <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> + <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> + </ImportGroup> + <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> + <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> + </ImportGroup> + <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> + <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> + </ImportGroup> + <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> + <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> + </ImportGroup> + <PropertyGroup Label="UserMacros" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> + <LinkIncremental>true</LinkIncremental> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> + <LinkIncremental>true</LinkIncremental> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> + <LinkIncremental>false</LinkIncremental> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> + <LinkIncremental>false</LinkIncremental> + </PropertyGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> + <ClCompile> + <PrecompiledHeader>NotUsing</PrecompiledHeader> + <WarningLevel>Level3</WarningLevel> + <Optimization>Disabled</Optimization> + <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;NOMINMAX;WIN32;HAVE_CONFIG_H;_SCL_SECURE_NO_WARNINGS;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <SDLCheck>true</SDLCheck> + <AdditionalIncludeDirectories>..\..\src;..\..\src\univalue\include;..\..\src\test;</AdditionalIncludeDirectories> + <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary> + </ClCompile> + <Link> + <SubSystem>Console</SubSystem> + <GenerateDebugInformation>true</GenerateDebugInformation> + <SuppressStartupBanner>false</SuppressStartupBanner> + <AdditionalDependencies>boost_test_exec_monitor-vc140-mt-gd.lib;crypt32.lib;Iphlpapi.lib;ws2_32.lib;Shlwapi.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies> + </Link> + </ItemDefinitionGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> + <ClCompile> + <PrecompiledHeader>NotUsing</PrecompiledHeader> + <WarningLevel>Level3</WarningLevel> + <Optimization>Disabled</Optimization> + <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;NOMINMAX;WIN32;HAVE_CONFIG_H;_SCL_SECURE_NO_WARNINGS;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <SDLCheck>true</SDLCheck> + <AdditionalIncludeDirectories>..\..\src;..\..\src\univalue\include;..\..\src\test;</AdditionalIncludeDirectories> + <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary> + </ClCompile> + <Link> + <SubSystem>Console</SubSystem> + <GenerateDebugInformation>true</GenerateDebugInformation> + <AdditionalDependencies>boost_test_exec_monitor-vc140-mt-gd.lib;crypt32.lib;Iphlpapi.lib;ws2_32.lib;Shlwapi.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies> + </Link> + </ItemDefinitionGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> + <ClCompile> + <PrecompiledHeader>NotUsing</PrecompiledHeader> + <WarningLevel>Level3</WarningLevel> + <Optimization>MaxSpeed</Optimization> + <FunctionLevelLinking>true</FunctionLevelLinking> + <IntrinsicFunctions>true</IntrinsicFunctions> + <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;NOMINMAX;WIN32;HAVE_CONFIG_H;_SCL_SECURE_NO_WARNINGS;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <SDLCheck>true</SDLCheck> + <AdditionalIncludeDirectories>..\..\src;..\..\src\univalue\include;..\..\src\test;</AdditionalIncludeDirectories> + <RuntimeLibrary>MultiThreaded</RuntimeLibrary> + </ClCompile> + <Link> + <SubSystem>Console</SubSystem> + <EnableCOMDATFolding>true</EnableCOMDATFolding> + <OptimizeReferences>true</OptimizeReferences> + <GenerateDebugInformation>true</GenerateDebugInformation> + <AdditionalDependencies>boost_test_exec_monitor-vc140-mt.lib;crypt32.lib;Iphlpapi.lib;ws2_32.lib;Shlwapi.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies> + </Link> + </ItemDefinitionGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> + <ClCompile> + <PrecompiledHeader>NotUsing</PrecompiledHeader> + <WarningLevel>Level3</WarningLevel> + <Optimization>MaxSpeed</Optimization> + <FunctionLevelLinking>true</FunctionLevelLinking> + <IntrinsicFunctions>true</IntrinsicFunctions> + <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;NOMINMAX;WIN32;HAVE_CONFIG_H;_SCL_SECURE_NO_WARNINGS;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <SDLCheck>true</SDLCheck> + <AdditionalIncludeDirectories>..\..\src;..\..\src\univalue\include;..\..\src\test;</AdditionalIncludeDirectories> + <RuntimeLibrary>MultiThreaded</RuntimeLibrary> + </ClCompile> + <Link> + <SubSystem>Console</SubSystem> + <EnableCOMDATFolding>true</EnableCOMDATFolding> + <OptimizeReferences>true</OptimizeReferences> + <GenerateDebugInformation>true</GenerateDebugInformation> + <AdditionalDependencies>boost_test_exec_monitor-vc140-mt.lib;crypt32.lib;Iphlpapi.lib;ws2_32.lib;Shlwapi.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies> + </Link> + </ItemDefinitionGroup> + <Target Name="RawBenchHeaderGen" BeforeTargets="PrepareForBuild"> + <PropertyGroup> + <ErrorText>There was an error executing the JSON test header generation task.</ErrorText> + </PropertyGroup> + <ItemGroup> + <JsonTestFile Include="..\..\src\test\data\*.json" /> + </ItemGroup> + <HeaderFromHexdump RawFilePath="%(JsonTestFile.FullPath)" HeaderFilePath="%(JsonTestFile.FullPath).h" SourceHeader="namespace json_tests{ static unsigned const char %(JsonTestFile.Filename)[] = {" SourceFooter="};}" /> + </Target> + <Import Label="configTarget" Project="..\common.vcxproj" /> + <Import Label="hexdumpTarget" Project="..\msbuild\tasks\hexdump.targets" /> +</Project> diff --git a/build_msvc/testconsensus/testconsensus.cpp b/build_msvc/testconsensus/testconsensus.cpp new file mode 100644 index 0000000000..0068f588cc --- /dev/null +++ b/build_msvc/testconsensus/testconsensus.cpp @@ -0,0 +1,50 @@ +#include <iostream> + +// bitcoin includes. +#include <..\src\script\bitcoinconsensus.h> +#include <..\src\primitives\transaction.h> +#include <..\src\script\script.h> +#include <..\src\streams.h> +#include <..\src\version.h> + +CMutableTransaction BuildSpendingTransaction(const CScript& scriptSig, const CScriptWitness& scriptWitness, int nValue = 0) +{ + CMutableTransaction txSpend; + txSpend.nVersion = 1; + txSpend.nLockTime = 0; + txSpend.vin.resize(1); + txSpend.vout.resize(1); + txSpend.vin[0].scriptWitness = scriptWitness; + txSpend.vin[0].prevout.hash = uint256(); + txSpend.vin[0].prevout.n = 0; + txSpend.vin[0].scriptSig = scriptSig; + txSpend.vin[0].nSequence = CTxIn::SEQUENCE_FINAL; + txSpend.vout[0].scriptPubKey = CScript(); + txSpend.vout[0].nValue = nValue; + + return txSpend; +} + +int main() +{ + std::cout << "bitcoinconsensus version: " << bitcoinconsensus_version() << std::endl; + + CScript pubKeyScript; + pubKeyScript << OP_1 << OP_0 << OP_1; + + int amount = 0; // 600000000; + + CScript scriptSig; + CScriptWitness scriptWitness; + CTransaction vanillaSpendTx = BuildSpendingTransaction(scriptSig, scriptWitness, amount); + CDataStream stream(SER_NETWORK, PROTOCOL_VERSION); + stream << vanillaSpendTx; + + bitcoinconsensus_error err; + auto op0Result = bitcoinconsensus_verify_script_with_amount(pubKeyScript.data(), pubKeyScript.size(), amount, (const unsigned char*)&stream[0], stream.size(), 0, bitcoinconsensus_SCRIPT_FLAGS_VERIFY_ALL, &err); + std::cout << "Op0 result: " << op0Result << ", error code " << err << std::endl; + + getchar(); + + return 0; +} diff --git a/build_msvc/testconsensus/testconsensus.vcxproj b/build_msvc/testconsensus/testconsensus.vcxproj new file mode 100644 index 0000000000..d73988df1c --- /dev/null +++ b/build_msvc/testconsensus/testconsensus.vcxproj @@ -0,0 +1,173 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <Import Label="configInitTarget" Project="..\common.init.vcxproj" /> + <ItemGroup Label="ProjectConfigurations"> + <ProjectConfiguration Include="Debug|Win32"> + <Configuration>Debug</Configuration> + <Platform>Win32</Platform> + </ProjectConfiguration> + <ProjectConfiguration Include="Release|Win32"> + <Configuration>Release</Configuration> + <Platform>Win32</Platform> + </ProjectConfiguration> + <ProjectConfiguration Include="Debug|x64"> + <Configuration>Debug</Configuration> + <Platform>x64</Platform> + </ProjectConfiguration> + <ProjectConfiguration Include="Release|x64"> + <Configuration>Release</Configuration> + <Platform>x64</Platform> + </ProjectConfiguration> + </ItemGroup> + <PropertyGroup Label="Globals"> + <VCProjectVersion>15.0</VCProjectVersion> + <ProjectGuid>{E78473E9-B850-456C-9120-276301E04C06}</ProjectGuid> + <Keyword>Win32Proj</Keyword> + <RootNamespace>testconsensus</RootNamespace> + <ProjectName>test_libbitcoinconsensus</ProjectName> + <VcpkgTriplet Condition="'$(Platform)'=='Win32'">x86-windows-static</VcpkgTriplet> + <VcpkgTriplet Condition="'$(Platform)'=='x64'">x64-windows-static</VcpkgTriplet> + </PropertyGroup> + <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> + <ConfigurationType>Application</ConfigurationType> + <UseDebugLibraries>true</UseDebugLibraries> + <PlatformToolset>v141</PlatformToolset> + <CharacterSet>Unicode</CharacterSet> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> + <ConfigurationType>Application</ConfigurationType> + <UseDebugLibraries>false</UseDebugLibraries> + <PlatformToolset>v141</PlatformToolset> + <WholeProgramOptimization>true</WholeProgramOptimization> + <CharacterSet>Unicode</CharacterSet> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration"> + <ConfigurationType>Application</ConfigurationType> + <UseDebugLibraries>true</UseDebugLibraries> + <PlatformToolset>v141</PlatformToolset> + <CharacterSet>Unicode</CharacterSet> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration"> + <ConfigurationType>Application</ConfigurationType> + <UseDebugLibraries>false</UseDebugLibraries> + <PlatformToolset>v141</PlatformToolset> + <WholeProgramOptimization>true</WholeProgramOptimization> + <CharacterSet>Unicode</CharacterSet> + </PropertyGroup> + <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> + <ImportGroup Label="ExtensionSettings"> + </ImportGroup> + <ImportGroup Label="Shared"> + </ImportGroup> + <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> + <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> + </ImportGroup> + <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> + <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> + </ImportGroup> + <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> + <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> + </ImportGroup> + <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> + <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> + </ImportGroup> + <PropertyGroup Label="UserMacros" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> + <LinkIncremental>true</LinkIncremental> + <Linkage-secp256k1>static</Linkage-secp256k1> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> + <LinkIncremental>true</LinkIncremental> + <Linkage-secp256k1>static</Linkage-secp256k1> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> + <LinkIncremental>false</LinkIncremental> + <Linkage-secp256k1>static</Linkage-secp256k1> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> + <LinkIncremental>false</LinkIncremental> + </PropertyGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> + <ClCompile> + <PrecompiledHeader>NotUsing</PrecompiledHeader> + <WarningLevel>Level3</WarningLevel> + <Optimization>Disabled</Optimization> + <PreprocessorDefinitions>HAVE_CONFIG_H;WIN32;_SCL_SECURE_NO_WARNINGS;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <SDLCheck>true</SDLCheck> + <AdditionalIncludeDirectories>..\..\src\;</AdditionalIncludeDirectories> + <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary> + </ClCompile> + <Link> + <SubSystem>Console</SubSystem> + <GenerateDebugInformation>true</GenerateDebugInformation> + </Link> + </ItemDefinitionGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> + <ClCompile> + <PrecompiledHeader>NotUsing</PrecompiledHeader> + <WarningLevel>Level3</WarningLevel> + <Optimization>Disabled</Optimization> + <PreprocessorDefinitions>HAVE_CONFIG_H;_SCL_SECURE_NO_WARNINGS;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <SDLCheck>true</SDLCheck> + <AdditionalIncludeDirectories>..\..\src\;</AdditionalIncludeDirectories> + <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary> + </ClCompile> + <Link> + <SubSystem>Console</SubSystem> + <GenerateDebugInformation>true</GenerateDebugInformation> + <DataExecutionPrevention>true</DataExecutionPrevention> + <AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies> + </Link> + </ItemDefinitionGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> + <ClCompile> + <PrecompiledHeader>NotUsing</PrecompiledHeader> + <WarningLevel>Level3</WarningLevel> + <Optimization>MaxSpeed</Optimization> + <FunctionLevelLinking>true</FunctionLevelLinking> + <IntrinsicFunctions>true</IntrinsicFunctions> + <PreprocessorDefinitions>HAVE_CONFIG_H;_SCL_SECURE_NO_WARNINGS;WIN32;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <SDLCheck>true</SDLCheck> + <AdditionalIncludeDirectories>..\..\src\;</AdditionalIncludeDirectories> + <RuntimeLibrary>MultiThreaded</RuntimeLibrary> + </ClCompile> + <Link> + <SubSystem>Console</SubSystem> + <EnableCOMDATFolding>true</EnableCOMDATFolding> + <OptimizeReferences>true</OptimizeReferences> + <GenerateDebugInformation>true</GenerateDebugInformation> + </Link> + </ItemDefinitionGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> + <ClCompile> + <PrecompiledHeader>NotUsing</PrecompiledHeader> + <WarningLevel>Level3</WarningLevel> + <Optimization>MaxSpeed</Optimization> + <FunctionLevelLinking>true</FunctionLevelLinking> + <IntrinsicFunctions>true</IntrinsicFunctions> + <PreprocessorDefinitions>HAVE_CONFIG_H;WIN32;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <SDLCheck>true</SDLCheck> + <AdditionalIncludeDirectories>..\..\src\;</AdditionalIncludeDirectories> + <RuntimeLibrary>MultiThreaded</RuntimeLibrary> + </ClCompile> + <Link> + <SubSystem>Console</SubSystem> + <EnableCOMDATFolding>true</EnableCOMDATFolding> + <OptimizeReferences>true</OptimizeReferences> + <GenerateDebugInformation>true</GenerateDebugInformation> + </Link> + </ItemDefinitionGroup> + <ItemGroup> + <ClCompile Include="testconsensus.cpp" /> + </ItemGroup> + <ItemGroup> + <ProjectReference Include="..\libbitcoinconsensus\libbitcoinconsensus.vcxproj"> + <Project>{2b384fa8-9ee1-4544-93cb-0d733c25e8ce}</Project> + </ProjectReference> + <ProjectReference Include="..\libbitcoin_util\libbitcoin_util.vcxproj"> + <Project>{b53a5535-ee9d-4c6f-9a26-f79ee3bc3754}</Project> + </ProjectReference> + </ItemGroup> + <Import Label="configTarget" Project="..\common.vcxproj" /> +</Project> diff --git a/configure.ac b/configure.ac index 5851413cf4..4275796b50 100644 --- a/configure.ac +++ b/configure.ac @@ -1,7 +1,7 @@ dnl require autoconf 2.60 (AS_ECHO/AS_ECHO_N) AC_PREREQ([2.60]) define(_CLIENT_VERSION_MAJOR, 0) -define(_CLIENT_VERSION_MINOR, 16) +define(_CLIENT_VERSION_MINOR, 17) define(_CLIENT_VERSION_REVISION, 99) define(_CLIENT_VERSION_BUILD, 0) define(_CLIENT_VERSION_IS_RELEASE, false) @@ -303,6 +303,7 @@ if test "x$CXXFLAGS_overridden" = "xno"; then AX_CHECK_COMPILE_FLAG([-Wformat-security],[WARN_CXXFLAGS="$WARN_CXXFLAGS -Wformat-security"],,[[$CXXFLAG_WERROR]]) AX_CHECK_COMPILE_FLAG([-Wthread-safety-analysis],[WARN_CXXFLAGS="$WARN_CXXFLAGS -Wthread-safety-analysis"],,[[$CXXFLAG_WERROR]]) AX_CHECK_COMPILE_FLAG([-Wrange-loop-analysis],[WARN_CXXFLAGS="$WARN_CXXFLAGS -Wrange-loop-analysis"],,[[$CXXFLAG_WERROR]]) + AX_CHECK_COMPILE_FLAG([-Wredundant-decls],[WARN_CXXFLAGS="$WARN_CXXFLAGS -Wredundant-decls"],,[[$CXXFLAG_WERROR]]) ## Some compilers (gcc) ignore unknown -Wno-* options, but warn about all ## unknown options if any other warning is produced. Test the -Wfoo case, and diff --git a/contrib/devtools/copyright_header.py b/contrib/devtools/copyright_header.py index da7d74bdc4..c5fcddea04 100755 --- a/contrib/devtools/copyright_header.py +++ b/contrib/devtools/copyright_header.py @@ -1,5 +1,5 @@ #!/usr/bin/env python3 -# Copyright (c) 2016-2017 The Bitcoin Core developers +# Copyright (c) 2016-2018 The Bitcoin Core developers # Distributed under the MIT software license, see the accompanying # file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/contrib/devtools/optimize-pngs.py b/contrib/devtools/optimize-pngs.py index a75731ef76..8b1f41f7e1 100755 --- a/contrib/devtools/optimize-pngs.py +++ b/contrib/devtools/optimize-pngs.py @@ -1,5 +1,5 @@ #!/usr/bin/env python3 -# Copyright (c) 2014-2017 The Bitcoin Core developers +# Copyright (c) 2014-2018 The Bitcoin Core developers # Distributed under the MIT software license, see the accompanying # file COPYING or http://www.opensource.org/licenses/mit-license.php. ''' diff --git a/contrib/devtools/security-check.py b/contrib/devtools/security-check.py index 391984a8f2..57af1c1066 100755 --- a/contrib/devtools/security-check.py +++ b/contrib/devtools/security-check.py @@ -1,5 +1,5 @@ #!/usr/bin/env python3 -# Copyright (c) 2015-2017 The Bitcoin Core developers +# Copyright (c) 2015-2018 The Bitcoin Core developers # Distributed under the MIT software license, see the accompanying # file COPYING or http://www.opensource.org/licenses/mit-license.php. ''' diff --git a/contrib/devtools/test-security-check.py b/contrib/devtools/test-security-check.py index 4cf51378c0..fd374f6328 100755 --- a/contrib/devtools/test-security-check.py +++ b/contrib/devtools/test-security-check.py @@ -1,5 +1,5 @@ #!/usr/bin/env python3 -# Copyright (c) 2015-2017 The Bitcoin Core developers +# Copyright (c) 2015-2018 The Bitcoin Core developers # Distributed under the MIT software license, see the accompanying # file COPYING or http://www.opensource.org/licenses/mit-license.php. ''' diff --git a/contrib/gitian-descriptors/gitian-linux.yml b/contrib/gitian-descriptors/gitian-linux.yml index 4255fb0c9a..c7933cff20 100644 --- a/contrib/gitian-descriptors/gitian-linux.yml +++ b/contrib/gitian-descriptors/gitian-linux.yml @@ -1,5 +1,5 @@ --- -name: "bitcoin-linux-0.17" +name: "bitcoin-linux-0.18" enable_cache: true suites: - "bionic" @@ -8,15 +8,19 @@ architectures: packages: - "curl" - "g++-aarch64-linux-gnu" -- "g++-7-aarch64-linux-gnu" -- "gcc-7-aarch64-linux-gnu" +- "g++-8-aarch64-linux-gnu" +- "gcc-8-aarch64-linux-gnu" - "binutils-aarch64-linux-gnu" - "g++-arm-linux-gnueabihf" -- "g++-7-arm-linux-gnueabihf" -- "gcc-7-arm-linux-gnueabihf" +- "g++-8-arm-linux-gnueabihf" +- "gcc-8-arm-linux-gnueabihf" - "binutils-arm-linux-gnueabihf" -- "g++-7-multilib" -- "gcc-7-multilib" +- "g++-riscv64-linux-gnu" +- "g++-8-riscv64-linux-gnu" +- "gcc-8-riscv64-linux-gnu" +- "binutils-riscv64-linux-gnu" +- "g++-8-multilib" +- "gcc-8-multilib" - "binutils-gold" - "git" - "pkg-config" @@ -34,9 +38,9 @@ files: [] script: | WRAP_DIR=$HOME/wrapped - HOSTS="i686-pc-linux-gnu x86_64-linux-gnu arm-linux-gnueabihf aarch64-linux-gnu" + HOSTS="i686-pc-linux-gnu x86_64-linux-gnu arm-linux-gnueabihf aarch64-linux-gnu riscv64-linux-gnu" CONFIGFLAGS="--enable-glibc-back-compat --enable-reduce-exports --disable-bench --disable-gui-tests" - FAKETIME_HOST_PROGS="" + FAKETIME_HOST_PROGS="gcc g++" FAKETIME_PROGS="date ar ranlib nm" HOST_CFLAGS="-O2 -g" HOST_CXXFLAGS="-O2 -g" @@ -69,12 +73,15 @@ script: | function create_per-host_faketime_wrappers { for i in $HOSTS; do for prog in ${FAKETIME_HOST_PROGS}; do - echo '#!/usr/bin/env bash' > ${WRAP_DIR}/${i}-${prog} - echo "REAL=\`which -a ${i}-${prog} | grep -v ${WRAP_DIR}/${i}-${prog} | head -1\`" >> ${WRAP_DIR}/${i}-${prog} - echo 'export LD_PRELOAD=/usr/lib/x86_64-linux-gnu/faketime/libfaketime.so.1' >> ${WRAP_DIR}/${i}-${prog} - echo "export FAKETIME=\"$1\"" >> ${WRAP_DIR}/${i}-${prog} - echo "\$REAL \$@" >> $WRAP_DIR/${i}-${prog} - chmod +x ${WRAP_DIR}/${i}-${prog} + if which ${i}-${prog}-8 + then + echo '#!/usr/bin/env bash' > ${WRAP_DIR}/${i}-${prog} + echo "REAL=\`which -a ${i}-${prog}-8 | grep -v ${WRAP_DIR}/${i}-${prog} | head -1\`" >> ${WRAP_DIR}/${i}-${prog} + echo 'export LD_PRELOAD=/usr/lib/x86_64-linux-gnu/faketime/libfaketime.so.1' >> ${WRAP_DIR}/${i}-${prog} + echo "export FAKETIME=\"$1\"" >> ${WRAP_DIR}/${i}-${prog} + echo "\$REAL \$@" >> $WRAP_DIR/${i}-${prog} + chmod +x ${WRAP_DIR}/${i}-${prog} + fi done done } @@ -100,7 +107,7 @@ script: | rm -f ${WRAP_DIR}/${prog} cat << EOF > ${WRAP_DIR}/${prog} #!/usr/bin/env bash - REAL="`which -a ${prog} | grep -v ${WRAP_DIR}/${prog} | head -1`" + REAL="`which -a ${prog}-8 | grep -v ${WRAP_DIR}/${prog} | head -1`" for var in "\$@" do if [ "\$var" = "-m32" ]; then @@ -174,6 +181,7 @@ script: | case $i in aarch64-*) : ;; arm-*) : ;; + riscv64-*) : ;; *) make ${MAKEOPTS} -C src check-symbols ;; esac diff --git a/contrib/gitian-descriptors/gitian-osx.yml b/contrib/gitian-descriptors/gitian-osx.yml index fb59cf671b..87d8007ccb 100644 --- a/contrib/gitian-descriptors/gitian-osx.yml +++ b/contrib/gitian-descriptors/gitian-osx.yml @@ -1,5 +1,5 @@ --- -name: "bitcoin-osx-0.17" +name: "bitcoin-osx-0.18" enable_cache: true suites: - "bionic" diff --git a/contrib/gitian-descriptors/gitian-win.yml b/contrib/gitian-descriptors/gitian-win.yml index 2d48170649..31b9c309c7 100644 --- a/contrib/gitian-descriptors/gitian-win.yml +++ b/contrib/gitian-descriptors/gitian-win.yml @@ -1,5 +1,5 @@ --- -name: "bitcoin-win-0.17" +name: "bitcoin-win-0.18" enable_cache: true suites: - "bionic" diff --git a/contrib/linearize/linearize-data.py b/contrib/linearize/linearize-data.py index b501388fd2..b6ead4a166 100755 --- a/contrib/linearize/linearize-data.py +++ b/contrib/linearize/linearize-data.py @@ -2,7 +2,7 @@ # # linearize-data.py: Construct a linear, no-fork version of the chain. # -# Copyright (c) 2013-2017 The Bitcoin Core developers +# Copyright (c) 2013-2018 The Bitcoin Core developers # Distributed under the MIT software license, see the accompanying # file COPYING or http://www.opensource.org/licenses/mit-license.php. # diff --git a/contrib/linearize/linearize-hashes.py b/contrib/linearize/linearize-hashes.py index bfd2171947..911c3c959d 100755 --- a/contrib/linearize/linearize-hashes.py +++ b/contrib/linearize/linearize-hashes.py @@ -2,7 +2,7 @@ # # linearize-hashes.py: List blocks in a linear, no-fork version of the chain. # -# Copyright (c) 2013-2017 The Bitcoin Core developers +# Copyright (c) 2013-2018 The Bitcoin Core developers # Distributed under the MIT software license, see the accompanying # file COPYING or http://www.opensource.org/licenses/mit-license.php. # diff --git a/contrib/macdeploy/custom_dsstore.py b/contrib/macdeploy/custom_dsstore.py index b29fc71765..6fa134972a 100755 --- a/contrib/macdeploy/custom_dsstore.py +++ b/contrib/macdeploy/custom_dsstore.py @@ -1,5 +1,5 @@ #!/usr/bin/env python3 -# Copyright (c) 2013-2016 The Bitcoin Core developers +# Copyright (c) 2013-2017 The Bitcoin Core developers # Distributed under the MIT software license, see the accompanying # file COPYING or http://www.opensource.org/licenses/mit-license.php. import biplist diff --git a/contrib/seeds/README.md b/contrib/seeds/README.md index 6dc277f298..502c20d0d6 100644 --- a/contrib/seeds/README.md +++ b/contrib/seeds/README.md @@ -4,7 +4,7 @@ Utility to generate the seeds.txt list that is compiled into the client (see [src/chainparamsseeds.h](/src/chainparamsseeds.h) and other utilities in [contrib/seeds](/contrib/seeds)). Be sure to update `PATTERN_AGENT` in `makeseeds.py` to include the current version, -and remove old versions as necessary (at a minimum when GetDesireableServiceFlags +and remove old versions as necessary (at a minimum when GetDesirableServiceFlags changes its default return value, as those are the services which seeds are added to addrman with). diff --git a/contrib/seeds/makeseeds.py b/contrib/seeds/makeseeds.py index 59044e701a..6527deccf2 100755 --- a/contrib/seeds/makeseeds.py +++ b/contrib/seeds/makeseeds.py @@ -1,5 +1,5 @@ #!/usr/bin/env python3 -# Copyright (c) 2013-2017 The Bitcoin Core developers +# Copyright (c) 2013-2018 The Bitcoin Core developers # Distributed under the MIT software license, see the accompanying # file COPYING or http://www.opensource.org/licenses/mit-license.php. # @@ -30,7 +30,7 @@ SUSPICIOUS_HOSTS = { PATTERN_IPV4 = re.compile(r"^((\d{1,3})\.(\d{1,3})\.(\d{1,3})\.(\d{1,3})):(\d+)$") PATTERN_IPV6 = re.compile(r"^\[([0-9a-z:]+)\]:(\d+)$") PATTERN_ONION = re.compile(r"^([abcdefghijklmnopqrstuvwxyz234567]{16}\.onion):(\d+)$") -PATTERN_AGENT = re.compile(r"^(/Satoshi:0.13.(1|2|99)/|/Satoshi:0.14.(0|1|2|99)/|/Satoshi:0.15.(0|1|2|99)/)$") +PATTERN_AGENT = re.compile(r"^(/Satoshi:0.14.(0|1|2|99)/|/Satoshi:0.15.(0|1|2|99)|/Satoshi:0.16.(0|1|2|99)/)$") def parseline(line): sline = line.split() diff --git a/contrib/seeds/nodes_main.txt b/contrib/seeds/nodes_main.txt index 01a386c60e..c0b5b299bd 100644 --- a/contrib/seeds/nodes_main.txt +++ b/contrib/seeds/nodes_main.txt @@ -1,1073 +1,782 @@ -5.19.5.127:8333 -5.29.139.120:8333 -5.39.64.7:8333 +2.132.100.47:8333 +5.1.97.4:8333 5.39.174.116:8333 -5.45.69.13:8333 -5.45.75.15:8333 -5.45.108.108:8333 -5.101.140.194:8333 -5.133.13.56:8333 -5.175.24.7:8333 -5.189.133.130:8333 +5.45.79.14:8333 +5.53.16.133:8333 +5.101.139.166:8333 +5.178.78.139:8333 +5.189.176.17:8333 5.228.64.71:8333 -13.80.67.162:8333 -14.192.8.27:21301 -23.89.193.201:8333 +8.18.38.122:8333 +13.115.96.63:8333 +14.2.124.84:8333 +14.3.170.1:8333 +23.94.28.250:8333 +23.111.172.106:8333 23.125.224.84:8333 -23.225.160.26:8333 -23.226.231.122:8333 -23.227.204.78:8333 -23.238.132.188:8333 -23.240.67.204:8333 -24.25.141.186:8333 -24.120.235.185:8333 -24.138.188.60:8333 -24.211.229.7:8333 -24.220.78.161:8333 -24.225.34.62:8333 -24.232.136.119:8333 -27.68.131.10:8333 +23.152.0.108:8333 +23.175.0.222:8333 +23.229.16.234:8333 +23.233.6.70:8333 +24.142.34.253:8333 +24.171.203.87:8333 +24.188.200.170:8333 +24.216.65.41:8333 +24.227.69.146:8333 +27.33.11.193:8333 +31.24.11.139:8333 31.28.10.13:8333 -31.31.203.113:8333 -31.145.106.61:8333 +31.165.17.164:8333 +31.179.204.142:8333 +31.186.96.186:8333 +31.210.172.21:8333 31.211.102.129:62734 -37.48.64.140:8333 -37.120.163.181:8333 -37.134.167.91:8333 -37.191.225.174:8333 -37.192.41.32:8333 -37.194.10.30:8333 -37.200.34.18:8333 -37.205.8.78:8333 -38.27.100.44:8333 -38.102.69.70:8333 +34.217.122.178:8333 +35.230.64.29:8333 +35.231.225.42:8333 +36.3.172.13:8333 +36.251.163.42:8333 +37.136.97.246:8333 +37.153.1.150:8333 +37.153.1.157:8333 +37.228.92.110:8333 +37.252.14.22:8333 +38.27.101.224:8333 +38.102.134.85:8333 38.104.225.30:8333 -41.86.104.94:8333 -41.170.64.8:8333 -43.229.76.45:8333 -43.248.160.151:8333 -45.32.65.19:8333 -45.62.198.46:8333 -46.19.136.138:8333 -46.20.246.117:8333 -46.28.69.138:8333 -46.28.205.112:8333 -46.160.195.121:8333 -46.163.118.51:8333 -46.166.129.159:8333 -46.183.236.254:8333 -46.227.101.176:8333 +43.229.76.38:8333 +45.40.132.57:8333 +45.45.34.122:8333 +45.48.177.222:8333 +46.19.34.236:8333 +46.28.66.196:8333 +46.28.204.21:8333 +46.28.205.161:8333 +46.30.42.144:8333 +46.138.139.195:8333 +46.165.245.221:8333 +46.166.129.155:8333 +46.166.160.52:8333 +46.166.160.56:8333 +46.188.44.82:8333 +46.188.126.74:8333 +46.229.165.145:8333 46.229.168.201:8333 -46.238.238.176:8333 -46.242.131.168:8333 -47.20.103.108:8333 +46.229.238.187:8333 +47.54.204.246:8333 +47.74.128.138:8333 47.94.224.99:8333 -47.187.1.83:8333 -47.223.232.58:8333 +47.97.96.198:8333 +47.187.36.48:8333 +47.218.16.81:8333 +47.223.66.222:8333 47.254.128.15:8333 -47.254.128.197:8333 -50.2.189.35:8333 -50.28.99.81:8333 -50.31.170.51:8333 -50.126.194.190:8333 -51.15.0.17:8333 -52.29.0.37:8333 -52.59.96.11:8333 -52.225.128.191:8333 -54.84.98.69:8333 -54.197.4.92:8333 -54.223.136.62:8333 -58.173.224.98:8333 -58.229.208.166:8333 -61.125.131.55:8333 -62.13.193.206:8333 +50.31.170.53:8333 +50.35.67.146:8333 +50.76.96.230:8333 +50.82.177.142:8333 +51.15.3.46:8333 +51.175.141.243:8333 +52.144.47.153:8333 +52.232.38.122:8333 +54.38.192.164:8333 +54.85.65.6:8333 +54.91.227.188:8333 +58.180.36.14:8333 +59.106.208.68:8333 +60.70.73.26:8333 +61.160.234.57:8333 +62.43.198.56:8333 62.45.0.15:8333 62.107.200.30:8333 -62.133.194.156:8333 -62.138.11.10:8333 -62.182.171.116:8333 -62.195.193.35:8333 -62.210.161.249:8333 -63.141.228.18:8333 -63.143.37.46:8333 -64.34.231.140:8333 -64.39.234.49:8333 -64.110.25.26:8333 -64.121.35.3:8333 -65.19.155.88:8333 +62.133.194.2:8333 +62.138.3.224:8333 +62.146.70.216:8333 +64.78.163.10:8333 +64.120.110.2:8333 +64.131.160.31:8333 66.18.172.16:8333 -66.160.128.215:8333 +66.85.74.242:8333 +66.110.132.10:8333 +66.114.33.90:8333 66.180.64.95:8333 -66.194.38.250:8333 -67.68.101.249:8333 -67.128.36.90:8333 -67.148.60.130:8333 +66.222.164.188:8333 +67.11.139.67:8333 +67.43.191.118:8333 +67.61.137.157:8333 +67.193.184.12:8333 67.210.228.203:8333 -67.225.134.26:8333 -68.12.98.246:8333 -68.199.10.75:8333 -69.39.49.199:8333 -69.41.171.35:8333 -69.41.171.224:8333 -69.64.34.1:8333 -69.64.46.27:8333 -69.64.225.2:8333 -69.159.134.58:8333 -69.181.160.80:8333 -69.222.192.88:8333 -70.15.74.72:8333 +67.215.12.43:8333 +67.253.72.119:8333 +68.201.228.6:8333 +68.202.128.19:8333 +69.30.218.226:8333 +69.61.35.175:8333 +69.61.171.22:8333 +69.125.194.25:8333 70.35.98.12:8333 -70.60.65.62:8333 -70.113.33.131:8333 -71.85.226.76:8333 +70.103.171.66:8333 +70.172.252.29:8333 +71.34.96.135:8333 +71.68.48.149:8333 71.93.161.162:8333 +71.162.192.5:8333 +72.11.174.71:8333 +72.50.240.124:8333 +72.70.32.215:8333 +72.211.196.232:8333 +72.234.112.22:8333 +72.253.237.0:8333 73.241.192.40:8333 -74.118.192.119:8333 -74.122.237.124:8333 -75.159.6.167:8333 -76.10.157.58:8333 -76.92.136.75:8333 +74.15.230.112:8333 +74.83.79.52:8333 +74.126.14.27:8333 +75.76.137.164:8333 +76.64.166.230:8333 +76.191.79.98:8333 +77.37.170.106:8333 +77.70.107.83:8333 77.95.226.194:8333 +77.111.172.134:8333 77.163.136.136:8333 -77.234.50.2:8333 +77.203.13.57:8333 77.239.37.12:8333 +77.240.168.19:8333 +77.244.219.164:8333 78.31.67.156:8333 +78.34.2.126:8333 +78.108.187.246:8333 78.109.163.153:8333 -78.130.161.78:8333 -78.192.35.130:8333 -78.248.65.34:8333 -79.46.194.163:8333 -79.77.6.136:8333 -79.98.196.89:8333 -79.154.97.168:8333 -79.165.235.119:8333 -79.169.35.235:8333 -79.182.167.137:8333 -80.82.67.182:8333 -80.82.77.138:8333 -80.84.54.26:8333 -80.208.224.217:8333 -80.208.227.53:8333 -80.220.43.228:8333 -80.254.188.235:8333 -81.7.10.251:8333 +79.28.205.145:8333 +79.66.70.89:8333 +79.132.230.144:8333 +80.209.224.79:8333 +80.211.252.104:8333 +80.229.28.60:8333 81.7.13.84:8333 +81.7.16.182:8333 81.18.224.62:8333 -81.27.96.37:8333 -81.108.196.72:8333 -81.186.243.220:8333 -81.228.194.187:8333 -82.72.198.68:8333 -82.74.224.35:8333 -82.96.64.6:8333 -82.117.166.77:8333 -82.118.236.69:8333 +81.171.27.138:8333 +81.187.80.221:8333 +81.217.112.225:8333 +81.245.141.6:8333 +82.43.171.91:8333 +82.102.10.251:8333 +82.118.234.178:8333 +82.144.197.93:8333 82.161.109.190:8333 82.193.102.228:8333 82.193.109.199:8333 82.199.102.10:8333 -82.200.204.119:8333 -82.202.197.224:8333 -82.212.7.242:8333 +82.212.130.94:8333 +82.213.208.16:8333 +82.217.67.17:8333 82.221.108.27:8333 -82.221.128.81:8333 -83.50.134.8:8333 -83.78.33.135:8333 +82.221.133.174:8333 +83.55.130.30:8333 +83.77.39.46:8333 83.137.41.10:8333 -83.150.37.94:8333 +83.149.70.48:8333 +83.151.233.218:8333 83.162.43.154:8333 -83.164.131.242:8333 83.164.131.243:8333 -83.209.8.140:8333 -83.236.135.251:8333 -83.243.59.41:8333 -83.249.13.223:8333 -83.250.86.108:8333 -84.94.235.161:8333 -84.117.1.27:8333 +83.221.11.7:8333 +83.243.128.13:8333 +84.16.38.218:8333 +84.38.3.249:8333 +84.75.26.172:8333 84.200.106.128:8333 -84.213.64.21:8333 -84.226.164.161:8333 -84.245.27.130:8333 -84.251.161.205:8333 -85.5.1.72:8333 -85.10.41.41:8333 -85.25.194.12:8333 -85.95.241.46:8333 +84.212.250.219:8333 +84.215.134.195:8333 +84.245.27.209:8333 +84.254.40.152:8333 +84.255.193.28:8333 +85.10.112.194:8333 +85.93.2.76:54382 +85.94.172.33:8333 85.129.0.126:8333 -85.170.232.245:8333 -85.195.232.39:8333 +85.145.168.159:8333 +85.170.238.26:8333 +85.195.232.197:8333 85.214.68.122:8333 85.214.235.137:8333 -85.245.167.246:8333 -86.8.35.17:8333 -86.105.5.113:8333 -86.106.131.179:8333 -87.79.68.86:8333 -87.120.8.5:8333 -87.239.202.239:8333 -88.98.198.130:8333 -88.149.106.236:8333 -88.207.236.175:8333 -89.35.29.3:8333 -89.38.96.70:8333 -89.142.65.151:8333 -89.163.224.195:8333 +85.218.48.146:8333 +85.220.165.205:8333 +85.229.134.98:8333 +85.241.49.242:8333 +86.25.32.77:8333 +86.41.89.170:8333 +86.50.143.43:8333 +86.61.67.183:8333 +86.137.26.210:8333 +86.177.194.215:8333 +87.157.177.58:8333 +87.224.163.66:8333 +87.236.196.169:8333 +87.246.46.132:8333 +88.99.64.76:8333 +89.1.100.49:8333 +89.10.155.88:8333 +89.27.59.246:8333 +89.163.132.73:8333 89.179.240.131:8333 +89.205.81.5:8333 +89.212.75.6:8333 +89.217.130.147:8333 89.230.96.42:8333 -89.236.101.52:8333 -90.191.203.18:8333 -91.65.7.30:8333 +89.248.172.10:8333 +90.46.57.17:8333 +90.110.11.101:8333 +90.240.37.163:8333 +91.65.4.21:8333 91.65.192.159:8333 +91.83.237.185:8333 +91.110.125.26:8333 +91.121.160.59:8333 91.135.0.187:8333 -91.154.113.227:8333 +91.143.109.68:8333 91.195.42.134:8333 -91.202.67.107:8333 -91.221.71.115:8333 -91.224.0.227:8333 -91.224.1.17:8333 -91.225.236.145:8333 -91.228.45.130:8333 -91.231.229.136:8333 -91.238.100.249:8333 -92.27.142.29:8333 +91.221.70.137:8333 +92.35.132.5:8333 +92.42.37.141:8333 +92.54.16.144:8333 92.62.34.184:8333 -92.177.2.181:8333 -92.249.169.36:8333 -92.255.176.109:8333 -93.75.18.151:8333 -93.79.204.222:10333 -93.95.100.155:8333 -93.113.131.134:8333 +92.186.231.240:8333 +93.123.80.47:8333 93.170.13.15:8333 +93.171.201.68:8333 93.179.197.152:8333 -93.190.205.25:8333 -94.59.135.148:8333 +93.190.206.151:8333 +93.191.131.177:8333 +93.208.132.214:8333 +94.104.97.247:8333 94.156.35.8:8333 -94.177.106.189:8333 -94.181.44.104:8333 -94.198.97.215:8333 -94.236.198.253:8333 -94.237.64.138:8333 -94.242.232.92:8333 -95.84.134.107:8333 -95.105.183.183:8333 -95.191.130.100:8333 -95.213.161.2:8333 +94.199.173.113:8333 +95.42.2.113:8333 +95.94.225.61:8333 +95.154.237.24:8333 +95.158.39.64:8333 +95.163.71.126:8333 +95.163.106.139:8333 +95.208.163.214:8333 +95.213.143.13:8333 95.226.77.108:8333 -96.20.227.39:8333 -96.23.67.85:8333 +96.3.74.66:8333 +96.23.128.65:8333 96.27.8.242:8333 -98.5.31.251:8333 +96.27.129.94:8333 +96.126.100.148:8333 +97.74.6.105:8333 +97.116.160.102:8333 +98.7.64.249:8333 +98.10.106.49:8333 +98.25.197.125:8333 +98.29.7.103:8333 98.127.130.17:8333 -98.162.209.130:8333 -99.198.237.76:8333 -99.238.3.86:8333 -101.165.34.253:8333 -103.44.162.50:8333 -103.56.136.105:8333 -103.59.166.139:8333 -103.60.97.21:8333 -103.79.107.144:8333 +99.224.192.201:8333 +101.190.172.209:8333 +103.35.151.76:8334 +103.74.193.127:8333 +103.80.133.191:8333 103.80.168.57:8333 -103.85.14.106:8333 -103.100.44.58:8333 -103.250.4.74:8333 -103.250.5.74:8333 -104.32.162.149:8333 -104.156.99.240:8333 -104.156.103.72:8333 +103.99.168.102:8333 +103.194.42.10:8333 104.168.101.207:8333 -104.171.113.52:8333 -104.197.64.3:8333 -104.199.192.85:8333 -104.200.67.161:8333 -104.220.16.253:8333 -104.237.4.26:8333 -104.238.198.165:8333 -107.180.85.93:33244 -108.4.11.29:8333 -108.49.194.58:8333 +104.200.67.162:8333 +104.207.132.42:8333 +104.237.4.202:8333 +107.155.72.108:8333 +107.183.37.162:8333 108.175.3.18:8333 +108.220.192.57:8333 109.61.102.5:8333 -109.106.136.195:8333 -109.110.95.201:8333 -109.172.104.119:8333 -110.4.40.147:8333 -112.187.178.116:8333 -113.105.139.42:8333 -115.90.171.158:8333 +109.206.177.21:8333 +109.237.111.156:8333 +115.68.47.82:8333 116.88.75.110:8333 -116.250.193.234:8333 -117.141.138.240:8333 118.67.201.40:8333 -118.89.229.178:8333 -118.211.167.90:8333 -120.79.64.154:8333 -121.200.5.186:8333 -121.254.173.39:8333 -123.2.128.107:8333 -123.203.163.128:8333 -128.1.68.46:8333 +119.28.4.230:8333 +119.28.130.210:8333 +120.31.143.167:8333 +120.220.14.92:8333 +120.220.14.93:8333 +124.18.133.220:8333 +126.207.39.22:8333 +128.77.37.214:8333 128.125.100.2:8333 -130.89.78.87:8333 -130.204.75.3:8333 +129.158.74.237:8333 +129.213.32.176:8333 +131.113.41.119:8333 +131.113.41.125:8333 131.114.10.233:8333 131.188.40.191:8333 -132.148.130.51:8333 -134.255.226.233:8333 -135.23.194.98:8333 -136.25.137.220:8333 -136.55.10.249:8333 -136.243.32.38:8333 -136.243.64.23:8333 -137.226.34.46:8333 -139.59.96.16:8333 -139.162.160.232:8333 -139.199.228.84:8333 +131.188.42.36:8333 +134.0.112.92:8333 +134.3.26.190:8333 +135.23.196.24:8333 +135.84.207.4:8333 +136.59.129.125:8333 +136.61.239.7:8333 +137.117.164.18:8333 +139.130.41.82:8333 141.134.71.188:8333 -141.138.137.40:8333 -145.129.31.147:8333 -146.71.76.53:8333 -146.71.76.236:8333 -149.210.228.108:8333 -150.229.0.143:8333 +141.213.6.57:8333 +141.223.82.139:8333 +142.0.130.49:8333 +142.0.130.53:8333 +144.118.141.232:8333 +148.66.58.146:8333 +150.95.130.17:8333 +150.187.36.233:8333 150.249.76.102:8333 -153.125.224.44:8333 -155.4.99.150:8333 -155.133.129.97:8333 -157.159.103.161:8333 -158.140.201.35:8333 -158.140.229.62:8333 -158.181.104.132:8333 -158.181.134.193:8333 -160.16.135.187:8333 -162.221.224.63:8333 -165.165.132.68:8333 -165.194.35.203:8333 -166.230.70.145:8333 -169.44.34.203:8333 -169.48.163.176:8333 -170.75.162.180:8333 -170.75.195.168:8333 +153.125.129.187:8333 +153.125.224.107:8333 +154.48.236.250:8887 +154.66.207.126:8333 +155.143.140.186:8333 +157.131.142.164:8333 +158.64.79.182:8333 +158.85.93.163:8333 +158.140.128.239:8333 +158.174.131.171:8333 +159.8.4.19:8333 +159.217.144.68:8333 +159.217.144.252:8333 +159.253.47.202:8333 +162.155.64.226:8333 +162.222.100.118:8333 +162.255.168.27:8333 +162.255.168.30:8333 +163.158.228.125:8333 +165.227.96.38:8333 +169.229.238.17:8333 171.25.165.145:8333 -172.96.161.138:8333 -172.98.193.45:8333 -172.103.164.75:8333 -172.110.8.233:8333 -173.209.53.114:8333 -173.212.192.117:8333 -173.243.64.49:8333 -173.255.224.185:8333 -174.100.131.151:8333 -174.113.66.230:8333 -174.138.62.90:8333 -176.10.136.25:8333 -176.23.13.27:8333 -176.24.220.141:8333 -176.106.252.173:8333 +171.33.177.9:8333 +172.72.228.93:8333 +172.96.161.244:8333 +172.102.228.150:8333 +172.118.136.98:8333 +173.46.65.8:8333 +173.212.193.35:8333 +173.239.33.85:8333 +173.243.64.48:8333 +174.115.129.37:8333 +176.12.6.59:8333 +176.107.184.29:8333 +176.123.10.192:8333 176.126.167.10:8333 -177.52.173.63:8333 -178.78.226.178:8333 -178.132.4.123:8333 -178.175.144.122:8333 -178.221.66.212:8333 -178.236.130.229:8333 +176.185.235.163:8333 +176.223.130.254:8333 +178.0.71.136:8333 +178.12.32.39:8333 +178.85.64.212:8333 +178.124.162.209:8333 +178.128.192.21:8333 +178.151.133.56:8333 +178.193.96.201:8333 +178.248.200.126:8333 178.254.7.88:8333 -178.254.34.144:8333 -178.255.41.21:8333 -179.48.251.41:8333 -182.247.238.169:8333 -183.111.29.28:8333 -184.64.12.109:8333 +180.233.106.171:8333 +181.166.168.210:8333 +183.66.227.70:12060 +183.111.108.56:8333 184.70.33.190:8333 -184.95.38.218:8333 -185.8.172.121:8333 -185.11.82.38:8333 +184.105.70.100:8333 +184.105.70.101:8333 185.12.7.38:8333 -185.12.236.242:8333 -185.20.226.148:8333 185.21.216.134:8333 -185.22.232.167:8333 +185.25.48.184:8333 +185.25.48.217:8333 +185.25.60.199:8333 185.28.76.179:8333 -185.31.136.69:8333 -185.35.137.175:8333 -185.35.138.84:8333 -185.35.182.123:8333 -185.47.132.109:8333 -185.53.128.180:8333 -185.63.172.14:8333 -185.64.104.2:8333 +185.35.139.54:8333 +185.44.78.208:8333 +185.47.132.55:8333 +185.51.128.27:8333 +185.59.100.107:8333 +185.67.175.75:8333 +185.67.204.76:8333 +185.67.204.80:8333 185.70.105.74:8339 -185.77.128.69:8333 -185.77.129.176:8333 -185.85.3.137:8333 +185.85.3.140:8333 +185.86.15.23:8333 +185.86.15.25:8333 185.102.71.6:8333 +185.117.74.21:8333 185.121.173.223:8333 -185.127.17.167:8333 -185.154.156.50:8333 +185.128.40.122:8333 +185.145.131.218:8333 +185.147.237.169:8333 185.162.128.83:8333 -185.183.161.35:8333 -185.189.199.248:8333 -185.215.224.107:8333 -186.5.136.70:8333 -186.31.4.202:8333 -188.27.80.126:8333 -188.65.212.49:8333 -188.116.140.127:8333 -188.134.79.145:8333 -188.214.128.18:8333 -188.214.128.175:8333 -188.227.64.19:8333 -188.234.241.172:8333 -188.253.2.125:8333 -190.10.8.211:8333 -190.145.22.202:8333 +185.165.76.220:8333 +185.172.165.130:8333 +185.177.5.4:8333 +185.183.131.75:8333 +185.186.208.208:8333 +185.215.224.22:8333 +185.224.80.108:8333 +185.225.16.4:8333 +185.243.112.214:8333 +185.244.193.18:8333 +185.248.160.66:8333 +186.19.136.144:8333 +188.68.38.243:8333 +188.68.240.89:8333 +188.134.6.84:8333 +188.134.77.121:8333 +188.138.1.43:8333 +188.217.9.168:8333 +190.2.133.91:8333 190.184.198.34:8333 -190.210.234.38:8333 -192.92.129.5:8333 -192.121.170.180:8333 +190.211.204.68:8333 +192.139.35.143:8333 192.162.100.156:8333 -192.162.210.91:8333 -192.169.6.127:8333 -192.175.59.140:8333 -192.222.237.16:8333 +192.162.101.250:8333 +192.206.202.6:8333 +192.207.12.244:8333 +192.207.12.245:8333 192.228.101.157:8333 -193.23.181.135:8333 -193.49.43.219:8333 -193.106.30.173:8333 -193.138.224.230:8333 -193.224.22.45:8333 +193.112.192.73:8333 +193.170.166.12:8333 194.15.231.236:8333 -194.106.216.20:8333 +194.165.16.33:8333 +194.181.80.77:8333 194.186.160.253:8333 -194.246.86.32:8333 -195.22.104.23:8333 -195.49.75.233:8333 -195.91.244.138:8333 +194.247.13.7:8333 +194.247.13.32:8333 +195.0.203.21:8333 +195.38.168.114:8333 +195.43.141.28:8333 +195.95.225.248:8333 +195.123.224.7:8333 +195.154.235.79:8333 195.169.99.82:8333 -196.28.98.21:8333 -196.220.67.151:8333 +195.201.0.81:8333 197.155.6.43:8333 -197.189.236.250:8333 -197.234.69.146:8333 -198.143.12.105:8333 -198.187.28.2:8333 -199.68.197.5:8333 +198.44.231.160:6333 +198.58.102.35:8333 +198.137.202.175:8333 199.127.224.50:8333 -199.193.6.14:8333 -199.201.110.146:8333 +199.182.129.26:8333 +199.188.204.102:8333 +199.188.204.155:8333 +199.244.49.224:8333 +199.249.230.37:15738 +200.83.123.46:8333 200.109.67.71:8333 -200.122.128.130:8333 -201.238.223.165:8333 -202.47.225.242:8333 -203.60.2.67:8333 +200.122.128.185:8333 +202.153.199.182:8333 +202.159.136.54:8333 +202.168.16.232:8333 +203.11.71.1:8333 +203.162.80.219:8333 +203.178.143.13:8333 204.15.11.4:8333 -204.15.11.8:8333 -204.138.165.35:8333 -206.123.11.139:8333 -206.253.163.226:8333 -207.188.16.16:8333 -208.77.18.25:8333 -208.86.161.83:8333 -208.100.137.204:8333 +206.125.169.162:8333 +206.174.55.164:8333 +207.182.146.18:8333 +208.93.66.198:8333 +208.98.196.249:8333 208.107.224.202:8333 +208.110.65.114:8333 208.118.235.190:8333 -209.159.137.146:8333 -209.161.4.164:8333 -209.197.13.62:8333 -210.211.109.165:8333 -211.151.38.92:8333 -212.32.229.230:8333 -212.51.14.72:8333 +209.122.208.131:8333 +209.126.110.198:8333 +209.131.238.80:8333 212.56.108.81:8333 -212.110.171.118:8333 -212.124.160.199:8333 -212.128.44.49:8333 -212.149.235.185:8333 -212.199.175.30:8333 -212.237.96.98:8333 -213.67.99.142:8333 +212.73.150.132:8333 +212.77.224.145:8333 +212.85.90.194:8333 +212.92.101.30:8333 +212.112.133.92:8333 +212.227.132.167:8333 +213.10.100.182:8333 +213.57.240.69:8333 213.91.205.134:8333 -213.115.224.252:8333 -213.131.12.10:8333 -213.132.76.184:8333 +213.125.67.108:8333 213.152.161.170:45893 213.155.3.216:8333 -213.156.108.63:8333 -213.219.162.146:8333 -216.36.179.27:8333 -216.184.8.26:8333 -216.245.218.242:8333 -217.12.204.86:8333 +213.180.70.138:8333 +213.185.226.225:8333 +216.71.203.79:8333 +216.194.164.211:8333 +216.240.168.226:8333 217.20.130.72:8333 -217.169.7.111:8333 -217.182.192.7:8333 -217.199.99.30:8333 -219.88.232.229:8333 +217.23.9.180:8333 +217.64.47.138:8333 +217.169.14.90:8333 +218.245.1.205:8333 220.130.128.58:8333 -220.191.169.90:8333 -221.127.43.207:8333 -222.239.193.210:8333 -223.17.202.206:8333 -[2001:0:4137:9e76:10f2:2873:970b:2068]:8333 -[2001:0:4137:9e76:10f6:1aa2:ae9d:4286]:8333 -[2001:0:4137:9e76:140a:d05:c1e1:b5c4]:8333 -[2001:0:4137:9e76:142a:1957:b61e:56e]:8333 -[2001:0:4137:9e76:142d:fac:2aaf:e4c2]:8333 -[2001:0:4137:9e76:1471:452:6671:8274]:8333 -[2001:0:4137:9e76:1482:530:b145:7e28]:8333 -[2001:0:4137:9e76:18ac:3954:3901:a257]:8333 -[2001:0:4137:9e76:18d5:3c77:829a:6fe6]:8333 -[2001:0:4137:9e76:2066:164f:b39d:b087]:8333 -[2001:0:4137:9e76:2069:78b:b7d5:5860]:8333 -[2001:0:4137:9e76:20ac:22b1:bb18:1160]:8333 -[2001:0:4137:9e76:20f6:147f:e7e9:ddd1]:8333 -[2001:0:4137:9e76:20fa:3126:97f1:600d]:8333 -[2001:0:4137:9e76:2457:f34:a313:4b99]:8333 -[2001:0:4137:9e76:28f4:2512:bc91:2e53]:8333 -[2001:0:4137:9e76:2c55:fa9:fde5:5d86]:8333 -[2001:0:4137:9e76:2cba:1828:52ae:7501]:8333 -[2001:0:4137:9e76:2cf3:78fc:a138:e6ed]:8333 -[2001:0:4137:9e76:3001:bf6:be62:cce5]:8333 -[2001:0:4137:9e76:30a8:3afb:b6d5:2bd7]:8333 -[2001:0:4137:9e76:30e6:44d:ae7f:749d]:8333 -[2001:0:4137:9e76:3402:daf:b475:daf9]:8333 -[2001:0:4137:9e76:3423:3d03:d771:d501]:8333 -[2001:0:4137:9e76:3424:211:b600:b4cb]:8333 -[2001:0:4137:9e76:342f:1453:cddc:4f03]:8333 -[2001:0:4137:9e76:3457:248d:a0b9:3bc9]:8333 -[2001:0:4137:9e76:386f:3846:b995:188]:8333 -[2001:0:4137:9e76:38a8:318a:e7dc:aee1]:8333 -[2001:0:4137:9e76:38eb:1e88:addb:181c]:8333 -[2001:0:4137:9e76:3c39:27e3:4758:365c]:8333 -[2001:0:4137:9e76:3c7d:3fa4:86ad:4ebb]:8333 -[2001:0:4137:9e76:3cfd:3181:b2c7:5c5e]:8333 -[2001:0:4137:9e76:401:2157:684e:f2d6]:8333 -[2001:0:4137:9e76:43a:1a64:bd14:fb16]:8333 -[2001:0:4137:9e76:47d:bb:ae1e:2948]:8333 -[2001:0:4137:9e76:843:9b9e:cd0a:6655]:8333 -[2001:0:4137:9e76:886:3c19:addd:9a58]:8333 -[2001:0:4137:9e76:8ba:9f8:9ead:f21]:8333 -[2001:0:4137:9e76:c06:124c:a482:a761]:8333 -[2001:0:4137:9e76:cda:b84:8d4c:d1e6]:8333 -[2001:0:53aa:64c:20:a71:858b:83f7]:8333 +220.133.39.61:8333 +222.239.193.116:8333 +222.239.193.120:8333 +[2001:0:4137:9e76:1cbd:3bc0:ade7:bf44]:8333 +[2001:0:4137:9e76:2046:150d:8d65:de4]:8333 +[2001:0:4137:9e76:2c99:3f36:d003:f47a]:8333 +[2001:0:4137:9e76:34b6:3910:a3dc:7bfa]:8333 +[2001:0:4137:9e76:3cec:2b5:525b:fb3c]:8333 [2001:0:53aa:64c:c5:235d:a10d:e0]:8333 -[2001:0:5ef5:79fb:103a:23fb:bb8a:ed5b]:8333 -[2001:0:5ef5:79fb:1064:d3d:51ff:5938]:8333 -[2001:0:5ef5:79fb:10fd:1369:715e:6aa7]:8333 -[2001:0:5ef5:79fb:14d5:1758:b17d:5eb1]:8333 -[2001:0:5ef5:79fb:1817:2634:9fc9:1bc4]:8333 -[2001:0:5ef5:79fb:181a:2717:9441:c1eb]:8333 -[2001:0:5ef5:79fb:1875:bc8:b1c2:1b4]:8333 -[2001:0:5ef5:79fb:18b5:3185:51a2:35d]:8333 -[2001:0:5ef5:79fb:18c3:feb:b471:49d1]:8333 -[2001:0:5ef5:79fb:18dd:3bd5:418f:c1e]:8333 -[2001:0:5ef5:79fb:1c19:3062:bcaa:96b]:8333 -[2001:0:5ef5:79fb:1c53:14bd:b8d9:7aa2]:8333 -[2001:0:5ef5:79fb:1c60:82b:94fd:a452]:8333 -[2001:0:5ef5:79fb:1c85:2e50:ba7d:a1a]:8333 -[2001:0:5ef5:79fb:1cff:2d43:51f9:b889]:8333 -[2001:0:5ef5:79fb:2074:221a:4750:eb12]:8333 -[2001:0:5ef5:79fb:208f:2d83:e0f5:e31f]:8333 -[2001:0:5ef5:79fb:2092:371f:9dfb:98cd]:8333 -[2001:0:5ef5:79fb:20f3:39a2:39ca:38c]:8333 -[2001:0:5ef5:79fb:281c:2085:518d:9c97]:8333 -[2001:0:5ef5:79fb:2851:c:524c:a180]:8333 -[2001:0:5ef5:79fb:2853:3b95:a430:40f3]:8333 -[2001:0:5ef5:79fb:28f6:30a4:30d9:1201]:8333 -[2001:0:5ef5:79fb:2c5f:1ade:718f:609d]:8333 -[2001:0:5ef5:79fb:2cc0:1b38:e7af:ae80]:8333 -[2001:0:5ef5:79fb:3000:3dc4:524d:3ce2]:8333 -[2001:0:5ef5:79fb:3060:2e81:518f:63bc]:8333 -[2001:0:5ef5:79fb:3068:507:bcaf:dbad]:8333 -[2001:0:5ef5:79fb:308f:f3:935d:6a1b]:8333 -[2001:0:5ef5:79fb:30ce:3301:d2d0:9bbc]:8333 -[2001:0:5ef5:79fb:30db:3145:4381:f147]:8333 -[2001:0:5ef5:79fb:34a3:2298:b7cd:22f6]:8333 -[2001:0:5ef5:79fb:41e:160:bc48:791d]:8333 -[2001:0:5ef5:79fb:42:b4fc:3f74:affb]:8333 -[2001:0:5ef5:79fb:47a:16aa:d0c9:30a4]:8333 -[2001:0:5ef5:79fb:89c:3481:d973:5dad]:8333 -[2001:0:5ef5:79fb:8be:314a:26b2:efef]:8333 -[2001:0:5ef5:79fb:8f3:3daf:3f21:bac]:8333 -[2001:0:5ef5:79fb:c1f:20f4:b9ac:99db]:8333 -[2001:0:5ef5:79fb:c70:105c:77de:9f7d]:8333 -[2001:0:5ef5:79fb:ed:200c:b9ac:34db]:8333 -[2001:0:5ef5:79fd:3057:85b:b703:255d]:8333 -[2001:0:5ef5:79fd:8d1:13c6:5d0a:b117]:8333 -[2001:0:9d38:6ab8:1007:395e:cd3a:82f2]:8333 -[2001:0:9d38:6ab8:108b:34b5:e8e3:eed7]:8333 -[2001:0:9d38:6ab8:109c:738:7fb9:785c]:8333 -[2001:0:9d38:6ab8:1401:393:ba7f:c313]:8333 -[2001:0:9d38:6ab8:1449:21d9:a05e:32f5]:8333 -[2001:0:9d38:6ab8:1498:36b6:a29b:12a4]:8333 -[2001:0:9d38:6ab8:183d:3649:b8f5:35d9]:8333 -[2001:0:9d38:6ab8:1857:3293:438b:73de]:8333 -[2001:0:9d38:6ab8:18b0:15d3:431c:bfec]:8333 -[2001:0:9d38:6ab8:18b1:288b:51c9:db37]:8333 -[2001:0:9d38:6ab8:18d5:2a37:6806:9797]:8333 -[2001:0:9d38:6ab8:1c42:3a1c:942f:7f08]:8333 -[2001:0:9d38:6ab8:1c7a:2fb7:e7d5:7ee2]:8333 -[2001:0:9d38:6ab8:1cc6:38c6:438b:73de]:8333 -[2001:0:9d38:6ab8:1cd6:2f48:fa1b:51c1]:8333 -[2001:0:9d38:6ab8:1cda:2fdf:b091:dbe5]:8333 -[2001:0:9d38:6ab8:1cf3:b9e:a14a:41f3]:8333 -[2001:0:9d38:6ab8:2015:473:9d21:cc3c]:8333 -[2001:0:9d38:6ab8:205d:eea3:a3c8:ea79]:8333 -[2001:0:9d38:6ab8:207c:19b1:e758:1c46]:8333 -[2001:0:9d38:6ab8:20cb:6b0:46cc:c27d]:8333 +[2001:0:53aa:64c:cbc:5ace:a625:39d1]:8333 +[2001:0:5ef5:79fb:38e5:36c1:d0ee:5d98]:8333 +[2001:0:5ef5:79fb:3c5c:c6c:39cf:69d3]:8333 +[2001:0:5ef5:79fb:896:ef4:ba63:8d15]:8333 +[2001:0:9d38:6ab8:106a:2112:e06b:b881]:8333 +[2001:0:9d38:6ab8:1c99:1655:e782:9340]:8333 [2001:0:9d38:6ab8:20cd:1cd9:54e6:5a6e]:8333 -[2001:0:9d38:6ab8:20ef:bc1:95f0:a658]:8333 -[2001:0:9d38:6ab8:2409:2ea4:47ee:3c9d]:8333 -[2001:0:9d38:6ab8:2427:330a:9441:dc2d]:8333 -[2001:0:9d38:6ab8:2436:3c78:431d:d559]:8333 -[2001:0:9d38:6ab8:24dd:2acb:b8a9:5ade]:8333 -[2001:0:9d38:6ab8:2869:2cb3:b57b:311c]:8333 -[2001:0:9d38:6ab8:28bf:33d4:9d29:8edc]:8333 -[2001:0:9d38:6ab8:28e0:142e:3ed6:b182]:8333 -[2001:0:9d38:6ab8:28f3:1675:c3ed:5be7]:8333 -[2001:0:9d38:6ab8:2c4c:21d6:946c:ef01]:8333 -[2001:0:9d38:6ab8:2cd6:3f49:a1ec:736]:8333 -[2001:0:9d38:6ab8:301d:1cd6:ba5a:2935]:8333 -[2001:0:9d38:6ab8:302b:340f:e723:b15e]:8333 -[2001:0:9d38:6ab8:3034:2d96:b57f:b0e6]:8333 -[2001:0:9d38:6ab8:306b:872:b4bc:d79f]:8333 -[2001:0:9d38:6ab8:30a4:1190:4315:e53]:8333 -[2001:0:9d38:6ab8:30c3:1362:521f:52c5]:8333 -[2001:0:9d38:6ab8:30e7:3e5c:da3f:6466]:8333 -[2001:0:9d38:6ab8:3439:223:a04a:fdfd]:8333 -[2001:0:9d38:6ab8:3477:14cd:f7de:dee8]:8333 -[2001:0:9d38:6ab8:3498:1a5:4635:2b50]:8333 -[2001:0:9d38:6ab8:349d:db2:a0e6:29a2]:8333 -[2001:0:9d38:6ab8:34f7:15b2:3012:3a74]:8333 -[2001:0:9d38:6ab8:3809:2941:4344:4838]:8333 -[2001:0:9d38:6ab8:3809:37b7:31b5:8e3d]:8333 -[2001:0:9d38:6ab8:3877:2dac:b691:719c]:8333 -[2001:0:9d38:6ab8:388a:24f3:a141:c194]:8333 -[2001:0:9d38:6ab8:38ba:3b3e:430c:fb74]:8333 -[2001:0:9d38:6ab8:38c4:2f2a:9357:b1ae]:8333 -[2001:0:9d38:6ab8:38e2:23f:b4f6:6ad1]:8333 -[2001:0:9d38:6ab8:3c56:2171:9d80:d360]:8333 -[2001:0:9d38:6ab8:3cab:1421:3ca4:1a8e]:8333 -[2001:0:9d38:6ab8:3f:2441:6806:9797]:8333 -[2001:0:9d38:6ab8:424:321:52b3:5633]:8333 -[2001:0:9d38:6ab8:47c:32ef:a7a8:a2b4]:8333 -[2001:0:9d38:6ab8:4a7:3cdd:9d1b:708]:8333 -[2001:0:9d38:6ab8:4c3:3a54:9d1c:2ad7]:8333 -[2001:0:9d38:6ab8:813:3ae3:bdd2:66d8]:8333 -[2001:0:9d38:6ab8:818:cf4:27f2:b5f5]:8333 -[2001:0:9d38:6ab8:855:33f7:6dbd:53c4]:8333 -[2001:0:9d38:6ab8:868:1baa:b174:b764]:8333 -[2001:0:9d38:6ab8:878:21cf:2b5b:2860]:8333 -[2001:0:9d38:6ab8:8a4:e1d1:79ec:7cee]:8333 -[2001:0:9d38:6ab8:8b3:392c:ab0d:ae6b]:8333 -[2001:0:9d38:6ab8:8ff:352f:b208:5604]:8333 -[2001:0:9d38:6ab8:c2f:1793:fa42:acdc]:8333 -[2001:0:9d38:6ab8:c36:25f:a0d0:e871]:8333 -[2001:0:9d38:6ab8:d3:69e:d0a0:1b73]:8333 -[2001:0:9d38:6abd:109f:379e:aeff:3957]:8333 -[2001:0:9d38:6abd:10a5:2f7d:ab07:9c7b]:8333 -[2001:0:9d38:6abd:1462:3fe1:b2cf:dcf0]:8333 -[2001:0:9d38:6abd:180b:29be:3429:fede]:8333 -[2001:0:9d38:6abd:1857:24c:46f4:7dc9]:8333 -[2001:0:9d38:6abd:18d5:a69:4b4a:6e8b]:8333 -[2001:0:9d38:6abd:1c20:25a2:3f5d:2da4]:8333 -[2001:0:9d38:6abd:1c96:24dc:a753:d6f2]:8333 -[2001:0:9d38:6abd:1ce7:533:26f3:2aab]:8333 -[2001:0:9d38:6abd:2065:3008:76b5:cb06]:8333 -[2001:0:9d38:6abd:20b2:434:4387:f5e1]:8333 -[2001:0:9d38:6abd:20ff:147c:840c:b0db]:8333 -[2001:0:9d38:6abd:2436:3c96:91e9:2de3]:8333 -[2001:0:9d38:6abd:244c:1817:ae9f:8a38]:8333 -[2001:0:9d38:6abd:284c:29ce:88b5:c86f]:8333 -[2001:0:9d38:6abd:285a:5c:c16b:119a]:8333 -[2001:0:9d38:6abd:2c5f:a51:a671:3d90]:8333 -[2001:0:9d38:6abd:3065:3255:4b21:e520]:8333 -[2001:0:9d38:6abd:341d:2dfa:892f:4366]:8333 -[2001:0:9d38:6abd:3450:302f:23b3:a33a]:8333 -[2001:0:9d38:6abd:3456:2308:d0b5:7970]:8333 -[2001:0:9d38:6abd:3470:346d:af23:d41b]:8333 -[2001:0:9d38:6abd:34ba:20c2:9a5a:dd02]:8333 -[2001:0:9d38:6abd:3846:1133:a68c:ea80]:8333 -[2001:0:9d38:6abd:38ef:31ea:6cd1:45db]:8333 -[2001:0:9d38:6abd:3c1f:c35a:cc00:28d3]:8333 -[2001:0:9d38:6abd:3c49:1539:fe22:5b3b]:8333 -[2001:0:9d38:6abd:3c5e:2ecd:88ee:787c]:8333 -[2001:0:9d38:6abd:3c74:194:4f94:e1b]:8333 -[2001:0:9d38:6abd:4c4:3492:4d56:35dd]:8333 -[2001:0:9d38:6abd:4e7:35f2:ae92:cbcd]:8333 -[2001:0:9d38:6abd:850:2b2f:adbf:fa7e]:8333 -[2001:0:9d38:6abd:8ba:f4f:3e75:b00b]:8333 -[2001:0:9d38:6abd:9e:3294:c2b5:67d7]:8333 -[2001:0:9d38:6abd:c74:81b:a2fb:aa90]:8333 -[2001:0:9d38:78cf:146b:2cc2:b2a5:db7]:8333 -[2001:0:9d38:78cf:18d3:1602:2a06:c562]:8333 -[2001:0:9d38:78cf:24a7:ee0:72cc:7f75]:8333 -[2001:0:9d38:78cf:2862:1384:b4b8:406f]:8333 -[2001:0:9d38:78cf:30c4:3698:92a5:3af9]:8333 -[2001:0:9d38:78cf:340b:1270:4d61:857]:8333 -[2001:0:9d38:78cf:3cb3:2773:4da3:d4c]:8333 -[2001:0:9d38:78cf:3cdf:8ab:a331:d75]:8333 -[2001:0:9d38:78cf:4d1:366f:4f91:eafb]:8333 -[2001:0:9d38:78cf:83f:b1c:c1a4:ad71]:8333 -[2001:0:9d38:90d7:1067:13c5:a69c:b099]:8333 -[2001:0:9d38:90d7:10aa:20c7:aa6f:d318]:8333 -[2001:0:9d38:90d7:10df:16c3:b351:e824]:8333 -[2001:0:9d38:90d7:1464:255e:9208:8012]:8333 -[2001:0:9d38:90d7:14e1:1b8:b256:ff4c]:8333 -[2001:0:9d38:90d7:180c:ebf:2a63:93c0]:8333 -[2001:0:9d38:90d7:18fb:9d7:af8d:a5d5]:8333 -[2001:0:9d38:90d7:1ca1:3e8e:ab02:edbe]:8333 -[2001:0:9d38:90d7:1cd7:3fe8:e80f:53f9]:8333 -[2001:0:9d38:90d7:20d8:1062:2684:32c2]:8333 -[2001:0:9d38:90d7:2419:373e:da40:1e51]:8333 -[2001:0:9d38:90d7:242b:1ac2:fdcc:af6a]:8333 -[2001:0:9d38:90d7:2442:2d34:9e97:36a0]:8333 -[2001:0:9d38:90d7:246c:24f1:3c0f:65fc]:8333 -[2001:0:9d38:90d7:24c4:15e7:d0cb:7a52]:8333 +[2001:0:9d38:6ab8:245e:2b3:a300:317e]:8333 +[2001:0:9d38:6ab8:2814:215c:88e3:4ee0]:8333 +[2001:0:9d38:6ab8:30ac:3a51:b2da:712d]:8333 +[2001:0:9d38:6ab8:34a6:eeb:c3ed:5be7]:8333 +[2001:0:9d38:6ab8:c2f:16d5:525a:107e]:8333 +[2001:0:9d38:6ab8:cb1:2557:431c:f3e1]:8333 +[2001:0:9d38:6abd:1056:290d:a671:3d90]:8333 +[2001:0:9d38:6abd:1865:14fe:d0a7:1f72]:8333 +[2001:0:9d38:6abd:2c3c:3006:a486:93c3]:8333 +[2001:0:9d38:6abd:2c73:3313:f21a:96da]:8333 +[2001:0:9d38:6abd:3050:fbff:a250:3386]:8333 +[2001:0:9d38:6abd:3828:494:fdaa:56cd]:8333 +[2001:0:9d38:6abd:454:187d:3e75:b00b]:8333 +[2001:0:9d38:78cf:c2c:1dcc:fa42:41a3]:8333 +[2001:0:9d38:90d7:1c4a:20d4:4daa:eb5a]:8333 +[2001:0:9d38:90d7:1ca7:1612:9a18:31e5]:8333 +[2001:0:9d38:90d7:24c8:3a0a:a68d:f799]:8333 [2001:0:9d38:90d7:2837:324e:d0cb:9f45]:22475 -[2001:0:9d38:90d7:2858:2d7c:bc51:6ee0]:8333 -[2001:0:9d38:90d7:289e:1b03:438e:b517]:8333 -[2001:0:9d38:90d7:289f:30fc:54bc:9685]:8333 -[2001:0:9d38:90d7:28a2:760:a6b3:3139]:8333 -[2001:0:9d38:90d7:28a4:1b25:b8c7:38ff]:8333 -[2001:0:9d38:90d7:28d3:1049:fd91:712c]:8333 -[2001:0:9d38:90d7:2c32:2da7:c111:dd82]:8333 -[2001:0:9d38:90d7:2c91:1e07:5d3d:7eb1]:8333 -[2001:0:9d38:90d7:2ce5:3c7:b736:9128]:8333 -[2001:0:9d38:90d7:2cf4:30d4:e020:53fa]:8333 -[2001:0:9d38:90d7:2cfc:2221:98e5:eed7]:8333 -[2001:0:9d38:90d7:3016:aed:6107:4df]:8333 -[2001:0:9d38:90d7:303e:3e8a:d06a:d137]:8333 -[2001:0:9d38:90d7:30ee:19d6:6e7b:908e]:8333 -[2001:0:9d38:90d7:342c:3ecc:c2a2:1e31]:8333 +[2001:0:9d38:90d7:28c1:361e:a69c:b099]:8333 +[2001:0:9d38:90d7:30fe:1c89:d0b4:4d18]:8333 [2001:0:9d38:90d7:3474:1df1:e732:e5e3]:8333 -[2001:0:9d38:90d7:3496:2e2d:cb17:c3bd]:8333 -[2001:0:9d38:90d7:34f3:3584:d0a4:aa5]:8333 -[2001:0:9d38:90d7:38e6:1092:d0cb:7576]:8333 -[2001:0:9d38:90d7:38ec:611:e05f:df3d]:8333 -[2001:0:9d38:90d7:38f5:3938:b454:4717]:8333 -[2001:0:9d38:90d7:38f8:14ce:8809:7786]:8333 -[2001:0:9d38:90d7:3c2c:10a4:bbfa:e09d]:8333 -[2001:0:9d38:90d7:3c35:2a8e:e79f:62fd]:8333 -[2001:0:9d38:90d7:3c40:77b:c2bb:79]:8333 -[2001:0:9d38:90d7:65:2adf:b8de:1781]:8333 -[2001:0:9d38:90d7:7c:129:d0cb:6e8b]:8333 -[2001:0:9d38:90d7:851:10d8:9d58:7059]:8333 -[2001:0:9d38:90d7:85d:102:2aa2:519a]:8333 -[2001:0:9d38:90d7:896:fe0:afc6:2270]:8333 -[2001:0:9d38:90d7:8a0:22cc:a0b3:d9da]:8333 -[2001:0:9d38:90d7:c0d:de2:b94f:774]:8333 -[2001:0:9d38:90d7:cff:c79:aa69:cb82]:8333 +[2001:0:9d38:90d7:34a8:fb1:88e3:fb19]:8333 +[2001:0:9d38:90d7:3c19:3d23:d0b4:f831]:18652 +[2001:0:9d38:90d7:3c45:2342:d0cb:d6ca]:8333 +[2001:0:9d38:90d7:3c5f:3105:d0b4:60b6]:8333 +[2001:0:9d38:90d7:8a1:2fb:d0cb:1e8f]:8333 +[2001:0:9d38:90d7:a3:36e0:e020:53fa]:8333 +[2001:0:9d38:90d7:eb:3b30:d0a4:aa5]:8333 [2001:0:9d38:953c:104e:8af:b3aa:f300]:8333 -[2001:0:9d38:953c:1063:10c4:93fd:77b5]:8333 -[2001:0:9d38:953c:10dd:3d0d:daee:ccda]:8333 -[2001:0:9d38:953c:1883:22e3:af92:33c7]:8333 -[2001:0:9d38:953c:1c0a:1583:9473:5f2e]:8333 -[2001:0:9d38:953c:1c44:2b70:9de7:a7cc]:8333 -[2001:0:9d38:953c:1cbb:646:d2cf:fd00]:8333 -[2001:0:9d38:953c:2051:348d:dc5a:c3c2]:8333 -[2001:0:9d38:953c:24f8:198a:d023:6580]:8333 -[2001:0:9d38:953c:2c32:2ea8:b817:2bb0]:8333 -[2001:0:9d38:953c:2c6d:3cef:4386:4937]:8333 -[2001:0:9d38:953c:2cb1:1719:5398:e444]:8333 -[2001:0:9d38:953c:3053:8a5e:25e4:352d]:8333 -[2001:0:9d38:953c:307b:2309:b347:3fdc]:8333 -[2001:0:9d38:953c:3084:1e46:8a72:750f]:8333 -[2001:0:9d38:953c:30a8:2304:9d47:7fdf]:8333 -[2001:0:9d38:953c:30b9:2ea0:e80c:53e5]:8333 -[2001:0:9d38:953c:30cf:3e04:a88b:4fe8]:8333 -[2001:0:9d38:953c:3427:2c62:bd53:f12d]:8333 -[2001:0:9d38:953c:3445:1bcb:b8b5:9653]:8333 -[2001:0:9d38:953c:3874:295f:9de2:cf3c]:8333 -[2001:0:9d38:953c:38bc:3f1:52c4:ea47]:8333 -[2001:0:9d38:953c:38c9:394f:bea2:fd60]:8333 -[2001:0:9d38:953c:38e8:2391:b6b2:90c1]:8333 -[2001:0:9d38:953c:3c43:3f1:b489:f8b8]:8333 -[2001:0:9d38:953c:4c5:2ae2:b643:3866]:8333 -[2001:0:9d38:953c:4db:3a7f:87b0:f876]:8333 -[2001:0:9d38:953c:8be:ce8:b8c5:5212]:8333 -[2001:0:9d38:953c:ac:2eab:2f99:80c4]:8333 -[2001:0:9d38:953c:c0a:1923:52a0:7ab2]:8333 -[2001:0:9d38:953c:c2:1715:b80b:7121]:8333 -[2001:0:9d38:953c:c8c:ee1:5199:bf8a]:8333 -[2001:0:9d38:953c:cbb:3f5:a670:b045]:8333 +[2001:0:9d38:953c:1434:71f:b850:bab1]:8333 +[2001:0:9d38:953c:144a:36e8:519a:bb69]:8333 +[2001:0:9d38:953c:20fc:26ef:ed26:c737]:8333 +[2001:0:9d38:953c:454:120:88e8:2fb]:8333 +[2001:0:9d38:953c:801:1620:bc22:95bc]:8333 +[2001:0:9d38:953c:8a0:1fdb:ab00:bc2]:8333 +[2001:0:9d38:953c:cf6:3d48:4386:4937]:8333 [2001:13d8:1c01:1000::8]:8333 -[2001:13d8:1c01:2000:2470::1]:8333 -[2001:14ba:1900::754:f271:151c]:8333 -[2001:1608:10:156:38::265c]:8333 [2001:1620:923:0:75be:ed92:1a01:641]:8333 [2001:1680:101:8c::1]:8333 -[2001:1838:2000:413::3]:8333 -[2001:19c0:1:801:801:ff00:46c:2]:8333 -[2001:19f0:0:204f:5400:ff:fe05:2d2e]:8333 -[2001:19f0:5000:8c8b:5400:ff:fe1f:c023]:8333 -[2001:19f0:5:17a7:5400:ff:fe87:cc21]:8333 -[2001:19f0:5c01:63b:5400:1ff:fe47:2ede]:8333 +[2001:1970:5ae2:2b00:30bd:7910:c84:7a8f]:8333 +[2001:1970:5d56:aa01:1e75:8ff:fead:da48]:8333 +[2001:19f0:300:1045:225:90ff:fec9:29b3]:8333 +[2001:19f0:5:1f93:5400:1ff:fe7a:c65a]:8333 +[2001:19f0:6c01:4bd:5400:1ff:fe76:4db6]:8333 [2001:19f0:ac01:2fb:5400:ff:fe5b:c3ff]:8333 +[2001:1a48:7:af1a:75f8:2c47:3285:d50e]:8333 +[2001:1af8:4010:a094:3333::8c38]:8333 [2001:1af8:4070:a016:3333::5afb]:8333 [2001:1af8:4700:a071:4444::e26e]:8333 -[2001:1bc0::ffff:aaaa:21]:8333 [2001:200:0:8801:5054:ff:fef2:1d0]:8333 -[2001:4128:6135:10:20c:29ff:fe69:9e81]:8333 [2001:4128:6135:2010:21e:bff:fee8:a3c0]:8333 -[2001:4128:6135:e001:5054:ff:fe37:e9eb]:8333 -[2001:4178:6:1427:62:116:188:85]:8333 -[2001:41c9:1:424::231]:8333 -[2001:41d0:1000:1e1f::]:8333 -[2001:41d0:1004:1fef::]:8333 -[2001:41d0:1004:24a5::]:8333 -[2001:41d0:1008:1c23::]:8333 -[2001:41d0:1008:2752::]:8333 +[2001:41d0:1000:1f98::]:8333 +[2001:41d0:1004:18c7::]:8333 +[2001:41d0:1004:19dc::]:18555 +[2001:41d0:1004:1f7c::]:8333 +[2001:41d0:1008:2bed::]:8333 [2001:41d0:1:45d8::1]:8333 -[2001:41d0:1:7d09::1]:8333 -[2001:41d0:1:8113::1]:8333 +[2001:41d0:1:5395::1]:8333 +[2001:41d0:1:85d3::1]:8333 [2001:41d0:1:8649::1]:8333 [2001:41d0:1:8b26::1]:8333 [2001:41d0:1:a5b8::1]:8333 [2001:41d0:1:ab6b::1]:8333 -[2001:41d0:1:afd8::]:8333 -[2001:41d0:1:b421::1]:8333 -[2001:41d0:1:b5ce::1]:8333 [2001:41d0:1:d227::]:8333 -[2001:41d0:1:dabd::1]:8333 -[2001:41d0:1:e13b::1]:8333 -[2001:41d0:1:f176::1]:8333 -[2001:41d0:203:10bd::]:8333 -[2001:41d0:2:16be::1]:8333 -[2001:41d0:2:53df::]:8333 -[2001:41d0:2:8c65::]:8333 -[2001:41d0:2:9431::]:8333 -[2001:41d0:2:9c94::1]:8333 -[2001:41d0:2:a5a9::]:8333 +[2001:41d0:1:f897::1]:8333 +[2001:41d0:1:f932::1]:8333 +[2001:41d0:2:34b7::1]:8333 +[2001:41d0:2:4975::]:8333 +[2001:41d0:2:5c22::]:8333 +[2001:41d0:2:84d4::1]:8333 [2001:41d0:2:ab38::]:8333 -[2001:41d0:2:c6e::]:8333 -[2001:41d0:2:c9bf::]:8333 -[2001:41d0:302:1000::fa25]:8333 -[2001:41d0:303:188::]:8333 -[2001:41d0:303:1907::]:8333 +[2001:41d0:2:c33c::]:8333 +[2001:41d0:303:193b::]:8333 [2001:41d0:303:2505::1a]:8333 -[2001:41d0:303:4140::]:8333 -[2001:41d0:303:d02::]:8333 -[2001:41d0:403:589::]:8333 -[2001:41d0:52:d00::6e2]:8333 -[2001:41d0:52:d00::6e3]:8333 -[2001:41d0:602:3b::]:8333 -[2001:41d0:602:6ca::]:8333 -[2001:41d0:602:e0::]:8333 -[2001:41d0:604:177::]:8333 -[2001:41d0:700:468::]:8333 -[2001:41d0:700:479::]:8333 -[2001:41d0:800:283::]:8333 +[2001:41d0:303:41db::]:58333 +[2001:41d0:303:4c68::]:8333 +[2001:41d0:303:508::]:8333 +[2001:41d0:303:6767::]:8333 +[2001:41d0:303:68cd::]:8333 +[2001:41d0:602:17a4::]:8333 +[2001:41d0:602:1842::]:8333 +[2001:41d0:602:3b7::]:8333 +[2001:41d0:602:898::]:8333 +[2001:41d0:602:b1a::]:8333 +[2001:41d0:800:135::]:8333 +[2001:41d0:800:3d3::]:8333 +[2001:41d0:8:101d::1]:8333 [2001:41d0:8:1b29::]:8333 -[2001:41d0:8:2556::]:8333 -[2001:41d0:8:7a38::1]:8333 -[2001:41d0:8:8007::]:8333 -[2001:41d0:8:8f46::1]:8333 -[2001:41d0:8:9c6e::1]:8333 -[2001:41d0:8:b3ad::1]:8333 -[2001:41d0:8:b7d0::1]:8333 +[2001:41d0:8:3f74::1]:8333 +[2001:41d0:8:43a0::]:8333 +[2001:41d0:8:bb32::1]:8333 [2001:41d0:8:bed3::]:8333 [2001:41d0:8:c67c::]:8333 +[2001:41d0:8:ca2d::]:8333 [2001:41d0:8:d444::1]:8333 -[2001:41d0:8:d844:1337::1017]:8333 -[2001:41d0:8:db78::1]:8333 [2001:41d0:8:ddb::1]:8333 -[2001:41d0:8:ddf::1]:8333 -[2001:41d0:8:e3e4::1]:8333 -[2001:41d0:a:3b5f::1]:8333 +[2001:41d0:8:ea86::1]:8333 +[2001:41d0:a:1220::1]:8333 +[2001:41d0:a:27ed::1]:8333 +[2001:41d0:a:296c::]:8139 +[2001:41d0:a:2b18::1]:8333 [2001:41d0:a:405c::]:8333 -[2001:41d0:a:635b::1]:8333 -[2001:41d0:a:6a0d::1]:8333 -[2001:41d0:a:6a1::1]:8333 +[2001:41d0:a:42df::]:8312 +[2001:41d0:a:4c49::aca:7929]:8333 +[2001:41d0:a:6927::1]:8333 +[2001:41d0:a:69a2::1]:8333 +[2001:41d0:a:6a87::1]:8333 [2001:41d0:a:6c29::1]:8333 -[2001:41d0:a:6fd0::]:8333 -[2001:41d0:a:755::1]:8333 -[2001:41d0:a:f8d2::1]:8333 -[2001:41d0:a:f915::1]:8333 +[2001:41d0:a:6c7d::1]:8333 +[2001:41d0:a:f243::1]:8333 +[2001:41d0:a:f9cd::1]:8333 +[2001:41d0:d:dc9::]:8333 [2001:41d0:e:1146::1]:8333 +[2001:41d0:e:126::1]:8333 +[2001:41d0:e:12aa::1]:8333 [2001:41d0:e:1388::1]:8333 -[2001:41d0:e:26b::1]:8333 -[2001:41d0:e:9e7::1]:8333 [2001:41d0:e:ec5::1]:8333 -[2001:41f0:61:0:72f3:95ff:fe09:7521]:8333 -[2001:41f0:61::7]:8333 -[2001:4642:e527::beef]:8333 -[2001:470:1d:8a9::]:8333 -[2001:470:1d:8a9::4]:8333 +[2001:41f0:0:4:62:6974:636f:696e]:8333 +[2001:470:18:be4::2]:8333 +[2001:470:1c62:b170:bbff:53f1:edbf:99df]:42434 [2001:470:1f06:15b4::2]:8333 +[2001:470:1f06:cea::2]:8333 [2001:470:1f07:803:20c:29ff:fe2d:5879]:8333 -[2001:470:1f09:325::40]:8333 -[2001:470:1f0b:56e:7e5c:f8ff:fe32:5302]:8333 -[2001:470:1f0b:8c4::5]:8333 -[2001:470:1f0b:8fe:c4:4338:e528:2713]:8333 -[2001:470:1f0b:967::11]:8333 -[2001:470:1f10:776::2]:8333 +[2001:470:1f08:3cc::2]:8333 +[2001:470:1f0a:18dd::2]:8333 [2001:470:1f15:11f8::10]:8333 -[2001:470:1f15:1b95:2c3e:8a9a:24e1:7084]:8333 [2001:470:1f15:cf7::14]:8333 -[2001:470:1f15:e9b::3ef]:8333 -[2001:470:1f17:22a:8d2:72bf:a564:21fb]:8333 [2001:470:1f17:b5::10]:8333 +[2001:470:1f1a:172::2]:8333 [2001:470:1f1b:5a6:216:3eff:fe24:1162]:8333 -[2001:470:2179:dead:deaf:0:2e70:9d8b]:8333 -[2001:470:25:482::2]:8333 -[2001:470:27:483::2]:8333 +[2001:470:28:365::7]:8333 +[2001:470:41:6::2]:8333 +[2001:470:6c80:101::1]:8333 +[2001:470:6c80:3::1]:8333 +[2001:470:7:63e::2]:8333 [2001:470:7:b74::2]:8333 -[2001:470:8:2e1:44ff:654e:e53e:ad59]:8333 -[2001:470:8:2e1:7058:53f6:5681:5be4]:8333 -[2001:470:8:2e1::43]:8333 -[2001:470:8:7b3::17]:8333 -[2001:470:8a2f:8000::e998]:8333 -[2001:470:a068::2]:8333 -[2001:470:a:88b::2]:8333 +[2001:470:8:bd3:4d25:ca57:a5b7:c6c4]:8333 [2001:470:a:c13::2]:8333 -[2001:470:b3d5:1:641c:6bff:fe9d:bccf]:8333 -[2001:470:c144:cafe::9]:8333 -[2001:470:d00d:0:3664:a9ff:fe9a:5150]:8333 -[2001:470:dbf2:aaaa::b17:c01c]:8333 -[2001:4802:7802:103:be76:4eff:fe21:19f9]:8333 +[2001:470:c144:cafe::23]:8333 +[2001:470:c3c4:100:100::202]:8333 +[2001:470:e696::1]:8333 [2001:48f8:1003::3ba]:8333 -[2001:4b99:1:1:216:3eff:febd:85ba]:8333 -[2001:4ba0:babe:2681::]:8333 +[2001:48f8:9015:1422:3dc0:fcf2:772f:57bc]:8333 [2001:4ba0:babe:832::]:8333 -[2001:4ba0:cafe:20c::1]:8333 -[2001:579:9284:bc:10be:5df1:f6d2:4194]:8333 -[2001:638:a000:4140::ff10:415]:8333 +[2001:628:22a0:9::12]:8333 [2001:638:a000:4140::ffff:191]:8333 -[2001:67c:2564:520:7800:4817:52ec:d8f]:8333 -[2001:708:150:10::4329]:8333 +[2001:638:a000:4142::ff10:bed6]:8333 +[2001:67c:21ec:1000::a]:8333 +[2001:8d8:90b:c000::21:2fc0]:8333 +[2001:8d8:91c:9200::5c:d425]:8333 [2001:980:231b:1:8e89:a5ff:fee3:f8be]:8333 [2001:980:ade8:1:14fc:fd6d:608c:f669]:8333 +[2001:981:bdbd:1:c506:7d38:4b47:da15]:8333 +[2001:982:27f2:1:7271:bcff:fe94:d5bb]:8333 +[2001:984:26b5::1]:8333 [2001:984:aec7:1:dcb7:29a:7eda:b9a2]:8333 [2001:985:79af:20::35]:8333 -[2001:bc8:225f:10e:505:6573:7573:d0a]:8333 +[2001:985:cb69:0:20c:29ff:feaf:dd5e]:8333 +[2001:b011:300d:1870:9c87:d4ff:fe9c:2d0f]:8333 +[2001:b030:2422::208d]:8333 +[2001:bc8:31d7:100::1]:8333 [2001:bc8:323c:100::]:8333 +[2001:bc8:33ac:19ff::26]:8333 [2001:bc8:399f:f000::1]:8333 -[2001:bc8:3cbf::5]:8333 -[2001:bc8:4400:2400::480f]:8333 -[2002:261b:642c::261b:642c]:8333 -[2002:2956:685e::2956:685e]:8333 -[2002:2d7b:674f::2d7b:674f]:8333 -[2002:2df9:5e40::2df9:5e40]:8333 -[2002:2e04:784b::2e04:784b]:8333 -[2002:2f58:fe42::2f58:fe42]:8333 -[2002:2f58:fe62::2f58:fe62]:8333 +[2001:bc8:3dc1:100::142]:8333 +[2001:bc8:4400:2000::463b]:8333 +[2001:bc8:4400:2400::1b35]:8333 +[2001:bc8:4700:2000::5823]:8333 +[2001:da8:8001:2303:1cf4:4466:3f1a:7edb]:8333 +[2001:da8:d800:741:652d:52db:5713:4515]:8333 +[2002:17e5:10ea::17e5:10ea]:8333 +[2002:1f2b:8cbe::1f2b:8cbe]:8333 [2002:2f59:30f3::2f59:30f3]:8333 -[2002:2f5a:3c1c::2f5a:3c1c]:10011 [2002:2f5a:562a::2f5a:562a]:8333 -[2002:2f5b:a5f9::2f5b:a5f9]:8333 -[2002:2f5b:b086::2f5b:b086]:8333 -[2002:323f:a61b::323f:a61b]:8333 -[2002:33ff:69a0::1]:8333 +[2002:3e92:46d8::3e92:46d8]:8333 [2002:3f62:e6bb::3f62:e6bb]:8333 -[2002:4b63:50b4:1234:4059:bf54:e088:7daa]:8333 -[2002:509:6ac5::509:6ac5]:8333 -[2002:51a9:9cc9::51a9:9cc9]:8333 -[2002:54fb:a1cd::1]:8333 -[2002:5bc2:5428::5bc2:5428]:8333 -[2002:5bce:1253::5bce:1253]:8333 -[2002:5d68:d270::5d68:d270]:8333 +[2002:404e:a30a::404e:a30a]:8333 +[2002:43db:9616::43db:9616]:8333 +[2002:43e5:a1fa::43e5:a1fa]:8333 +[2002:5266:afb::5266:afb]:8333 [2002:5dbd:91a9::5dbd:91a9]:8333 -[2002:5fd3:8944::5fd3:8944]:8333 -[2002:6738:8869::6738:8869]:8333 -[2002:67e9:fe16::67e9:fe16]:8333 -[2002:67fa:44a::67fa:44a]:8333 -[2002:67fa:44b::67fa:44b]:8333 -[2002:6825:d425::6825:d425]:8333 -[2002:6a0e:3ea8::6a0e:3ea8]:10011 -[2002:6bb4:475c::6bb4:475c]:41888 -[2002:6bb4:54bc::6bb4:54bc]:8333 -[2002:6c3d:d88a::6c3d:d88a]:8333 -[2002:704a:d6d4::704a:d6d4]:9997 -[2002:7169:8b2a::7169:8b2a]:8333 -[2002:7237:fcf6::7237:fcf6]:20188 -[2002:7819:7e80::7819:7e80]:7743 -[2002:8494:8233::8494:8233]:8333 -[2002:8494:84fc::8494:84fc]:8333 -[2002:9247:4cec::9247:4cec]:8333 -[2002:9538:735d::9538:735d]:8333 -[2002:adcd:b88c::adcd:b88c]:8333 -[2002:b025:5c52::b025:5c52]:8333 +[2002:627e:333d::627e:333d]:8333 +[2002:6b9b:486c::6b9b:486c]:8333 +[2002:6dcb:7cba::6dcb:7cba]:8333 +[2002:7cf8:e33e::7cf8:e33e]:8333 +[2002:8e00:8231::8e00:8231]:8333 +[2002:8e00:8233::8e00:8233]:8333 [2002:b07e:a70a::b07e:a70a]:8333 [2002:b2c9:e6fc:10:3d5c:e3ad:813:9c46]:8333 [2002:b4b2:3612::b4b2:3612]:8333 +[2002:b610:1ca2::b610:1ca2]:8333 [2002:b610:1ca3::b610:1ca3]:8333 -[2002:b85f:26da::b85f:26da]:8333 -[2002:b923:b67b::b923:b67b]:8333 +[2002:b845:3322::1]:8333 [2002:b946:694a::b946:694a]:8339 [2002:b960:5e18::b960:5e18]:8333 -[2002:bc48:d606::bc48:d606]:8333 -[2002:c13a:c4d4::1]:8333 -[2002:c16a:1c08::c16a:1c08]:8333 -[2002:c16a:1d12::c16a:1d12]:8333 [2002:c23f:8fc5::c23f:8fc5]:8333 [2002:c2a5:1021::c2a5:1021]:8333 -[2002:c2a5:10fe::c2a5:10fe]:8333 -[2002:c39a:a4a8::c39a:a4a8]:8333 -[2002:cb82:d02d::cb82:d02d]:8333 +[2002:c62c:e7a0::c62c:e7a0]:6333 +[2002:ca99:c7b6::ca99:c7b6]:8333 [2002:d035:2734::d035:2734]:8333 -[2002:d2d3:6da5::d2d3:6da5]:8333 -[2002:d453:9174::d453:9174]:8333 -[2002:d917:d95::d917:d95]:8333 -[2003:a:1114:1001:6ab5:99ff:feb0:8770]:8333 -[2400:2650:480:bc00:bcaf:7c49:8c9e:7cdf]:8333 -[2400:8901::f03c:91ff:fe1f:ec00]:8333 -[2400:8901::f03c:91ff:fe3e:571b]:8333 -[2400:8901::f03c:91ff:fe3e:57ef]:8333 -[2400:8901::f03c:91ff:feb4:71f1]:8333 -[2400:8902::f03c:91ff:feb9:c59c]:8333 -[2400:dd01:1034:e00:f21f:afff:fedc:164d]:8333 -[2400:dd08:1001:120:f0f7:d9da:8b5b:58d7]:8333 -[2401:1800:7800:102:be76:4eff:fe1c:a7d]:8333 -[2401:1800:7801:101:be76:4eff:fe1c:f4b]:8333 -[2402:1f00:8100:36::]:8333 -[2404:7a83:94e0:7f00:858f:8a7d:3a8c:26dd]:8333 -[2404:c805:d00:101:716a:cff7:c9ab:a595]:8333 +[2002:d06e:5d1a::d06e:5d1a]:8333 +[2002:d8da:b949::d8da:b949]:8333 +[2400:2410:a960:4800:18be:d624:7018:cd2f]:8333 +[2400:6180:0:d0::3e1:b001]:8333 +[2400:6180:0:d0::5cd2:a001]:8333 +[2400:6180:0:d1::4c6:8001]:8333 +[2400:6180:100:d0::797:a001]:8333 +[2400:8500:1302:817:150:95:130:17]:8333 +[2401:1800:7800:106:be76:4eff:fe1c:1879]:8333 +[2401:3900:2:1::2]:8333 +[2401:a400:3200:5600:3c16:2deb:abce:70cd]:8333 +[2401:b140::43:100]:8333 +[2401:b140::43:102]:8333 +[2402:1f00:8100:21c::]:8333 +[2403:bd80:c000:1:103:202:216:182]:8333 +[2405:6580:c5c0:1700:6cd2:b72e:740e:4311]:8333 +[2405:800:1000:1:1000::2001]:8333 +[2405:9800:b560:96d:630:c28e:a79a:a182]:8333 [2405:aa00:2::40]:8333 [2409:10:ca20:1df0:224:e8ff:fe1f:60d9]:8333 -[2600:1f14:6ae:d900:6550:3fc5:e074:a72c]:8333 -[2600:1f14:6d0:2e03:640e:1937:9960:32e9]:8333 -[2600:1f14:6d0:2e03:761:6e21:952c:de5b]:8333 [2600:1f16:625:e00:269a:3452:2edf:1011]:8333 [2600:1f16:625:e00:7bc:5879:4463:15dd]:8333 [2600:1f16:625:e00:a28b:5a16:849c:fe41]:8333 [2600:1f16:625:e00:a70f:e728:e8e1:2c2e]:8333 -[2600:1f16:b32:3102:440:fab:d8a2:cc59]:8333 -[2600:1f18:3d:4600:699a:d6b3:76e8:9b8d]:48333 -[2600:1f18:3f8:f90f:2b39:201b:e9a4:e882]:8333 -[2600:1f18:609f:da02:b283:b16e:aac4:749f]:8333 -[2600:3c00::f03c:91ff:fe28:9e61]:8333 +[2600:3c00::f03c:91ff:fe0c:4d74]:8333 +[2600:3c00::f03c:91ff:fe2b:bf38]:8333 [2600:3c00::f03c:91ff:fe91:3e49]:8333 -[2600:3c00::f03c:91ff:feb9:36fc]:8333 -[2600:3c01::f03c:91ff:fe39:768b]:8333 -[2600:3c01::f03c:91ff:fe8e:8ae1]:8333 +[2600:3c00::f03c:91ff:feb6:19f2]:8333 [2600:3c01::f03c:91ff:fe91:6a29]:8333 -[2600:3c01::f03c:91ff:fea7:e0f9]:8333 -[2600:3c02::f03c:91ff:fe8e:bcd9]:8333 +[2600:3c01::f03c:91ff:fed8:85a2]:8333 +[2600:3c01::f03c:91ff:fed8:db38]:8333 [2600:3c03::f03c:91ff:fe28:1445]:8333 -[2600:3c03::f03c:91ff:fe7a:1eb2]:8333 -[2600:3c03::f03c:91ff:feb0:5fc4]:8333 -[2600:3c03::f03c:91ff:fee0:233e]:8333 -[2600:6c40:7900:319f:8390:e8af:5a2c:9b0b]:8333 -[2600:6c44:467f:f89c:722d:8424:d481:d155]:8333 -[2600:8801:8306:e900:dce8:6a03:9592:a053]:8333 +[2601:147:4300:e61::30c]:8333 +[2601:147:4300:e61::f91]:8333 [2601:186:c100:6bcd:16bd:cea1:235d:1c19]:8333 [2601:18d:4600:5f32:20e7:b3ff:fecf:a99]:8333 -[2601:1c2:f00:29b0:922b:34ff:fea8:4118]:8333 -[2601:282:8000:20b0:67f8:fa63:e056:dd23]:8333 -[2601:40a:c200:37e8:9528:d453:6358:9f2a]:8333 -[2601:646:4101:1603:5809:1bff:fe55:6678]:8333 -[2601:c0:c100:1880:21f:5bff:fe3c:6e84]:8333 -[2601:c8:4100:770:23e:e1ff:febe:736d]:8333 -[2603:3000:903:c5f1:468a:5bff:fe9e:89dc]:8333 +[2601:240:4601:ecee:309a:f9de:b64d:87df]:8333 +[2601:240:8100:256b:20c:29ff:fe5e:d707]:8333 +[2601:646:c202:5301:101b:a096:efba:c10a]:8333 +[2601:807:8000:9508:9993:d2b3:1a:8225]:8333 +[2601:c8:4100:770:c37:807b:98cc:bd7e]:8333 +[2602:100:6154:d6e3:2c91:d0de:b032:b0a4]:8333 +[2602:100:6154:d6e3::60]:8333 +[2602:61:786c:2c00::1]:8333 +[2602:ff83:fff:fffe::75]:8333 +[2602:ff83:fff:fffe::76]:8333 [2603:3005:3000:5000:bc5a:72ac:36e9:175e]:8333 -[2603:3022:501:7800:495c:728c:ed5d:5d75]:8333 -[2604:180:1:346::684d]:8333 -[2604:67c0:2001::2]:8333 -[2604:8d80:100:0:8065:4c57:667a:b70f]:8333 -[2604:8d80:100::adf3:4031]:8333 +[2604:0:c1:100:6bc1:f98a:97f9:3845]:8333 +[2604:2d80:c808:857b:8d6:9e1c:7131:4bea]:8333 +[2604:4080:1008:0:96de:80ff:fe62:e650]:8333 +[2604:4300:a:104:b699:baff:feaa:5109]:8333 +[2604:5500:c226:7f00:2d96:ed64:ce45:9a6]:8333 +[2604:8d80:100::adf3:4030]:8333 +[2604:a880:2:d0::22f8:e001]:8333 [2604:a880:2:d0::22f8:f001]:8333 [2604:a880:2:d0::22f9:1]:8333 [2604:a880:2:d0::22f9:1001]:8333 @@ -1077,449 +786,483 @@ [2604:a880:2:d0::22fa:1001]:8333 [2604:a880:2:d0::22fa:2001]:8333 [2604:a880:2:d0::22fa:3001]:8333 -[2604:a880:2:d0::301:8001]:8333 [2604:a880:2:d0::38:f001]:8333 -[2604:a880:2:d0::46:f001]:8333 -[2604:a880:2:d0::b2:9001]:8333 +[2604:a880:2:d0::662:c001]:8333 [2604:a880:400:d0::1ac4:b001]:8333 [2604:a880:400:d0::2004:4001]:8333 [2604:a880:400:d0::2004:5001]:8333 [2604:a880:400:d0::2004:6001]:8333 -[2604:a880:400:d0::2004:c001]:8333 [2604:a880:400:d0::2004:d001]:8333 [2604:a880:400:d0::2004:e001]:8333 -[2604:a880:400:d0::2004:f001]:8333 [2604:a880:400:d0::2005:1]:8333 [2604:a880:400:d0::2005:2001]:8333 [2604:a880:400:d0::2005:3001]:8333 -[2604:a880:400:d0::261f:6001]:8333 +[2604:a880:400:d0::cd7:4001]:8333 +[2604:a880:400:d1::729:b001]:8333 +[2604:a880:800:a1::11a9:8001]:8333 +[2604:a880:800:a1::59:9001]:8333 +[2604:a880:800:a1::cbb:f001]:8333 +[2604:a880:800:a1::ee8:e001]:8333 +[2604:a880:cad:d0::370:f001]:8333 +[2604:a880:cad:d0::a52:6001]:8333 [2605:4d00::50]:8333 -[2605:6000:e8c8:6701:7562:de11:245c:f6ba]:8333 +[2605:9880:0:1cf:225:90ff:fec9:29b3]:8333 [2605:9880:0:3::8333]:8333 [2605:9880:201:17::4b7c]:8333 -[2605:9880:201:6:ec4:7aff:fe6c:a660]:8333 +[2605:a000:4a87:9501:d613:fbf8:1e82:8d3c]:8333 [2605:a000:f343:b700:5054:ff:fea7:131]:8333 +[2605:a601:a41:1a00:a00:27ff:fefc:4759]:8333 [2605:ae00:203::203]:8333 [2605:c000:2a0a:1::102]:8333 -[2605:f700:80:800::3724:81c]:8333 -[2605:f700:80:800::38c1:2b84]:8333 -[2606:df00:7:4:4caa:2c79:b619:27c9]:8333 -[2607:4480:2:1:38:102:69:70]:8333 -[2607:5300:120:b7e::]:8333 -[2607:5300:201:2000::1:556]:8333 -[2607:5300:203:1245::]:8333 -[2607:5300:203:14e7::20f]:8333 -[2607:5300:203:190a::]:8333 -[2607:5300:203:a3::]:8333 +[2605:e000:1c00:80e8:984e:a697:97a3:50ed]:8333 +[2605:e000:1c0d:437b:5054:ff:fe1b:2913]:8333 +[2605:e000:9093:a700:9853:4464:5f78:c484]:8333 +[2605:f700:100:400::104e:43bd]:8333 +[2605:f700:100:400::131:5b54]:8333 +[2605:f700:100:c10:5575:8e73:b07c:bf5a]:8333 +[2606:6000:c149:8830:5054:ff:fe78:66ff]:8333 +[2607:1c00:a:6:3c1c:1b0d:ba4:8ea9]:8333 +[2607:1c00:a:6::1000]:8333 +[2607:5300:120:a04::]:8333 +[2607:5300:203:2fac::]:8333 +[2607:5300:203:408::]:8333 +[2607:5300:203:6bc::]:18333 +[2607:5300:203:8d::]:8333 [2607:5300:60:10aa::1]:8333 +[2607:5300:60:122a::1]:8333 [2607:5300:60:13bb::1]:8333 -[2607:5300:60:1ba8::1]:8333 -[2607:5300:60:2218::]:8333 -[2607:5300:60:26f::1]:8333 -[2607:5300:60:2827::]:8333 -[2607:5300:60:2c16::]:8333 [2607:5300:60:3ddf::]:8333 -[2607:5300:60:9ad::1]:8333 -[2607:5300:60:ac0::1]:8333 -[2607:5300:61:c50::]:8333 -[2607:5300:61:f5b::]:8333 -[2607:9000:0:6:1:0:36b:5a5]:8333 +[2607:5300:60:5735::]:8333 +[2607:5300:60:714::1]:8333 +[2607:5300:60:981::1]:8333 +[2607:5300:60:cff1::]:28633 +[2607:9280:b:73b:250:56ff:fe21:bf32]:8333 [2607:f178:0:8::106]:8333 [2607:f1c0:823:af00::35:bbd1]:8333 -[2607:f1c0:846:9a00::87:d00e]:8333 -[2607:f2d8:4005:d:a8a2:eeff:fee0:a859]:8333 -[2607:f470:14:a:21d:7dff:fe01:bcee]:8333 +[2607:f2c0:f00e:300:201:2eff:fe67:9130]:8333 [2607:fa18:0:beef::c012]:8333 -[2607:fd70:4a:babe:b00b:1e5:0:1]:8333 -[2607:fea8:e2df:f87e:4b8e:8a8c:8167:ec0d]:8333 -[2607:fea8:e60:574:fdbc:add5:eabd:4d9e]:8333 -[2610:1a0:103:4a:dead:beaf:0:cafe]:8333 -[2610:1a0:103:4a:dead:beef:1:cafe]:8333 -[2801:80:930::63]:8333 +[2607:ff28:1:7::176e:c4a5]:8333 +[2607:ff28:1:7::65af:9afb]:8333 +[2620:71:4000:0:192:30:120:110]:8333 +[2801:84:0:1034:76d4:35ff:fe7f:5033]:8333 [2803:1500:1200:c487::1]:8333 +[2804:14c:6582:60f0::1]:8333 +[2804:14d:baa6:962c:486:47f6:c161:a79d]:8333 +[2a00:13a0:3015:1:85:14:79:26]:8333 [2a00:16d8:c::5b6a:c261]:8333 -[2a00:1a48:7810:101:be76:4eff:fe08:c774]:8333 -[2a00:1c48:6:108:a6bf:1ff:fe16:35c1]:8333 -[2a00:1c60:0:12:e2d5:5eff:fe09:257d]:8333 -[2a00:1ca8:37::65e9:f438]:8333 -[2a00:4802:360::ff9]:8333 -[2a00:7c80:0:97::7]:8333 +[2a00:1768:2001:24::148:218]:8333 +[2a00:1838:36:2c::ed85]:8333 +[2a00:1a28:1157:2f8::946a]:8333 +[2a00:1c48:6:203:a60:6eff:fe44:8086]:8333 +[2a00:1f40:2::1126]:8333 +[2a00:7c80:0:5d::1d0e]:8333 [2a00:8a60:e012:a00::21]:8333 -[2a00:bbe0:0:42:222:64ff:fe9a:e206]:8333 +[2a00:ab00:603:84::3]:8333 [2a00:bbe0:cc:0:6651:6ff:fe0e:9418]:8333 -[2a00:c440:10:1c62:1234::1]:8333 -[2a00:c440:40:33b:9d1c:7726:5571:c862]:8333 -[2a00:c70:1:213:246:56:95:1]:8333 -[2a00:ee2:1200:1900:20c:29ff:fe81:a0a3]:8333 -[2a00:f940:2:1:2::1086]:8333 -[2a00:f940:2:1:2::184b]:8333 -[2a01:238:4343:7700:3e6:f65c:5e57:511c]:8333 -[2a01:238:43a6:6500:5e5c:24bb:5e39:d96f]:8333 +[2a00:ca8:a1f:3025:4121:5ca1:3b:4469]:8333 +[2a00:ca8:a1f:9091:945e:80a3:830a:78cf]:8333 +[2a01:238:433c:5300:7a61:3e1a:27f4:9dc2]:8333 [2a01:4240:a21:983b::c0a8:32]:8333 -[2a01:488:66:1000:2ea3:7633:0:1]:8333 +[2a01:488:66:1000:53a9:21b8:0:1]:8333 [2a01:4d60:3:1:5::1]:8333 -[2a01:4f8:10a:10a8::2]:8333 -[2a01:4f8:10a:1d8f::2]:8333 -[2a01:4f8:10a:239c::2]:9002 -[2a01:4f8:10a:2ae0::2]:8333 -[2a01:4f8:10a:31d3::2]:8333 -[2a01:4f8:10a:3718::2]:8333 -[2a01:4f8:10a:3fe4::2]:8333 -[2a01:4f8:10a:41c1::2]:8333 -[2a01:4f8:10b:18c2::2]:8333 -[2a01:4f8:10b:2a9b::2]:8333 -[2a01:4f8:10b:2e18::2]:8333 -[2a01:4f8:10b:2e19::2]:8333 -[2a01:4f8:10b:2e8c::3]:8333 +[2a01:4f8:10a:3524::2]:8333 +[2a01:4f8:10b:362::2]:8333 [2a01:4f8:10b:d50::2]:8333 -[2a01:4f8:10b:e2d::2]:8333 -[2a01:4f8:10b:ee1::2]:8333 -[2a01:4f8:10b:f04::2]:8333 [2a01:4f8:10b:f44::2]:8333 -[2a01:4f8:110:411f::2]:8333 [2a01:4f8:120:1391::2]:8333 -[2a01:4f8:120:62e6::2]:8333 -[2a01:4f8:120:702e::2]:8333 -[2a01:4f8:130:618e::2]:8333 +[2a01:4f8:120:70a3::2]:8333 +[2a01:4f8:120:93f8::2]:8333 +[2a01:4f8:121:2385::2]:8333 [2a01:4f8:130:71d2::2]:8333 [2a01:4f8:130:7422::2]:8333 -[2a01:4f8:13b:271c::2]:8333 +[2a01:4f8:13a:124f::2]:8333 +[2a01:4f8:13a:1dcb::2]:8333 +[2a01:4f8:13a:708::2]:21775 +[2a01:4f8:13a:723::2]:8333 +[2a01:4f8:13b:109e::2]:8333 +[2a01:4f8:13b:1a9e::201]:8333 +[2a01:4f8:13b:271c::2]:10731 +[2a01:4f8:13b:2d42::2]:8333 +[2a01:4f8:13b:2d94::2]:8333 [2a01:4f8:13b:3810::2]:8333 -[2a01:4f8:140:2123::2]:8333 -[2a01:4f8:140:3144::2]:8333 -[2a01:4f8:140:4201::2]:8333 -[2a01:4f8:140:524a::2]:8333 +[2a01:4f8:13b:3da8::2]:8333 +[2a01:4f8:13b:41e6::2]:8333 +[2a01:4f8:13b:4281::2]:8333 +[2a01:4f8:13b:5c7::2]:8333 +[2a01:4f8:13b:81::2]:8333 +[2a01:4f8:140:236a:cafe::5]:8333 +[2a01:4f8:140:324e::2]:8333 [2a01:4f8:140:5329::102]:8333 -[2a01:4f8:140:624c::2]:8333 -[2a01:4f8:140:7173::2]:8333 -[2a01:4f8:140:82b6::2]:8333 -[2a01:4f8:140:9082::2]:8333 +[2a01:4f8:140:5329::50:109]:8333 [2a01:4f8:140:931a::2]:8333 -[2a01:4f8:141:13b1::2]:8333 -[2a01:4f8:141:22ae::2]:8333 -[2a01:4f8:141:2426::2]:8333 -[2a01:4f8:141:5491::2]:8333 -[2a01:4f8:150:32f2::2]:8333 -[2a01:4f8:150:4107::2]:5001 -[2a01:4f8:150:4226::2]:8333 -[2a01:4f8:150:5327::2]:8333 -[2a01:4f8:150:53a4::2]:8333 +[2a01:4f8:140:93b0::2]:8333 +[2a01:4f8:141:47::2]:8333 [2a01:4f8:150:53a4::4]:8333 -[2a01:4f8:150:728f::2]:8333 [2a01:4f8:150:72ee::4202]:8333 -[2a01:4f8:150:7331::2]:8333 -[2a01:4f8:151:82d2::2]:8333 -[2a01:4f8:160:3324::2]:8333 [2a01:4f8:160:41f0::1:33]:8333 -[2a01:4f8:160:542e::2]:8333 +[2a01:4f8:160:4443::2]:8333 +[2a01:4f8:160:6092:d7bd:a39:3e52:b65d]:8333 +[2a01:4f8:160:60aa::2]:8333 [2a01:4f8:160:636e::2]:8333 -[2a01:4f8:160:74b2::2]:8333 -[2a01:4f8:161:2148::2]:8333 -[2a01:4f8:161:22e7::2]:8333 [2a01:4f8:161:6091::2]:8333 -[2a01:4f8:161:610c::2]:8333 -[2a01:4f8:161:9::2]:8333 -[2a01:4f8:162:128d::2]:8333 -[2a01:4f8:162:14ee::2]:8333 -[2a01:4f8:162:2108::2]:8333 +[2a01:4f8:161:6111::2]:8333 +[2a01:4f8:161:812e::2]:8333 +[2a01:4f8:162:2c6::2]:8333 [2a01:4f8:162:33ac::2]:8333 -[2a01:4f8:162:3462::2]:8333 -[2a01:4f8:162:4110::2]:8333 -[2a01:4f8:162:424c::2]:8333 [2a01:4f8:171:1c3::2]:8333 +[2a01:4f8:171:2bdc::2]:8333 [2a01:4f8:171:3248::2]:8333 +[2a01:4f8:171:4dc::2]:8333 +[2a01:4f8:171:d09::2]:8333 [2a01:4f8:171:d4a::2]:8333 -[2a01:4f8:172:1568::2]:8333 +[2a01:4f8:171:e0d::2]:8333 +[2a01:4f8:171:ecd::2]:8333 [2a01:4f8:172:1823::2]:8333 -[2a01:4f8:172:29ef::2]:8333 [2a01:4f8:173:1622::2]:8333 -[2a01:4f8:173:1c9c::2]:8333 -[2a01:4f8:173:294f::2]:8333 -[2a01:4f8:173:2d9c::2]:8333 -[2a01:4f8:190:24eb::2]:8333 -[2a01:4f8:190:528d::2]:8333 -[2a01:4f8:191:22ee::2]:8333 -[2a01:4f8:191:3068::2]:8333 -[2a01:4f8:191:40ef::2]:8333 -[2a01:4f8:191:60a5::2]:8333 -[2a01:4f8:191:81b7::2]:8333 -[2a01:4f8:192:1b2::2]:8333 -[2a01:4f8:192:34d0::2]:8333 -[2a01:4f8:192:4a5::2]:8333 +[2a01:4f8:190:50b6::2]:8333 +[2a01:4f8:190:5176::123]:8333 +[2a01:4f8:191:268::2]:8333 +[2a01:4f8:192:216c::2]:8333 [2a01:4f8:192:628a::83]:8333 +[2a01:4f8:1c0c:77af::1]:8333 [2a01:4f8:200:1012::2]:8333 -[2a01:4f8:200:24bb::2]:8333 -[2a01:4f8:200:32a6::2]:8333 [2a01:4f8:200:442d::2]:8333 -[2a01:4f8:200:6346::2]:8333 -[2a01:4f8:200:7222::2]:8333 -[2a01:4f8:200:90c3::2]:8333 -[2a01:4f8:201:4017::11]:8333 -[2a01:4f8:201:6016::2]:8333 -[2a01:4f8:202:3030::2]:8333 +[2a01:4f8:201:1113::2]:8333 +[2a01:4f8:201:4f0::2]:8333 +[2a01:4f8:201:53cc::2]:8333 +[2a01:4f8:201:8026::1337]:8333 +[2a01:4f8:201:8026::2]:8333 [2a01:4f8:202:32c6::2]:8333 -[2a01:4f8:202:53c3::2]:8333 -[2a01:4f8:202:7227::2]:8333 -[2a01:4f8:210:5488::2]:8333 -[2a01:4f8:211:13cf::2]:8333 -[2a01:4f8:211:1643::2]:8333 -[2a01:4f8:211:17c6::2]:8333 -[2a01:4f8:211:1e17::2]:8333 -[2a01:4f8:211:d99::133]:8333 +[2a01:4f8:211:309::2]:8333 [2a01:4f8:211:f08::2]:8333 [2a01:4f8:212:1e16::2]:8333 -[2a01:4f8:212:311::2]:8333 -[2a01:4f8:221:1384::2311]:8333 +[2a01:4f8:221:1808::2]:15000 +[2a01:4f8:221:2e18::2]:8333 +[2a01:4f8:221:2fcf::2]:8333 +[2a01:4f8:221:3441::2]:8333 +[2a01:4f8:221:3452::2]:8333 +[2a01:4f8:221:39c1::2]:8335 +[2a01:4f8:221:3c82::2]:8333 [2a01:4f8:221:3c82:fea1::666]:8333 +[2a01:4f8:221:6cd::2]:8333 [2a01:4f8:221:801::2]:8333 [2a01:4f8:221:f59::2]:8333 -[2a01:4f8:a0:108c::2]:8333 -[2a01:4f8:a0:2232::2]:8333 -[2a01:4f8:a0:4366::2]:8333 [2a01:4f8:a0:6147::2]:8333 -[2a01:4f8:a0:746a:101:1:1:2]:8333 -[2a01:4f8:a0:828a::2]:8333 -[2a01:4f8:a0:9163::2]:8333 -[2a01:4f8:b10:5009::2]:8333 -[2a01:4f8:c0c:10dc::2]:8333 -[2a01:4f8:c0c:1ff7::2]:8333 -[2a01:4f8:c0c:2262::2]:8333 -[2a01:4f8:c0c:354c::2]:8333 -[2a01:4f8:c0c:4242::2]:8333 -[2a01:4f8:c0c:4816::2]:8333 -[2a01:4f8:c0c:dcc::2]:8333 -[2a01:4f8:c17:24ee::2]:8333 -[2a01:4f8:c17:330f::2]:8333 -[2a01:4f8:c17:3b02::2]:8333 -[2a01:4f8:c17:5dc0::2]:8333 -[2a01:4f8:c17:67f8::2]:8333 -[2a01:4f8:c17:710b::2]:8333 -[2a01:4f8:c17:714::2]:8333 +[2a01:4f8:c0c:4268::2]:8333 +[2a01:4f8:c0c:56a5::2]:8333 [2a01:4f8:c17:e00::2]:8333 -[2a01:5c0:10:6eb1:89b8:bb58:25a:6050]:8333 -[2a01:680:10:10::1]:8333 -[2a01:6f0:ffff:120::8dcb]:8333 -[2a01:7a0:2:1374::4]:8333 -[2a01:7a0:2:1374::5]:8333 +[2a01:4f9:2a:10d4::2]:8333 +[2a01:4f9:2a:1827::2]:8333 +[2a01:4f9:2a:192c::2]:8333 +[2a01:4f9:2a:1c87::2]:8333 +[2a01:4f9:2a:2510::2]:8333 +[2a01:4f9:2a:2518::2]:8333 +[2a01:4f9:2a:2585::2]:8333 +[2a01:4f9:2a:2698::2]:8333 +[2a01:4f9:2a:2d0a::2]:8333 +[2a01:4f9:2a:2d17::2]:8333 +[2a01:4f9:2a:347::2]:8333 +[2a01:4f9:2a:650::2]:8333 +[2a01:4f9:2a:d54::2]:8333 +[2a01:4f9:c010:12e7::1]:8333 +[2a01:4f9:c010:1736::1]:8333 +[2a01:5d00:1:4b6:d2bf:9cff:fe45:b834]:8333 +[2a01:79c:cebe:70cc:1a03:73ff:fe48:e691]:8333 [2a01:7a0:2:1374::7]:8333 [2a01:7a7:2:1218:ec4:7aff:fe83:83c4]:8333 [2a01:7a7:2:1288:ea39:35ff:fef0:c429]:8333 -[2a01:7a7:2:155c:346c:8f5:719f:a6b6]:8333 -[2a01:7a7:2:1565:9484:509b:2a3b:a773]:8333 -[2a01:7c8:aaaa:373:5054:ff:feb3:2947]:8333 -[2a01:7c8:aab5:3e6:5054:ff:fed7:4e54]:8333 -[2a01:7c8:aaba:343::8333]:8333 -[2a01:7c8:aabd:3d5:5054:ff:fe95:f586]:8333 -[2a01:7c8:aac1:453:c50:fa3a:229:8504]:8333 -[2a01:7c8:aac7:5e:5054:ff:fee9:bdf7]:8333 +[2a01:7c8:aaba:18:5054:ff:fe2b:df20]:8333 +[2a01:7c8:fffa:50e:3035:741b:be02:b5de]:8333 [2a01:be00:10:201:0:80:cece:1]:8333 -[2a01:cb00:2ca:b700:2079:b33f:cf5a:5958]:8333 -[2a01:cb00:b3:d300:90fd:e3b1:28de:116c]:8333 +[2a01:cb00:5be:d500:227:eff:fe28:c565]:8333 +[2a01:cb00:b3:d300:9276:8a8c:74bf:2a88]:8333 [2a01:cb14:b8:a500:dd9d:80f5:d305:68f9]:8333 -[2a01:d0:0:1c::245]:8333 +[2a01:e0a:20:9120:7c3f:5643:9978:1825]:8333 [2a01:e0a:d:6ea0:56:deab:1b2f:300b]:8333 -[2a01:e34:ecfd:1910:58fb:c2ff:feac:571f]:8333 -[2a01:e34:eed7:6670:e150:6bb0:f11b:d6d8]:8333 -[2a01:e35:2433:e320:9c8e:6ff0:990f:f06e]:8333 -[2a01:e35:2ee5:610:21f:d0ff:fe4e:7460]:8333 -[2a01:e35:8be7:53d0:b8d5:de58:95b5:dd16]:8333 -[2a01:e35:8bff:70b0:1e1b:dff:fe0b:236d]:8333 -[2a02:1205:34c3:bae0:baae:edff:feea:9445]:8333 -[2a02:1205:5004:de00:c84:4a1:e760:cf90]:8333 -[2a02:1205:5076:ee00:d6c9:efff:fe65:fbfb]:8333 -[2a02:1205:c6be:84e0:ca2a:14ff:fe0b:803b]:8333 -[2a02:1206:45c3:be80:d4a4:3215:aaf0:85aa]:8333 -[2a02:120b:2c2a:5ec0:10dd:31ff:fe42:5079]:8333 -[2a02:120b:2c3f:3fc0:10dd:31ff:fe42:5079]:8333 -[2a02:121e:3e87:0:7d3a:fe09:b619:6b4b]:8333 -[2a02:168:420b:a::20]:8333 -[2a02:168:4a01::39]:8333 -[2a02:168:4a35:0:2e44:fdff:fe9a:46dc]:8333 +[2a01:e34:ec16:93f0:725d:d8d2:bb90:eabf]:8333 +[2a01:e34:ee33:1640:c418:3c3a:8ff6:3eab]:8333 +[2a01:e34:eed7:6670:28c0:183c:7783:7dc3]:8333 +[2a01:e35:2f7d:a0b0:59c2:3c8a:95a2:c4d1]:8333 +[2a01:e35:87ba:d0c0:75a2:9f39:efcb:f59f]:8333 +[2a02:120b:c3c5:cef0:ec82:a43d:4d6:dc2]:8333 +[2a02:120b:c3d1:f2d0:eea8:6bff:fefc:2265]:8333 +[2a02:168:404c:0:eea8:6bff:fef3:7d5c]:8333 [2a02:180:1:1::517:10b6]:8333 -[2a02:180:6:1::18]:8333 -[2a02:1810:1d13:7200:848b:c4c4:526b:e657]:8333 -[2a02:181f:0:2161:8f0:54b2:222c:b315]:8333 -[2a02:20c8:1422:1::a3]:8333 -[2a02:2168:80d:6e8::2]:8333 +[2a02:180:1:1::5b8f:538c]:8333 +[2a02:1b8:10:147::2]:8333 [2a02:2168:d05:2c00:216:3eff:fef7:a099]:8333 [2a02:2528:503:2::14]:8333 +[2a02:2528:fa:1400::1]:8333 +[2a02:2770:17:0:21a:4aff:fe7b:175f]:8333 +[2a02:2770:5:0:21a:4aff:fe44:8370]:8333 [2a02:2808:5401:0:225:90ff:fe4e:ee42]:8333 [2a02:390:9000:0:218:7dff:fe10:be33]:8333 -[2a02:7aa0:1201::bd4e:1219]:8333 +[2a02:750:7:c11:5054:ff:fe43:eb81]:8333 [2a02:7aa0:1619::590:eba2]:8333 -[2a02:7b40:50d0:e0d9::1]:8333 -[2a02:7b40:50d0:e335::1]:8333 -[2a02:7b40:c287:53af::1]:8333 -[2a02:7b40:d418:60c5::1]:8333 -[2a02:7b40:d418:6a84::1]:8333 +[2a02:7b40:3e4d:9ed9::1]:8333 +[2a02:7b40:50d1:e04f::1]:8333 +[2a02:7b40:5928:f9e::1]:8333 +[2a02:7b40:592f:a590::1]:8333 +[2a02:7b40:b0df:82fe::1]:8333 +[2a02:7b40:b0df:8925::1]:8333 +[2a02:7b40:b0df:8b41::1]:8333 +[2a02:7b40:b0df:8d57::1]:8333 +[2a02:7b40:d418:6fcd::1]:8333 +[2a02:8108:2340:1c18:7a:231e:1430:7f12]:8333 [2a02:8108:9c3f:dd18:922b:34ff:fe30:ac42]:8333 -[2a02:8109:9ac0:2a2b:707a:ad1a:70c:84a9]:8333 [2a02:810d:8a40:36f8:9af2:b3ff:fee8:6d7a]:8333 -[2a02:810d:9840:7e50::227]:8333 +[2a02:8388:e301:7180:201:2eff:fe82:b3cc]:8333 +[2a02:908:213:54a0:39bf:d4aa:60b2:d9c3]:8333 +[2a02:908:4f0:7e1c:5054:ff:feb7:ce4b]:8333 [2a02:930:1:0:250:56ff:fe8e:2819]:8333 -[2a02:c200:1:10:2:4:334:1]:8333 -[2a02:c200:1:10:2:5:227:1]:8333 -[2a02:c200:1:10:2:5:800:1]:8333 +[2a02:a80:0:2052::2]:8333 [2a02:c205:0:5145::1]:8333 [2a02:c205:2008:272::1]:8333 -[2a02:c205:2008:7160::1]:8333 -[2a02:c205:2009:7804::1]:8333 -[2a02:c205:2014:1981::1]:8333 -[2a02:c205:2014:3524::1]:8333 -[2a02:c205:2015:2475::1]:8333 +[2a02:c205:2010:6230::1]:8333 +[2a02:c205:2016:4327::1]:8333 +[2a02:c205:2017:2116::1]:8333 +[2a02:c205:2018:1754::1]:8333 +[2a02:c205:2018:8229::1]:8333 [2a02:c205:3002:2787::1]:8333 -[2a02:c207:2002:9013::1]:8333 +[2a02:c205:3002:6525::1]:8333 +[2a02:c207:0:3829::1]:8333 [2a02:c207:2007:4699::1]:8333 -[2a02:c207:2008:6519::1]:8333 [2a02:c207:2009:213::1]:8333 -[2a02:c207:2011:2583::1]:8333 -[2a02:c207:2012:263::1]:8333 -[2a02:c207:2012:2917::1]:8333 +[2a02:c207:2010:7751::1]:8333 [2a02:c207:2012:4826::1]:8333 -[2a02:c207:2013:3160::1]:8333 [2a02:c207:2014:4199::1]:8333 [2a02:c207:2014:5639::1]:8333 -[2a02:c207:2014:7160::1]:8333 -[2a02:c207:2014:8104::1]:8333 -[2a02:c207:2014:8536::1]:8333 -[2a02:c207:2014:9433::1]:8333 -[2a02:c207:2015:4997::1]:8333 +[2a02:c207:2014:9913::1]:18333 +[2a02:c207:2015:3799::1]:8333 +[2a02:c207:2015:3926::1]:8333 [2a02:c207:2015:5919::1]:8333 -[2a02:c207:3001:5824::1]:8333 -[2a02:c207:3001:7645::1]:8333 -[2a02:c207:3001:7776::1]:8333 +[2a02:c207:2015:6681::1]:8333 +[2a02:c207:2016:2394::1]:8333 +[2a02:c207:2016:9375::1]:8333 +[2a02:c207:2017:1988::1]:8333 +[2a02:c207:2017:3720::1]:8333 +[2a02:c207:2017:4486::1]:8333 +[2a02:c207:2017:4708::1]:8333 +[2a02:c207:2017:5828::1]:8333 +[2a02:c207:2017:7320::1]:8333 +[2a02:c207:2017:8175::1]:8333 +[2a02:c207:2017:8998::1]:8333 +[2a02:c207:2018:1462::1]:8333 +[2a02:c207:2018:3094::1]:8333 +[2a02:c207:2018:3275::1]:8333 +[2a02:c207:2018:3710::1]:8333 +[2a02:c207:2018:4790::1]:8333 +[2a02:c207:2018:7407::1]:8333 +[2a02:c207:2019:1067::1]:8333 +[2a02:c207:2019:1425::1]:8333 +[2a02:c207:2019:2041::1]:8333 +[2a02:c207:2019:248::1]:8333 +[2a02:c207:2019:3592::1]:8333 [2a02:c207:3001:9320::1]:8333 [2a02:c207:3002:1287::1]:8333 -[2a02:c207:3002:1532::1]:8333 -[2a02:c207:3002:2432::1]:8333 -[2a02:c207:3002:4431::1]:8333 -[2a02:c207:3002:809::1]:8333 -[2a02:c7f:7c2c:a800:428d:5cff:fe74:1455]:8333 -[2a02:c7f:d826:1901:20c:29ff:fe11:9d0e]:8333 +[2a02:c207:3002:4187::1]:8333 +[2a02:c207:3002:5642::1]:8333 +[2a02:c207:3002:7150::1]:8333 +[2a02:c207:3002:7222::1]:8333 +[2a02:c207:3002:7610::1]:8333 +[2a02:c207:3002:8456::1]:8333 [2a02:ce80:0:20::1]:8333 -[2a03:4000:2:496::8]:8333 -[2a03:7380:300:16::]:8333 -[2a03:7380:300:7:a19f:eb0b:ae0:6aad]:8333 -[2a03:b0c0:3:d0::1219:6001]:8333 +[2a02:e00:fff0:1b9::1]:8333 +[2a02:e00:fff0:1b9::a]:8333 +[2a02:e00:fff0:1e2::1]:8333 +[2a03:b0c0:1:d0::69:3001]:8333 +[2a03:b0c0:2:d0::3ba:b001]:8333 +[2a03:b0c0:2:d0::8ce:4001]:8333 +[2a03:b0c0:3:d0::116:5001]:8333 +[2a03:b0c0:3:d0::12a:1]:8333 [2a03:b0c0:3:d0::23fb:6001]:8333 +[2a03:b0c0:3:d0::409:1001]:8333 [2a03:b0c0:3:d0::44b8:9001]:8333 [2a03:b0c0:3:d0::44b8:a001]:8333 -[2a03:b0c0:3:d0::44b8:b001]:8333 [2a03:b0c0:3:d0::44b8:e001]:8333 [2a03:b0c0:3:d0::44b8:f001]:8333 [2a03:b0c0:3:d0::44b9:1]:8333 [2a03:b0c0:3:d0::44b9:1001]:8333 [2a03:b0c0:3:d0::44b9:2001]:8333 [2a03:b0c0:3:d0::44b9:4001]:8333 -[2a03:b0c0:3:d0::4:1]:8333 [2a03:b0c0:3:d0::5e48:d001]:8333 -[2a03:b0c0:3:d0::c7:f001]:8333 -[2a03:b0c0:3:d0::e9:f001]:8333 -[2a03:ff40:4ed1:1004:a236:9fff:feb4:f9f8]:8333 -[2a04:2180:0:2::94]:8333 -[2a04:2180:1:6:f000::14]:8333 -[2a04:52c0:101:122::496d]:8333 -[2a04:dbc3:fffe:0:e61f:13ff:fe95:8401]:8333 -[2a05:3580:d400:140d:da6e:826e:e771:4100]:8333 -[2a05:bec0:1:1:216:3eff:fe73:d20a]:8333 -[2a06:3d80:b:1:48b4:bedd:6964:54ac]:8333 -[2a06:3d80:b:1:ae1f:6bff:fe13:c13e]:8333 -[2a06:3d80:b:2:ae1f:6bff:fe13:c13e]:8333 -[2a06:3d80:b:2:ec4:7aff:fe96:b570]:8333 -[2a07:5740:600::14ad:9cec]:8333 -[2a07:5740:600::1b5:3082]:8333 -[2a07:5741:0:d8b::1]:8333 +[2a03:ee40:0:294:250:56ff:fe8d:4ad7]:8333 +[2a04:2180:1:c:f000::15]:8333 +[2a07:440:2000:20::ca0:1817]:8333 +[2a0a:c800:1:1::4]:8333 226eupdnaouu4h2v.onion:8333 -2ej5qoyruoeijadb.onion:8333 +23wdfqkzttmenvki.onion:8333 +2bfsxzluysybysnr.onion:8333 2f4xg7m3g6vtxqcd.onion:8333 -3ig6dutfdd6pkkw4.onion:8333 +2i5i6kvxoggngz67.onion:8333 +336lqgffb4tg5gpm.onion:8333 +342ouaetvqzgepjx.onion:8333 +3mutzniftca5w7ou.onion:8333 +3qpbpt4gkp3dxn2r.onion:8333 3r44ddzjitznyahw.onion:8333 +3xucqntxp5ddoaz5.onion:8333 +44walnmvlhcqa3c2.onion:8333 +4ehtdyvvzhbbo6c5.onion:8333 +4jekbh7cdlfda3ve.onion:8333 +4mewwo2bfxk6lg3f.onion:8333 53tsjt6zq3iasv5q.onion:8333 546esc6botbjfbxb.onion:8333 +55zzzsk7iqv6p3ew.onion:8333 +56stijc6kcgw6flk.onion:8333 5elzwcg4xysogalo.onion:8333 +5f4ysqk4eed4jcvj.onion:8333 +5k3oxus2laabmyip.onion:8333 +5ptuzplawb3svsos.onion:8333 +5rmpsrrdb3vpfgzh.onion:8333 +5wnkqzjzjehmq7hn.onion:8333 +5xxsqhppii22pges.onion:8333 5ygszbkbbauzjx7m.onion:8333 +5z2she4d6fvrdnme.onion:8333 64qrhyxglyjjhkne.onion:8333 -66ehyqkvke6td4fy.onion:8333 -6ruyo3kysvd27dlf.onion:8333 -6tr7cshvx5aymzth.onion:8333 -7nubu2wy3xizgwzu.onion:8333 -7nui6eestaw2f7xm.onion:8333 -7qg6jdmahfxamay5.onion:8333 -ab7ftdfw6qhdx3re.onion:8333 +6kn76kajckqg22ao.onion:8333 +6m2iqgnqjxh7ulyk.onion:8333 +6wcfnbb3vmaw6cwa.onion:8333 +6zynxbbupfmnvc3g.onion:8333 +7sns7raurpmllybi.onion:8333 +7whaszg22pdkvfck.onion:8333 +a3a6plzycomx5gqw.onion:8333 +acs7hylaadjkt7mk.onion:8333 +agpwcvixadbinyet.onion:8333 ajqvsylg5xd5vs3y.onion:8333 -alhlegtjkdmbqsvt.onion:8333 +aktfeaqkbnk52bfx.onion:8333 +albsennsmbsgxls3.onion:8333 +alruzrdz7xcek67f.onion:8333 +am6aq3dluz3njcnt.onion:8333 +aoefyxgnpgaiw2xg.onion:8333 +ap2frg2maqxpmkkd.onion:8333 +ap4zz4imxbdl6plr.onion:8333 +apbbvhk32myudnyy.onion:8333 +arlocvowxtnlbpo3.onion:8333 b5d6etfljm2lje5y.onion:8333 -b7xer7moeiiz56cp.onion:8333 +bdwvcwafzpssqckj.onion:8333 brwqezn6le54w2bb.onion:8333 -bup5n5e3kurvjzf3.onion:8333 -bvay66ezgxwo7wj4.onion:8333 -cgk4u2lxrvml4jvb.onion:8333 +bxxvkb7czrxtvz2c.onion:8333 +c2tpqkaz4ihjzwgb.onion:8333 +cgcv32rbbbjyyzow.onion:8333 +ckkqplgkzof45h2y.onion:8333 cpyfqbs4fs3vnbpf.onion:8333 +ctzuzxnvla5xvb7z.onion:8333 +cw4iqvcdy67b5tpw.onion:8333 cyvpgt25274i5b7c.onion:8333 -d26tupmbhdjmxzwm.onion:8333 -d6wubsdtr46dd5ki.onion:8333 -dekj4wacywpqsad3.onion:8333 -dqpxwlpnv3z3hznl.onion:8333 -dsrwqwijtsvi4dfk.onion:42434 -dxkmtmwiq7ddtgul.onion:8333 +dmudsr7x7edvyglt.onion:8333 +dsbn53f2dwphv5mx.onion:8333 +dssqdj6pxnzkth6i.onion:8333 e3zbephvcqmzcqkr.onion:8333 -eab5op3z24n7eqd5.onion:8333 -ejcqevujcqltqn7d.onion:8333 +e63i7c7qazbdtjma.onion:8333 +eiuaj2qjvbn737ph.onion:8333 ep2mjzox3kvb6ax4.onion:8333 -f34cshhal2nuljsc.onion:8333 +eyvfxeefr4eokefr.onion:8333 f3nfioh27j2xlfe5.onion:8333 -f6h7ukyyiczlyvml.onion:8333 +f5ezxphghknfbrtg.onion:8333 faewczjuzs4wfxhv.onion:8333 -fnk3dioogxals7r4.onion:8333 -hahhloezyfqh3hci.onion:8333 -ifruqn4x7nbn5pba.onion:8333 +fefisckqu5raqe3c.onion:8333 +fgbss353vsvandn7.onion:8333 +fnlkrowsyrfeub6s.onion:8333 +fno4aakpl6sg6y47.onion:8333 +fnpnjdk24pzgcplx.onion:8333 +foe4ymjz4hjhowud.onion:8333 +fql436nz7qdis3nk.onion:8333 +frhfucww5vghf7cv.onion:8333 +frrxefv5dir5hm7l.onion:8333 +fuckerolyuv7ebla.onion:8333 +fz6nsij6jiyuwlsc.onion:8333 +g4qfwcu5wm7ze5lg.onion:8333 +gb5ypqt63du3wfhn.onion:8333 +gcydj5id3jcxybzr.onion:8333 +gfvnnnwcddfzosav.onion:8333 +golevvyaydsduuw2.onion:8333 +gq4su6stjnosqu67.onion:8333 +hb4oreglor5x3xoa.onion:8333 +hbuair37dxnblurw.onion:8333 +hda7fvzq3voh7mu6.onion:8333 +hnvk3pgvieyixyc2.onion:8333 +ifwxwunja4pgwydg.onion:8333 ijmbmziunbszzxtj.onion:8333 -imperialnza3tqgh.onion:8333 in7r5ieo7ogkxbne.onion:8333 -iuenlcarsnsstiix.onion:8333 +inysvhakrulg6lts.onion:8333 +iwrwbwss7lfalfg4.onion:8333 +ja7dmgkri7fi47xk.onion:8333 jtksnokusbzms7wl.onion:8333 -k6cpe3hatrrxvnz6.onion:8333 +jwxyqhp42cmwhqf3.onion:8333 +jxrfatqtcevzwywz.onion:8333 +jy6mvzb2ntutiye6.onion:8333 +jydquxzliej6dm24.onion:8333 +k2gdzvryrx7v6ksw.onion:8333 +kkdas3qebkosygu5.onion:8333 kswfyurnglm65u7b.onion:8333 -kvd44sw7skb5folw.onion:8333 l2pruzr3mnhieuug.onion:8333 -l5oddj46pvoddzd4.onion:8333 +lgkgcd4brjmhrqna.onion:8333 lgkvbvro67jomosw.onion:8333 -loflfbxumxm55biq.onion:8333 -m6jrhrqvjbnzla3r.onion:8333 +llljnatksfgtlhko.onion:8333 +mdpt6w5sjwcnxtwy.onion:8333 +mhjcepzc4gyadw2w.onion:8333 +mn744hbioayn3ojs.onion:8333 +mpakpgzu7umgu3ze.onion:8333 mvomwfdddqfqg3lq.onion:8333 -o4dfb6tp33ff2lq7.onion:8333 -o4sl5na6jeqgi3l6.onion:8333 +mx5kdfxwowc3ymzg.onion:8333 +n4m32zcp5hvomkt4.onion:8333 +n73steqcmjz5hwni.onion:8333 +nc2bgkhqohrmwbxr.onion:8333 +nc6zlswwqqg7c5yz.onion:8333 +nrrfwdmrm3imuebn.onion:8333 +nrrmkgmulpgsbwlt.onion:8333 +o2tku2dbsd6iumch.onion:8333 o72zyzrv77ea2bwu.onion:8333 -omts4ofhwqjdulr6.onion:8333 -pbnlp7m4kujma6iz.onion:8333 +ohgwa5y65z4eem7b.onion:8333 +olvdu57g7rxwpcr4.onion:8333 +onlzo775ogdpjn5x.onion:8333 +otshttbd6v2k3jlz.onion:8333 +owr5tm7ygw62z4vl.onion:8333 pcfhsdqzs6q63ryu.onion:8333 +pffwqxvuldeq55zc.onion:8333 +pgnz7kwc36rcucpu.onion:8333 +ph4g7b4jsyuntvr4.onion:8333 pjghcivzkoersesd.onion:8333 -pz2x5nfhjipshaz3.onion:8333 +pu7w3jfyrzp7sxsi.onion:8333 +pxvkjp6sfb2f7foe.onion:8333 qaxm5spmx5d2k3up.onion:8333 qepth54daysmpy5y.onion:8333 -qgw4jb6yikp44ypa.onion:8333 qj6irqn2i73edff5.onion:8333 -qlv6py6hdtzipntn.onion:8333 -qv4hq75asyitkmas.onion:8333 -r3dsojfhwcm7x7p6.onion:8333 -rjacws757ai66lre.onion:8333 -seoskudzk6vn6mqz.onion:8333 -smtmhcewuv6tjynv.onion:8333 -stil3scvqbvhowvb.onion:8333 -tchop676j6yppwwm.onion:8333 +qjpejfzlwqqnzsol.onion:8333 +qxe3bqjmrcepxpx4.onion:8333 +rlonjm7ui6fdyz4h.onion:8333 +rs635ss24ymwyqkw.onion:8333 +sgiitogeoqslvkjv.onion:8333 +spidernetimmmkth.onion:8333 +tb7qlicrt6rdzxzd.onion:8333 +thbjka62axzuwtnt.onion:8333 toguvy5upyuctudx.onion:8333 -tpx4jan5n2a2cci2.onion:8333 -trrtyp3sirmwttyu.onion:8333 u7mpvxotmnqntyn5.onion:8333 +uccmw67l4kgl646y.onion:8333 ueo6royc3775ioq7.onion:8333 -vev3n5fxfrtqj6e5.onion:8333 -visevrizz3quyagj.onion:8333 -vnzfcobvaqahooun.onion:8333 -w2dtur5kugapw3rp.onion:8333 +ujsb2qcjk4t6234z.onion:8333 +uub43p3artmornv5.onion:8333 +uvb55mwvuy22mgm2.onion:8333 +uzzyjgqlf47ackbr.onion:8333 +v5fgr3fnz3nw663t.onion:8333 +v5zs2sgjyr3glh6c.onion:8333 +vk3qjdehyy4dwcxw.onion:8333 +voy6xbvejox4xbax.onion:8333 +vuiw75kgpcqke4mv.onion:8333 +w3q47ucyajtfic76.onion:8333 wg6vwmbrzyyzapun.onion:8333 -wmxc6ask4a5xyaxh.onion:8333 -xz3bsfhiqucn37gd.onion:8333 -ypzld2xyidu6ymqc.onion:8333 +wgpfwxgy2dowienn.onion:8333 +wjtmvsznvdclncau.onion:8333 +xab45bpmmrl5g3by.onion:8333 +xdlu3ujzieheouo7.onion:8333 +xgykmaa2jjay7cfu.onion:8333 +xnlu3tvakngy7tkp.onion:8333 +xsn5icce45gs3qy7.onion:8333 +ydonogjpjd3me45v.onion:8333 +ykn7vof37bavxetd.onion:8333 +yl525dwhvqis7ryc.onion:8333 +yrbaccpbyge6xaba.onion:8333 yyuxafli7fqdizhq.onion:8333 -ziew7smr2dl2hg2q.onion:8333 -zsq5qogtoshzkqad.onion:8333 +z33nukt7ngik3cpe.onion:8333 +zon2bbc2q2ihqt4c.onion:8333 +zqjvtxskxonu4kzv.onion:8333 diff --git a/contrib/testgen/base58.py b/contrib/testgen/base58.py index 071bc722b0..da67cb2d90 100644 --- a/contrib/testgen/base58.py +++ b/contrib/testgen/base58.py @@ -1,4 +1,4 @@ -# Copyright (c) 2012-2017 The Bitcoin Core developers +# Copyright (c) 2012-2018 The Bitcoin Core developers # Distributed under the MIT software license, see the accompanying # file COPYING or http://www.opensource.org/licenses/mit-license.php. ''' diff --git a/contrib/testgen/gen_base58_test_vectors.py b/contrib/testgen/gen_base58_test_vectors.py index de15657d27..c76de5ce75 100755 --- a/contrib/testgen/gen_base58_test_vectors.py +++ b/contrib/testgen/gen_base58_test_vectors.py @@ -1,5 +1,5 @@ #!/usr/bin/env python3 -# Copyright (c) 2012-2017 The Bitcoin Core developers +# Copyright (c) 2012-2018 The Bitcoin Core developers # Distributed under the MIT software license, see the accompanying # file COPYING or http://www.opensource.org/licenses/mit-license.php. ''' diff --git a/contrib/zmq/zmq_sub.py b/contrib/zmq/zmq_sub.py index fa9e669308..20763e935d 100644 --- a/contrib/zmq/zmq_sub.py +++ b/contrib/zmq/zmq_sub.py @@ -1,5 +1,5 @@ #!/usr/bin/env python3 -# Copyright (c) 2014-2017 The Bitcoin Core developers +# Copyright (c) 2014-2018 The Bitcoin Core developers # Distributed under the MIT software license, see the accompanying # file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/contrib/zmq/zmq_sub3.4.py b/contrib/zmq/zmq_sub3.4.py index d05ecc2623..7e608c1a50 100644 --- a/contrib/zmq/zmq_sub3.4.py +++ b/contrib/zmq/zmq_sub3.4.py @@ -1,5 +1,5 @@ #!/usr/bin/env python3 -# Copyright (c) 2014-2017 The Bitcoin Core developers +# Copyright (c) 2014-2018 The Bitcoin Core developers # Distributed under the MIT software license, see the accompanying # file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/depends/packages/libX11.mk b/depends/packages/libX11.mk index 178d592ee6..298616bea4 100644 --- a/depends/packages/libX11.mk +++ b/depends/packages/libX11.mk @@ -10,6 +10,10 @@ $(package)_config_opts=--disable-xkb --disable-static $(package)_config_opts_linux=--with-pic endef +define $(package)_preprocess_cmds + cp -f $(BASEDIR)/config.guess $(BASEDIR)/config.sub . +endef + define $(package)_config_cmds $($(package)_autoconf) endef diff --git a/depends/packages/libXau.mk b/depends/packages/libXau.mk index e87df2e4de..304494e3c5 100644 --- a/depends/packages/libXau.mk +++ b/depends/packages/libXau.mk @@ -10,6 +10,10 @@ define $(package)_set_vars $(package)_config_opts_linux=--with-pic endef +define $(package)_preprocess_cmds + cp -f $(BASEDIR)/config.guess $(BASEDIR)/config.sub . +endef + define $(package)_config_cmds $($(package)_autoconf) endef diff --git a/depends/packages/libXext.mk b/depends/packages/libXext.mk index 4db836066f..c0565dd672 100644 --- a/depends/packages/libXext.mk +++ b/depends/packages/libXext.mk @@ -9,6 +9,10 @@ define $(package)_set_vars $(package)_config_opts=--disable-static endef +define $(package)_preprocess_cmds + cp -f $(BASEDIR)/config.guess $(BASEDIR)/config.sub . +endef + define $(package)_config_cmds $($(package)_autoconf) endef diff --git a/depends/packages/libxcb.mk b/depends/packages/libxcb.mk index 28f2bd6f25..3f346d9728 100644 --- a/depends/packages/libxcb.mk +++ b/depends/packages/libxcb.mk @@ -10,6 +10,7 @@ $(package)_config_opts=--disable-static endef define $(package)_preprocess_cmds + cp -f $(BASEDIR)/config.guess $(BASEDIR)/config.sub build-aux &&\ sed "s/pthread-stubs//" -i configure endef diff --git a/depends/packages/packages.mk b/depends/packages/packages.mk index 69acb19b8f..5fe6f98da2 100644 --- a/depends/packages/packages.mk +++ b/depends/packages/packages.mk @@ -3,9 +3,7 @@ packages:=boost openssl libevent zeromq qt_native_packages = native_protobuf qt_packages = qrencode protobuf zlib -qt_x86_64_linux_packages:=qt expat dbus libxcb xcb_proto libXau xproto freetype fontconfig libX11 xextproto libXext xtrans -qt_i686_linux_packages:=$(qt_x86_64_linux_packages) -qt_arm_linux_packages:=$(qt_x86_64_linux_packages) +qt_linux_packages:=qt expat dbus libxcb xcb_proto libXau xproto freetype fontconfig libX11 xextproto libXext xtrans qt_darwin_packages=qt qt_mingw32_packages=qt diff --git a/depends/packages/protobuf.mk b/depends/packages/protobuf.mk index 54d3fd9245..d201d1183f 100644 --- a/depends/packages/protobuf.mk +++ b/depends/packages/protobuf.mk @@ -11,6 +11,11 @@ define $(package)_set_vars $(package)_config_opts_linux=--with-pic endef +define $(package)_preprocess_cmds + cp -f $(BASEDIR)/config.guess $(BASEDIR)/config.sub . &&\ + cp -f $(BASEDIR)/config.guess $(BASEDIR)/config.sub gtest/build-aux +endef + define $(package)_config_cmds $($(package)_autoconf) endef diff --git a/depends/packages/qrencode.mk b/depends/packages/qrencode.mk index 44fdf1c295..313e4adf2a 100644 --- a/depends/packages/qrencode.mk +++ b/depends/packages/qrencode.mk @@ -9,6 +9,10 @@ $(package)_config_opts=--disable-shared -without-tools --disable-sdltest $(package)_config_opts_linux=--with-pic endef +define $(package)_preprocess_cmds + cp -f $(BASEDIR)/config.guess $(BASEDIR)/config.sub use +endef + define $(package)_config_cmds $($(package)_autoconf) endef diff --git a/depends/packages/qt.mk b/depends/packages/qt.mk index 7fdd7612c3..5286f89c30 100644 --- a/depends/packages/qt.mk +++ b/depends/packages/qt.mk @@ -8,7 +8,7 @@ $(package)_dependencies=openssl zlib $(package)_linux_dependencies=freetype fontconfig libxcb libX11 xproto libXext $(package)_build_subdir=qtbase $(package)_qt_libs=corelib network widgets gui plugins testlib -$(package)_patches=fix_qt_pkgconfig.patch mac-qmake.conf fix_configure_mac.patch fix_no_printer.patch fix_rcc_determinism.patch +$(package)_patches=fix_qt_pkgconfig.patch mac-qmake.conf fix_configure_mac.patch fix_no_printer.patch fix_rcc_determinism.patch fix_riscv64_arch.patch xkb-default.patch $(package)_qttranslations_file_name=qttranslations-$($(package)_suffix) $(package)_qttranslations_sha256_hash=9822084f8e2d2939ba39f4af4c0c2320e45d5996762a9423f833055607604ed8 @@ -83,7 +83,7 @@ $(package)_config_opts_darwin += -device-option MAC_TARGET=$(host) $(package)_config_opts_darwin += -device-option MAC_LD64_VERSION=$(LD64_VERSION) endif -$(package)_config_opts_linux = -qt-xkbcommon +$(package)_config_opts_linux = -qt-xkbcommon-x11 $(package)_config_opts_linux += -qt-xcb $(package)_config_opts_linux += -system-freetype $(package)_config_opts_linux += -no-feature-sessionmanager @@ -92,6 +92,8 @@ $(package)_config_opts_linux += -no-opengl $(package)_config_opts_arm_linux += -platform linux-g++ -xplatform bitcoin-linux-g++ $(package)_config_opts_i686_linux = -xplatform linux-g++-32 $(package)_config_opts_x86_64_linux = -xplatform linux-g++-64 +$(package)_config_opts_aarch64_linux = -xplatform linux-aarch64-gnu-g++ +$(package)_config_opts_riscv64_linux = -platform linux-g++ -xplatform bitcoin-linux-g++ $(package)_config_opts_mingw32 = -no-opengl -xplatform win32-g++ -device-option CROSS_COMPILE="$(host)-" $(package)_build_env = QT_RCC_TEST=1 $(package)_build_env += QT_RCC_SOURCE_DATE_OVERRIDE=1 @@ -135,9 +137,11 @@ define $(package)_preprocess_cmds patch -p1 -i $($(package)_patch_dir)/fix_configure_mac.patch &&\ patch -p1 -i $($(package)_patch_dir)/fix_no_printer.patch &&\ patch -p1 -i $($(package)_patch_dir)/fix_rcc_determinism.patch &&\ + patch -p1 -i $($(package)_patch_dir)/xkb-default.patch &&\ echo "!host_build: QMAKE_CFLAGS += $($(package)_cflags) $($(package)_cppflags)" >> qtbase/mkspecs/common/gcc-base.conf && \ echo "!host_build: QMAKE_CXXFLAGS += $($(package)_cxxflags) $($(package)_cppflags)" >> qtbase/mkspecs/common/gcc-base.conf && \ echo "!host_build: QMAKE_LFLAGS += $($(package)_ldflags)" >> qtbase/mkspecs/common/gcc-base.conf && \ + patch -p1 -i $($(package)_patch_dir)/fix_riscv64_arch.patch &&\ echo "QMAKE_LINK_OBJECT_MAX = 10" >> qtbase/mkspecs/win32-g++/qmake.conf &&\ echo "QMAKE_LINK_OBJECT_SCRIPT = object_script" >> qtbase/mkspecs/win32-g++/qmake.conf &&\ sed -i.old "s|QMAKE_CFLAGS = |!host_build: QMAKE_CFLAGS = $($(package)_cflags) $($(package)_cppflags) |" qtbase/mkspecs/win32-g++/qmake.conf && \ diff --git a/depends/packages/xextproto.mk b/depends/packages/xextproto.mk index 98a11eb497..7065237bd5 100644 --- a/depends/packages/xextproto.mk +++ b/depends/packages/xextproto.mk @@ -4,6 +4,10 @@ $(package)_download_path=http://xorg.freedesktop.org/releases/individual/proto $(package)_file_name=$(package)-$($(package)_version).tar.bz2 $(package)_sha256_hash=f3f4b23ac8db9c3a9e0d8edb591713f3d70ef9c3b175970dd8823dfc92aa5bb0 +define $(package)_preprocess_cmds + cp -f $(BASEDIR)/config.guess $(BASEDIR)/config.sub . +endef + define $(package)_set_vars $(package)_config_opts=--disable-shared endef diff --git a/depends/packages/xproto.mk b/depends/packages/xproto.mk index 50a90b2685..5328ec8481 100644 --- a/depends/packages/xproto.mk +++ b/depends/packages/xproto.mk @@ -8,6 +8,10 @@ define $(package)_set_vars $(package)_config_opts=--disable-shared endef +define $(package)_preprocess_cmds + cp -f $(BASEDIR)/config.guess $(BASEDIR)/config.sub . +endef + define $(package)_config_cmds $($(package)_autoconf) endef diff --git a/depends/packages/xtrans.mk b/depends/packages/xtrans.mk index 99eefa6d5e..c313b1f609 100644 --- a/depends/packages/xtrans.mk +++ b/depends/packages/xtrans.mk @@ -9,6 +9,10 @@ define $(package)_set_vars $(package)_config_opts_linux=--with-pic --disable-static endef +define $(package)_preprocess_cmds + cp -f $(BASEDIR)/config.guess $(BASEDIR)/config.sub . +endef + define $(package)_config_cmds $($(package)_autoconf) endef diff --git a/depends/patches/qt/fix_riscv64_arch.patch b/depends/patches/qt/fix_riscv64_arch.patch new file mode 100644 index 0000000000..e7f29f01f9 --- /dev/null +++ b/depends/patches/qt/fix_riscv64_arch.patch @@ -0,0 +1,14 @@ +diff --git a/qtbase/src/3rdparty/double-conversion/include/double-conversion/utils.h b/qtbase/src/3rdparty/double-conversion/include/double-conversion/utils.h +index 20bfd36..93729fa 100644 +--- a/qtbase/src/3rdparty/double-conversion/include/double-conversion/utils.h ++++ b/qtbase/src/3rdparty/double-conversion/include/double-conversion/utils.h +@@ -65,7 +65,8 @@ + defined(__sparc__) || defined(__sparc) || defined(__s390__) || \ + defined(__SH4__) || defined(__alpha__) || \ + defined(_MIPS_ARCH_MIPS32R2) || \ +- defined(__AARCH64EL__) ++ defined(__AARCH64EL__) || defined(__aarch64__) || \ ++ defined(__riscv) + #define DOUBLE_CONVERSION_CORRECT_DOUBLE_OPERATIONS 1 + #elif defined(_M_IX86) || defined(__i386__) || defined(__i386) + #if defined(_WIN32) diff --git a/depends/patches/qt/xkb-default.patch b/depends/patches/qt/xkb-default.patch new file mode 100644 index 0000000000..165abf3e2e --- /dev/null +++ b/depends/patches/qt/xkb-default.patch @@ -0,0 +1,26 @@ +--- old/qtbase/src/gui/configure.pri 2018-06-06 17:28:10.000000000 -0400 ++++ new/qtbase/src/gui/configure.pri 2018-08-17 18:43:01.589384567 -0400 +@@ -43,18 +43,11 @@ + } + + defineTest(qtConfTest_xkbConfigRoot) { +- qtConfTest_getPkgConfigVariable($${1}): return(true) +- +- for (dir, $$list("/usr/share/X11/xkb", "/usr/local/share/X11/xkb")) { +- exists($$dir) { +- $${1}.value = $$dir +- export($${1}.value) +- $${1}.cache += value +- export($${1}.cache) +- return(true) +- } +- } +- return(false) ++ $${1}.value = "/usr/share/X11/xkb" ++ export($${1}.value) ++ $${1}.cache += value ++ export($${1}.cache) ++ return(true) + } + + defineTest(qtConfTest_qpaDefaultPlatform) { diff --git a/doc/README.md b/doc/README.md index 45762b2374..5ffff825b4 100644 --- a/doc/README.md +++ b/doc/README.md @@ -9,7 +9,7 @@ To download Bitcoin Core, visit [bitcoincore.org](https://bitcoincore.org/en/rel Running --------------------- -The following are some helpful notes on how to run Bitcoin on your native platform. +The following are some helpful notes on how to run Bitcoin Core on your native platform. ### Unix @@ -24,7 +24,7 @@ Unpack the files into a directory, and then run bitcoin-qt.exe. ### macOS -Drag Bitcoin-Core to your applications folder, and then run Bitcoin-Core. +Drag Bitcoin Core to your applications folder, and then run Bitcoin Core. ### Need Help? @@ -35,7 +35,7 @@ for help and more information. Building --------------------- -The following are developer notes on how to build Bitcoin on your native platform. They are not complete guides, but include notes on the necessary libraries, compile flags, etc. +The following are developer notes on how to build Bitcoin Core on your native platform. They are not complete guides, but include notes on the necessary libraries, compile flags, etc. - [Dependencies](dependencies.md) - [macOS Build Notes](build-osx.md) diff --git a/doc/benchmarking.md b/doc/benchmarking.md index 99d36cb226..48f81cf6c1 100644 --- a/doc/benchmarking.md +++ b/doc/benchmarking.md @@ -2,7 +2,7 @@ Benchmarking ============ Bitcoin Core has an internal benchmarking framework, with benchmarks -for cryptographic algorithms such as SHA1, SHA256, SHA512 and RIPEMD160. As well as the rolling bloom filter. +for cryptographic algorithms (e.g. SHA1, SHA256, SHA512, RIPEMD160), as well as the rolling bloom filter. Running --------------------- diff --git a/doc/bips.md b/doc/bips.md index eb29b036cc..76edc94c29 100644 --- a/doc/bips.md +++ b/doc/bips.md @@ -13,7 +13,7 @@ BIPs that are implemented by Bitcoin Core (up-to-date up to **v0.17.0**): * [`BIP 32`](https://github.com/bitcoin/bips/blob/master/bip-0032.mediawiki): Hierarchical Deterministic Wallets has been implemented since **v0.13.0** ([PR #8035](https://github.com/bitcoin/bitcoin/pull/8035)). * [`BIP 34`](https://github.com/bitcoin/bips/blob/master/bip-0034.mediawiki): The rule that requires blocks to contain their height (number) in the coinbase input, and the introduction of version 2 blocks has been implemented since **v0.7.0**. The rule took effect for version 2 blocks as of *block 224413* (March 5th 2013), and version 1 blocks are no longer allowed since *block 227931* (March 25th 2013) ([PR #1526](https://github.com/bitcoin/bitcoin/pull/1526)). * [`BIP 35`](https://github.com/bitcoin/bips/blob/master/bip-0035.mediawiki): The 'mempool' protocol message (and the protocol version bump to 60002) has been implemented since **v0.7.0** ([PR #1641](https://github.com/bitcoin/bitcoin/pull/1641)). -* [`BIP 37`](https://github.com/bitcoin/bips/blob/master/bip-0037.mediawiki): The bloom filtering for transaction relaying, partial merkle trees for blocks, and the protocol version bump to 70001 (enabling low-bandwidth SPV clients) has been implemented since **v0.8.0** ([PR #1795](https://github.com/bitcoin/bitcoin/pull/1795)). +* [`BIP 37`](https://github.com/bitcoin/bips/blob/master/bip-0037.mediawiki): The bloom filtering for transaction relaying, partial Merkle trees for blocks, and the protocol version bump to 70001 (enabling low-bandwidth SPV clients) has been implemented since **v0.8.0** ([PR #1795](https://github.com/bitcoin/bitcoin/pull/1795)). * [`BIP 42`](https://github.com/bitcoin/bips/blob/master/bip-0042.mediawiki): The bug that would have caused the subsidy schedule to resume after block 13440000 was fixed in **v0.9.2** ([PR #3842](https://github.com/bitcoin/bitcoin/pull/3842)). * [`BIP 61`](https://github.com/bitcoin/bips/blob/master/bip-0061.mediawiki): The 'reject' protocol message (and the protocol version bump to 70002) was added in **v0.9.0** ([PR #3185](https://github.com/bitcoin/bitcoin/pull/3185)). Starting *v0.17.0*, whether to send reject messages can be configured with the `-enablebip61` option. * [`BIP 65`](https://github.com/bitcoin/bips/blob/master/bip-0065.mediawiki): The CHECKLOCKTIMEVERIFY softfork was merged in **v0.12.0** ([PR #6351](https://github.com/bitcoin/bitcoin/pull/6351)), and backported to **v0.11.2** and **v0.10.4**. Mempool-only CLTV was added in [PR #6124](https://github.com/bitcoin/bitcoin/pull/6124). diff --git a/doc/build-osx.md b/doc/build-osx.md index 486a505b60..448918e8cb 100644 --- a/doc/build-osx.md +++ b/doc/build-osx.md @@ -41,14 +41,14 @@ from the root of the repository. Build Bitcoin Core ------------------------ -1. Clone the bitcoin source code and cd into `bitcoin` +1. Clone the Bitcoin Core source code and cd into `bitcoin` git clone https://github.com/bitcoin/bitcoin cd bitcoin -2. Build bitcoin-core: +2. Build Bitcoin Core: - Configure and build the headless bitcoin binaries as well as the GUI (if Qt is found). + Configure and build the headless Bitcoin Core binaries as well as the GUI (if Qt is found). You can disable the GUI build by passing `--without-gui` to configure. @@ -69,7 +69,7 @@ Running Bitcoin Core is now available at `./src/bitcoind` -Before running, it's recommended you create an RPC configuration file. +Before running, it's recommended that you create an RPC configuration file. echo -e "rpcuser=bitcoinrpc\nrpcpassword=$(xxd -l 16 -p /dev/urandom)" > "/Users/${USER}/Library/Application Support/Bitcoin/bitcoin.conf" diff --git a/doc/build-unix.md b/doc/build-unix.md index d9208fed54..a01ff59fa6 100644 --- a/doc/build-unix.md +++ b/doc/build-unix.md @@ -6,7 +6,7 @@ Some notes on how to build Bitcoin Core in Unix. Note --------------------- -Always use absolute paths to configure and compile bitcoin and the dependencies, +Always use absolute paths to configure and compile Bitcoin Core and the dependencies, for example, when specifying the path of the dependency: ../dist/configure --enable-cxx --disable-shared --with-pic --prefix=$BDB_PREFIX @@ -99,7 +99,7 @@ ZMQ dependencies (provides ZMQ API 4.x): #### Dependencies for the GUI -If you want to build Bitcoin-Qt, make sure that the required packages for Qt development +If you want to build bitcoin-qt, make sure that the required packages for Qt development are installed. Qt 5 is necessary to build the GUI. To build without GUI pass `--without-gui`. @@ -178,7 +178,7 @@ If you need to build Boost yourself: Security -------- -To help make your bitcoin installation more secure by making certain attacks impossible to +To help make your Bitcoin Core installation more secure by making certain attacks impossible to exploit even if a vulnerability is found, binaries are hardened by default. This can be disabled with: @@ -194,7 +194,7 @@ Hardening enables the following features: Build position independent code to take advantage of Address Space Layout Randomization offered by some kernels. Attackers who can cause execution of code at an arbitrary memory location are thwarted if they don't know where anything useful is located. - The stack and heap are randomly located by default but this allows the code section to be + The stack and heap are randomly located by default, but this allows the code section to be randomly located as well. On an AMD64 processor where a library was not compiled with -fPIC, this will cause an error @@ -210,8 +210,8 @@ Hardening enables the following features: ET_DYN * Non-executable Stack - If the stack is executable then trivial stack based buffer overflow exploits are possible if - vulnerable buffers are found. By default, bitcoin should be built with a non-executable stack + If the stack is executable then trivial stack-based buffer overflow exploits are possible if + vulnerable buffers are found. By default, Bitcoin Core should be built with a non-executable stack, but if one of the libraries it uses asks for an executable stack or someone makes a mistake and uses a compiler extension which requires an executable stack, it will silently build an executable without the non-executable stack protection. @@ -219,7 +219,7 @@ Hardening enables the following features: To verify that the stack is non-executable after compiling use: `scanelf -e ./bitcoin` - the output should contain: + The output should contain: STK/REL/PTL RW- R-- RW- @@ -227,7 +227,7 @@ Hardening enables the following features: Disable-wallet mode -------------------- -When the intention is to run only a P2P node without a wallet, bitcoin may be compiled in +When the intention is to run only a P2P node without a wallet, Bitcoin Core may be compiled in disable-wallet mode with: ./configure --disable-wallet diff --git a/doc/build-windows.md b/doc/build-windows.md index 935e29ce1c..12adadacdc 100644 --- a/doc/build-windows.md +++ b/doc/build-windows.md @@ -10,7 +10,7 @@ and is the platform used to build the Bitcoin Core Windows release binaries. * On Windows using [Windows Subsystem for Linux (WSL)](https://msdn.microsoft.com/commandline/wsl/about) and the Mingw-w64 cross compiler tool chain. -Other options which may work but which have not been extensively tested are (please contribute instructions): +Other options which may work, but which have not been extensively tested are (please contribute instructions): * On Windows using a POSIX compatibility layer application such as [cygwin](http://www.cygwin.com/) or [msys2](http://www.msys2.org/). * On Windows using a native compiler tool chain such as [Visual Studio](https://www.visualstudio.com). @@ -46,7 +46,7 @@ To install WSL on Windows 10 with Fall Creators Update installed (version >= 162 After the bash shell is active, you can follow the instructions below, starting with the "Cross-compilation" section. Compiling the 64-bit version is -recommended but it is possible to compile the 32-bit version. +recommended, but it is possible to compile the 32-bit version. Cross-compilation for Ubuntu and Windows Subsystem for Linux ------------------------------------------------------------ @@ -77,7 +77,7 @@ Ubuntu Bionic 18.04 <sup>[1](#footnote1)</sup>: sudo update-alternatives --config x86_64-w64-mingw32-g++ # Set the default mingw32 g++ compiler option to posix. -Once the tool chain is installed the build steps are common: +Once the toolchain is installed the build steps are common: Note that for WSL the Bitcoin Core source path MUST be somewhere in the default mount file system, for example /usr/src/bitcoin, AND not under /mnt/d/. If this is not the case the dependency autoconf scripts will fail. @@ -146,5 +146,5 @@ Footnotes compiler options to allow a choice between either posix or win32 threads. The default option is win32 threads which is the more efficient since it will result in binary code that links directly with the Windows kernel32.lib. Unfortunately, the headers required to support win32 threads conflict with some of the classes in the C++11 standard library in particular std::mutex. -It's not possible to build the bitcoin code using the win32 version of the Mingw-w64 cross compilers (at least not without -modifying headers in the bitcoin source code). +It's not possible to build the Bitcoin Core code using the win32 version of the Mingw-w64 cross compilers (at least not without +modifying headers in the Bitcoin Core source code). diff --git a/doc/dependencies.md b/doc/dependencies.md index 793c659419..3fc7aecba8 100644 --- a/doc/dependencies.md +++ b/doc/dependencies.md @@ -6,25 +6,25 @@ These are the dependencies currently used by Bitcoin Core. You can find instruct | Dependency | Version used | Minimum required | CVEs | Shared | [Bundled Qt library](https://doc.qt.io/qt-5/configure-options.html) | | --- | --- | --- | --- | --- | --- | | Berkeley DB | [4.8.30](http://www.oracle.com/technetwork/database/database-technologies/berkeleydb/downloads/index.html) | 4.8.x | No | | | -| Boost | [1.64.0](http://www.boost.org/users/download/) | [1.47.0](https://github.com/bitcoin/bitcoin/pull/8920) | No | | | -| Clang | | [3.3+](http://llvm.org/releases/download.html) (C++11 support) | | | | +| Boost | [1.64.0](https://www.boost.org/users/download/) | [1.47.0](https://github.com/bitcoin/bitcoin/pull/8920) | No | | | +| Clang | | [3.3+](https://llvm.org/releases/download.html) (C++11 support) | | | | | D-Bus | [1.10.18](https://cgit.freedesktop.org/dbus/dbus/tree/NEWS?h=dbus-1.10) | | No | Yes | | | Expat | [2.2.5](https://libexpat.github.io/) | | No | Yes | | | fontconfig | [2.12.1](https://www.freedesktop.org/software/fontconfig/release/) | | No | Yes | | | FreeType | [2.7.1](http://download.savannah.gnu.org/releases/freetype) | | No | | | -| GCC | | [4.8+](https://gcc.gnu.org/) | | | | +| GCC | | [4.8+](https://gcc.gnu.org/) (C++11 support) | | | | | HarfBuzz-NG | | | | | | | libevent | [2.1.8-stable](https://github.com/libevent/libevent/releases) | 2.0.22 | No | | | -| libjpeg | | | | | [Yes](https://github.com/bitcoin/bitcoin/blob/master/depends/packages/qt.mk#L75) | -| libpng | | | | | [Yes](https://github.com/bitcoin/bitcoin/blob/master/depends/packages/qt.mk#L74) | +| libjpeg | | | | | [Yes](https://github.com/bitcoin/bitcoin/blob/master/depends/packages/qt.mk#L65) | +| libpng | | | | | [Yes](https://github.com/bitcoin/bitcoin/blob/master/depends/packages/qt.mk#L64) | | MiniUPnPc | [2.0.20180203](http://miniupnp.free.fr/files) | | No | | | | OpenSSL | [1.0.1k](https://www.openssl.org/source) | | Yes | | | -| PCRE | | | | | [Yes](https://github.com/bitcoin/bitcoin/blob/master/depends/packages/qt.mk#L76) | -| protobuf | [2.6.3](https://github.com/google/protobuf/releases) | | No | | | +| PCRE | | | | | [Yes](https://github.com/bitcoin/bitcoin/blob/master/depends/packages/qt.mk#L66) | +| protobuf | [2.6.1](https://github.com/google/protobuf/releases) | | No | | | | Python (tests) | | [3.4](https://www.python.org/downloads) | | | | | qrencode | [3.4.4](https://fukuchi.org/works/qrencode) | | No | | | -| Qt | [5.7.1](https://download.qt.io/official_releases/qt/) | 5.x | No | | | -| XCB | | | | | [Yes](https://github.com/bitcoin/bitcoin/blob/master/depends/packages/qt.mk#L94) (Linux only) | -| xkbcommon | | | | | [Yes](https://github.com/bitcoin/bitcoin/blob/master/depends/packages/qt.mk#L93) (Linux only) | +| Qt | [5.9.6](https://download.qt.io/official_releases/qt/) | 5.x | No | | | +| XCB | | | | | [Yes](https://github.com/bitcoin/bitcoin/blob/master/depends/packages/qt.mk#L87) (Linux only) | +| xkbcommon | | | | | [Yes](https://github.com/bitcoin/bitcoin/blob/master/depends/packages/qt.mk#L86) (Linux only) | | ZeroMQ | [4.2.3](https://github.com/zeromq/libzmq/releases) | | No | | | -| zlib | [1.2.11](http://zlib.net/) | | | | No | +| zlib | [1.2.11](https://zlib.net/) | | | | No | diff --git a/doc/developer-notes.md b/doc/developer-notes.md index 2fa91ecb02..da8384c537 100644 --- a/doc/developer-notes.md +++ b/doc/developer-notes.md @@ -5,8 +5,10 @@ Developer Notes **Table of Contents** - [Developer Notes](#developer-notes) - - [Coding Style](#coding-style) + - [Coding Style (General)](#coding-style-general) + - [Coding Style (C++)](#coding-style-c) - [Doxygen comments](#doxygen-comments) + - [Coding Style (Python)](#coding-style-python) - [Development tips and tricks](#development-tips-and-tricks) - [Compiling for debugging](#compiling-for-debugging) - [Compiling for gprof profiling](#compiling-for-gprof-profiling) @@ -35,8 +37,8 @@ Developer Notes <!-- markdown-toc end --> -Coding Style ---------------- +Coding Style (General) +---------------------- Various coding styles have been used during the history of the codebase, and the result is not very consistent. However, we're now trying to converge to @@ -46,6 +48,9 @@ commits. Do not submit patches solely to modify the style of existing code. +Coding Style (C++) +------------------ + - **Indentation and whitespace rules** as specified in [src/.clang-format](/src/.clang-format). You can use the provided [clang-format-diff script](/contrib/devtools/README.md#clang-format-diffpy) @@ -174,6 +179,11 @@ but if possible use one of the above styles. Documentation can be generated with `make docs` and cleaned up with `make clean-docs`. +Coding Style (Python) +--------------------- + +Refer to [/test/functional/README.md#style-guidelines](/test/functional/README.md#style-guidelines). + Development tips and tricks --------------------------- @@ -247,7 +257,7 @@ make cov **Sanitizers** -Bitcoin can be compiled with various "sanitizers" enabled, which add +Bitcoin Core can be compiled with various "sanitizers" enabled, which add instrumentation for issues regarding things like memory safety, thread race conditions, or undefined behavior. This is controlled with the `--with-sanitizers` configure flag, which should be a comma separated list of diff --git a/doc/man/bitcoin-cli.1 b/doc/man/bitcoin-cli.1 index 168a68cb30..bf24d929bc 100644 --- a/doc/man/bitcoin-cli.1 +++ b/doc/man/bitcoin-cli.1 @@ -1,5 +1,5 @@ -.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.47.3. -.TH BITCOIN-CLI "1" "January 2018" "bitcoin-cli v0.16.99.0" "User Commands" +.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.47.6. +.TH BITCOIN-CLI "1" "July 2018" "bitcoin-cli v0.16.99.0" "User Commands" .SH NAME bitcoin-cli \- manual page for bitcoin-cli v0.16.99.0 .SH DESCRIPTION @@ -20,7 +20,8 @@ This help message .HP \fB\-conf=\fR<file> .IP -Specify configuration file (default: bitcoin.conf) +Specify configuration file. Relative paths will be prefixed by datadir +location. (default: bitcoin.conf) .HP \fB\-datadir=\fR<dir> .IP @@ -33,47 +34,52 @@ server\-side RPC calls, the results of \fB\-getinfo\fR is the result of multiple non\-atomic requests. Some entries in the result may represent results from different states (e.g. wallet balance may be as of a different block from the chain state reported) -.PP -Chain selection options: -.HP -\fB\-testnet\fR -.IP -Use the test chain -.HP -\fB\-regtest\fR -.IP -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. .HP \fB\-named\fR .IP Pass named instead of positional arguments (default: false) .HP +\fB\-rpcclienttimeout=\fR<n> +.IP +Timeout in seconds during HTTP requests, or 0 for no timeout. (default: +900) +.HP \fB\-rpcconnect=\fR<ip> .IP Send commands to node running on <ip> (default: 127.0.0.1) .HP -\fB\-rpcport=\fR<port> +\fB\-rpccookiefile=\fR<loc> .IP -Connect to JSON\-RPC on <port> (default: 8332 or testnet: 18332) +Location of the auth cookie. Relative paths will be prefixed by a +net\-specific datadir location. (default: data dir) .HP -\fB\-rpcwait\fR +\fB\-rpcpassword=\fR<pw> .IP -Wait for RPC server to start +Password for JSON\-RPC connections +.HP +\fB\-rpcport=\fR<port> +.IP +Connect to JSON\-RPC on <port> (default: 8332 or testnet: 18332) .HP \fB\-rpcuser=\fR<user> .IP Username for JSON\-RPC connections .HP -\fB\-rpcpassword=\fR<pw> +\fB\-rpcwait\fR .IP -Password for JSON\-RPC connections +Wait for RPC server to start .HP -\fB\-rpcclienttimeout=\fR<n> +\fB\-rpcwallet=\fR<walletname> .IP -Timeout in seconds during HTTP requests, or 0 for no timeout. (default: -900) +Send RPC for non\-default wallet on RPC server (needs to exactly match +corresponding \fB\-wallet\fR option passed to bitcoind) +.HP +\fB\-stdin\fR +.IP +Read extra arguments from standard input, one per line until EOF/Ctrl\-D +(recommended for sensitive information such as passphrases). +When combined with \fB\-stdinrpcpass\fR, the first line from standard +input is used for the RPC password. .HP \fB\-stdinrpcpass\fR .TP @@ -83,18 +89,15 @@ When combined with \fB\-stdin\fR, the first line from standard input is used for the RPC password. .HP -\fB\-stdin\fR +\fB\-version\fR .IP -Read extra arguments from standard input, one per line until EOF/Ctrl\-D -(recommended for sensitive information such as passphrases). -When combined with \fB\-stdinrpcpass\fR, the first line from standard -input is used for the RPC password. +Print version and exit +.PP +Chain selection options: .HP -\fB\-rpcwallet=\fR<walletname> +\fB\-testnet\fR .IP -Send RPC for non\-default wallet on RPC server (argument is wallet -filename in bitcoind directory, required if bitcoind/\-Qt runs -with multiple wallets) +Use the test chain .SH COPYRIGHT Copyright (C) 2009-2018 The Bitcoin Core developers diff --git a/doc/man/bitcoin-qt.1 b/doc/man/bitcoin-qt.1 index a8c55fb0b3..3a18c9f49f 100644 --- a/doc/man/bitcoin-qt.1 +++ b/doc/man/bitcoin-qt.1 @@ -1,5 +1,5 @@ -.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.47.3. -.TH BITCOIN-QT "1" "January 2018" "bitcoin-qt v0.16.99.0" "User Commands" +.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.47.6. +.TH BITCOIN-QT "1" "July 2018" "bitcoin-qt v0.16.99.0" "User Commands" .SH NAME bitcoin-qt \- manual page for bitcoin-qt v0.16.99.0 .SH DESCRIPTION @@ -13,20 +13,11 @@ bitcoin\-qt [command\-line options] .IP Print this help message and exit .HP -\fB\-version\fR -.IP -Print version and exit -.HP \fB\-alertnotify=\fR<cmd> .IP Execute command when a relevant alert is received or we see a really long fork (%s in cmd is replaced by message) .HP -\fB\-blocknotify=\fR<cmd> -.IP -Execute command when the best block changes (%s in cmd is replaced by -block hash) -.HP \fB\-assumevalid=\fR<hex> .IP If this block is in the chain assume that it and its ancestors are valid @@ -36,9 +27,28 @@ default: testnet: 0000000002e9e7b00e1f6dc5123a04aad68dd0f0968d8c7aa45f6640795c37b1) .HP +\fB\-blocknotify=\fR<cmd> +.IP +Execute command when the best block changes (%s in cmd is replaced by +block hash) +.HP +\fB\-blockreconstructionextratxn=\fR<n> +.IP +Extra transactions to keep in memory for compact block reconstructions +(default: 100) +.HP +\fB\-blocksdir=\fR<dir> +.IP +Specify blocks directory (default: <datadir>/blocks) +.HP \fB\-conf=\fR<file> .IP -Specify configuration file (default: bitcoin.conf) +Specify configuration file. Relative paths will be prefixed by datadir +location. (default: bitcoin.conf) +.HP +\fB\-daemon\fR +.IP +Run in the background as a daemon and accept commands .HP \fB\-datadir=\fR<dir> .IP @@ -48,45 +58,46 @@ Specify data directory .IP Set database cache size in megabytes (4 to 16384, default: 450) .HP -\fB\-loadblock=\fR<file> +\fB\-debuglogfile=\fR<file> .IP -Imports blocks from external blk000??.dat file on startup +Specify location of debug log file. Relative paths will be prefixed by a +net\-specific datadir location. (0 to disable; default: debug.log) .HP -\fB\-debuglogfile=\fR<file> +\fB\-includeconf=\fR<file> .IP -Specify location of debug log file: this can be an absolute path or a -path relative to the data directory (default: debug.log) +Specify additional configuration file, relative to the \fB\-datadir\fR path +(only useable from configuration file, not command line) .HP -\fB\-maxorphantx=\fR<n> +\fB\-loadblock=\fR<file> .IP -Keep at most <n> unconnectable transactions in memory (default: 100) +Imports blocks from external blk000??.dat file on startup .HP \fB\-maxmempool=\fR<n> .IP Keep the transaction memory pool below <n> megabytes (default: 300) .HP +\fB\-maxorphantx=\fR<n> +.IP +Keep at most <n> unconnectable transactions in memory (default: 100) +.HP \fB\-mempoolexpiry=\fR<n> .IP Do not keep transactions in the mempool longer than <n> hours (default: 336) .HP -\fB\-persistmempool\fR -.IP -Whether to save the mempool on shutdown and load on restart (default: 1) -.HP -\fB\-blockreconstructionextratxn=\fR<n> -.IP -Extra transactions to keep in memory for compact block reconstructions -(default: 100) -.HP \fB\-par=\fR<n> .IP -Set the number of script verification threads (\fB\-6\fR to 16, 0 = auto, <0 = +Set the number of script verification threads (\fB\-8\fR to 16, 0 = auto, <0 = leave that many cores free, default: 0) .HP +\fB\-persistmempool\fR +.IP +Whether to save the mempool on shutdown and load on restart (default: 1) +.HP \fB\-pid=\fR<file> .IP -Specify pid file (default: bitcoind.pid) +Specify pid file. Relative paths will be prefixed by a net\-specific +datadir location. (default: bitcoind.pid) .HP \fB\-prune=\fR<n> .IP @@ -100,14 +111,14 @@ setting requires re\-downloading the entire blockchain. (default: >550 = automatically prune block files to stay under the specified target size in MiB) .HP -\fB\-reindex\-chainstate\fR -.IP -Rebuild chain state from the currently indexed blocks -.HP \fB\-reindex\fR .IP Rebuild chain state and block index from the blk*.dat files on disk .HP +\fB\-reindex\-chainstate\fR +.IP +Rebuild chain state from the currently indexed blocks +.HP \fB\-sysperms\fR .IP Create new files with system default permissions, instead of umask 077 @@ -117,13 +128,18 @@ Create new files with system default permissions, instead of umask 077 .IP Maintain a full transaction index, used by the getrawtransaction rpc call (default: 0) +.HP +\fB\-version\fR +.IP +Print version and exit .PP Connection options: .HP \fB\-addnode=\fR<ip> .IP Add a node to connect to and attempt to keep the connection open (see -the `addnode` RPC command help for more info) +the `addnode` RPC command help for more info). This option can be +specified multiple times to add multiple nodes. .HP \fB\-banscore=\fR<n> .IP @@ -141,9 +157,10 @@ for IPv6 .HP \fB\-connect=\fR<ip> .IP -Connect only to the specified node(s); \fB\-connect\fR=\fI\,0\/\fR disables automatic +Connect only to the specified node; \fB\-connect\fR=\fI\,0\/\fR disables automatic connections (the rules for this peer are the same as for -\fB\-addnode\fR) +\fB\-addnode\fR). This option can be specified multiple times to connect +to multiple nodes. .HP \fB\-discover\fR .IP @@ -159,6 +176,10 @@ Allow DNS lookups for \fB\-addnode\fR, \fB\-seednode\fR and \fB\-connect\fR (def Query for peer addresses via DNS lookup, if low on addresses (default: 1 unless \fB\-connect\fR used) .HP +\fB\-enablebip61\fR +.IP +Send reject messages per BIP61 (default: 1) +.HP \fB\-externalip=\fR<ip> .IP Specify your own public address @@ -193,6 +214,11 @@ Maximum allowed median peer time offset adjustment. Local perspective of time may be influenced by peers forward or backward by this amount. (default: 4200 seconds) .HP +\fB\-maxuploadtarget=\fR<n> +.IP +Tries to keep outbound traffic under the given target (in MiB per 24h), +0 = no limit (default: 0) +.HP \fB\-onion=\fR<ip:port> .IP Use separate SOCKS5 proxy to reach peers via Tor hidden services @@ -200,17 +226,20 @@ Use separate SOCKS5 proxy to reach peers via Tor hidden services .HP \fB\-onlynet=\fR<net> .IP -Only connect to nodes in network <net> (ipv4, ipv6 or onion) -.HP -\fB\-permitbaremultisig\fR -.IP -Relay non\-P2SH multisig (default: 1) +Make outgoing connections only through network <net> (ipv4, ipv6 or +onion). Incoming connections are not affected by this option. +This option can be specified multiple times to allow multiple +networks. .HP \fB\-peerbloomfilters\fR .IP Support filtering of blocks and transaction with bloom filters (default: 1) .HP +\fB\-permitbaremultisig\fR +.IP +Relay non\-P2SH multisig (default: 1) +.HP \fB\-port=\fR<port> .IP Listen for connections on <port> (default: 8333 or testnet: 18333) @@ -226,7 +255,9 @@ stream isolation (default: 1) .HP \fB\-seednode=\fR<ip> .IP -Connect to a node to retrieve peer addresses, and disconnect +Connect to a node to retrieve peer addresses, and disconnect. This +option can be specified multiple times to connect to multiple +nodes. .HP \fB\-timeout=\fR<n> .IP @@ -257,11 +288,6 @@ CIDR notated network (e.g. 1.2.3.0/24). Can be specified multiple times. Whitelisted peers cannot be DoS banned and their transactions are always relayed, even if they are already in the mempool, useful e.g. for a gateway -.HP -\fB\-maxuploadtarget=\fR<n> -.IP -Tries to keep outbound traffic under the given target (in MiB per 24h), -0 = no limit (default: 0) .PP Wallet options: .HP @@ -270,6 +296,14 @@ Wallet options: What type of addresses to use ("legacy", "p2sh\-segwit", or "bech32", default: "p2sh\-segwit") .HP +\fB\-avoidpartialspends\fR +.IP +Group outputs by address, selecting all or none, instead of selecting on +a per\-output basis. Privacy is improved as an address is only +used once (unless someone sends to it after spending from it), +but may result in slightly higher fees as suboptimal coin +selection may result due to the added limitation (default: 0) +.HP \fB\-changetype\fR .IP What type of change to use ("legacy", "p2sh\-segwit", or "bech32"). @@ -281,22 +315,22 @@ sending to a native segwit address) .IP Do not load the wallet and disable wallet RPC calls .HP -\fB\-keypool=\fR<n> +\fB\-discardfee=\fR<amt> .IP -Set key pool size to <n> (default: 1000) +The fee rate (in BTC/kB) that indicates your tolerance for discarding +change by adding it to the fee (default: 0.0001). Note: An output +is discarded if it is dust at this rate, but we will always +discard up to the dust relay fee and a discard fee above that is +limited by the fee estimate for the longest target .HP \fB\-fallbackfee=\fR<amt> .IP A fee rate (in BTC/kB) that will be used when fee estimation has insufficient data (default: 0.0002) .HP -\fB\-discardfee=\fR<amt> +\fB\-keypool=\fR<n> .IP -The fee rate (in BTC/kB) that indicates your tolerance for discarding -change by adding it to the fee (default: 0.0001). Note: An output -is discarded if it is dust at this rate, but we will always -discard up to the dust relay fee and a discard fee above that is -limited by the fee estimate for the longest target +Set key pool size to <n> (default: 1000) .HP \fB\-mintxfee=\fR<amt> .IP @@ -324,17 +358,18 @@ Spend unconfirmed change when sending transactions (default: 1) If paytxfee is not set, include enough fee so transactions begin confirmation on average within n blocks (default: 6) .HP -\fB\-walletrbf\fR -.IP -Send transactions with full\-RBF opt\-in enabled (RPC only, default: 0) -.HP \fB\-upgradewallet\fR .IP Upgrade wallet to latest format on startup .HP -\fB\-wallet=\fR<file> +\fB\-wallet=\fR<path> .IP -Specify wallet file (within data directory) (default: wallet.dat) +Specify wallet database path. Can be specified multiple times to load +multiple wallets. Path is interpreted relative to <walletdir> if +it is not absolute, and will be created if it does not exist (as +a directory containing a wallet.dat file and log files). For +backwards compatibility this will also accept names of existing +data files in <walletdir>.) .HP \fB\-walletbroadcast\fR .IP @@ -350,6 +385,10 @@ exists, otherwise <datadir>) Execute command when a wallet transaction changes (%s in cmd is replaced by TxID) .HP +\fB\-walletrbf\fR +.IP +Send transactions with full\-RBF opt\-in enabled (RPC only, default: 0) +.HP \fB\-zapwallettxes=\fR<mode> .IP Delete all wallet transactions and only recover those parts of the @@ -377,10 +416,6 @@ Enable publish raw transaction in <address> .PP Debugging/Testing options: .HP -\fB\-uacomment=\fR<cmt> -.IP -Append comment to the user agent string -.HP \fB\-debug=\fR<category> .IP Output debugging information (default: 0, supplying <category> is @@ -416,11 +451,16 @@ transaction; setting this too low may abort large transactions .HP \fB\-printtoconsole\fR .IP -Send trace/debug info to console instead of debug.log file +Send trace/debug info to console (default: 1 when no \fB\-daemon\fR. To disable +logging to file, set debuglogfile=0) .HP \fB\-shrinkdebugfile\fR .IP Shrink debug.log file on client startup (default: 1 when no \fB\-debug\fR) +.HP +\fB\-uacomment=\fR<cmt> +.IP +Append comment to the user agent string .PP Chain selection options: .HP @@ -453,15 +493,15 @@ Enable transaction replacement in the memory pool (default: 1) Fees (in BTC/kB) smaller than this are considered zero fee for relaying, mining and transaction creation (default: 0.00001) .HP -\fB\-whitelistrelay\fR -.IP -Accept relayed transactions received from whitelisted peers even when -not relaying transactions (default: 1) -.HP \fB\-whitelistforcerelay\fR .IP Force relay of transactions from whitelisted peers even if they violate local relay policy (default: 1) +.HP +\fB\-whitelistrelay\fR +.IP +Accept relayed transactions received from whitelisted peers even when +not relaying transactions (default: 1) .PP Block creation options: .HP @@ -469,11 +509,6 @@ Block creation options: .IP Set maximum BIP141 block weight (default: 3996000) .HP -\fB\-blockmaxsize=\fR<n> -.IP -Set maximum BIP141 block weight to this * 4. Deprecated, use -blockmaxweight -.HP \fB\-blockmintxfee=\fR<amt> .IP Set lowest fee rate (in BTC/kB) for transactions to be included in block @@ -481,14 +516,26 @@ creation. (default: 0.00001) .PP RPC server options: .HP -\fB\-server\fR -.IP -Accept command line and JSON\-RPC commands -.HP \fB\-rest\fR .IP Accept public REST requests (default: 0) .HP +\fB\-rpcallowip=\fR<ip> +.IP +Allow JSON\-RPC connections from specified source. Valid for <ip> are a +single IP (e.g. 1.2.3.4), a network/netmask (e.g. +1.2.3.4/255.255.255.0) or a network/CIDR (e.g. 1.2.3.4/24). This +option can be specified multiple times +.HP +\fB\-rpcauth=\fR<userpw> +.IP +Username and hashed password for JSON\-RPC connections. The field +<userpw> comes in the format: <USERNAME>:<SALT>$<HASH>. A +canonical python script is included in share/rpcauth. The client +then connects normally using the +rpcuser=<USERNAME>/rpcpassword=<PASSWORD> pair of arguments. This +option can be specified multiple times +.HP \fB\-rpcbind=\fR<addr>[:port] .IP Bind to given address to listen for JSON\-RPC connections. This option is @@ -500,37 +547,18 @@ option can be specified multiple times (default: 127.0.0.1 and .HP \fB\-rpccookiefile=\fR<loc> .IP -Location of the auth cookie (default: data dir) -.HP -\fB\-rpcuser=\fR<user> -.IP -Username for JSON\-RPC connections +Location of the auth cookie. Relative paths will be prefixed by a +net\-specific datadir location. (default: data dir) .HP \fB\-rpcpassword=\fR<pw> .IP Password for JSON\-RPC connections .HP -\fB\-rpcauth=\fR<userpw> -.IP -Username and hashed password for JSON\-RPC connections. The field -<userpw> comes in the format: <USERNAME>:<SALT>$<HASH>. A -canonical python script is included in share/rpcuser. The client -then connects normally using the -rpcuser=<USERNAME>/rpcpassword=<PASSWORD> pair of arguments. This -option can be specified multiple times -.HP \fB\-rpcport=\fR<port> .IP Listen for JSON\-RPC connections on <port> (default: 8332 or testnet: 18332) .HP -\fB\-rpcallowip=\fR<ip> -.IP -Allow JSON\-RPC connections from specified source. Valid for <ip> are a -single IP (e.g. 1.2.3.4), a network/netmask (e.g. -1.2.3.4/255.255.255.0) or a network/CIDR (e.g. 1.2.3.4/24). This -option can be specified multiple times -.HP \fB\-rpcserialversion\fR .IP Sets the serialization of raw transaction or block hex returned in @@ -539,6 +567,14 @@ non\-verbose mode, non\-segwit(0) or segwit(1) (default: 1) \fB\-rpcthreads=\fR<n> .IP Set the number of threads to service RPC calls (default: 4) +.HP +\fB\-rpcuser=\fR<user> +.IP +Username for JSON\-RPC connections +.HP +\fB\-server\fR +.IP +Accept command line and JSON\-RPC commands .PP UI Options: .HP @@ -554,6 +590,10 @@ Set language, for example "de_DE" (default: system locale) .IP Start minimized .HP +\fB\-resetguisettings\fR +.IP +Reset all settings changed in the GUI +.HP \fB\-rootcertificates=\fR<file> .IP Set SSL root certificates for payment request (default: \fB\-system\-\fR) @@ -561,10 +601,6 @@ Set SSL root certificates for payment request (default: \fB\-system\-\fR) \fB\-splash\fR .IP Show splash screen on startup (default: 1) -.HP -\fB\-resetguisettings\fR -.IP -Reset all settings changed in the GUI .SH COPYRIGHT Copyright (C) 2009-2018 The Bitcoin Core developers diff --git a/doc/man/bitcoin-tx.1 b/doc/man/bitcoin-tx.1 index 8e6994ac07..e1b81bad6c 100644 --- a/doc/man/bitcoin-tx.1 +++ b/doc/man/bitcoin-tx.1 @@ -1,5 +1,5 @@ -.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.47.3. -.TH BITCOIN-TX "1" "January 2018" "bitcoin-tx v0.16.99.0" "User Commands" +.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.47.6. +.TH BITCOIN-TX "1" "July 2018" "bitcoin-tx v0.16.99.0" "User Commands" .SH NAME bitcoin-tx \- manual page for bitcoin-tx v0.16.99.0 .SH DESCRIPTION @@ -34,12 +34,6 @@ Chain selection options: \fB\-testnet\fR .IP Use the test chain -.HP -\fB\-regtest\fR -.IP -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. .PP Commands: .IP @@ -63,37 +57,37 @@ nversion=N .IP Set TX version to N .IP -replaceable(=N) -.IP -Set RBF opt\-in sequence number for input N (if not provided, opt\-in all -available inputs) -.IP outaddr=VALUE:ADDRESS .IP Add address\-based output to TX .IP +outdata=[VALUE:]DATA +.IP +Add data\-based output to TX +.IP +outmultisig=VALUE:REQUIRED:PUBKEYS:PUBKEY1:PUBKEY2:....[:FLAGS] +.IP +Add Pay To n\-of\-m Multi\-sig output to TX. n = REQUIRED, m = PUBKEYS. +Optionally add the "W" flag to produce a +pay\-to\-witness\-script\-hash output. Optionally add the "S" flag to +wrap the output in a pay\-to\-script\-hash. +.IP outpubkey=VALUE:PUBKEY[:FLAGS] .IP Add pay\-to\-pubkey output to TX. Optionally add the "W" flag to produce a pay\-to\-witness\-pubkey\-hash output. Optionally add the "S" flag to wrap the output in a pay\-to\-script\-hash. .IP -outdata=[VALUE:]DATA -.IP -Add data\-based output to TX -.IP outscript=VALUE:SCRIPT[:FLAGS] .IP Add raw script output to TX. Optionally add the "W" flag to produce a pay\-to\-witness\-script\-hash output. Optionally add the "S" flag to wrap the output in a pay\-to\-script\-hash. .IP -outmultisig=VALUE:REQUIRED:PUBKEYS:PUBKEY1:PUBKEY2:....[:FLAGS] +replaceable(=N) .IP -Add Pay To n\-of\-m Multi\-sig output to TX. n = REQUIRED, m = PUBKEYS. -Optionally add the "W" flag to produce a -pay\-to\-witness\-script\-hash output. Optionally add the "S" flag to -wrap the output in a pay\-to\-script\-hash. +Set RBF opt\-in sequence number for input N (if not provided, opt\-in all +available inputs) .IP sign=SIGHASH\-FLAGS .IP diff --git a/doc/man/bitcoind.1 b/doc/man/bitcoind.1 index 8728965b2a..d0ba131cde 100644 --- a/doc/man/bitcoind.1 +++ b/doc/man/bitcoind.1 @@ -1,5 +1,5 @@ -.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.47.3. -.TH BITCOIND "1" "January 2018" "bitcoind v0.16.99.0" "User Commands" +.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.47.6. +.TH BITCOIND "1" "July 2018" "bitcoind v0.16.99.0" "User Commands" .SH NAME bitcoind \- manual page for bitcoind v0.16.99.0 .SH DESCRIPTION @@ -14,20 +14,11 @@ Start Bitcoin Core Daemon .IP Print this help message and exit .HP -\fB\-version\fR -.IP -Print version and exit -.HP \fB\-alertnotify=\fR<cmd> .IP Execute command when a relevant alert is received or we see a really long fork (%s in cmd is replaced by message) .HP -\fB\-blocknotify=\fR<cmd> -.IP -Execute command when the best block changes (%s in cmd is replaced by -block hash) -.HP \fB\-assumevalid=\fR<hex> .IP If this block is in the chain assume that it and its ancestors are valid @@ -37,9 +28,24 @@ default: testnet: 0000000002e9e7b00e1f6dc5123a04aad68dd0f0968d8c7aa45f6640795c37b1) .HP +\fB\-blocknotify=\fR<cmd> +.IP +Execute command when the best block changes (%s in cmd is replaced by +block hash) +.HP +\fB\-blockreconstructionextratxn=\fR<n> +.IP +Extra transactions to keep in memory for compact block reconstructions +(default: 100) +.HP +\fB\-blocksdir=\fR<dir> +.IP +Specify blocks directory (default: <datadir>/blocks) +.HP \fB\-conf=\fR<file> .IP -Specify configuration file (default: bitcoin.conf) +Specify configuration file. Relative paths will be prefixed by datadir +location. (default: bitcoin.conf) .HP \fB\-daemon\fR .IP @@ -53,45 +59,46 @@ Specify data directory .IP Set database cache size in megabytes (4 to 16384, default: 450) .HP -\fB\-loadblock=\fR<file> +\fB\-debuglogfile=\fR<file> .IP -Imports blocks from external blk000??.dat file on startup +Specify location of debug log file. Relative paths will be prefixed by a +net\-specific datadir location. (0 to disable; default: debug.log) .HP -\fB\-debuglogfile=\fR<file> +\fB\-includeconf=\fR<file> .IP -Specify location of debug log file: this can be an absolute path or a -path relative to the data directory (default: debug.log) +Specify additional configuration file, relative to the \fB\-datadir\fR path +(only useable from configuration file, not command line) .HP -\fB\-maxorphantx=\fR<n> +\fB\-loadblock=\fR<file> .IP -Keep at most <n> unconnectable transactions in memory (default: 100) +Imports blocks from external blk000??.dat file on startup .HP \fB\-maxmempool=\fR<n> .IP Keep the transaction memory pool below <n> megabytes (default: 300) .HP +\fB\-maxorphantx=\fR<n> +.IP +Keep at most <n> unconnectable transactions in memory (default: 100) +.HP \fB\-mempoolexpiry=\fR<n> .IP Do not keep transactions in the mempool longer than <n> hours (default: 336) .HP -\fB\-persistmempool\fR -.IP -Whether to save the mempool on shutdown and load on restart (default: 1) -.HP -\fB\-blockreconstructionextratxn=\fR<n> -.IP -Extra transactions to keep in memory for compact block reconstructions -(default: 100) -.HP \fB\-par=\fR<n> .IP -Set the number of script verification threads (\fB\-6\fR to 16, 0 = auto, <0 = +Set the number of script verification threads (\fB\-8\fR to 16, 0 = auto, <0 = leave that many cores free, default: 0) .HP +\fB\-persistmempool\fR +.IP +Whether to save the mempool on shutdown and load on restart (default: 1) +.HP \fB\-pid=\fR<file> .IP -Specify pid file (default: bitcoind.pid) +Specify pid file. Relative paths will be prefixed by a net\-specific +datadir location. (default: bitcoind.pid) .HP \fB\-prune=\fR<n> .IP @@ -105,14 +112,14 @@ setting requires re\-downloading the entire blockchain. (default: >550 = automatically prune block files to stay under the specified target size in MiB) .HP -\fB\-reindex\-chainstate\fR -.IP -Rebuild chain state from the currently indexed blocks -.HP \fB\-reindex\fR .IP Rebuild chain state and block index from the blk*.dat files on disk .HP +\fB\-reindex\-chainstate\fR +.IP +Rebuild chain state from the currently indexed blocks +.HP \fB\-sysperms\fR .IP Create new files with system default permissions, instead of umask 077 @@ -122,13 +129,18 @@ Create new files with system default permissions, instead of umask 077 .IP Maintain a full transaction index, used by the getrawtransaction rpc call (default: 0) +.HP +\fB\-version\fR +.IP +Print version and exit .PP Connection options: .HP \fB\-addnode=\fR<ip> .IP Add a node to connect to and attempt to keep the connection open (see -the `addnode` RPC command help for more info) +the `addnode` RPC command help for more info). This option can be +specified multiple times to add multiple nodes. .HP \fB\-banscore=\fR<n> .IP @@ -146,9 +158,10 @@ for IPv6 .HP \fB\-connect=\fR<ip> .IP -Connect only to the specified node(s); \fB\-connect\fR=\fI\,0\/\fR disables automatic +Connect only to the specified node; \fB\-connect\fR=\fI\,0\/\fR disables automatic connections (the rules for this peer are the same as for -\fB\-addnode\fR) +\fB\-addnode\fR). This option can be specified multiple times to connect +to multiple nodes. .HP \fB\-discover\fR .IP @@ -164,6 +177,10 @@ Allow DNS lookups for \fB\-addnode\fR, \fB\-seednode\fR and \fB\-connect\fR (def Query for peer addresses via DNS lookup, if low on addresses (default: 1 unless \fB\-connect\fR used) .HP +\fB\-enablebip61\fR +.IP +Send reject messages per BIP61 (default: 1) +.HP \fB\-externalip=\fR<ip> .IP Specify your own public address @@ -198,6 +215,11 @@ Maximum allowed median peer time offset adjustment. Local perspective of time may be influenced by peers forward or backward by this amount. (default: 4200 seconds) .HP +\fB\-maxuploadtarget=\fR<n> +.IP +Tries to keep outbound traffic under the given target (in MiB per 24h), +0 = no limit (default: 0) +.HP \fB\-onion=\fR<ip:port> .IP Use separate SOCKS5 proxy to reach peers via Tor hidden services @@ -205,17 +227,20 @@ Use separate SOCKS5 proxy to reach peers via Tor hidden services .HP \fB\-onlynet=\fR<net> .IP -Only connect to nodes in network <net> (ipv4, ipv6 or onion) -.HP -\fB\-permitbaremultisig\fR -.IP -Relay non\-P2SH multisig (default: 1) +Make outgoing connections only through network <net> (ipv4, ipv6 or +onion). Incoming connections are not affected by this option. +This option can be specified multiple times to allow multiple +networks. .HP \fB\-peerbloomfilters\fR .IP Support filtering of blocks and transaction with bloom filters (default: 1) .HP +\fB\-permitbaremultisig\fR +.IP +Relay non\-P2SH multisig (default: 1) +.HP \fB\-port=\fR<port> .IP Listen for connections on <port> (default: 8333 or testnet: 18333) @@ -231,7 +256,9 @@ stream isolation (default: 1) .HP \fB\-seednode=\fR<ip> .IP -Connect to a node to retrieve peer addresses, and disconnect +Connect to a node to retrieve peer addresses, and disconnect. This +option can be specified multiple times to connect to multiple +nodes. .HP \fB\-timeout=\fR<n> .IP @@ -262,11 +289,6 @@ CIDR notated network (e.g. 1.2.3.0/24). Can be specified multiple times. Whitelisted peers cannot be DoS banned and their transactions are always relayed, even if they are already in the mempool, useful e.g. for a gateway -.HP -\fB\-maxuploadtarget=\fR<n> -.IP -Tries to keep outbound traffic under the given target (in MiB per 24h), -0 = no limit (default: 0) .PP Wallet options: .HP @@ -275,6 +297,14 @@ Wallet options: What type of addresses to use ("legacy", "p2sh\-segwit", or "bech32", default: "p2sh\-segwit") .HP +\fB\-avoidpartialspends\fR +.IP +Group outputs by address, selecting all or none, instead of selecting on +a per\-output basis. Privacy is improved as an address is only +used once (unless someone sends to it after spending from it), +but may result in slightly higher fees as suboptimal coin +selection may result due to the added limitation (default: 0) +.HP \fB\-changetype\fR .IP What type of change to use ("legacy", "p2sh\-segwit", or "bech32"). @@ -286,22 +316,22 @@ sending to a native segwit address) .IP Do not load the wallet and disable wallet RPC calls .HP -\fB\-keypool=\fR<n> +\fB\-discardfee=\fR<amt> .IP -Set key pool size to <n> (default: 1000) +The fee rate (in BTC/kB) that indicates your tolerance for discarding +change by adding it to the fee (default: 0.0001). Note: An output +is discarded if it is dust at this rate, but we will always +discard up to the dust relay fee and a discard fee above that is +limited by the fee estimate for the longest target .HP \fB\-fallbackfee=\fR<amt> .IP A fee rate (in BTC/kB) that will be used when fee estimation has insufficient data (default: 0.0002) .HP -\fB\-discardfee=\fR<amt> +\fB\-keypool=\fR<n> .IP -The fee rate (in BTC/kB) that indicates your tolerance for discarding -change by adding it to the fee (default: 0.0001). Note: An output -is discarded if it is dust at this rate, but we will always -discard up to the dust relay fee and a discard fee above that is -limited by the fee estimate for the longest target +Set key pool size to <n> (default: 1000) .HP \fB\-mintxfee=\fR<amt> .IP @@ -329,17 +359,18 @@ Spend unconfirmed change when sending transactions (default: 1) If paytxfee is not set, include enough fee so transactions begin confirmation on average within n blocks (default: 6) .HP -\fB\-walletrbf\fR -.IP -Send transactions with full\-RBF opt\-in enabled (RPC only, default: 0) -.HP \fB\-upgradewallet\fR .IP Upgrade wallet to latest format on startup .HP -\fB\-wallet=\fR<file> +\fB\-wallet=\fR<path> .IP -Specify wallet file (within data directory) (default: wallet.dat) +Specify wallet database path. Can be specified multiple times to load +multiple wallets. Path is interpreted relative to <walletdir> if +it is not absolute, and will be created if it does not exist (as +a directory containing a wallet.dat file and log files). For +backwards compatibility this will also accept names of existing +data files in <walletdir>.) .HP \fB\-walletbroadcast\fR .IP @@ -355,6 +386,10 @@ exists, otherwise <datadir>) Execute command when a wallet transaction changes (%s in cmd is replaced by TxID) .HP +\fB\-walletrbf\fR +.IP +Send transactions with full\-RBF opt\-in enabled (RPC only, default: 0) +.HP \fB\-zapwallettxes=\fR<mode> .IP Delete all wallet transactions and only recover those parts of the @@ -382,10 +417,6 @@ Enable publish raw transaction in <address> .PP Debugging/Testing options: .HP -\fB\-uacomment=\fR<cmt> -.IP -Append comment to the user agent string -.HP \fB\-debug=\fR<category> .IP Output debugging information (default: 0, supplying <category> is @@ -421,11 +452,16 @@ transaction; setting this too low may abort large transactions .HP \fB\-printtoconsole\fR .IP -Send trace/debug info to console instead of debug.log file +Send trace/debug info to console (default: 1 when no \fB\-daemon\fR. To disable +logging to file, set debuglogfile=0) .HP \fB\-shrinkdebugfile\fR .IP Shrink debug.log file on client startup (default: 1 when no \fB\-debug\fR) +.HP +\fB\-uacomment=\fR<cmt> +.IP +Append comment to the user agent string .PP Chain selection options: .HP @@ -458,15 +494,15 @@ Enable transaction replacement in the memory pool (default: 1) Fees (in BTC/kB) smaller than this are considered zero fee for relaying, mining and transaction creation (default: 0.00001) .HP -\fB\-whitelistrelay\fR -.IP -Accept relayed transactions received from whitelisted peers even when -not relaying transactions (default: 1) -.HP \fB\-whitelistforcerelay\fR .IP Force relay of transactions from whitelisted peers even if they violate local relay policy (default: 1) +.HP +\fB\-whitelistrelay\fR +.IP +Accept relayed transactions received from whitelisted peers even when +not relaying transactions (default: 1) .PP Block creation options: .HP @@ -474,11 +510,6 @@ Block creation options: .IP Set maximum BIP141 block weight (default: 3996000) .HP -\fB\-blockmaxsize=\fR<n> -.IP -Set maximum BIP141 block weight to this * 4. Deprecated, use -blockmaxweight -.HP \fB\-blockmintxfee=\fR<amt> .IP Set lowest fee rate (in BTC/kB) for transactions to be included in block @@ -486,14 +517,26 @@ creation. (default: 0.00001) .PP RPC server options: .HP -\fB\-server\fR -.IP -Accept command line and JSON\-RPC commands -.HP \fB\-rest\fR .IP Accept public REST requests (default: 0) .HP +\fB\-rpcallowip=\fR<ip> +.IP +Allow JSON\-RPC connections from specified source. Valid for <ip> are a +single IP (e.g. 1.2.3.4), a network/netmask (e.g. +1.2.3.4/255.255.255.0) or a network/CIDR (e.g. 1.2.3.4/24). This +option can be specified multiple times +.HP +\fB\-rpcauth=\fR<userpw> +.IP +Username and hashed password for JSON\-RPC connections. The field +<userpw> comes in the format: <USERNAME>:<SALT>$<HASH>. A +canonical python script is included in share/rpcauth. The client +then connects normally using the +rpcuser=<USERNAME>/rpcpassword=<PASSWORD> pair of arguments. This +option can be specified multiple times +.HP \fB\-rpcbind=\fR<addr>[:port] .IP Bind to given address to listen for JSON\-RPC connections. This option is @@ -505,37 +548,18 @@ option can be specified multiple times (default: 127.0.0.1 and .HP \fB\-rpccookiefile=\fR<loc> .IP -Location of the auth cookie (default: data dir) -.HP -\fB\-rpcuser=\fR<user> -.IP -Username for JSON\-RPC connections +Location of the auth cookie. Relative paths will be prefixed by a +net\-specific datadir location. (default: data dir) .HP \fB\-rpcpassword=\fR<pw> .IP Password for JSON\-RPC connections .HP -\fB\-rpcauth=\fR<userpw> -.IP -Username and hashed password for JSON\-RPC connections. The field -<userpw> comes in the format: <USERNAME>:<SALT>$<HASH>. A -canonical python script is included in share/rpcuser. The client -then connects normally using the -rpcuser=<USERNAME>/rpcpassword=<PASSWORD> pair of arguments. This -option can be specified multiple times -.HP \fB\-rpcport=\fR<port> .IP Listen for JSON\-RPC connections on <port> (default: 8332 or testnet: 18332) .HP -\fB\-rpcallowip=\fR<ip> -.IP -Allow JSON\-RPC connections from specified source. Valid for <ip> are a -single IP (e.g. 1.2.3.4), a network/netmask (e.g. -1.2.3.4/255.255.255.0) or a network/CIDR (e.g. 1.2.3.4/24). This -option can be specified multiple times -.HP \fB\-rpcserialversion\fR .IP Sets the serialization of raw transaction or block hex returned in @@ -544,6 +568,14 @@ non\-verbose mode, non\-segwit(0) or segwit(1) (default: 1) \fB\-rpcthreads=\fR<n> .IP Set the number of threads to service RPC calls (default: 4) +.HP +\fB\-rpcuser=\fR<user> +.IP +Username for JSON\-RPC connections +.HP +\fB\-server\fR +.IP +Accept command line and JSON\-RPC commands .SH COPYRIGHT Copyright (C) 2009-2018 The Bitcoin Core developers diff --git a/doc/reduce-traffic.md b/doc/reduce-traffic.md index 697099beab..dd1469f563 100644 --- a/doc/reduce-traffic.md +++ b/doc/reduce-traffic.md @@ -3,7 +3,7 @@ Reduce Traffic Some node operators need to deal with bandwidth caps imposed by their ISPs. -By default, bitcoin-core allows up to 125 connections to different peers, 8 of +By default, Bitcoin Core allows up to 125 connections to different peers, 8 of which are outbound. You can therefore, have at most 117 inbound connections. The default settings can result in relatively significant traffic consumption. diff --git a/doc/release-notes-pr10267.md b/doc/release-notes-pr10267.md deleted file mode 100644 index 7e1967daf0..0000000000 --- a/doc/release-notes-pr10267.md +++ /dev/null @@ -1,13 +0,0 @@ -Changed command-line options ----------------------------- - -- `-includeconf=<file>` can be used to include additional configuration files. - Only works inside the `bitcoin.conf` file, not inside included files or from - command-line. Multiple files may be included. Can be disabled from command- - line via `-noincludeconf`. Note that multi-argument commands like - `-includeconf` will override preceding `-noincludeconf`, i.e. - - noincludeconf=1 - includeconf=relative.conf - - as bitcoin.conf will still include `relative.conf`. diff --git a/doc/release-notes-pr10740.md b/doc/release-notes-pr10740.md deleted file mode 100644 index a2eb8cd837..0000000000 --- a/doc/release-notes-pr10740.md +++ /dev/null @@ -1,10 +0,0 @@ -Dynamic loading and creation of wallets ---------------------------------------- - -Previously, wallets could only be loaded or created at startup, by specifying `-wallet` parameters on the command line or in the bitcoin.conf file. It is now possible to load, create and unload wallets dynamically at runtime: - -- Existing wallets can be loaded by calling the `loadwallet` RPC. The wallet can be specified as file/directory basename (which must be located in the `walletdir` directory), or as an absolute path to a file/directory. -- New wallets can be created (and loaded) by calling the `createwallet` RPC. The provided name must not match a wallet file in the `walletdir` directory or the name of a wallet that is currently loaded. -- Loaded wallets can be unloaded by calling the `unloadwallet` RPC. - -This feature is currently only available through the RPC interface. diff --git a/doc/release-notes-pr12257.md b/doc/release-notes-pr12257.md deleted file mode 100644 index 293a00ad75..0000000000 --- a/doc/release-notes-pr12257.md +++ /dev/null @@ -1,9 +0,0 @@ -Notable changes -=============== - -Coin selection --------------- -- A new `-avoidpartialspends` flag has been added (default=false). If enabled, the wallet will try to spend UTXO's that point at the same destination - together. This is a privacy increase, as there will no longer be cases where a wallet will inadvertently spend only parts of the coins sent to - the same address (note that if someone were to send coins to that address after it was used, those coins will still be included in future - coin selections). diff --git a/doc/release-notes-pr12823.md b/doc/release-notes-pr12823.md deleted file mode 100644 index b493908716..0000000000 --- a/doc/release-notes-pr12823.md +++ /dev/null @@ -1,20 +0,0 @@ -Configuration sections for testnet and regtest ----------------------------------------------- - -It is now possible for a single configuration file to set different -options for different networks. This is done by using sections or by -prefixing the option with the network, such as: - - main.uacomment=bitcoin - test.uacomment=bitcoin-testnet - regtest.uacomment=regtest - [main] - mempoolsize=300 - [test] - mempoolsize=100 - [regtest] - mempoolsize=20 - -The `addnode=`, `connect=`, `port=`, `bind=`, `rpcport=`, `rpcbind=` -and `wallet=` options will only apply to mainnet when specified in the -configuration file, unless a network is specified. diff --git a/doc/release-notes-pr12892.md b/doc/release-notes-pr12892.md deleted file mode 100644 index f4a95bd40f..0000000000 --- a/doc/release-notes-pr12892.md +++ /dev/null @@ -1,37 +0,0 @@ -'label' and 'account' APIs for wallet -------------------------------------- - -A new 'label' API has been introduced for the wallet. This is intended as a -replacement for the deprecated 'account' API. The 'account' can continue to -be used in V0.17 by starting bitcoind with the '-deprecatedrpc=accounts' -argument, and will be fully removed in V0.18. - -The label RPC methods mirror the account functionality, with the following functional differences: - -- Labels can be set on any address, not just receiving addresses. This functionality was previously only available through the GUI. -- Labels can be deleted by reassigning all addresses using the `setlabel` RPC method. -- There isn't support for sending transactions _from_ a label, or for determining which label a transaction was sent from. -- Labels do not have a balance. - -Here are the changes to RPC methods: - -| Deprecated Method | New Method | Notes | -| :---------------------- | :-------------------- | :-----------| -| `getaccount` | `getaddressinfo` | `getaddressinfo` returns a json object with address information instead of just the name of the account as a string. | -| `getaccountaddress` | n/a | There is no replacement for `getaccountaddress` since labels do not have an associated receive address. | -| `getaddressesbyaccount` | `getaddressesbylabel` | `getaddressesbylabel` returns a json object with the addresses as keys, instead of a list of strings. | -| `getreceivedbyaccount` | `getreceivedbylabel` | _no change in behavior_ | -| `listaccounts` | `listlabels` | `listlabels` does not return a balance or accept `minconf` and `watchonly` arguments. | -| `listreceivedbyaccount` | `listreceivedbylabel` | Both methods return new `label` fields, along with `account` fields for backward compatibility. | -| `move` | n/a | _no replacement_ | -| `sendfrom` | n/a | _no replacement_ | -| `setaccount` | `setlabel` | Both methods now: <ul><li>allow assigning labels to any address, instead of raising an error if the address is not receiving address.<li>delete the previous label associated with an address when the final address using that label is reassigned to a different label, instead of making an implicit `getaccountaddress` call to ensure the previous label still has a receiving address. | - -| Changed Method | Notes | -| :--------------------- | :------ | -| `addmultisigaddress` | Renamed `account` named parameter to `label`. Still accepts `account` for backward compatibility if running with '-deprecatedrpc=accounts'. | -| `getnewaddress` | Renamed `account` named parameter to `label`. Still accepts `account` for backward compatibility. if running with '-deprecatedrpc=accounts' | -| `listunspent` | Returns new `label` fields. `account` field will be returned for backward compatibility if running with '-deprecatedrpc=accounts' | -| `sendmany` | The `account` named parameter has been renamed to `dummy`. If provided, the `dummy` parameter must be set to the empty string, unless running with the `-deprecatedrpc=accounts` argument (in which case functionality is unchanged). | -| `listtransactions` | The `account` named parameter has been renamed to `dummy`. If provided, the `dummy` parameter must be set to the string `*`, unless running with the `-deprecatedrpc=accounts` argument (in which case functionality is unchanged). | -| `getbalance` | `account`, `minconf` and `include_watchonly` parameters are deprecated, and can only be used if running with '-deprecatedrpc=accounts' | diff --git a/doc/release-notes-pr12924.md b/doc/release-notes-pr12924.md deleted file mode 100644 index 92e7e23217..0000000000 --- a/doc/release-notes-pr12924.md +++ /dev/null @@ -1,12 +0,0 @@ -RPC changes ------------- - -### Low-level changes - -- The `getwalletinfo` RPC method now returns an `hdseedid` value, which is always the same as the incorrectly-named `hdmasterkeyid` value. `hdmasterkeyid` will be removed in V0.18. -- The `getaddressinfo` RPC method now returns an `hdseedid` value, which is always the same as the incorrectly-named `hdmasterkeyid` value. `hdmasterkeyid` will be removed in V0.18. - -Other API changes ------------------ - -- The `inactivehdmaster` property in the `dumpwallet` output has been corrected to `inactivehdseed` diff --git a/doc/release-notes-pr13033.md b/doc/release-notes-pr13033.md deleted file mode 100644 index 3ab4a984db..0000000000 --- a/doc/release-notes-pr13033.md +++ /dev/null @@ -1,11 +0,0 @@ -Transaction index changes -------------------------- - -The transaction index is now built separately from the main node procedure, -meaning the `-txindex` flag can be toggled without a full reindex. If bitcoind -is run with `-txindex` on a node that is already partially or fully synced -without one, the transaction index will be built in the background and become -available once caught up. When switching from running `-txindex` to running -without the flag, the transaction index database will *not* be deleted -automatically, meaning it could be turned back on at a later time without a full -resync. diff --git a/doc/release-notes.md b/doc/release-notes.md index ad0c42ab31..d3ba067657 100644 --- a/doc/release-notes.md +++ b/doc/release-notes.md @@ -59,99 +59,9 @@ support versions of macOS older than 10.10. Notable changes =============== -GUI changes ------------ - -- Block storage can be limited under Preferences, in the Main tab. Undoing this setting requires downloading the full blockchain again. This mode is incompatible with -txindex and -rescan. - -RPC changes +Example item ------------ -### Low-level changes - -- The `createrawtransaction` RPC will now accept an array or dictionary (kept for compatibility) for the `outputs` parameter. This means the order of transaction outputs can be specified by the client. -- The `fundrawtransaction` RPC will reject the previously deprecated `reserveChangeKey` option. -- `sendmany` now shuffles outputs to improve privacy, so any previously expected behavior with regards to output ordering can no longer be relied upon. -- The new RPC `testmempoolaccept` can be used to test acceptance of a transaction to the mempool without adding it. -- JSON transaction decomposition now includes a `weight` field which provides - the transaction's exact weight. This is included in REST /rest/tx/ and - /rest/block/ endpoints when in json mode. This is also included in `getblock` - (with verbosity=2), `listsinceblock`, `listtransactions`, and - `getrawtransaction` RPC commands. -- New `fees` field introduced in `getrawmempool`, `getmempoolancestors`, `getmempooldescendants` and - `getmempoolentry` when verbosity is set to `true` with sub-fields `ancestor`, `base`, `modified` - and `descendant` denominated in BTC. This new field deprecates previous fee fields, such as - `fee`, `modifiedfee`, `ancestorfee` and `descendantfee`. -- The new RPC `getzmqnotifications` returns information about active ZMQ - notifications. - -External wallet files ---------------------- - -The `-wallet=<path>` option now accepts full paths instead of requiring wallets -to be located in the -walletdir directory. - -Newly created wallet format ---------------------------- - -If `-wallet=<path>` is specified with a path that does not exist, it will now -create a wallet directory at the specified location (containing a wallet.dat -data file, a db.log file, and database/log.?????????? files) instead of just -creating a data file at the path and storing log files in the parent -directory. This should make backing up wallets more straightforward than -before because the specified wallet path can just be directly archived without -having to look in the parent directory for transaction log files. - -For backwards compatibility, wallet paths that are names of existing data files -in the `-walletdir` directory will continue to be accepted and interpreted the -same as before. - -Low-level RPC changes ---------------------- - -- When bitcoin is not started with any `-wallet=<path>` options, the name of - the default wallet returned by `getwalletinfo` and `listwallets` RPCs is - now the empty string `""` instead of `"wallet.dat"`. If bitcoin is started - with any `-wallet=<path>` options, there is no change in behavior, and the - name of any wallet is just its `<path>` string. -- Passing an empty string (`""`) as the `address_type` parameter to - `getnewaddress`, `getrawchangeaddress`, `addmultisigaddress`, - `fundrawtransaction` RPCs is now an error. Previously, this would fall back - to using the default address type. It is still possible to pass null or leave - the parameter unset to use the default address type. - -- Bare multisig outputs to our keys are no longer automatically treated as - incoming payments. As this feature was only available for multisig outputs for - which you had all private keys in your wallet, there was generally no use for - them compared to single-key schemes. Furthermore, no address format for such - outputs is defined, and wallet software can't easily send to it. These outputs - will no longer show up in `listtransactions`, `listunspent`, or contribute to - your balance, unless they are explicitly watched (using `importaddress` or - `importmulti` with hex script argument). `signrawtransaction*` also still - works for them. - -### Logging - -- The log timestamp format is now ISO 8601 (e.g. "2018-02-28T12:34:56Z"). - -- When running bitcoind with `-debug` but without `-daemon`, logging to stdout - is now the default behavior. Setting `-printtoconsole=1` no longer implicitly - disables logging to debug.log. Instead, logging to file can be explicitly disabled - by setting `-debuglogfile=0`. - -Miner block size removed ------------------------- - -The `-blockmaxsize` option for miners to limit their blocks' sizes was -deprecated in V0.15.1, and has now been removed. Miners should use the -`-blockmaxweight` option if they want to limit the weight of their blocks' -weights. - -Python Support --------------- - -Support for Python 2 has been discontinued for all test files and tools. - Credits ======= diff --git a/doc/tor.md b/doc/tor.md index f0f98b7d12..2d0676c89a 100644 --- a/doc/tor.md +++ b/doc/tor.md @@ -1,20 +1,20 @@ # TOR SUPPORT IN BITCOIN -It is possible to run Bitcoin as a Tor hidden service, and connect to such services. +It is possible to run Bitcoin Core as a Tor hidden service, and connect to such services. The following directions assume you have a Tor proxy running on port 9050. Many distributions default to having a SOCKS proxy listening on port 9050, but others may not. In particular, the Tor Browser Bundle defaults to listening on port 9150. See [Tor Project FAQ:TBBSocksPort](https://www.torproject.org/docs/faq.html.en#TBBSocksPort) for how to properly configure Tor. -## 1. Run bitcoin behind a Tor proxy +## 1. Run Bitcoin Core behind a Tor proxy -The first step is running Bitcoin behind a Tor proxy. This will already make all -outgoing connections be anonymized, but more is possible. +The first step is running Bitcoin Core behind a Tor proxy. This will already anonymize all +outgoing connections, but more is possible. -proxy=ip:port Set the proxy server. If SOCKS5 is selected (default), this proxy server will be used to try to reach .onion addresses as well. - -onion=ip:port Set the proxy server to use for tor hidden services. You do not + -onion=ip:port Set the proxy server to use for Tor hidden services. You do not need to set this if it's the same as -proxy. You can use -noonion to explicitly disable access to hidden service. @@ -32,7 +32,7 @@ In a typical situation, this suffices to run behind a Tor proxy: ./bitcoind -proxy=127.0.0.1:9050 -## 2. Run a bitcoin hidden server +## 2. Run a Bitcoin Core hidden server If you configure your Tor system accordingly, it is possible to make your node also reachable from the Tor network. Add these lines to your /etc/tor/torrc (or equivalent @@ -48,11 +48,11 @@ your bitcoind's P2P listen port (8333 by default). -externalip=X You can tell bitcoin about its publicly reachable address using this option, and this can be a .onion address. Given the above - configuration, you can find your onion address in - /var/lib/tor/bitcoin-service/hostname. Onion addresses are given - preference for your node to advertise itself with, for connections + configuration, you can find your .onion address in + /var/lib/tor/bitcoin-service/hostname. For connections coming from unroutable addresses (such as 127.0.0.1, where the - Tor proxy typically runs). + Tor proxy typically runs), .onion addresses are given + preference for your node to advertise itself with. -listen You'll need to enable listening for incoming connections, as this is off by default behind a proxy. @@ -68,7 +68,7 @@ In a typical situation, where you're only reachable via Tor, this should suffice ./bitcoind -proxy=127.0.0.1:9050 -externalip=57qr3yd1nyntf5k.onion -listen -(obviously, replace the Onion address with your own). It should be noted that you still +(obviously, replace the .onion address with your own). It should be noted that you still listen on all devices and another node could establish a clearnet connection, when knowing your address. To mitigate this, additionally bind the address of your Tor proxy: @@ -81,7 +81,7 @@ as well, use `discover` instead: and open port 8333 on your firewall (or use -upnp). -If you only want to use Tor to reach onion addresses, but not use it as a proxy +If you only want to use Tor to reach .onion addresses, but not use it as a proxy for normal IPv4/IPv6 communication, use: ./bitcoind -onion=127.0.0.1:9050 -externalip=57qr3yd1nyntf5k.onion -discover @@ -101,20 +101,20 @@ requires a Tor connection to work. It can be explicitly disabled with `-listenon and, if not disabled, configured using the `-torcontrol` and `-torpassword` settings. To show verbose debugging information, pass `-debug=tor`. -Connecting to Tor's control socket API requires one of two authentication methods to be -configured. For cookie authentication the user running bitcoind must have write access -to the `CookieAuthFile` specified in Tor configuration. In some cases this is -preconfigured and the creation of a hidden service is automatic. If permission problems -are seen with `-debug=tor` they can be resolved by adding both the user running tor and -the user running bitcoind to the same group and setting permissions appropriately. On -Debian-based systems the user running bitcoind can be added to the debian-tor group, -which has the appropriate permissions. An alternative authentication method is the use -of the `-torpassword` flag and a `hash-password` which can be enabled and specified in +Connecting to Tor's control socket API requires one of two authentication methods to be +configured. For cookie authentication the user running bitcoind must have write access +to the `CookieAuthFile` specified in Tor configuration. In some cases, this is +preconfigured and the creation of a hidden service is automatic. If permission problems +are seen with `-debug=tor` they can be resolved by adding both the user running Tor and +the user running bitcoind to the same group and setting permissions appropriately. On +Debian-based systems the user running bitcoind can be added to the debian-tor group, +which has the appropriate permissions. An alternative authentication method is the use +of the `-torpassword` flag and a `hash-password` which can be enabled and specified in Tor configuration. ## 4. Privacy recommendations -- Do not add anything but bitcoin ports to the hidden service created in section 2. +- Do not add anything but Bitcoin Core ports to the hidden service created in section 2. If you run a web service too, create a new hidden service for that. Otherwise it is trivial to link them, which may reduce privacy. Hidden services created automatically (as in section 3) always have only one port diff --git a/doc/translation_process.md b/doc/translation_process.md index 022d7bb00b..19f145e9bf 100644 --- a/doc/translation_process.md +++ b/doc/translation_process.md @@ -62,7 +62,7 @@ token = username = USERNAME ``` -The Transifex Bitcoin project config file is included as part of the repo. It can be found at `.tx/config`, however you shouldn’t need change anything. +The Transifex Bitcoin project config file is included as part of the repo. It can be found at `.tx/config`, however you shouldn’t need to change anything. ### Synchronising translations To assist in updating translations, we have created a script to help. diff --git a/share/qt/extract_strings_qt.py b/share/qt/extract_strings_qt.py index e908071321..76ef12eeec 100755 --- a/share/qt/extract_strings_qt.py +++ b/share/qt/extract_strings_qt.py @@ -1,5 +1,5 @@ #!/usr/bin/env python3 -# Copyright (c) 2012-2017 The Bitcoin Core developers +# Copyright (c) 2012-2018 The Bitcoin Core developers # Distributed under the MIT software license, see the accompanying # file COPYING or http://www.opensource.org/licenses/mit-license.php. ''' diff --git a/share/rpcauth/rpcauth.py b/share/rpcauth/rpcauth.py index 566c55aba9..13bef3d37a 100755 --- a/share/rpcauth/rpcauth.py +++ b/share/rpcauth/rpcauth.py @@ -1,5 +1,5 @@ #!/usr/bin/env python3 -# Copyright (c) 2015-2017 The Bitcoin Core developers +# Copyright (c) 2015-2018 The Bitcoin Core developers # Distributed under the MIT software license, see the accompanying # file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/Makefile.am b/src/Makefile.am index 60ecf07a59..d1693fa85c 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -158,6 +158,7 @@ BITCOIN_CORE_H = \ rpc/register.h \ rpc/util.h \ scheduler.h \ + script/descriptor.h \ script/ismine.h \ script/sigcache.h \ script/sign.h \ @@ -387,6 +388,7 @@ libbitcoin_common_a_SOURCES = \ policy/feerate.cpp \ protocol.cpp \ scheduler.cpp \ + script/descriptor.cpp \ script/ismine.cpp \ script/sign.cpp \ script/standard.cpp \ diff --git a/src/Makefile.test.include b/src/Makefile.test.include index 02f2063504..6f401636f5 100644 --- a/src/Makefile.test.include +++ b/src/Makefile.test.include @@ -47,6 +47,7 @@ BITCOIN_TESTS =\ test/crypto_tests.cpp \ test/cuckoocache_tests.cpp \ test/denialofservice_tests.cpp \ + test/descriptor_tests.cpp \ test/getarg_tests.cpp \ test/hash_tests.cpp \ test/key_io_tests.cpp \ diff --git a/src/addrdb.cpp b/src/addrdb.cpp index 59305ff187..3eae2b5127 100644 --- a/src/addrdb.cpp +++ b/src/addrdb.cpp @@ -1,5 +1,5 @@ // Copyright (c) 2009-2010 Satoshi Nakamoto -// Copyright (c) 2009-2017 The Bitcoin Core developers +// Copyright (c) 2009-2018 The Bitcoin Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/addrdb.h b/src/addrdb.h index e39bd6f5ae..90eca44bdb 100644 --- a/src/addrdb.h +++ b/src/addrdb.h @@ -1,5 +1,5 @@ // Copyright (c) 2009-2010 Satoshi Nakamoto -// Copyright (c) 2009-2017 The Bitcoin Core developers +// Copyright (c) 2009-2018 The Bitcoin Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/addrman.cpp b/src/addrman.cpp index 3337ec54db..093b263ab3 100644 --- a/src/addrman.cpp +++ b/src/addrman.cpp @@ -1,5 +1,5 @@ // Copyright (c) 2012 Pieter Wuille -// Copyright (c) 2012-2017 The Bitcoin Core developers +// Copyright (c) 2012-2018 The Bitcoin Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/addrman.h b/src/addrman.h index dc8ef8375b..cf1949c28c 100644 --- a/src/addrman.h +++ b/src/addrman.h @@ -1,5 +1,5 @@ // Copyright (c) 2012 Pieter Wuille -// Copyright (c) 2012-2017 The Bitcoin Core developers +// Copyright (c) 2012-2018 The Bitcoin Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/arith_uint256.cpp b/src/arith_uint256.cpp index c7ddb17eb0..13fa176f8b 100644 --- a/src/arith_uint256.cpp +++ b/src/arith_uint256.cpp @@ -1,5 +1,5 @@ // Copyright (c) 2009-2010 Satoshi Nakamoto -// Copyright (c) 2009-2017 The Bitcoin Core developers +// Copyright (c) 2009-2018 The Bitcoin Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/arith_uint256.h b/src/arith_uint256.h index e4c7575e2d..5cc273be27 100644 --- a/src/arith_uint256.h +++ b/src/arith_uint256.h @@ -1,5 +1,5 @@ // Copyright (c) 2009-2010 Satoshi Nakamoto -// Copyright (c) 2009-2017 The Bitcoin Core developers +// Copyright (c) 2009-2018 The Bitcoin Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/base58.cpp b/src/base58.cpp index feec2d4e05..7020c24055 100644 --- a/src/base58.cpp +++ b/src/base58.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2014-2017 The Bitcoin Core developers +// Copyright (c) 2014-2018 The Bitcoin Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/base58.h b/src/base58.h index 8f2833bec9..9d3f90652e 100644 --- a/src/base58.h +++ b/src/base58.h @@ -1,5 +1,5 @@ // Copyright (c) 2009-2010 Satoshi Nakamoto -// Copyright (c) 2009-2017 The Bitcoin Core developers +// Copyright (c) 2009-2018 The Bitcoin Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/bench/base58.cpp b/src/bench/base58.cpp index 70bfd7d0bf..a555376e40 100644 --- a/src/bench/base58.cpp +++ b/src/bench/base58.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2016-2017 The Bitcoin Core developers +// Copyright (c) 2016-2018 The Bitcoin Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/bench/bench.cpp b/src/bench/bench.cpp index de3e57b04f..966b99f6c8 100644 --- a/src/bench/bench.cpp +++ b/src/bench/bench.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2015-2017 The Bitcoin Core developers +// Copyright (c) 2015-2018 The Bitcoin Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/bench/bench.h b/src/bench/bench.h index 5d131c2aa8..35eeab3393 100644 --- a/src/bench/bench.h +++ b/src/bench/bench.h @@ -1,4 +1,4 @@ -// Copyright (c) 2015-2017 The Bitcoin Core developers +// Copyright (c) 2015-2018 The Bitcoin Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/bench/bench_bitcoin.cpp b/src/bench/bench_bitcoin.cpp index 92befdd593..603b858e54 100644 --- a/src/bench/bench_bitcoin.cpp +++ b/src/bench/bench_bitcoin.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2015-2017 The Bitcoin Core developers +// Copyright (c) 2015-2018 The Bitcoin Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/bench/block_assemble.cpp b/src/bench/block_assemble.cpp index 9b53c6b023..bc99b8cdcd 100644 --- a/src/bench/block_assemble.cpp +++ b/src/bench/block_assemble.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2011-2017 The Bitcoin Core developers +// Copyright (c) 2011-2018 The Bitcoin Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. @@ -41,7 +41,8 @@ static CTxIn MineBlock(const CScript& coinbase_scriptPubKey) auto block = PrepareBlock(coinbase_scriptPubKey); while (!CheckProofOfWork(block->GetHash(), block->nBits, Params().GetConsensus())) { - assert(++block->nNonce); + ++block->nNonce; + assert(block->nNonce); } bool processed{ProcessNewBlock(Params(), block, true, nullptr)}; diff --git a/src/bench/ccoins_caching.cpp b/src/bench/ccoins_caching.cpp index 74169bcad7..db303eeead 100644 --- a/src/bench/ccoins_caching.cpp +++ b/src/bench/ccoins_caching.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2016-2017 The Bitcoin Core developers +// Copyright (c) 2016-2018 The Bitcoin Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/bench/checkblock.cpp b/src/bench/checkblock.cpp index fac7e079a7..6f03581c4b 100644 --- a/src/bench/checkblock.cpp +++ b/src/bench/checkblock.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2016-2017 The Bitcoin Core developers +// Copyright (c) 2016-2018 The Bitcoin Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. @@ -28,7 +28,8 @@ static void DeserializeBlockTest(benchmark::State& state) while (state.KeepRunning()) { CBlock block; stream >> block; - assert(stream.Rewind(sizeof(block_bench::block413567))); + bool rewound = stream.Rewind(sizeof(block_bench::block413567)); + assert(rewound); } } @@ -45,10 +46,12 @@ static void DeserializeAndCheckBlockTest(benchmark::State& state) while (state.KeepRunning()) { CBlock block; // Note that CBlock caches its checked state, so we need to recreate it here stream >> block; - assert(stream.Rewind(sizeof(block_bench::block413567))); + bool rewound = stream.Rewind(sizeof(block_bench::block413567)); + assert(rewound); CValidationState validationState; - assert(CheckBlock(block, validationState, chainParams->GetConsensus())); + bool checked = CheckBlock(block, validationState, chainParams->GetConsensus()); + assert(checked); } } diff --git a/src/bench/checkqueue.cpp b/src/bench/checkqueue.cpp index 6e816f1bec..79689f6e0b 100644 --- a/src/bench/checkqueue.cpp +++ b/src/bench/checkqueue.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2015-2017 The Bitcoin Core developers +// Copyright (c) 2015-2018 The Bitcoin Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/bench/coin_selection.cpp b/src/bench/coin_selection.cpp index 20013d702b..0a6f5d85ea 100644 --- a/src/bench/coin_selection.cpp +++ b/src/bench/coin_selection.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2012-2017 The Bitcoin Core developers +// Copyright (c) 2012-2018 The Bitcoin Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/bench/crypto_hash.cpp b/src/bench/crypto_hash.cpp index 7d907eaf10..bab22f5984 100644 --- a/src/bench/crypto_hash.cpp +++ b/src/bench/crypto_hash.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2016-2017 The Bitcoin Core developers +// Copyright (c) 2016-2018 The Bitcoin Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/bench/examples.cpp b/src/bench/examples.cpp index b68c9cd156..6d95e05ef6 100644 --- a/src/bench/examples.cpp +++ b/src/bench/examples.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2015-2017 The Bitcoin Core developers +// Copyright (c) 2015-2018 The Bitcoin Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/bench/lockedpool.cpp b/src/bench/lockedpool.cpp index 55a00318c1..0712eab4bc 100644 --- a/src/bench/lockedpool.cpp +++ b/src/bench/lockedpool.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2016-2017 The Bitcoin Core developers +// Copyright (c) 2016-2018 The Bitcoin Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/bench/mempool_eviction.cpp b/src/bench/mempool_eviction.cpp index d37291b900..0ec7c158cc 100644 --- a/src/bench/mempool_eviction.cpp +++ b/src/bench/mempool_eviction.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2011-2017 The Bitcoin Core developers +// Copyright (c) 2011-2018 The Bitcoin Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/bench/merkle_root.cpp b/src/bench/merkle_root.cpp index fab12da311..bdb2bdbe3d 100644 --- a/src/bench/merkle_root.cpp +++ b/src/bench/merkle_root.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2016 The Bitcoin Core developers +// Copyright (c) 2016-2018 The Bitcoin Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/bench/prevector.cpp b/src/bench/prevector.cpp index 7986d0da79..8cc404b9e2 100644 --- a/src/bench/prevector.cpp +++ b/src/bench/prevector.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2015-2017 The Bitcoin Core developers +// Copyright (c) 2015-2018 The Bitcoin Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/bench/rollingbloom.cpp b/src/bench/rollingbloom.cpp index f7f72605d7..43e7635047 100644 --- a/src/bench/rollingbloom.cpp +++ b/src/bench/rollingbloom.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2016-2017 The Bitcoin Core developers +// Copyright (c) 2016-2018 The Bitcoin Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/bench/verify_script.cpp b/src/bench/verify_script.cpp index ae60588c2d..312b66e38a 100644 --- a/src/bench/verify_script.cpp +++ b/src/bench/verify_script.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2016-2017 The Bitcoin Core developers +// Copyright (c) 2016-2018 The Bitcoin Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. @@ -76,7 +76,7 @@ static void VerifyScriptBench(benchmark::State& state) CMutableTransaction txSpend = BuildSpendingTransaction(scriptSig, txCredit); CScriptWitness& witness = txSpend.vin[0].scriptWitness; witness.stack.emplace_back(); - key.Sign(SignatureHash(witScriptPubkey, txSpend, 0, SIGHASH_ALL, txCredit.vout[0].nValue, SigVersion::WITNESS_V0), witness.stack.back(), 0); + key.Sign(SignatureHash(witScriptPubkey, txSpend, 0, SIGHASH_ALL, txCredit.vout[0].nValue, SigVersion::WITNESS_V0), witness.stack.back()); witness.stack.back().push_back(static_cast<unsigned char>(SIGHASH_ALL)); witness.stack.push_back(ToByteVector(pubkey)); diff --git a/src/bitcoin-cli.cpp b/src/bitcoin-cli.cpp index a77e3d49b8..db713f58d2 100644 --- a/src/bitcoin-cli.cpp +++ b/src/bitcoin-cli.cpp @@ -1,5 +1,5 @@ // Copyright (c) 2009-2010 Satoshi Nakamoto -// Copyright (c) 2009-2017 The Bitcoin Core developers +// Copyright (c) 2009-2018 The Bitcoin Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. @@ -49,8 +49,8 @@ static void SetupCliArgs() gArgs.AddArg("-rpcuser=<user>", "Username for JSON-RPC connections", false, OptionsCategory::OPTIONS); gArgs.AddArg("-rpcwait", "Wait for RPC server to start", false, OptionsCategory::OPTIONS); gArgs.AddArg("-rpcwallet=<walletname>", "Send RPC for non-default wallet on RPC server (needs to exactly match corresponding -wallet option passed to bitcoind)", false, OptionsCategory::OPTIONS); - gArgs.AddArg("-stdin", "Read extra arguments from standard input, one per line until EOF/Ctrl-D (recommended for sensitive information such as passphrases). When combined with -stdinrpcpass, the first line from standard input is used for the RPC password.", false, OptionsCategory::OPTIONS); - gArgs.AddArg("-stdinrpcpass", strprintf("Read RPC password from standard input as a single line. When combined with -stdin, the first line from standard input is used for the RPC password."), false, OptionsCategory::OPTIONS); + gArgs.AddArg("-stdin", "Read extra arguments from standard input, one per line until EOF/Ctrl-D (recommended for sensitive information such as passphrases). When combined with -stdinrpcpass, the first line from standard input is used for the RPC password.", false, OptionsCategory::OPTIONS); + gArgs.AddArg("-stdinrpcpass", "Read RPC password from standard input as a single line. When combined with -stdin, the first line from standard input is used for the RPC password.", false, OptionsCategory::OPTIONS); // Hidden gArgs.AddArg("-h", "", false, OptionsCategory::HIDDEN); @@ -104,14 +104,13 @@ static int AppInitRPC(int argc, char* argv[]) return EXIT_FAILURE; } if (argc < 2 || HelpRequested(gArgs) || gArgs.IsArgSet("-version")) { - std::string strUsage = strprintf("%s RPC client version", PACKAGE_NAME) + " " + FormatFullVersion() + "\n"; + std::string strUsage = PACKAGE_NAME " RPC client version " + FormatFullVersion() + "\n"; if (!gArgs.IsArgSet("-version")) { - strUsage += "\nUsage:\n" - " bitcoin-cli [options] <command> [params] " + strprintf("Send command to %s", PACKAGE_NAME) + "\n" + - " bitcoin-cli [options] -named <command> [name=value] ... " + strprintf("Send command to %s (with named arguments)", PACKAGE_NAME) + "\n" + - " bitcoin-cli [options] help List commands\n" + - " bitcoin-cli [options] help <command> Get help for a command\n"; - + strUsage += "\n" + "Usage: bitcoin-cli [options] <command> [params] Send command to " PACKAGE_NAME "\n" + "or: bitcoin-cli [options] -named <command> [name=value]... Send command to " PACKAGE_NAME " (with named arguments)\n" + "or: bitcoin-cli [options] help List commands\n" + "or: bitcoin-cli [options] help <command> Get help for a command\n"; strUsage += "\n" + gArgs.GetHelpMessage(); } diff --git a/src/bitcoin-tx.cpp b/src/bitcoin-tx.cpp index 181e2bb1bc..5fef4724c9 100644 --- a/src/bitcoin-tx.cpp +++ b/src/bitcoin-tx.cpp @@ -98,11 +98,10 @@ static int AppInitRawTx(int argc, char* argv[]) if (argc < 2 || HelpRequested(gArgs)) { // First part of help message is specific to this utility - std::string strUsage = strprintf("%s bitcoin-tx utility version", PACKAGE_NAME) + " " + FormatFullVersion() + "\n\n" + - "Usage:\n" - " bitcoin-tx [options] <hex-tx> [commands] Update hex-encoded bitcoin transaction\n" + - " bitcoin-tx [options] -create [commands] Create hex-encoded bitcoin transaction\n" + - "\n"; + std::string strUsage = PACKAGE_NAME " bitcoin-tx utility version " + FormatFullVersion() + "\n\n" + + "Usage: bitcoin-tx [options] <hex-tx> [commands] Update hex-encoded bitcoin transaction\n" + + "or: bitcoin-tx [options] -create [commands] Create hex-encoded bitcoin transaction\n" + + "\n"; strUsage += gArgs.GetHelpMessage(); fprintf(stdout, "%s", strUsage.c_str()); diff --git a/src/bitcoind.cpp b/src/bitcoind.cpp index 4d010c0d14..06f8622426 100644 --- a/src/bitcoind.cpp +++ b/src/bitcoind.cpp @@ -71,7 +71,7 @@ static bool AppInit(int argc, char* argv[]) // Process help and version before taking care about datadir if (HelpRequested(gArgs) || gArgs.IsArgSet("-version")) { - std::string strUsage = strprintf("%s Daemon", PACKAGE_NAME) + " version " + FormatFullVersion() + "\n"; + std::string strUsage = PACKAGE_NAME " Daemon version " + FormatFullVersion() + "\n"; if (gArgs.IsArgSet("-version")) { @@ -79,9 +79,7 @@ static bool AppInit(int argc, char* argv[]) } else { - strUsage += "\nUsage:\n" - " bitcoind [options] " + strprintf("Start %s Daemon", PACKAGE_NAME) + "\n"; - + strUsage += "\nUsage: bitcoind [options] Start " PACKAGE_NAME " Daemon\n"; strUsage += "\n" + gArgs.GetHelpMessage(); } diff --git a/src/blockencodings.cpp b/src/blockencodings.cpp index 391db0cfcb..b17ff3507d 100644 --- a/src/blockencodings.cpp +++ b/src/blockencodings.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2016-2017 The Bitcoin Core developers +// Copyright (c) 2016-2018 The Bitcoin Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/blockencodings.h b/src/blockencodings.h index 3a0828b307..fad1f56f54 100644 --- a/src/blockencodings.h +++ b/src/blockencodings.h @@ -1,4 +1,4 @@ -// Copyright (c) 2016-2017 The Bitcoin Core developers +// Copyright (c) 2016-2018 The Bitcoin Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/bloom.cpp b/src/bloom.cpp index 799e0eef00..94aae742f1 100644 --- a/src/bloom.cpp +++ b/src/bloom.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2012-2017 The Bitcoin Core developers +// Copyright (c) 2012-2018 The Bitcoin Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. @@ -38,17 +38,6 @@ CBloomFilter::CBloomFilter(const unsigned int nElements, const double nFPRate, c { } -// Private constructor used by CRollingBloomFilter -CBloomFilter::CBloomFilter(const unsigned int nElements, const double nFPRate, const unsigned int nTweakIn) : - vData((unsigned int)(-1 / LN2SQUARED * nElements * log(nFPRate)) / 8), - isFull(false), - isEmpty(true), - nHashFuncs((unsigned int)(vData.size() * 8 / nElements * LN2)), - nTweak(nTweakIn), - nFlags(BLOOM_UPDATE_NONE) -{ -} - inline unsigned int CBloomFilter::Hash(unsigned int nHashNum, const std::vector<unsigned char>& vDataToHash) const { // 0xFBA4C795 chosen as it guarantees a reasonable bit difference between nHashNum values. diff --git a/src/bloom.h b/src/bloom.h index 71386f52fa..7d3aa878b0 100644 --- a/src/bloom.h +++ b/src/bloom.h @@ -1,4 +1,4 @@ -// Copyright (c) 2012-2017 The Bitcoin Core developers +// Copyright (c) 2012-2018 The Bitcoin Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. @@ -53,10 +53,6 @@ private: unsigned int Hash(unsigned int nHashNum, const std::vector<unsigned char>& vDataToHash) const; - // Private constructor for CRollingBloomFilter, no restrictions on size - CBloomFilter(const unsigned int nElements, const double nFPRate, const unsigned int nTweak); - friend class CRollingBloomFilter; - public: /** * Creates a new bloom filter which will provide the given fp rate when filled with the given number of elements diff --git a/src/chain.cpp b/src/chain.cpp index 79e8bdfa44..d462f94ab5 100644 --- a/src/chain.cpp +++ b/src/chain.cpp @@ -1,5 +1,5 @@ // Copyright (c) 2009-2010 Satoshi Nakamoto -// Copyright (c) 2009-2017 The Bitcoin Core developers +// Copyright (c) 2009-2018 The Bitcoin Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/chain.h b/src/chain.h index 8e6ac8d821..1c0c5a7e69 100644 --- a/src/chain.h +++ b/src/chain.h @@ -1,5 +1,5 @@ // Copyright (c) 2009-2010 Satoshi Nakamoto -// Copyright (c) 2009-2017 The Bitcoin Core developers +// Copyright (c) 2009-2018 The Bitcoin Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. @@ -117,7 +117,7 @@ struct CDiskBlockPos std::string ToString() const { - return strprintf("CBlockDiskPos(nFile=%i, nPos=%i)", nFile, nPos); + return strprintf("CDiskBlockPos(nFile=%i, nPos=%i)", nFile, nPos); } }; diff --git a/src/chainparams.cpp b/src/chainparams.cpp index b517717c97..93bb3e7647 100644 --- a/src/chainparams.cpp +++ b/src/chainparams.cpp @@ -1,5 +1,5 @@ // Copyright (c) 2010 Satoshi Nakamoto -// Copyright (c) 2009-2017 The Bitcoin Core developers +// Copyright (c) 2009-2018 The Bitcoin Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/chainparams.h b/src/chainparams.h index 344cbb1a8a..722e52ff40 100644 --- a/src/chainparams.h +++ b/src/chainparams.h @@ -1,5 +1,5 @@ // Copyright (c) 2009-2010 Satoshi Nakamoto -// Copyright (c) 2009-2017 The Bitcoin Core developers +// Copyright (c) 2009-2018 The Bitcoin Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/chainparamsbase.cpp b/src/chainparamsbase.cpp index da9f3e3209..e9e8ce03b4 100644 --- a/src/chainparamsbase.cpp +++ b/src/chainparamsbase.cpp @@ -1,5 +1,5 @@ // Copyright (c) 2010 Satoshi Nakamoto -// Copyright (c) 2009-2017 The Bitcoin Core developers +// Copyright (c) 2009-2018 The Bitcoin Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/chainparamsbase.h b/src/chainparamsbase.h index 9f8bbafcd5..355df043d3 100644 --- a/src/chainparamsbase.h +++ b/src/chainparamsbase.h @@ -1,4 +1,4 @@ -// Copyright (c) 2014-2017 The Bitcoin Core developers +// Copyright (c) 2014-2018 The Bitcoin Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/chainparamsseeds.h b/src/chainparamsseeds.h index 6e2b3c34a2..4b982a4715 100644 --- a/src/chainparamsseeds.h +++ b/src/chainparamsseeds.h @@ -8,1076 +8,785 @@ * IPv4 as well as onion addresses are wrapped inside an IPv6 address accordingly. */ static SeedSpec6 pnSeed6_main[] = { - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x05,0x13,0x05,0x7f}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x05,0x1d,0x8b,0x78}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x05,0x27,0x40,0x07}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x02,0x84,0x64,0x2f}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x05,0x01,0x61,0x04}, 8333}, {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x05,0x27,0xae,0x74}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x05,0x2d,0x45,0x0d}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x05,0x2d,0x4b,0x0f}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x05,0x2d,0x6c,0x6c}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x05,0x65,0x8c,0xc2}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x05,0x85,0x0d,0x38}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x05,0xaf,0x18,0x07}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x05,0xbd,0x85,0x82}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x05,0x2d,0x4f,0x0e}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x05,0x35,0x10,0x85}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x05,0x65,0x8b,0xa6}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x05,0xb2,0x4e,0x8b}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x05,0xbd,0xb0,0x11}, 8333}, {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x05,0xe4,0x40,0x47}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x0d,0x50,0x43,0xa2}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x0e,0xc0,0x08,0x1b}, 21301}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x17,0x59,0xc1,0xc9}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x08,0x12,0x26,0x7a}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x0d,0x73,0x60,0x3f}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x0e,0x02,0x7c,0x54}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x0e,0x03,0xaa,0x01}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x17,0x5e,0x1c,0xfa}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x17,0x6f,0xac,0x6a}, 8333}, {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x17,0x7d,0xe0,0x54}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x17,0xe1,0xa0,0x1a}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x17,0xe2,0xe7,0x7a}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x17,0xe3,0xcc,0x4e}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x17,0xee,0x84,0xbc}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x17,0xf0,0x43,0xcc}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x18,0x19,0x8d,0xba}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x18,0x78,0xeb,0xb9}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x18,0x8a,0xbc,0x3c}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x18,0xd3,0xe5,0x07}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x18,0xdc,0x4e,0xa1}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x18,0xe1,0x22,0x3e}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x18,0xe8,0x88,0x77}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x1b,0x44,0x83,0x0a}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x17,0x98,0x00,0x6c}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x17,0xaf,0x00,0xde}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x17,0xe5,0x10,0xea}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x17,0xe9,0x06,0x46}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x18,0x8e,0x22,0xfd}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x18,0xab,0xcb,0x57}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x18,0xbc,0xc8,0xaa}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x18,0xd8,0x41,0x29}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x18,0xe3,0x45,0x92}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x1b,0x21,0x0b,0xc1}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x1f,0x18,0x0b,0x8b}, 8333}, {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x1f,0x1c,0x0a,0x0d}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x1f,0x1f,0xcb,0x71}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x1f,0x91,0x6a,0x3d}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x1f,0xa5,0x11,0xa4}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x1f,0xb3,0xcc,0x8e}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x1f,0xba,0x60,0xba}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x1f,0xd2,0xac,0x15}, 8333}, {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x1f,0xd3,0x66,0x81}, 62734}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x25,0x30,0x40,0x8c}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x25,0x78,0xa3,0xb5}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x25,0x86,0xa7,0x5b}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x25,0xbf,0xe1,0xae}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x25,0xc0,0x29,0x20}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x25,0xc2,0x0a,0x1e}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x25,0xc8,0x22,0x12}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x25,0xcd,0x08,0x4e}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x26,0x1b,0x64,0x2c}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x26,0x66,0x45,0x46}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x22,0xd9,0x7a,0xb2}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x23,0xe6,0x40,0x1d}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x23,0xe7,0xe1,0x2a}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x24,0x03,0xac,0x0d}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x24,0xfb,0xa3,0x2a}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x25,0x88,0x61,0xf6}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x25,0x99,0x01,0x96}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x25,0x99,0x01,0x9d}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x25,0xe4,0x5c,0x6e}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x25,0xfc,0x0e,0x16}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x26,0x1b,0x65,0xe0}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x26,0x66,0x86,0x55}, 8333}, {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x26,0x68,0xe1,0x1e}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x29,0x56,0x68,0x5e}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x29,0xaa,0x40,0x08}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x2b,0xe5,0x4c,0x2d}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x2b,0xf8,0xa0,0x97}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x2d,0x20,0x41,0x13}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x2d,0x3e,0xc6,0x2e}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x2e,0x13,0x88,0x8a}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x2e,0x14,0xf6,0x75}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x2e,0x1c,0x45,0x8a}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x2e,0x1c,0xcd,0x70}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x2e,0xa0,0xc3,0x79}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x2e,0xa3,0x76,0x33}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x2e,0xa6,0x81,0x9f}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x2e,0xb7,0xec,0xfe}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x2e,0xe3,0x65,0xb0}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x2b,0xe5,0x4c,0x26}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x2d,0x28,0x84,0x39}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x2d,0x2d,0x22,0x7a}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x2d,0x30,0xb1,0xde}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x2e,0x13,0x22,0xec}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x2e,0x1c,0x42,0xc4}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x2e,0x1c,0xcc,0x15}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x2e,0x1c,0xcd,0xa1}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x2e,0x1e,0x2a,0x90}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x2e,0x8a,0x8b,0xc3}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x2e,0xa5,0xf5,0xdd}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x2e,0xa6,0x81,0x9b}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x2e,0xa6,0xa0,0x34}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x2e,0xa6,0xa0,0x38}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x2e,0xbc,0x2c,0x52}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x2e,0xbc,0x7e,0x4a}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x2e,0xe5,0xa5,0x91}, 8333}, {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x2e,0xe5,0xa8,0xc9}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x2e,0xee,0xee,0xb0}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x2e,0xf2,0x83,0xa8}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x2f,0x14,0x67,0x6c}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x2e,0xe5,0xee,0xbb}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x2f,0x36,0xcc,0xf6}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x2f,0x4a,0x80,0x8a}, 8333}, {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x2f,0x5e,0xe0,0x63}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x2f,0xbb,0x01,0x53}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x2f,0xdf,0xe8,0x3a}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x2f,0x61,0x60,0xc6}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x2f,0xbb,0x24,0x30}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x2f,0xda,0x10,0x51}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x2f,0xdf,0x42,0xde}, 8333}, {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x2f,0xfe,0x80,0x0f}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x2f,0xfe,0x80,0xc5}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x32,0x02,0xbd,0x23}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x32,0x1c,0x63,0x51}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x32,0x1f,0xaa,0x33}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x32,0x7e,0xc2,0xbe}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x33,0x0f,0x00,0x11}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x34,0x1d,0x00,0x25}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x34,0x3b,0x60,0x0b}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x34,0xe1,0x80,0xbf}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x36,0x54,0x62,0x45}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x36,0xc5,0x04,0x5c}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x36,0xdf,0x88,0x3e}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x3a,0xad,0xe0,0x62}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x3a,0xe5,0xd0,0xa6}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x3d,0x7d,0x83,0x37}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x3e,0x0d,0xc1,0xce}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x32,0x1f,0xaa,0x35}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x32,0x23,0x43,0x92}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x32,0x4c,0x60,0xe6}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x32,0x52,0xb1,0x8e}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x33,0x0f,0x03,0x2e}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x33,0xaf,0x8d,0xf3}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x34,0x90,0x2f,0x99}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x34,0xe8,0x26,0x7a}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x36,0x26,0xc0,0xa4}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x36,0x55,0x41,0x06}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x36,0x5b,0xe3,0xbc}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x3a,0xb4,0x24,0x0e}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x3b,0x6a,0xd0,0x44}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x3c,0x46,0x49,0x1a}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x3d,0xa0,0xea,0x39}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x3e,0x2b,0xc6,0x38}, 8333}, {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x3e,0x2d,0x00,0x0f}, 8333}, {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x3e,0x6b,0xc8,0x1e}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x3e,0x85,0xc2,0x9c}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x3e,0x8a,0x0b,0x0a}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x3e,0xb6,0xab,0x74}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x3e,0xc3,0xc1,0x23}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x3e,0xd2,0xa1,0xf9}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x3f,0x8d,0xe4,0x12}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x3f,0x8f,0x25,0x2e}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x40,0x22,0xe7,0x8c}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x40,0x27,0xea,0x31}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x40,0x6e,0x19,0x1a}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x40,0x79,0x23,0x03}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x41,0x13,0x9b,0x58}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x3e,0x85,0xc2,0x02}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x3e,0x8a,0x03,0xe0}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x3e,0x92,0x46,0xd8}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x40,0x4e,0xa3,0x0a}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x40,0x78,0x6e,0x02}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x40,0x83,0xa0,0x1f}, 8333}, {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x42,0x12,0xac,0x10}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x42,0xa0,0x80,0xd7}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x42,0x55,0x4a,0xf2}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x42,0x6e,0x84,0x0a}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x42,0x72,0x21,0x5a}, 8333}, {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x42,0xb4,0x40,0x5f}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x42,0xc2,0x26,0xfa}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x43,0x44,0x65,0xf9}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x43,0x80,0x24,0x5a}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x43,0x94,0x3c,0x82}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x42,0xde,0xa4,0xbc}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x43,0x0b,0x8b,0x43}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x43,0x2b,0xbf,0x76}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x43,0x3d,0x89,0x9d}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x43,0xc1,0xb8,0x0c}, 8333}, {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x43,0xd2,0xe4,0xcb}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x43,0xe1,0x86,0x1a}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x44,0x0c,0x62,0xf6}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x44,0xc7,0x0a,0x4b}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x45,0x27,0x31,0xc7}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x45,0x29,0xab,0x23}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x45,0x29,0xab,0xe0}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x45,0x40,0x22,0x01}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x45,0x40,0x2e,0x1b}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x45,0x40,0xe1,0x02}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x45,0x9f,0x86,0x3a}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x45,0xb5,0xa0,0x50}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x45,0xde,0xc0,0x58}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x46,0x0f,0x4a,0x48}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x43,0xd7,0x0c,0x2b}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x43,0xfd,0x48,0x77}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x44,0xc9,0xe4,0x06}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x44,0xca,0x80,0x13}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x45,0x1e,0xda,0xe2}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x45,0x3d,0x23,0xaf}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x45,0x3d,0xab,0x16}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x45,0x7d,0xc2,0x19}, 8333}, {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x46,0x23,0x62,0x0c}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x46,0x3c,0x41,0x3e}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x46,0x71,0x21,0x83}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x47,0x55,0xe2,0x4c}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x46,0x67,0xab,0x42}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x46,0xac,0xfc,0x1d}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x47,0x22,0x60,0x87}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x47,0x44,0x30,0x95}, 8333}, {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x47,0x5d,0xa1,0xa2}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x47,0xa2,0xc0,0x05}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x48,0x0b,0xae,0x47}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x48,0x32,0xf0,0x7c}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x48,0x46,0x20,0xd7}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x48,0xd3,0xc4,0xe8}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x48,0xea,0x70,0x16}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x48,0xfd,0xed,0x00}, 8333}, {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x49,0xf1,0xc0,0x28}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x4a,0x76,0xc0,0x77}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x4a,0x7a,0xed,0x7c}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x4b,0x9f,0x06,0xa7}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x4c,0x0a,0x9d,0x3a}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x4c,0x5c,0x88,0x4b}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x4a,0x0f,0xe6,0x70}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x4a,0x53,0x4f,0x34}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x4a,0x7e,0x0e,0x1b}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x4b,0x4c,0x89,0xa4}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x4c,0x40,0xa6,0xe6}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x4c,0xbf,0x4f,0x62}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x4d,0x25,0xaa,0x6a}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x4d,0x46,0x6b,0x53}, 8333}, {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x4d,0x5f,0xe2,0xc2}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x4d,0x6f,0xac,0x86}, 8333}, {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x4d,0xa3,0x88,0x88}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x4d,0xea,0x32,0x02}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x4d,0xcb,0x0d,0x39}, 8333}, {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x4d,0xef,0x25,0x0c}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x4d,0xf0,0xa8,0x13}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x4d,0xf4,0xdb,0xa4}, 8333}, {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x4e,0x1f,0x43,0x9c}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x4e,0x22,0x02,0x7e}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x4e,0x6c,0xbb,0xf6}, 8333}, {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x4e,0x6d,0xa3,0x99}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x4e,0x82,0xa1,0x4e}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x4e,0xc0,0x23,0x82}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x4e,0xf8,0x41,0x22}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x4f,0x2e,0xc2,0xa3}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x4f,0x4d,0x06,0x88}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x4f,0x62,0xc4,0x59}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x4f,0x9a,0x61,0xa8}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x4f,0xa5,0xeb,0x77}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x4f,0xa9,0x23,0xeb}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x4f,0xb6,0xa7,0x89}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x50,0x52,0x43,0xb6}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x50,0x52,0x4d,0x8a}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x50,0x54,0x36,0x1a}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x50,0xd0,0xe0,0xd9}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x50,0xd0,0xe3,0x35}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x50,0xdc,0x2b,0xe4}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x50,0xfe,0xbc,0xeb}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x51,0x07,0x0a,0xfb}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x4f,0x1c,0xcd,0x91}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x4f,0x42,0x46,0x59}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x4f,0x84,0xe6,0x90}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x50,0xd1,0xe0,0x4f}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x50,0xd3,0xfc,0x68}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x50,0xe5,0x1c,0x3c}, 8333}, {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x51,0x07,0x0d,0x54}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x51,0x07,0x10,0xb6}, 8333}, {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x51,0x12,0xe0,0x3e}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x51,0x1b,0x60,0x25}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x51,0x6c,0xc4,0x48}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x51,0xba,0xf3,0xdc}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x51,0xe4,0xc2,0xbb}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x52,0x48,0xc6,0x44}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x52,0x4a,0xe0,0x23}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x52,0x60,0x40,0x06}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x52,0x75,0xa6,0x4d}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x52,0x76,0xec,0x45}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x51,0xab,0x1b,0x8a}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x51,0xbb,0x50,0xdd}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x51,0xd9,0x70,0xe1}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x51,0xf5,0x8d,0x06}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x52,0x2b,0xab,0x5b}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x52,0x66,0x0a,0xfb}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x52,0x76,0xea,0xb2}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x52,0x90,0xc5,0x5d}, 8333}, {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x52,0xa1,0x6d,0xbe}, 8333}, {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x52,0xc1,0x66,0xe4}, 8333}, {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x52,0xc1,0x6d,0xc7}, 8333}, {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x52,0xc7,0x66,0x0a}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x52,0xc8,0xcc,0x77}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x52,0xca,0xc5,0xe0}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x52,0xd4,0x07,0xf2}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x52,0xd4,0x82,0x5e}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x52,0xd5,0xd0,0x10}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x52,0xd9,0x43,0x11}, 8333}, {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x52,0xdd,0x6c,0x1b}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x52,0xdd,0x80,0x51}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x53,0x32,0x86,0x08}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x53,0x4e,0x21,0x87}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x52,0xdd,0x85,0xae}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x53,0x37,0x82,0x1e}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x53,0x4d,0x27,0x2e}, 8333}, {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x53,0x89,0x29,0x0a}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x53,0x96,0x25,0x5e}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x53,0x95,0x46,0x30}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x53,0x97,0xe9,0xda}, 8333}, {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x53,0xa2,0x2b,0x9a}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x53,0xa4,0x83,0xf2}, 8333}, {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x53,0xa4,0x83,0xf3}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x53,0xd1,0x08,0x8c}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x53,0xec,0x87,0xfb}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x53,0xf3,0x3b,0x29}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x53,0xf9,0x0d,0xdf}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x53,0xfa,0x56,0x6c}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x54,0x5e,0xeb,0xa1}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x54,0x75,0x01,0x1b}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x53,0xdd,0x0b,0x07}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x53,0xf3,0x80,0x0d}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x54,0x10,0x26,0xda}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x54,0x26,0x03,0xf9}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x54,0x4b,0x1a,0xac}, 8333}, {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x54,0xc8,0x6a,0x80}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x54,0xd5,0x40,0x15}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x54,0xe2,0xa4,0xa1}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x54,0xf5,0x1b,0x82}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x54,0xfb,0xa1,0xcd}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x55,0x05,0x01,0x48}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x55,0x0a,0x29,0x29}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x55,0x19,0xc2,0x0c}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x55,0x5f,0xf1,0x2e}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x54,0xd4,0xfa,0xdb}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x54,0xd7,0x86,0xc3}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x54,0xf5,0x1b,0xd1}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x54,0xfe,0x28,0x98}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x54,0xff,0xc1,0x1c}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x55,0x0a,0x70,0xc2}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x55,0x5d,0x02,0x4c}, 54382}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x55,0x5e,0xac,0x21}, 8333}, {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x55,0x81,0x00,0x7e}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x55,0xaa,0xe8,0xf5}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x55,0xc3,0xe8,0x27}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x55,0x91,0xa8,0x9f}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x55,0xaa,0xee,0x1a}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x55,0xc3,0xe8,0xc5}, 8333}, {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x55,0xd6,0x44,0x7a}, 8333}, {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x55,0xd6,0xeb,0x89}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x55,0xf5,0xa7,0xf6}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x56,0x08,0x23,0x11}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x56,0x69,0x05,0x71}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x56,0x6a,0x83,0xb3}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x57,0x4f,0x44,0x56}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x57,0x78,0x08,0x05}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x57,0xef,0xca,0xef}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x58,0x62,0xc6,0x82}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x58,0x95,0x6a,0xec}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x58,0xcf,0xec,0xaf}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x59,0x23,0x1d,0x03}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x59,0x26,0x60,0x46}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x59,0x8e,0x41,0x97}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x59,0xa3,0xe0,0xc3}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x55,0xda,0x30,0x92}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x55,0xdc,0xa5,0xcd}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x55,0xe5,0x86,0x62}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x55,0xf1,0x31,0xf2}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x56,0x19,0x20,0x4d}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x56,0x29,0x59,0xaa}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x56,0x32,0x8f,0x2b}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x56,0x3d,0x43,0xb7}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x56,0x89,0x1a,0xd2}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x56,0xb1,0xc2,0xd7}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x57,0x9d,0xb1,0x3a}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x57,0xe0,0xa3,0x42}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x57,0xec,0xc4,0xa9}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x57,0xf6,0x2e,0x84}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x58,0x63,0x40,0x4c}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x59,0x01,0x64,0x31}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x59,0x0a,0x9b,0x58}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x59,0x1b,0x3b,0xf6}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x59,0xa3,0x84,0x49}, 8333}, {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x59,0xb3,0xf0,0x83}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x59,0xcd,0x51,0x05}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x59,0xd4,0x4b,0x06}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x59,0xd9,0x82,0x93}, 8333}, {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x59,0xe6,0x60,0x2a}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x59,0xec,0x65,0x34}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x5a,0xbf,0xcb,0x12}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x5b,0x41,0x07,0x1e}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x59,0xf8,0xac,0x0a}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x5a,0x2e,0x39,0x11}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x5a,0x6e,0x0b,0x65}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x5a,0xf0,0x25,0xa3}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x5b,0x41,0x04,0x15}, 8333}, {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x5b,0x41,0xc0,0x9f}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x5b,0x53,0xed,0xb9}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x5b,0x6e,0x7d,0x1a}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x5b,0x79,0xa0,0x3b}, 8333}, {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x5b,0x87,0x00,0xbb}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x5b,0x9a,0x71,0xe3}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x5b,0x8f,0x6d,0x44}, 8333}, {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x5b,0xc3,0x2a,0x86}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x5b,0xca,0x43,0x6b}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x5b,0xdd,0x47,0x73}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x5b,0xe0,0x00,0xe3}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x5b,0xe0,0x01,0x11}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x5b,0xe1,0xec,0x91}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x5b,0xe4,0x2d,0x82}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x5b,0xe7,0xe5,0x88}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x5b,0xee,0x64,0xf9}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x5c,0x1b,0x8e,0x1d}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x5b,0xdd,0x46,0x89}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x5c,0x23,0x84,0x05}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x5c,0x2a,0x25,0x8d}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x5c,0x36,0x10,0x90}, 8333}, {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x5c,0x3e,0x22,0xb8}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x5c,0xb1,0x02,0xb5}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x5c,0xf9,0xa9,0x24}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x5c,0xff,0xb0,0x6d}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x5d,0x4b,0x12,0x97}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x5d,0x4f,0xcc,0xde}, 10333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x5d,0x5f,0x64,0x9b}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x5d,0x71,0x83,0x86}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x5c,0xba,0xe7,0xf0}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x5d,0x7b,0x50,0x2f}, 8333}, {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x5d,0xaa,0x0d,0x0f}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x5d,0xab,0xc9,0x44}, 8333}, {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x5d,0xb3,0xc5,0x98}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x5d,0xbe,0xcd,0x19}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x5e,0x3b,0x87,0x94}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x5d,0xbe,0xce,0x97}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x5d,0xbf,0x83,0xb1}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x5d,0xd0,0x84,0xd6}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x5e,0x68,0x61,0xf7}, 8333}, {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x5e,0x9c,0x23,0x08}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x5e,0xb1,0x6a,0xbd}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x5e,0xb5,0x2c,0x68}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x5e,0xc6,0x61,0xd7}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x5e,0xec,0xc6,0xfd}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x5e,0xed,0x40,0x8a}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x5e,0xf2,0xe8,0x5c}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x5f,0x54,0x86,0x6b}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x5f,0x69,0xb7,0xb7}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x5f,0xbf,0x82,0x64}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x5f,0xd5,0xa1,0x02}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x5e,0xc7,0xad,0x71}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x5f,0x2a,0x02,0x71}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x5f,0x5e,0xe1,0x3d}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x5f,0x9a,0xed,0x18}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x5f,0x9e,0x27,0x40}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x5f,0xa3,0x47,0x7e}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x5f,0xa3,0x6a,0x8b}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x5f,0xd0,0xa3,0xd6}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x5f,0xd5,0x8f,0x0d}, 8333}, {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x5f,0xe2,0x4d,0x6c}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x60,0x14,0xe3,0x27}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x60,0x17,0x43,0x55}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x60,0x03,0x4a,0x42}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x60,0x17,0x80,0x41}, 8333}, {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x60,0x1b,0x08,0xf2}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x62,0x05,0x1f,0xfb}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x60,0x1b,0x81,0x5e}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x60,0x7e,0x64,0x94}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x61,0x4a,0x06,0x69}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x61,0x74,0xa0,0x66}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x62,0x07,0x40,0xf9}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x62,0x0a,0x6a,0x31}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x62,0x19,0xc5,0x7d}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x62,0x1d,0x07,0x67}, 8333}, {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x62,0x7f,0x82,0x11}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x62,0xa2,0xd1,0x82}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x63,0xc6,0xed,0x4c}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x63,0xee,0x03,0x56}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x65,0xa5,0x22,0xfd}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x67,0x2c,0xa2,0x32}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x67,0x38,0x88,0x69}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x67,0x3b,0xa6,0x8b}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x67,0x3c,0x61,0x15}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x67,0x4f,0x6b,0x90}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x63,0xe0,0xc0,0xc9}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x65,0xbe,0xac,0xd1}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x67,0x23,0x97,0x4c}, 8334}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x67,0x4a,0xc1,0x7f}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x67,0x50,0x85,0xbf}, 8333}, {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x67,0x50,0xa8,0x39}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x67,0x55,0x0e,0x6a}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x67,0x64,0x2c,0x3a}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x67,0xfa,0x04,0x4a}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x67,0xfa,0x05,0x4a}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x68,0x20,0xa2,0x95}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x68,0x9c,0x63,0xf0}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x68,0x9c,0x67,0x48}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x67,0x63,0xa8,0x66}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x67,0xc2,0x2a,0x0a}, 8333}, {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x68,0xa8,0x65,0xcf}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x68,0xab,0x71,0x34}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x68,0xc5,0x40,0x03}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x68,0xc7,0xc0,0x55}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x68,0xc8,0x43,0xa1}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x68,0xdc,0x10,0xfd}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x68,0xed,0x04,0x1a}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x68,0xee,0xc6,0xa5}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x6b,0xb4,0x55,0x5d}, 33244}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x6c,0x04,0x0b,0x1d}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x6c,0x31,0xc2,0x3a}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x68,0xc8,0x43,0xa2}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x68,0xcf,0x84,0x2a}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x68,0xed,0x04,0xca}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x6b,0x9b,0x48,0x6c}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x6b,0xb7,0x25,0xa2}, 8333}, {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x6c,0xaf,0x03,0x12}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x6c,0xdc,0xc0,0x39}, 8333}, {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x6d,0x3d,0x66,0x05}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x6d,0x6a,0x88,0xc3}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x6d,0x6e,0x5f,0xc9}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x6d,0xac,0x68,0x77}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x6e,0x04,0x28,0x93}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x70,0xbb,0xb2,0x74}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x71,0x69,0x8b,0x2a}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x73,0x5a,0xab,0x9e}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x6d,0xce,0xb1,0x15}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x6d,0xed,0x6f,0x9c}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x73,0x44,0x2f,0x52}, 8333}, {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x74,0x58,0x4b,0x6e}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x74,0xfa,0xc1,0xea}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x75,0x8d,0x8a,0xf0}, 8333}, {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x76,0x43,0xc9,0x28}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x76,0x59,0xe5,0xb2}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x76,0xd3,0xa7,0x5a}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x78,0x4f,0x40,0x9a}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x79,0xc8,0x05,0xba}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x79,0xfe,0xad,0x27}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x7b,0x02,0x80,0x6b}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x7b,0xcb,0xa3,0x80}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x80,0x01,0x44,0x2e}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x77,0x1c,0x04,0xe6}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x77,0x1c,0x82,0xd2}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x78,0x1f,0x8f,0xa7}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x78,0xdc,0x0e,0x5c}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x78,0xdc,0x0e,0x5d}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x7c,0x12,0x85,0xdc}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x7e,0xcf,0x27,0x16}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x80,0x4d,0x25,0xd6}, 8333}, {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x80,0x7d,0x64,0x02}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x82,0x59,0x4e,0x57}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x82,0xcc,0x4b,0x03}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x81,0x9e,0x4a,0xed}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x81,0xd5,0x20,0xb0}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x83,0x71,0x29,0x77}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x83,0x71,0x29,0x7d}, 8333}, {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x83,0x72,0x0a,0xe9}, 8333}, {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x83,0xbc,0x28,0xbf}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x84,0x94,0x82,0x33}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x86,0xff,0xe2,0xe9}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x87,0x17,0xc2,0x62}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x88,0x19,0x89,0xdc}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x88,0x37,0x0a,0xf9}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x88,0xf3,0x20,0x26}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x88,0xf3,0x40,0x17}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x89,0xe2,0x22,0x2e}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x8b,0x3b,0x60,0x10}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x8b,0xa2,0xa0,0xe8}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x8b,0xc7,0xe4,0x54}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x83,0xbc,0x2a,0x24}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x86,0x00,0x70,0x5c}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x86,0x03,0x1a,0xbe}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x87,0x17,0xc4,0x18}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x87,0x54,0xcf,0x04}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x88,0x3b,0x81,0x7d}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x88,0x3d,0xef,0x07}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x89,0x75,0xa4,0x12}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x8b,0x82,0x29,0x52}, 8333}, {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x8d,0x86,0x47,0xbc}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x8d,0x8a,0x89,0x28}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x91,0x81,0x1f,0x93}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x92,0x47,0x4c,0x35}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x92,0x47,0x4c,0xec}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x95,0xd2,0xe4,0x6c}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x96,0xe5,0x00,0x8f}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x8d,0xd5,0x06,0x39}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x8d,0xdf,0x52,0x8b}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x8e,0x00,0x82,0x31}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x8e,0x00,0x82,0x35}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x90,0x76,0x8d,0xe8}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x94,0x42,0x3a,0x92}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x96,0x5f,0x82,0x11}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x96,0xbb,0x24,0xe9}, 8333}, {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x96,0xf9,0x4c,0x66}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x99,0x7d,0xe0,0x2c}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x9b,0x04,0x63,0x96}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x9b,0x85,0x81,0x61}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x9d,0x9f,0x67,0xa1}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x9e,0x8c,0xc9,0x23}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x9e,0x8c,0xe5,0x3e}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x9e,0xb5,0x68,0x84}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x9e,0xb5,0x86,0xc1}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xa0,0x10,0x87,0xbb}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xa2,0xdd,0xe0,0x3f}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xa5,0xa5,0x84,0x44}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xa5,0xc2,0x23,0xcb}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xa6,0xe6,0x46,0x91}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xa9,0x2c,0x22,0xcb}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xa9,0x30,0xa3,0xb0}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xaa,0x4b,0xa2,0xb4}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xaa,0x4b,0xc3,0xa8}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x99,0x7d,0x81,0xbb}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x99,0x7d,0xe0,0x6b}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x9a,0x30,0xec,0xfa}, 8887}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x9a,0x42,0xcf,0x7e}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x9b,0x8f,0x8c,0xba}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x9d,0x83,0x8e,0xa4}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x9e,0x40,0x4f,0xb6}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x9e,0x55,0x5d,0xa3}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x9e,0x8c,0x80,0xef}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x9e,0xae,0x83,0xab}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x9f,0x08,0x04,0x13}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x9f,0xd9,0x90,0x44}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x9f,0xd9,0x90,0xfc}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x9f,0xfd,0x2f,0xca}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xa2,0x9b,0x40,0xe2}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xa2,0xde,0x64,0x76}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xa2,0xff,0xa8,0x1b}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xa2,0xff,0xa8,0x1e}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xa3,0x9e,0xe4,0x7d}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xa5,0xe3,0x60,0x26}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xa9,0xe5,0xee,0x11}, 8333}, {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xab,0x19,0xa5,0x91}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xac,0x60,0xa1,0x8a}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xac,0x62,0xc1,0x2d}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xac,0x67,0xa4,0x4b}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xac,0x6e,0x08,0xe9}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xad,0xd1,0x35,0x72}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xad,0xd4,0xc0,0x75}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xad,0xf3,0x40,0x31}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xad,0xff,0xe0,0xb9}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xae,0x64,0x83,0x97}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xae,0x71,0x42,0xe6}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xae,0x8a,0x3e,0x5a}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xb0,0x0a,0x88,0x19}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xb0,0x17,0x0d,0x1b}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xb0,0x18,0xdc,0x8d}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xb0,0x6a,0xfc,0xad}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xab,0x21,0xb1,0x09}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xac,0x48,0xe4,0x5d}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xac,0x60,0xa1,0xf4}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xac,0x66,0xe4,0x96}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xac,0x76,0x88,0x62}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xad,0x2e,0x41,0x08}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xad,0xd4,0xc1,0x23}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xad,0xef,0x21,0x55}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xad,0xf3,0x40,0x30}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xae,0x73,0x81,0x25}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xb0,0x0c,0x06,0x3b}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xb0,0x6b,0xb8,0x1d}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xb0,0x7b,0x0a,0xc0}, 8333}, {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xb0,0x7e,0xa7,0x0a}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xb1,0x34,0xad,0x3f}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xb2,0x4e,0xe2,0xb2}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xb2,0x84,0x04,0x7b}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xb2,0xaf,0x90,0x7a}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xb2,0xdd,0x42,0xd4}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xb2,0xec,0x82,0xe5}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xb0,0xb9,0xeb,0xa3}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xb0,0xdf,0x82,0xfe}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xb2,0x00,0x47,0x88}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xb2,0x0c,0x20,0x27}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xb2,0x55,0x40,0xd4}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xb2,0x7c,0xa2,0xd1}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xb2,0x80,0xc0,0x15}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xb2,0x97,0x85,0x38}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xb2,0xc1,0x60,0xc9}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xb2,0xf8,0xc8,0x7e}, 8333}, {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xb2,0xfe,0x07,0x58}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xb2,0xfe,0x22,0x90}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xb2,0xff,0x29,0x15}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xb3,0x30,0xfb,0x29}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xb6,0xf7,0xee,0xa9}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xb7,0x6f,0x1d,0x1c}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xb8,0x40,0x0c,0x6d}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xb4,0xe9,0x6a,0xab}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xb5,0xa6,0xa8,0xd2}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xb7,0x42,0xe3,0x46}, 12060}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xb7,0x6f,0x6c,0x38}, 8333}, {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xb8,0x46,0x21,0xbe}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xb8,0x5f,0x26,0xda}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xb9,0x08,0xac,0x79}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xb9,0x0b,0x52,0x26}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xb8,0x69,0x46,0x64}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xb8,0x69,0x46,0x65}, 8333}, {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xb9,0x0c,0x07,0x26}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xb9,0x0c,0xec,0xf2}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xb9,0x14,0xe2,0x94}, 8333}, {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xb9,0x15,0xd8,0x86}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xb9,0x16,0xe8,0xa7}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xb9,0x19,0x30,0xb8}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xb9,0x19,0x30,0xd9}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xb9,0x19,0x3c,0xc7}, 8333}, {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xb9,0x1c,0x4c,0xb3}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xb9,0x1f,0x88,0x45}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xb9,0x23,0x89,0xaf}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xb9,0x23,0x8a,0x54}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xb9,0x23,0xb6,0x7b}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xb9,0x2f,0x84,0x6d}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xb9,0x35,0x80,0xb4}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xb9,0x3f,0xac,0x0e}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xb9,0x40,0x68,0x02}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xb9,0x23,0x8b,0x36}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xb9,0x2c,0x4e,0xd0}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xb9,0x2f,0x84,0x37}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xb9,0x33,0x80,0x1b}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xb9,0x3b,0x64,0x6b}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xb9,0x43,0xaf,0x4b}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xb9,0x43,0xcc,0x4c}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xb9,0x43,0xcc,0x50}, 8333}, {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xb9,0x46,0x69,0x4a}, 8339}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xb9,0x4d,0x80,0x45}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xb9,0x4d,0x81,0xb0}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xb9,0x55,0x03,0x89}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xb9,0x55,0x03,0x8c}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xb9,0x56,0x0f,0x17}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xb9,0x56,0x0f,0x19}, 8333}, {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xb9,0x66,0x47,0x06}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xb9,0x75,0x4a,0x15}, 8333}, {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xb9,0x79,0xad,0xdf}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xb9,0x7f,0x11,0xa7}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xb9,0x9a,0x9c,0x32}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xb9,0x80,0x28,0x7a}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xb9,0x91,0x83,0xda}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xb9,0x93,0xed,0xa9}, 8333}, {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xb9,0xa2,0x80,0x53}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xb9,0xb7,0xa1,0x23}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xb9,0xbd,0xc7,0xf8}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xb9,0xd7,0xe0,0x6b}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xba,0x05,0x88,0x46}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xba,0x1f,0x04,0xca}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xbc,0x1b,0x50,0x7e}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xbc,0x41,0xd4,0x31}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xbc,0x74,0x8c,0x7f}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xbc,0x86,0x4f,0x91}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xbc,0xd6,0x80,0x12}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xbc,0xd6,0x80,0xaf}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xbc,0xe3,0x40,0x13}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xbc,0xea,0xf1,0xac}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xbc,0xfd,0x02,0x7d}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xbe,0x0a,0x08,0xd3}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xbe,0x91,0x16,0xca}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xb9,0xa5,0x4c,0xdc}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xb9,0xac,0xa5,0x82}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xb9,0xb1,0x05,0x04}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xb9,0xb7,0x83,0x4b}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xb9,0xba,0xd0,0xd0}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xb9,0xd7,0xe0,0x16}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xb9,0xe0,0x50,0x6c}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xb9,0xe1,0x10,0x04}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xb9,0xf3,0x70,0xd6}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xb9,0xf4,0xc1,0x12}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xb9,0xf8,0xa0,0x42}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xba,0x13,0x88,0x90}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xbc,0x44,0x26,0xf3}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xbc,0x44,0xf0,0x59}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xbc,0x86,0x06,0x54}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xbc,0x86,0x4d,0x79}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xbc,0x8a,0x01,0x2b}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xbc,0xd9,0x09,0xa8}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xbe,0x02,0x85,0x5b}, 8333}, {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xbe,0xb8,0xc6,0x22}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xbe,0xd2,0xea,0x26}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xc0,0x5c,0x81,0x05}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xc0,0x79,0xaa,0xb4}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xbe,0xd3,0xcc,0x44}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xc0,0x8b,0x23,0x8f}, 8333}, {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xc0,0xa2,0x64,0x9c}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xc0,0xa2,0xd2,0x5b}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xc0,0xa9,0x06,0x7f}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xc0,0xaf,0x3b,0x8c}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xc0,0xde,0xed,0x10}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xc0,0xa2,0x65,0xfa}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xc0,0xce,0xca,0x06}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xc0,0xcf,0x0c,0xf4}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xc0,0xcf,0x0c,0xf5}, 8333}, {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xc0,0xe4,0x65,0x9d}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xc1,0x17,0xb5,0x87}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xc1,0x31,0x2b,0xdb}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xc1,0x6a,0x1e,0xad}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xc1,0x8a,0xe0,0xe6}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xc1,0xe0,0x16,0x2d}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xc1,0x70,0xc0,0x49}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xc1,0xaa,0xa6,0x0c}, 8333}, {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xc2,0x0f,0xe7,0xec}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xc2,0x6a,0xd8,0x14}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xc2,0xa5,0x10,0x21}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xc2,0xb5,0x50,0x4d}, 8333}, {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xc2,0xba,0xa0,0xfd}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xc2,0xf6,0x56,0x20}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xc3,0x16,0x68,0x17}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xc3,0x31,0x4b,0xe9}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xc3,0x5b,0xf4,0x8a}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xc2,0xf7,0x0d,0x07}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xc2,0xf7,0x0d,0x20}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xc3,0x00,0xcb,0x15}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xc3,0x26,0xa8,0x72}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xc3,0x2b,0x8d,0x1c}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xc3,0x5f,0xe1,0xf8}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xc3,0x7b,0xe0,0x07}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xc3,0x9a,0xeb,0x4f}, 8333}, {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xc3,0xa9,0x63,0x52}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xc4,0x1c,0x62,0x15}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xc4,0xdc,0x43,0x97}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xc3,0xc9,0x00,0x51}, 8333}, {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xc5,0x9b,0x06,0x2b}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xc5,0xbd,0xec,0xfa}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xc5,0xea,0x45,0x92}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xc6,0x8f,0x0c,0x69}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xc6,0xbb,0x1c,0x02}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xc7,0x44,0xc5,0x05}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xc6,0x2c,0xe7,0xa0}, 6333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xc6,0x3a,0x66,0x23}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xc6,0x89,0xca,0xaf}, 8333}, {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xc7,0x7f,0xe0,0x32}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xc7,0xc1,0x06,0x0e}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xc7,0xc9,0x6e,0x92}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xc7,0xb6,0x81,0x1a}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xc7,0xbc,0xcc,0x66}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xc7,0xbc,0xcc,0x9b}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xc7,0xf4,0x31,0xe0}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xc7,0xf9,0xe6,0x25}, 15738}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xc8,0x53,0x7b,0x2e}, 8333}, {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xc8,0x6d,0x43,0x47}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xc8,0x7a,0x80,0x82}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xc9,0xee,0xdf,0xa5}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xca,0x2f,0xe1,0xf2}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xcb,0x3c,0x02,0x43}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xc8,0x7a,0x80,0xb9}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xca,0x99,0xc7,0xb6}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xca,0x9f,0x88,0x36}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xca,0xa8,0x10,0xe8}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xcb,0x0b,0x47,0x01}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xcb,0xa2,0x50,0xdb}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xcb,0xb2,0x8f,0x0d}, 8333}, {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xcc,0x0f,0x0b,0x04}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xcc,0x0f,0x0b,0x08}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xcc,0x8a,0xa5,0x23}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xce,0x7b,0x0b,0x8b}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xce,0xfd,0xa3,0xe2}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xcf,0xbc,0x10,0x10}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xd0,0x4d,0x12,0x19}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xd0,0x56,0xa1,0x53}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xd0,0x64,0x89,0xcc}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xce,0x7d,0xa9,0xa2}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xce,0xae,0x37,0xa4}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xcf,0xb6,0x92,0x12}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xd0,0x5d,0x42,0xc6}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xd0,0x62,0xc4,0xf9}, 8333}, {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xd0,0x6b,0xe0,0xca}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xd0,0x6e,0x41,0x72}, 8333}, {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xd0,0x76,0xeb,0xbe}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xd1,0x9f,0x89,0x92}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xd1,0xa1,0x04,0xa4}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xd1,0xc5,0x0d,0x3e}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xd2,0xd3,0x6d,0xa5}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xd3,0x97,0x26,0x5c}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xd4,0x20,0xe5,0xe6}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xd4,0x33,0x0e,0x48}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xd1,0x7a,0xd0,0x83}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xd1,0x7e,0x6e,0xc6}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xd1,0x83,0xee,0x50}, 8333}, {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xd4,0x38,0x6c,0x51}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xd4,0x6e,0xab,0x76}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xd4,0x7c,0xa0,0xc7}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xd4,0x80,0x2c,0x31}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xd4,0x95,0xeb,0xb9}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xd4,0xc7,0xaf,0x1e}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xd4,0xed,0x60,0x62}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xd5,0x43,0x63,0x8e}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xd4,0x49,0x96,0x84}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xd4,0x4d,0xe0,0x91}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xd4,0x55,0x5a,0xc2}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xd4,0x5c,0x65,0x1e}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xd4,0x70,0x85,0x5c}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xd4,0xe3,0x84,0xa7}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xd5,0x0a,0x64,0xb6}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xd5,0x39,0xf0,0x45}, 8333}, {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xd5,0x5b,0xcd,0x86}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xd5,0x73,0xe0,0xfc}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xd5,0x83,0x0c,0x0a}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xd5,0x84,0x4c,0xb8}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xd5,0x7d,0x43,0x6c}, 8333}, {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xd5,0x98,0xa1,0xaa}, 45893}, {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xd5,0x9b,0x03,0xd8}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xd5,0x9c,0x6c,0x3f}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xd5,0xdb,0xa2,0x92}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xd8,0x24,0xb3,0x1b}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xd8,0xb8,0x08,0x1a}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xd8,0xf5,0xda,0xf2}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xd9,0x0c,0xcc,0x56}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xd5,0xb4,0x46,0x8a}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xd5,0xb9,0xe2,0xe1}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xd8,0x47,0xcb,0x4f}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xd8,0xc2,0xa4,0xd3}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xd8,0xf0,0xa8,0xe2}, 8333}, {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xd9,0x14,0x82,0x48}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xd9,0xa9,0x07,0x6f}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xd9,0xb6,0xc0,0x07}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xd9,0xc7,0x63,0x1e}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xdb,0x58,0xe8,0xe5}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xd9,0x17,0x09,0xb4}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xd9,0x40,0x2f,0x8a}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xd9,0xa9,0x0e,0x5a}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xda,0xf5,0x01,0xcd}, 8333}, {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xdc,0x82,0x80,0x3a}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xdc,0xbf,0xa9,0x5a}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xdd,0x7f,0x2b,0xcf}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xde,0xef,0xc1,0xd2}, 8333}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xdf,0x11,0xca,0xce}, 8333}, - {{0x20,0x01,0x00,0x00,0x41,0x37,0x9e,0x76,0x10,0xf2,0x28,0x73,0x97,0x0b,0x20,0x68}, 8333}, - {{0x20,0x01,0x00,0x00,0x41,0x37,0x9e,0x76,0x10,0xf6,0x1a,0xa2,0xae,0x9d,0x42,0x86}, 8333}, - {{0x20,0x01,0x00,0x00,0x41,0x37,0x9e,0x76,0x14,0x0a,0x0d,0x05,0xc1,0xe1,0xb5,0xc4}, 8333}, - {{0x20,0x01,0x00,0x00,0x41,0x37,0x9e,0x76,0x14,0x2a,0x19,0x57,0xb6,0x1e,0x05,0x6e}, 8333}, - {{0x20,0x01,0x00,0x00,0x41,0x37,0x9e,0x76,0x14,0x2d,0x0f,0xac,0x2a,0xaf,0xe4,0xc2}, 8333}, - {{0x20,0x01,0x00,0x00,0x41,0x37,0x9e,0x76,0x14,0x71,0x04,0x52,0x66,0x71,0x82,0x74}, 8333}, - {{0x20,0x01,0x00,0x00,0x41,0x37,0x9e,0x76,0x14,0x82,0x05,0x30,0xb1,0x45,0x7e,0x28}, 8333}, - {{0x20,0x01,0x00,0x00,0x41,0x37,0x9e,0x76,0x18,0xac,0x39,0x54,0x39,0x01,0xa2,0x57}, 8333}, - {{0x20,0x01,0x00,0x00,0x41,0x37,0x9e,0x76,0x18,0xd5,0x3c,0x77,0x82,0x9a,0x6f,0xe6}, 8333}, - {{0x20,0x01,0x00,0x00,0x41,0x37,0x9e,0x76,0x20,0x66,0x16,0x4f,0xb3,0x9d,0xb0,0x87}, 8333}, - {{0x20,0x01,0x00,0x00,0x41,0x37,0x9e,0x76,0x20,0x69,0x07,0x8b,0xb7,0xd5,0x58,0x60}, 8333}, - {{0x20,0x01,0x00,0x00,0x41,0x37,0x9e,0x76,0x20,0xac,0x22,0xb1,0xbb,0x18,0x11,0x60}, 8333}, - {{0x20,0x01,0x00,0x00,0x41,0x37,0x9e,0x76,0x20,0xf6,0x14,0x7f,0xe7,0xe9,0xdd,0xd1}, 8333}, - {{0x20,0x01,0x00,0x00,0x41,0x37,0x9e,0x76,0x20,0xfa,0x31,0x26,0x97,0xf1,0x60,0x0d}, 8333}, - {{0x20,0x01,0x00,0x00,0x41,0x37,0x9e,0x76,0x24,0x57,0x0f,0x34,0xa3,0x13,0x4b,0x99}, 8333}, - {{0x20,0x01,0x00,0x00,0x41,0x37,0x9e,0x76,0x28,0xf4,0x25,0x12,0xbc,0x91,0x2e,0x53}, 8333}, - {{0x20,0x01,0x00,0x00,0x41,0x37,0x9e,0x76,0x2c,0x55,0x0f,0xa9,0xfd,0xe5,0x5d,0x86}, 8333}, - {{0x20,0x01,0x00,0x00,0x41,0x37,0x9e,0x76,0x2c,0xba,0x18,0x28,0x52,0xae,0x75,0x01}, 8333}, - {{0x20,0x01,0x00,0x00,0x41,0x37,0x9e,0x76,0x2c,0xf3,0x78,0xfc,0xa1,0x38,0xe6,0xed}, 8333}, - {{0x20,0x01,0x00,0x00,0x41,0x37,0x9e,0x76,0x30,0x01,0x0b,0xf6,0xbe,0x62,0xcc,0xe5}, 8333}, - {{0x20,0x01,0x00,0x00,0x41,0x37,0x9e,0x76,0x30,0xa8,0x3a,0xfb,0xb6,0xd5,0x2b,0xd7}, 8333}, - {{0x20,0x01,0x00,0x00,0x41,0x37,0x9e,0x76,0x30,0xe6,0x04,0x4d,0xae,0x7f,0x74,0x9d}, 8333}, - {{0x20,0x01,0x00,0x00,0x41,0x37,0x9e,0x76,0x34,0x02,0x0d,0xaf,0xb4,0x75,0xda,0xf9}, 8333}, - {{0x20,0x01,0x00,0x00,0x41,0x37,0x9e,0x76,0x34,0x23,0x3d,0x03,0xd7,0x71,0xd5,0x01}, 8333}, - {{0x20,0x01,0x00,0x00,0x41,0x37,0x9e,0x76,0x34,0x24,0x02,0x11,0xb6,0x00,0xb4,0xcb}, 8333}, - {{0x20,0x01,0x00,0x00,0x41,0x37,0x9e,0x76,0x34,0x2f,0x14,0x53,0xcd,0xdc,0x4f,0x03}, 8333}, - {{0x20,0x01,0x00,0x00,0x41,0x37,0x9e,0x76,0x34,0x57,0x24,0x8d,0xa0,0xb9,0x3b,0xc9}, 8333}, - {{0x20,0x01,0x00,0x00,0x41,0x37,0x9e,0x76,0x38,0x6f,0x38,0x46,0xb9,0x95,0x01,0x88}, 8333}, - {{0x20,0x01,0x00,0x00,0x41,0x37,0x9e,0x76,0x38,0xa8,0x31,0x8a,0xe7,0xdc,0xae,0xe1}, 8333}, - {{0x20,0x01,0x00,0x00,0x41,0x37,0x9e,0x76,0x38,0xeb,0x1e,0x88,0xad,0xdb,0x18,0x1c}, 8333}, - {{0x20,0x01,0x00,0x00,0x41,0x37,0x9e,0x76,0x3c,0x39,0x27,0xe3,0x47,0x58,0x36,0x5c}, 8333}, - {{0x20,0x01,0x00,0x00,0x41,0x37,0x9e,0x76,0x3c,0x7d,0x3f,0xa4,0x86,0xad,0x4e,0xbb}, 8333}, - {{0x20,0x01,0x00,0x00,0x41,0x37,0x9e,0x76,0x3c,0xfd,0x31,0x81,0xb2,0xc7,0x5c,0x5e}, 8333}, - {{0x20,0x01,0x00,0x00,0x41,0x37,0x9e,0x76,0x04,0x01,0x21,0x57,0x68,0x4e,0xf2,0xd6}, 8333}, - {{0x20,0x01,0x00,0x00,0x41,0x37,0x9e,0x76,0x04,0x3a,0x1a,0x64,0xbd,0x14,0xfb,0x16}, 8333}, - {{0x20,0x01,0x00,0x00,0x41,0x37,0x9e,0x76,0x04,0x7d,0x00,0xbb,0xae,0x1e,0x29,0x48}, 8333}, - {{0x20,0x01,0x00,0x00,0x41,0x37,0x9e,0x76,0x08,0x43,0x9b,0x9e,0xcd,0x0a,0x66,0x55}, 8333}, - {{0x20,0x01,0x00,0x00,0x41,0x37,0x9e,0x76,0x08,0x86,0x3c,0x19,0xad,0xdd,0x9a,0x58}, 8333}, - {{0x20,0x01,0x00,0x00,0x41,0x37,0x9e,0x76,0x08,0xba,0x09,0xf8,0x9e,0xad,0x0f,0x21}, 8333}, - {{0x20,0x01,0x00,0x00,0x41,0x37,0x9e,0x76,0x0c,0x06,0x12,0x4c,0xa4,0x82,0xa7,0x61}, 8333}, - {{0x20,0x01,0x00,0x00,0x41,0x37,0x9e,0x76,0x0c,0xda,0x0b,0x84,0x8d,0x4c,0xd1,0xe6}, 8333}, - {{0x20,0x01,0x00,0x00,0x53,0xaa,0x06,0x4c,0x00,0x20,0x0a,0x71,0x85,0x8b,0x83,0xf7}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xdc,0x85,0x27,0x3d}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xde,0xef,0xc1,0x74}, 8333}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xde,0xef,0xc1,0x78}, 8333}, + {{0x20,0x01,0x00,0x00,0x41,0x37,0x9e,0x76,0x1c,0xbd,0x3b,0xc0,0xad,0xe7,0xbf,0x44}, 8333}, + {{0x20,0x01,0x00,0x00,0x41,0x37,0x9e,0x76,0x20,0x46,0x15,0x0d,0x8d,0x65,0x0d,0xe4}, 8333}, + {{0x20,0x01,0x00,0x00,0x41,0x37,0x9e,0x76,0x2c,0x99,0x3f,0x36,0xd0,0x03,0xf4,0x7a}, 8333}, + {{0x20,0x01,0x00,0x00,0x41,0x37,0x9e,0x76,0x34,0xb6,0x39,0x10,0xa3,0xdc,0x7b,0xfa}, 8333}, + {{0x20,0x01,0x00,0x00,0x41,0x37,0x9e,0x76,0x3c,0xec,0x02,0xb5,0x52,0x5b,0xfb,0x3c}, 8333}, {{0x20,0x01,0x00,0x00,0x53,0xaa,0x06,0x4c,0x00,0xc5,0x23,0x5d,0xa1,0x0d,0x00,0xe0}, 8333}, - {{0x20,0x01,0x00,0x00,0x5e,0xf5,0x79,0xfb,0x10,0x3a,0x23,0xfb,0xbb,0x8a,0xed,0x5b}, 8333}, - {{0x20,0x01,0x00,0x00,0x5e,0xf5,0x79,0xfb,0x10,0x64,0x0d,0x3d,0x51,0xff,0x59,0x38}, 8333}, - {{0x20,0x01,0x00,0x00,0x5e,0xf5,0x79,0xfb,0x10,0xfd,0x13,0x69,0x71,0x5e,0x6a,0xa7}, 8333}, - {{0x20,0x01,0x00,0x00,0x5e,0xf5,0x79,0xfb,0x14,0xd5,0x17,0x58,0xb1,0x7d,0x5e,0xb1}, 8333}, - {{0x20,0x01,0x00,0x00,0x5e,0xf5,0x79,0xfb,0x18,0x17,0x26,0x34,0x9f,0xc9,0x1b,0xc4}, 8333}, - {{0x20,0x01,0x00,0x00,0x5e,0xf5,0x79,0xfb,0x18,0x1a,0x27,0x17,0x94,0x41,0xc1,0xeb}, 8333}, - {{0x20,0x01,0x00,0x00,0x5e,0xf5,0x79,0xfb,0x18,0x75,0x0b,0xc8,0xb1,0xc2,0x01,0xb4}, 8333}, - {{0x20,0x01,0x00,0x00,0x5e,0xf5,0x79,0xfb,0x18,0xb5,0x31,0x85,0x51,0xa2,0x03,0x5d}, 8333}, - {{0x20,0x01,0x00,0x00,0x5e,0xf5,0x79,0xfb,0x18,0xc3,0x0f,0xeb,0xb4,0x71,0x49,0xd1}, 8333}, - {{0x20,0x01,0x00,0x00,0x5e,0xf5,0x79,0xfb,0x18,0xdd,0x3b,0xd5,0x41,0x8f,0x0c,0x1e}, 8333}, - {{0x20,0x01,0x00,0x00,0x5e,0xf5,0x79,0xfb,0x1c,0x19,0x30,0x62,0xbc,0xaa,0x09,0x6b}, 8333}, - {{0x20,0x01,0x00,0x00,0x5e,0xf5,0x79,0xfb,0x1c,0x53,0x14,0xbd,0xb8,0xd9,0x7a,0xa2}, 8333}, - {{0x20,0x01,0x00,0x00,0x5e,0xf5,0x79,0xfb,0x1c,0x60,0x08,0x2b,0x94,0xfd,0xa4,0x52}, 8333}, - {{0x20,0x01,0x00,0x00,0x5e,0xf5,0x79,0xfb,0x1c,0x85,0x2e,0x50,0xba,0x7d,0x0a,0x1a}, 8333}, - {{0x20,0x01,0x00,0x00,0x5e,0xf5,0x79,0xfb,0x1c,0xff,0x2d,0x43,0x51,0xf9,0xb8,0x89}, 8333}, - {{0x20,0x01,0x00,0x00,0x5e,0xf5,0x79,0xfb,0x20,0x74,0x22,0x1a,0x47,0x50,0xeb,0x12}, 8333}, - {{0x20,0x01,0x00,0x00,0x5e,0xf5,0x79,0xfb,0x20,0x8f,0x2d,0x83,0xe0,0xf5,0xe3,0x1f}, 8333}, - {{0x20,0x01,0x00,0x00,0x5e,0xf5,0x79,0xfb,0x20,0x92,0x37,0x1f,0x9d,0xfb,0x98,0xcd}, 8333}, - {{0x20,0x01,0x00,0x00,0x5e,0xf5,0x79,0xfb,0x20,0xf3,0x39,0xa2,0x39,0xca,0x03,0x8c}, 8333}, - {{0x20,0x01,0x00,0x00,0x5e,0xf5,0x79,0xfb,0x28,0x1c,0x20,0x85,0x51,0x8d,0x9c,0x97}, 8333}, - {{0x20,0x01,0x00,0x00,0x5e,0xf5,0x79,0xfb,0x28,0x51,0x00,0x0c,0x52,0x4c,0xa1,0x80}, 8333}, - {{0x20,0x01,0x00,0x00,0x5e,0xf5,0x79,0xfb,0x28,0x53,0x3b,0x95,0xa4,0x30,0x40,0xf3}, 8333}, - {{0x20,0x01,0x00,0x00,0x5e,0xf5,0x79,0xfb,0x28,0xf6,0x30,0xa4,0x30,0xd9,0x12,0x01}, 8333}, - {{0x20,0x01,0x00,0x00,0x5e,0xf5,0x79,0xfb,0x2c,0x5f,0x1a,0xde,0x71,0x8f,0x60,0x9d}, 8333}, - {{0x20,0x01,0x00,0x00,0x5e,0xf5,0x79,0xfb,0x2c,0xc0,0x1b,0x38,0xe7,0xaf,0xae,0x80}, 8333}, - {{0x20,0x01,0x00,0x00,0x5e,0xf5,0x79,0xfb,0x30,0x00,0x3d,0xc4,0x52,0x4d,0x3c,0xe2}, 8333}, - {{0x20,0x01,0x00,0x00,0x5e,0xf5,0x79,0xfb,0x30,0x60,0x2e,0x81,0x51,0x8f,0x63,0xbc}, 8333}, - {{0x20,0x01,0x00,0x00,0x5e,0xf5,0x79,0xfb,0x30,0x68,0x05,0x07,0xbc,0xaf,0xdb,0xad}, 8333}, - {{0x20,0x01,0x00,0x00,0x5e,0xf5,0x79,0xfb,0x30,0x8f,0x00,0xf3,0x93,0x5d,0x6a,0x1b}, 8333}, - {{0x20,0x01,0x00,0x00,0x5e,0xf5,0x79,0xfb,0x30,0xce,0x33,0x01,0xd2,0xd0,0x9b,0xbc}, 8333}, - {{0x20,0x01,0x00,0x00,0x5e,0xf5,0x79,0xfb,0x30,0xdb,0x31,0x45,0x43,0x81,0xf1,0x47}, 8333}, - {{0x20,0x01,0x00,0x00,0x5e,0xf5,0x79,0xfb,0x34,0xa3,0x22,0x98,0xb7,0xcd,0x22,0xf6}, 8333}, - {{0x20,0x01,0x00,0x00,0x5e,0xf5,0x79,0xfb,0x04,0x1e,0x01,0x60,0xbc,0x48,0x79,0x1d}, 8333}, - {{0x20,0x01,0x00,0x00,0x5e,0xf5,0x79,0xfb,0x00,0x42,0xb4,0xfc,0x3f,0x74,0xaf,0xfb}, 8333}, - {{0x20,0x01,0x00,0x00,0x5e,0xf5,0x79,0xfb,0x04,0x7a,0x16,0xaa,0xd0,0xc9,0x30,0xa4}, 8333}, - {{0x20,0x01,0x00,0x00,0x5e,0xf5,0x79,0xfb,0x08,0x9c,0x34,0x81,0xd9,0x73,0x5d,0xad}, 8333}, - {{0x20,0x01,0x00,0x00,0x5e,0xf5,0x79,0xfb,0x08,0xbe,0x31,0x4a,0x26,0xb2,0xef,0xef}, 8333}, - {{0x20,0x01,0x00,0x00,0x5e,0xf5,0x79,0xfb,0x08,0xf3,0x3d,0xaf,0x3f,0x21,0x0b,0xac}, 8333}, - {{0x20,0x01,0x00,0x00,0x5e,0xf5,0x79,0xfb,0x0c,0x1f,0x20,0xf4,0xb9,0xac,0x99,0xdb}, 8333}, - {{0x20,0x01,0x00,0x00,0x5e,0xf5,0x79,0xfb,0x0c,0x70,0x10,0x5c,0x77,0xde,0x9f,0x7d}, 8333}, - {{0x20,0x01,0x00,0x00,0x5e,0xf5,0x79,0xfb,0x00,0xed,0x20,0x0c,0xb9,0xac,0x34,0xdb}, 8333}, - {{0x20,0x01,0x00,0x00,0x5e,0xf5,0x79,0xfd,0x30,0x57,0x08,0x5b,0xb7,0x03,0x25,0x5d}, 8333}, - {{0x20,0x01,0x00,0x00,0x5e,0xf5,0x79,0xfd,0x08,0xd1,0x13,0xc6,0x5d,0x0a,0xb1,0x17}, 8333}, - {{0x20,0x01,0x00,0x00,0x9d,0x38,0x6a,0xb8,0x10,0x07,0x39,0x5e,0xcd,0x3a,0x82,0xf2}, 8333}, - {{0x20,0x01,0x00,0x00,0x9d,0x38,0x6a,0xb8,0x10,0x8b,0x34,0xb5,0xe8,0xe3,0xee,0xd7}, 8333}, - {{0x20,0x01,0x00,0x00,0x9d,0x38,0x6a,0xb8,0x10,0x9c,0x07,0x38,0x7f,0xb9,0x78,0x5c}, 8333}, - {{0x20,0x01,0x00,0x00,0x9d,0x38,0x6a,0xb8,0x14,0x01,0x03,0x93,0xba,0x7f,0xc3,0x13}, 8333}, - {{0x20,0x01,0x00,0x00,0x9d,0x38,0x6a,0xb8,0x14,0x49,0x21,0xd9,0xa0,0x5e,0x32,0xf5}, 8333}, - {{0x20,0x01,0x00,0x00,0x9d,0x38,0x6a,0xb8,0x14,0x98,0x36,0xb6,0xa2,0x9b,0x12,0xa4}, 8333}, - {{0x20,0x01,0x00,0x00,0x9d,0x38,0x6a,0xb8,0x18,0x3d,0x36,0x49,0xb8,0xf5,0x35,0xd9}, 8333}, - {{0x20,0x01,0x00,0x00,0x9d,0x38,0x6a,0xb8,0x18,0x57,0x32,0x93,0x43,0x8b,0x73,0xde}, 8333}, - {{0x20,0x01,0x00,0x00,0x9d,0x38,0x6a,0xb8,0x18,0xb0,0x15,0xd3,0x43,0x1c,0xbf,0xec}, 8333}, - {{0x20,0x01,0x00,0x00,0x9d,0x38,0x6a,0xb8,0x18,0xb1,0x28,0x8b,0x51,0xc9,0xdb,0x37}, 8333}, - {{0x20,0x01,0x00,0x00,0x9d,0x38,0x6a,0xb8,0x18,0xd5,0x2a,0x37,0x68,0x06,0x97,0x97}, 8333}, - {{0x20,0x01,0x00,0x00,0x9d,0x38,0x6a,0xb8,0x1c,0x42,0x3a,0x1c,0x94,0x2f,0x7f,0x08}, 8333}, - {{0x20,0x01,0x00,0x00,0x9d,0x38,0x6a,0xb8,0x1c,0x7a,0x2f,0xb7,0xe7,0xd5,0x7e,0xe2}, 8333}, - {{0x20,0x01,0x00,0x00,0x9d,0x38,0x6a,0xb8,0x1c,0xc6,0x38,0xc6,0x43,0x8b,0x73,0xde}, 8333}, - {{0x20,0x01,0x00,0x00,0x9d,0x38,0x6a,0xb8,0x1c,0xd6,0x2f,0x48,0xfa,0x1b,0x51,0xc1}, 8333}, - {{0x20,0x01,0x00,0x00,0x9d,0x38,0x6a,0xb8,0x1c,0xda,0x2f,0xdf,0xb0,0x91,0xdb,0xe5}, 8333}, - {{0x20,0x01,0x00,0x00,0x9d,0x38,0x6a,0xb8,0x1c,0xf3,0x0b,0x9e,0xa1,0x4a,0x41,0xf3}, 8333}, - {{0x20,0x01,0x00,0x00,0x9d,0x38,0x6a,0xb8,0x20,0x15,0x04,0x73,0x9d,0x21,0xcc,0x3c}, 8333}, - {{0x20,0x01,0x00,0x00,0x9d,0x38,0x6a,0xb8,0x20,0x5d,0xee,0xa3,0xa3,0xc8,0xea,0x79}, 8333}, - {{0x20,0x01,0x00,0x00,0x9d,0x38,0x6a,0xb8,0x20,0x7c,0x19,0xb1,0xe7,0x58,0x1c,0x46}, 8333}, - {{0x20,0x01,0x00,0x00,0x9d,0x38,0x6a,0xb8,0x20,0xcb,0x06,0xb0,0x46,0xcc,0xc2,0x7d}, 8333}, + {{0x20,0x01,0x00,0x00,0x53,0xaa,0x06,0x4c,0x0c,0xbc,0x5a,0xce,0xa6,0x25,0x39,0xd1}, 8333}, + {{0x20,0x01,0x00,0x00,0x5e,0xf5,0x79,0xfb,0x38,0xe5,0x36,0xc1,0xd0,0xee,0x5d,0x98}, 8333}, + {{0x20,0x01,0x00,0x00,0x5e,0xf5,0x79,0xfb,0x3c,0x5c,0x0c,0x6c,0x39,0xcf,0x69,0xd3}, 8333}, + {{0x20,0x01,0x00,0x00,0x5e,0xf5,0x79,0xfb,0x08,0x96,0x0e,0xf4,0xba,0x63,0x8d,0x15}, 8333}, + {{0x20,0x01,0x00,0x00,0x9d,0x38,0x6a,0xb8,0x10,0x6a,0x21,0x12,0xe0,0x6b,0xb8,0x81}, 8333}, + {{0x20,0x01,0x00,0x00,0x9d,0x38,0x6a,0xb8,0x1c,0x99,0x16,0x55,0xe7,0x82,0x93,0x40}, 8333}, {{0x20,0x01,0x00,0x00,0x9d,0x38,0x6a,0xb8,0x20,0xcd,0x1c,0xd9,0x54,0xe6,0x5a,0x6e}, 8333}, - {{0x20,0x01,0x00,0x00,0x9d,0x38,0x6a,0xb8,0x20,0xef,0x0b,0xc1,0x95,0xf0,0xa6,0x58}, 8333}, - {{0x20,0x01,0x00,0x00,0x9d,0x38,0x6a,0xb8,0x24,0x09,0x2e,0xa4,0x47,0xee,0x3c,0x9d}, 8333}, - {{0x20,0x01,0x00,0x00,0x9d,0x38,0x6a,0xb8,0x24,0x27,0x33,0x0a,0x94,0x41,0xdc,0x2d}, 8333}, - {{0x20,0x01,0x00,0x00,0x9d,0x38,0x6a,0xb8,0x24,0x36,0x3c,0x78,0x43,0x1d,0xd5,0x59}, 8333}, - {{0x20,0x01,0x00,0x00,0x9d,0x38,0x6a,0xb8,0x24,0xdd,0x2a,0xcb,0xb8,0xa9,0x5a,0xde}, 8333}, - {{0x20,0x01,0x00,0x00,0x9d,0x38,0x6a,0xb8,0x28,0x69,0x2c,0xb3,0xb5,0x7b,0x31,0x1c}, 8333}, - {{0x20,0x01,0x00,0x00,0x9d,0x38,0x6a,0xb8,0x28,0xbf,0x33,0xd4,0x9d,0x29,0x8e,0xdc}, 8333}, - {{0x20,0x01,0x00,0x00,0x9d,0x38,0x6a,0xb8,0x28,0xe0,0x14,0x2e,0x3e,0xd6,0xb1,0x82}, 8333}, - {{0x20,0x01,0x00,0x00,0x9d,0x38,0x6a,0xb8,0x28,0xf3,0x16,0x75,0xc3,0xed,0x5b,0xe7}, 8333}, - {{0x20,0x01,0x00,0x00,0x9d,0x38,0x6a,0xb8,0x2c,0x4c,0x21,0xd6,0x94,0x6c,0xef,0x01}, 8333}, - {{0x20,0x01,0x00,0x00,0x9d,0x38,0x6a,0xb8,0x2c,0xd6,0x3f,0x49,0xa1,0xec,0x07,0x36}, 8333}, - {{0x20,0x01,0x00,0x00,0x9d,0x38,0x6a,0xb8,0x30,0x1d,0x1c,0xd6,0xba,0x5a,0x29,0x35}, 8333}, - {{0x20,0x01,0x00,0x00,0x9d,0x38,0x6a,0xb8,0x30,0x2b,0x34,0x0f,0xe7,0x23,0xb1,0x5e}, 8333}, - {{0x20,0x01,0x00,0x00,0x9d,0x38,0x6a,0xb8,0x30,0x34,0x2d,0x96,0xb5,0x7f,0xb0,0xe6}, 8333}, - {{0x20,0x01,0x00,0x00,0x9d,0x38,0x6a,0xb8,0x30,0x6b,0x08,0x72,0xb4,0xbc,0xd7,0x9f}, 8333}, - {{0x20,0x01,0x00,0x00,0x9d,0x38,0x6a,0xb8,0x30,0xa4,0x11,0x90,0x43,0x15,0x0e,0x53}, 8333}, - {{0x20,0x01,0x00,0x00,0x9d,0x38,0x6a,0xb8,0x30,0xc3,0x13,0x62,0x52,0x1f,0x52,0xc5}, 8333}, - {{0x20,0x01,0x00,0x00,0x9d,0x38,0x6a,0xb8,0x30,0xe7,0x3e,0x5c,0xda,0x3f,0x64,0x66}, 8333}, - {{0x20,0x01,0x00,0x00,0x9d,0x38,0x6a,0xb8,0x34,0x39,0x02,0x23,0xa0,0x4a,0xfd,0xfd}, 8333}, - {{0x20,0x01,0x00,0x00,0x9d,0x38,0x6a,0xb8,0x34,0x77,0x14,0xcd,0xf7,0xde,0xde,0xe8}, 8333}, - {{0x20,0x01,0x00,0x00,0x9d,0x38,0x6a,0xb8,0x34,0x98,0x01,0xa5,0x46,0x35,0x2b,0x50}, 8333}, - {{0x20,0x01,0x00,0x00,0x9d,0x38,0x6a,0xb8,0x34,0x9d,0x0d,0xb2,0xa0,0xe6,0x29,0xa2}, 8333}, - {{0x20,0x01,0x00,0x00,0x9d,0x38,0x6a,0xb8,0x34,0xf7,0x15,0xb2,0x30,0x12,0x3a,0x74}, 8333}, - {{0x20,0x01,0x00,0x00,0x9d,0x38,0x6a,0xb8,0x38,0x09,0x29,0x41,0x43,0x44,0x48,0x38}, 8333}, - {{0x20,0x01,0x00,0x00,0x9d,0x38,0x6a,0xb8,0x38,0x09,0x37,0xb7,0x31,0xb5,0x8e,0x3d}, 8333}, - {{0x20,0x01,0x00,0x00,0x9d,0x38,0x6a,0xb8,0x38,0x77,0x2d,0xac,0xb6,0x91,0x71,0x9c}, 8333}, - {{0x20,0x01,0x00,0x00,0x9d,0x38,0x6a,0xb8,0x38,0x8a,0x24,0xf3,0xa1,0x41,0xc1,0x94}, 8333}, - {{0x20,0x01,0x00,0x00,0x9d,0x38,0x6a,0xb8,0x38,0xba,0x3b,0x3e,0x43,0x0c,0xfb,0x74}, 8333}, - {{0x20,0x01,0x00,0x00,0x9d,0x38,0x6a,0xb8,0x38,0xc4,0x2f,0x2a,0x93,0x57,0xb1,0xae}, 8333}, - {{0x20,0x01,0x00,0x00,0x9d,0x38,0x6a,0xb8,0x38,0xe2,0x02,0x3f,0xb4,0xf6,0x6a,0xd1}, 8333}, - {{0x20,0x01,0x00,0x00,0x9d,0x38,0x6a,0xb8,0x3c,0x56,0x21,0x71,0x9d,0x80,0xd3,0x60}, 8333}, - {{0x20,0x01,0x00,0x00,0x9d,0x38,0x6a,0xb8,0x3c,0xab,0x14,0x21,0x3c,0xa4,0x1a,0x8e}, 8333}, - {{0x20,0x01,0x00,0x00,0x9d,0x38,0x6a,0xb8,0x00,0x3f,0x24,0x41,0x68,0x06,0x97,0x97}, 8333}, - {{0x20,0x01,0x00,0x00,0x9d,0x38,0x6a,0xb8,0x04,0x24,0x03,0x21,0x52,0xb3,0x56,0x33}, 8333}, - {{0x20,0x01,0x00,0x00,0x9d,0x38,0x6a,0xb8,0x04,0x7c,0x32,0xef,0xa7,0xa8,0xa2,0xb4}, 8333}, - {{0x20,0x01,0x00,0x00,0x9d,0x38,0x6a,0xb8,0x04,0xa7,0x3c,0xdd,0x9d,0x1b,0x07,0x08}, 8333}, - {{0x20,0x01,0x00,0x00,0x9d,0x38,0x6a,0xb8,0x04,0xc3,0x3a,0x54,0x9d,0x1c,0x2a,0xd7}, 8333}, - {{0x20,0x01,0x00,0x00,0x9d,0x38,0x6a,0xb8,0x08,0x13,0x3a,0xe3,0xbd,0xd2,0x66,0xd8}, 8333}, - {{0x20,0x01,0x00,0x00,0x9d,0x38,0x6a,0xb8,0x08,0x18,0x0c,0xf4,0x27,0xf2,0xb5,0xf5}, 8333}, - {{0x20,0x01,0x00,0x00,0x9d,0x38,0x6a,0xb8,0x08,0x55,0x33,0xf7,0x6d,0xbd,0x53,0xc4}, 8333}, - {{0x20,0x01,0x00,0x00,0x9d,0x38,0x6a,0xb8,0x08,0x68,0x1b,0xaa,0xb1,0x74,0xb7,0x64}, 8333}, - {{0x20,0x01,0x00,0x00,0x9d,0x38,0x6a,0xb8,0x08,0x78,0x21,0xcf,0x2b,0x5b,0x28,0x60}, 8333}, - {{0x20,0x01,0x00,0x00,0x9d,0x38,0x6a,0xb8,0x08,0xa4,0xe1,0xd1,0x79,0xec,0x7c,0xee}, 8333}, - {{0x20,0x01,0x00,0x00,0x9d,0x38,0x6a,0xb8,0x08,0xb3,0x39,0x2c,0xab,0x0d,0xae,0x6b}, 8333}, - {{0x20,0x01,0x00,0x00,0x9d,0x38,0x6a,0xb8,0x08,0xff,0x35,0x2f,0xb2,0x08,0x56,0x04}, 8333}, - {{0x20,0x01,0x00,0x00,0x9d,0x38,0x6a,0xb8,0x0c,0x2f,0x17,0x93,0xfa,0x42,0xac,0xdc}, 8333}, - {{0x20,0x01,0x00,0x00,0x9d,0x38,0x6a,0xb8,0x0c,0x36,0x02,0x5f,0xa0,0xd0,0xe8,0x71}, 8333}, - {{0x20,0x01,0x00,0x00,0x9d,0x38,0x6a,0xb8,0x00,0xd3,0x06,0x9e,0xd0,0xa0,0x1b,0x73}, 8333}, - {{0x20,0x01,0x00,0x00,0x9d,0x38,0x6a,0xbd,0x10,0x9f,0x37,0x9e,0xae,0xff,0x39,0x57}, 8333}, - {{0x20,0x01,0x00,0x00,0x9d,0x38,0x6a,0xbd,0x10,0xa5,0x2f,0x7d,0xab,0x07,0x9c,0x7b}, 8333}, - {{0x20,0x01,0x00,0x00,0x9d,0x38,0x6a,0xbd,0x14,0x62,0x3f,0xe1,0xb2,0xcf,0xdc,0xf0}, 8333}, - {{0x20,0x01,0x00,0x00,0x9d,0x38,0x6a,0xbd,0x18,0x0b,0x29,0xbe,0x34,0x29,0xfe,0xde}, 8333}, - {{0x20,0x01,0x00,0x00,0x9d,0x38,0x6a,0xbd,0x18,0x57,0x02,0x4c,0x46,0xf4,0x7d,0xc9}, 8333}, - {{0x20,0x01,0x00,0x00,0x9d,0x38,0x6a,0xbd,0x18,0xd5,0x0a,0x69,0x4b,0x4a,0x6e,0x8b}, 8333}, - {{0x20,0x01,0x00,0x00,0x9d,0x38,0x6a,0xbd,0x1c,0x20,0x25,0xa2,0x3f,0x5d,0x2d,0xa4}, 8333}, - {{0x20,0x01,0x00,0x00,0x9d,0x38,0x6a,0xbd,0x1c,0x96,0x24,0xdc,0xa7,0x53,0xd6,0xf2}, 8333}, - {{0x20,0x01,0x00,0x00,0x9d,0x38,0x6a,0xbd,0x1c,0xe7,0x05,0x33,0x26,0xf3,0x2a,0xab}, 8333}, - {{0x20,0x01,0x00,0x00,0x9d,0x38,0x6a,0xbd,0x20,0x65,0x30,0x08,0x76,0xb5,0xcb,0x06}, 8333}, - {{0x20,0x01,0x00,0x00,0x9d,0x38,0x6a,0xbd,0x20,0xb2,0x04,0x34,0x43,0x87,0xf5,0xe1}, 8333}, - {{0x20,0x01,0x00,0x00,0x9d,0x38,0x6a,0xbd,0x20,0xff,0x14,0x7c,0x84,0x0c,0xb0,0xdb}, 8333}, - {{0x20,0x01,0x00,0x00,0x9d,0x38,0x6a,0xbd,0x24,0x36,0x3c,0x96,0x91,0xe9,0x2d,0xe3}, 8333}, - {{0x20,0x01,0x00,0x00,0x9d,0x38,0x6a,0xbd,0x24,0x4c,0x18,0x17,0xae,0x9f,0x8a,0x38}, 8333}, - {{0x20,0x01,0x00,0x00,0x9d,0x38,0x6a,0xbd,0x28,0x4c,0x29,0xce,0x88,0xb5,0xc8,0x6f}, 8333}, - {{0x20,0x01,0x00,0x00,0x9d,0x38,0x6a,0xbd,0x28,0x5a,0x00,0x5c,0xc1,0x6b,0x11,0x9a}, 8333}, - {{0x20,0x01,0x00,0x00,0x9d,0x38,0x6a,0xbd,0x2c,0x5f,0x0a,0x51,0xa6,0x71,0x3d,0x90}, 8333}, - {{0x20,0x01,0x00,0x00,0x9d,0x38,0x6a,0xbd,0x30,0x65,0x32,0x55,0x4b,0x21,0xe5,0x20}, 8333}, - {{0x20,0x01,0x00,0x00,0x9d,0x38,0x6a,0xbd,0x34,0x1d,0x2d,0xfa,0x89,0x2f,0x43,0x66}, 8333}, - {{0x20,0x01,0x00,0x00,0x9d,0x38,0x6a,0xbd,0x34,0x50,0x30,0x2f,0x23,0xb3,0xa3,0x3a}, 8333}, - {{0x20,0x01,0x00,0x00,0x9d,0x38,0x6a,0xbd,0x34,0x56,0x23,0x08,0xd0,0xb5,0x79,0x70}, 8333}, - {{0x20,0x01,0x00,0x00,0x9d,0x38,0x6a,0xbd,0x34,0x70,0x34,0x6d,0xaf,0x23,0xd4,0x1b}, 8333}, - {{0x20,0x01,0x00,0x00,0x9d,0x38,0x6a,0xbd,0x34,0xba,0x20,0xc2,0x9a,0x5a,0xdd,0x02}, 8333}, - {{0x20,0x01,0x00,0x00,0x9d,0x38,0x6a,0xbd,0x38,0x46,0x11,0x33,0xa6,0x8c,0xea,0x80}, 8333}, - {{0x20,0x01,0x00,0x00,0x9d,0x38,0x6a,0xbd,0x38,0xef,0x31,0xea,0x6c,0xd1,0x45,0xdb}, 8333}, - {{0x20,0x01,0x00,0x00,0x9d,0x38,0x6a,0xbd,0x3c,0x1f,0xc3,0x5a,0xcc,0x00,0x28,0xd3}, 8333}, - {{0x20,0x01,0x00,0x00,0x9d,0x38,0x6a,0xbd,0x3c,0x49,0x15,0x39,0xfe,0x22,0x5b,0x3b}, 8333}, - {{0x20,0x01,0x00,0x00,0x9d,0x38,0x6a,0xbd,0x3c,0x5e,0x2e,0xcd,0x88,0xee,0x78,0x7c}, 8333}, - {{0x20,0x01,0x00,0x00,0x9d,0x38,0x6a,0xbd,0x3c,0x74,0x01,0x94,0x4f,0x94,0x0e,0x1b}, 8333}, - {{0x20,0x01,0x00,0x00,0x9d,0x38,0x6a,0xbd,0x04,0xc4,0x34,0x92,0x4d,0x56,0x35,0xdd}, 8333}, - {{0x20,0x01,0x00,0x00,0x9d,0x38,0x6a,0xbd,0x04,0xe7,0x35,0xf2,0xae,0x92,0xcb,0xcd}, 8333}, - {{0x20,0x01,0x00,0x00,0x9d,0x38,0x6a,0xbd,0x08,0x50,0x2b,0x2f,0xad,0xbf,0xfa,0x7e}, 8333}, - {{0x20,0x01,0x00,0x00,0x9d,0x38,0x6a,0xbd,0x08,0xba,0x0f,0x4f,0x3e,0x75,0xb0,0x0b}, 8333}, - {{0x20,0x01,0x00,0x00,0x9d,0x38,0x6a,0xbd,0x00,0x9e,0x32,0x94,0xc2,0xb5,0x67,0xd7}, 8333}, - {{0x20,0x01,0x00,0x00,0x9d,0x38,0x6a,0xbd,0x0c,0x74,0x08,0x1b,0xa2,0xfb,0xaa,0x90}, 8333}, - {{0x20,0x01,0x00,0x00,0x9d,0x38,0x78,0xcf,0x14,0x6b,0x2c,0xc2,0xb2,0xa5,0x0d,0xb7}, 8333}, - {{0x20,0x01,0x00,0x00,0x9d,0x38,0x78,0xcf,0x18,0xd3,0x16,0x02,0x2a,0x06,0xc5,0x62}, 8333}, - {{0x20,0x01,0x00,0x00,0x9d,0x38,0x78,0xcf,0x24,0xa7,0x0e,0xe0,0x72,0xcc,0x7f,0x75}, 8333}, - {{0x20,0x01,0x00,0x00,0x9d,0x38,0x78,0xcf,0x28,0x62,0x13,0x84,0xb4,0xb8,0x40,0x6f}, 8333}, - {{0x20,0x01,0x00,0x00,0x9d,0x38,0x78,0xcf,0x30,0xc4,0x36,0x98,0x92,0xa5,0x3a,0xf9}, 8333}, - {{0x20,0x01,0x00,0x00,0x9d,0x38,0x78,0xcf,0x34,0x0b,0x12,0x70,0x4d,0x61,0x08,0x57}, 8333}, - {{0x20,0x01,0x00,0x00,0x9d,0x38,0x78,0xcf,0x3c,0xb3,0x27,0x73,0x4d,0xa3,0x0d,0x4c}, 8333}, - {{0x20,0x01,0x00,0x00,0x9d,0x38,0x78,0xcf,0x3c,0xdf,0x08,0xab,0xa3,0x31,0x0d,0x75}, 8333}, - {{0x20,0x01,0x00,0x00,0x9d,0x38,0x78,0xcf,0x04,0xd1,0x36,0x6f,0x4f,0x91,0xea,0xfb}, 8333}, - {{0x20,0x01,0x00,0x00,0x9d,0x38,0x78,0xcf,0x08,0x3f,0x0b,0x1c,0xc1,0xa4,0xad,0x71}, 8333}, - {{0x20,0x01,0x00,0x00,0x9d,0x38,0x90,0xd7,0x10,0x67,0x13,0xc5,0xa6,0x9c,0xb0,0x99}, 8333}, - {{0x20,0x01,0x00,0x00,0x9d,0x38,0x90,0xd7,0x10,0xaa,0x20,0xc7,0xaa,0x6f,0xd3,0x18}, 8333}, - {{0x20,0x01,0x00,0x00,0x9d,0x38,0x90,0xd7,0x10,0xdf,0x16,0xc3,0xb3,0x51,0xe8,0x24}, 8333}, - {{0x20,0x01,0x00,0x00,0x9d,0x38,0x90,0xd7,0x14,0x64,0x25,0x5e,0x92,0x08,0x80,0x12}, 8333}, - {{0x20,0x01,0x00,0x00,0x9d,0x38,0x90,0xd7,0x14,0xe1,0x01,0xb8,0xb2,0x56,0xff,0x4c}, 8333}, - {{0x20,0x01,0x00,0x00,0x9d,0x38,0x90,0xd7,0x18,0x0c,0x0e,0xbf,0x2a,0x63,0x93,0xc0}, 8333}, - {{0x20,0x01,0x00,0x00,0x9d,0x38,0x90,0xd7,0x18,0xfb,0x09,0xd7,0xaf,0x8d,0xa5,0xd5}, 8333}, - {{0x20,0x01,0x00,0x00,0x9d,0x38,0x90,0xd7,0x1c,0xa1,0x3e,0x8e,0xab,0x02,0xed,0xbe}, 8333}, - {{0x20,0x01,0x00,0x00,0x9d,0x38,0x90,0xd7,0x1c,0xd7,0x3f,0xe8,0xe8,0x0f,0x53,0xf9}, 8333}, - {{0x20,0x01,0x00,0x00,0x9d,0x38,0x90,0xd7,0x20,0xd8,0x10,0x62,0x26,0x84,0x32,0xc2}, 8333}, - {{0x20,0x01,0x00,0x00,0x9d,0x38,0x90,0xd7,0x24,0x19,0x37,0x3e,0xda,0x40,0x1e,0x51}, 8333}, - {{0x20,0x01,0x00,0x00,0x9d,0x38,0x90,0xd7,0x24,0x2b,0x1a,0xc2,0xfd,0xcc,0xaf,0x6a}, 8333}, - {{0x20,0x01,0x00,0x00,0x9d,0x38,0x90,0xd7,0x24,0x42,0x2d,0x34,0x9e,0x97,0x36,0xa0}, 8333}, - {{0x20,0x01,0x00,0x00,0x9d,0x38,0x90,0xd7,0x24,0x6c,0x24,0xf1,0x3c,0x0f,0x65,0xfc}, 8333}, - {{0x20,0x01,0x00,0x00,0x9d,0x38,0x90,0xd7,0x24,0xc4,0x15,0xe7,0xd0,0xcb,0x7a,0x52}, 8333}, + {{0x20,0x01,0x00,0x00,0x9d,0x38,0x6a,0xb8,0x24,0x5e,0x02,0xb3,0xa3,0x00,0x31,0x7e}, 8333}, + {{0x20,0x01,0x00,0x00,0x9d,0x38,0x6a,0xb8,0x28,0x14,0x21,0x5c,0x88,0xe3,0x4e,0xe0}, 8333}, + {{0x20,0x01,0x00,0x00,0x9d,0x38,0x6a,0xb8,0x30,0xac,0x3a,0x51,0xb2,0xda,0x71,0x2d}, 8333}, + {{0x20,0x01,0x00,0x00,0x9d,0x38,0x6a,0xb8,0x34,0xa6,0x0e,0xeb,0xc3,0xed,0x5b,0xe7}, 8333}, + {{0x20,0x01,0x00,0x00,0x9d,0x38,0x6a,0xb8,0x0c,0x2f,0x16,0xd5,0x52,0x5a,0x10,0x7e}, 8333}, + {{0x20,0x01,0x00,0x00,0x9d,0x38,0x6a,0xb8,0x0c,0xb1,0x25,0x57,0x43,0x1c,0xf3,0xe1}, 8333}, + {{0x20,0x01,0x00,0x00,0x9d,0x38,0x6a,0xbd,0x10,0x56,0x29,0x0d,0xa6,0x71,0x3d,0x90}, 8333}, + {{0x20,0x01,0x00,0x00,0x9d,0x38,0x6a,0xbd,0x18,0x65,0x14,0xfe,0xd0,0xa7,0x1f,0x72}, 8333}, + {{0x20,0x01,0x00,0x00,0x9d,0x38,0x6a,0xbd,0x2c,0x3c,0x30,0x06,0xa4,0x86,0x93,0xc3}, 8333}, + {{0x20,0x01,0x00,0x00,0x9d,0x38,0x6a,0xbd,0x2c,0x73,0x33,0x13,0xf2,0x1a,0x96,0xda}, 8333}, + {{0x20,0x01,0x00,0x00,0x9d,0x38,0x6a,0xbd,0x30,0x50,0xfb,0xff,0xa2,0x50,0x33,0x86}, 8333}, + {{0x20,0x01,0x00,0x00,0x9d,0x38,0x6a,0xbd,0x38,0x28,0x04,0x94,0xfd,0xaa,0x56,0xcd}, 8333}, + {{0x20,0x01,0x00,0x00,0x9d,0x38,0x6a,0xbd,0x04,0x54,0x18,0x7d,0x3e,0x75,0xb0,0x0b}, 8333}, + {{0x20,0x01,0x00,0x00,0x9d,0x38,0x78,0xcf,0x0c,0x2c,0x1d,0xcc,0xfa,0x42,0x41,0xa3}, 8333}, + {{0x20,0x01,0x00,0x00,0x9d,0x38,0x90,0xd7,0x1c,0x4a,0x20,0xd4,0x4d,0xaa,0xeb,0x5a}, 8333}, + {{0x20,0x01,0x00,0x00,0x9d,0x38,0x90,0xd7,0x1c,0xa7,0x16,0x12,0x9a,0x18,0x31,0xe5}, 8333}, + {{0x20,0x01,0x00,0x00,0x9d,0x38,0x90,0xd7,0x24,0xc8,0x3a,0x0a,0xa6,0x8d,0xf7,0x99}, 8333}, {{0x20,0x01,0x00,0x00,0x9d,0x38,0x90,0xd7,0x28,0x37,0x32,0x4e,0xd0,0xcb,0x9f,0x45}, 22475}, - {{0x20,0x01,0x00,0x00,0x9d,0x38,0x90,0xd7,0x28,0x58,0x2d,0x7c,0xbc,0x51,0x6e,0xe0}, 8333}, - {{0x20,0x01,0x00,0x00,0x9d,0x38,0x90,0xd7,0x28,0x9e,0x1b,0x03,0x43,0x8e,0xb5,0x17}, 8333}, - {{0x20,0x01,0x00,0x00,0x9d,0x38,0x90,0xd7,0x28,0x9f,0x30,0xfc,0x54,0xbc,0x96,0x85}, 8333}, - {{0x20,0x01,0x00,0x00,0x9d,0x38,0x90,0xd7,0x28,0xa2,0x07,0x60,0xa6,0xb3,0x31,0x39}, 8333}, - {{0x20,0x01,0x00,0x00,0x9d,0x38,0x90,0xd7,0x28,0xa4,0x1b,0x25,0xb8,0xc7,0x38,0xff}, 8333}, - {{0x20,0x01,0x00,0x00,0x9d,0x38,0x90,0xd7,0x28,0xd3,0x10,0x49,0xfd,0x91,0x71,0x2c}, 8333}, - {{0x20,0x01,0x00,0x00,0x9d,0x38,0x90,0xd7,0x2c,0x32,0x2d,0xa7,0xc1,0x11,0xdd,0x82}, 8333}, - {{0x20,0x01,0x00,0x00,0x9d,0x38,0x90,0xd7,0x2c,0x91,0x1e,0x07,0x5d,0x3d,0x7e,0xb1}, 8333}, - {{0x20,0x01,0x00,0x00,0x9d,0x38,0x90,0xd7,0x2c,0xe5,0x03,0xc7,0xb7,0x36,0x91,0x28}, 8333}, - {{0x20,0x01,0x00,0x00,0x9d,0x38,0x90,0xd7,0x2c,0xf4,0x30,0xd4,0xe0,0x20,0x53,0xfa}, 8333}, - {{0x20,0x01,0x00,0x00,0x9d,0x38,0x90,0xd7,0x2c,0xfc,0x22,0x21,0x98,0xe5,0xee,0xd7}, 8333}, - {{0x20,0x01,0x00,0x00,0x9d,0x38,0x90,0xd7,0x30,0x16,0x0a,0xed,0x61,0x07,0x04,0xdf}, 8333}, - {{0x20,0x01,0x00,0x00,0x9d,0x38,0x90,0xd7,0x30,0x3e,0x3e,0x8a,0xd0,0x6a,0xd1,0x37}, 8333}, - {{0x20,0x01,0x00,0x00,0x9d,0x38,0x90,0xd7,0x30,0xee,0x19,0xd6,0x6e,0x7b,0x90,0x8e}, 8333}, - {{0x20,0x01,0x00,0x00,0x9d,0x38,0x90,0xd7,0x34,0x2c,0x3e,0xcc,0xc2,0xa2,0x1e,0x31}, 8333}, + {{0x20,0x01,0x00,0x00,0x9d,0x38,0x90,0xd7,0x28,0xc1,0x36,0x1e,0xa6,0x9c,0xb0,0x99}, 8333}, + {{0x20,0x01,0x00,0x00,0x9d,0x38,0x90,0xd7,0x30,0xfe,0x1c,0x89,0xd0,0xb4,0x4d,0x18}, 8333}, {{0x20,0x01,0x00,0x00,0x9d,0x38,0x90,0xd7,0x34,0x74,0x1d,0xf1,0xe7,0x32,0xe5,0xe3}, 8333}, - {{0x20,0x01,0x00,0x00,0x9d,0x38,0x90,0xd7,0x34,0x96,0x2e,0x2d,0xcb,0x17,0xc3,0xbd}, 8333}, - {{0x20,0x01,0x00,0x00,0x9d,0x38,0x90,0xd7,0x34,0xf3,0x35,0x84,0xd0,0xa4,0x0a,0xa5}, 8333}, - {{0x20,0x01,0x00,0x00,0x9d,0x38,0x90,0xd7,0x38,0xe6,0x10,0x92,0xd0,0xcb,0x75,0x76}, 8333}, - {{0x20,0x01,0x00,0x00,0x9d,0x38,0x90,0xd7,0x38,0xec,0x06,0x11,0xe0,0x5f,0xdf,0x3d}, 8333}, - {{0x20,0x01,0x00,0x00,0x9d,0x38,0x90,0xd7,0x38,0xf5,0x39,0x38,0xb4,0x54,0x47,0x17}, 8333}, - {{0x20,0x01,0x00,0x00,0x9d,0x38,0x90,0xd7,0x38,0xf8,0x14,0xce,0x88,0x09,0x77,0x86}, 8333}, - {{0x20,0x01,0x00,0x00,0x9d,0x38,0x90,0xd7,0x3c,0x2c,0x10,0xa4,0xbb,0xfa,0xe0,0x9d}, 8333}, - {{0x20,0x01,0x00,0x00,0x9d,0x38,0x90,0xd7,0x3c,0x35,0x2a,0x8e,0xe7,0x9f,0x62,0xfd}, 8333}, - {{0x20,0x01,0x00,0x00,0x9d,0x38,0x90,0xd7,0x3c,0x40,0x07,0x7b,0xc2,0xbb,0x00,0x79}, 8333}, - {{0x20,0x01,0x00,0x00,0x9d,0x38,0x90,0xd7,0x00,0x65,0x2a,0xdf,0xb8,0xde,0x17,0x81}, 8333}, - {{0x20,0x01,0x00,0x00,0x9d,0x38,0x90,0xd7,0x00,0x7c,0x01,0x29,0xd0,0xcb,0x6e,0x8b}, 8333}, - {{0x20,0x01,0x00,0x00,0x9d,0x38,0x90,0xd7,0x08,0x51,0x10,0xd8,0x9d,0x58,0x70,0x59}, 8333}, - {{0x20,0x01,0x00,0x00,0x9d,0x38,0x90,0xd7,0x08,0x5d,0x01,0x02,0x2a,0xa2,0x51,0x9a}, 8333}, - {{0x20,0x01,0x00,0x00,0x9d,0x38,0x90,0xd7,0x08,0x96,0x0f,0xe0,0xaf,0xc6,0x22,0x70}, 8333}, - {{0x20,0x01,0x00,0x00,0x9d,0x38,0x90,0xd7,0x08,0xa0,0x22,0xcc,0xa0,0xb3,0xd9,0xda}, 8333}, - {{0x20,0x01,0x00,0x00,0x9d,0x38,0x90,0xd7,0x0c,0x0d,0x0d,0xe2,0xb9,0x4f,0x07,0x74}, 8333}, - {{0x20,0x01,0x00,0x00,0x9d,0x38,0x90,0xd7,0x0c,0xff,0x0c,0x79,0xaa,0x69,0xcb,0x82}, 8333}, + {{0x20,0x01,0x00,0x00,0x9d,0x38,0x90,0xd7,0x34,0xa8,0x0f,0xb1,0x88,0xe3,0xfb,0x19}, 8333}, + {{0x20,0x01,0x00,0x00,0x9d,0x38,0x90,0xd7,0x3c,0x19,0x3d,0x23,0xd0,0xb4,0xf8,0x31}, 18652}, + {{0x20,0x01,0x00,0x00,0x9d,0x38,0x90,0xd7,0x3c,0x45,0x23,0x42,0xd0,0xcb,0xd6,0xca}, 8333}, + {{0x20,0x01,0x00,0x00,0x9d,0x38,0x90,0xd7,0x3c,0x5f,0x31,0x05,0xd0,0xb4,0x60,0xb6}, 8333}, + {{0x20,0x01,0x00,0x00,0x9d,0x38,0x90,0xd7,0x08,0xa1,0x02,0xfb,0xd0,0xcb,0x1e,0x8f}, 8333}, + {{0x20,0x01,0x00,0x00,0x9d,0x38,0x90,0xd7,0x00,0xa3,0x36,0xe0,0xe0,0x20,0x53,0xfa}, 8333}, + {{0x20,0x01,0x00,0x00,0x9d,0x38,0x90,0xd7,0x00,0xeb,0x3b,0x30,0xd0,0xa4,0x0a,0xa5}, 8333}, {{0x20,0x01,0x00,0x00,0x9d,0x38,0x95,0x3c,0x10,0x4e,0x08,0xaf,0xb3,0xaa,0xf3,0x00}, 8333}, - {{0x20,0x01,0x00,0x00,0x9d,0x38,0x95,0x3c,0x10,0x63,0x10,0xc4,0x93,0xfd,0x77,0xb5}, 8333}, - {{0x20,0x01,0x00,0x00,0x9d,0x38,0x95,0x3c,0x10,0xdd,0x3d,0x0d,0xda,0xee,0xcc,0xda}, 8333}, - {{0x20,0x01,0x00,0x00,0x9d,0x38,0x95,0x3c,0x18,0x83,0x22,0xe3,0xaf,0x92,0x33,0xc7}, 8333}, - {{0x20,0x01,0x00,0x00,0x9d,0x38,0x95,0x3c,0x1c,0x0a,0x15,0x83,0x94,0x73,0x5f,0x2e}, 8333}, - {{0x20,0x01,0x00,0x00,0x9d,0x38,0x95,0x3c,0x1c,0x44,0x2b,0x70,0x9d,0xe7,0xa7,0xcc}, 8333}, - {{0x20,0x01,0x00,0x00,0x9d,0x38,0x95,0x3c,0x1c,0xbb,0x06,0x46,0xd2,0xcf,0xfd,0x00}, 8333}, - {{0x20,0x01,0x00,0x00,0x9d,0x38,0x95,0x3c,0x20,0x51,0x34,0x8d,0xdc,0x5a,0xc3,0xc2}, 8333}, - {{0x20,0x01,0x00,0x00,0x9d,0x38,0x95,0x3c,0x24,0xf8,0x19,0x8a,0xd0,0x23,0x65,0x80}, 8333}, - {{0x20,0x01,0x00,0x00,0x9d,0x38,0x95,0x3c,0x2c,0x32,0x2e,0xa8,0xb8,0x17,0x2b,0xb0}, 8333}, - {{0x20,0x01,0x00,0x00,0x9d,0x38,0x95,0x3c,0x2c,0x6d,0x3c,0xef,0x43,0x86,0x49,0x37}, 8333}, - {{0x20,0x01,0x00,0x00,0x9d,0x38,0x95,0x3c,0x2c,0xb1,0x17,0x19,0x53,0x98,0xe4,0x44}, 8333}, - {{0x20,0x01,0x00,0x00,0x9d,0x38,0x95,0x3c,0x30,0x53,0x8a,0x5e,0x25,0xe4,0x35,0x2d}, 8333}, - {{0x20,0x01,0x00,0x00,0x9d,0x38,0x95,0x3c,0x30,0x7b,0x23,0x09,0xb3,0x47,0x3f,0xdc}, 8333}, - {{0x20,0x01,0x00,0x00,0x9d,0x38,0x95,0x3c,0x30,0x84,0x1e,0x46,0x8a,0x72,0x75,0x0f}, 8333}, - {{0x20,0x01,0x00,0x00,0x9d,0x38,0x95,0x3c,0x30,0xa8,0x23,0x04,0x9d,0x47,0x7f,0xdf}, 8333}, - {{0x20,0x01,0x00,0x00,0x9d,0x38,0x95,0x3c,0x30,0xb9,0x2e,0xa0,0xe8,0x0c,0x53,0xe5}, 8333}, - {{0x20,0x01,0x00,0x00,0x9d,0x38,0x95,0x3c,0x30,0xcf,0x3e,0x04,0xa8,0x8b,0x4f,0xe8}, 8333}, - {{0x20,0x01,0x00,0x00,0x9d,0x38,0x95,0x3c,0x34,0x27,0x2c,0x62,0xbd,0x53,0xf1,0x2d}, 8333}, - {{0x20,0x01,0x00,0x00,0x9d,0x38,0x95,0x3c,0x34,0x45,0x1b,0xcb,0xb8,0xb5,0x96,0x53}, 8333}, - {{0x20,0x01,0x00,0x00,0x9d,0x38,0x95,0x3c,0x38,0x74,0x29,0x5f,0x9d,0xe2,0xcf,0x3c}, 8333}, - {{0x20,0x01,0x00,0x00,0x9d,0x38,0x95,0x3c,0x38,0xbc,0x03,0xf1,0x52,0xc4,0xea,0x47}, 8333}, - {{0x20,0x01,0x00,0x00,0x9d,0x38,0x95,0x3c,0x38,0xc9,0x39,0x4f,0xbe,0xa2,0xfd,0x60}, 8333}, - {{0x20,0x01,0x00,0x00,0x9d,0x38,0x95,0x3c,0x38,0xe8,0x23,0x91,0xb6,0xb2,0x90,0xc1}, 8333}, - {{0x20,0x01,0x00,0x00,0x9d,0x38,0x95,0x3c,0x3c,0x43,0x03,0xf1,0xb4,0x89,0xf8,0xb8}, 8333}, - {{0x20,0x01,0x00,0x00,0x9d,0x38,0x95,0x3c,0x04,0xc5,0x2a,0xe2,0xb6,0x43,0x38,0x66}, 8333}, - {{0x20,0x01,0x00,0x00,0x9d,0x38,0x95,0x3c,0x04,0xdb,0x3a,0x7f,0x87,0xb0,0xf8,0x76}, 8333}, - {{0x20,0x01,0x00,0x00,0x9d,0x38,0x95,0x3c,0x08,0xbe,0x0c,0xe8,0xb8,0xc5,0x52,0x12}, 8333}, - {{0x20,0x01,0x00,0x00,0x9d,0x38,0x95,0x3c,0x00,0xac,0x2e,0xab,0x2f,0x99,0x80,0xc4}, 8333}, - {{0x20,0x01,0x00,0x00,0x9d,0x38,0x95,0x3c,0x0c,0x0a,0x19,0x23,0x52,0xa0,0x7a,0xb2}, 8333}, - {{0x20,0x01,0x00,0x00,0x9d,0x38,0x95,0x3c,0x00,0xc2,0x17,0x15,0xb8,0x0b,0x71,0x21}, 8333}, - {{0x20,0x01,0x00,0x00,0x9d,0x38,0x95,0x3c,0x0c,0x8c,0x0e,0xe1,0x51,0x99,0xbf,0x8a}, 8333}, - {{0x20,0x01,0x00,0x00,0x9d,0x38,0x95,0x3c,0x0c,0xbb,0x03,0xf5,0xa6,0x70,0xb0,0x45}, 8333}, + {{0x20,0x01,0x00,0x00,0x9d,0x38,0x95,0x3c,0x14,0x34,0x07,0x1f,0xb8,0x50,0xba,0xb1}, 8333}, + {{0x20,0x01,0x00,0x00,0x9d,0x38,0x95,0x3c,0x14,0x4a,0x36,0xe8,0x51,0x9a,0xbb,0x69}, 8333}, + {{0x20,0x01,0x00,0x00,0x9d,0x38,0x95,0x3c,0x20,0xfc,0x26,0xef,0xed,0x26,0xc7,0x37}, 8333}, + {{0x20,0x01,0x00,0x00,0x9d,0x38,0x95,0x3c,0x04,0x54,0x01,0x20,0x88,0xe8,0x02,0xfb}, 8333}, + {{0x20,0x01,0x00,0x00,0x9d,0x38,0x95,0x3c,0x08,0x01,0x16,0x20,0xbc,0x22,0x95,0xbc}, 8333}, + {{0x20,0x01,0x00,0x00,0x9d,0x38,0x95,0x3c,0x08,0xa0,0x1f,0xdb,0xab,0x00,0x0b,0xc2}, 8333}, + {{0x20,0x01,0x00,0x00,0x9d,0x38,0x95,0x3c,0x0c,0xf6,0x3d,0x48,0x43,0x86,0x49,0x37}, 8333}, {{0x20,0x01,0x13,0xd8,0x1c,0x01,0x10,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x08}, 8333}, - {{0x20,0x01,0x13,0xd8,0x1c,0x01,0x20,0x00,0x24,0x70,0x00,0x00,0x00,0x00,0x00,0x01}, 8333}, - {{0x20,0x01,0x14,0xba,0x19,0x00,0x00,0x00,0x00,0x00,0x07,0x54,0xf2,0x71,0x15,0x1c}, 8333}, - {{0x20,0x01,0x16,0x08,0x00,0x10,0x01,0x56,0x00,0x38,0x00,0x00,0x00,0x00,0x26,0x5c}, 8333}, {{0x20,0x01,0x16,0x20,0x09,0x23,0x00,0x00,0x75,0xbe,0xed,0x92,0x1a,0x01,0x06,0x41}, 8333}, {{0x20,0x01,0x16,0x80,0x01,0x01,0x00,0x8c,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01}, 8333}, - {{0x20,0x01,0x18,0x38,0x20,0x00,0x04,0x13,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x03}, 8333}, - {{0x20,0x01,0x19,0xc0,0x00,0x01,0x08,0x01,0x08,0x01,0xff,0x00,0x04,0x6c,0x00,0x02}, 8333}, - {{0x20,0x01,0x19,0xf0,0x00,0x00,0x20,0x4f,0x54,0x00,0x00,0xff,0xfe,0x05,0x2d,0x2e}, 8333}, - {{0x20,0x01,0x19,0xf0,0x50,0x00,0x8c,0x8b,0x54,0x00,0x00,0xff,0xfe,0x1f,0xc0,0x23}, 8333}, - {{0x20,0x01,0x19,0xf0,0x00,0x05,0x17,0xa7,0x54,0x00,0x00,0xff,0xfe,0x87,0xcc,0x21}, 8333}, - {{0x20,0x01,0x19,0xf0,0x5c,0x01,0x06,0x3b,0x54,0x00,0x01,0xff,0xfe,0x47,0x2e,0xde}, 8333}, + {{0x20,0x01,0x19,0x70,0x5a,0xe2,0x2b,0x00,0x30,0xbd,0x79,0x10,0x0c,0x84,0x7a,0x8f}, 8333}, + {{0x20,0x01,0x19,0x70,0x5d,0x56,0xaa,0x01,0x1e,0x75,0x08,0xff,0xfe,0xad,0xda,0x48}, 8333}, + {{0x20,0x01,0x19,0xf0,0x03,0x00,0x10,0x45,0x02,0x25,0x90,0xff,0xfe,0xc9,0x29,0xb3}, 8333}, + {{0x20,0x01,0x19,0xf0,0x00,0x05,0x1f,0x93,0x54,0x00,0x01,0xff,0xfe,0x7a,0xc6,0x5a}, 8333}, + {{0x20,0x01,0x19,0xf0,0x6c,0x01,0x04,0xbd,0x54,0x00,0x01,0xff,0xfe,0x76,0x4d,0xb6}, 8333}, {{0x20,0x01,0x19,0xf0,0xac,0x01,0x02,0xfb,0x54,0x00,0x00,0xff,0xfe,0x5b,0xc3,0xff}, 8333}, + {{0x20,0x01,0x1a,0x48,0x00,0x07,0xaf,0x1a,0x75,0xf8,0x2c,0x47,0x32,0x85,0xd5,0x0e}, 8333}, + {{0x20,0x01,0x1a,0xf8,0x40,0x10,0xa0,0x94,0x33,0x33,0x00,0x00,0x00,0x00,0x8c,0x38}, 8333}, {{0x20,0x01,0x1a,0xf8,0x40,0x70,0xa0,0x16,0x33,0x33,0x00,0x00,0x00,0x00,0x5a,0xfb}, 8333}, {{0x20,0x01,0x1a,0xf8,0x47,0x00,0xa0,0x71,0x44,0x44,0x00,0x00,0x00,0x00,0xe2,0x6e}, 8333}, - {{0x20,0x01,0x1b,0xc0,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xaa,0xaa,0x00,0x21}, 8333}, {{0x20,0x01,0x02,0x00,0x00,0x00,0x88,0x01,0x50,0x54,0x00,0xff,0xfe,0xf2,0x01,0xd0}, 8333}, - {{0x20,0x01,0x41,0x28,0x61,0x35,0x00,0x10,0x02,0x0c,0x29,0xff,0xfe,0x69,0x9e,0x81}, 8333}, {{0x20,0x01,0x41,0x28,0x61,0x35,0x20,0x10,0x02,0x1e,0x0b,0xff,0xfe,0xe8,0xa3,0xc0}, 8333}, - {{0x20,0x01,0x41,0x28,0x61,0x35,0xe0,0x01,0x50,0x54,0x00,0xff,0xfe,0x37,0xe9,0xeb}, 8333}, - {{0x20,0x01,0x41,0x78,0x00,0x06,0x14,0x27,0x00,0x62,0x01,0x16,0x01,0x88,0x00,0x85}, 8333}, - {{0x20,0x01,0x41,0xc9,0x00,0x01,0x04,0x24,0x00,0x00,0x00,0x00,0x00,0x00,0x02,0x31}, 8333}, - {{0x20,0x01,0x41,0xd0,0x10,0x00,0x1e,0x1f,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00}, 8333}, - {{0x20,0x01,0x41,0xd0,0x10,0x04,0x1f,0xef,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00}, 8333}, - {{0x20,0x01,0x41,0xd0,0x10,0x04,0x24,0xa5,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00}, 8333}, - {{0x20,0x01,0x41,0xd0,0x10,0x08,0x1c,0x23,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00}, 8333}, - {{0x20,0x01,0x41,0xd0,0x10,0x08,0x27,0x52,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00}, 8333}, + {{0x20,0x01,0x41,0xd0,0x10,0x00,0x1f,0x98,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00}, 8333}, + {{0x20,0x01,0x41,0xd0,0x10,0x04,0x18,0xc7,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00}, 8333}, + {{0x20,0x01,0x41,0xd0,0x10,0x04,0x19,0xdc,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00}, 18555}, + {{0x20,0x01,0x41,0xd0,0x10,0x04,0x1f,0x7c,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00}, 8333}, + {{0x20,0x01,0x41,0xd0,0x10,0x08,0x2b,0xed,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00}, 8333}, {{0x20,0x01,0x41,0xd0,0x00,0x01,0x45,0xd8,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01}, 8333}, - {{0x20,0x01,0x41,0xd0,0x00,0x01,0x7d,0x09,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01}, 8333}, - {{0x20,0x01,0x41,0xd0,0x00,0x01,0x81,0x13,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01}, 8333}, + {{0x20,0x01,0x41,0xd0,0x00,0x01,0x53,0x95,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01}, 8333}, + {{0x20,0x01,0x41,0xd0,0x00,0x01,0x85,0xd3,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01}, 8333}, {{0x20,0x01,0x41,0xd0,0x00,0x01,0x86,0x49,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01}, 8333}, {{0x20,0x01,0x41,0xd0,0x00,0x01,0x8b,0x26,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01}, 8333}, {{0x20,0x01,0x41,0xd0,0x00,0x01,0xa5,0xb8,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01}, 8333}, {{0x20,0x01,0x41,0xd0,0x00,0x01,0xab,0x6b,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01}, 8333}, - {{0x20,0x01,0x41,0xd0,0x00,0x01,0xaf,0xd8,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00}, 8333}, - {{0x20,0x01,0x41,0xd0,0x00,0x01,0xb4,0x21,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01}, 8333}, - {{0x20,0x01,0x41,0xd0,0x00,0x01,0xb5,0xce,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01}, 8333}, {{0x20,0x01,0x41,0xd0,0x00,0x01,0xd2,0x27,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00}, 8333}, - {{0x20,0x01,0x41,0xd0,0x00,0x01,0xda,0xbd,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01}, 8333}, - {{0x20,0x01,0x41,0xd0,0x00,0x01,0xe1,0x3b,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01}, 8333}, - {{0x20,0x01,0x41,0xd0,0x00,0x01,0xf1,0x76,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01}, 8333}, - {{0x20,0x01,0x41,0xd0,0x02,0x03,0x10,0xbd,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00}, 8333}, - {{0x20,0x01,0x41,0xd0,0x00,0x02,0x16,0xbe,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01}, 8333}, - {{0x20,0x01,0x41,0xd0,0x00,0x02,0x53,0xdf,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00}, 8333}, - {{0x20,0x01,0x41,0xd0,0x00,0x02,0x8c,0x65,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00}, 8333}, - {{0x20,0x01,0x41,0xd0,0x00,0x02,0x94,0x31,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00}, 8333}, - {{0x20,0x01,0x41,0xd0,0x00,0x02,0x9c,0x94,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01}, 8333}, - {{0x20,0x01,0x41,0xd0,0x00,0x02,0xa5,0xa9,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00}, 8333}, + {{0x20,0x01,0x41,0xd0,0x00,0x01,0xf8,0x97,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01}, 8333}, + {{0x20,0x01,0x41,0xd0,0x00,0x01,0xf9,0x32,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01}, 8333}, + {{0x20,0x01,0x41,0xd0,0x00,0x02,0x34,0xb7,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01}, 8333}, + {{0x20,0x01,0x41,0xd0,0x00,0x02,0x49,0x75,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00}, 8333}, + {{0x20,0x01,0x41,0xd0,0x00,0x02,0x5c,0x22,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00}, 8333}, + {{0x20,0x01,0x41,0xd0,0x00,0x02,0x84,0xd4,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01}, 8333}, {{0x20,0x01,0x41,0xd0,0x00,0x02,0xab,0x38,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00}, 8333}, - {{0x20,0x01,0x41,0xd0,0x00,0x02,0x0c,0x6e,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00}, 8333}, - {{0x20,0x01,0x41,0xd0,0x00,0x02,0xc9,0xbf,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00}, 8333}, - {{0x20,0x01,0x41,0xd0,0x03,0x02,0x10,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xfa,0x25}, 8333}, - {{0x20,0x01,0x41,0xd0,0x03,0x03,0x01,0x88,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00}, 8333}, - {{0x20,0x01,0x41,0xd0,0x03,0x03,0x19,0x07,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00}, 8333}, + {{0x20,0x01,0x41,0xd0,0x00,0x02,0xc3,0x3c,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00}, 8333}, + {{0x20,0x01,0x41,0xd0,0x03,0x03,0x19,0x3b,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00}, 8333}, {{0x20,0x01,0x41,0xd0,0x03,0x03,0x25,0x05,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x1a}, 8333}, - {{0x20,0x01,0x41,0xd0,0x03,0x03,0x41,0x40,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00}, 8333}, - {{0x20,0x01,0x41,0xd0,0x03,0x03,0x0d,0x02,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00}, 8333}, - {{0x20,0x01,0x41,0xd0,0x04,0x03,0x05,0x89,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00}, 8333}, - {{0x20,0x01,0x41,0xd0,0x00,0x52,0x0d,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x06,0xe2}, 8333}, - {{0x20,0x01,0x41,0xd0,0x00,0x52,0x0d,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x06,0xe3}, 8333}, - {{0x20,0x01,0x41,0xd0,0x06,0x02,0x00,0x3b,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00}, 8333}, - {{0x20,0x01,0x41,0xd0,0x06,0x02,0x06,0xca,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00}, 8333}, - {{0x20,0x01,0x41,0xd0,0x06,0x02,0x00,0xe0,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00}, 8333}, - {{0x20,0x01,0x41,0xd0,0x06,0x04,0x01,0x77,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00}, 8333}, - {{0x20,0x01,0x41,0xd0,0x07,0x00,0x04,0x68,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00}, 8333}, - {{0x20,0x01,0x41,0xd0,0x07,0x00,0x04,0x79,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00}, 8333}, - {{0x20,0x01,0x41,0xd0,0x08,0x00,0x02,0x83,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00}, 8333}, + {{0x20,0x01,0x41,0xd0,0x03,0x03,0x41,0xdb,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00}, 58333}, + {{0x20,0x01,0x41,0xd0,0x03,0x03,0x4c,0x68,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00}, 8333}, + {{0x20,0x01,0x41,0xd0,0x03,0x03,0x05,0x08,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00}, 8333}, + {{0x20,0x01,0x41,0xd0,0x03,0x03,0x67,0x67,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00}, 8333}, + {{0x20,0x01,0x41,0xd0,0x03,0x03,0x68,0xcd,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00}, 8333}, + {{0x20,0x01,0x41,0xd0,0x06,0x02,0x17,0xa4,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00}, 8333}, + {{0x20,0x01,0x41,0xd0,0x06,0x02,0x18,0x42,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00}, 8333}, + {{0x20,0x01,0x41,0xd0,0x06,0x02,0x03,0xb7,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00}, 8333}, + {{0x20,0x01,0x41,0xd0,0x06,0x02,0x08,0x98,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00}, 8333}, + {{0x20,0x01,0x41,0xd0,0x06,0x02,0x0b,0x1a,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00}, 8333}, + {{0x20,0x01,0x41,0xd0,0x08,0x00,0x01,0x35,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00}, 8333}, + {{0x20,0x01,0x41,0xd0,0x08,0x00,0x03,0xd3,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00}, 8333}, + {{0x20,0x01,0x41,0xd0,0x00,0x08,0x10,0x1d,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01}, 8333}, {{0x20,0x01,0x41,0xd0,0x00,0x08,0x1b,0x29,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00}, 8333}, - {{0x20,0x01,0x41,0xd0,0x00,0x08,0x25,0x56,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00}, 8333}, - {{0x20,0x01,0x41,0xd0,0x00,0x08,0x7a,0x38,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01}, 8333}, - {{0x20,0x01,0x41,0xd0,0x00,0x08,0x80,0x07,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00}, 8333}, - {{0x20,0x01,0x41,0xd0,0x00,0x08,0x8f,0x46,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01}, 8333}, - {{0x20,0x01,0x41,0xd0,0x00,0x08,0x9c,0x6e,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01}, 8333}, - {{0x20,0x01,0x41,0xd0,0x00,0x08,0xb3,0xad,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01}, 8333}, - {{0x20,0x01,0x41,0xd0,0x00,0x08,0xb7,0xd0,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01}, 8333}, + {{0x20,0x01,0x41,0xd0,0x00,0x08,0x3f,0x74,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01}, 8333}, + {{0x20,0x01,0x41,0xd0,0x00,0x08,0x43,0xa0,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00}, 8333}, + {{0x20,0x01,0x41,0xd0,0x00,0x08,0xbb,0x32,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01}, 8333}, {{0x20,0x01,0x41,0xd0,0x00,0x08,0xbe,0xd3,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00}, 8333}, {{0x20,0x01,0x41,0xd0,0x00,0x08,0xc6,0x7c,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00}, 8333}, + {{0x20,0x01,0x41,0xd0,0x00,0x08,0xca,0x2d,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00}, 8333}, {{0x20,0x01,0x41,0xd0,0x00,0x08,0xd4,0x44,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01}, 8333}, - {{0x20,0x01,0x41,0xd0,0x00,0x08,0xd8,0x44,0x13,0x37,0x00,0x00,0x00,0x00,0x10,0x17}, 8333}, - {{0x20,0x01,0x41,0xd0,0x00,0x08,0xdb,0x78,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01}, 8333}, {{0x20,0x01,0x41,0xd0,0x00,0x08,0x0d,0xdb,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01}, 8333}, - {{0x20,0x01,0x41,0xd0,0x00,0x08,0x0d,0xdf,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01}, 8333}, - {{0x20,0x01,0x41,0xd0,0x00,0x08,0xe3,0xe4,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01}, 8333}, - {{0x20,0x01,0x41,0xd0,0x00,0x0a,0x3b,0x5f,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01}, 8333}, + {{0x20,0x01,0x41,0xd0,0x00,0x08,0xea,0x86,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01}, 8333}, + {{0x20,0x01,0x41,0xd0,0x00,0x0a,0x12,0x20,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01}, 8333}, + {{0x20,0x01,0x41,0xd0,0x00,0x0a,0x27,0xed,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01}, 8333}, + {{0x20,0x01,0x41,0xd0,0x00,0x0a,0x29,0x6c,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00}, 8139}, + {{0x20,0x01,0x41,0xd0,0x00,0x0a,0x2b,0x18,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01}, 8333}, {{0x20,0x01,0x41,0xd0,0x00,0x0a,0x40,0x5c,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00}, 8333}, - {{0x20,0x01,0x41,0xd0,0x00,0x0a,0x63,0x5b,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01}, 8333}, - {{0x20,0x01,0x41,0xd0,0x00,0x0a,0x6a,0x0d,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01}, 8333}, - {{0x20,0x01,0x41,0xd0,0x00,0x0a,0x06,0xa1,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01}, 8333}, + {{0x20,0x01,0x41,0xd0,0x00,0x0a,0x42,0xdf,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00}, 8312}, + {{0x20,0x01,0x41,0xd0,0x00,0x0a,0x4c,0x49,0x00,0x00,0x00,0x00,0x0a,0xca,0x79,0x29}, 8333}, + {{0x20,0x01,0x41,0xd0,0x00,0x0a,0x69,0x27,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01}, 8333}, + {{0x20,0x01,0x41,0xd0,0x00,0x0a,0x69,0xa2,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01}, 8333}, + {{0x20,0x01,0x41,0xd0,0x00,0x0a,0x6a,0x87,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01}, 8333}, {{0x20,0x01,0x41,0xd0,0x00,0x0a,0x6c,0x29,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01}, 8333}, - {{0x20,0x01,0x41,0xd0,0x00,0x0a,0x6f,0xd0,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00}, 8333}, - {{0x20,0x01,0x41,0xd0,0x00,0x0a,0x07,0x55,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01}, 8333}, - {{0x20,0x01,0x41,0xd0,0x00,0x0a,0xf8,0xd2,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01}, 8333}, - {{0x20,0x01,0x41,0xd0,0x00,0x0a,0xf9,0x15,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01}, 8333}, + {{0x20,0x01,0x41,0xd0,0x00,0x0a,0x6c,0x7d,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01}, 8333}, + {{0x20,0x01,0x41,0xd0,0x00,0x0a,0xf2,0x43,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01}, 8333}, + {{0x20,0x01,0x41,0xd0,0x00,0x0a,0xf9,0xcd,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01}, 8333}, + {{0x20,0x01,0x41,0xd0,0x00,0x0d,0x0d,0xc9,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00}, 8333}, {{0x20,0x01,0x41,0xd0,0x00,0x0e,0x11,0x46,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01}, 8333}, + {{0x20,0x01,0x41,0xd0,0x00,0x0e,0x01,0x26,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01}, 8333}, + {{0x20,0x01,0x41,0xd0,0x00,0x0e,0x12,0xaa,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01}, 8333}, {{0x20,0x01,0x41,0xd0,0x00,0x0e,0x13,0x88,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01}, 8333}, - {{0x20,0x01,0x41,0xd0,0x00,0x0e,0x02,0x6b,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01}, 8333}, - {{0x20,0x01,0x41,0xd0,0x00,0x0e,0x09,0xe7,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01}, 8333}, {{0x20,0x01,0x41,0xd0,0x00,0x0e,0x0e,0xc5,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01}, 8333}, - {{0x20,0x01,0x41,0xf0,0x00,0x61,0x00,0x00,0x72,0xf3,0x95,0xff,0xfe,0x09,0x75,0x21}, 8333}, - {{0x20,0x01,0x41,0xf0,0x00,0x61,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x07}, 8333}, - {{0x20,0x01,0x46,0x42,0xe5,0x27,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xbe,0xef}, 8333}, - {{0x20,0x01,0x04,0x70,0x00,0x1d,0x08,0xa9,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00}, 8333}, - {{0x20,0x01,0x04,0x70,0x00,0x1d,0x08,0xa9,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x04}, 8333}, + {{0x20,0x01,0x41,0xf0,0x00,0x00,0x00,0x04,0x00,0x62,0x69,0x74,0x63,0x6f,0x69,0x6e}, 8333}, + {{0x20,0x01,0x04,0x70,0x00,0x18,0x0b,0xe4,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333}, + {{0x20,0x01,0x04,0x70,0x1c,0x62,0xb1,0x70,0xbb,0xff,0x53,0xf1,0xed,0xbf,0x99,0xdf}, 42434}, {{0x20,0x01,0x04,0x70,0x1f,0x06,0x15,0xb4,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333}, + {{0x20,0x01,0x04,0x70,0x1f,0x06,0x0c,0xea,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333}, {{0x20,0x01,0x04,0x70,0x1f,0x07,0x08,0x03,0x02,0x0c,0x29,0xff,0xfe,0x2d,0x58,0x79}, 8333}, - {{0x20,0x01,0x04,0x70,0x1f,0x09,0x03,0x25,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x40}, 8333}, - {{0x20,0x01,0x04,0x70,0x1f,0x0b,0x05,0x6e,0x7e,0x5c,0xf8,0xff,0xfe,0x32,0x53,0x02}, 8333}, - {{0x20,0x01,0x04,0x70,0x1f,0x0b,0x08,0xc4,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x05}, 8333}, - {{0x20,0x01,0x04,0x70,0x1f,0x0b,0x08,0xfe,0x00,0xc4,0x43,0x38,0xe5,0x28,0x27,0x13}, 8333}, - {{0x20,0x01,0x04,0x70,0x1f,0x0b,0x09,0x67,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x11}, 8333}, - {{0x20,0x01,0x04,0x70,0x1f,0x10,0x07,0x76,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333}, + {{0x20,0x01,0x04,0x70,0x1f,0x08,0x03,0xcc,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333}, + {{0x20,0x01,0x04,0x70,0x1f,0x0a,0x18,0xdd,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333}, {{0x20,0x01,0x04,0x70,0x1f,0x15,0x11,0xf8,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x10}, 8333}, - {{0x20,0x01,0x04,0x70,0x1f,0x15,0x1b,0x95,0x2c,0x3e,0x8a,0x9a,0x24,0xe1,0x70,0x84}, 8333}, {{0x20,0x01,0x04,0x70,0x1f,0x15,0x0c,0xf7,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x14}, 8333}, - {{0x20,0x01,0x04,0x70,0x1f,0x15,0x0e,0x9b,0x00,0x00,0x00,0x00,0x00,0x00,0x03,0xef}, 8333}, - {{0x20,0x01,0x04,0x70,0x1f,0x17,0x02,0x2a,0x08,0xd2,0x72,0xbf,0xa5,0x64,0x21,0xfb}, 8333}, {{0x20,0x01,0x04,0x70,0x1f,0x17,0x00,0xb5,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x10}, 8333}, + {{0x20,0x01,0x04,0x70,0x1f,0x1a,0x01,0x72,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333}, {{0x20,0x01,0x04,0x70,0x1f,0x1b,0x05,0xa6,0x02,0x16,0x3e,0xff,0xfe,0x24,0x11,0x62}, 8333}, - {{0x20,0x01,0x04,0x70,0x21,0x79,0xde,0xad,0xde,0xaf,0x00,0x00,0x2e,0x70,0x9d,0x8b}, 8333}, - {{0x20,0x01,0x04,0x70,0x00,0x25,0x04,0x82,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333}, - {{0x20,0x01,0x04,0x70,0x00,0x27,0x04,0x83,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333}, + {{0x20,0x01,0x04,0x70,0x00,0x28,0x03,0x65,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x07}, 8333}, + {{0x20,0x01,0x04,0x70,0x00,0x41,0x00,0x06,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333}, + {{0x20,0x01,0x04,0x70,0x6c,0x80,0x01,0x01,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01}, 8333}, + {{0x20,0x01,0x04,0x70,0x6c,0x80,0x00,0x03,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01}, 8333}, + {{0x20,0x01,0x04,0x70,0x00,0x07,0x06,0x3e,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333}, {{0x20,0x01,0x04,0x70,0x00,0x07,0x0b,0x74,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333}, - {{0x20,0x01,0x04,0x70,0x00,0x08,0x02,0xe1,0x44,0xff,0x65,0x4e,0xe5,0x3e,0xad,0x59}, 8333}, - {{0x20,0x01,0x04,0x70,0x00,0x08,0x02,0xe1,0x70,0x58,0x53,0xf6,0x56,0x81,0x5b,0xe4}, 8333}, - {{0x20,0x01,0x04,0x70,0x00,0x08,0x02,0xe1,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x43}, 8333}, - {{0x20,0x01,0x04,0x70,0x00,0x08,0x07,0xb3,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x17}, 8333}, - {{0x20,0x01,0x04,0x70,0x8a,0x2f,0x80,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xe9,0x98}, 8333}, - {{0x20,0x01,0x04,0x70,0xa0,0x68,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333}, - {{0x20,0x01,0x04,0x70,0x00,0x0a,0x08,0x8b,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333}, + {{0x20,0x01,0x04,0x70,0x00,0x08,0x0b,0xd3,0x4d,0x25,0xca,0x57,0xa5,0xb7,0xc6,0xc4}, 8333}, {{0x20,0x01,0x04,0x70,0x00,0x0a,0x0c,0x13,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333}, - {{0x20,0x01,0x04,0x70,0xb3,0xd5,0x00,0x01,0x64,0x1c,0x6b,0xff,0xfe,0x9d,0xbc,0xcf}, 8333}, - {{0x20,0x01,0x04,0x70,0xc1,0x44,0xca,0xfe,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x09}, 8333}, - {{0x20,0x01,0x04,0x70,0xd0,0x0d,0x00,0x00,0x36,0x64,0xa9,0xff,0xfe,0x9a,0x51,0x50}, 8333}, - {{0x20,0x01,0x04,0x70,0xdb,0xf2,0xaa,0xaa,0x00,0x00,0x00,0x00,0x0b,0x17,0xc0,0x1c}, 8333}, - {{0x20,0x01,0x48,0x02,0x78,0x02,0x01,0x03,0xbe,0x76,0x4e,0xff,0xfe,0x21,0x19,0xf9}, 8333}, + {{0x20,0x01,0x04,0x70,0xc1,0x44,0xca,0xfe,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x23}, 8333}, + {{0x20,0x01,0x04,0x70,0xc3,0xc4,0x01,0x00,0x01,0x00,0x00,0x00,0x00,0x00,0x02,0x02}, 8333}, + {{0x20,0x01,0x04,0x70,0xe6,0x96,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01}, 8333}, {{0x20,0x01,0x48,0xf8,0x10,0x03,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x03,0xba}, 8333}, - {{0x20,0x01,0x4b,0x99,0x00,0x01,0x00,0x01,0x02,0x16,0x3e,0xff,0xfe,0xbd,0x85,0xba}, 8333}, - {{0x20,0x01,0x4b,0xa0,0xba,0xbe,0x26,0x81,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00}, 8333}, + {{0x20,0x01,0x48,0xf8,0x90,0x15,0x14,0x22,0x3d,0xc0,0xfc,0xf2,0x77,0x2f,0x57,0xbc}, 8333}, {{0x20,0x01,0x4b,0xa0,0xba,0xbe,0x08,0x32,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00}, 8333}, - {{0x20,0x01,0x4b,0xa0,0xca,0xfe,0x02,0x0c,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01}, 8333}, - {{0x20,0x01,0x05,0x79,0x92,0x84,0x00,0xbc,0x10,0xbe,0x5d,0xf1,0xf6,0xd2,0x41,0x94}, 8333}, - {{0x20,0x01,0x06,0x38,0xa0,0x00,0x41,0x40,0x00,0x00,0x00,0x00,0xff,0x10,0x04,0x15}, 8333}, + {{0x20,0x01,0x06,0x28,0x22,0xa0,0x00,0x09,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x12}, 8333}, {{0x20,0x01,0x06,0x38,0xa0,0x00,0x41,0x40,0x00,0x00,0x00,0x00,0xff,0xff,0x01,0x91}, 8333}, - {{0x20,0x01,0x06,0x7c,0x25,0x64,0x05,0x20,0x78,0x00,0x48,0x17,0x52,0xec,0x0d,0x8f}, 8333}, - {{0x20,0x01,0x07,0x08,0x01,0x50,0x00,0x10,0x00,0x00,0x00,0x00,0x00,0x00,0x43,0x29}, 8333}, + {{0x20,0x01,0x06,0x38,0xa0,0x00,0x41,0x42,0x00,0x00,0x00,0x00,0xff,0x10,0xbe,0xd6}, 8333}, + {{0x20,0x01,0x06,0x7c,0x21,0xec,0x10,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x0a}, 8333}, + {{0x20,0x01,0x08,0xd8,0x09,0x0b,0xc0,0x00,0x00,0x00,0x00,0x00,0x00,0x21,0x2f,0xc0}, 8333}, + {{0x20,0x01,0x08,0xd8,0x09,0x1c,0x92,0x00,0x00,0x00,0x00,0x00,0x00,0x5c,0xd4,0x25}, 8333}, {{0x20,0x01,0x09,0x80,0x23,0x1b,0x00,0x01,0x8e,0x89,0xa5,0xff,0xfe,0xe3,0xf8,0xbe}, 8333}, {{0x20,0x01,0x09,0x80,0xad,0xe8,0x00,0x01,0x14,0xfc,0xfd,0x6d,0x60,0x8c,0xf6,0x69}, 8333}, + {{0x20,0x01,0x09,0x81,0xbd,0xbd,0x00,0x01,0xc5,0x06,0x7d,0x38,0x4b,0x47,0xda,0x15}, 8333}, + {{0x20,0x01,0x09,0x82,0x27,0xf2,0x00,0x01,0x72,0x71,0xbc,0xff,0xfe,0x94,0xd5,0xbb}, 8333}, + {{0x20,0x01,0x09,0x84,0x26,0xb5,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01}, 8333}, {{0x20,0x01,0x09,0x84,0xae,0xc7,0x00,0x01,0xdc,0xb7,0x02,0x9a,0x7e,0xda,0xb9,0xa2}, 8333}, {{0x20,0x01,0x09,0x85,0x79,0xaf,0x00,0x20,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x35}, 8333}, - {{0x20,0x01,0x0b,0xc8,0x22,0x5f,0x01,0x0e,0x05,0x05,0x65,0x73,0x75,0x73,0x0d,0x0a}, 8333}, + {{0x20,0x01,0x09,0x85,0xcb,0x69,0x00,0x00,0x02,0x0c,0x29,0xff,0xfe,0xaf,0xdd,0x5e}, 8333}, + {{0x20,0x01,0xb0,0x11,0x30,0x0d,0x18,0x70,0x9c,0x87,0xd4,0xff,0xfe,0x9c,0x2d,0x0f}, 8333}, + {{0x20,0x01,0xb0,0x30,0x24,0x22,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x20,0x8d}, 8333}, + {{0x20,0x01,0x0b,0xc8,0x31,0xd7,0x01,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01}, 8333}, {{0x20,0x01,0x0b,0xc8,0x32,0x3c,0x01,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00}, 8333}, + {{0x20,0x01,0x0b,0xc8,0x33,0xac,0x19,0xff,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x26}, 8333}, {{0x20,0x01,0x0b,0xc8,0x39,0x9f,0xf0,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01}, 8333}, - {{0x20,0x01,0x0b,0xc8,0x3c,0xbf,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x05}, 8333}, - {{0x20,0x01,0x0b,0xc8,0x44,0x00,0x24,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x48,0x0f}, 8333}, - {{0x20,0x02,0x26,0x1b,0x64,0x2c,0x00,0x00,0x00,0x00,0x00,0x00,0x26,0x1b,0x64,0x2c}, 8333}, - {{0x20,0x02,0x29,0x56,0x68,0x5e,0x00,0x00,0x00,0x00,0x00,0x00,0x29,0x56,0x68,0x5e}, 8333}, - {{0x20,0x02,0x2d,0x7b,0x67,0x4f,0x00,0x00,0x00,0x00,0x00,0x00,0x2d,0x7b,0x67,0x4f}, 8333}, - {{0x20,0x02,0x2d,0xf9,0x5e,0x40,0x00,0x00,0x00,0x00,0x00,0x00,0x2d,0xf9,0x5e,0x40}, 8333}, - {{0x20,0x02,0x2e,0x04,0x78,0x4b,0x00,0x00,0x00,0x00,0x00,0x00,0x2e,0x04,0x78,0x4b}, 8333}, - {{0x20,0x02,0x2f,0x58,0xfe,0x42,0x00,0x00,0x00,0x00,0x00,0x00,0x2f,0x58,0xfe,0x42}, 8333}, - {{0x20,0x02,0x2f,0x58,0xfe,0x62,0x00,0x00,0x00,0x00,0x00,0x00,0x2f,0x58,0xfe,0x62}, 8333}, + {{0x20,0x01,0x0b,0xc8,0x3d,0xc1,0x01,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01,0x42}, 8333}, + {{0x20,0x01,0x0b,0xc8,0x44,0x00,0x20,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x46,0x3b}, 8333}, + {{0x20,0x01,0x0b,0xc8,0x44,0x00,0x24,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x1b,0x35}, 8333}, + {{0x20,0x01,0x0b,0xc8,0x47,0x00,0x20,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x58,0x23}, 8333}, + {{0x20,0x01,0x0d,0xa8,0x80,0x01,0x23,0x03,0x1c,0xf4,0x44,0x66,0x3f,0x1a,0x7e,0xdb}, 8333}, + {{0x20,0x01,0x0d,0xa8,0xd8,0x00,0x07,0x41,0x65,0x2d,0x52,0xdb,0x57,0x13,0x45,0x15}, 8333}, + {{0x20,0x02,0x17,0xe5,0x10,0xea,0x00,0x00,0x00,0x00,0x00,0x00,0x17,0xe5,0x10,0xea}, 8333}, + {{0x20,0x02,0x1f,0x2b,0x8c,0xbe,0x00,0x00,0x00,0x00,0x00,0x00,0x1f,0x2b,0x8c,0xbe}, 8333}, {{0x20,0x02,0x2f,0x59,0x30,0xf3,0x00,0x00,0x00,0x00,0x00,0x00,0x2f,0x59,0x30,0xf3}, 8333}, - {{0x20,0x02,0x2f,0x5a,0x3c,0x1c,0x00,0x00,0x00,0x00,0x00,0x00,0x2f,0x5a,0x3c,0x1c}, 10011}, {{0x20,0x02,0x2f,0x5a,0x56,0x2a,0x00,0x00,0x00,0x00,0x00,0x00,0x2f,0x5a,0x56,0x2a}, 8333}, - {{0x20,0x02,0x2f,0x5b,0xa5,0xf9,0x00,0x00,0x00,0x00,0x00,0x00,0x2f,0x5b,0xa5,0xf9}, 8333}, - {{0x20,0x02,0x2f,0x5b,0xb0,0x86,0x00,0x00,0x00,0x00,0x00,0x00,0x2f,0x5b,0xb0,0x86}, 8333}, - {{0x20,0x02,0x32,0x3f,0xa6,0x1b,0x00,0x00,0x00,0x00,0x00,0x00,0x32,0x3f,0xa6,0x1b}, 8333}, - {{0x20,0x02,0x33,0xff,0x69,0xa0,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01}, 8333}, + {{0x20,0x02,0x3e,0x92,0x46,0xd8,0x00,0x00,0x00,0x00,0x00,0x00,0x3e,0x92,0x46,0xd8}, 8333}, {{0x20,0x02,0x3f,0x62,0xe6,0xbb,0x00,0x00,0x00,0x00,0x00,0x00,0x3f,0x62,0xe6,0xbb}, 8333}, - {{0x20,0x02,0x4b,0x63,0x50,0xb4,0x12,0x34,0x40,0x59,0xbf,0x54,0xe0,0x88,0x7d,0xaa}, 8333}, - {{0x20,0x02,0x05,0x09,0x6a,0xc5,0x00,0x00,0x00,0x00,0x00,0x00,0x05,0x09,0x6a,0xc5}, 8333}, - {{0x20,0x02,0x51,0xa9,0x9c,0xc9,0x00,0x00,0x00,0x00,0x00,0x00,0x51,0xa9,0x9c,0xc9}, 8333}, - {{0x20,0x02,0x54,0xfb,0xa1,0xcd,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01}, 8333}, - {{0x20,0x02,0x5b,0xc2,0x54,0x28,0x00,0x00,0x00,0x00,0x00,0x00,0x5b,0xc2,0x54,0x28}, 8333}, - {{0x20,0x02,0x5b,0xce,0x12,0x53,0x00,0x00,0x00,0x00,0x00,0x00,0x5b,0xce,0x12,0x53}, 8333}, - {{0x20,0x02,0x5d,0x68,0xd2,0x70,0x00,0x00,0x00,0x00,0x00,0x00,0x5d,0x68,0xd2,0x70}, 8333}, + {{0x20,0x02,0x40,0x4e,0xa3,0x0a,0x00,0x00,0x00,0x00,0x00,0x00,0x40,0x4e,0xa3,0x0a}, 8333}, + {{0x20,0x02,0x43,0xdb,0x96,0x16,0x00,0x00,0x00,0x00,0x00,0x00,0x43,0xdb,0x96,0x16}, 8333}, + {{0x20,0x02,0x43,0xe5,0xa1,0xfa,0x00,0x00,0x00,0x00,0x00,0x00,0x43,0xe5,0xa1,0xfa}, 8333}, + {{0x20,0x02,0x52,0x66,0x0a,0xfb,0x00,0x00,0x00,0x00,0x00,0x00,0x52,0x66,0x0a,0xfb}, 8333}, {{0x20,0x02,0x5d,0xbd,0x91,0xa9,0x00,0x00,0x00,0x00,0x00,0x00,0x5d,0xbd,0x91,0xa9}, 8333}, - {{0x20,0x02,0x5f,0xd3,0x89,0x44,0x00,0x00,0x00,0x00,0x00,0x00,0x5f,0xd3,0x89,0x44}, 8333}, - {{0x20,0x02,0x67,0x38,0x88,0x69,0x00,0x00,0x00,0x00,0x00,0x00,0x67,0x38,0x88,0x69}, 8333}, - {{0x20,0x02,0x67,0xe9,0xfe,0x16,0x00,0x00,0x00,0x00,0x00,0x00,0x67,0xe9,0xfe,0x16}, 8333}, - {{0x20,0x02,0x67,0xfa,0x04,0x4a,0x00,0x00,0x00,0x00,0x00,0x00,0x67,0xfa,0x04,0x4a}, 8333}, - {{0x20,0x02,0x67,0xfa,0x04,0x4b,0x00,0x00,0x00,0x00,0x00,0x00,0x67,0xfa,0x04,0x4b}, 8333}, - {{0x20,0x02,0x68,0x25,0xd4,0x25,0x00,0x00,0x00,0x00,0x00,0x00,0x68,0x25,0xd4,0x25}, 8333}, - {{0x20,0x02,0x6a,0x0e,0x3e,0xa8,0x00,0x00,0x00,0x00,0x00,0x00,0x6a,0x0e,0x3e,0xa8}, 10011}, - {{0x20,0x02,0x6b,0xb4,0x47,0x5c,0x00,0x00,0x00,0x00,0x00,0x00,0x6b,0xb4,0x47,0x5c}, 41888}, - {{0x20,0x02,0x6b,0xb4,0x54,0xbc,0x00,0x00,0x00,0x00,0x00,0x00,0x6b,0xb4,0x54,0xbc}, 8333}, - {{0x20,0x02,0x6c,0x3d,0xd8,0x8a,0x00,0x00,0x00,0x00,0x00,0x00,0x6c,0x3d,0xd8,0x8a}, 8333}, - {{0x20,0x02,0x70,0x4a,0xd6,0xd4,0x00,0x00,0x00,0x00,0x00,0x00,0x70,0x4a,0xd6,0xd4}, 9997}, - {{0x20,0x02,0x71,0x69,0x8b,0x2a,0x00,0x00,0x00,0x00,0x00,0x00,0x71,0x69,0x8b,0x2a}, 8333}, - {{0x20,0x02,0x72,0x37,0xfc,0xf6,0x00,0x00,0x00,0x00,0x00,0x00,0x72,0x37,0xfc,0xf6}, 20188}, - {{0x20,0x02,0x78,0x19,0x7e,0x80,0x00,0x00,0x00,0x00,0x00,0x00,0x78,0x19,0x7e,0x80}, 7743}, - {{0x20,0x02,0x84,0x94,0x82,0x33,0x00,0x00,0x00,0x00,0x00,0x00,0x84,0x94,0x82,0x33}, 8333}, - {{0x20,0x02,0x84,0x94,0x84,0xfc,0x00,0x00,0x00,0x00,0x00,0x00,0x84,0x94,0x84,0xfc}, 8333}, - {{0x20,0x02,0x92,0x47,0x4c,0xec,0x00,0x00,0x00,0x00,0x00,0x00,0x92,0x47,0x4c,0xec}, 8333}, - {{0x20,0x02,0x95,0x38,0x73,0x5d,0x00,0x00,0x00,0x00,0x00,0x00,0x95,0x38,0x73,0x5d}, 8333}, - {{0x20,0x02,0xad,0xcd,0xb8,0x8c,0x00,0x00,0x00,0x00,0x00,0x00,0xad,0xcd,0xb8,0x8c}, 8333}, - {{0x20,0x02,0xb0,0x25,0x5c,0x52,0x00,0x00,0x00,0x00,0x00,0x00,0xb0,0x25,0x5c,0x52}, 8333}, + {{0x20,0x02,0x62,0x7e,0x33,0x3d,0x00,0x00,0x00,0x00,0x00,0x00,0x62,0x7e,0x33,0x3d}, 8333}, + {{0x20,0x02,0x6b,0x9b,0x48,0x6c,0x00,0x00,0x00,0x00,0x00,0x00,0x6b,0x9b,0x48,0x6c}, 8333}, + {{0x20,0x02,0x6d,0xcb,0x7c,0xba,0x00,0x00,0x00,0x00,0x00,0x00,0x6d,0xcb,0x7c,0xba}, 8333}, + {{0x20,0x02,0x7c,0xf8,0xe3,0x3e,0x00,0x00,0x00,0x00,0x00,0x00,0x7c,0xf8,0xe3,0x3e}, 8333}, + {{0x20,0x02,0x8e,0x00,0x82,0x31,0x00,0x00,0x00,0x00,0x00,0x00,0x8e,0x00,0x82,0x31}, 8333}, + {{0x20,0x02,0x8e,0x00,0x82,0x33,0x00,0x00,0x00,0x00,0x00,0x00,0x8e,0x00,0x82,0x33}, 8333}, {{0x20,0x02,0xb0,0x7e,0xa7,0x0a,0x00,0x00,0x00,0x00,0x00,0x00,0xb0,0x7e,0xa7,0x0a}, 8333}, {{0x20,0x02,0xb2,0xc9,0xe6,0xfc,0x00,0x10,0x3d,0x5c,0xe3,0xad,0x08,0x13,0x9c,0x46}, 8333}, {{0x20,0x02,0xb4,0xb2,0x36,0x12,0x00,0x00,0x00,0x00,0x00,0x00,0xb4,0xb2,0x36,0x12}, 8333}, + {{0x20,0x02,0xb6,0x10,0x1c,0xa2,0x00,0x00,0x00,0x00,0x00,0x00,0xb6,0x10,0x1c,0xa2}, 8333}, {{0x20,0x02,0xb6,0x10,0x1c,0xa3,0x00,0x00,0x00,0x00,0x00,0x00,0xb6,0x10,0x1c,0xa3}, 8333}, - {{0x20,0x02,0xb8,0x5f,0x26,0xda,0x00,0x00,0x00,0x00,0x00,0x00,0xb8,0x5f,0x26,0xda}, 8333}, - {{0x20,0x02,0xb9,0x23,0xb6,0x7b,0x00,0x00,0x00,0x00,0x00,0x00,0xb9,0x23,0xb6,0x7b}, 8333}, + {{0x20,0x02,0xb8,0x45,0x33,0x22,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01}, 8333}, {{0x20,0x02,0xb9,0x46,0x69,0x4a,0x00,0x00,0x00,0x00,0x00,0x00,0xb9,0x46,0x69,0x4a}, 8339}, {{0x20,0x02,0xb9,0x60,0x5e,0x18,0x00,0x00,0x00,0x00,0x00,0x00,0xb9,0x60,0x5e,0x18}, 8333}, - {{0x20,0x02,0xbc,0x48,0xd6,0x06,0x00,0x00,0x00,0x00,0x00,0x00,0xbc,0x48,0xd6,0x06}, 8333}, - {{0x20,0x02,0xc1,0x3a,0xc4,0xd4,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01}, 8333}, - {{0x20,0x02,0xc1,0x6a,0x1c,0x08,0x00,0x00,0x00,0x00,0x00,0x00,0xc1,0x6a,0x1c,0x08}, 8333}, - {{0x20,0x02,0xc1,0x6a,0x1d,0x12,0x00,0x00,0x00,0x00,0x00,0x00,0xc1,0x6a,0x1d,0x12}, 8333}, {{0x20,0x02,0xc2,0x3f,0x8f,0xc5,0x00,0x00,0x00,0x00,0x00,0x00,0xc2,0x3f,0x8f,0xc5}, 8333}, {{0x20,0x02,0xc2,0xa5,0x10,0x21,0x00,0x00,0x00,0x00,0x00,0x00,0xc2,0xa5,0x10,0x21}, 8333}, - {{0x20,0x02,0xc2,0xa5,0x10,0xfe,0x00,0x00,0x00,0x00,0x00,0x00,0xc2,0xa5,0x10,0xfe}, 8333}, - {{0x20,0x02,0xc3,0x9a,0xa4,0xa8,0x00,0x00,0x00,0x00,0x00,0x00,0xc3,0x9a,0xa4,0xa8}, 8333}, - {{0x20,0x02,0xcb,0x82,0xd0,0x2d,0x00,0x00,0x00,0x00,0x00,0x00,0xcb,0x82,0xd0,0x2d}, 8333}, + {{0x20,0x02,0xc6,0x2c,0xe7,0xa0,0x00,0x00,0x00,0x00,0x00,0x00,0xc6,0x2c,0xe7,0xa0}, 6333}, + {{0x20,0x02,0xca,0x99,0xc7,0xb6,0x00,0x00,0x00,0x00,0x00,0x00,0xca,0x99,0xc7,0xb6}, 8333}, {{0x20,0x02,0xd0,0x35,0x27,0x34,0x00,0x00,0x00,0x00,0x00,0x00,0xd0,0x35,0x27,0x34}, 8333}, - {{0x20,0x02,0xd2,0xd3,0x6d,0xa5,0x00,0x00,0x00,0x00,0x00,0x00,0xd2,0xd3,0x6d,0xa5}, 8333}, - {{0x20,0x02,0xd4,0x53,0x91,0x74,0x00,0x00,0x00,0x00,0x00,0x00,0xd4,0x53,0x91,0x74}, 8333}, - {{0x20,0x02,0xd9,0x17,0x0d,0x95,0x00,0x00,0x00,0x00,0x00,0x00,0xd9,0x17,0x0d,0x95}, 8333}, - {{0x20,0x03,0x00,0x0a,0x11,0x14,0x10,0x01,0x6a,0xb5,0x99,0xff,0xfe,0xb0,0x87,0x70}, 8333}, - {{0x24,0x00,0x26,0x50,0x04,0x80,0xbc,0x00,0xbc,0xaf,0x7c,0x49,0x8c,0x9e,0x7c,0xdf}, 8333}, - {{0x24,0x00,0x89,0x01,0x00,0x00,0x00,0x00,0xf0,0x3c,0x91,0xff,0xfe,0x1f,0xec,0x00}, 8333}, - {{0x24,0x00,0x89,0x01,0x00,0x00,0x00,0x00,0xf0,0x3c,0x91,0xff,0xfe,0x3e,0x57,0x1b}, 8333}, - {{0x24,0x00,0x89,0x01,0x00,0x00,0x00,0x00,0xf0,0x3c,0x91,0xff,0xfe,0x3e,0x57,0xef}, 8333}, - {{0x24,0x00,0x89,0x01,0x00,0x00,0x00,0x00,0xf0,0x3c,0x91,0xff,0xfe,0xb4,0x71,0xf1}, 8333}, - {{0x24,0x00,0x89,0x02,0x00,0x00,0x00,0x00,0xf0,0x3c,0x91,0xff,0xfe,0xb9,0xc5,0x9c}, 8333}, - {{0x24,0x00,0xdd,0x01,0x10,0x34,0x0e,0x00,0xf2,0x1f,0xaf,0xff,0xfe,0xdc,0x16,0x4d}, 8333}, - {{0x24,0x00,0xdd,0x08,0x10,0x01,0x01,0x20,0xf0,0xf7,0xd9,0xda,0x8b,0x5b,0x58,0xd7}, 8333}, - {{0x24,0x01,0x18,0x00,0x78,0x00,0x01,0x02,0xbe,0x76,0x4e,0xff,0xfe,0x1c,0x0a,0x7d}, 8333}, - {{0x24,0x01,0x18,0x00,0x78,0x01,0x01,0x01,0xbe,0x76,0x4e,0xff,0xfe,0x1c,0x0f,0x4b}, 8333}, - {{0x24,0x02,0x1f,0x00,0x81,0x00,0x00,0x36,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00}, 8333}, - {{0x24,0x04,0x7a,0x83,0x94,0xe0,0x7f,0x00,0x85,0x8f,0x8a,0x7d,0x3a,0x8c,0x26,0xdd}, 8333}, - {{0x24,0x04,0xc8,0x05,0x0d,0x00,0x01,0x01,0x71,0x6a,0xcf,0xf7,0xc9,0xab,0xa5,0x95}, 8333}, + {{0x20,0x02,0xd0,0x6e,0x5d,0x1a,0x00,0x00,0x00,0x00,0x00,0x00,0xd0,0x6e,0x5d,0x1a}, 8333}, + {{0x20,0x02,0xd8,0xda,0xb9,0x49,0x00,0x00,0x00,0x00,0x00,0x00,0xd8,0xda,0xb9,0x49}, 8333}, + {{0x24,0x00,0x24,0x10,0xa9,0x60,0x48,0x00,0x18,0xbe,0xd6,0x24,0x70,0x18,0xcd,0x2f}, 8333}, + {{0x24,0x00,0x61,0x80,0x00,0x00,0x00,0xd0,0x00,0x00,0x00,0x00,0x03,0xe1,0xb0,0x01}, 8333}, + {{0x24,0x00,0x61,0x80,0x00,0x00,0x00,0xd0,0x00,0x00,0x00,0x00,0x5c,0xd2,0xa0,0x01}, 8333}, + {{0x24,0x00,0x61,0x80,0x00,0x00,0x00,0xd1,0x00,0x00,0x00,0x00,0x04,0xc6,0x80,0x01}, 8333}, + {{0x24,0x00,0x61,0x80,0x01,0x00,0x00,0xd0,0x00,0x00,0x00,0x00,0x07,0x97,0xa0,0x01}, 8333}, + {{0x24,0x00,0x85,0x00,0x13,0x02,0x08,0x17,0x01,0x50,0x00,0x95,0x01,0x30,0x00,0x17}, 8333}, + {{0x24,0x01,0x18,0x00,0x78,0x00,0x01,0x06,0xbe,0x76,0x4e,0xff,0xfe,0x1c,0x18,0x79}, 8333}, + {{0x24,0x01,0x39,0x00,0x00,0x02,0x00,0x01,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333}, + {{0x24,0x01,0xa4,0x00,0x32,0x00,0x56,0x00,0x3c,0x16,0x2d,0xeb,0xab,0xce,0x70,0xcd}, 8333}, + {{0x24,0x01,0xb1,0x40,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x43,0x01,0x00}, 8333}, + {{0x24,0x01,0xb1,0x40,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x43,0x01,0x02}, 8333}, + {{0x24,0x02,0x1f,0x00,0x81,0x00,0x02,0x1c,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00}, 8333}, + {{0x24,0x03,0xbd,0x80,0xc0,0x00,0x00,0x01,0x01,0x03,0x02,0x02,0x02,0x16,0x01,0x82}, 8333}, + {{0x24,0x05,0x65,0x80,0xc5,0xc0,0x17,0x00,0x6c,0xd2,0xb7,0x2e,0x74,0x0e,0x43,0x11}, 8333}, + {{0x24,0x05,0x08,0x00,0x10,0x00,0x00,0x01,0x10,0x00,0x00,0x00,0x00,0x00,0x20,0x01}, 8333}, + {{0x24,0x05,0x98,0x00,0xb5,0x60,0x09,0x6d,0x06,0x30,0xc2,0x8e,0xa7,0x9a,0xa1,0x82}, 8333}, {{0x24,0x05,0xaa,0x00,0x00,0x02,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x40}, 8333}, {{0x24,0x09,0x00,0x10,0xca,0x20,0x1d,0xf0,0x02,0x24,0xe8,0xff,0xfe,0x1f,0x60,0xd9}, 8333}, - {{0x26,0x00,0x1f,0x14,0x06,0xae,0xd9,0x00,0x65,0x50,0x3f,0xc5,0xe0,0x74,0xa7,0x2c}, 8333}, - {{0x26,0x00,0x1f,0x14,0x06,0xd0,0x2e,0x03,0x64,0x0e,0x19,0x37,0x99,0x60,0x32,0xe9}, 8333}, - {{0x26,0x00,0x1f,0x14,0x06,0xd0,0x2e,0x03,0x07,0x61,0x6e,0x21,0x95,0x2c,0xde,0x5b}, 8333}, {{0x26,0x00,0x1f,0x16,0x06,0x25,0x0e,0x00,0x26,0x9a,0x34,0x52,0x2e,0xdf,0x10,0x11}, 8333}, {{0x26,0x00,0x1f,0x16,0x06,0x25,0x0e,0x00,0x07,0xbc,0x58,0x79,0x44,0x63,0x15,0xdd}, 8333}, {{0x26,0x00,0x1f,0x16,0x06,0x25,0x0e,0x00,0xa2,0x8b,0x5a,0x16,0x84,0x9c,0xfe,0x41}, 8333}, {{0x26,0x00,0x1f,0x16,0x06,0x25,0x0e,0x00,0xa7,0x0f,0xe7,0x28,0xe8,0xe1,0x2c,0x2e}, 8333}, - {{0x26,0x00,0x1f,0x16,0x0b,0x32,0x31,0x02,0x04,0x40,0x0f,0xab,0xd8,0xa2,0xcc,0x59}, 8333}, - {{0x26,0x00,0x1f,0x18,0x00,0x3d,0x46,0x00,0x69,0x9a,0xd6,0xb3,0x76,0xe8,0x9b,0x8d}, 48333}, - {{0x26,0x00,0x1f,0x18,0x03,0xf8,0xf9,0x0f,0x2b,0x39,0x20,0x1b,0xe9,0xa4,0xe8,0x82}, 8333}, - {{0x26,0x00,0x1f,0x18,0x60,0x9f,0xda,0x02,0xb2,0x83,0xb1,0x6e,0xaa,0xc4,0x74,0x9f}, 8333}, - {{0x26,0x00,0x3c,0x00,0x00,0x00,0x00,0x00,0xf0,0x3c,0x91,0xff,0xfe,0x28,0x9e,0x61}, 8333}, + {{0x26,0x00,0x3c,0x00,0x00,0x00,0x00,0x00,0xf0,0x3c,0x91,0xff,0xfe,0x0c,0x4d,0x74}, 8333}, + {{0x26,0x00,0x3c,0x00,0x00,0x00,0x00,0x00,0xf0,0x3c,0x91,0xff,0xfe,0x2b,0xbf,0x38}, 8333}, {{0x26,0x00,0x3c,0x00,0x00,0x00,0x00,0x00,0xf0,0x3c,0x91,0xff,0xfe,0x91,0x3e,0x49}, 8333}, - {{0x26,0x00,0x3c,0x00,0x00,0x00,0x00,0x00,0xf0,0x3c,0x91,0xff,0xfe,0xb9,0x36,0xfc}, 8333}, - {{0x26,0x00,0x3c,0x01,0x00,0x00,0x00,0x00,0xf0,0x3c,0x91,0xff,0xfe,0x39,0x76,0x8b}, 8333}, - {{0x26,0x00,0x3c,0x01,0x00,0x00,0x00,0x00,0xf0,0x3c,0x91,0xff,0xfe,0x8e,0x8a,0xe1}, 8333}, + {{0x26,0x00,0x3c,0x00,0x00,0x00,0x00,0x00,0xf0,0x3c,0x91,0xff,0xfe,0xb6,0x19,0xf2}, 8333}, {{0x26,0x00,0x3c,0x01,0x00,0x00,0x00,0x00,0xf0,0x3c,0x91,0xff,0xfe,0x91,0x6a,0x29}, 8333}, - {{0x26,0x00,0x3c,0x01,0x00,0x00,0x00,0x00,0xf0,0x3c,0x91,0xff,0xfe,0xa7,0xe0,0xf9}, 8333}, - {{0x26,0x00,0x3c,0x02,0x00,0x00,0x00,0x00,0xf0,0x3c,0x91,0xff,0xfe,0x8e,0xbc,0xd9}, 8333}, + {{0x26,0x00,0x3c,0x01,0x00,0x00,0x00,0x00,0xf0,0x3c,0x91,0xff,0xfe,0xd8,0x85,0xa2}, 8333}, + {{0x26,0x00,0x3c,0x01,0x00,0x00,0x00,0x00,0xf0,0x3c,0x91,0xff,0xfe,0xd8,0xdb,0x38}, 8333}, {{0x26,0x00,0x3c,0x03,0x00,0x00,0x00,0x00,0xf0,0x3c,0x91,0xff,0xfe,0x28,0x14,0x45}, 8333}, - {{0x26,0x00,0x3c,0x03,0x00,0x00,0x00,0x00,0xf0,0x3c,0x91,0xff,0xfe,0x7a,0x1e,0xb2}, 8333}, - {{0x26,0x00,0x3c,0x03,0x00,0x00,0x00,0x00,0xf0,0x3c,0x91,0xff,0xfe,0xb0,0x5f,0xc4}, 8333}, - {{0x26,0x00,0x3c,0x03,0x00,0x00,0x00,0x00,0xf0,0x3c,0x91,0xff,0xfe,0xe0,0x23,0x3e}, 8333}, - {{0x26,0x00,0x6c,0x40,0x79,0x00,0x31,0x9f,0x83,0x90,0xe8,0xaf,0x5a,0x2c,0x9b,0x0b}, 8333}, - {{0x26,0x00,0x6c,0x44,0x46,0x7f,0xf8,0x9c,0x72,0x2d,0x84,0x24,0xd4,0x81,0xd1,0x55}, 8333}, - {{0x26,0x00,0x88,0x01,0x83,0x06,0xe9,0x00,0xdc,0xe8,0x6a,0x03,0x95,0x92,0xa0,0x53}, 8333}, + {{0x26,0x01,0x01,0x47,0x43,0x00,0x0e,0x61,0x00,0x00,0x00,0x00,0x00,0x00,0x03,0x0c}, 8333}, + {{0x26,0x01,0x01,0x47,0x43,0x00,0x0e,0x61,0x00,0x00,0x00,0x00,0x00,0x00,0x0f,0x91}, 8333}, {{0x26,0x01,0x01,0x86,0xc1,0x00,0x6b,0xcd,0x16,0xbd,0xce,0xa1,0x23,0x5d,0x1c,0x19}, 8333}, {{0x26,0x01,0x01,0x8d,0x46,0x00,0x5f,0x32,0x20,0xe7,0xb3,0xff,0xfe,0xcf,0x0a,0x99}, 8333}, - {{0x26,0x01,0x01,0xc2,0x0f,0x00,0x29,0xb0,0x92,0x2b,0x34,0xff,0xfe,0xa8,0x41,0x18}, 8333}, - {{0x26,0x01,0x02,0x82,0x80,0x00,0x20,0xb0,0x67,0xf8,0xfa,0x63,0xe0,0x56,0xdd,0x23}, 8333}, - {{0x26,0x01,0x04,0x0a,0xc2,0x00,0x37,0xe8,0x95,0x28,0xd4,0x53,0x63,0x58,0x9f,0x2a}, 8333}, - {{0x26,0x01,0x06,0x46,0x41,0x01,0x16,0x03,0x58,0x09,0x1b,0xff,0xfe,0x55,0x66,0x78}, 8333}, - {{0x26,0x01,0x00,0xc0,0xc1,0x00,0x18,0x80,0x02,0x1f,0x5b,0xff,0xfe,0x3c,0x6e,0x84}, 8333}, - {{0x26,0x01,0x00,0xc8,0x41,0x00,0x07,0x70,0x02,0x3e,0xe1,0xff,0xfe,0xbe,0x73,0x6d}, 8333}, - {{0x26,0x03,0x30,0x00,0x09,0x03,0xc5,0xf1,0x46,0x8a,0x5b,0xff,0xfe,0x9e,0x89,0xdc}, 8333}, + {{0x26,0x01,0x02,0x40,0x46,0x01,0xec,0xee,0x30,0x9a,0xf9,0xde,0xb6,0x4d,0x87,0xdf}, 8333}, + {{0x26,0x01,0x02,0x40,0x81,0x00,0x25,0x6b,0x02,0x0c,0x29,0xff,0xfe,0x5e,0xd7,0x07}, 8333}, + {{0x26,0x01,0x06,0x46,0xc2,0x02,0x53,0x01,0x10,0x1b,0xa0,0x96,0xef,0xba,0xc1,0x0a}, 8333}, + {{0x26,0x01,0x08,0x07,0x80,0x00,0x95,0x08,0x99,0x93,0xd2,0xb3,0x00,0x1a,0x82,0x25}, 8333}, + {{0x26,0x01,0x00,0xc8,0x41,0x00,0x07,0x70,0x0c,0x37,0x80,0x7b,0x98,0xcc,0xbd,0x7e}, 8333}, + {{0x26,0x02,0x01,0x00,0x61,0x54,0xd6,0xe3,0x2c,0x91,0xd0,0xde,0xb0,0x32,0xb0,0xa4}, 8333}, + {{0x26,0x02,0x01,0x00,0x61,0x54,0xd6,0xe3,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x60}, 8333}, + {{0x26,0x02,0x00,0x61,0x78,0x6c,0x2c,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01}, 8333}, + {{0x26,0x02,0xff,0x83,0x0f,0xff,0xff,0xfe,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x75}, 8333}, + {{0x26,0x02,0xff,0x83,0x0f,0xff,0xff,0xfe,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x76}, 8333}, {{0x26,0x03,0x30,0x05,0x30,0x00,0x50,0x00,0xbc,0x5a,0x72,0xac,0x36,0xe9,0x17,0x5e}, 8333}, - {{0x26,0x03,0x30,0x22,0x05,0x01,0x78,0x00,0x49,0x5c,0x72,0x8c,0xed,0x5d,0x5d,0x75}, 8333}, - {{0x26,0x04,0x01,0x80,0x00,0x01,0x03,0x46,0x00,0x00,0x00,0x00,0x00,0x00,0x68,0x4d}, 8333}, - {{0x26,0x04,0x67,0xc0,0x20,0x01,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333}, - {{0x26,0x04,0x8d,0x80,0x01,0x00,0x00,0x00,0x80,0x65,0x4c,0x57,0x66,0x7a,0xb7,0x0f}, 8333}, - {{0x26,0x04,0x8d,0x80,0x01,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xad,0xf3,0x40,0x31}, 8333}, + {{0x26,0x04,0x00,0x00,0x00,0xc1,0x01,0x00,0x6b,0xc1,0xf9,0x8a,0x97,0xf9,0x38,0x45}, 8333}, + {{0x26,0x04,0x2d,0x80,0xc8,0x08,0x85,0x7b,0x08,0xd6,0x9e,0x1c,0x71,0x31,0x4b,0xea}, 8333}, + {{0x26,0x04,0x40,0x80,0x10,0x08,0x00,0x00,0x96,0xde,0x80,0xff,0xfe,0x62,0xe6,0x50}, 8333}, + {{0x26,0x04,0x43,0x00,0x00,0x0a,0x01,0x04,0xb6,0x99,0xba,0xff,0xfe,0xaa,0x51,0x09}, 8333}, + {{0x26,0x04,0x55,0x00,0xc2,0x26,0x7f,0x00,0x2d,0x96,0xed,0x64,0xce,0x45,0x09,0xa6}, 8333}, + {{0x26,0x04,0x8d,0x80,0x01,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xad,0xf3,0x40,0x30}, 8333}, + {{0x26,0x04,0xa8,0x80,0x00,0x02,0x00,0xd0,0x00,0x00,0x00,0x00,0x22,0xf8,0xe0,0x01}, 8333}, {{0x26,0x04,0xa8,0x80,0x00,0x02,0x00,0xd0,0x00,0x00,0x00,0x00,0x22,0xf8,0xf0,0x01}, 8333}, {{0x26,0x04,0xa8,0x80,0x00,0x02,0x00,0xd0,0x00,0x00,0x00,0x00,0x22,0xf9,0x00,0x01}, 8333}, {{0x26,0x04,0xa8,0x80,0x00,0x02,0x00,0xd0,0x00,0x00,0x00,0x00,0x22,0xf9,0x10,0x01}, 8333}, @@ -1087,452 +796,486 @@ static SeedSpec6 pnSeed6_main[] = { {{0x26,0x04,0xa8,0x80,0x00,0x02,0x00,0xd0,0x00,0x00,0x00,0x00,0x22,0xfa,0x10,0x01}, 8333}, {{0x26,0x04,0xa8,0x80,0x00,0x02,0x00,0xd0,0x00,0x00,0x00,0x00,0x22,0xfa,0x20,0x01}, 8333}, {{0x26,0x04,0xa8,0x80,0x00,0x02,0x00,0xd0,0x00,0x00,0x00,0x00,0x22,0xfa,0x30,0x01}, 8333}, - {{0x26,0x04,0xa8,0x80,0x00,0x02,0x00,0xd0,0x00,0x00,0x00,0x00,0x03,0x01,0x80,0x01}, 8333}, {{0x26,0x04,0xa8,0x80,0x00,0x02,0x00,0xd0,0x00,0x00,0x00,0x00,0x00,0x38,0xf0,0x01}, 8333}, - {{0x26,0x04,0xa8,0x80,0x00,0x02,0x00,0xd0,0x00,0x00,0x00,0x00,0x00,0x46,0xf0,0x01}, 8333}, - {{0x26,0x04,0xa8,0x80,0x00,0x02,0x00,0xd0,0x00,0x00,0x00,0x00,0x00,0xb2,0x90,0x01}, 8333}, + {{0x26,0x04,0xa8,0x80,0x00,0x02,0x00,0xd0,0x00,0x00,0x00,0x00,0x06,0x62,0xc0,0x01}, 8333}, {{0x26,0x04,0xa8,0x80,0x04,0x00,0x00,0xd0,0x00,0x00,0x00,0x00,0x1a,0xc4,0xb0,0x01}, 8333}, {{0x26,0x04,0xa8,0x80,0x04,0x00,0x00,0xd0,0x00,0x00,0x00,0x00,0x20,0x04,0x40,0x01}, 8333}, {{0x26,0x04,0xa8,0x80,0x04,0x00,0x00,0xd0,0x00,0x00,0x00,0x00,0x20,0x04,0x50,0x01}, 8333}, {{0x26,0x04,0xa8,0x80,0x04,0x00,0x00,0xd0,0x00,0x00,0x00,0x00,0x20,0x04,0x60,0x01}, 8333}, - {{0x26,0x04,0xa8,0x80,0x04,0x00,0x00,0xd0,0x00,0x00,0x00,0x00,0x20,0x04,0xc0,0x01}, 8333}, {{0x26,0x04,0xa8,0x80,0x04,0x00,0x00,0xd0,0x00,0x00,0x00,0x00,0x20,0x04,0xd0,0x01}, 8333}, {{0x26,0x04,0xa8,0x80,0x04,0x00,0x00,0xd0,0x00,0x00,0x00,0x00,0x20,0x04,0xe0,0x01}, 8333}, - {{0x26,0x04,0xa8,0x80,0x04,0x00,0x00,0xd0,0x00,0x00,0x00,0x00,0x20,0x04,0xf0,0x01}, 8333}, {{0x26,0x04,0xa8,0x80,0x04,0x00,0x00,0xd0,0x00,0x00,0x00,0x00,0x20,0x05,0x00,0x01}, 8333}, {{0x26,0x04,0xa8,0x80,0x04,0x00,0x00,0xd0,0x00,0x00,0x00,0x00,0x20,0x05,0x20,0x01}, 8333}, {{0x26,0x04,0xa8,0x80,0x04,0x00,0x00,0xd0,0x00,0x00,0x00,0x00,0x20,0x05,0x30,0x01}, 8333}, - {{0x26,0x04,0xa8,0x80,0x04,0x00,0x00,0xd0,0x00,0x00,0x00,0x00,0x26,0x1f,0x60,0x01}, 8333}, + {{0x26,0x04,0xa8,0x80,0x04,0x00,0x00,0xd0,0x00,0x00,0x00,0x00,0x0c,0xd7,0x40,0x01}, 8333}, + {{0x26,0x04,0xa8,0x80,0x04,0x00,0x00,0xd1,0x00,0x00,0x00,0x00,0x07,0x29,0xb0,0x01}, 8333}, + {{0x26,0x04,0xa8,0x80,0x08,0x00,0x00,0xa1,0x00,0x00,0x00,0x00,0x11,0xa9,0x80,0x01}, 8333}, + {{0x26,0x04,0xa8,0x80,0x08,0x00,0x00,0xa1,0x00,0x00,0x00,0x00,0x00,0x59,0x90,0x01}, 8333}, + {{0x26,0x04,0xa8,0x80,0x08,0x00,0x00,0xa1,0x00,0x00,0x00,0x00,0x0c,0xbb,0xf0,0x01}, 8333}, + {{0x26,0x04,0xa8,0x80,0x08,0x00,0x00,0xa1,0x00,0x00,0x00,0x00,0x0e,0xe8,0xe0,0x01}, 8333}, + {{0x26,0x04,0xa8,0x80,0x0c,0xad,0x00,0xd0,0x00,0x00,0x00,0x00,0x03,0x70,0xf0,0x01}, 8333}, + {{0x26,0x04,0xa8,0x80,0x0c,0xad,0x00,0xd0,0x00,0x00,0x00,0x00,0x0a,0x52,0x60,0x01}, 8333}, {{0x26,0x05,0x4d,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x50}, 8333}, - {{0x26,0x05,0x60,0x00,0xe8,0xc8,0x67,0x01,0x75,0x62,0xde,0x11,0x24,0x5c,0xf6,0xba}, 8333}, + {{0x26,0x05,0x98,0x80,0x00,0x00,0x01,0xcf,0x02,0x25,0x90,0xff,0xfe,0xc9,0x29,0xb3}, 8333}, {{0x26,0x05,0x98,0x80,0x00,0x00,0x00,0x03,0x00,0x00,0x00,0x00,0x00,0x00,0x83,0x33}, 8333}, {{0x26,0x05,0x98,0x80,0x02,0x01,0x00,0x17,0x00,0x00,0x00,0x00,0x00,0x00,0x4b,0x7c}, 8333}, - {{0x26,0x05,0x98,0x80,0x02,0x01,0x00,0x06,0x0e,0xc4,0x7a,0xff,0xfe,0x6c,0xa6,0x60}, 8333}, + {{0x26,0x05,0xa0,0x00,0x4a,0x87,0x95,0x01,0xd6,0x13,0xfb,0xf8,0x1e,0x82,0x8d,0x3c}, 8333}, {{0x26,0x05,0xa0,0x00,0xf3,0x43,0xb7,0x00,0x50,0x54,0x00,0xff,0xfe,0xa7,0x01,0x31}, 8333}, + {{0x26,0x05,0xa6,0x01,0x0a,0x41,0x1a,0x00,0x0a,0x00,0x27,0xff,0xfe,0xfc,0x47,0x59}, 8333}, {{0x26,0x05,0xae,0x00,0x02,0x03,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02,0x03}, 8333}, {{0x26,0x05,0xc0,0x00,0x2a,0x0a,0x00,0x01,0x00,0x00,0x00,0x00,0x00,0x00,0x01,0x02}, 8333}, - {{0x26,0x05,0xf7,0x00,0x00,0x80,0x08,0x00,0x00,0x00,0x00,0x00,0x37,0x24,0x08,0x1c}, 8333}, - {{0x26,0x05,0xf7,0x00,0x00,0x80,0x08,0x00,0x00,0x00,0x00,0x00,0x38,0xc1,0x2b,0x84}, 8333}, - {{0x26,0x06,0xdf,0x00,0x00,0x07,0x00,0x04,0x4c,0xaa,0x2c,0x79,0xb6,0x19,0x27,0xc9}, 8333}, - {{0x26,0x07,0x44,0x80,0x00,0x02,0x00,0x01,0x00,0x38,0x01,0x02,0x00,0x69,0x00,0x70}, 8333}, - {{0x26,0x07,0x53,0x00,0x01,0x20,0x0b,0x7e,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00}, 8333}, - {{0x26,0x07,0x53,0x00,0x02,0x01,0x20,0x00,0x00,0x00,0x00,0x00,0x00,0x01,0x05,0x56}, 8333}, - {{0x26,0x07,0x53,0x00,0x02,0x03,0x12,0x45,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00}, 8333}, - {{0x26,0x07,0x53,0x00,0x02,0x03,0x14,0xe7,0x00,0x00,0x00,0x00,0x00,0x00,0x02,0x0f}, 8333}, - {{0x26,0x07,0x53,0x00,0x02,0x03,0x19,0x0a,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00}, 8333}, - {{0x26,0x07,0x53,0x00,0x02,0x03,0x00,0xa3,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00}, 8333}, + {{0x26,0x05,0xe0,0x00,0x1c,0x00,0x80,0xe8,0x98,0x4e,0xa6,0x97,0x97,0xa3,0x50,0xed}, 8333}, + {{0x26,0x05,0xe0,0x00,0x1c,0x0d,0x43,0x7b,0x50,0x54,0x00,0xff,0xfe,0x1b,0x29,0x13}, 8333}, + {{0x26,0x05,0xe0,0x00,0x90,0x93,0xa7,0x00,0x98,0x53,0x44,0x64,0x5f,0x78,0xc4,0x84}, 8333}, + {{0x26,0x05,0xf7,0x00,0x01,0x00,0x04,0x00,0x00,0x00,0x00,0x00,0x10,0x4e,0x43,0xbd}, 8333}, + {{0x26,0x05,0xf7,0x00,0x01,0x00,0x04,0x00,0x00,0x00,0x00,0x00,0x01,0x31,0x5b,0x54}, 8333}, + {{0x26,0x05,0xf7,0x00,0x01,0x00,0x0c,0x10,0x55,0x75,0x8e,0x73,0xb0,0x7c,0xbf,0x5a}, 8333}, + {{0x26,0x06,0x60,0x00,0xc1,0x49,0x88,0x30,0x50,0x54,0x00,0xff,0xfe,0x78,0x66,0xff}, 8333}, + {{0x26,0x07,0x1c,0x00,0x00,0x0a,0x00,0x06,0x3c,0x1c,0x1b,0x0d,0x0b,0xa4,0x8e,0xa9}, 8333}, + {{0x26,0x07,0x1c,0x00,0x00,0x0a,0x00,0x06,0x00,0x00,0x00,0x00,0x00,0x00,0x10,0x00}, 8333}, + {{0x26,0x07,0x53,0x00,0x01,0x20,0x0a,0x04,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00}, 8333}, + {{0x26,0x07,0x53,0x00,0x02,0x03,0x2f,0xac,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00}, 8333}, + {{0x26,0x07,0x53,0x00,0x02,0x03,0x04,0x08,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00}, 8333}, + {{0x26,0x07,0x53,0x00,0x02,0x03,0x06,0xbc,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00}, 18333}, + {{0x26,0x07,0x53,0x00,0x02,0x03,0x00,0x8d,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00}, 8333}, {{0x26,0x07,0x53,0x00,0x00,0x60,0x10,0xaa,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01}, 8333}, + {{0x26,0x07,0x53,0x00,0x00,0x60,0x12,0x2a,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01}, 8333}, {{0x26,0x07,0x53,0x00,0x00,0x60,0x13,0xbb,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01}, 8333}, - {{0x26,0x07,0x53,0x00,0x00,0x60,0x1b,0xa8,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01}, 8333}, - {{0x26,0x07,0x53,0x00,0x00,0x60,0x22,0x18,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00}, 8333}, - {{0x26,0x07,0x53,0x00,0x00,0x60,0x02,0x6f,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01}, 8333}, - {{0x26,0x07,0x53,0x00,0x00,0x60,0x28,0x27,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00}, 8333}, - {{0x26,0x07,0x53,0x00,0x00,0x60,0x2c,0x16,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00}, 8333}, {{0x26,0x07,0x53,0x00,0x00,0x60,0x3d,0xdf,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00}, 8333}, - {{0x26,0x07,0x53,0x00,0x00,0x60,0x09,0xad,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01}, 8333}, - {{0x26,0x07,0x53,0x00,0x00,0x60,0x0a,0xc0,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01}, 8333}, - {{0x26,0x07,0x53,0x00,0x00,0x61,0x0c,0x50,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00}, 8333}, - {{0x26,0x07,0x53,0x00,0x00,0x61,0x0f,0x5b,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00}, 8333}, - {{0x26,0x07,0x90,0x00,0x00,0x00,0x00,0x06,0x00,0x01,0x00,0x00,0x03,0x6b,0x05,0xa5}, 8333}, + {{0x26,0x07,0x53,0x00,0x00,0x60,0x57,0x35,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00}, 8333}, + {{0x26,0x07,0x53,0x00,0x00,0x60,0x07,0x14,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01}, 8333}, + {{0x26,0x07,0x53,0x00,0x00,0x60,0x09,0x81,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01}, 8333}, + {{0x26,0x07,0x53,0x00,0x00,0x60,0xcf,0xf1,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00}, 28633}, + {{0x26,0x07,0x92,0x80,0x00,0x0b,0x07,0x3b,0x02,0x50,0x56,0xff,0xfe,0x21,0xbf,0x32}, 8333}, {{0x26,0x07,0xf1,0x78,0x00,0x00,0x00,0x08,0x00,0x00,0x00,0x00,0x00,0x00,0x01,0x06}, 8333}, {{0x26,0x07,0xf1,0xc0,0x08,0x23,0xaf,0x00,0x00,0x00,0x00,0x00,0x00,0x35,0xbb,0xd1}, 8333}, - {{0x26,0x07,0xf1,0xc0,0x08,0x46,0x9a,0x00,0x00,0x00,0x00,0x00,0x00,0x87,0xd0,0x0e}, 8333}, - {{0x26,0x07,0xf2,0xd8,0x40,0x05,0x00,0x0d,0xa8,0xa2,0xee,0xff,0xfe,0xe0,0xa8,0x59}, 8333}, - {{0x26,0x07,0xf4,0x70,0x00,0x14,0x00,0x0a,0x02,0x1d,0x7d,0xff,0xfe,0x01,0xbc,0xee}, 8333}, + {{0x26,0x07,0xf2,0xc0,0xf0,0x0e,0x03,0x00,0x02,0x01,0x2e,0xff,0xfe,0x67,0x91,0x30}, 8333}, {{0x26,0x07,0xfa,0x18,0x00,0x00,0xbe,0xef,0x00,0x00,0x00,0x00,0x00,0x00,0xc0,0x12}, 8333}, - {{0x26,0x07,0xfd,0x70,0x00,0x4a,0xba,0xbe,0xb0,0x0b,0x01,0xe5,0x00,0x00,0x00,0x01}, 8333}, - {{0x26,0x07,0xfe,0xa8,0xe2,0xdf,0xf8,0x7e,0x4b,0x8e,0x8a,0x8c,0x81,0x67,0xec,0x0d}, 8333}, - {{0x26,0x07,0xfe,0xa8,0x0e,0x60,0x05,0x74,0xfd,0xbc,0xad,0xd5,0xea,0xbd,0x4d,0x9e}, 8333}, - {{0x26,0x10,0x01,0xa0,0x01,0x03,0x00,0x4a,0xde,0xad,0xbe,0xaf,0x00,0x00,0xca,0xfe}, 8333}, - {{0x26,0x10,0x01,0xa0,0x01,0x03,0x00,0x4a,0xde,0xad,0xbe,0xef,0x00,0x01,0xca,0xfe}, 8333}, - {{0x28,0x01,0x00,0x80,0x09,0x30,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x63}, 8333}, + {{0x26,0x07,0xff,0x28,0x00,0x01,0x00,0x07,0x00,0x00,0x00,0x00,0x17,0x6e,0xc4,0xa5}, 8333}, + {{0x26,0x07,0xff,0x28,0x00,0x01,0x00,0x07,0x00,0x00,0x00,0x00,0x65,0xaf,0x9a,0xfb}, 8333}, + {{0x26,0x20,0x00,0x71,0x40,0x00,0x00,0x00,0x01,0x92,0x00,0x30,0x01,0x20,0x01,0x10}, 8333}, + {{0x28,0x01,0x00,0x84,0x00,0x00,0x10,0x34,0x76,0xd4,0x35,0xff,0xfe,0x7f,0x50,0x33}, 8333}, {{0x28,0x03,0x15,0x00,0x12,0x00,0xc4,0x87,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01}, 8333}, + {{0x28,0x04,0x01,0x4c,0x65,0x82,0x60,0xf0,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01}, 8333}, + {{0x28,0x04,0x01,0x4d,0xba,0xa6,0x96,0x2c,0x04,0x86,0x47,0xf6,0xc1,0x61,0xa7,0x9d}, 8333}, + {{0x2a,0x00,0x13,0xa0,0x30,0x15,0x00,0x01,0x00,0x85,0x00,0x14,0x00,0x79,0x00,0x26}, 8333}, {{0x2a,0x00,0x16,0xd8,0x00,0x0c,0x00,0x00,0x00,0x00,0x00,0x00,0x5b,0x6a,0xc2,0x61}, 8333}, - {{0x2a,0x00,0x1a,0x48,0x78,0x10,0x01,0x01,0xbe,0x76,0x4e,0xff,0xfe,0x08,0xc7,0x74}, 8333}, - {{0x2a,0x00,0x1c,0x48,0x00,0x06,0x01,0x08,0xa6,0xbf,0x01,0xff,0xfe,0x16,0x35,0xc1}, 8333}, - {{0x2a,0x00,0x1c,0x60,0x00,0x00,0x00,0x12,0xe2,0xd5,0x5e,0xff,0xfe,0x09,0x25,0x7d}, 8333}, - {{0x2a,0x00,0x1c,0xa8,0x00,0x37,0x00,0x00,0x00,0x00,0x00,0x00,0x65,0xe9,0xf4,0x38}, 8333}, - {{0x2a,0x00,0x48,0x02,0x03,0x60,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x0f,0xf9}, 8333}, - {{0x2a,0x00,0x7c,0x80,0x00,0x00,0x00,0x97,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x07}, 8333}, + {{0x2a,0x00,0x17,0x68,0x20,0x01,0x00,0x24,0x00,0x00,0x00,0x00,0x01,0x48,0x02,0x18}, 8333}, + {{0x2a,0x00,0x18,0x38,0x00,0x36,0x00,0x2c,0x00,0x00,0x00,0x00,0x00,0x00,0xed,0x85}, 8333}, + {{0x2a,0x00,0x1a,0x28,0x11,0x57,0x02,0xf8,0x00,0x00,0x00,0x00,0x00,0x00,0x94,0x6a}, 8333}, + {{0x2a,0x00,0x1c,0x48,0x00,0x06,0x02,0x03,0x0a,0x60,0x6e,0xff,0xfe,0x44,0x80,0x86}, 8333}, + {{0x2a,0x00,0x1f,0x40,0x00,0x02,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x11,0x26}, 8333}, + {{0x2a,0x00,0x7c,0x80,0x00,0x00,0x00,0x5d,0x00,0x00,0x00,0x00,0x00,0x00,0x1d,0x0e}, 8333}, {{0x2a,0x00,0x8a,0x60,0xe0,0x12,0x0a,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x21}, 8333}, - {{0x2a,0x00,0xbb,0xe0,0x00,0x00,0x00,0x42,0x02,0x22,0x64,0xff,0xfe,0x9a,0xe2,0x06}, 8333}, + {{0x2a,0x00,0xab,0x00,0x06,0x03,0x00,0x84,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x03}, 8333}, {{0x2a,0x00,0xbb,0xe0,0x00,0xcc,0x00,0x00,0x66,0x51,0x06,0xff,0xfe,0x0e,0x94,0x18}, 8333}, - {{0x2a,0x00,0xc4,0x40,0x00,0x10,0x1c,0x62,0x12,0x34,0x00,0x00,0x00,0x00,0x00,0x01}, 8333}, - {{0x2a,0x00,0xc4,0x40,0x00,0x40,0x03,0x3b,0x9d,0x1c,0x77,0x26,0x55,0x71,0xc8,0x62}, 8333}, - {{0x2a,0x00,0x0c,0x70,0x00,0x01,0x02,0x13,0x02,0x46,0x00,0x56,0x00,0x95,0x00,0x01}, 8333}, - {{0x2a,0x00,0x0e,0xe2,0x12,0x00,0x19,0x00,0x02,0x0c,0x29,0xff,0xfe,0x81,0xa0,0xa3}, 8333}, - {{0x2a,0x00,0xf9,0x40,0x00,0x02,0x00,0x01,0x00,0x02,0x00,0x00,0x00,0x00,0x10,0x86}, 8333}, - {{0x2a,0x00,0xf9,0x40,0x00,0x02,0x00,0x01,0x00,0x02,0x00,0x00,0x00,0x00,0x18,0x4b}, 8333}, - {{0x2a,0x01,0x02,0x38,0x43,0x43,0x77,0x00,0x03,0xe6,0xf6,0x5c,0x5e,0x57,0x51,0x1c}, 8333}, - {{0x2a,0x01,0x02,0x38,0x43,0xa6,0x65,0x00,0x5e,0x5c,0x24,0xbb,0x5e,0x39,0xd9,0x6f}, 8333}, + {{0x2a,0x00,0x0c,0xa8,0x0a,0x1f,0x30,0x25,0x41,0x21,0x5c,0xa1,0x00,0x3b,0x44,0x69}, 8333}, + {{0x2a,0x00,0x0c,0xa8,0x0a,0x1f,0x90,0x91,0x94,0x5e,0x80,0xa3,0x83,0x0a,0x78,0xcf}, 8333}, + {{0x2a,0x01,0x02,0x38,0x43,0x3c,0x53,0x00,0x7a,0x61,0x3e,0x1a,0x27,0xf4,0x9d,0xc2}, 8333}, {{0x2a,0x01,0x42,0x40,0x0a,0x21,0x98,0x3b,0x00,0x00,0x00,0x00,0xc0,0xa8,0x00,0x32}, 8333}, - {{0x2a,0x01,0x04,0x88,0x00,0x66,0x10,0x00,0x2e,0xa3,0x76,0x33,0x00,0x00,0x00,0x01}, 8333}, + {{0x2a,0x01,0x04,0x88,0x00,0x66,0x10,0x00,0x53,0xa9,0x21,0xb8,0x00,0x00,0x00,0x01}, 8333}, {{0x2a,0x01,0x4d,0x60,0x00,0x03,0x00,0x01,0x00,0x05,0x00,0x00,0x00,0x00,0x00,0x01}, 8333}, - {{0x2a,0x01,0x04,0xf8,0x01,0x0a,0x10,0xa8,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333}, - {{0x2a,0x01,0x04,0xf8,0x01,0x0a,0x1d,0x8f,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333}, - {{0x2a,0x01,0x04,0xf8,0x01,0x0a,0x23,0x9c,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 9002}, - {{0x2a,0x01,0x04,0xf8,0x01,0x0a,0x2a,0xe0,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333}, - {{0x2a,0x01,0x04,0xf8,0x01,0x0a,0x31,0xd3,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333}, - {{0x2a,0x01,0x04,0xf8,0x01,0x0a,0x37,0x18,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333}, - {{0x2a,0x01,0x04,0xf8,0x01,0x0a,0x3f,0xe4,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333}, - {{0x2a,0x01,0x04,0xf8,0x01,0x0a,0x41,0xc1,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333}, - {{0x2a,0x01,0x04,0xf8,0x01,0x0b,0x18,0xc2,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333}, - {{0x2a,0x01,0x04,0xf8,0x01,0x0b,0x2a,0x9b,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333}, - {{0x2a,0x01,0x04,0xf8,0x01,0x0b,0x2e,0x18,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333}, - {{0x2a,0x01,0x04,0xf8,0x01,0x0b,0x2e,0x19,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333}, - {{0x2a,0x01,0x04,0xf8,0x01,0x0b,0x2e,0x8c,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x03}, 8333}, + {{0x2a,0x01,0x04,0xf8,0x01,0x0a,0x35,0x24,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333}, + {{0x2a,0x01,0x04,0xf8,0x01,0x0b,0x03,0x62,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333}, {{0x2a,0x01,0x04,0xf8,0x01,0x0b,0x0d,0x50,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333}, - {{0x2a,0x01,0x04,0xf8,0x01,0x0b,0x0e,0x2d,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333}, - {{0x2a,0x01,0x04,0xf8,0x01,0x0b,0x0e,0xe1,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333}, - {{0x2a,0x01,0x04,0xf8,0x01,0x0b,0x0f,0x04,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333}, {{0x2a,0x01,0x04,0xf8,0x01,0x0b,0x0f,0x44,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333}, - {{0x2a,0x01,0x04,0xf8,0x01,0x10,0x41,0x1f,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333}, {{0x2a,0x01,0x04,0xf8,0x01,0x20,0x13,0x91,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333}, - {{0x2a,0x01,0x04,0xf8,0x01,0x20,0x62,0xe6,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333}, - {{0x2a,0x01,0x04,0xf8,0x01,0x20,0x70,0x2e,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333}, - {{0x2a,0x01,0x04,0xf8,0x01,0x30,0x61,0x8e,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333}, + {{0x2a,0x01,0x04,0xf8,0x01,0x20,0x70,0xa3,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333}, + {{0x2a,0x01,0x04,0xf8,0x01,0x20,0x93,0xf8,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333}, + {{0x2a,0x01,0x04,0xf8,0x01,0x21,0x23,0x85,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333}, {{0x2a,0x01,0x04,0xf8,0x01,0x30,0x71,0xd2,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333}, {{0x2a,0x01,0x04,0xf8,0x01,0x30,0x74,0x22,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333}, - {{0x2a,0x01,0x04,0xf8,0x01,0x3b,0x27,0x1c,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333}, + {{0x2a,0x01,0x04,0xf8,0x01,0x3a,0x12,0x4f,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333}, + {{0x2a,0x01,0x04,0xf8,0x01,0x3a,0x1d,0xcb,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333}, + {{0x2a,0x01,0x04,0xf8,0x01,0x3a,0x07,0x08,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 21775}, + {{0x2a,0x01,0x04,0xf8,0x01,0x3a,0x07,0x23,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333}, + {{0x2a,0x01,0x04,0xf8,0x01,0x3b,0x10,0x9e,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333}, + {{0x2a,0x01,0x04,0xf8,0x01,0x3b,0x1a,0x9e,0x00,0x00,0x00,0x00,0x00,0x00,0x02,0x01}, 8333}, + {{0x2a,0x01,0x04,0xf8,0x01,0x3b,0x27,0x1c,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 10731}, + {{0x2a,0x01,0x04,0xf8,0x01,0x3b,0x2d,0x42,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333}, + {{0x2a,0x01,0x04,0xf8,0x01,0x3b,0x2d,0x94,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333}, {{0x2a,0x01,0x04,0xf8,0x01,0x3b,0x38,0x10,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333}, - {{0x2a,0x01,0x04,0xf8,0x01,0x40,0x21,0x23,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333}, - {{0x2a,0x01,0x04,0xf8,0x01,0x40,0x31,0x44,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333}, - {{0x2a,0x01,0x04,0xf8,0x01,0x40,0x42,0x01,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333}, - {{0x2a,0x01,0x04,0xf8,0x01,0x40,0x52,0x4a,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333}, + {{0x2a,0x01,0x04,0xf8,0x01,0x3b,0x3d,0xa8,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333}, + {{0x2a,0x01,0x04,0xf8,0x01,0x3b,0x41,0xe6,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333}, + {{0x2a,0x01,0x04,0xf8,0x01,0x3b,0x42,0x81,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333}, + {{0x2a,0x01,0x04,0xf8,0x01,0x3b,0x05,0xc7,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333}, + {{0x2a,0x01,0x04,0xf8,0x01,0x3b,0x00,0x81,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333}, + {{0x2a,0x01,0x04,0xf8,0x01,0x40,0x23,0x6a,0xca,0xfe,0x00,0x00,0x00,0x00,0x00,0x05}, 8333}, + {{0x2a,0x01,0x04,0xf8,0x01,0x40,0x32,0x4e,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333}, {{0x2a,0x01,0x04,0xf8,0x01,0x40,0x53,0x29,0x00,0x00,0x00,0x00,0x00,0x00,0x01,0x02}, 8333}, - {{0x2a,0x01,0x04,0xf8,0x01,0x40,0x62,0x4c,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333}, - {{0x2a,0x01,0x04,0xf8,0x01,0x40,0x71,0x73,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333}, - {{0x2a,0x01,0x04,0xf8,0x01,0x40,0x82,0xb6,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333}, - {{0x2a,0x01,0x04,0xf8,0x01,0x40,0x90,0x82,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333}, + {{0x2a,0x01,0x04,0xf8,0x01,0x40,0x53,0x29,0x00,0x00,0x00,0x00,0x00,0x50,0x01,0x09}, 8333}, {{0x2a,0x01,0x04,0xf8,0x01,0x40,0x93,0x1a,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333}, - {{0x2a,0x01,0x04,0xf8,0x01,0x41,0x13,0xb1,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333}, - {{0x2a,0x01,0x04,0xf8,0x01,0x41,0x22,0xae,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333}, - {{0x2a,0x01,0x04,0xf8,0x01,0x41,0x24,0x26,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333}, - {{0x2a,0x01,0x04,0xf8,0x01,0x41,0x54,0x91,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333}, - {{0x2a,0x01,0x04,0xf8,0x01,0x50,0x32,0xf2,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333}, - {{0x2a,0x01,0x04,0xf8,0x01,0x50,0x41,0x07,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 5001}, - {{0x2a,0x01,0x04,0xf8,0x01,0x50,0x42,0x26,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333}, - {{0x2a,0x01,0x04,0xf8,0x01,0x50,0x53,0x27,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333}, - {{0x2a,0x01,0x04,0xf8,0x01,0x50,0x53,0xa4,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333}, + {{0x2a,0x01,0x04,0xf8,0x01,0x40,0x93,0xb0,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333}, + {{0x2a,0x01,0x04,0xf8,0x01,0x41,0x00,0x47,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333}, {{0x2a,0x01,0x04,0xf8,0x01,0x50,0x53,0xa4,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x04}, 8333}, - {{0x2a,0x01,0x04,0xf8,0x01,0x50,0x72,0x8f,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333}, {{0x2a,0x01,0x04,0xf8,0x01,0x50,0x72,0xee,0x00,0x00,0x00,0x00,0x00,0x00,0x42,0x02}, 8333}, - {{0x2a,0x01,0x04,0xf8,0x01,0x50,0x73,0x31,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333}, - {{0x2a,0x01,0x04,0xf8,0x01,0x51,0x82,0xd2,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333}, - {{0x2a,0x01,0x04,0xf8,0x01,0x60,0x33,0x24,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333}, {{0x2a,0x01,0x04,0xf8,0x01,0x60,0x41,0xf0,0x00,0x00,0x00,0x00,0x00,0x01,0x00,0x33}, 8333}, - {{0x2a,0x01,0x04,0xf8,0x01,0x60,0x54,0x2e,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333}, + {{0x2a,0x01,0x04,0xf8,0x01,0x60,0x44,0x43,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333}, + {{0x2a,0x01,0x04,0xf8,0x01,0x60,0x60,0x92,0xd7,0xbd,0x0a,0x39,0x3e,0x52,0xb6,0x5d}, 8333}, + {{0x2a,0x01,0x04,0xf8,0x01,0x60,0x60,0xaa,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333}, {{0x2a,0x01,0x04,0xf8,0x01,0x60,0x63,0x6e,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333}, - {{0x2a,0x01,0x04,0xf8,0x01,0x60,0x74,0xb2,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333}, - {{0x2a,0x01,0x04,0xf8,0x01,0x61,0x21,0x48,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333}, - {{0x2a,0x01,0x04,0xf8,0x01,0x61,0x22,0xe7,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333}, {{0x2a,0x01,0x04,0xf8,0x01,0x61,0x60,0x91,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333}, - {{0x2a,0x01,0x04,0xf8,0x01,0x61,0x61,0x0c,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333}, - {{0x2a,0x01,0x04,0xf8,0x01,0x61,0x00,0x09,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333}, - {{0x2a,0x01,0x04,0xf8,0x01,0x62,0x12,0x8d,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333}, - {{0x2a,0x01,0x04,0xf8,0x01,0x62,0x14,0xee,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333}, - {{0x2a,0x01,0x04,0xf8,0x01,0x62,0x21,0x08,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333}, + {{0x2a,0x01,0x04,0xf8,0x01,0x61,0x61,0x11,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333}, + {{0x2a,0x01,0x04,0xf8,0x01,0x61,0x81,0x2e,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333}, + {{0x2a,0x01,0x04,0xf8,0x01,0x62,0x02,0xc6,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333}, {{0x2a,0x01,0x04,0xf8,0x01,0x62,0x33,0xac,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333}, - {{0x2a,0x01,0x04,0xf8,0x01,0x62,0x34,0x62,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333}, - {{0x2a,0x01,0x04,0xf8,0x01,0x62,0x41,0x10,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333}, - {{0x2a,0x01,0x04,0xf8,0x01,0x62,0x42,0x4c,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333}, {{0x2a,0x01,0x04,0xf8,0x01,0x71,0x01,0xc3,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333}, + {{0x2a,0x01,0x04,0xf8,0x01,0x71,0x2b,0xdc,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333}, {{0x2a,0x01,0x04,0xf8,0x01,0x71,0x32,0x48,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333}, + {{0x2a,0x01,0x04,0xf8,0x01,0x71,0x04,0xdc,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333}, + {{0x2a,0x01,0x04,0xf8,0x01,0x71,0x0d,0x09,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333}, {{0x2a,0x01,0x04,0xf8,0x01,0x71,0x0d,0x4a,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333}, - {{0x2a,0x01,0x04,0xf8,0x01,0x72,0x15,0x68,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333}, + {{0x2a,0x01,0x04,0xf8,0x01,0x71,0x0e,0x0d,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333}, + {{0x2a,0x01,0x04,0xf8,0x01,0x71,0x0e,0xcd,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333}, {{0x2a,0x01,0x04,0xf8,0x01,0x72,0x18,0x23,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333}, - {{0x2a,0x01,0x04,0xf8,0x01,0x72,0x29,0xef,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333}, {{0x2a,0x01,0x04,0xf8,0x01,0x73,0x16,0x22,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333}, - {{0x2a,0x01,0x04,0xf8,0x01,0x73,0x1c,0x9c,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333}, - {{0x2a,0x01,0x04,0xf8,0x01,0x73,0x29,0x4f,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333}, - {{0x2a,0x01,0x04,0xf8,0x01,0x73,0x2d,0x9c,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333}, - {{0x2a,0x01,0x04,0xf8,0x01,0x90,0x24,0xeb,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333}, - {{0x2a,0x01,0x04,0xf8,0x01,0x90,0x52,0x8d,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333}, - {{0x2a,0x01,0x04,0xf8,0x01,0x91,0x22,0xee,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333}, - {{0x2a,0x01,0x04,0xf8,0x01,0x91,0x30,0x68,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333}, - {{0x2a,0x01,0x04,0xf8,0x01,0x91,0x40,0xef,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333}, - {{0x2a,0x01,0x04,0xf8,0x01,0x91,0x60,0xa5,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333}, - {{0x2a,0x01,0x04,0xf8,0x01,0x91,0x81,0xb7,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333}, - {{0x2a,0x01,0x04,0xf8,0x01,0x92,0x01,0xb2,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333}, - {{0x2a,0x01,0x04,0xf8,0x01,0x92,0x34,0xd0,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333}, - {{0x2a,0x01,0x04,0xf8,0x01,0x92,0x04,0xa5,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333}, + {{0x2a,0x01,0x04,0xf8,0x01,0x90,0x50,0xb6,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333}, + {{0x2a,0x01,0x04,0xf8,0x01,0x90,0x51,0x76,0x00,0x00,0x00,0x00,0x00,0x00,0x01,0x23}, 8333}, + {{0x2a,0x01,0x04,0xf8,0x01,0x91,0x02,0x68,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333}, + {{0x2a,0x01,0x04,0xf8,0x01,0x92,0x21,0x6c,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333}, {{0x2a,0x01,0x04,0xf8,0x01,0x92,0x62,0x8a,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x83}, 8333}, + {{0x2a,0x01,0x04,0xf8,0x1c,0x0c,0x77,0xaf,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01}, 8333}, {{0x2a,0x01,0x04,0xf8,0x02,0x00,0x10,0x12,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333}, - {{0x2a,0x01,0x04,0xf8,0x02,0x00,0x24,0xbb,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333}, - {{0x2a,0x01,0x04,0xf8,0x02,0x00,0x32,0xa6,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333}, {{0x2a,0x01,0x04,0xf8,0x02,0x00,0x44,0x2d,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333}, - {{0x2a,0x01,0x04,0xf8,0x02,0x00,0x63,0x46,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333}, - {{0x2a,0x01,0x04,0xf8,0x02,0x00,0x72,0x22,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333}, - {{0x2a,0x01,0x04,0xf8,0x02,0x00,0x90,0xc3,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333}, - {{0x2a,0x01,0x04,0xf8,0x02,0x01,0x40,0x17,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x11}, 8333}, - {{0x2a,0x01,0x04,0xf8,0x02,0x01,0x60,0x16,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333}, - {{0x2a,0x01,0x04,0xf8,0x02,0x02,0x30,0x30,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333}, + {{0x2a,0x01,0x04,0xf8,0x02,0x01,0x11,0x13,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333}, + {{0x2a,0x01,0x04,0xf8,0x02,0x01,0x04,0xf0,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333}, + {{0x2a,0x01,0x04,0xf8,0x02,0x01,0x53,0xcc,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333}, + {{0x2a,0x01,0x04,0xf8,0x02,0x01,0x80,0x26,0x00,0x00,0x00,0x00,0x00,0x00,0x13,0x37}, 8333}, + {{0x2a,0x01,0x04,0xf8,0x02,0x01,0x80,0x26,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333}, {{0x2a,0x01,0x04,0xf8,0x02,0x02,0x32,0xc6,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333}, - {{0x2a,0x01,0x04,0xf8,0x02,0x02,0x53,0xc3,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333}, - {{0x2a,0x01,0x04,0xf8,0x02,0x02,0x72,0x27,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333}, - {{0x2a,0x01,0x04,0xf8,0x02,0x10,0x54,0x88,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333}, - {{0x2a,0x01,0x04,0xf8,0x02,0x11,0x13,0xcf,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333}, - {{0x2a,0x01,0x04,0xf8,0x02,0x11,0x16,0x43,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333}, - {{0x2a,0x01,0x04,0xf8,0x02,0x11,0x17,0xc6,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333}, - {{0x2a,0x01,0x04,0xf8,0x02,0x11,0x1e,0x17,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333}, - {{0x2a,0x01,0x04,0xf8,0x02,0x11,0x0d,0x99,0x00,0x00,0x00,0x00,0x00,0x00,0x01,0x33}, 8333}, + {{0x2a,0x01,0x04,0xf8,0x02,0x11,0x03,0x09,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333}, {{0x2a,0x01,0x04,0xf8,0x02,0x11,0x0f,0x08,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333}, {{0x2a,0x01,0x04,0xf8,0x02,0x12,0x1e,0x16,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333}, - {{0x2a,0x01,0x04,0xf8,0x02,0x12,0x03,0x11,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333}, - {{0x2a,0x01,0x04,0xf8,0x02,0x21,0x13,0x84,0x00,0x00,0x00,0x00,0x00,0x00,0x23,0x11}, 8333}, + {{0x2a,0x01,0x04,0xf8,0x02,0x21,0x18,0x08,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 15000}, + {{0x2a,0x01,0x04,0xf8,0x02,0x21,0x2e,0x18,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333}, + {{0x2a,0x01,0x04,0xf8,0x02,0x21,0x2f,0xcf,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333}, + {{0x2a,0x01,0x04,0xf8,0x02,0x21,0x34,0x41,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333}, + {{0x2a,0x01,0x04,0xf8,0x02,0x21,0x34,0x52,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333}, + {{0x2a,0x01,0x04,0xf8,0x02,0x21,0x39,0xc1,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8335}, + {{0x2a,0x01,0x04,0xf8,0x02,0x21,0x3c,0x82,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333}, {{0x2a,0x01,0x04,0xf8,0x02,0x21,0x3c,0x82,0xfe,0xa1,0x00,0x00,0x00,0x00,0x06,0x66}, 8333}, + {{0x2a,0x01,0x04,0xf8,0x02,0x21,0x06,0xcd,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333}, {{0x2a,0x01,0x04,0xf8,0x02,0x21,0x08,0x01,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333}, {{0x2a,0x01,0x04,0xf8,0x02,0x21,0x0f,0x59,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333}, - {{0x2a,0x01,0x04,0xf8,0x00,0xa0,0x10,0x8c,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333}, - {{0x2a,0x01,0x04,0xf8,0x00,0xa0,0x22,0x32,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333}, - {{0x2a,0x01,0x04,0xf8,0x00,0xa0,0x43,0x66,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333}, {{0x2a,0x01,0x04,0xf8,0x00,0xa0,0x61,0x47,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333}, - {{0x2a,0x01,0x04,0xf8,0x00,0xa0,0x74,0x6a,0x01,0x01,0x00,0x01,0x00,0x01,0x00,0x02}, 8333}, - {{0x2a,0x01,0x04,0xf8,0x00,0xa0,0x82,0x8a,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333}, - {{0x2a,0x01,0x04,0xf8,0x00,0xa0,0x91,0x63,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333}, - {{0x2a,0x01,0x04,0xf8,0x0b,0x10,0x50,0x09,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333}, - {{0x2a,0x01,0x04,0xf8,0x0c,0x0c,0x10,0xdc,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333}, - {{0x2a,0x01,0x04,0xf8,0x0c,0x0c,0x1f,0xf7,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333}, - {{0x2a,0x01,0x04,0xf8,0x0c,0x0c,0x22,0x62,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333}, - {{0x2a,0x01,0x04,0xf8,0x0c,0x0c,0x35,0x4c,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333}, - {{0x2a,0x01,0x04,0xf8,0x0c,0x0c,0x42,0x42,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333}, - {{0x2a,0x01,0x04,0xf8,0x0c,0x0c,0x48,0x16,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333}, - {{0x2a,0x01,0x04,0xf8,0x0c,0x0c,0x0d,0xcc,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333}, - {{0x2a,0x01,0x04,0xf8,0x0c,0x17,0x24,0xee,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333}, - {{0x2a,0x01,0x04,0xf8,0x0c,0x17,0x33,0x0f,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333}, - {{0x2a,0x01,0x04,0xf8,0x0c,0x17,0x3b,0x02,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333}, - {{0x2a,0x01,0x04,0xf8,0x0c,0x17,0x5d,0xc0,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333}, - {{0x2a,0x01,0x04,0xf8,0x0c,0x17,0x67,0xf8,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333}, - {{0x2a,0x01,0x04,0xf8,0x0c,0x17,0x71,0x0b,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333}, - {{0x2a,0x01,0x04,0xf8,0x0c,0x17,0x07,0x14,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333}, + {{0x2a,0x01,0x04,0xf8,0x0c,0x0c,0x42,0x68,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333}, + {{0x2a,0x01,0x04,0xf8,0x0c,0x0c,0x56,0xa5,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333}, {{0x2a,0x01,0x04,0xf8,0x0c,0x17,0x0e,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333}, - {{0x2a,0x01,0x05,0xc0,0x00,0x10,0x6e,0xb1,0x89,0xb8,0xbb,0x58,0x02,0x5a,0x60,0x50}, 8333}, - {{0x2a,0x01,0x06,0x80,0x00,0x10,0x00,0x10,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01}, 8333}, - {{0x2a,0x01,0x06,0xf0,0xff,0xff,0x01,0x20,0x00,0x00,0x00,0x00,0x00,0x00,0x8d,0xcb}, 8333}, - {{0x2a,0x01,0x07,0xa0,0x00,0x02,0x13,0x74,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x04}, 8333}, - {{0x2a,0x01,0x07,0xa0,0x00,0x02,0x13,0x74,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x05}, 8333}, + {{0x2a,0x01,0x04,0xf9,0x00,0x2a,0x10,0xd4,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333}, + {{0x2a,0x01,0x04,0xf9,0x00,0x2a,0x18,0x27,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333}, + {{0x2a,0x01,0x04,0xf9,0x00,0x2a,0x19,0x2c,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333}, + {{0x2a,0x01,0x04,0xf9,0x00,0x2a,0x1c,0x87,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333}, + {{0x2a,0x01,0x04,0xf9,0x00,0x2a,0x25,0x10,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333}, + {{0x2a,0x01,0x04,0xf9,0x00,0x2a,0x25,0x18,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333}, + {{0x2a,0x01,0x04,0xf9,0x00,0x2a,0x25,0x85,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333}, + {{0x2a,0x01,0x04,0xf9,0x00,0x2a,0x26,0x98,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333}, + {{0x2a,0x01,0x04,0xf9,0x00,0x2a,0x2d,0x0a,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333}, + {{0x2a,0x01,0x04,0xf9,0x00,0x2a,0x2d,0x17,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333}, + {{0x2a,0x01,0x04,0xf9,0x00,0x2a,0x03,0x47,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333}, + {{0x2a,0x01,0x04,0xf9,0x00,0x2a,0x06,0x50,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333}, + {{0x2a,0x01,0x04,0xf9,0x00,0x2a,0x0d,0x54,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333}, + {{0x2a,0x01,0x04,0xf9,0xc0,0x10,0x12,0xe7,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01}, 8333}, + {{0x2a,0x01,0x04,0xf9,0xc0,0x10,0x17,0x36,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01}, 8333}, + {{0x2a,0x01,0x5d,0x00,0x00,0x01,0x04,0xb6,0xd2,0xbf,0x9c,0xff,0xfe,0x45,0xb8,0x34}, 8333}, + {{0x2a,0x01,0x07,0x9c,0xce,0xbe,0x70,0xcc,0x1a,0x03,0x73,0xff,0xfe,0x48,0xe6,0x91}, 8333}, {{0x2a,0x01,0x07,0xa0,0x00,0x02,0x13,0x74,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x07}, 8333}, {{0x2a,0x01,0x07,0xa7,0x00,0x02,0x12,0x18,0x0e,0xc4,0x7a,0xff,0xfe,0x83,0x83,0xc4}, 8333}, {{0x2a,0x01,0x07,0xa7,0x00,0x02,0x12,0x88,0xea,0x39,0x35,0xff,0xfe,0xf0,0xc4,0x29}, 8333}, - {{0x2a,0x01,0x07,0xa7,0x00,0x02,0x15,0x5c,0x34,0x6c,0x08,0xf5,0x71,0x9f,0xa6,0xb6}, 8333}, - {{0x2a,0x01,0x07,0xa7,0x00,0x02,0x15,0x65,0x94,0x84,0x50,0x9b,0x2a,0x3b,0xa7,0x73}, 8333}, - {{0x2a,0x01,0x07,0xc8,0xaa,0xaa,0x03,0x73,0x50,0x54,0x00,0xff,0xfe,0xb3,0x29,0x47}, 8333}, - {{0x2a,0x01,0x07,0xc8,0xaa,0xb5,0x03,0xe6,0x50,0x54,0x00,0xff,0xfe,0xd7,0x4e,0x54}, 8333}, - {{0x2a,0x01,0x07,0xc8,0xaa,0xba,0x03,0x43,0x00,0x00,0x00,0x00,0x00,0x00,0x83,0x33}, 8333}, - {{0x2a,0x01,0x07,0xc8,0xaa,0xbd,0x03,0xd5,0x50,0x54,0x00,0xff,0xfe,0x95,0xf5,0x86}, 8333}, - {{0x2a,0x01,0x07,0xc8,0xaa,0xc1,0x04,0x53,0x0c,0x50,0xfa,0x3a,0x02,0x29,0x85,0x04}, 8333}, - {{0x2a,0x01,0x07,0xc8,0xaa,0xc7,0x00,0x5e,0x50,0x54,0x00,0xff,0xfe,0xe9,0xbd,0xf7}, 8333}, + {{0x2a,0x01,0x07,0xc8,0xaa,0xba,0x00,0x18,0x50,0x54,0x00,0xff,0xfe,0x2b,0xdf,0x20}, 8333}, + {{0x2a,0x01,0x07,0xc8,0xff,0xfa,0x05,0x0e,0x30,0x35,0x74,0x1b,0xbe,0x02,0xb5,0xde}, 8333}, {{0x2a,0x01,0xbe,0x00,0x00,0x10,0x02,0x01,0x00,0x00,0x00,0x80,0xce,0xce,0x00,0x01}, 8333}, - {{0x2a,0x01,0xcb,0x00,0x02,0xca,0xb7,0x00,0x20,0x79,0xb3,0x3f,0xcf,0x5a,0x59,0x58}, 8333}, - {{0x2a,0x01,0xcb,0x00,0x00,0xb3,0xd3,0x00,0x90,0xfd,0xe3,0xb1,0x28,0xde,0x11,0x6c}, 8333}, + {{0x2a,0x01,0xcb,0x00,0x05,0xbe,0xd5,0x00,0x02,0x27,0x0e,0xff,0xfe,0x28,0xc5,0x65}, 8333}, + {{0x2a,0x01,0xcb,0x00,0x00,0xb3,0xd3,0x00,0x92,0x76,0x8a,0x8c,0x74,0xbf,0x2a,0x88}, 8333}, {{0x2a,0x01,0xcb,0x14,0x00,0xb8,0xa5,0x00,0xdd,0x9d,0x80,0xf5,0xd3,0x05,0x68,0xf9}, 8333}, - {{0x2a,0x01,0x00,0xd0,0x00,0x00,0x00,0x1c,0x00,0x00,0x00,0x00,0x00,0x00,0x02,0x45}, 8333}, + {{0x2a,0x01,0x0e,0x0a,0x00,0x20,0x91,0x20,0x7c,0x3f,0x56,0x43,0x99,0x78,0x18,0x25}, 8333}, {{0x2a,0x01,0x0e,0x0a,0x00,0x0d,0x6e,0xa0,0x00,0x56,0xde,0xab,0x1b,0x2f,0x30,0x0b}, 8333}, - {{0x2a,0x01,0x0e,0x34,0xec,0xfd,0x19,0x10,0x58,0xfb,0xc2,0xff,0xfe,0xac,0x57,0x1f}, 8333}, - {{0x2a,0x01,0x0e,0x34,0xee,0xd7,0x66,0x70,0xe1,0x50,0x6b,0xb0,0xf1,0x1b,0xd6,0xd8}, 8333}, - {{0x2a,0x01,0x0e,0x35,0x24,0x33,0xe3,0x20,0x9c,0x8e,0x6f,0xf0,0x99,0x0f,0xf0,0x6e}, 8333}, - {{0x2a,0x01,0x0e,0x35,0x2e,0xe5,0x06,0x10,0x02,0x1f,0xd0,0xff,0xfe,0x4e,0x74,0x60}, 8333}, - {{0x2a,0x01,0x0e,0x35,0x8b,0xe7,0x53,0xd0,0xb8,0xd5,0xde,0x58,0x95,0xb5,0xdd,0x16}, 8333}, - {{0x2a,0x01,0x0e,0x35,0x8b,0xff,0x70,0xb0,0x1e,0x1b,0x0d,0xff,0xfe,0x0b,0x23,0x6d}, 8333}, - {{0x2a,0x02,0x12,0x05,0x34,0xc3,0xba,0xe0,0xba,0xae,0xed,0xff,0xfe,0xea,0x94,0x45}, 8333}, - {{0x2a,0x02,0x12,0x05,0x50,0x04,0xde,0x00,0x0c,0x84,0x04,0xa1,0xe7,0x60,0xcf,0x90}, 8333}, - {{0x2a,0x02,0x12,0x05,0x50,0x76,0xee,0x00,0xd6,0xc9,0xef,0xff,0xfe,0x65,0xfb,0xfb}, 8333}, - {{0x2a,0x02,0x12,0x05,0xc6,0xbe,0x84,0xe0,0xca,0x2a,0x14,0xff,0xfe,0x0b,0x80,0x3b}, 8333}, - {{0x2a,0x02,0x12,0x06,0x45,0xc3,0xbe,0x80,0xd4,0xa4,0x32,0x15,0xaa,0xf0,0x85,0xaa}, 8333}, - {{0x2a,0x02,0x12,0x0b,0x2c,0x2a,0x5e,0xc0,0x10,0xdd,0x31,0xff,0xfe,0x42,0x50,0x79}, 8333}, - {{0x2a,0x02,0x12,0x0b,0x2c,0x3f,0x3f,0xc0,0x10,0xdd,0x31,0xff,0xfe,0x42,0x50,0x79}, 8333}, - {{0x2a,0x02,0x12,0x1e,0x3e,0x87,0x00,0x00,0x7d,0x3a,0xfe,0x09,0xb6,0x19,0x6b,0x4b}, 8333}, - {{0x2a,0x02,0x01,0x68,0x42,0x0b,0x00,0x0a,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x20}, 8333}, - {{0x2a,0x02,0x01,0x68,0x4a,0x01,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x39}, 8333}, - {{0x2a,0x02,0x01,0x68,0x4a,0x35,0x00,0x00,0x2e,0x44,0xfd,0xff,0xfe,0x9a,0x46,0xdc}, 8333}, + {{0x2a,0x01,0x0e,0x34,0xec,0x16,0x93,0xf0,0x72,0x5d,0xd8,0xd2,0xbb,0x90,0xea,0xbf}, 8333}, + {{0x2a,0x01,0x0e,0x34,0xee,0x33,0x16,0x40,0xc4,0x18,0x3c,0x3a,0x8f,0xf6,0x3e,0xab}, 8333}, + {{0x2a,0x01,0x0e,0x34,0xee,0xd7,0x66,0x70,0x28,0xc0,0x18,0x3c,0x77,0x83,0x7d,0xc3}, 8333}, + {{0x2a,0x01,0x0e,0x35,0x2f,0x7d,0xa0,0xb0,0x59,0xc2,0x3c,0x8a,0x95,0xa2,0xc4,0xd1}, 8333}, + {{0x2a,0x01,0x0e,0x35,0x87,0xba,0xd0,0xc0,0x75,0xa2,0x9f,0x39,0xef,0xcb,0xf5,0x9f}, 8333}, + {{0x2a,0x02,0x12,0x0b,0xc3,0xc5,0xce,0xf0,0xec,0x82,0xa4,0x3d,0x04,0xd6,0x0d,0xc2}, 8333}, + {{0x2a,0x02,0x12,0x0b,0xc3,0xd1,0xf2,0xd0,0xee,0xa8,0x6b,0xff,0xfe,0xfc,0x22,0x65}, 8333}, + {{0x2a,0x02,0x01,0x68,0x40,0x4c,0x00,0x00,0xee,0xa8,0x6b,0xff,0xfe,0xf3,0x7d,0x5c}, 8333}, {{0x2a,0x02,0x01,0x80,0x00,0x01,0x00,0x01,0x00,0x00,0x00,0x00,0x05,0x17,0x10,0xb6}, 8333}, - {{0x2a,0x02,0x01,0x80,0x00,0x06,0x00,0x01,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x18}, 8333}, - {{0x2a,0x02,0x18,0x10,0x1d,0x13,0x72,0x00,0x84,0x8b,0xc4,0xc4,0x52,0x6b,0xe6,0x57}, 8333}, - {{0x2a,0x02,0x18,0x1f,0x00,0x00,0x21,0x61,0x08,0xf0,0x54,0xb2,0x22,0x2c,0xb3,0x15}, 8333}, - {{0x2a,0x02,0x20,0xc8,0x14,0x22,0x00,0x01,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xa3}, 8333}, - {{0x2a,0x02,0x21,0x68,0x08,0x0d,0x06,0xe8,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333}, + {{0x2a,0x02,0x01,0x80,0x00,0x01,0x00,0x01,0x00,0x00,0x00,0x00,0x5b,0x8f,0x53,0x8c}, 8333}, + {{0x2a,0x02,0x01,0xb8,0x00,0x10,0x01,0x47,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333}, {{0x2a,0x02,0x21,0x68,0x0d,0x05,0x2c,0x00,0x02,0x16,0x3e,0xff,0xfe,0xf7,0xa0,0x99}, 8333}, {{0x2a,0x02,0x25,0x28,0x05,0x03,0x00,0x02,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x14}, 8333}, + {{0x2a,0x02,0x25,0x28,0x00,0xfa,0x14,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01}, 8333}, + {{0x2a,0x02,0x27,0x70,0x00,0x17,0x00,0x00,0x02,0x1a,0x4a,0xff,0xfe,0x7b,0x17,0x5f}, 8333}, + {{0x2a,0x02,0x27,0x70,0x00,0x05,0x00,0x00,0x02,0x1a,0x4a,0xff,0xfe,0x44,0x83,0x70}, 8333}, {{0x2a,0x02,0x28,0x08,0x54,0x01,0x00,0x00,0x02,0x25,0x90,0xff,0xfe,0x4e,0xee,0x42}, 8333}, {{0x2a,0x02,0x03,0x90,0x90,0x00,0x00,0x00,0x02,0x18,0x7d,0xff,0xfe,0x10,0xbe,0x33}, 8333}, - {{0x2a,0x02,0x7a,0xa0,0x12,0x01,0x00,0x00,0x00,0x00,0x00,0x00,0xbd,0x4e,0x12,0x19}, 8333}, + {{0x2a,0x02,0x07,0x50,0x00,0x07,0x0c,0x11,0x50,0x54,0x00,0xff,0xfe,0x43,0xeb,0x81}, 8333}, {{0x2a,0x02,0x7a,0xa0,0x16,0x19,0x00,0x00,0x00,0x00,0x00,0x00,0x05,0x90,0xeb,0xa2}, 8333}, - {{0x2a,0x02,0x7b,0x40,0x50,0xd0,0xe0,0xd9,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01}, 8333}, - {{0x2a,0x02,0x7b,0x40,0x50,0xd0,0xe3,0x35,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01}, 8333}, - {{0x2a,0x02,0x7b,0x40,0xc2,0x87,0x53,0xaf,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01}, 8333}, - {{0x2a,0x02,0x7b,0x40,0xd4,0x18,0x60,0xc5,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01}, 8333}, - {{0x2a,0x02,0x7b,0x40,0xd4,0x18,0x6a,0x84,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01}, 8333}, + {{0x2a,0x02,0x7b,0x40,0x3e,0x4d,0x9e,0xd9,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01}, 8333}, + {{0x2a,0x02,0x7b,0x40,0x50,0xd1,0xe0,0x4f,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01}, 8333}, + {{0x2a,0x02,0x7b,0x40,0x59,0x28,0x0f,0x9e,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01}, 8333}, + {{0x2a,0x02,0x7b,0x40,0x59,0x2f,0xa5,0x90,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01}, 8333}, + {{0x2a,0x02,0x7b,0x40,0xb0,0xdf,0x82,0xfe,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01}, 8333}, + {{0x2a,0x02,0x7b,0x40,0xb0,0xdf,0x89,0x25,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01}, 8333}, + {{0x2a,0x02,0x7b,0x40,0xb0,0xdf,0x8b,0x41,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01}, 8333}, + {{0x2a,0x02,0x7b,0x40,0xb0,0xdf,0x8d,0x57,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01}, 8333}, + {{0x2a,0x02,0x7b,0x40,0xd4,0x18,0x6f,0xcd,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01}, 8333}, + {{0x2a,0x02,0x81,0x08,0x23,0x40,0x1c,0x18,0x00,0x7a,0x23,0x1e,0x14,0x30,0x7f,0x12}, 8333}, {{0x2a,0x02,0x81,0x08,0x9c,0x3f,0xdd,0x18,0x92,0x2b,0x34,0xff,0xfe,0x30,0xac,0x42}, 8333}, - {{0x2a,0x02,0x81,0x09,0x9a,0xc0,0x2a,0x2b,0x70,0x7a,0xad,0x1a,0x07,0x0c,0x84,0xa9}, 8333}, {{0x2a,0x02,0x81,0x0d,0x8a,0x40,0x36,0xf8,0x9a,0xf2,0xb3,0xff,0xfe,0xe8,0x6d,0x7a}, 8333}, - {{0x2a,0x02,0x81,0x0d,0x98,0x40,0x7e,0x50,0x00,0x00,0x00,0x00,0x00,0x00,0x02,0x27}, 8333}, + {{0x2a,0x02,0x83,0x88,0xe3,0x01,0x71,0x80,0x02,0x01,0x2e,0xff,0xfe,0x82,0xb3,0xcc}, 8333}, + {{0x2a,0x02,0x09,0x08,0x02,0x13,0x54,0xa0,0x39,0xbf,0xd4,0xaa,0x60,0xb2,0xd9,0xc3}, 8333}, + {{0x2a,0x02,0x09,0x08,0x04,0xf0,0x7e,0x1c,0x50,0x54,0x00,0xff,0xfe,0xb7,0xce,0x4b}, 8333}, {{0x2a,0x02,0x09,0x30,0x00,0x01,0x00,0x00,0x02,0x50,0x56,0xff,0xfe,0x8e,0x28,0x19}, 8333}, - {{0x2a,0x02,0xc2,0x00,0x00,0x01,0x00,0x10,0x00,0x02,0x00,0x04,0x03,0x34,0x00,0x01}, 8333}, - {{0x2a,0x02,0xc2,0x00,0x00,0x01,0x00,0x10,0x00,0x02,0x00,0x05,0x02,0x27,0x00,0x01}, 8333}, - {{0x2a,0x02,0xc2,0x00,0x00,0x01,0x00,0x10,0x00,0x02,0x00,0x05,0x08,0x00,0x00,0x01}, 8333}, + {{0x2a,0x02,0x0a,0x80,0x00,0x00,0x20,0x52,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02}, 8333}, {{0x2a,0x02,0xc2,0x05,0x00,0x00,0x51,0x45,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01}, 8333}, {{0x2a,0x02,0xc2,0x05,0x20,0x08,0x02,0x72,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01}, 8333}, - {{0x2a,0x02,0xc2,0x05,0x20,0x08,0x71,0x60,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01}, 8333}, - {{0x2a,0x02,0xc2,0x05,0x20,0x09,0x78,0x04,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01}, 8333}, - {{0x2a,0x02,0xc2,0x05,0x20,0x14,0x19,0x81,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01}, 8333}, - {{0x2a,0x02,0xc2,0x05,0x20,0x14,0x35,0x24,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01}, 8333}, - {{0x2a,0x02,0xc2,0x05,0x20,0x15,0x24,0x75,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01}, 8333}, + {{0x2a,0x02,0xc2,0x05,0x20,0x10,0x62,0x30,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01}, 8333}, + {{0x2a,0x02,0xc2,0x05,0x20,0x16,0x43,0x27,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01}, 8333}, + {{0x2a,0x02,0xc2,0x05,0x20,0x17,0x21,0x16,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01}, 8333}, + {{0x2a,0x02,0xc2,0x05,0x20,0x18,0x17,0x54,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01}, 8333}, + {{0x2a,0x02,0xc2,0x05,0x20,0x18,0x82,0x29,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01}, 8333}, {{0x2a,0x02,0xc2,0x05,0x30,0x02,0x27,0x87,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01}, 8333}, - {{0x2a,0x02,0xc2,0x07,0x20,0x02,0x90,0x13,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01}, 8333}, + {{0x2a,0x02,0xc2,0x05,0x30,0x02,0x65,0x25,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01}, 8333}, + {{0x2a,0x02,0xc2,0x07,0x00,0x00,0x38,0x29,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01}, 8333}, {{0x2a,0x02,0xc2,0x07,0x20,0x07,0x46,0x99,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01}, 8333}, - {{0x2a,0x02,0xc2,0x07,0x20,0x08,0x65,0x19,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01}, 8333}, {{0x2a,0x02,0xc2,0x07,0x20,0x09,0x02,0x13,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01}, 8333}, - {{0x2a,0x02,0xc2,0x07,0x20,0x11,0x25,0x83,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01}, 8333}, - {{0x2a,0x02,0xc2,0x07,0x20,0x12,0x02,0x63,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01}, 8333}, - {{0x2a,0x02,0xc2,0x07,0x20,0x12,0x29,0x17,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01}, 8333}, + {{0x2a,0x02,0xc2,0x07,0x20,0x10,0x77,0x51,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01}, 8333}, {{0x2a,0x02,0xc2,0x07,0x20,0x12,0x48,0x26,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01}, 8333}, - {{0x2a,0x02,0xc2,0x07,0x20,0x13,0x31,0x60,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01}, 8333}, {{0x2a,0x02,0xc2,0x07,0x20,0x14,0x41,0x99,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01}, 8333}, {{0x2a,0x02,0xc2,0x07,0x20,0x14,0x56,0x39,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01}, 8333}, - {{0x2a,0x02,0xc2,0x07,0x20,0x14,0x71,0x60,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01}, 8333}, - {{0x2a,0x02,0xc2,0x07,0x20,0x14,0x81,0x04,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01}, 8333}, - {{0x2a,0x02,0xc2,0x07,0x20,0x14,0x85,0x36,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01}, 8333}, - {{0x2a,0x02,0xc2,0x07,0x20,0x14,0x94,0x33,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01}, 8333}, - {{0x2a,0x02,0xc2,0x07,0x20,0x15,0x49,0x97,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01}, 8333}, + {{0x2a,0x02,0xc2,0x07,0x20,0x14,0x99,0x13,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01}, 18333}, + {{0x2a,0x02,0xc2,0x07,0x20,0x15,0x37,0x99,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01}, 8333}, + {{0x2a,0x02,0xc2,0x07,0x20,0x15,0x39,0x26,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01}, 8333}, {{0x2a,0x02,0xc2,0x07,0x20,0x15,0x59,0x19,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01}, 8333}, - {{0x2a,0x02,0xc2,0x07,0x30,0x01,0x58,0x24,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01}, 8333}, - {{0x2a,0x02,0xc2,0x07,0x30,0x01,0x76,0x45,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01}, 8333}, - {{0x2a,0x02,0xc2,0x07,0x30,0x01,0x77,0x76,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01}, 8333}, + {{0x2a,0x02,0xc2,0x07,0x20,0x15,0x66,0x81,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01}, 8333}, + {{0x2a,0x02,0xc2,0x07,0x20,0x16,0x23,0x94,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01}, 8333}, + {{0x2a,0x02,0xc2,0x07,0x20,0x16,0x93,0x75,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01}, 8333}, + {{0x2a,0x02,0xc2,0x07,0x20,0x17,0x19,0x88,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01}, 8333}, + {{0x2a,0x02,0xc2,0x07,0x20,0x17,0x37,0x20,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01}, 8333}, + {{0x2a,0x02,0xc2,0x07,0x20,0x17,0x44,0x86,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01}, 8333}, + {{0x2a,0x02,0xc2,0x07,0x20,0x17,0x47,0x08,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01}, 8333}, + {{0x2a,0x02,0xc2,0x07,0x20,0x17,0x58,0x28,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01}, 8333}, + {{0x2a,0x02,0xc2,0x07,0x20,0x17,0x73,0x20,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01}, 8333}, + {{0x2a,0x02,0xc2,0x07,0x20,0x17,0x81,0x75,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01}, 8333}, + {{0x2a,0x02,0xc2,0x07,0x20,0x17,0x89,0x98,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01}, 8333}, + {{0x2a,0x02,0xc2,0x07,0x20,0x18,0x14,0x62,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01}, 8333}, + {{0x2a,0x02,0xc2,0x07,0x20,0x18,0x30,0x94,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01}, 8333}, + {{0x2a,0x02,0xc2,0x07,0x20,0x18,0x32,0x75,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01}, 8333}, + {{0x2a,0x02,0xc2,0x07,0x20,0x18,0x37,0x10,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01}, 8333}, + {{0x2a,0x02,0xc2,0x07,0x20,0x18,0x47,0x90,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01}, 8333}, + {{0x2a,0x02,0xc2,0x07,0x20,0x18,0x74,0x07,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01}, 8333}, + {{0x2a,0x02,0xc2,0x07,0x20,0x19,0x10,0x67,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01}, 8333}, + {{0x2a,0x02,0xc2,0x07,0x20,0x19,0x14,0x25,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01}, 8333}, + {{0x2a,0x02,0xc2,0x07,0x20,0x19,0x20,0x41,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01}, 8333}, + {{0x2a,0x02,0xc2,0x07,0x20,0x19,0x02,0x48,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01}, 8333}, + {{0x2a,0x02,0xc2,0x07,0x20,0x19,0x35,0x92,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01}, 8333}, {{0x2a,0x02,0xc2,0x07,0x30,0x01,0x93,0x20,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01}, 8333}, {{0x2a,0x02,0xc2,0x07,0x30,0x02,0x12,0x87,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01}, 8333}, - {{0x2a,0x02,0xc2,0x07,0x30,0x02,0x15,0x32,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01}, 8333}, - {{0x2a,0x02,0xc2,0x07,0x30,0x02,0x24,0x32,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01}, 8333}, - {{0x2a,0x02,0xc2,0x07,0x30,0x02,0x44,0x31,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01}, 8333}, - {{0x2a,0x02,0xc2,0x07,0x30,0x02,0x08,0x09,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01}, 8333}, - {{0x2a,0x02,0x0c,0x7f,0x7c,0x2c,0xa8,0x00,0x42,0x8d,0x5c,0xff,0xfe,0x74,0x14,0x55}, 8333}, - {{0x2a,0x02,0x0c,0x7f,0xd8,0x26,0x19,0x01,0x02,0x0c,0x29,0xff,0xfe,0x11,0x9d,0x0e}, 8333}, + {{0x2a,0x02,0xc2,0x07,0x30,0x02,0x41,0x87,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01}, 8333}, + {{0x2a,0x02,0xc2,0x07,0x30,0x02,0x56,0x42,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01}, 8333}, + {{0x2a,0x02,0xc2,0x07,0x30,0x02,0x71,0x50,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01}, 8333}, + {{0x2a,0x02,0xc2,0x07,0x30,0x02,0x72,0x22,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01}, 8333}, + {{0x2a,0x02,0xc2,0x07,0x30,0x02,0x76,0x10,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01}, 8333}, + {{0x2a,0x02,0xc2,0x07,0x30,0x02,0x84,0x56,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01}, 8333}, {{0x2a,0x02,0xce,0x80,0x00,0x00,0x00,0x20,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01}, 8333}, - {{0x2a,0x03,0x40,0x00,0x00,0x02,0x04,0x96,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x08}, 8333}, - {{0x2a,0x03,0x73,0x80,0x03,0x00,0x00,0x16,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00}, 8333}, - {{0x2a,0x03,0x73,0x80,0x03,0x00,0x00,0x07,0xa1,0x9f,0xeb,0x0b,0x0a,0xe0,0x6a,0xad}, 8333}, - {{0x2a,0x03,0xb0,0xc0,0x00,0x03,0x00,0xd0,0x00,0x00,0x00,0x00,0x12,0x19,0x60,0x01}, 8333}, + {{0x2a,0x02,0x0e,0x00,0xff,0xf0,0x01,0xb9,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01}, 8333}, + {{0x2a,0x02,0x0e,0x00,0xff,0xf0,0x01,0xb9,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x0a}, 8333}, + {{0x2a,0x02,0x0e,0x00,0xff,0xf0,0x01,0xe2,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01}, 8333}, + {{0x2a,0x03,0xb0,0xc0,0x00,0x01,0x00,0xd0,0x00,0x00,0x00,0x00,0x00,0x69,0x30,0x01}, 8333}, + {{0x2a,0x03,0xb0,0xc0,0x00,0x02,0x00,0xd0,0x00,0x00,0x00,0x00,0x03,0xba,0xb0,0x01}, 8333}, + {{0x2a,0x03,0xb0,0xc0,0x00,0x02,0x00,0xd0,0x00,0x00,0x00,0x00,0x08,0xce,0x40,0x01}, 8333}, + {{0x2a,0x03,0xb0,0xc0,0x00,0x03,0x00,0xd0,0x00,0x00,0x00,0x00,0x01,0x16,0x50,0x01}, 8333}, + {{0x2a,0x03,0xb0,0xc0,0x00,0x03,0x00,0xd0,0x00,0x00,0x00,0x00,0x01,0x2a,0x00,0x01}, 8333}, {{0x2a,0x03,0xb0,0xc0,0x00,0x03,0x00,0xd0,0x00,0x00,0x00,0x00,0x23,0xfb,0x60,0x01}, 8333}, + {{0x2a,0x03,0xb0,0xc0,0x00,0x03,0x00,0xd0,0x00,0x00,0x00,0x00,0x04,0x09,0x10,0x01}, 8333}, {{0x2a,0x03,0xb0,0xc0,0x00,0x03,0x00,0xd0,0x00,0x00,0x00,0x00,0x44,0xb8,0x90,0x01}, 8333}, {{0x2a,0x03,0xb0,0xc0,0x00,0x03,0x00,0xd0,0x00,0x00,0x00,0x00,0x44,0xb8,0xa0,0x01}, 8333}, - {{0x2a,0x03,0xb0,0xc0,0x00,0x03,0x00,0xd0,0x00,0x00,0x00,0x00,0x44,0xb8,0xb0,0x01}, 8333}, {{0x2a,0x03,0xb0,0xc0,0x00,0x03,0x00,0xd0,0x00,0x00,0x00,0x00,0x44,0xb8,0xe0,0x01}, 8333}, {{0x2a,0x03,0xb0,0xc0,0x00,0x03,0x00,0xd0,0x00,0x00,0x00,0x00,0x44,0xb8,0xf0,0x01}, 8333}, {{0x2a,0x03,0xb0,0xc0,0x00,0x03,0x00,0xd0,0x00,0x00,0x00,0x00,0x44,0xb9,0x00,0x01}, 8333}, {{0x2a,0x03,0xb0,0xc0,0x00,0x03,0x00,0xd0,0x00,0x00,0x00,0x00,0x44,0xb9,0x10,0x01}, 8333}, {{0x2a,0x03,0xb0,0xc0,0x00,0x03,0x00,0xd0,0x00,0x00,0x00,0x00,0x44,0xb9,0x20,0x01}, 8333}, {{0x2a,0x03,0xb0,0xc0,0x00,0x03,0x00,0xd0,0x00,0x00,0x00,0x00,0x44,0xb9,0x40,0x01}, 8333}, - {{0x2a,0x03,0xb0,0xc0,0x00,0x03,0x00,0xd0,0x00,0x00,0x00,0x00,0x00,0x04,0x00,0x01}, 8333}, {{0x2a,0x03,0xb0,0xc0,0x00,0x03,0x00,0xd0,0x00,0x00,0x00,0x00,0x5e,0x48,0xd0,0x01}, 8333}, - {{0x2a,0x03,0xb0,0xc0,0x00,0x03,0x00,0xd0,0x00,0x00,0x00,0x00,0x00,0xc7,0xf0,0x01}, 8333}, - {{0x2a,0x03,0xb0,0xc0,0x00,0x03,0x00,0xd0,0x00,0x00,0x00,0x00,0x00,0xe9,0xf0,0x01}, 8333}, - {{0x2a,0x03,0xff,0x40,0x4e,0xd1,0x10,0x04,0xa2,0x36,0x9f,0xff,0xfe,0xb4,0xf9,0xf8}, 8333}, - {{0x2a,0x04,0x21,0x80,0x00,0x00,0x00,0x02,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x94}, 8333}, - {{0x2a,0x04,0x21,0x80,0x00,0x01,0x00,0x06,0xf0,0x00,0x00,0x00,0x00,0x00,0x00,0x14}, 8333}, - {{0x2a,0x04,0x52,0xc0,0x01,0x01,0x01,0x22,0x00,0x00,0x00,0x00,0x00,0x00,0x49,0x6d}, 8333}, - {{0x2a,0x04,0xdb,0xc3,0xff,0xfe,0x00,0x00,0xe6,0x1f,0x13,0xff,0xfe,0x95,0x84,0x01}, 8333}, - {{0x2a,0x05,0x35,0x80,0xd4,0x00,0x14,0x0d,0xda,0x6e,0x82,0x6e,0xe7,0x71,0x41,0x00}, 8333}, - {{0x2a,0x05,0xbe,0xc0,0x00,0x01,0x00,0x01,0x02,0x16,0x3e,0xff,0xfe,0x73,0xd2,0x0a}, 8333}, - {{0x2a,0x06,0x3d,0x80,0x00,0x0b,0x00,0x01,0x48,0xb4,0xbe,0xdd,0x69,0x64,0x54,0xac}, 8333}, - {{0x2a,0x06,0x3d,0x80,0x00,0x0b,0x00,0x01,0xae,0x1f,0x6b,0xff,0xfe,0x13,0xc1,0x3e}, 8333}, - {{0x2a,0x06,0x3d,0x80,0x00,0x0b,0x00,0x02,0xae,0x1f,0x6b,0xff,0xfe,0x13,0xc1,0x3e}, 8333}, - {{0x2a,0x06,0x3d,0x80,0x00,0x0b,0x00,0x02,0x0e,0xc4,0x7a,0xff,0xfe,0x96,0xb5,0x70}, 8333}, - {{0x2a,0x07,0x57,0x40,0x06,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x14,0xad,0x9c,0xec}, 8333}, - {{0x2a,0x07,0x57,0x40,0x06,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01,0xb5,0x30,0x82}, 8333}, - {{0x2a,0x07,0x57,0x41,0x00,0x00,0x0d,0x8b,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01}, 8333}, + {{0x2a,0x03,0xee,0x40,0x00,0x00,0x02,0x94,0x02,0x50,0x56,0xff,0xfe,0x8d,0x4a,0xd7}, 8333}, + {{0x2a,0x04,0x21,0x80,0x00,0x01,0x00,0x0c,0xf0,0x00,0x00,0x00,0x00,0x00,0x00,0x15}, 8333}, + {{0x2a,0x07,0x04,0x40,0x20,0x00,0x00,0x20,0x00,0x00,0x00,0x00,0x0c,0xa0,0x18,0x17}, 8333}, + {{0x2a,0x0a,0xc8,0x00,0x00,0x01,0x00,0x01,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x04}, 8333}, {{0xfd,0x87,0xd8,0x7e,0xeb,0x43,0xd6,0xbc,0x4a,0x3c,0x6d,0x03,0xa9,0x4e,0x1f,0x55}, 8333}, - {{0xfd,0x87,0xd8,0x7e,0xeb,0x43,0xd1,0x13,0xd8,0x3b,0x11,0xa3,0x88,0x84,0x80,0x61}, 8333}, + {{0xfd,0x87,0xd8,0x7e,0xeb,0x43,0xd6,0xec,0x32,0xc1,0x59,0x9c,0xd8,0x46,0xd5,0x48}, 8333}, + {{0xfd,0x87,0xd8,0x7e,0xeb,0x43,0xd0,0x4b,0x2b,0xe5,0x74,0xc4,0xb0,0x1c,0x49,0xb1}, 8333}, {{0xfd,0x87,0xd8,0x7e,0xeb,0x43,0xd1,0x79,0x73,0x7d,0x9b,0x37,0xab,0x3b,0xc0,0x43}, 8333}, - {{0xfd,0x87,0xd8,0x7e,0xeb,0x43,0xda,0x0d,0xe1,0xd2,0x65,0x18,0xfc,0xf5,0x2a,0xdc}, 8333}, + {{0xfd,0x87,0xd8,0x7e,0xeb,0x43,0xd2,0x3a,0x8f,0x2a,0xb7,0x71,0x8c,0xd3,0x67,0xdf}, 8333}, + {{0xfd,0x87,0xd8,0x7e,0xeb,0x43,0xde,0xfc,0xb8,0x18,0xa5,0x0f,0x26,0x6e,0x99,0xec}, 8333}, + {{0xfd,0x87,0xd8,0x7e,0xeb,0x43,0xdf,0x34,0xea,0x00,0x93,0xac,0x32,0x62,0x3d,0x37}, 8333}, + {{0xfd,0x87,0xd8,0x7e,0xeb,0x43,0xdb,0x29,0x3c,0xb5,0x05,0x98,0x81,0xdb,0x7d,0xd4}, 8333}, + {{0xfd,0x87,0xd8,0x7e,0xeb,0x43,0xdc,0x1e,0x17,0xcf,0x86,0x53,0xf6,0x3b,0xb7,0x51}, 8333}, {{0xfd,0x87,0xd8,0x7e,0xeb,0x43,0xdc,0x79,0xc1,0x8f,0x29,0x44,0xf2,0xdc,0x00,0xf6}, 8333}, + {{0xfd,0x87,0xd8,0x7e,0xeb,0x43,0xdd,0xe8,0x28,0x36,0x77,0x7f,0x46,0x37,0x03,0x3d}, 8333}, + {{0xfd,0x87,0xd8,0x7e,0xeb,0x43,0xe7,0x2c,0x05,0xb5,0x95,0x59,0xc5,0x00,0x6c,0x5a}, 8333}, + {{0xfd,0x87,0xd8,0x7e,0xeb,0x43,0xe1,0x0f,0x31,0xe2,0xb5,0xc9,0xc2,0x17,0x78,0x5d}, 8333}, + {{0xfd,0x87,0xd8,0x7e,0xeb,0x43,0xe2,0x48,0xa0,0x9f,0xe2,0x1a,0xca,0x30,0x6e,0xa4}, 8333}, + {{0xfd,0x87,0xd8,0x7e,0xeb,0x43,0xe3,0x09,0x6b,0x3b,0x41,0x2d,0xd5,0xe5,0x9b,0x65}, 8333}, {{0xfd,0x87,0xd8,0x7e,0xeb,0x43,0xee,0xe7,0x24,0xcf,0xd9,0x86,0xd0,0x09,0x57,0xb0}, 8333}, {{0xfd,0x87,0xd8,0x7e,0xeb,0x43,0xef,0x3c,0x49,0x0b,0xc1,0x74,0xc2,0x92,0x86,0xe1}, 8333}, + {{0xfd,0x87,0xd8,0x7e,0xeb,0x43,0xef,0x73,0x9c,0xc9,0x5f,0x44,0x2b,0xe7,0xec,0x96}, 8333}, + {{0xfd,0x87,0xd8,0x7e,0xeb,0x43,0xef,0xa5,0x34,0x24,0x5e,0x50,0x8d,0x6f,0x15,0x6a}, 8333}, {{0xfd,0x87,0xd8,0x7e,0xeb,0x43,0xe9,0x17,0x9b,0x08,0xdc,0xbe,0x24,0xe3,0x01,0x6e}, 8333}, + {{0xfd,0x87,0xd8,0x7e,0xeb,0x43,0xe9,0x79,0x89,0x41,0x5c,0x21,0x07,0xc4,0x8a,0xa9}, 8333}, + {{0xfd,0x87,0xd8,0x7e,0xeb,0x43,0xea,0xb6,0xeb,0xd2,0x5a,0x58,0x00,0x16,0x61,0x0f}, 8333}, + {{0xfd,0x87,0xd8,0x7e,0xeb,0x43,0xeb,0xe7,0x4c,0xbd,0x60,0xb0,0x77,0x2a,0xc9,0xd2}, 8333}, + {{0xfd,0x87,0xd8,0x7e,0xeb,0x43,0xec,0x58,0xf9,0x46,0x23,0x0e,0xea,0xf2,0x9b,0x27}, 8333}, + {{0xfd,0x87,0xd8,0x7e,0xeb,0x43,0xed,0x9a,0xa8,0x65,0x39,0x49,0x0e,0xc8,0x7c,0xed}, 8333}, + {{0xfd,0x87,0xd8,0x7e,0xeb,0x43,0xed,0xef,0x28,0x1d,0xef,0x42,0x35,0xa7,0x98,0x92}, 8333}, {{0xfd,0x87,0xd8,0x7e,0xeb,0x43,0xee,0x0d,0x2c,0x85,0x41,0x08,0x29,0x94,0xdf,0xec}, 8333}, + {{0xfd,0x87,0xd8,0x7e,0xeb,0x43,0xee,0x75,0x23,0x93,0x83,0xf1,0x6b,0x11,0xb5,0x84}, 8333}, {{0xfd,0x87,0xd8,0x7e,0xeb,0x43,0xf7,0x21,0x13,0xe2,0xe6,0x5e,0x12,0x93,0xa9,0xa4}, 8333}, - {{0xfd,0x87,0xd8,0x7e,0xeb,0x43,0xf7,0x88,0x7c,0x41,0x55,0x51,0x3d,0x31,0xf0,0xb8}, 8333}, - {{0xfd,0x87,0xd8,0x7e,0xeb,0x43,0xf4,0x69,0x87,0x6d,0x58,0x95,0x47,0xaf,0x8d,0x65}, 8333}, - {{0xfd,0x87,0xd8,0x7e,0xeb,0x43,0xf4,0xe3,0xf1,0x48,0xf5,0xbf,0x41,0x86,0x66,0x67}, 8333}, - {{0xfd,0x87,0xd8,0x7e,0xeb,0x43,0xfb,0x68,0x1a,0x6a,0xd8,0xdd,0xd1,0x93,0x5b,0x34}, 8333}, - {{0xfd,0x87,0xd8,0x7e,0xeb,0x43,0xfb,0x68,0x8f,0x10,0x92,0x98,0x2d,0xa2,0xfe,0xec}, 8333}, - {{0xfd,0x87,0xd8,0x7e,0xeb,0x43,0xfc,0x0d,0xe4,0x8d,0x80,0x39,0x6e,0x06,0x03,0x1d}, 8333}, - {{0xfd,0x87,0xd8,0x7e,0xeb,0x43,0x00,0x7e,0x59,0x8c,0xb6,0xf4,0x0e,0x3b,0xee,0x24}, 8333}, + {{0xfd,0x87,0xd8,0x7e,0xeb,0x43,0xf2,0x9b,0xff,0x28,0x09,0x12,0xa0,0x6d,0x68,0x0e}, 8333}, + {{0xfd,0x87,0xd8,0x7e,0xeb,0x43,0xf3,0x34,0x88,0x19,0xb0,0x4d,0xcf,0xfa,0x2f,0x0a}, 8333}, + {{0xfd,0x87,0xd8,0x7e,0xeb,0x43,0xf5,0x84,0x56,0x84,0x3b,0xab,0x01,0x6f,0x0a,0xc0}, 8333}, + {{0xfd,0x87,0xd8,0x7e,0xeb,0x43,0xf6,0x70,0xdb,0x84,0x34,0x79,0x58,0xda,0x8b,0x66}, 8333}, + {{0xfd,0x87,0xd8,0x7e,0xeb,0x43,0xfc,0x9b,0x2f,0xc4,0x14,0x8b,0xd8,0xb5,0xe0,0x28}, 8333}, + {{0xfd,0x87,0xd8,0x7e,0xeb,0x43,0xfd,0x8e,0x09,0x64,0xda,0xd3,0xc6,0xaa,0x94,0x4a}, 8333}, + {{0xfd,0x87,0xd8,0x7e,0xeb,0x43,0x06,0xc1,0xe7,0xaf,0x38,0x13,0x99,0x7e,0x9a,0x16}, 8333}, + {{0xfd,0x87,0xd8,0x7e,0xeb,0x43,0x00,0xa5,0xf3,0xe1,0x60,0x00,0xd2,0xa9,0xfd,0x8a}, 8333}, + {{0xfd,0x87,0xd8,0x7e,0xeb,0x43,0x01,0x9f,0x61,0x55,0x17,0x00,0xc2,0x86,0xe0,0x93}, 8333}, {{0xfd,0x87,0xd8,0x7e,0xeb,0x43,0x02,0x61,0x59,0x61,0x66,0xed,0xc7,0xda,0xcb,0x78}, 8333}, - {{0xfd,0x87,0xd8,0x7e,0xeb,0x43,0x02,0xce,0xb2,0x1a,0x69,0x50,0xd8,0x18,0x4a,0xb3}, 8333}, + {{0xfd,0x87,0xd8,0x7e,0xeb,0x43,0x02,0xa6,0x52,0x02,0x0a,0x0b,0x55,0xdd,0x04,0xb7}, 8333}, + {{0xfd,0x87,0xd8,0x7e,0xeb,0x43,0x02,0xc3,0x22,0x35,0xb2,0x60,0x64,0x6b,0xae,0x5b}, 8333}, + {{0xfd,0x87,0xd8,0x7e,0xeb,0x43,0x02,0xe3,0x4c,0xc4,0x79,0xfd,0xc4,0x45,0x7b,0xe5}, 8333}, + {{0xfd,0x87,0xd8,0x7e,0xeb,0x43,0x03,0x3c,0x08,0x6c,0x6b,0xa6,0x76,0xd4,0x89,0xb3}, 8333}, + {{0xfd,0x87,0xd8,0x7e,0xeb,0x43,0x03,0x88,0x5c,0x5c,0xcd,0x79,0x80,0x8b,0x6a,0xe6}, 8333}, + {{0xfd,0x87,0xd8,0x7e,0xeb,0x43,0x03,0xf4,0x58,0x9b,0x4c,0x04,0x2e,0xf6,0x29,0x43}, 8333}, + {{0xfd,0x87,0xd8,0x7e,0xeb,0x43,0x03,0xf9,0x9c,0xf1,0x0c,0xb8,0x46,0xbf,0x3d,0x71}, 8333}, + {{0xfd,0x87,0xd8,0x7e,0xeb,0x43,0x03,0xc2,0x1a,0x9d,0x5b,0xd3,0x31,0x41,0xb7,0x18}, 8333}, + {{0xfd,0x87,0xd8,0x7e,0xeb,0x43,0x04,0x56,0xe1,0x55,0xd6,0xbc,0xda,0xb0,0xbd,0xdb}, 8333}, {{0xfd,0x87,0xd8,0x7e,0xeb,0x43,0x0f,0x47,0xe2,0x4c,0xab,0x4b,0x34,0xb4,0x93,0xb8}, 8333}, - {{0xfd,0x87,0xd8,0x7e,0xeb,0x43,0x0f,0xee,0x48,0xfd,0x8e,0x22,0x11,0x9e,0xf8,0x4f}, 8333}, + {{0xfd,0x87,0xd8,0x7e,0xeb,0x43,0x08,0xed,0x51,0x58,0x05,0xcb,0xe5,0x28,0x09,0x49}, 8333}, {{0xfd,0x87,0xd8,0x7e,0xeb,0x43,0x0c,0x6d,0x02,0x65,0xbe,0x59,0x3b,0xcb,0x68,0x21}, 8333}, - {{0xfd,0x87,0xd8,0x7e,0xeb,0x43,0x0d,0x1f,0xd6,0xf4,0x9b,0x55,0x23,0x54,0xe4,0xbb}, 8333}, - {{0xfd,0x87,0xd8,0x7e,0xeb,0x43,0x0d,0x41,0x8f,0x78,0x99,0x35,0xec,0xef,0xd9,0x3c}, 8333}, - {{0xfd,0x87,0xd8,0x7e,0xeb,0x43,0x11,0x95,0xca,0x69,0x77,0x8d,0x58,0xbe,0x26,0xa1}, 8333}, + {{0xfd,0x87,0xd8,0x7e,0xeb,0x43,0x0d,0xef,0x55,0x07,0xe2,0xcc,0x6f,0x3a,0xe7,0x42}, 8333}, + {{0xfd,0x87,0xd8,0x7e,0xeb,0x43,0x16,0xa6,0xf8,0x28,0x19,0xe2,0x0e,0x9c,0xd8,0xc1}, 8333}, + {{0xfd,0x87,0xd8,0x7e,0xeb,0x43,0x11,0x85,0x5d,0xea,0x21,0x08,0x53,0x8c,0x65,0xd6}, 8333}, + {{0xfd,0x87,0xd8,0x7e,0xeb,0x43,0x12,0x95,0x07,0xac,0xca,0xcb,0x8b,0xce,0x9f,0x58}, 8333}, {{0xfd,0x87,0xd8,0x7e,0xeb,0x43,0x13,0xf0,0x58,0x06,0x5c,0x2c,0xb7,0x56,0x85,0xe5}, 8333}, + {{0xfd,0x87,0xd8,0x7e,0xeb,0x43,0x14,0xf3,0x4c,0xdd,0xb5,0x58,0x3b,0x7a,0x87,0xf9}, 8333}, + {{0xfd,0x87,0xd8,0x7e,0xeb,0x43,0x15,0xb8,0x88,0x54,0x43,0xc7,0xbe,0x1e,0xcd,0xf6}, 8333}, {{0xfd,0x87,0xd8,0x7e,0xeb,0x43,0x16,0x2a,0xf3,0x4f,0x5d,0xd7,0xf8,0x8e,0x87,0xe2}, 8333}, - {{0xfd,0x87,0xd8,0x7e,0xeb,0x43,0x1e,0xbd,0x3a,0x3d,0x81,0x38,0xd2,0xcb,0xe6,0xcc}, 8333}, - {{0xfd,0x87,0xd8,0x7e,0xeb,0x43,0x1f,0xad,0x40,0xc8,0x73,0x8f,0x3c,0x31,0xf5,0x48}, 8333}, - {{0xfd,0x87,0xd8,0x7e,0xeb,0x43,0x19,0x14,0x9e,0x58,0x02,0xc5,0x9f,0x09,0x00,0x7b}, 8333}, - {{0xfd,0x87,0xd8,0x7e,0xeb,0x43,0x1c,0x1f,0x7b,0x2d,0xed,0xae,0xf3,0xb3,0xe5,0xab}, 8333}, - {{0xfd,0x87,0xd8,0x7e,0xeb,0x43,0x1c,0xa3,0x68,0x59,0x09,0x9c,0xaa,0x8e,0x0c,0xaa}, 42434}, - {{0xfd,0x87,0xd8,0x7e,0xeb,0x43,0x1d,0xd4,0xc9,0xb2,0xc8,0x87,0xc6,0x39,0x9a,0x8b}, 8333}, + {{0xfd,0x87,0xd8,0x7e,0xeb,0x43,0x1b,0x28,0x39,0x47,0xf7,0xf9,0x07,0x5c,0x19,0x73}, 8333}, + {{0xfd,0x87,0xd8,0x7e,0xeb,0x43,0x1c,0x82,0xde,0xec,0xba,0x1d,0x9e,0x7a,0xf5,0x97}, 8333}, + {{0xfd,0x87,0xd8,0x7e,0xeb,0x43,0x1c,0xa5,0x01,0xa7,0xcf,0xbb,0x72,0xa9,0x9f,0xc8}, 8333}, {{0xfd,0x87,0xd8,0x7e,0xeb,0x43,0x26,0xf2,0x12,0x3c,0xf5,0x14,0x19,0x91,0x41,0x51}, 8333}, - {{0xfd,0x87,0xd8,0x7e,0xeb,0x43,0x20,0x03,0xd7,0x3f,0x79,0xd7,0x1b,0xf2,0x40,0x7d}, 8333}, - {{0xfd,0x87,0xd8,0x7e,0xeb,0x43,0x22,0x45,0x02,0x56,0x89,0x14,0x17,0x38,0x37,0xe3}, 8333}, + {{0xfd,0x87,0xd8,0x7e,0xeb,0x43,0x27,0xb6,0x8f,0x8b,0xf0,0x06,0x42,0x39,0xa5,0x80}, 8333}, + {{0xfd,0x87,0xd8,0x7e,0xeb,0x43,0x22,0x28,0x04,0xea,0x09,0xa8,0x5b,0xfd,0xfd,0xe7}, 8333}, {{0xfd,0x87,0xd8,0x7e,0xeb,0x43,0x23,0xf4,0xc4,0xe5,0xd7,0xda,0xaa,0x1f,0x02,0xfc}, 8333}, - {{0xfd,0x87,0xd8,0x7e,0xeb,0x43,0x2e,0xf8,0x29,0x1c,0xe0,0x5e,0x9b,0x45,0xa6,0x42}, 8333}, + {{0xfd,0x87,0xd8,0x7e,0xeb,0x43,0x26,0x2a,0x5b,0x90,0x85,0x8f,0x08,0xe5,0x10,0xb1}, 8333}, {{0xfd,0x87,0xd8,0x7e,0xeb,0x43,0x2e,0xda,0x54,0x38,0xfa,0xfa,0x75,0x75,0x94,0x9d}, 8333}, - {{0xfd,0x87,0xd8,0x7e,0xeb,0x43,0x2f,0x8f,0xfa,0x2b,0x18,0x40,0xb2,0xbc,0x55,0x8b}, 8333}, + {{0xfd,0x87,0xd8,0x7e,0xeb,0x43,0x2f,0x49,0x9b,0xbc,0xe6,0x3a,0x9a,0x50,0xc6,0x66}, 8333}, {{0xfd,0x87,0xd8,0x7e,0xeb,0x43,0x28,0x09,0x61,0x65,0x34,0xcc,0xb9,0x62,0xdc,0xf5}, 8333}, - {{0xfd,0x87,0xd8,0x7e,0xeb,0x43,0x2b,0x55,0xb1,0xa1,0xce,0x35,0xc0,0xb9,0x7e,0x3c}, 8333}, - {{0xfd,0x87,0xd8,0x7e,0xeb,0x43,0x38,0x0e,0x75,0xb8,0x99,0xc1,0x60,0x7d,0x9c,0x48}, 8333}, - {{0xfd,0x87,0xd8,0x7e,0xeb,0x43,0x41,0x63,0x48,0x37,0x97,0xfb,0x42,0xde,0xbc,0x20}, 8333}, + {{0xfd,0x87,0xd8,0x7e,0xeb,0x43,0x29,0x0a,0x89,0x09,0x50,0xa7,0x62,0x08,0x13,0x62}, 8333}, + {{0xfd,0x87,0xd8,0x7e,0xeb,0x43,0x29,0x83,0x29,0x6f,0xbb,0xac,0xaa,0x06,0x8d,0xbf}, 8333}, + {{0xfd,0x87,0xd8,0x7e,0xeb,0x43,0x2b,0x56,0xa8,0xba,0xd2,0xc4,0x4a,0x4a,0x07,0xd2}, 8333}, + {{0xfd,0x87,0xd8,0x7e,0xeb,0x43,0x2b,0x5d,0xc0,0x01,0x4f,0x5f,0xa4,0x6f,0x63,0x9f}, 8333}, + {{0xfd,0x87,0xd8,0x7e,0xeb,0x43,0x2b,0x5e,0xd4,0x8d,0x5a,0xe3,0xf2,0x61,0x3d,0x77}, 8333}, + {{0xfd,0x87,0xd8,0x7e,0xeb,0x43,0x2b,0x89,0xcc,0x31,0x39,0xe1,0xd2,0x77,0x5a,0x83}, 8333}, + {{0xfd,0x87,0xd8,0x7e,0xeb,0x43,0x2c,0x17,0xcd,0xf9,0xb9,0xfc,0x06,0x89,0x6d,0xaa}, 8333}, + {{0xfd,0x87,0xd8,0x7e,0xeb,0x43,0x2c,0x4e,0x5a,0x0a,0xd6,0xed,0x4c,0x72,0xfc,0x55}, 8333}, + {{0xfd,0x87,0xd8,0x7e,0xeb,0x43,0x2c,0x63,0x72,0x16,0xbd,0x1a,0x23,0xd3,0xb3,0xeb}, 8333}, + {{0xfd,0x87,0xd8,0x7e,0xeb,0x43,0x2d,0x04,0xa2,0x45,0xcb,0xc5,0x2b,0xf2,0x05,0x60}, 8333}, + {{0xfd,0x87,0xd8,0x7e,0xeb,0x43,0x2e,0x7c,0xd9,0x21,0x3e,0x4a,0x31,0x4b,0x2e,0x42}, 8333}, + {{0xfd,0x87,0xd8,0x7e,0xeb,0x43,0x37,0x20,0x5b,0x0a,0x9d,0xb3,0x3f,0x92,0x75,0x66}, 8333}, + {{0xfd,0x87,0xd8,0x7e,0xeb,0x43,0x30,0x7b,0x87,0xc2,0x7e,0xd8,0xe9,0xbb,0x14,0xed}, 8333}, + {{0xfd,0x87,0xd8,0x7e,0xeb,0x43,0x30,0xb0,0x34,0xf5,0x03,0xda,0x45,0x7c,0x07,0x31}, 8333}, + {{0xfd,0x87,0xd8,0x7e,0xeb,0x43,0x31,0x6a,0xd6,0xb6,0xc2,0x18,0xcb,0x97,0x48,0x15}, 8333}, + {{0xfd,0x87,0xd8,0x7e,0xeb,0x43,0x33,0x96,0x4a,0xd7,0x00,0xc0,0xe4,0x3a,0x52,0xda}, 8333}, + {{0xfd,0x87,0xd8,0x7e,0xeb,0x43,0x34,0x39,0x2a,0x7a,0x53,0x4b,0x5d,0x28,0x53,0xdf}, 8333}, + {{0xfd,0x87,0xd8,0x7e,0xeb,0x43,0x38,0x78,0xe8,0x90,0xcb,0x74,0x7b,0x7d,0xdd,0xc0}, 8333}, + {{0xfd,0x87,0xd8,0x7e,0xeb,0x43,0x38,0x68,0x04,0x47,0x7f,0x1d,0xda,0x15,0xd2,0x36}, 8333}, + {{0xfd,0x87,0xd8,0x7e,0xeb,0x43,0x38,0xc1,0xf2,0xd7,0x30,0xdd,0x5c,0x7f,0xb2,0x9e}, 8333}, + {{0xfd,0x87,0xd8,0x7e,0xeb,0x43,0x3b,0x6a,0xad,0xbc,0xd5,0x41,0x30,0x8b,0xe0,0x5a}, 8333}, + {{0xfd,0x87,0xd8,0x7e,0xeb,0x43,0x41,0x6d,0x7b,0x51,0xa9,0x07,0x1e,0x6b,0x60,0x66}, 8333}, {{0xfd,0x87,0xd8,0x7e,0xeb,0x43,0x42,0x58,0x16,0x65,0x14,0x68,0x65,0x9c,0xde,0x69}, 8333}, - {{0xfd,0x87,0xd8,0x7e,0xeb,0x43,0x43,0x1e,0x48,0xa0,0x0b,0x6e,0x41,0xb9,0xc0,0xc7}, 8333}, {{0xfd,0x87,0xd8,0x7e,0xeb,0x43,0x43,0x7f,0x1e,0xa0,0x8e,0xfb,0x8c,0xab,0x85,0xa4}, 8333}, - {{0xfd,0x87,0xd8,0x7e,0xeb,0x43,0x45,0x08,0xd5,0x88,0x11,0x93,0x65,0x29,0xa1,0x17}, 8333}, + {{0xfd,0x87,0xd8,0x7e,0xeb,0x43,0x43,0x71,0x2a,0x9c,0x0a,0x8d,0x16,0x6f,0x2e,0x72}, 8333}, + {{0xfd,0x87,0xd8,0x7e,0xeb,0x43,0x45,0xa3,0x60,0xda,0x52,0xfa,0xca,0x05,0x94,0xdc}, 8333}, + {{0xfd,0x87,0xd8,0x7e,0xeb,0x43,0x48,0x3e,0x36,0x19,0x51,0x47,0xca,0x8e,0x7e,0xea}, 8333}, {{0xfd,0x87,0xd8,0x7e,0xeb,0x43,0x4c,0xd5,0x26,0xb9,0x54,0x90,0x72,0xc9,0x7e,0xcb}, 8333}, - {{0xfd,0x87,0xd8,0x7e,0xeb,0x43,0x57,0x84,0xf2,0x6c,0xe0,0x9c,0x63,0x7a,0xb7,0x3e}, 8333}, + {{0xfd,0x87,0xd8,0x7e,0xeb,0x43,0x4d,0xaf,0x88,0x1d,0xfc,0xd0,0x99,0x63,0xc0,0xbb}, 8333}, + {{0xfd,0x87,0xd8,0x7e,0xeb,0x43,0x4d,0xe2,0x50,0x4e,0x13,0x11,0x2b,0x9b,0x62,0xd9}, 8333}, + {{0xfd,0x87,0xd8,0x7e,0xeb,0x43,0x4e,0x3c,0xca,0xe4,0x3a,0x6c,0xe9,0x34,0x60,0x9e}, 8333}, + {{0xfd,0x87,0xd8,0x7e,0xeb,0x43,0x4e,0x07,0x0a,0x5f,0x2b,0x41,0x13,0xe1,0xb3,0x5c}, 8333}, + {{0xfd,0x87,0xd8,0x7e,0xeb,0x43,0x56,0x8c,0x3c,0xd6,0x38,0x8d,0xff,0x5f,0x2a,0x56}, 8333}, + {{0xfd,0x87,0xd8,0x7e,0xeb,0x43,0x52,0x86,0x09,0x6e,0x04,0x0a,0x9d,0x2c,0x1a,0x9d}, 8333}, {{0xfd,0x87,0xd8,0x7e,0xeb,0x43,0x54,0xac,0x5c,0x52,0x2d,0x32,0xd9,0xee,0xd3,0xe1}, 8333}, - {{0xfd,0x87,0xd8,0x7e,0xeb,0x43,0x55,0x47,0xce,0x4a,0xdf,0x92,0x83,0xd2,0xb9,0x76}, 8333}, {{0xfd,0x87,0xd8,0x7e,0xeb,0x43,0x5e,0x9f,0x1a,0x66,0x3b,0x63,0x4e,0x82,0x52,0x86}, 8333}, - {{0xfd,0x87,0xd8,0x7e,0xeb,0x43,0x5f,0x5c,0x31,0xa7,0x9e,0x7d,0x5c,0x31,0xe4,0x7c}, 8333}, + {{0xfd,0x87,0xd8,0x7e,0xeb,0x43,0x59,0x94,0x61,0x0f,0x81,0x8a,0x58,0x78,0xc1,0xa0}, 8333}, {{0xfd,0x87,0xd8,0x7e,0xeb,0x43,0x59,0x95,0x50,0xd6,0x2e,0xf7,0xd2,0xe6,0x3a,0x56}, 8333}, - {{0xfd,0x87,0xd8,0x7e,0xeb,0x43,0x5b,0x8a,0xb2,0x86,0xf4,0x65,0xd9,0xde,0x85,0x10}, 8333}, - {{0xfd,0x87,0xd8,0x7e,0xeb,0x43,0x67,0x93,0x13,0xc6,0x15,0x48,0x5b,0x95,0x83,0x71}, 8333}, + {{0xfd,0x87,0xd8,0x7e,0xeb,0x43,0x5a,0xd6,0x96,0x82,0x6a,0x91,0x4d,0x35,0x9d,0x4e}, 8333}, + {{0xfd,0x87,0xd8,0x7e,0xeb,0x43,0x60,0xdf,0x3f,0x5b,0xb2,0x4d,0x84,0xdb,0xce,0xd8}, 8333}, + {{0xfd,0x87,0xd8,0x7e,0xeb,0x43,0x61,0xd2,0x22,0x3f,0x22,0xe1,0xb0,0x01,0xdb,0x56}, 8333}, + {{0xfd,0x87,0xd8,0x7e,0xeb,0x43,0x63,0x7f,0xce,0x1c,0x28,0x70,0x30,0xdd,0xb9,0x32}, 8333}, + {{0xfd,0x87,0xd8,0x7e,0xeb,0x43,0x63,0xc0,0xa7,0x9b,0x34,0xfd,0x18,0x6a,0x6f,0x24}, 8333}, {{0xfd,0x87,0xd8,0x7e,0xeb,0x43,0x65,0x5c,0xcb,0x14,0x63,0x1c,0x0b,0x03,0x6d,0x70}, 8333}, - {{0xfd,0x87,0xd8,0x7e,0xeb,0x43,0x77,0x06,0x50,0xfa,0x6f,0xde,0xca,0x5d,0x2e,0x1f}, 8333}, - {{0xfd,0x87,0xd8,0x7e,0xeb,0x43,0x77,0x24,0xbe,0xb4,0x1e,0x49,0x20,0x64,0x6d,0x7e}, 8333}, + {{0xfd,0x87,0xd8,0x7e,0xeb,0x43,0x65,0xfa,0xa1,0x96,0xf6,0x75,0x85,0xbc,0x33,0x26}, 8333}, + {{0xfd,0x87,0xd8,0x7e,0xeb,0x43,0x6f,0x19,0xbd,0x64,0x4f,0xe9,0xea,0xe6,0x2a,0x7c}, 8333}, + {{0xfd,0x87,0xd8,0x7e,0xeb,0x43,0x6f,0xf7,0x29,0x92,0x02,0x62,0x73,0xd3,0xd9,0xa8}, 8333}, + {{0xfd,0x87,0xd8,0x7e,0xeb,0x43,0x68,0xb4,0x13,0x28,0xf0,0x71,0xe2,0xcb,0x06,0xf1}, 8333}, + {{0xfd,0x87,0xd8,0x7e,0xeb,0x43,0x68,0xbd,0x95,0xca,0xd6,0x84,0x0d,0xf1,0x77,0x19}, 8333}, + {{0xfd,0x87,0xd8,0x7e,0xeb,0x43,0x6c,0x62,0x5b,0x0d,0x91,0x66,0xd0,0xca,0x10,0x2d}, 8333}, + {{0xfd,0x87,0xd8,0x7e,0xeb,0x43,0x6c,0x62,0xc5,0x19,0x94,0x5b,0xcd,0x20,0xd9,0x73}, 8333}, + {{0xfd,0x87,0xd8,0x7e,0xeb,0x43,0x76,0xa6,0xaa,0x68,0x61,0x90,0xfc,0x8a,0x30,0x47}, 8333}, {{0xfd,0x87,0xd8,0x7e,0xeb,0x43,0x77,0xf5,0x9c,0x66,0x35,0xff,0xc8,0x0d,0x06,0xd4}, 8333}, - {{0xfd,0x87,0xd8,0x7e,0xeb,0x43,0x73,0x27,0x2e,0x38,0xa7,0xb4,0x12,0x3a,0x2e,0x3e}, 8333}, - {{0xfd,0x87,0xd8,0x7e,0xeb,0x43,0x78,0x5a,0xb7,0xfd,0x9c,0x55,0x12,0xc0,0x79,0x19}, 8333}, + {{0xfd,0x87,0xd8,0x7e,0xeb,0x43,0x71,0xcd,0x60,0x77,0x1e,0xee,0x78,0x42,0x33,0xe1}, 8333}, + {{0xfd,0x87,0xd8,0x7e,0xeb,0x43,0x72,0xea,0x3a,0x77,0xe6,0xfc,0x6f,0x67,0x8a,0x3c}, 8333}, + {{0xfd,0x87,0xd8,0x7e,0xeb,0x43,0x73,0x57,0x97,0x7f,0xfd,0x71,0x86,0xf4,0xb7,0xb7}, 8333}, + {{0xfd,0x87,0xd8,0x7e,0xeb,0x43,0x74,0xe4,0x79,0xcc,0x23,0xf5,0x74,0xad,0xa5,0x79}, 8333}, + {{0xfd,0x87,0xd8,0x7e,0xeb,0x43,0x75,0xa3,0xd9,0xb3,0xf8,0x35,0xbd,0xac,0xf2,0xab}, 8333}, {{0xfd,0x87,0xd8,0x7e,0xeb,0x43,0x78,0x8a,0x79,0x0e,0x19,0x97,0xa1,0xed,0xc7,0x14}, 8333}, + {{0xfd,0x87,0xd8,0x7e,0xeb,0x43,0x79,0x4b,0x68,0x5e,0xb4,0x58,0xc9,0x0e,0xf7,0x22}, 8333}, + {{0xfd,0x87,0xd8,0x7e,0xeb,0x43,0x79,0x9b,0x9f,0xaa,0xc2,0xdf,0xa2,0x2a,0x09,0xf4}, 8333}, + {{0xfd,0x87,0xd8,0x7e,0xeb,0x43,0x79,0xf8,0x6f,0x87,0x89,0x96,0x28,0xd9,0xd6,0x3c}, 8333}, {{0xfd,0x87,0xd8,0x7e,0xeb,0x43,0x7a,0x4c,0x71,0x22,0xb9,0x53,0x89,0x19,0x12,0x43}, 8333}, - {{0xfd,0x87,0xd8,0x7e,0xeb,0x43,0x7e,0x75,0x7e,0xb4,0xa7,0x4a,0x1f,0x23,0x83,0x3b}, 8333}, + {{0xfd,0x87,0xd8,0x7e,0xeb,0x43,0x7d,0x3f,0x6d,0xa4,0xb8,0x8e,0x5f,0xf9,0x5e,0x48}, 8333}, + {{0xfd,0x87,0xd8,0x7e,0xeb,0x43,0x7d,0xea,0xa4,0xbf,0xd2,0x28,0x74,0x5f,0x95,0xc4}, 8333}, {{0xfd,0x87,0xd8,0x7e,0xeb,0x43,0x80,0x2e,0xce,0xc9,0xec,0xbf,0x47,0xa5,0x6e,0x8f}, 8333}, {{0xfd,0x87,0xd8,0x7e,0xeb,0x43,0x81,0x1f,0x33,0xf7,0x83,0x06,0x24,0xc7,0xe3,0xb8}, 8333}, - {{0xfd,0x87,0xd8,0x7e,0xeb,0x43,0x81,0xad,0xc4,0x87,0xd8,0x42,0x9f,0xce,0x61,0xe0}, 8333}, {{0xfd,0x87,0xd8,0x7e,0xeb,0x43,0x82,0x7c,0x88,0xc1,0xba,0x47,0xf6,0x41,0x94,0xbd}, 8333}, - {{0xfd,0x87,0xd8,0x7e,0xeb,0x43,0x82,0xeb,0xe7,0xe3,0xc7,0x1c,0xf2,0x87,0xb6,0x6d}, 8333}, - {{0xfd,0x87,0xd8,0x7e,0xeb,0x43,0x85,0x78,0x78,0x7f,0xa0,0x96,0x11,0x35,0x30,0x12}, 8333}, - {{0xfd,0x87,0xd8,0x7e,0xeb,0x43,0x8e,0xc7,0x27,0x24,0xa7,0xb0,0x99,0xfb,0xfd,0xfe}, 8333}, - {{0xfd,0x87,0xd8,0x7e,0xeb,0x43,0x8a,0x40,0x2b,0x4b,0xfd,0xf8,0x11,0xef,0x2e,0x24}, 8333}, - {{0xfd,0x87,0xd8,0x7e,0xeb,0x43,0x91,0x1d,0x25,0x50,0x79,0x57,0xaa,0xdf,0x32,0x19}, 8333}, - {{0xfd,0x87,0xd8,0x7e,0xeb,0x43,0x93,0x26,0xc3,0x88,0x96,0xa5,0x7d,0x34,0xe1,0xb5}, 8333}, - {{0xfd,0x87,0xd8,0x7e,0xeb,0x43,0x94,0xd0,0xbd,0xc8,0x55,0x80,0x6a,0x77,0x5a,0xa1}, 8333}, - {{0xfd,0x87,0xd8,0x7e,0xeb,0x43,0x98,0x8e,0xe7,0xfb,0xfe,0x4f,0xb0,0xf7,0xda,0xcc}, 8333}, + {{0xfd,0x87,0xd8,0x7e,0xeb,0x43,0x82,0x5e,0x44,0x97,0x2b,0xb4,0x20,0xdc,0xc9,0xcb}, 8333}, + {{0xfd,0x87,0xd8,0x7e,0xeb,0x43,0x85,0xc9,0xb0,0xc1,0x2c,0x88,0x88,0xfb,0xbe,0xfc}, 8333}, + {{0xfd,0x87,0xd8,0x7e,0xeb,0x43,0x8a,0xdc,0xd4,0xb3,0xf4,0x47,0x8a,0x3c,0x67,0x87}, 8333}, + {{0xfd,0x87,0xd8,0x7e,0xeb,0x43,0x8c,0xbd,0xbe,0xca,0x5a,0xe6,0x19,0x6c,0x41,0x56}, 8333}, + {{0xfd,0x87,0xd8,0x7e,0xeb,0x43,0x91,0x90,0x89,0xb8,0xc4,0x74,0x24,0xba,0xa9,0x35}, 8333}, + {{0xfd,0x87,0xd8,0x7e,0xeb,0x43,0x93,0xd0,0x32,0x45,0xa4,0x9a,0x18,0xc6,0x2a,0x67}, 8333}, + {{0xfd,0x87,0xd8,0x7e,0xeb,0x43,0x98,0x7f,0x05,0xa0,0x51,0x9f,0xa2,0x3c,0xdf,0x23}, 8333}, + {{0xfd,0x87,0xd8,0x7e,0xeb,0x43,0x99,0xc2,0x95,0x03,0xda,0x05,0xf3,0x4b,0x4d,0xb3}, 8333}, {{0xfd,0x87,0xd8,0x7e,0xeb,0x43,0x9b,0x8d,0x4a,0xe3,0xb4,0x7e,0x28,0x29,0xd0,0x77}, 8333}, - {{0xfd,0x87,0xd8,0x7e,0xeb,0x43,0x9b,0xef,0xc4,0x81,0xbd,0x6e,0x81,0xa1,0x09,0x1a}, 8333}, - {{0xfd,0x87,0xd8,0x7e,0xeb,0x43,0x9c,0x63,0x3c,0x3f,0x72,0x44,0x59,0x69,0xcf,0x14}, 8333}, {{0xfd,0x87,0xd8,0x7e,0xeb,0x43,0xa7,0xd8,0xfa,0xdd,0xd3,0x63,0x60,0xd9,0xe1,0xbd}, 8333}, + {{0xfd,0x87,0xd8,0x7e,0xeb,0x43,0xa0,0x84,0xcb,0x7b,0xeb,0xe2,0x8c,0xbf,0x73,0xd8}, 8333}, {{0xfd,0x87,0xd8,0x7e,0xeb,0x43,0xa1,0x1d,0xe8,0xbb,0x02,0xdf,0xff,0xd4,0x3a,0x1f}, 8333}, - {{0xfd,0x87,0xd8,0x7e,0xeb,0x43,0xa9,0x2b,0xb6,0xf4,0xb7,0x2c,0x67,0x04,0xf8,0x9d}, 8333}, - {{0xfd,0x87,0xd8,0x7e,0xeb,0x43,0xaa,0x24,0x4a,0xc5,0x19,0xce,0xe1,0x4c,0x00,0xc9}, 8333}, - {{0xfd,0x87,0xd8,0x7e,0xeb,0x43,0xab,0x72,0x51,0x38,0x35,0x04,0x00,0x77,0x3a,0x8d}, 8333}, - {{0xfd,0x87,0xd8,0x7e,0xeb,0x43,0xb6,0x87,0x3a,0x47,0xaa,0xa1,0x80,0xfb,0x6e,0x2f}, 8333}, + {{0xfd,0x87,0xd8,0x7e,0xeb,0x43,0xa2,0x64,0x1d,0x40,0x49,0x57,0x27,0xed,0x6f,0x99}, 8333}, + {{0xfd,0x87,0xd8,0x7e,0xeb,0x43,0xa5,0x03,0xcd,0xbf,0x60,0x8c,0xd8,0xe8,0xb6,0xbd}, 8333}, + {{0xfd,0x87,0xd8,0x7e,0xeb,0x43,0xa5,0x43,0xde,0xb2,0xd5,0xa6,0x35,0xa6,0x19,0x9a}, 8333}, + {{0xfd,0x87,0xd8,0x7e,0xeb,0x43,0xa6,0x73,0x84,0x9a,0x0b,0x2f,0x3e,0x01,0x28,0x31}, 8333}, + {{0xfd,0x87,0xd8,0x7e,0xeb,0x43,0xaf,0x4a,0x68,0xec,0xad,0xce,0xdb,0x6f,0x7b,0x73}, 8333}, + {{0xfd,0x87,0xd8,0x7e,0xeb,0x43,0xaf,0x73,0x2d,0x48,0xc9,0xc4,0x76,0x65,0x9f,0xc2}, 8333}, + {{0xfd,0x87,0xd8,0x7e,0xeb,0x43,0xaa,0xb7,0x04,0x8c,0x87,0xc6,0x38,0x3b,0x0a,0xf6}, 8333}, + {{0xfd,0x87,0xd8,0x7e,0xeb,0x43,0xab,0xb1,0xeb,0x86,0xa4,0x4b,0xaf,0xcb,0x84,0x17}, 8333}, + {{0xfd,0x87,0xd8,0x7e,0xeb,0x43,0xad,0x11,0x6f,0xf5,0x46,0x78,0xa0,0xa2,0x71,0x95}, 8333}, + {{0xfd,0x87,0xd8,0x7e,0xeb,0x43,0xb6,0xe1,0xcf,0xd0,0x58,0x02,0x66,0x54,0x0b,0xfe}, 8333}, {{0xfd,0x87,0xd8,0x7e,0xeb,0x43,0xb1,0xbd,0x5b,0x30,0x31,0xce,0x31,0x90,0x3e,0x8d}, 8333}, - {{0xfd,0x87,0xd8,0x7e,0xeb,0x43,0xb3,0x2e,0x2f,0x02,0x4a,0xe0,0x3b,0x7c,0x02,0xe7}, 8333}, - {{0xfd,0x87,0xd8,0x7e,0xeb,0x43,0xbe,0x76,0x19,0x14,0xe8,0x85,0x04,0xdd,0xfc,0xc3}, 8333}, - {{0xfd,0x87,0xd8,0x7e,0xeb,0x43,0xc3,0xf2,0xb1,0xea,0xf8,0x40,0xe9,0xec,0x32,0x02}, 8333}, + {{0xfd,0x87,0xd8,0x7e,0xeb,0x43,0xb1,0x9e,0x5b,0x5c,0xd8,0xd0,0xdd,0x64,0x11,0xad}, 8333}, + {{0xfd,0x87,0xd8,0x7e,0xeb,0x43,0xb2,0x66,0xca,0xcb,0x2d,0xa8,0xc4,0xb6,0x88,0x14}, 8333}, + {{0xfd,0x87,0xd8,0x7e,0xeb,0x43,0xb8,0x03,0xce,0x85,0xec,0x64,0x57,0xd3,0x6c,0x38}, 8333}, + {{0xfd,0x87,0xd8,0x7e,0xeb,0x43,0xb8,0xd7,0x4d,0xd1,0x39,0x41,0x0e,0x47,0x51,0xdf}, 8333}, + {{0xfd,0x87,0xd8,0x7e,0xeb,0x43,0xb9,0xb0,0xa6,0x00,0x1a,0x4a,0x41,0x8f,0x88,0xb4}, 8333}, + {{0xfd,0x87,0xd8,0x7e,0xeb,0x43,0xbb,0x57,0x4d,0xce,0xa0,0x53,0x4d,0x8f,0xcd,0x4f}, 8333}, + {{0xfd,0x87,0xd8,0x7e,0xeb,0x43,0xbc,0x9b,0xd4,0x08,0x44,0xe7,0x4d,0x2d,0xc3,0x1f}, 8333}, + {{0xfd,0x87,0xd8,0x7e,0xeb,0x43,0xc0,0xdc,0xd7,0x19,0x2f,0x48,0xf6,0xc2,0x73,0xb5}, 8333}, + {{0xfd,0x87,0xd8,0x7e,0xeb,0x43,0xc2,0x9b,0xfa,0xb8,0xbb,0xf8,0x41,0x5b,0x92,0x63}, 8333}, + {{0xfd,0x87,0xd8,0x7e,0xeb,0x43,0xc2,0xfb,0xae,0x8e,0xc7,0xac,0x11,0x2f,0xc7,0x02}, 8333}, + {{0xfd,0x87,0xd8,0x7e,0xeb,0x43,0xc4,0x42,0x01,0x09,0xe1,0xc1,0x89,0xeb,0x80,0x20}, 8333}, {{0xfd,0x87,0xd8,0x7e,0xeb,0x43,0xc6,0x29,0x70,0x15,0x68,0xf9,0x60,0x34,0x64,0xf0}, 8333}, - {{0xfd,0x87,0xd8,0x7e,0xeb,0x43,0xca,0x09,0x6f,0xc9,0x91,0xd0,0xd7,0xa3,0x9b,0x50}, 8333}, - {{0xfd,0x87,0xd8,0x7e,0xeb,0x43,0xcc,0xa1,0xd8,0x38,0xd3,0x74,0x8f,0x95,0x40,0x03}, 8333} + {{0xfd,0x87,0xd8,0x7e,0xeb,0x43,0xce,0xf6,0xda,0x2a,0x7f,0x69,0x90,0xad,0x89,0xe4}, 8333}, + {{0xfd,0x87,0xd8,0x7e,0xeb,0x43,0xcb,0x9b,0xa0,0x84,0x5a,0x86,0x90,0x78,0x4f,0x82}, 8333}, + {{0xfd,0x87,0xd8,0x7e,0xeb,0x43,0xcc,0x13,0x59,0xde,0x4a,0xbb,0x9b,0x4e,0x2b,0x35}, 8333} }; static SeedSpec6 pnSeed6_test[] = { diff --git a/src/checkpoints.cpp b/src/checkpoints.cpp index 816d854db3..ad5edfeb39 100644 --- a/src/checkpoints.cpp +++ b/src/checkpoints.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2009-2017 The Bitcoin Core developers +// Copyright (c) 2009-2018 The Bitcoin Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/checkpoints.h b/src/checkpoints.h index 564b486393..a25e97e469 100644 --- a/src/checkpoints.h +++ b/src/checkpoints.h @@ -1,4 +1,4 @@ -// Copyright (c) 2009-2017 The Bitcoin Core developers +// Copyright (c) 2009-2018 The Bitcoin Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/checkqueue.h b/src/checkqueue.h index 84360d0716..978e23a7c4 100644 --- a/src/checkqueue.h +++ b/src/checkqueue.h @@ -1,4 +1,4 @@ -// Copyright (c) 2012-2017 The Bitcoin Core developers +// Copyright (c) 2012-2018 The Bitcoin Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/clientversion.cpp b/src/clientversion.cpp index a3eb127ca8..5d9eaea6d0 100644 --- a/src/clientversion.cpp +++ b/src/clientversion.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2012-2017 The Bitcoin Core developers +// Copyright (c) 2012-2018 The Bitcoin Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/clientversion.h b/src/clientversion.h index d7321fad86..363094b696 100644 --- a/src/clientversion.h +++ b/src/clientversion.h @@ -1,4 +1,4 @@ -// Copyright (c) 2009-2017 The Bitcoin Core developers +// Copyright (c) 2009-2018 The Bitcoin Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/coins.cpp b/src/coins.cpp index 8dfb35c2eb..da1036acfb 100644 --- a/src/coins.cpp +++ b/src/coins.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2012-2017 The Bitcoin Core developers +// Copyright (c) 2012-2018 The Bitcoin Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/coins.h b/src/coins.h index 89685ce4b2..41a422f485 100644 --- a/src/coins.h +++ b/src/coins.h @@ -1,5 +1,5 @@ // Copyright (c) 2009-2010 Satoshi Nakamoto -// Copyright (c) 2009-2017 The Bitcoin Core developers +// Copyright (c) 2009-2018 The Bitcoin Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/compat.h b/src/compat.h index 920b3f776d..19f9813fd4 100644 --- a/src/compat.h +++ b/src/compat.h @@ -1,5 +1,5 @@ // Copyright (c) 2009-2010 Satoshi Nakamoto -// Copyright (c) 2009-2017 The Bitcoin Core developers +// Copyright (c) 2009-2018 The Bitcoin Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/compat/byteswap.h b/src/compat/byteswap.h index bfb80bd632..fe47f4899f 100644 --- a/src/compat/byteswap.h +++ b/src/compat/byteswap.h @@ -1,4 +1,4 @@ -// Copyright (c) 2014-2017 The Bitcoin Core developers +// Copyright (c) 2014-2018 The Bitcoin Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/compat/endian.h b/src/compat/endian.h index 4f244c3930..c5cf7a46cc 100644 --- a/src/compat/endian.h +++ b/src/compat/endian.h @@ -1,4 +1,4 @@ -// Copyright (c) 2014-2017 The Bitcoin Core developers +// Copyright (c) 2014-2018 The Bitcoin Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/compat/glibc_compat.cpp b/src/compat/glibc_compat.cpp index b1cbe9f72a..4de4fd7f45 100644 --- a/src/compat/glibc_compat.cpp +++ b/src/compat/glibc_compat.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2009-2017 The Bitcoin Core developers +// Copyright (c) 2009-2018 The Bitcoin Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. @@ -67,6 +67,8 @@ __asm(".symver log2f_old,log2f@GLIBC_2.2.5"); __asm(".symver log2f_old,log2f@GLIBC_2.4"); #elif defined(__aarch64__) __asm(".symver log2f_old,log2f@GLIBC_2.17"); +#elif defined(__riscv) +__asm(".symver log2f_old,log2f@GLIBC_2.27"); #endif extern "C" float __wrap_log2f(float x) { diff --git a/src/compat/glibc_sanity.cpp b/src/compat/glibc_sanity.cpp index 1c22dc073c..1ef66e27b4 100644 --- a/src/compat/glibc_sanity.cpp +++ b/src/compat/glibc_sanity.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2009-2017 The Bitcoin Core developers +// Copyright (c) 2009-2018 The Bitcoin Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/compat/glibcxx_sanity.cpp b/src/compat/glibcxx_sanity.cpp index 257665a061..e6e6208e40 100644 --- a/src/compat/glibcxx_sanity.cpp +++ b/src/compat/glibcxx_sanity.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2009-2017 The Bitcoin Core developers +// Copyright (c) 2009-2018 The Bitcoin Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/compat/strnlen.cpp b/src/compat/strnlen.cpp index f7344d39f5..93a034a664 100644 --- a/src/compat/strnlen.cpp +++ b/src/compat/strnlen.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2009-2017 The Bitcoin Core developers +// Copyright (c) 2009-2018 The Bitcoin Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/compressor.cpp b/src/compressor.cpp index da639a01af..a2d9af8805 100644 --- a/src/compressor.cpp +++ b/src/compressor.cpp @@ -1,5 +1,5 @@ // Copyright (c) 2009-2010 Satoshi Nakamoto -// Copyright (c) 2009-2017 The Bitcoin Core developers +// Copyright (c) 2009-2018 The Bitcoin Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/compressor.h b/src/compressor.h index 6bd68529d4..c1eda503c8 100644 --- a/src/compressor.h +++ b/src/compressor.h @@ -1,5 +1,5 @@ // Copyright (c) 2009-2010 Satoshi Nakamoto -// Copyright (c) 2009-2017 The Bitcoin Core developers +// Copyright (c) 2009-2018 The Bitcoin Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/consensus/consensus.h b/src/consensus/consensus.h index 650635a766..788fa4e55b 100644 --- a/src/consensus/consensus.h +++ b/src/consensus/consensus.h @@ -1,5 +1,5 @@ // Copyright (c) 2009-2010 Satoshi Nakamoto -// Copyright (c) 2009-2017 The Bitcoin Core developers +// Copyright (c) 2009-2018 The Bitcoin Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/consensus/merkle.cpp b/src/consensus/merkle.cpp index 07cd109cc1..2a87a936b1 100644 --- a/src/consensus/merkle.cpp +++ b/src/consensus/merkle.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2015-2017 The Bitcoin Core developers +// Copyright (c) 2015-2018 The Bitcoin Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/consensus/merkle.h b/src/consensus/merkle.h index 01d75b1329..7675877de5 100644 --- a/src/consensus/merkle.h +++ b/src/consensus/merkle.h @@ -1,4 +1,4 @@ -// Copyright (c) 2015-2017 The Bitcoin Core developers +// Copyright (c) 2015-2018 The Bitcoin Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/consensus/params.h b/src/consensus/params.h index 0559304fc2..6c3a201f4f 100644 --- a/src/consensus/params.h +++ b/src/consensus/params.h @@ -1,5 +1,5 @@ // Copyright (c) 2009-2010 Satoshi Nakamoto -// Copyright (c) 2009-2017 The Bitcoin Core developers +// Copyright (c) 2009-2018 The Bitcoin Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/consensus/tx_verify.h b/src/consensus/tx_verify.h index 50db1775a3..0519cef8c0 100644 --- a/src/consensus/tx_verify.h +++ b/src/consensus/tx_verify.h @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2017 The Bitcoin Core developers +// Copyright (c) 2017-2018 The Bitcoin Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/consensus/validation.h b/src/consensus/validation.h index 28d3c4a119..008eda69b2 100644 --- a/src/consensus/validation.h +++ b/src/consensus/validation.h @@ -1,5 +1,5 @@ // Copyright (c) 2009-2010 Satoshi Nakamoto -// Copyright (c) 2009-2017 The Bitcoin Core developers +// Copyright (c) 2009-2018 The Bitcoin Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/core_io.h b/src/core_io.h index ebddcc2a04..d53a45c0cb 100644 --- a/src/core_io.h +++ b/src/core_io.h @@ -1,4 +1,4 @@ -// Copyright (c) 2009-2017 The Bitcoin Core developers +// Copyright (c) 2009-2018 The Bitcoin Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. @@ -11,6 +11,7 @@ #include <vector> class CBlock; +class CBlockHeader; class CScript; class CTransaction; struct CMutableTransaction; @@ -23,6 +24,7 @@ CScript ParseScript(const std::string& s); std::string ScriptToAsmStr(const CScript& script, const bool fAttemptSighashDecode = false); bool DecodeHexTx(CMutableTransaction& tx, const std::string& hex_tx, bool try_no_witness = false, bool try_witness = true); bool DecodeHexBlk(CBlock&, const std::string& strHexBlk); +bool DecodeHexBlockHeader(CBlockHeader&, const std::string& hex_header); uint256 ParseHashStr(const std::string&, const std::string& strName); std::vector<unsigned char> ParseHexUV(const UniValue& v, const std::string& strName); bool DecodePSBT(PartiallySignedTransaction& psbt, const std::string& base64_tx, std::string& error); diff --git a/src/core_memusage.h b/src/core_memusage.h index 6c03938d0c..6f1ace9980 100644 --- a/src/core_memusage.h +++ b/src/core_memusage.h @@ -1,4 +1,4 @@ -// Copyright (c) 2015-2017 The Bitcoin Core developers +// Copyright (c) 2015-2018 The Bitcoin Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/core_read.cpp b/src/core_read.cpp index 4337c38282..b02016c014 100644 --- a/src/core_read.cpp +++ b/src/core_read.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2009-2017 The Bitcoin Core developers +// Copyright (c) 2009-2018 The Bitcoin Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. @@ -145,6 +145,20 @@ bool DecodeHexTx(CMutableTransaction& tx, const std::string& hex_tx, bool try_no return false; } +bool DecodeHexBlockHeader(CBlockHeader& header, const std::string& hex_header) +{ + if (!IsHex(hex_header)) return false; + + const std::vector<unsigned char> header_data{ParseHex(hex_header)}; + CDataStream ser_header(header_data, SER_NETWORK, PROTOCOL_VERSION); + try { + ser_header >> header; + } catch (const std::exception&) { + return false; + } + return true; +} + bool DecodeHexBlk(CBlock& block, const std::string& strHexBlk) { if (!IsHex(strHexBlk)) diff --git a/src/core_write.cpp b/src/core_write.cpp index 1272266235..6331a3d880 100644 --- a/src/core_write.cpp +++ b/src/core_write.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2009-2017 The Bitcoin Core developers +// Copyright (c) 2009-2018 The Bitcoin Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/crypto/aes.cpp b/src/crypto/aes.cpp index bf7a252349..919ea593b7 100644 --- a/src/crypto/aes.cpp +++ b/src/crypto/aes.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2016-2017 The Bitcoin Core developers +// Copyright (c) 2016-2018 The Bitcoin Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/crypto/aes.h b/src/crypto/aes.h index 2dec8d9558..fdad70c593 100644 --- a/src/crypto/aes.h +++ b/src/crypto/aes.h @@ -1,4 +1,4 @@ -// Copyright (c) 2015-2017 The Bitcoin Core developers +// Copyright (c) 2015-2018 The Bitcoin Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. // diff --git a/src/crypto/common.h b/src/crypto/common.h index 6e9d6dc82a..e7bb020a19 100644 --- a/src/crypto/common.h +++ b/src/crypto/common.h @@ -1,4 +1,4 @@ -// Copyright (c) 2014-2017 The Bitcoin Core developers +// Copyright (c) 2014-2018 The Bitcoin Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/crypto/hmac_sha256.cpp b/src/crypto/hmac_sha256.cpp index d4afe1439f..0ba99ae274 100644 --- a/src/crypto/hmac_sha256.cpp +++ b/src/crypto/hmac_sha256.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2014-2017 The Bitcoin Core developers +// Copyright (c) 2014-2018 The Bitcoin Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/crypto/hmac_sha256.h b/src/crypto/hmac_sha256.h index 4fb30b7ac0..d31fda1dd1 100644 --- a/src/crypto/hmac_sha256.h +++ b/src/crypto/hmac_sha256.h @@ -1,4 +1,4 @@ -// Copyright (c) 2014-2017 The Bitcoin Core developers +// Copyright (c) 2014-2018 The Bitcoin Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/crypto/hmac_sha512.cpp b/src/crypto/hmac_sha512.cpp index d9c4d04100..d70aee843b 100644 --- a/src/crypto/hmac_sha512.cpp +++ b/src/crypto/hmac_sha512.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2014-2017 The Bitcoin Core developers +// Copyright (c) 2014-2018 The Bitcoin Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/crypto/hmac_sha512.h b/src/crypto/hmac_sha512.h index ab84ee7652..1ea9a3671e 100644 --- a/src/crypto/hmac_sha512.h +++ b/src/crypto/hmac_sha512.h @@ -1,4 +1,4 @@ -// Copyright (c) 2014-2017 The Bitcoin Core developers +// Copyright (c) 2014-2018 The Bitcoin Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/crypto/ripemd160.cpp b/src/crypto/ripemd160.cpp index 51468ec8d0..a00331dcb7 100644 --- a/src/crypto/ripemd160.cpp +++ b/src/crypto/ripemd160.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2014-2017 The Bitcoin Core developers +// Copyright (c) 2014-2018 The Bitcoin Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/crypto/sha1.cpp b/src/crypto/sha1.cpp index dc96ac507a..5c601c54a6 100644 --- a/src/crypto/sha1.cpp +++ b/src/crypto/sha1.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2014-2017 The Bitcoin Core developers +// Copyright (c) 2014-2018 The Bitcoin Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/crypto/sha256.cpp b/src/crypto/sha256.cpp index fbdbef0bc6..cab37e0322 100644 --- a/src/crypto/sha256.cpp +++ b/src/crypto/sha256.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2014-2017 The Bitcoin Core developers +// Copyright (c) 2014-2018 The Bitcoin Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/crypto/sha256.h b/src/crypto/sha256.h index 31b2b3b3df..028ee14345 100644 --- a/src/crypto/sha256.h +++ b/src/crypto/sha256.h @@ -1,4 +1,4 @@ -// Copyright (c) 2014-2017 The Bitcoin Core developers +// Copyright (c) 2014-2018 The Bitcoin Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/crypto/sha512.cpp b/src/crypto/sha512.cpp index dff4d8da1a..bc64135cae 100644 --- a/src/crypto/sha512.cpp +++ b/src/crypto/sha512.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2014-2017 The Bitcoin Core developers +// Copyright (c) 2014-2018 The Bitcoin Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/dbwrapper.cpp b/src/dbwrapper.cpp index e401b5fb1b..f5fb715800 100644 --- a/src/dbwrapper.cpp +++ b/src/dbwrapper.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2012-2017 The Bitcoin Core developers +// Copyright (c) 2012-2018 The Bitcoin Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/dbwrapper.h b/src/dbwrapper.h index 2a5e0cab00..52f9efe17c 100644 --- a/src/dbwrapper.h +++ b/src/dbwrapper.h @@ -1,4 +1,4 @@ -// Copyright (c) 2012-2017 The Bitcoin Core developers +// Copyright (c) 2012-2018 The Bitcoin Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/hash.cpp b/src/hash.cpp index d31e094540..c049eea716 100644 --- a/src/hash.cpp +++ b/src/hash.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2013-2017 The Bitcoin Core developers +// Copyright (c) 2013-2018 The Bitcoin Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/hash.h b/src/hash.h index 75353e0c0f..3534a400b3 100644 --- a/src/hash.h +++ b/src/hash.h @@ -1,5 +1,5 @@ // Copyright (c) 2009-2010 Satoshi Nakamoto -// Copyright (c) 2009-2017 The Bitcoin Core developers +// Copyright (c) 2009-2018 The Bitcoin Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/httprpc.cpp b/src/httprpc.cpp index 0e5b497960..38f6e79643 100644 --- a/src/httprpc.cpp +++ b/src/httprpc.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2015-2017 The Bitcoin Core developers +// Copyright (c) 2015-2018 The Bitcoin Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. @@ -244,8 +244,9 @@ bool StartHTTPRPC() // ifdef can be removed once we switch to better endpoint support and API versioning RegisterHTTPHandler("/wallet/", false, HTTPReq_JSONRPC); #endif - assert(EventBase()); - httpRPCTimerInterface = MakeUnique<HTTPRPCTimerInterface>(EventBase()); + struct event_base* eventBase = EventBase(); + assert(eventBase); + httpRPCTimerInterface = MakeUnique<HTTPRPCTimerInterface>(eventBase); RPCSetTimerInterface(httpRPCTimerInterface.get()); return true; } diff --git a/src/httprpc.h b/src/httprpc.h index ccae29b45d..2230a8ca4e 100644 --- a/src/httprpc.h +++ b/src/httprpc.h @@ -1,4 +1,4 @@ -// Copyright (c) 2015-2017 The Bitcoin Core developers +// Copyright (c) 2015-2018 The Bitcoin Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. @@ -23,7 +23,7 @@ void StopHTTPRPC(); /** Start HTTP REST subsystem. * Precondition; HTTP and RPC has been started. */ -bool StartREST(); +void StartREST(); /** Interrupt RPC REST subsystem. */ void InterruptREST(); diff --git a/src/httpserver.cpp b/src/httpserver.cpp index 9daf3d1968..8962fe6a42 100644 --- a/src/httpserver.cpp +++ b/src/httpserver.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2015-2017 The Bitcoin Core developers +// Copyright (c) 2015-2018 The Bitcoin Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/httpserver.h b/src/httpserver.h index 8a3adaf91f..fa7cc4a5d3 100644 --- a/src/httpserver.h +++ b/src/httpserver.h @@ -1,4 +1,4 @@ -// Copyright (c) 2015-2017 The Bitcoin Core developers +// Copyright (c) 2015-2018 The Bitcoin Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/init.cpp b/src/init.cpp index 18402ef5d7..2131a6adc0 100644 --- a/src/init.cpp +++ b/src/init.cpp @@ -209,11 +209,7 @@ void Shutdown() // using the other before destroying them. if (peerLogic) UnregisterValidationInterface(peerLogic.get()); if (g_connman) g_connman->Stop(); - peerLogic.reset(); - g_connman.reset(); - if (g_txindex) { - g_txindex.reset(); - } + if (g_txindex) g_txindex->Stop(); StopTorControl(); @@ -222,6 +218,12 @@ void Shutdown() threadGroup.interrupt_all(); threadGroup.join_all(); + // After the threads that potentially access these pointers have been stopped, + // destruct and reset all to nullptr. + peerLogic.reset(); + g_connman.reset(); + g_txindex.reset(); + if (g_is_mempool_loaded && gArgs.GetArg("-persistmempool", DEFAULT_PERSIST_MEMPOOL)) { DumpMempool(); } @@ -326,12 +328,12 @@ static void registerSignalHandler(int signal, void(*handler)(int)) static void OnRPCStarted() { - uiInterface.NotifyBlockTip.connect(&RPCNotifyBlockChange); + uiInterface.NotifyBlockTip_connect(&RPCNotifyBlockChange); } static void OnRPCStopped() { - uiInterface.NotifyBlockTip.disconnect(&RPCNotifyBlockChange); + uiInterface.NotifyBlockTip_disconnect(&RPCNotifyBlockChange); RPCNotifyBlockChange(false, nullptr); g_best_block_cv.notify_all(); LogPrint(BCLog::RPC, "RPC stopped.\n"); @@ -382,7 +384,7 @@ void SetupServerArgs() #endif gArgs.AddArg("-prune=<n>", strprintf("Reduce storage requirements by enabling pruning (deleting) of old blocks. This allows the pruneblockchain RPC to be called to delete specific blocks, and enables automatic pruning of old blocks if a target size in MiB is provided. This mode is incompatible with -txindex and -rescan. " "Warning: Reverting this setting requires re-downloading the entire blockchain. " - "(default: 0 = disable pruning blocks, 1 = allow manual pruning via RPC, >%u = automatically prune block files to stay under the specified target size in MiB)", MIN_DISK_SPACE_FOR_BLOCK_FILES / 1024 / 1024), false, OptionsCategory::OPTIONS); + "(default: 0 = disable pruning blocks, 1 = allow manual pruning via RPC, >=%u = automatically prune block files to stay under the specified target size in MiB)", MIN_DISK_SPACE_FOR_BLOCK_FILES / 1024 / 1024), false, OptionsCategory::OPTIONS); gArgs.AddArg("-reindex", "Rebuild chain state and block index from the blk*.dat files on disk", false, OptionsCategory::OPTIONS); gArgs.AddArg("-reindex-chainstate", "Rebuild chain state from the currently indexed blocks", false, OptionsCategory::OPTIONS); #ifndef WIN32 @@ -734,8 +736,7 @@ static bool AppInitServers() StartRPC(); if (!StartHTTPRPC()) return false; - if (gArgs.GetBoolArg("-rest", DEFAULT_REST_ENABLE) && !StartREST()) - return false; + if (gArgs.GetBoolArg("-rest", DEFAULT_REST_ENABLE)) StartREST(); StartHTTPServer(); return true; } @@ -1286,7 +1287,7 @@ bool AppInitMain() */ if (gArgs.GetBoolArg("-server", false)) { - uiInterface.InitMessage.connect(SetRPCWarmupStatus); + uiInterface.InitMessage_connect(SetRPCWarmupStatus); if (!AppInitServers()) return InitError(_("Unable to start HTTP server. See debug log for details.")); } @@ -1643,13 +1644,13 @@ bool AppInitMain() // Either install a handler to notify us when genesis activates, or set fHaveGenesis directly. // No locking, as this happens before any background thread is started. if (chainActive.Tip() == nullptr) { - uiInterface.NotifyBlockTip.connect(BlockNotifyGenesisWait); + uiInterface.NotifyBlockTip_connect(BlockNotifyGenesisWait); } else { fHaveGenesis = true; } if (gArgs.IsArgSet("-blocknotify")) - uiInterface.NotifyBlockTip.connect(BlockNotifyCallback); + uiInterface.NotifyBlockTip_connect(BlockNotifyCallback); std::vector<fs::path> vImportFiles; for (const std::string& strFile : gArgs.GetArgs("-loadblock")) { @@ -1667,7 +1668,7 @@ bool AppInitMain() while (!fHaveGenesis && !ShutdownRequested()) { condvar_GenesisWait.wait_for(lock, std::chrono::milliseconds(500)); } - uiInterface.NotifyBlockTip.disconnect(BlockNotifyGenesisWait); + uiInterface.NotifyBlockTip_disconnect(BlockNotifyGenesisWait); } if (ShutdownRequested()) { diff --git a/src/interfaces/node.cpp b/src/interfaces/node.cpp index 106dd38f60..1da58fe487 100644 --- a/src/interfaces/node.cpp +++ b/src/interfaces/node.cpp @@ -233,44 +233,44 @@ class NodeImpl : public Node } std::unique_ptr<Handler> handleInitMessage(InitMessageFn fn) override { - return MakeHandler(::uiInterface.InitMessage.connect(fn)); + return MakeHandler(::uiInterface.InitMessage_connect(fn)); } std::unique_ptr<Handler> handleMessageBox(MessageBoxFn fn) override { - return MakeHandler(::uiInterface.ThreadSafeMessageBox.connect(fn)); + return MakeHandler(::uiInterface.ThreadSafeMessageBox_connect(fn)); } std::unique_ptr<Handler> handleQuestion(QuestionFn fn) override { - return MakeHandler(::uiInterface.ThreadSafeQuestion.connect(fn)); + return MakeHandler(::uiInterface.ThreadSafeQuestion_connect(fn)); } std::unique_ptr<Handler> handleShowProgress(ShowProgressFn fn) override { - return MakeHandler(::uiInterface.ShowProgress.connect(fn)); + return MakeHandler(::uiInterface.ShowProgress_connect(fn)); } std::unique_ptr<Handler> handleLoadWallet(LoadWalletFn fn) override { CHECK_WALLET( - return MakeHandler(::uiInterface.LoadWallet.connect([fn](std::shared_ptr<CWallet> wallet) { fn(MakeWallet(wallet)); }))); + return MakeHandler(::uiInterface.LoadWallet_connect([fn](std::shared_ptr<CWallet> wallet) { fn(MakeWallet(wallet)); }))); } std::unique_ptr<Handler> handleNotifyNumConnectionsChanged(NotifyNumConnectionsChangedFn fn) override { - return MakeHandler(::uiInterface.NotifyNumConnectionsChanged.connect(fn)); + return MakeHandler(::uiInterface.NotifyNumConnectionsChanged_connect(fn)); } std::unique_ptr<Handler> handleNotifyNetworkActiveChanged(NotifyNetworkActiveChangedFn fn) override { - return MakeHandler(::uiInterface.NotifyNetworkActiveChanged.connect(fn)); + return MakeHandler(::uiInterface.NotifyNetworkActiveChanged_connect(fn)); } std::unique_ptr<Handler> handleNotifyAlertChanged(NotifyAlertChangedFn fn) override { - return MakeHandler(::uiInterface.NotifyAlertChanged.connect(fn)); + return MakeHandler(::uiInterface.NotifyAlertChanged_connect(fn)); } std::unique_ptr<Handler> handleBannedListChanged(BannedListChangedFn fn) override { - return MakeHandler(::uiInterface.BannedListChanged.connect(fn)); + return MakeHandler(::uiInterface.BannedListChanged_connect(fn)); } std::unique_ptr<Handler> handleNotifyBlockTip(NotifyBlockTipFn fn) override { - return MakeHandler(::uiInterface.NotifyBlockTip.connect([fn](bool initial_download, const CBlockIndex* block) { + return MakeHandler(::uiInterface.NotifyBlockTip_connect([fn](bool initial_download, const CBlockIndex* block) { fn(initial_download, block->nHeight, block->GetBlockTime(), GuessVerificationProgress(Params().TxData(), block)); })); @@ -278,7 +278,7 @@ class NodeImpl : public Node std::unique_ptr<Handler> handleNotifyHeaderTip(NotifyHeaderTipFn fn) override { return MakeHandler( - ::uiInterface.NotifyHeaderTip.connect([fn](bool initial_download, const CBlockIndex* block) { + ::uiInterface.NotifyHeaderTip_connect([fn](bool initial_download, const CBlockIndex* block) { fn(initial_download, block->nHeight, block->GetBlockTime(), GuessVerificationProgress(Params().TxData(), block)); })); diff --git a/src/key.cpp b/src/key.cpp index 94be179bfb..df452cd330 100644 --- a/src/key.cpp +++ b/src/key.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2009-2017 The Bitcoin Core developers +// Copyright (c) 2009-2018 The Bitcoin Core developers // Copyright (c) 2017 The Zcash developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. @@ -189,7 +189,20 @@ CPubKey CKey::GetPubKey() const { return result; } -bool CKey::Sign(const uint256 &hash, std::vector<unsigned char>& vchSig, uint32_t test_case) const { +// Check that the sig has a low R value and will be less than 71 bytes +bool SigHasLowR(const secp256k1_ecdsa_signature* sig) +{ + unsigned char compact_sig[64]; + secp256k1_ecdsa_signature_serialize_compact(secp256k1_context_sign, compact_sig, sig); + + // In DER serialization, all values are interpreted as big-endian, signed integers. The highest bit in the integer indicates + // its signed-ness; 0 is positive, 1 is negative. When the value is interpreted as a negative integer, it must be converted + // to a positive value by prepending a 0x00 byte so that the highest bit is 0. We can avoid this prepending by ensuring that + // our highest bit is always 0, and thus we must check that the first byte is less than 0x80. + return compact_sig[0] < 0x80; +} + +bool CKey::Sign(const uint256 &hash, std::vector<unsigned char>& vchSig, bool grind, uint32_t test_case) const { if (!fValid) return false; vchSig.resize(CPubKey::SIGNATURE_SIZE); @@ -197,7 +210,14 @@ bool CKey::Sign(const uint256 &hash, std::vector<unsigned char>& vchSig, uint32_ unsigned char extra_entropy[32] = {0}; WriteLE32(extra_entropy, test_case); secp256k1_ecdsa_signature sig; - int ret = secp256k1_ecdsa_sign(secp256k1_context_sign, &sig, hash.begin(), begin(), secp256k1_nonce_function_rfc6979, test_case ? extra_entropy : nullptr); + uint32_t counter = 0; + int ret = secp256k1_ecdsa_sign(secp256k1_context_sign, &sig, hash.begin(), begin(), secp256k1_nonce_function_rfc6979, (!grind && test_case) ? extra_entropy : nullptr); + + // Grind for low R + while (ret && !SigHasLowR(&sig) && grind) { + WriteLE32(extra_entropy, ++counter); + ret = secp256k1_ecdsa_sign(secp256k1_context_sign, &sig, hash.begin(), begin(), secp256k1_nonce_function_rfc6979, extra_entropy); + } assert(ret); secp256k1_ecdsa_signature_serialize_der(secp256k1_context_sign, vchSig.data(), &nSigLen, &sig); vchSig.resize(nSigLen); @@ -1,5 +1,5 @@ // Copyright (c) 2009-2010 Satoshi Nakamoto -// Copyright (c) 2009-2017 The Bitcoin Core developers +// Copyright (c) 2009-2018 The Bitcoin Core developers // Copyright (c) 2017 The Zcash developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. @@ -114,7 +114,7 @@ public: * Create a DER-serialized signature. * The test_case parameter tweaks the deterministic nonce. */ - bool Sign(const uint256& hash, std::vector<unsigned char>& vchSig, uint32_t test_case = 0) const; + bool Sign(const uint256& hash, std::vector<unsigned char>& vchSig, bool grind = true, uint32_t test_case = 0) const; /** * Create a compact signature (65 bytes), which allows reconstructing the used public key. diff --git a/src/key_io.cpp b/src/key_io.cpp index c2dc511989..5c5e2dc031 100644 --- a/src/key_io.cpp +++ b/src/key_io.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2014-2016 The Bitcoin Core developers +// Copyright (c) 2014-2017 The Bitcoin Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/key_io.h b/src/key_io.h index d75b5b31c8..d80c08f49c 100644 --- a/src/key_io.h +++ b/src/key_io.h @@ -1,5 +1,5 @@ // Copyright (c) 2009-2010 Satoshi Nakamoto -// Copyright (c) 2009-2015 The Bitcoin Core developers +// Copyright (c) 2009-2018 The Bitcoin Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/keystore.cpp b/src/keystore.cpp index ea93ed69fa..b2012a04bb 100644 --- a/src/keystore.cpp +++ b/src/keystore.cpp @@ -1,5 +1,5 @@ // Copyright (c) 2009-2010 Satoshi Nakamoto -// Copyright (c) 2009-2017 The Bitcoin Core developers +// Copyright (c) 2009-2018 The Bitcoin Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/keystore.h b/src/keystore.h index f64024c7e7..4bd99e255d 100644 --- a/src/keystore.h +++ b/src/keystore.h @@ -1,5 +1,5 @@ // Copyright (c) 2009-2010 Satoshi Nakamoto -// Copyright (c) 2009-2017 The Bitcoin Core developers +// Copyright (c) 2009-2018 The Bitcoin Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/leveldb/util/env_posix.cc b/src/leveldb/util/env_posix.cc index 4676bc2240..f77918313e 100644 --- a/src/leveldb/util/env_posix.cc +++ b/src/leveldb/util/env_posix.cc @@ -585,8 +585,8 @@ static int MaxMmaps() { if (mmap_limit >= 0) { return mmap_limit; } - // Up to 1000 mmaps for 64-bit binaries; none for smaller pointer sizes. - mmap_limit = sizeof(void*) >= 8 ? 1000 : 0; + // Up to 4096 mmaps for 64-bit binaries; none for smaller pointer sizes. + mmap_limit = sizeof(void*) >= 8 ? 4096 : 0; return mmap_limit; } diff --git a/src/limitedmap.h b/src/limitedmap.h index 22dde5ec36..7d66964e36 100644 --- a/src/limitedmap.h +++ b/src/limitedmap.h @@ -1,4 +1,4 @@ -// Copyright (c) 2012-2017 The Bitcoin Core developers +// Copyright (c) 2012-2018 The Bitcoin Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/logging.cpp b/src/logging.cpp index e8e22cbf97..6557dddffb 100644 --- a/src/logging.cpp +++ b/src/logging.cpp @@ -245,7 +245,7 @@ void BCLog::Logger::ShrinkDebugFile() size_t log_size = 0; try { log_size = fs::file_size(m_file_path); - } catch (boost::filesystem::filesystem_error &) {} + } catch (const fs::filesystem_error&) {} // If debug.log file is more than 10% bigger the RECENT_DEBUG_HISTORY_SIZE // trim it down by saving only the last RECENT_DEBUG_HISTORY_SIZE bytes diff --git a/src/memusage.h b/src/memusage.h index 0b92e53b48..3ae9face15 100644 --- a/src/memusage.h +++ b/src/memusage.h @@ -1,4 +1,4 @@ -// Copyright (c) 2015-2017 The Bitcoin Core developers +// Copyright (c) 2015-2018 The Bitcoin Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/merkleblock.cpp b/src/merkleblock.cpp index de3519c1da..7bbc45d38a 100644 --- a/src/merkleblock.cpp +++ b/src/merkleblock.cpp @@ -1,5 +1,5 @@ // Copyright (c) 2009-2010 Satoshi Nakamoto -// Copyright (c) 2009-2017 The Bitcoin Core developers +// Copyright (c) 2009-2018 The Bitcoin Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/merkleblock.h b/src/merkleblock.h index 984e33a961..e641c8aa94 100644 --- a/src/merkleblock.h +++ b/src/merkleblock.h @@ -1,5 +1,5 @@ // Copyright (c) 2009-2010 Satoshi Nakamoto -// Copyright (c) 2009-2017 The Bitcoin Core developers +// Copyright (c) 2009-2018 The Bitcoin Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/miner.cpp b/src/miner.cpp index c32dc26f86..6d35f9ac37 100644 --- a/src/miner.cpp +++ b/src/miner.cpp @@ -1,5 +1,5 @@ // Copyright (c) 2009-2010 Satoshi Nakamoto -// Copyright (c) 2009-2017 The Bitcoin Core developers +// Copyright (c) 2009-2018 The Bitcoin Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. @@ -133,8 +133,11 @@ std::unique_ptr<CBlockTemplate> BlockAssembler::CreateNewBlock(const CScript& sc // Decide whether to include witness transactions // This is only needed in case the witness softfork activation is reverted - // (which would require a very deep reorganization) or when - // -promiscuousmempoolflags is used. + // (which would require a very deep reorganization). + // Note that the mempool would accept transactions with witness data before + // IsWitnessEnabled, but we would only ever mine blocks after IsWitnessEnabled + // unless there is a massive block reorganization with the witness softfork + // not activated. // TODO: replace this with a call to main to assess validity of a mempool // transaction (which in most cases can be a no-op). fIncludeWitness = IsWitnessEnabled(pindexPrev, chainparams.GetConsensus()) && fMineWitnessTx; diff --git a/src/miner.h b/src/miner.h index ed1b4434f9..8cdcf7133b 100644 --- a/src/miner.h +++ b/src/miner.h @@ -1,5 +1,5 @@ // Copyright (c) 2009-2010 Satoshi Nakamoto -// Copyright (c) 2009-2017 The Bitcoin Core developers +// Copyright (c) 2009-2018 The Bitcoin Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/net.cpp b/src/net.cpp index 0ebfefa757..ec4fa6c267 100644 --- a/src/net.cpp +++ b/src/net.cpp @@ -1,5 +1,5 @@ // Copyright (c) 2009-2010 Satoshi Nakamoto -// Copyright (c) 2009-2017 The Bitcoin Core developers +// Copyright (c) 2009-2018 The Bitcoin Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. @@ -1798,7 +1798,6 @@ void CConnman::ThreadOpenConnections(const std::vector<std::string> connect) CAddress addrConnect; // Only connect out to one peer per network group (/16 for IPv4). - // Do this here so we don't have to critsect vNodes inside mapAddresses critsect. int nOutbound = 0; std::set<std::vector<unsigned char> > setConnected; { @@ -1,5 +1,5 @@ // Copyright (c) 2009-2010 Satoshi Nakamoto -// Copyright (c) 2009-2017 The Bitcoin Core developers +// Copyright (c) 2009-2018 The Bitcoin Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. @@ -45,6 +45,8 @@ static const int TIMEOUT_INTERVAL = 20 * 60; static const int FEELER_INTERVAL = 120; /** The maximum number of entries in an 'inv' protocol message */ static const unsigned int MAX_INV_SZ = 50000; +/** The maximum number of entries in a locator */ +static const unsigned int MAX_LOCATOR_SZ = 101; /** The maximum number of new addresses to accumulate before announcing. */ static const unsigned int MAX_ADDR_TO_SEND = 1000; /** Maximum length of incoming protocol messages (no message over 4 MB is currently acceptable). */ diff --git a/src/net_processing.cpp b/src/net_processing.cpp index d5d664b27e..88999ba735 100644 --- a/src/net_processing.cpp +++ b/src/net_processing.cpp @@ -1,5 +1,5 @@ // Copyright (c) 2009-2010 Satoshi Nakamoto -// Copyright (c) 2009-2017 The Bitcoin Core developers +// Copyright (c) 2009-2018 The Bitcoin Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. @@ -2018,6 +2018,12 @@ bool static ProcessMessage(CNode* pfrom, const std::string& strCommand, CDataStr uint256 hashStop; vRecv >> locator >> hashStop; + if (locator.vHave.size() > MAX_LOCATOR_SZ) { + LogPrint(BCLog::NET, "getblocks locator size %lld > %d, disconnect peer=%d\n", locator.vHave.size(), MAX_LOCATOR_SZ, pfrom->GetId()); + pfrom->fDisconnect = true; + return true; + } + // We might have announced the currently-being-connected tip using a // compact block, which resulted in the peer sending a getblocks // request, which we would otherwise respond to without the new block. @@ -2131,6 +2137,12 @@ bool static ProcessMessage(CNode* pfrom, const std::string& strCommand, CDataStr uint256 hashStop; vRecv >> locator >> hashStop; + if (locator.vHave.size() > MAX_LOCATOR_SZ) { + LogPrint(BCLog::NET, "getheaders locator size %lld > %d, disconnect peer=%d\n", locator.vHave.size(), MAX_LOCATOR_SZ, pfrom->GetId()); + pfrom->fDisconnect = true; + return true; + } + LOCK(cs_main); if (IsInitialBlockDownload() && !pfrom->fWhitelisted) { LogPrint(BCLog::NET, "Ignoring getheaders from peer=%d because node is in initial block download\n", pfrom->GetId()); diff --git a/src/net_processing.h b/src/net_processing.h index 4dab0ada2b..7caefc80ca 100644 --- a/src/net_processing.h +++ b/src/net_processing.h @@ -1,5 +1,5 @@ // Copyright (c) 2009-2010 Satoshi Nakamoto -// Copyright (c) 2009-2017 The Bitcoin Core developers +// Copyright (c) 2009-2018 The Bitcoin Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/netaddress.cpp b/src/netaddress.cpp index 193582d14e..778c2700f9 100644 --- a/src/netaddress.cpp +++ b/src/netaddress.cpp @@ -1,5 +1,5 @@ // Copyright (c) 2009-2010 Satoshi Nakamoto -// Copyright (c) 2009-2017 The Bitcoin Core developers +// Copyright (c) 2009-2018 The Bitcoin Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/netaddress.h b/src/netaddress.h index 966bef8cdf..cc0e4d4f12 100644 --- a/src/netaddress.h +++ b/src/netaddress.h @@ -1,4 +1,4 @@ -// Copyright (c) 2009-2017 The Bitcoin Core developers +// Copyright (c) 2009-2018 The Bitcoin Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/netbase.cpp b/src/netbase.cpp index 607eb89573..9750173987 100644 --- a/src/netbase.cpp +++ b/src/netbase.cpp @@ -1,5 +1,5 @@ // Copyright (c) 2009-2010 Satoshi Nakamoto -// Copyright (c) 2009-2017 The Bitcoin Core developers +// Copyright (c) 2009-2018 The Bitcoin Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/netbase.h b/src/netbase.h index 50d4bc54fa..708df5b8e2 100644 --- a/src/netbase.h +++ b/src/netbase.h @@ -1,4 +1,4 @@ -// Copyright (c) 2009-2017 The Bitcoin Core developers +// Copyright (c) 2009-2018 The Bitcoin Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/netmessagemaker.h b/src/netmessagemaker.h index 975be460b3..2efb384a7b 100644 --- a/src/netmessagemaker.h +++ b/src/netmessagemaker.h @@ -1,5 +1,5 @@ // Copyright (c) 2009-2010 Satoshi Nakamoto -// Copyright (c) 2009-2017 The Bitcoin Core developers +// Copyright (c) 2009-2018 The Bitcoin Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/noui.cpp b/src/noui.cpp index efe6f28246..e6d01e7b26 100644 --- a/src/noui.cpp +++ b/src/noui.cpp @@ -1,5 +1,5 @@ // Copyright (c) 2010 Satoshi Nakamoto -// Copyright (c) 2009-2017 The Bitcoin Core developers +// Copyright (c) 2009-2018 The Bitcoin Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. @@ -52,7 +52,7 @@ static void noui_InitMessage(const std::string& message) void noui_connect() { // Connect bitcoind signal handlers - uiInterface.ThreadSafeMessageBox.connect(noui_ThreadSafeMessageBox); - uiInterface.ThreadSafeQuestion.connect(noui_ThreadSafeQuestion); - uiInterface.InitMessage.connect(noui_InitMessage); + uiInterface.ThreadSafeMessageBox_connect(noui_ThreadSafeMessageBox); + uiInterface.ThreadSafeQuestion_connect(noui_ThreadSafeQuestion); + uiInterface.InitMessage_connect(noui_InitMessage); } diff --git a/src/outputtype.cpp b/src/outputtype.cpp index 3ff28bf9c2..7e5690dfc5 100644 --- a/src/outputtype.cpp +++ b/src/outputtype.cpp @@ -1,5 +1,5 @@ // Copyright (c) 2009-2010 Satoshi Nakamoto -// Copyright (c) 2009-2017 The Bitcoin Core developers +// Copyright (c) 2009-2018 The Bitcoin Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/outputtype.h b/src/outputtype.h index 21623e3b49..4c4d93bc8b 100644 --- a/src/outputtype.h +++ b/src/outputtype.h @@ -1,5 +1,5 @@ // Copyright (c) 2009-2010 Satoshi Nakamoto -// Copyright (c) 2009-2017 The Bitcoin Core developers +// Copyright (c) 2009-2018 The Bitcoin Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/policy/feerate.cpp b/src/policy/feerate.cpp index a560815491..14be6192fe 100644 --- a/src/policy/feerate.cpp +++ b/src/policy/feerate.cpp @@ -1,5 +1,5 @@ // Copyright (c) 2009-2010 Satoshi Nakamoto -// Copyright (c) 2009-2017 The Bitcoin Core developers +// Copyright (c) 2009-2018 The Bitcoin Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/policy/feerate.h b/src/policy/feerate.h index eed77d5030..85d7d22b4f 100644 --- a/src/policy/feerate.h +++ b/src/policy/feerate.h @@ -1,5 +1,5 @@ // Copyright (c) 2009-2010 Satoshi Nakamoto -// Copyright (c) 2009-2017 The Bitcoin Core developers +// Copyright (c) 2009-2018 The Bitcoin Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/policy/fees.cpp b/src/policy/fees.cpp index 79b450e3e6..aee6fbee1a 100644 --- a/src/policy/fees.cpp +++ b/src/policy/fees.cpp @@ -1,5 +1,5 @@ // Copyright (c) 2009-2010 Satoshi Nakamoto -// Copyright (c) 2009-2017 The Bitcoin Core developers +// Copyright (c) 2009-2018 The Bitcoin Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/policy/fees.h b/src/policy/fees.h index 8c34bee237..136fb481f7 100644 --- a/src/policy/fees.h +++ b/src/policy/fees.h @@ -1,5 +1,5 @@ // Copyright (c) 2009-2010 Satoshi Nakamoto -// Copyright (c) 2009-2017 The Bitcoin Core developers +// Copyright (c) 2009-2018 The Bitcoin Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. #ifndef BITCOIN_POLICY_FEES_H diff --git a/src/policy/policy.cpp b/src/policy/policy.cpp index 3a592e40d3..b8f7963a0c 100644 --- a/src/policy/policy.cpp +++ b/src/policy/policy.cpp @@ -1,5 +1,5 @@ // Copyright (c) 2009-2010 Satoshi Nakamoto -// Copyright (c) 2009-2017 The Bitcoin Core developers +// Copyright (c) 2009-2018 The Bitcoin Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/policy/policy.h b/src/policy/policy.h index 035627bd60..3d47ac1267 100644 --- a/src/policy/policy.h +++ b/src/policy/policy.h @@ -1,5 +1,5 @@ // Copyright (c) 2009-2010 Satoshi Nakamoto -// Copyright (c) 2009-2017 The Bitcoin Core developers +// Copyright (c) 2009-2018 The Bitcoin Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/policy/rbf.cpp b/src/policy/rbf.cpp index 81b2a7fadc..18f9c0c2a8 100644 --- a/src/policy/rbf.cpp +++ b/src/policy/rbf.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2016-2017 The Bitcoin Core developers +// Copyright (c) 2016-2018 The Bitcoin Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/policy/rbf.h b/src/policy/rbf.h index c0a25f75b5..581f489e12 100644 --- a/src/policy/rbf.h +++ b/src/policy/rbf.h @@ -1,4 +1,4 @@ -// Copyright (c) 2016-2017 The Bitcoin Core developers +// Copyright (c) 2016-2018 The Bitcoin Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/pow.cpp b/src/pow.cpp index 929ea26a02..1414d37564 100644 --- a/src/pow.cpp +++ b/src/pow.cpp @@ -1,5 +1,5 @@ // Copyright (c) 2009-2010 Satoshi Nakamoto -// Copyright (c) 2009-2017 The Bitcoin Core developers +// Copyright (c) 2009-2018 The Bitcoin Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. @@ -1,5 +1,5 @@ // Copyright (c) 2009-2010 Satoshi Nakamoto -// Copyright (c) 2009-2017 The Bitcoin Core developers +// Copyright (c) 2009-2018 The Bitcoin Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/prevector.h b/src/prevector.h index 103ead82cc..033952c959 100644 --- a/src/prevector.h +++ b/src/prevector.h @@ -1,4 +1,4 @@ -// Copyright (c) 2015-2017 The Bitcoin Core developers +// Copyright (c) 2015-2018 The Bitcoin Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/primitives/block.cpp b/src/primitives/block.cpp index 21f880bccb..fb95a66bde 100644 --- a/src/primitives/block.cpp +++ b/src/primitives/block.cpp @@ -1,5 +1,5 @@ // Copyright (c) 2009-2010 Satoshi Nakamoto -// Copyright (c) 2009-2017 The Bitcoin Core developers +// Copyright (c) 2009-2018 The Bitcoin Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/primitives/block.h b/src/primitives/block.h index 1fca55d910..750d42efbc 100644 --- a/src/primitives/block.h +++ b/src/primitives/block.h @@ -1,5 +1,5 @@ // Copyright (c) 2009-2010 Satoshi Nakamoto -// Copyright (c) 2009-2017 The Bitcoin Core developers +// Copyright (c) 2009-2018 The Bitcoin Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/primitives/transaction.cpp b/src/primitives/transaction.cpp index 230f762a1b..59865a5eab 100644 --- a/src/primitives/transaction.cpp +++ b/src/primitives/transaction.cpp @@ -1,5 +1,5 @@ // Copyright (c) 2009-2010 Satoshi Nakamoto -// Copyright (c) 2009-2017 The Bitcoin Core developers +// Copyright (c) 2009-2018 The Bitcoin Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/primitives/transaction.h b/src/primitives/transaction.h index 360615ec56..fb9db508d2 100644 --- a/src/primitives/transaction.h +++ b/src/primitives/transaction.h @@ -1,5 +1,5 @@ // Copyright (c) 2009-2010 Satoshi Nakamoto -// Copyright (c) 2009-2017 The Bitcoin Core developers +// Copyright (c) 2009-2018 The Bitcoin Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/protocol.cpp b/src/protocol.cpp index 2ec26fbd3e..b4fc9def1f 100644 --- a/src/protocol.cpp +++ b/src/protocol.cpp @@ -1,5 +1,5 @@ // Copyright (c) 2009-2010 Satoshi Nakamoto -// Copyright (c) 2009-2017 The Bitcoin Core developers +// Copyright (c) 2009-2018 The Bitcoin Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/protocol.h b/src/protocol.h index 3a9b2d2561..50d197415b 100644 --- a/src/protocol.h +++ b/src/protocol.h @@ -1,5 +1,5 @@ // Copyright (c) 2009-2010 Satoshi Nakamoto -// Copyright (c) 2009-2017 The Bitcoin Core developers +// Copyright (c) 2009-2018 The Bitcoin Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/pubkey.cpp b/src/pubkey.cpp index 1eb126434b..d38df716bd 100644 --- a/src/pubkey.cpp +++ b/src/pubkey.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2009-2017 The Bitcoin Core developers +// Copyright (c) 2009-2018 The Bitcoin Core developers // Copyright (c) 2017 The Zcash developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/pubkey.h b/src/pubkey.h index 0985273f34..089324ffda 100644 --- a/src/pubkey.h +++ b/src/pubkey.h @@ -1,5 +1,5 @@ // Copyright (c) 2009-2010 Satoshi Nakamoto -// Copyright (c) 2009-2017 The Bitcoin Core developers +// Copyright (c) 2009-2018 The Bitcoin Core developers // Copyright (c) 2017 The Zcash developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/qt/addressbookpage.cpp b/src/qt/addressbookpage.cpp index d51069d922..e1d9b1addf 100644 --- a/src/qt/addressbookpage.cpp +++ b/src/qt/addressbookpage.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2011-2017 The Bitcoin Core developers +// Copyright (c) 2011-2018 The Bitcoin Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/qt/addressbookpage.h b/src/qt/addressbookpage.h index ba420c5e15..32ab2dfeb5 100644 --- a/src/qt/addressbookpage.h +++ b/src/qt/addressbookpage.h @@ -1,4 +1,4 @@ -// Copyright (c) 2011-2017 The Bitcoin Core developers +// Copyright (c) 2011-2018 The Bitcoin Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/qt/addresstablemodel.cpp b/src/qt/addresstablemodel.cpp index 25b615e6f8..380a3ddb84 100644 --- a/src/qt/addresstablemodel.cpp +++ b/src/qt/addresstablemodel.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2011-2017 The Bitcoin Core developers +// Copyright (c) 2011-2018 The Bitcoin Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/qt/addresstablemodel.h b/src/qt/addresstablemodel.h index 6e1b53b049..41bed4e290 100644 --- a/src/qt/addresstablemodel.h +++ b/src/qt/addresstablemodel.h @@ -1,4 +1,4 @@ -// Copyright (c) 2011-2015 The Bitcoin Core developers +// Copyright (c) 2011-2018 The Bitcoin Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/qt/askpassphrasedialog.cpp b/src/qt/askpassphrasedialog.cpp index 0270af98b7..812d2251e1 100644 --- a/src/qt/askpassphrasedialog.cpp +++ b/src/qt/askpassphrasedialog.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2011-2017 The Bitcoin Core developers +// Copyright (c) 2011-2018 The Bitcoin Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/qt/askpassphrasedialog.h b/src/qt/askpassphrasedialog.h index 7ec8bf0a15..ac31569f63 100644 --- a/src/qt/askpassphrasedialog.h +++ b/src/qt/askpassphrasedialog.h @@ -1,4 +1,4 @@ -// Copyright (c) 2011-2017 The Bitcoin Core developers +// Copyright (c) 2011-2018 The Bitcoin Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/qt/bantablemodel.cpp b/src/qt/bantablemodel.cpp index aa0d4a31d3..97348aad2b 100644 --- a/src/qt/bantablemodel.cpp +++ b/src/qt/bantablemodel.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2011-2017 The Bitcoin Core developers +// Copyright (c) 2011-2018 The Bitcoin Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/qt/bantablemodel.h b/src/qt/bantablemodel.h index d6c8dbf6dd..b8505b599f 100644 --- a/src/qt/bantablemodel.h +++ b/src/qt/bantablemodel.h @@ -1,4 +1,4 @@ -// Copyright (c) 2011-2017 The Bitcoin Core developers +// Copyright (c) 2011-2018 The Bitcoin Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/qt/bitcoin.cpp b/src/qt/bitcoin.cpp index 5d0e384cf8..d3ec67e441 100644 --- a/src/qt/bitcoin.cpp +++ b/src/qt/bitcoin.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2011-2017 The Bitcoin Core developers +// Copyright (c) 2011-2018 The Bitcoin Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/qt/bitcoinaddressvalidator.cpp b/src/qt/bitcoinaddressvalidator.cpp index 6a76358a78..a2adca6eac 100644 --- a/src/qt/bitcoinaddressvalidator.cpp +++ b/src/qt/bitcoinaddressvalidator.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2011-2017 The Bitcoin Core developers +// Copyright (c) 2011-2018 The Bitcoin Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/qt/bitcoinamountfield.cpp b/src/qt/bitcoinamountfield.cpp index 68a9dc4c27..6726019a3f 100644 --- a/src/qt/bitcoinamountfield.cpp +++ b/src/qt/bitcoinamountfield.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2011-2017 The Bitcoin Core developers +// Copyright (c) 2011-2018 The Bitcoin Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/qt/bitcoinamountfield.h b/src/qt/bitcoinamountfield.h index 8e2cceeb5e..f93579c492 100644 --- a/src/qt/bitcoinamountfield.h +++ b/src/qt/bitcoinamountfield.h @@ -1,4 +1,4 @@ -// Copyright (c) 2011-2017 The Bitcoin Core developers +// Copyright (c) 2011-2018 The Bitcoin Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/qt/bitcoingui.cpp b/src/qt/bitcoingui.cpp index c8f8b9c7d3..ff0641dcf5 100644 --- a/src/qt/bitcoingui.cpp +++ b/src/qt/bitcoingui.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2011-2017 The Bitcoin Core developers +// Copyright (c) 2011-2018 The Bitcoin Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. @@ -146,7 +146,7 @@ BitcoinGUI::BitcoinGUI(interfaces::Node& node, const PlatformStyle *_platformSty unitDisplayControl = new UnitDisplayStatusBarControl(platformStyle); labelWalletEncryptionIcon = new QLabel(); labelWalletHDStatusIcon = new QLabel(); - labelProxyIcon = new QLabel(); + labelProxyIcon = new GUIUtil::ClickableLabel(); connectionsControl = new GUIUtil::ClickableLabel(); labelBlocksIcon = new GUIUtil::ClickableLabel(); if(enableWallet) @@ -193,7 +193,12 @@ BitcoinGUI::BitcoinGUI(interfaces::Node& node, const PlatformStyle *_platformSty // Subscribe to notifications from core subscribeToCoreSignals(); - connect(connectionsControl, SIGNAL(clicked(QPoint)), this, SLOT(toggleNetworkActive())); + connect(connectionsControl, &GUIUtil::ClickableLabel::clicked, [this] { + m_node.setNetworkActive(!m_node.getNetworkActive()); + }); + connect(labelProxyIcon, &GUIUtil::ClickableLabel::clicked, [this] { + openOptionsDialogWithTab(OptionsDialog::TAB_NETWORK); + }); modalOverlay = new ModalOverlay(this->centralWidget()); #ifdef ENABLE_WALLET @@ -635,12 +640,7 @@ void BitcoinGUI::trayIconActivated(QSystemTrayIcon::ActivationReason reason) void BitcoinGUI::optionsClicked() { - if(!clientModel || !clientModel->getOptionsModel()) - return; - - OptionsDialog dlg(this, enableWallet); - dlg.setModel(clientModel->getOptionsModel()); - dlg.exec(); + openOptionsDialogWithTab(OptionsDialog::TAB_MAIN); } void BitcoinGUI::aboutClicked() @@ -764,6 +764,17 @@ void BitcoinGUI::updateHeadersSyncProgressLabel() progressBarLabel->setText(tr("Syncing Headers (%1%)...").arg(QString::number(100.0 / (headersTipHeight+estHeadersLeft)*headersTipHeight, 'f', 1))); } +void BitcoinGUI::openOptionsDialogWithTab(OptionsDialog::Tab tab) +{ + if (!clientModel || !clientModel->getOptionsModel()) + return; + + OptionsDialog dlg(this, enableWallet); + dlg.setCurrentTab(tab); + dlg.setModel(clientModel->getOptionsModel()); + dlg.exec(); +} + void BitcoinGUI::setNumBlocks(int count, const QDateTime& blockDate, double nVerificationProgress, bool header) { if (modalOverlay) @@ -1231,11 +1242,6 @@ void BitcoinGUI::unsubscribeFromCoreSignals() m_handler_question->disconnect(); } -void BitcoinGUI::toggleNetworkActive() -{ - m_node.setNetworkActive(!m_node.getNetworkActive()); -} - UnitDisplayStatusBarControl::UnitDisplayStatusBarControl(const PlatformStyle *platformStyle) : optionsModel(0), menu(0) diff --git a/src/qt/bitcoingui.h b/src/qt/bitcoingui.h index d7ca8081d1..3a8ef3ad8c 100644 --- a/src/qt/bitcoingui.h +++ b/src/qt/bitcoingui.h @@ -1,4 +1,4 @@ -// Copyright (c) 2011-2017 The Bitcoin Core developers +// Copyright (c) 2011-2018 The Bitcoin Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. @@ -9,6 +9,8 @@ #include <config/bitcoin-config.h> #endif +#include <qt/optionsdialog.h> + #include <amount.h> #include <QLabel> @@ -45,6 +47,10 @@ class QProgressBar; class QProgressDialog; QT_END_NAMESPACE +namespace GUIUtil { +class ClickableLabel; +} + /** Bitcoin GUI main class. This class represents the main window of the Bitcoin UI. It communicates with both the client and wallet models to give the user an up-to-date view of the current core state. @@ -93,8 +99,8 @@ private: UnitDisplayStatusBarControl* unitDisplayControl = nullptr; QLabel* labelWalletEncryptionIcon = nullptr; QLabel* labelWalletHDStatusIcon = nullptr; - QLabel* labelProxyIcon = nullptr; - QLabel* connectionsControl = nullptr; + GUIUtil::ClickableLabel* labelProxyIcon = nullptr; + GUIUtil::ClickableLabel* connectionsControl = nullptr; QLabel* labelBlocksIcon = nullptr; QLabel* progressBarLabel = nullptr; QProgressBar* progressBar = nullptr; @@ -166,6 +172,9 @@ private: void updateHeadersSyncProgressLabel(); + /** Open the OptionsDialog on the specified tab index */ + void openOptionsDialogWithTab(OptionsDialog::Tab tab); + Q_SIGNALS: /** Signal raised when a URI was entered or dragged to the GUI */ void receivedURI(const QString &uri); @@ -266,9 +275,6 @@ private Q_SLOTS: /** When hideTrayIcon setting is changed in OptionsModel hide or show the icon accordingly. */ void setTrayIconVisible(bool); - /** Toggle networking */ - void toggleNetworkActive(); - void showModalOverlay(); }; diff --git a/src/qt/bitcoinstrings.cpp b/src/qt/bitcoinstrings.cpp index ab7e56a9da..de60b30dfe 100644 --- a/src/qt/bitcoinstrings.cpp +++ b/src/qt/bitcoinstrings.cpp @@ -40,6 +40,12 @@ QT_TRANSLATE_NOOP("bitcoin-core", "" "Fee estimation failed. Fallbackfee is disabled. Wait a few blocks or enable -" "fallbackfee."), QT_TRANSLATE_NOOP("bitcoin-core", "" +"Group outputs by address, selecting all or none, instead of selecting on a " +"per-output basis. Privacy is improved as an address is only used once " +"(unless someone sends to it after spending from it), but may result in " +"slightly higher fees as suboptimal coin selection may result due to the " +"added limitation (default: %u)"), +QT_TRANSLATE_NOOP("bitcoin-core", "" "Invalid amount for -maxtxfee=<amount>: '%s' (must be at least the minrelay " "fee of %s to prevent stuck transactions)"), QT_TRANSLATE_NOOP("bitcoin-core", "" @@ -168,7 +174,7 @@ QT_TRANSLATE_NOOP("bitcoin-core", "Signing transaction failed"), QT_TRANSLATE_NOOP("bitcoin-core", "Specified -walletdir \"%s\" does not exist"), QT_TRANSLATE_NOOP("bitcoin-core", "Specified -walletdir \"%s\" is a relative path"), QT_TRANSLATE_NOOP("bitcoin-core", "Specified -walletdir \"%s\" is not a directory"), -QT_TRANSLATE_NOOP("bitcoin-core", "Specified blocks directory \"%s\" does not exist.\n"), +QT_TRANSLATE_NOOP("bitcoin-core", "Specified blocks directory \"%s\" does not exist."), QT_TRANSLATE_NOOP("bitcoin-core", "Starting network threads..."), QT_TRANSLATE_NOOP("bitcoin-core", "The source code is available from %s."), QT_TRANSLATE_NOOP("bitcoin-core", "The transaction amount is too small to pay the fee"), diff --git a/src/qt/bitcoinunits.cpp b/src/qt/bitcoinunits.cpp index 30625f419a..8aa1fdba4d 100644 --- a/src/qt/bitcoinunits.cpp +++ b/src/qt/bitcoinunits.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2011-2017 The Bitcoin Core developers +// Copyright (c) 2011-2018 The Bitcoin Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/qt/bitcoinunits.h b/src/qt/bitcoinunits.h index 9b01b4678a..06a1544fa2 100644 --- a/src/qt/bitcoinunits.h +++ b/src/qt/bitcoinunits.h @@ -1,4 +1,4 @@ -// Copyright (c) 2011-2017 The Bitcoin Core developers +// Copyright (c) 2011-2018 The Bitcoin Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/qt/clientmodel.cpp b/src/qt/clientmodel.cpp index 8a4a2955f6..7154ac14be 100644 --- a/src/qt/clientmodel.cpp +++ b/src/qt/clientmodel.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2011-2017 The Bitcoin Core developers +// Copyright (c) 2011-2018 The Bitcoin Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/qt/clientmodel.h b/src/qt/clientmodel.h index 9d4fa74b7a..ed7ecbf73b 100644 --- a/src/qt/clientmodel.h +++ b/src/qt/clientmodel.h @@ -1,4 +1,4 @@ -// Copyright (c) 2011-2017 The Bitcoin Core developers +// Copyright (c) 2011-2018 The Bitcoin Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/qt/coincontroldialog.cpp b/src/qt/coincontroldialog.cpp index 9b6480a915..ca3598334d 100644 --- a/src/qt/coincontroldialog.cpp +++ b/src/qt/coincontroldialog.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2011-2017 The Bitcoin Core developers +// Copyright (c) 2011-2018 The Bitcoin Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/qt/coincontroldialog.h b/src/qt/coincontroldialog.h index a254c55556..9c3f6a46a2 100644 --- a/src/qt/coincontroldialog.h +++ b/src/qt/coincontroldialog.h @@ -1,4 +1,4 @@ -// Copyright (c) 2011-2017 The Bitcoin Core developers +// Copyright (c) 2011-2018 The Bitcoin Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/qt/coincontroltreewidget.cpp b/src/qt/coincontroltreewidget.cpp index e7326d3f7a..4ffbd832e9 100644 --- a/src/qt/coincontroltreewidget.cpp +++ b/src/qt/coincontroltreewidget.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2011-2017 The Bitcoin Core developers +// Copyright (c) 2011-2018 The Bitcoin Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/qt/csvmodelwriter.cpp b/src/qt/csvmodelwriter.cpp index 672226ca11..fe63fed52c 100644 --- a/src/qt/csvmodelwriter.cpp +++ b/src/qt/csvmodelwriter.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2011-2017 The Bitcoin Core developers +// Copyright (c) 2011-2018 The Bitcoin Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/qt/editaddressdialog.cpp b/src/qt/editaddressdialog.cpp index f26a31158e..0b0b96b30c 100644 --- a/src/qt/editaddressdialog.cpp +++ b/src/qt/editaddressdialog.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2011-2017 The Bitcoin Core developers +// Copyright (c) 2011-2018 The Bitcoin Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. @@ -39,6 +39,10 @@ EditAddressDialog::EditAddressDialog(Mode _mode, QWidget *parent) : mapper = new QDataWidgetMapper(this); mapper->setSubmitPolicy(QDataWidgetMapper::ManualSubmit); + + GUIUtil::ItemDelegate* delegate = new GUIUtil::ItemDelegate(mapper); + connect(delegate, &GUIUtil::ItemDelegate::keyEscapePressed, this, &EditAddressDialog::reject); + mapper->setItemDelegate(delegate); } EditAddressDialog::~EditAddressDialog() diff --git a/src/qt/editaddressdialog.h b/src/qt/editaddressdialog.h index 3aba74bf08..fd88b45793 100644 --- a/src/qt/editaddressdialog.h +++ b/src/qt/editaddressdialog.h @@ -1,4 +1,4 @@ -// Copyright (c) 2011-2015 The Bitcoin Core developers +// Copyright (c) 2011-2018 The Bitcoin Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/qt/guiconstants.h b/src/qt/guiconstants.h index ff47653fb7..04b03a5435 100644 --- a/src/qt/guiconstants.h +++ b/src/qt/guiconstants.h @@ -1,4 +1,4 @@ -// Copyright (c) 2011-2016 The Bitcoin Core developers +// Copyright (c) 2011-2018 The Bitcoin Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/qt/guiutil.cpp b/src/qt/guiutil.cpp index 9dde2c392c..f8391b6303 100644 --- a/src/qt/guiutil.cpp +++ b/src/qt/guiutil.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2011-2017 The Bitcoin Core developers +// Copyright (c) 2011-2018 The Bitcoin Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. @@ -49,6 +49,7 @@ #include <QDoubleValidator> #include <QFileDialog> #include <QFont> +#include <QKeyEvent> #include <QLineEdit> #include <QSettings> #include <QTextDocument> // for Qt::mightBeRichText @@ -367,10 +368,10 @@ void openDebugLogfile() bool openBitcoinConf() { - boost::filesystem::path pathConfig = GetConfigFile(gArgs.GetArg("-conf", BITCOIN_CONF_FILENAME)); + fs::path pathConfig = GetConfigFile(gArgs.GetArg("-conf", BITCOIN_CONF_FILENAME)); /* Create the file */ - boost::filesystem::ofstream configFile(pathConfig, std::ios_base::app); + fs::ofstream configFile(pathConfig, std::ios_base::app); if (!configFile.good()) return false; @@ -927,4 +928,14 @@ void ClickableProgressBar::mouseReleaseEvent(QMouseEvent *event) Q_EMIT clicked(event->pos()); } +bool ItemDelegate::eventFilter(QObject *object, QEvent *event) +{ + if (event->type() == QEvent::KeyPress) { + if (static_cast<QKeyEvent*>(event)->key() == Qt::Key_Escape) { + Q_EMIT keyEscapePressed(); + } + } + return QItemDelegate::eventFilter(object, event); +} + } // namespace GUIUtil diff --git a/src/qt/guiutil.h b/src/qt/guiutil.h index 6aa65369fa..011827e134 100644 --- a/src/qt/guiutil.h +++ b/src/qt/guiutil.h @@ -1,4 +1,4 @@ -// Copyright (c) 2011-2017 The Bitcoin Core developers +// Copyright (c) 2011-2018 The Bitcoin Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. @@ -10,6 +10,7 @@ #include <QEvent> #include <QHeaderView> +#include <QItemDelegate> #include <QMessageBox> #include <QObject> #include <QProgressBar> @@ -232,6 +233,18 @@ namespace GUIUtil typedef ClickableProgressBar ProgressBar; + class ItemDelegate : public QItemDelegate + { + Q_OBJECT + public: + ItemDelegate(QObject* parent) : QItemDelegate(parent) {} + + Q_SIGNALS: + void keyEscapePressed(); + + private: + bool eventFilter(QObject *object, QEvent *event); + }; } // namespace GUIUtil #endif // BITCOIN_QT_GUIUTIL_H diff --git a/src/qt/intro.cpp b/src/qt/intro.cpp index 8c00ca0363..dbba3c1b3b 100644 --- a/src/qt/intro.cpp +++ b/src/qt/intro.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2011-2017 The Bitcoin Core developers +// Copyright (c) 2011-2018 The Bitcoin Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. @@ -23,7 +23,7 @@ static const uint64_t GB_BYTES = 1000000000LL; /* Minimum free space (in GB) needed for data directory */ -static const uint64_t BLOCK_CHAIN_SIZE = 200; +constexpr uint64_t BLOCK_CHAIN_SIZE = 220; /* Minimum free space (in GB) needed for data directory when pruned; Does not include prune target */ static const uint64_t CHAIN_STATE_SIZE = 3; /* Total required space (in GB) depending on user choice (prune, not prune) */ diff --git a/src/qt/intro.h b/src/qt/intro.h index b0937aedcb..2b3da963e2 100644 --- a/src/qt/intro.h +++ b/src/qt/intro.h @@ -1,4 +1,4 @@ -// Copyright (c) 2011-2016 The Bitcoin Core developers +// Copyright (c) 2011-2018 The Bitcoin Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/qt/locale/bitcoin_af.ts b/src/qt/locale/bitcoin_af.ts index 444952eea2..bff2db1d6a 100644 --- a/src/qt/locale/bitcoin_af.ts +++ b/src/qt/locale/bitcoin_af.ts @@ -3,11 +3,11 @@ <name>AddressBookPage</name> <message> <source>Right-click to edit address or label</source> - <translation>Regs-kliek om die adres of etiket te verander</translation> + <translation>Regsklik om adres of etiket te verander</translation> </message> <message> <source>Create a new address</source> - <translation>Skep 'n nuwe adres</translation> + <translation>Skep ’n nuwe adres</translation> </message> <message> <source>&New</source> @@ -132,6 +132,10 @@ <translation>Herhaal nuwe wagwoord</translation> </message> <message> + <source>Show password</source> + <translation>Wys wagwoord</translation> + </message> + <message> <source>Enter the new passphrase to the wallet.<br/>Please use a passphrase of <b>ten or more random characters</b>, or <b>eight or more words</b>.</source> <translation>Tik die nuwe wagwoord vir u beursie.<br/>Gerbuik asseblief 'n wagwoord met <b>tien of meer lukrake karakters</b>, of <b>agt of meer woorde</b>.</translation> </message> @@ -690,10 +694,6 @@ <translation>&Adres</translation> </message> <message> - <source>New receiving address</source> - <translation>Nuwe ontvang adres</translation> - </message> - <message> <source>New sending address</source> <translation>Nuwe stuur adres</translation> </message> @@ -710,10 +710,6 @@ <translation>Die ingevoerde adres "%1" is nie 'n geldige Bitcoin adres nie.</translation> </message> <message> - <source>The entered address "%1" is already in the address book.</source> - <translation>Die ingevoerde adres "%1" is reeds in die adres boek.</translation> - </message> - <message> <source>Could not unlock wallet.</source> <translation>Kon beursie nie oopsluit nie.</translation> </message> @@ -763,42 +759,6 @@ <source>Command-line options</source> <translation>Opdrag lyn opsies</translation> </message> - <message> - <source>Usage:</source> - <translation>Gebruik:</translation> - </message> - <message> - <source>command-line options</source> - <translation>opdrag lyn opsies</translation> - </message> - <message> - <source>UI Options:</source> - <translation>Gebruikerkoppelvlakopsies:</translation> - </message> - <message> - <source>Choose data directory on startup (default: %u)</source> - <translation>Kies data gids by aanvang (standaard: %u)</translation> - </message> - <message> - <source>Set language, for example "de_DE" (default: system locale)</source> - <translation>Stel taal, byvoorbeeld "de_DE" (standaard: stelsel lokaal)</translation> - </message> - <message> - <source>Start minimized</source> - <translation>Begin geminimeer</translation> - </message> - <message> - <source>Set SSL root certificates for payment request (default: -system-)</source> - <translation>Stel SSL-wortelsertifikate vir betaling versoek (standaard: -stelsel-)</translation> - </message> - <message> - <source>Show splash screen on startup (default: %u)</source> - <translation>Wys spatskerm tydens opstart (standaard: %u)</translation> - </message> - <message> - <source>Reset all settings changed in the GUI</source> - <translation>Alle instellings wat in die grafiese gebruikerkoppelvlak gewysig is, terugstel</translation> - </message> </context> <context> <name>Intro</name> @@ -1470,6 +1430,10 @@ <source>Message</source> <translation>Boodskap</translation> </message> + <message> + <source>Wallet</source> + <translation>Beursie</translation> + </message> </context> <context> <name>RecentRequestsTableModel</name> @@ -1629,6 +1593,10 @@ <translation>%1 tot %2</translation> </message> <message> + <source>Transaction fee</source> + <translation>Transaksie fooi</translation> + </message> + <message> <source>Payment request expired.</source> <translation>Betalings versoek verstryk.</translation> </message> @@ -1910,18 +1878,10 @@ <context> <name>bitcoin-core</name> <message> - <source>Options:</source> - <translation>Opsies:</translation> - </message> - <message> <source>Bitcoin Core</source> <translation>Bitcoin Kern</translation> </message> <message> - <source>Connection options:</source> - <translation>Konneksie opsies:</translation> - </message> - <message> <source>Error loading %s</source> <translation>Fout met laai %s</translation> </message> @@ -1930,26 +1890,10 @@ <translation>Besig met invoer...</translation> </message> <message> - <source>Wallet options:</source> - <translation>Beursie opsies:</translation> - </message> - <message> - <source>(default: %u)</source> - <translation>(standaard: %u)</translation> - </message> - <message> <source>Information</source> <translation>Inligting</translation> </message> <message> - <source>Node relay options:</source> - <translation>Node aflos opsies:</translation> - </message> - <message> - <source>RPC server options:</source> - <translation>RPC bediener opsies:</translation> - </message> - <message> <source>Signing transaction failed</source> <translation>Teken van transaksie het misluk</translation> </message> @@ -1974,58 +1918,10 @@ <translation>Waarskuwing</translation> </message> <message> - <source>Do not keep transactions in the mempool longer than <n> hours (default: %u)</source> - <translation>Moenie transaksies vir langer as <n> ure in die geheuepoel hou nie (verstek: %u)</translation> - </message> - <message> <source>%s is set very high!</source> <translation>%s is baie hoog gestel!</translation> </message> <message> - <source>(default: %s)</source> - <translation>(standaard: %s)</translation> - </message> - <message> - <source>Listen for JSON-RPC connections on <port> (default: %u or testnet: %u)</source> - <translation>Luister vir JSON-RPC konneksies op <port> (verstek: %u of testnet: %u)</translation> - </message> - <message> - <source>Listen for connections on <port> (default: %u or testnet: %u)</source> - <translation>Luister vir konneksies op <port> (verstek: %u of testnet: %u)</translation> - </message> - <message> - <source>Maintain at most <n> connections to peers (default: %u)</source> - <translation>Handhaaf hoogstens <n> verbindings na portuurs (verstek: %u)</translation> - </message> - <message> - <source>Make the wallet broadcast transactions</source> - <translation>Maak dat die beursie transaksies uitsaai</translation> - </message> - <message> - <source>Maximum per-connection receive buffer, <n>*1000 bytes (default: %u)</source> - <translation>Maksimum per-konneksie ontvang buffer, <n>*1000 grepe (verstek: %u)</translation> - </message> - <message> - <source>Maximum per-connection send buffer, <n>*1000 bytes (default: %u)</source> - <translation>Maksimum per-konneksie stuur buffer, <n>*1000 grepe (verstek: %u)</translation> - </message> - <message> - <source>Prepend debug output with timestamp (default: %u)</source> - <translation>Voeg ontfout-uitset met tydstempel by (verstek: %u)</translation> - </message> - <message> - <source>Specify configuration file (default: %s)</source> - <translation>Spesifiseer konfigurasie lêer (verstek: %s)</translation> - </message> - <message> - <source>Specify connection timeout in milliseconds (minimum: 1, default: %d)</source> - <translation>Spesifiseer konneksie timeout in millisekondes (minimum: 1, verstek: %d)</translation> - </message> - <message> - <source>Specify pid file (default: %s)</source> - <translation>Spesifiseer pid lêer (verstek: %s)</translation> - </message> - <message> <source>Starting network threads...</source> <translation>Begin tans netwerkdrade...</translation> </message> @@ -2038,10 +1934,6 @@ <translation>Dit is die transaksie fooi wat u sal betaal as u 'n transaksie stuur.</translation> </message> <message> - <source>Threshold for disconnecting misbehaving peers (default: %u)</source> - <translation>Drumpel vir die ontkoppel van misdadige portuurs (verstek: %u)</translation> - </message> - <message> <source>Transaction amounts must not be negative</source> <translation>Transaksies bedrae moet nie negatief wees nie</translation> </message> @@ -2055,7 +1947,7 @@ </message> <message> <source>Unknown network specified in -onlynet: '%s'</source> - <translation>Onbekend netwerk gespesifiseer in -onlynet: '%s'</translation> + <translation>Onbekende netwerk gespesifiseer in -onlynet: '%s'</translation> </message> <message> <source>Insufficient funds</source> @@ -2079,7 +1971,7 @@ </message> <message> <source>Done loading</source> - <translation>Klaar met laai</translation> + <translation>Klaar gelaai</translation> </message> <message> <source>Error</source> diff --git a/src/qt/locale/bitcoin_af_ZA.ts b/src/qt/locale/bitcoin_af_ZA.ts index 8c05010fb9..b3e9acca9d 100644 --- a/src/qt/locale/bitcoin_af_ZA.ts +++ b/src/qt/locale/bitcoin_af_ZA.ts @@ -136,6 +136,10 @@ <translation>Wys wagwoord</translation> </message> <message> + <source>Enter the new passphrase to the wallet.<br/>Please use a passphrase of <b>ten or more random characters</b>, or <b>eight or more words</b>.</source> + <translation>Tik die nuwe wagwoord vir die beursie in.<br/>Gebruik asseblief 'n wagwoord van <b>ten minste 10 ewekansige karakters</b>, of <b>agt (8) of meer woorde.</b></translation> + </message> + <message> <source>Encrypt wallet</source> <translation>Enkripteer beursie</translation> </message> @@ -168,12 +172,28 @@ <translation>Bevestig beursie enkripsie.</translation> </message> <message> + <source>Warning: If you encrypt your wallet and lose your passphrase, you will <b>LOSE ALL OF YOUR BITCOINS</b>!</source> + <translation>Waarskuwing: As jy jou beursie enkripteer en jou wagwoord verloor, sal jy <b>AL JOU BITCOINS VERLOOR</b>!</translation> + </message> + <message> + <source>Are you sure you wish to encrypt your wallet?</source> + <translation>Is jy seker jy wil jou beursie enkripteer?</translation> + </message> + <message> <source>Wallet encrypted</source> - <translation>Beursie Enkripteer</translation> + <translation>Beursie enkriptasie voltooi</translation> + </message> + <message> + <source>%1 will close now to finish the encryption process. Remember that encrypting your wallet cannot fully protect your bitcoins from being stolen by malware infecting your computer.</source> + <translation>%1 gaan nou toe maak om die enkripsie proses klaar te maak. Onthou dat jou bitcoins nie ten volle beskerm kan word deur die beursie te enkrip teen "malware" wat jou rekenaar besmet.</translation> + </message> + <message> + <source>IMPORTANT: Any previous backups you have made of your wallet file should be replaced with the newly generated, encrypted wallet file. For security reasons, previous backups of the unencrypted wallet file will become useless as soon as you start using the new, encrypted wallet.</source> + <translation>BELANGRIK: Enige vorige rugsteune wat u gemaak het van u beursie-lêer moet vervang word met die nuut-gegenereerde, versleutelde beursie-lêer. Vir sekuriteitsredes sal vorige rugsteune van die onversleutelde beursie-lêer onbruikbaar word sodra u die nuwe, versleutelde beursie begin gebruik.</translation> </message> <message> <source>Wallet encryption failed</source> - <translation>Die beursie kon nie bewaak word nie</translation> + <translation>Beursie enkriptasie het misluk</translation> </message> <message> <source>Wallet encryption failed due to an internal error. Your wallet was not encrypted.</source> @@ -199,13 +219,25 @@ <source>Wallet passphrase was successfully changed.</source> <translation>Die beursie se wagfrase verandering was suksesvol.</translation> </message> - </context> + <message> + <source>Warning: The Caps Lock key is on!</source> + <translation>Waarskuwing: Die Caps Lock is aan!</translation> + </message> +</context> <context> <name>BanTableModel</name> - </context> + <message> + <source>Banned Until</source> + <translation>Verban Tot</translation> + </message> +</context> <context> <name>BitcoinGUI</name> <message> + <source>Sign &message...</source> + <translation>Teken &Boodskap</translation> + </message> + <message> <source>Synchronizing with network...</source> <translation>Sinchroniseer met die netwerk ...</translation> </message> @@ -238,6 +270,18 @@ <translation>Sluit af</translation> </message> <message> + <source>&About %1</source> + <translation>&Oor %1</translation> + </message> + <message> + <source>Show information about %1</source> + <translation>Wys inligting oor %1</translation> + </message> + <message> + <source>About &Qt</source> + <translation>Oor &Qt</translation> + </message> + <message> <source>Show information about Qt</source> <translation>Wys inligting oor Qt</translation> </message> @@ -246,6 +290,66 @@ <translation>&Opsies</translation> </message> <message> + <source>Modify configuration options for %1</source> + <translation>Verander konfigurasie opsies vir %1</translation> + </message> + <message> + <source>&Encrypt Wallet...</source> + <translation>&Enkripteer Beursie...</translation> + </message> + <message> + <source>&Backup Wallet...</source> + <translation>&Rugsteun Beursie...</translation> + </message> + <message> + <source>&Change Passphrase...</source> + <translation>Verander wagwoord frase...</translation> + </message> + <message> + <source>&Sending addresses...</source> + <translation>Uitstuur adresse...</translation> + </message> + <message> + <source>&Receiving addresses...</source> + <translation>&Ontvang adresse...</translation> + </message> + <message> + <source>Open &URI...</source> + <translation>Maak &URI oop...</translation> + </message> + <message> + <source>Click to disable network activity.</source> + <translation>Klik om netwerk aktiwiteit af te skakel.</translation> + </message> + <message> + <source>Network activity disabled.</source> + <translation>Netwerk aktiwiteid afgeskakel.</translation> + </message> + <message> + <source>Click to enable network activity again.</source> + <translation>Klik om netwerk aktiwiteit weer aan te skakel.</translation> + </message> + <message> + <source>Send coins to a Bitcoin address</source> + <translation>Stuur muntstukke na 'n Bitcoin adres</translation> + </message> + <message> + <source>Backup wallet to another location</source> + <translation>Rugsteun beursie na 'n ander plek</translation> + </message> + <message> + <source>Change the passphrase used for wallet encryption</source> + <translation>Verander die wagwoordfrase wat vir beursie-versleuteling gebruik word</translation> + </message> + <message> + <source>&Debug window</source> + <translation>&Ontfoutvenster</translation> + </message> + <message> + <source>&Verify message...</source> + <translation>&Verifieer boodskap...</translation> + </message> + <message> <source>Bitcoin</source> <translation>Bitcoin</translation> </message> @@ -262,6 +366,26 @@ <translation>&Ontvang</translation> </message> <message> + <source>&Show / Hide</source> + <translation>&Wys / Versteek</translation> + </message> + <message> + <source>Show or hide the main Window</source> + <translation>Wys of versteek die hoof Venster</translation> + </message> + <message> + <source>Encrypt the private keys that belong to your wallet</source> + <translation>Versleutel die private sleutels wat aan u beursie behoort</translation> + </message> + <message> + <source>Sign messages with your Bitcoin addresses to prove you own them</source> + <translation>Teken boodskappe met u Bitcoin adresse om te bewys dat u hul besit</translation> + </message> + <message> + <source>Verify messages to ensure they were signed with specified Bitcoin addresses</source> + <translation>Bevestig boodskappe om te verseker dat hulle geteken was met gespesifiseerde Bitcoin adresse</translation> + </message> + <message> <source>&File</source> <translation>&Lêer</translation> </message> @@ -278,6 +402,18 @@ <translation>Blad nutsbalk</translation> </message> <message> + <source>Request payments (generates QR codes and bitcoin: URIs)</source> + <translation>Versoek betalings (genereer QR kodes en bitcoin: URIs)</translation> + </message> + <message> + <source>Show the list of used sending addresses and labels</source> + <translation>Wys die lys van gebruikte stuur adresse en etikette</translation> + </message> + <message> + <source>Show the list of used receiving addresses and labels</source> + <translation>Wys die lys van gebruikte ontvangsadresse en etikette</translation> + </message> + <message> <source>&Command-line options</source> <translation>&Opdrag lys opsies</translation> </message> @@ -306,23 +442,65 @@ <translation>Op datum</translation> </message> <message> + <source>%1 client</source> + <translation>%1 klient</translation> + </message> + <message> <source>Catching up...</source> <translation>Besig om op te vang...</translation> </message> <message> + <source>Date: %1 +</source> + <translation>Datum: %1 +</translation> + </message> + <message> <source>Amount: %1 </source> <translation>Bedrag: %1 </translation> </message> <message> + <source>Type: %1 +</source> + <translation>Tipe: %1 +</translation> + </message> + <message> + <source>Address: %1 +</source> + <translation>Adres: %1 +</translation> + </message> + <message> <source>Incoming transaction</source> <translation>Inkomende transaksie</translation> </message> + <message> + <source>HD key generation is <b>enabled</b></source> + <translation>HD sleutel generasie is <b>aangesit</b></translation> + </message> + <message> + <source>HD key generation is <b>disabled</b></source> + <translation>HD sleutel generasie is <b>afgesit</b></translation> + </message> + <message> + <source>Wallet is <b>encrypted</b> and currently <b>unlocked</b></source> + <translation>Beursie is <b>versleutel</b> en is tans <b>oopgesluit</b></translation> + </message> + <message> + <source>Wallet is <b>encrypted</b> and currently <b>locked</b></source> + <translation>Beursie is <b>versleutel</b> en is tans <b>gesluit</b></translation> + </message> </context> <context> <name>CoinControlDialog</name> <message> + <source>Coin Selection</source> + <translation>Munt Keuse</translation> + </message> + <message> <source>Quantity:</source> <translation>Hoeveelheid:</translation> </message> @@ -335,6 +513,14 @@ <translation>Bedrag:</translation> </message> <message> + <source>Fee:</source> + <translation>Fooi:</translation> + </message> + <message> + <source>Dust:</source> + <translation>Stof:</translation> + </message> + <message> <source>Change:</source> <translation>Verander:</translation> </message> @@ -458,10 +644,6 @@ <translation>&Adres</translation> </message> <message> - <source>New receiving address</source> - <translation>Nuwe ontvangende adres</translation> - </message> - <message> <source>New sending address</source> <translation>Nuwe stuurende adres</translation> </message> @@ -477,14 +659,26 @@ <source>Could not unlock wallet.</source> <translation>Kon nie die beursie oopsluit nie.</translation> </message> - </context> + <message> + <source>New key generation failed.</source> + <translation>Nuwe sleutel genereering het misluk.</translation> + </message> +</context> <context> <name>FreespaceChecker</name> <message> + <source>A new data directory will be created.</source> + <translation>n Nuwe data lêer sal geskep word.</translation> + </message> + <message> <source>name</source> <translation>naam</translation> </message> <message> + <source>Directory already exists. Add %1 if you intend to create a new directory here.</source> + <translation>Lêer bestaan reeds. Voeg %1 indien u van plan is om n nuwe lêer hier te skep.</translation> + </message> + <message> <source>Cannot create data directory here.</source> <translation>Kan nie data gids hier skep nie.</translation> </message> @@ -507,27 +701,7 @@ <source>Command-line options</source> <translation>Opdrag lys opsies</translation> </message> - <message> - <source>Usage:</source> - <translation>Gebruik:</translation> - </message> - <message> - <source>command-line options</source> - <translation>opdrag lys opsies</translation> - </message> - <message> - <source>UI Options:</source> - <translation>Gebruikerskoppelvlak Opsies:</translation> - </message> - <message> - <source>Choose data directory on startup (default: %u)</source> - <translation>Kies data gids op aanvang (standaard: %u)</translation> - </message> - <message> - <source>Start minimized</source> - <translation>Begin verminderd</translation> - </message> - </context> +</context> <context> <name>Intro</name> <message> @@ -543,6 +717,10 @@ <translation>Bitcoin</translation> </message> <message> + <source>The wallet will also be stored in this directory.</source> + <translation>Die beursie sal ook gestoor word in hierdie lêer.</translation> + </message> + <message> <source>Error</source> <translation>Fout</translation> </message> @@ -554,6 +732,10 @@ <translation>Vorm</translation> </message> <message> + <source>Progress</source> + <translation>Vorderering</translation> + </message> + <message> <source>Hide</source> <translation>Steek weg</translation> </message> @@ -642,6 +824,10 @@ <source>Balances</source> <translation>Balans</translation> </message> + <message> + <source>Total:</source> + <translation>Totaal:</translation> + </message> </context> <context> <name>PaymentServer</name> @@ -656,6 +842,30 @@ <translation>Bedrag</translation> </message> <message> + <source>%1 d</source> + <translation>%1 d</translation> + </message> + <message> + <source>%1 h</source> + <translation>%1 h</translation> + </message> + <message> + <source>%1 m</source> + <translation>%1 m</translation> + </message> + <message> + <source>%1 s</source> + <translation>%1 s</translation> + </message> + <message> + <source>None</source> + <translation>Geen</translation> + </message> + <message> + <source>%1 ms</source> + <translation>%1 ms</translation> + </message> + <message> <source>unknown</source> <translation>onbekend</translation> </message> @@ -710,6 +920,10 @@ <source>Message</source> <translation>Boodskap</translation> </message> + <message> + <source>Wallet</source> + <translation>Beursie</translation> + </message> </context> <context> <name>RecentRequestsTableModel</name> @@ -753,6 +967,10 @@ <translation>Bedrag:</translation> </message> <message> + <source>Fee:</source> + <translation>Fooi:</translation> + </message> + <message> <source>Change:</source> <translation>Verander:</translation> </message> @@ -769,6 +987,10 @@ <translation>Stuur aan vele ontvangers op eens</translation> </message> <message> + <source>Dust:</source> + <translation>Stof:</translation> + </message> + <message> <source>Balance:</source> <translation>Balans:</translation> </message> @@ -813,6 +1035,10 @@ <translation>of</translation> </message> <message> + <source>Transaction fee</source> + <translation>Transaksie fooi</translation> + </message> + <message> <source>(no label)</source> <translation>(geen etiket)</translation> </message> @@ -1118,14 +1344,14 @@ <context> <name>bitcoin-core</name> <message> - <source>Options:</source> - <translation>Opsies:</translation> - </message> - <message> <source>Error: Disk space is low!</source> <translation>Fout: Hardeskyf spasie is baie laag!</translation> </message> <message> + <source>Importing...</source> + <translation>Invoer proses tans besig..</translation> + </message> + <message> <source>Information</source> <translation>Informasie</translation> </message> diff --git a/src/qt/locale/bitcoin_ar.ts b/src/qt/locale/bitcoin_ar.ts index 3937367446..481e02c60e 100644 --- a/src/qt/locale/bitcoin_ar.ts +++ b/src/qt/locale/bitcoin_ar.ts @@ -7,7 +7,7 @@ </message> <message> <source>Create a new address</source> - <translation>انشأ عنوان جديد</translation> + <translation>انشاء عنوان جديد</translation> </message> <message> <source>&New</source> @@ -30,6 +30,10 @@ <translation>حذف العنوان المحدد من القائمة</translation> </message> <message> + <source>Enter address or label to search</source> + <translation>ادخل عنوان أووصف للبحث</translation> + </message> + <message> <source>Export the data in the current tab to a file</source> <translation>تحميل البيانات في علامة التبويب الحالية إلى ملف.</translation> </message> @@ -63,11 +67,11 @@ </message> <message> <source>These are your Bitcoin addresses for sending payments. Always check the amount and the receiving address before sending coins.</source> - <translation>هذه هي عناوين Bitcion التابعة لك من أجل إرسال الدفعات. تحقق دائما من المبلغ و عنوان المرسل المستقبل قبل إرسال العملات</translation> + <translation>هذه هي عناوين Bitcoin التابعة لك من أجل إرسال الدفعات. تحقق دائما من المبلغ و عنوان المرسل المستقبل قبل إرسال العملات</translation> </message> <message> <source>These are your Bitcoin addresses for receiving payments. It is recommended to use a new receiving address for each transaction.</source> - <translation>هذه هي عناوين Bitcion التابعة لك من أجل إستقبال الدفعات. ينصح استخدام عنوان جديد من أجل كل صفقة</translation> + <translation>هذه هي عناوين Bitcoin التابعة لك من أجل إستقبال الدفعات. ينصح استخدام عنوان جديد من أجل كل صفقة</translation> </message> <message> <source>&Copy Address</source> @@ -184,6 +188,10 @@ <translation>محفظة مشفرة</translation> </message> <message> + <source>%1 will close now to finish the encryption process. Remember that encrypting your wallet cannot fully protect your bitcoins from being stolen by malware infecting your computer.</source> + <translation>سيتم إغلاق %1 الآن لإنهاء عملية التشفير. تذكر أن تشفير محفظتك لا يمكن أن يحمي البتكوين الخاص بك بالكامل من السرقة عبر البرامج الضارة التي بامكانها أن تصيب جهاز الكمبيوتر الخاص بك.</translation> + </message> + <message> <source>IMPORTANT: Any previous backups you have made of your wallet file should be replaced with the newly generated, encrypted wallet file. For security reasons, previous backups of the unencrypted wallet file will become useless as soon as you start using the new, encrypted wallet.</source> <translation>هام: أي نسخة إحتياطية سابقة قمت بها لمحفظتك يجب استبدالها بأخرى حديثة، مشفرة. لأسباب أمنية، النسخ الاحتياطية السابقة لملفات المحفظة الغير مشفرة تصبح عديمة الفائدة مع بداية استخدام المحفظة المشفرة الجديدة.</translation> </message> @@ -330,8 +338,12 @@ <translation>اضغط لتفعيل الشبكه مره أخرى</translation> </message> <message> + <source>Syncing Headers (%1%)...</source> + <translation>مزامنة الرؤوس (%1%)...</translation> + </message> + <message> <source>Reindexing blocks on disk...</source> - <translation>إعادة الفهرسة الكتل على القرص ...</translation> + <translation>إعادة فهرسة الكتل على القرص ...</translation> </message> <message> <source>Send coins to a Bitcoin address</source> @@ -431,7 +443,7 @@ </message> <message> <source>Indexing blocks on disk...</source> - <translation>ترتيب الفهرسة الكتل على القرص...</translation> + <translation>ترتيب فهرسة الكتل على القرص...</translation> </message> <message> <source>Processing blocks on disk...</source> @@ -522,6 +534,14 @@ <translation>المعاملات الواردة</translation> </message> <message> + <source>HD key generation is <b>enabled</b></source> + <translation>توليد المفاتيح الهرمية الحتمية HD <b>مفعل</b></translation> + </message> + <message> + <source>HD key generation is <b>disabled</b></source> + <translation>توليد المفاتيح الهرمية الحتمية HD <b>معطل</b></translation> + </message> + <message> <source>Wallet is <b>encrypted</b> and currently <b>unlocked</b></source> <translation>المحفظة <b>مشفرة</b> و <b>مفتوحة</b> حاليا</translation> </message> @@ -621,6 +641,14 @@ <translation>نسخ رقم العملية</translation> </message> <message> + <source>Lock unspent</source> + <translation>قفل غير المنفق</translation> + </message> + <message> + <source>Unlock unspent</source> + <translation>فتح غير المنفق</translation> + </message> + <message> <source>Copy quantity</source> <translation>نسخ الكمية </translation> </message> @@ -637,6 +665,10 @@ <translation>نسخ البايتات </translation> </message> <message> + <source>Copy dust</source> + <translation>نسخ الغبار</translation> + </message> + <message> <source>Copy change</source> <translation>نسخ التعديل</translation> </message> @@ -649,6 +681,14 @@ <translation>لا</translation> </message> <message> + <source>This label turns red if any recipient receives an amount smaller than the current dust threshold.</source> + <translation>يتحول هذا الملصق إلى اللون الأحمر إذا تلقى أي مستلم كمية أصغر من عتبة الغبار الحالية.</translation> + </message> + <message> + <source>Can vary +/- %1 satoshi(s) per input.</source> + <translation>يمكن أن يختلف +/- %1 من ساتوشي(s) لكل إدخال.</translation> + </message> + <message> <source>(no label)</source> <translation>(لا وصف)</translation> </message> @@ -680,10 +720,6 @@ <translation>&العنوان</translation> </message> <message> - <source>New receiving address</source> - <translation>عنوان أستلام جديد</translation> - </message> - <message> <source>New sending address</source> <translation>عنوان إرسال جديد</translation> </message> @@ -700,10 +736,6 @@ <translation>العنوان المدخل "%1" ليس عنوان بيت كوين صحيح.</translation> </message> <message> - <source>The entered address "%1" is already in the address book.</source> - <translation>هدا العنوان "%1" موجود مسبقا في دفتر العناوين</translation> - </message> - <message> <source>Could not unlock wallet.</source> <translation> يمكن فتح المحفظة.</translation> </message> @@ -716,7 +748,7 @@ <name>FreespaceChecker</name> <message> <source>A new data directory will be created.</source> - <translation>سيتم انشاء دليل بيانات جديد</translation> + <translation>سيتم انشاء دليل بيانات جديد.</translation> </message> <message> <source>name</source> @@ -724,7 +756,7 @@ </message> <message> <source>Directory already exists. Add %1 if you intend to create a new directory here.</source> - <translation>الدليل موجوج بالفعل. أضف %1 لو نويت إنشاء دليل جديد هنا.</translation> + <translation>الدليل موجوج بالفعل. أضف %1 اذا نويت إنشاء دليل جديد هنا.</translation> </message> <message> <source>Path already exists, and is not a directory.</source> @@ -742,6 +774,10 @@ <translation>النسخة</translation> </message> <message> + <source>(%1-bit)</source> + <translation>(%1-بت)</translation> + </message> + <message> <source>About %1</source> <translation>حوالي %1</translation> </message> @@ -749,42 +785,6 @@ <source>Command-line options</source> <translation>خيارات سطر الأوامر</translation> </message> - <message> - <source>Usage:</source> - <translation>المستخدم</translation> - </message> - <message> - <source>command-line options</source> - <translation>خيارات سطر الأوامر</translation> - </message> - <message> - <source>UI Options:</source> - <translation>خيارات واجهة المستخدم</translation> - </message> - <message> - <source>Choose data directory on startup (default: %u)</source> - <translation>اختر دليل البيانات عند بدء التشغير (افتراضي: %u)</translation> - </message> - <message> - <source>Set language, for example "de_DE" (default: system locale)</source> - <translation>أضع لغة, على سبيل المثال " de_DE " (افتراضي:- مكان النظام)</translation> - </message> - <message> - <source>Start minimized</source> - <translation>الدخول مصغر</translation> - </message> - <message> - <source>Set SSL root certificates for payment request (default: -system-)</source> - <translation>أضع شهادة بروتوكول الشبقة الأمنية لطلب المدفوع (افتراضي: -نظام-)</translation> - </message> - <message> - <source>Show splash screen on startup (default: %u)</source> - <translation>أظهر شاشة البداية عند بدء التشغيل (افتراضي: %u)</translation> - </message> - <message> - <source>Reset all settings changed in the GUI</source> - <translation>اعد تعديل جميع النظم المتغيرة في GUI</translation> - </message> </context> <context> <name>Intro</name> @@ -801,6 +801,18 @@ <translation>بما انه هذه اول مرة لانطلاق هذا البرنامج, فيمكنك ان تختار اين سيخزن %1 بياناته</translation> </message> <message> + <source>When you click OK, %1 will begin to download and process the full %4 block chain (%2GB) starting with the earliest transactions in %3 when %4 initially launched.</source> + <translation>عند النقر على "موافق" ، سيبدأ %1 في تنزيل ومعالجة سلسلة الكتل %4 الكاملة (%2 جيجابايت) بدءًا من المعاملات الأقدم في %3 عند تشغيل %4 في البداية.</translation> + </message> + <message> + <source>This initial synchronisation is very demanding, and may expose hardware problems with your computer that had previously gone unnoticed. Each time you run %1, it will continue downloading where it left off.</source> + <translation>تُعد هذه المزامنة الأولية أمرًا شاقًا للغاية، وقد تعرض جهاز الكمبيوتر الخاص بك للمشاكل الذي لم يلاحظها أحد سابقًا. في كل مرة تقوم فيها بتشغيل %1، سيتابع التحميل من حيث تم التوقف.</translation> + </message> + <message> + <source>If you have chosen to limit block chain storage (pruning), the historical data must still be downloaded and processed, but will be deleted afterward to keep your disk usage low.</source> + <translation>إذا كنت قد اخترت تقييد تخزين سلسلة الكتل (التجريد)، فيجب تحميل البيانات القديمة ومعالجتها، ولكن سيتم حذفها بعد ذلك للحفاظ على انخفاض استخدام القرص.</translation> + </message> + <message> <source>Use the default data directory</source> <translation>استخدام دليل البانات الافتراضي</translation> </message> @@ -813,6 +825,22 @@ <translation>بتكوين</translation> </message> <message> + <source>At least %1 GB of data will be stored in this directory, and it will grow over time.</source> + <translation>سيتم تخزين %1 جيجابايت على الأقل من البيانات في هذا الدليل، وستنمو مع الوقت.</translation> + </message> + <message> + <source>Approximately %1 GB of data will be stored in this directory.</source> + <translation>سيتم تخزين %1 جيجابايت تقريباً من البيانات في هذا الدليل.</translation> + </message> + <message> + <source>%1 will download and store a copy of the Bitcoin block chain.</source> + <translation>سيقوم %1 بتنزيل نسخة من سلسلة كتل بتكوين وتخزينها.</translation> + </message> + <message> + <source>The wallet will also be stored in this directory.</source> + <translation>سوف يتم تخزين المحفظة في هذا الدليل.</translation> + </message> + <message> <source>Error: Specified data directory "%1" cannot be created.</source> <translation>خطأ: لا يمكن تكوين دليل بيانات مخصص ل %1</translation> </message> @@ -828,6 +856,14 @@ <translation>نمودج</translation> </message> <message> + <source>Recent transactions may not yet be visible, and therefore your wallet's balance might be incorrect. This information will be correct once your wallet has finished synchronizing with the bitcoin network, as detailed below.</source> + <translation>قد لا تكون المعاملات الأخيرة مرئية بعد، وبالتالي قد يكون رصيد محفظتك غير صحيح. ستكون هذه المعلومات صحيحة بمجرد الانتهاء من محفظتك مع شبكة البيتكوين، كما هو مفصل أدناه.</translation> + </message> + <message> + <source>Attempting to spend bitcoins that are affected by not-yet-displayed transactions will not be accepted by the network.</source> + <translation>لن تقبل الشبكة محاولة إنفاق البتكوين المتأثرة بالمعاملات التي لم يتم عرضها بعد.</translation> + </message> + <message> <source>Number of blocks left</source> <translation>عدد الكتل الفاضلة</translation> </message> @@ -859,7 +895,11 @@ <source>Hide</source> <translation>إخفاء</translation> </message> - </context> + <message> + <source>Unknown. Syncing Headers (%1)...</source> + <translation>غير معروف. مزامنة الرؤوس (%1) ...</translation> + </message> +</context> <context> <name>OpenURIDialog</name> <message> @@ -871,6 +911,10 @@ <translation>حدد طلب الدفع من ملف او URI</translation> </message> <message> + <source>URI:</source> + <translation>العنوان:</translation> + </message> + <message> <source>Select payment request file</source> <translation>حدد ملف طلب الدفع</translation> </message> @@ -890,14 +934,62 @@ <translation>&الرئيسي</translation> </message> <message> + <source>Automatically start %1 after logging in to the system.</source> + <translation>ابدأ تلقائيًا %1 بعد تسجيل الدخول إلى النظام.</translation> + </message> + <message> + <source>&Start %1 on system login</source> + <translation>تشغيل %1 عند الدخول إلى النظام</translation> + </message> + <message> + <source>Size of &database cache</source> + <translation>حجم ذاكرة التخزين المؤقت لقاعدة البيانات</translation> + </message> + <message> <source>MB</source> <translation>م ب</translation> </message> <message> + <source>Number of script &verification threads</source> + <translation>عدد مؤشرات التحقق من البرنامج النصي</translation> + </message> + <message> + <source>Shows if the supplied default SOCKS5 proxy is used to reach peers via this network type.</source> + <translation>إظهار ما إذا كان وكيل SOCKS5 الافتراضي الموفر تم استخدامه للوصول إلى النظراء عبر نوع الشبكة هذا.</translation> + </message> + <message> + <source>Use separate SOCKS&5 proxy to reach peers via Tor hidden services:</source> + <translation>استخدام وكيل SOCKS5 منفصل للوصول إلى الأقران عبر خدمات Tor المخفية:</translation> + </message> + <message> + <source>Hide the icon from the system tray.</source> + <translation>إخفاء الآيقونة من صينية النظام.</translation> + </message> + <message> + <source>&Hide tray icon</source> + <translation>اخفاء آيقونة الصينية</translation> + </message> + <message> + <source>Minimize instead of exit the application when the window is closed. When this option is enabled, the application will be closed only after selecting Exit in the menu.</source> + <translation>التصغير بدلاً من الخروج من التطبيق عند إغلاق النافذة. عند تفعيل هذا الخيار، سيتم إغلاق التطبيق فقط بعد اختيار الخروج من القائمة.</translation> + </message> + <message> + <source>Active command-line options that override above options:</source> + <translation>خيارات سطر الأوامر النشطة التي تتجاوز الخيارات أعلاه:</translation> + </message> + <message> + <source>Open the %1 configuration file from the working directory.</source> + <translation>فتح ملف الإعدادات %1 من الدليل العامل.</translation> + </message> + <message> <source>Open Configuration File</source> <translation>فتح ملف الإعدادات</translation> </message> <message> + <source>Reset all client options to default.</source> + <translation>إعادة تعيين كل إعدادات العميل للحالة الإفتراضية.</translation> + </message> + <message> <source>&Reset Options</source> <translation>&استعادة الخيارات</translation> </message> @@ -914,6 +1006,34 @@ <translation>تصدير</translation> </message> <message> + <source>Enable coin &control features</source> + <translation>تفعيل ميزات التحكم في العملة</translation> + </message> + <message> + <source>&Spend unconfirmed change</source> + <translation>دفع الفكة غير المؤكدة</translation> + </message> + <message> + <source>Map port using &UPnP</source> + <translation>ربط المنفذ باستخدام UPnP</translation> + </message> + <message> + <source>Accept connections from outside.</source> + <translation>قبول الاتصالات من الخارج.</translation> + </message> + <message> + <source>Allow incomin&g connections</source> + <translation>السماح بالاتصالات الواردة.</translation> + </message> + <message> + <source>Connect to the Bitcoin network through a SOCKS5 proxy.</source> + <translation>الاتصال بشبكة البتكوين عبر وكيل SOCKS5.</translation> + </message> + <message> + <source>&Connect through SOCKS5 proxy (default proxy):</source> + <translation>الاتصال من خلال وكيل SOCKS5 (الوكيل الافتراضي):</translation> + </message> + <message> <source>Proxy &IP:</source> <translation>بروكسي &اي بي:</translation> </message> @@ -942,10 +1062,26 @@ <translation>تور</translation> </message> <message> + <source>Connect to the Bitcoin network through a separate SOCKS5 proxy for Tor hidden services.</source> + <translation>قم بالاتصال بشبكة بتكوين عبر وكيل SOCKS5 منفصل لخدمات تور المخفية.</translation> + </message> + <message> <source>&Window</source> <translation>نافذه</translation> </message> <message> + <source>Show only a tray icon after minimizing the window.</source> + <translation>إظهار آيقونة الصينية فقط بعد تصغير النافذة.</translation> + </message> + <message> + <source>&Minimize to the tray instead of the taskbar</source> + <translation>التصغير إلى صينية النظام بدلاً من شريط المهام</translation> + </message> + <message> + <source>M&inimize on close</source> + <translation>تصغير عند الإغلاق</translation> + </message> + <message> <source>&Display</source> <translation>&عرض</translation> </message> @@ -954,6 +1090,22 @@ <translation>واجهة المستخدم &اللغة:</translation> </message> <message> + <source>&Unit to show amounts in:</source> + <translation>الوحدة لإظهار المبالغ فيها:</translation> + </message> + <message> + <source>Choose the default subdivision unit to show in the interface and when sending coins.</source> + <translation>اختر وحدة التقسيم الفرعية الافتراضية للعرض في الواجهة وعند إرسال العملات.</translation> + </message> + <message> + <source>Whether to show coin control features or not.</source> + <translation>ما اذا أردت إظهار ميزات التحكم في العملة أم لا.</translation> + </message> + <message> + <source>&Third party transaction URLs</source> + <translation>العناوين (URL) لجهات خارجية</translation> + </message> + <message> <source>&OK</source> <translation>تم</translation> </message> @@ -974,6 +1126,14 @@ <translation>تأكيد استعادة الخيارات</translation> </message> <message> + <source>Client restart required to activate changes.</source> + <translation>يتطلب إعادة تشغيل العميل لتفعيل التغييرات.</translation> + </message> + <message> + <source>Client will be shut down. Do you want to proceed?</source> + <translation>سوف يتم إيقاف العميل تماماً. هل تريد الإستمرار؟</translation> + </message> + <message> <source>Configuration options</source> <translation>إعداد الخيارات</translation> </message> @@ -982,6 +1142,14 @@ <translation>خطأ</translation> </message> <message> + <source>The configuration file could not be opened.</source> + <translation>لم تتمكن من فتح ملف الإعدادات.</translation> + </message> + <message> + <source>This change would require a client restart.</source> + <translation>هذا التغيير يتطلب إعادة تشغيل العميل بشكل كامل.</translation> + </message> + <message> <source>The supplied proxy address is invalid.</source> <translation>عنوان الوكيل توفيره غير صالح.</translation> </message> @@ -993,18 +1161,42 @@ <translation>نمودج</translation> </message> <message> + <source>The displayed information may be out of date. Your wallet automatically synchronizes with the Bitcoin network after a connection is established, but this process has not completed yet.</source> + <translation>قد تكون المعلومات المعروضة قديمة. تتزامن محفظتك تلقائيًا مع شبكة البتكوين بعد إنشاء الاتصال، ولكن هذه العملية لم تكتمل بعد.</translation> + </message> + <message> + <source>Watch-only:</source> + <translation>مشاهدة فقط:</translation> + </message> + <message> <source>Available:</source> <translation>متوفر</translation> </message> <message> + <source>Your current spendable balance</source> + <translation>رصيدك القابل للصرف</translation> + </message> + <message> <source>Pending:</source> <translation>معلق:</translation> </message> <message> + <source>Total of transactions that have yet to be confirmed, and do not yet count toward the spendable balance</source> + <translation>إجمالي المعاملات التي لم يتم تأكيدها بعد ولا تحتسب ضمن الرصيد القابل للانفاق</translation> + </message> + <message> <source>Immature:</source> <translation>غير ناضجة</translation> </message> <message> + <source>Mined balance that has not yet matured</source> + <translation>الرصيد المعدّن الذي لم ينضج بعد</translation> + </message> + <message> + <source>Balances</source> + <translation>الأرصدة</translation> + </message> + <message> <source>Total:</source> <translation>المجموع:</translation> </message> @@ -1012,17 +1204,137 @@ <source>Your current total balance</source> <translation>رصيدك الكلي الحالي</translation> </message> - </context> + <message> + <source>Your current balance in watch-only addresses</source> + <translation>رصيدك الحالي في العناوين المشاهدة فقط</translation> + </message> + <message> + <source>Spendable:</source> + <translation>قابل للصرف:</translation> + </message> + <message> + <source>Recent transactions</source> + <translation>أحدث المعاملات</translation> + </message> + <message> + <source>Unconfirmed transactions to watch-only addresses</source> + <translation>معاملات غير مؤكدة للعناوين المشاهدة فقط</translation> + </message> + <message> + <source>Mined balance in watch-only addresses that has not yet matured</source> + <translation>الرصيد المعدّن في العناوين المشاهدة فقط التي لم تنضج بعد</translation> + </message> + <message> + <source>Current total balance in watch-only addresses</source> + <translation>الرصيد الإجمالي الحالي في العناوين المشاهدة فقط</translation> + </message> +</context> <context> <name>PaymentServer</name> <message> + <source>Payment request error</source> + <translation>خطأ في طلب الدفع</translation> + </message> + <message> + <source>Cannot start bitcoin: click-to-pay handler</source> + <translation>لا يمكن تشغيل بتكوين: معالج النقر للدفع</translation> + </message> + <message> + <source>URI handling</source> + <translation>التعامل مع العنوان</translation> + </message> + <message> + <source>Invalid payment address %1</source> + <translation>عنوان الدفع غير صالح %1</translation> + </message> + <message> + <source>URI cannot be parsed! This can be caused by an invalid Bitcoin address or malformed URI parameters.</source> + <translation>لا يمكن تحليل العنوان (URI)! يمكن أن يحدث هذا بسبب عنوان بتكوين غير صالح أو معلمات عنوان (URI) غير صحيحة.</translation> + </message> + <message> + <source>Payment request file handling</source> + <translation>التعامل مع ملف طلب الدفع</translation> + </message> + <message> + <source>Payment request file cannot be read! This can be caused by an invalid payment request file.</source> + <translation>لا يمكن قراءة ملف طلب الدفع! يمكن أن يحدث هذا بسبب ملف لطلب الدفع غير صالح.</translation> + </message> + <message> + <source>Payment request rejected</source> + <translation>تم رفض طلب الدفع</translation> + </message> + <message> + <source>Payment request network doesn't match client network.</source> + <translation>لا تتطابق شبكة طلب الدفع مع شبكة العميل.</translation> + </message> + <message> + <source>Payment request expired.</source> + <translation>انتهاء صلاحية طلب الدفع.</translation> + </message> + <message> + <source>Payment request is not initialized.</source> + <translation>لم يتم تهيئة طلب الدفع.</translation> + </message> + <message> + <source>Unverified payment requests to custom payment scripts are unsupported.</source> + <translation>طلبات الدفع غير المؤكدة إلى نصوص الدفع المخصصة غير مدعومة.</translation> + </message> + <message> + <source>Invalid payment request.</source> + <translation>طلب دفع غير صالح.</translation> + </message> + <message> + <source>Requested payment amount of %1 is too small (considered dust).</source> + <translation>المبلغ المطلوب للدفع %1 صغير جداً (يعتبر غبار).</translation> + </message> + <message> + <source>Refund from %1</source> + <translation>إعادة مال من %1</translation> + </message> + <message> + <source>Payment request %1 is too large (%2 bytes, allowed %3 bytes).</source> + <translation>طلب الدفع %1 كبير جداً (%2 بايت، المسموح به %3 بايت).</translation> + </message> + <message> + <source>Error communicating with %1: %2</source> + <translation>حدث خطأ في الاتصال بـ %1: %2</translation> + </message> + <message> + <source>Payment request cannot be parsed!</source> + <translation>لا يمكن تحليل طلب الدفع!</translation> + </message> + <message> <source>Bad response from server %1</source> <translation>استجابة سيئة من الملقم %1</translation> </message> - </context> + <message> + <source>Network request error</source> + <translation>خطأ في طلب الشبكة</translation> + </message> + <message> + <source>Payment acknowledged</source> + <translation>اعتراف بالدفع</translation> + </message> +</context> <context> <name>PeerTableModel</name> <message> + <source>User Agent</source> + <translation>وكيل المستخدم</translation> + </message> + <message> + <source>Node/Service</source> + <translation>عقدة/خدمة</translation> + </message> + <message> + <source>NodeId</source> + <translation>رقم العقدة</translation> + </message> + <message> + <source>Ping</source> + <translation>رنين</translation> + </message> + <message> <source>Sent</source> <translation>تم الإرسال</translation> </message> @@ -1038,6 +1350,14 @@ <translation>مبلغ</translation> </message> <message> + <source>Enter a Bitcoin address (e.g. %1)</source> + <translation>ادخل عنوان محفطة البتكوين (مثال %1)</translation> + </message> + <message> + <source>%1 d</source> + <translation>%1 يوم</translation> + </message> + <message> <source>%1 h</source> <translation>%1 ساعة</translation> </message> @@ -1046,10 +1366,22 @@ <translation>%1 دقيقة</translation> </message> <message> + <source>%1 s</source> + <translation>%1 ثانية</translation> + </message> + <message> + <source>None</source> + <translation>لا شيء</translation> + </message> + <message> <source>N/A</source> <translation>غير معروف</translation> </message> <message> + <source>%1 ms</source> + <translation>%1 جزء من الثانية</translation> + </message> + <message> <source>%1 and %2</source> <translation>%1 و %2</translation> </message> @@ -1070,13 +1402,25 @@ <translation>%1 قيقا بايت</translation> </message> <message> + <source>%1 didn't yet exit safely...</source> + <translation>%1 لم يخرج بعد بأمان...</translation> + </message> + <message> <source>unknown</source> <translation>غير معروف</translation> </message> </context> <context> <name>QObject::QObject</name> - </context> + <message> + <source>Error: Specified data directory "%1" does not exist.</source> + <translation>خطأ: دليل البيانات المحدد "%1" غير موجود.</translation> + </message> + <message> + <source>Error: %1</source> + <translation>خطأ: %1</translation> + </message> +</context> <context> <name>QRImageWidget</name> <message> @@ -1119,6 +1463,14 @@ <translation>عام</translation> </message> <message> + <source>Using BerkeleyDB version</source> + <translation>باستخدام BerkeleyDB إصدار</translation> + </message> + <message> + <source>Datadir</source> + <translation>دليل البيانات</translation> + </message> + <message> <source>Startup time</source> <translation>وقت البدء</translation> </message> @@ -1139,6 +1491,26 @@ <translation>سلسلة الكتل</translation> </message> <message> + <source>Current number of blocks</source> + <translation>عدد الكتل الحالي</translation> + </message> + <message> + <source>Memory Pool</source> + <translation>تجمع الذاكرة</translation> + </message> + <message> + <source>Current number of transactions</source> + <translation>عدد المعاملات الحالي</translation> + </message> + <message> + <source>Memory usage</source> + <translation>استخدام الذاكرة</translation> + </message> + <message> + <source>&Reset</source> + <translation>إعادة تعيين</translation> + </message> + <message> <source>Received</source> <translation>إستقبل</translation> </message> @@ -1151,6 +1523,18 @@ <translation>&اصدقاء</translation> </message> <message> + <source>Banned peers</source> + <translation>الأقران الممنوعين</translation> + </message> + <message> + <source>Select a peer to view detailed information.</source> + <translation>حدد نظير لعرض معلومات مفصلة.</translation> + </message> + <message> + <source>Whitelisted</source> + <translation>اللائحة البيضاء</translation> + </message> + <message> <source>Direction</source> <translation>جهة</translation> </message> @@ -1163,10 +1547,38 @@ <translation>كتلة البداية</translation> </message> <message> + <source>Synced Headers</source> + <translation>رؤوس متزامنة</translation> + </message> + <message> + <source>Synced Blocks</source> + <translation>كتل متزامنة</translation> + </message> + <message> + <source>User Agent</source> + <translation>وكيل المستخدم</translation> + </message> + <message> + <source>Decrease font size</source> + <translation>تصغير حجم الخط</translation> + </message> + <message> + <source>Increase font size</source> + <translation>تكبير حجم الخط</translation> + </message> + <message> <source>Services</source> <translation>خدمات</translation> </message> <message> + <source>Ban Score</source> + <translation>نقاط الحظر</translation> + </message> + <message> + <source>Connection Time</source> + <translation>مدة الاتصال</translation> + </message> + <message> <source>Last Send</source> <translation>آخر استقبال</translation> </message> @@ -1175,6 +1587,26 @@ <translation>آخر إرسال</translation> </message> <message> + <source>Ping Time</source> + <translation>وقت الرنين</translation> + </message> + <message> + <source>The duration of a currently outstanding ping.</source> + <translation>مدة الرنين المعلقة حالياً.</translation> + </message> + <message> + <source>Ping Wait</source> + <translation>انتظار الرنين</translation> + </message> + <message> + <source>Min Ping</source> + <translation>أقل رنين</translation> + </message> + <message> + <source>Time Offset</source> + <translation>إزاحة الوقت</translation> + </message> + <message> <source>Last block time</source> <translation>اخر وقت الكتلة</translation> </message> @@ -1183,6 +1615,10 @@ <translation>الفتح</translation> </message> <message> + <source>&Console</source> + <translation>وحدة التحكم</translation> + </message> + <message> <source>&Network Traffic</source> <translation>&حركة مرور الشبكة</translation> </message> @@ -1199,6 +1635,14 @@ <translation>خارج:</translation> </message> <message> + <source>Debug log file</source> + <translation>تصحيح ملف السجل</translation> + </message> + <message> + <source>Clear console</source> + <translation>مسح وحدة التحكم</translation> + </message> + <message> <source>1 &hour</source> <translation>1 &ساعة</translation> </message> @@ -1215,6 +1659,50 @@ <translation>1 & سنة</translation> </message> <message> + <source>&Disconnect</source> + <translation>قطع الاتصال</translation> + </message> + <message> + <source>Ban for</source> + <translation>حظر ل</translation> + </message> + <message> + <source>&Unban</source> + <translation>رفع الحظر</translation> + </message> + <message> + <source>Welcome to the %1 RPC console.</source> + <translation>مرحبًا بك في وحدة التحكم %1 RPC.</translation> + </message> + <message> + <source>Use up and down arrows to navigate history, and %1 to clear screen.</source> + <translation>استخدم السهمين لأعلى ولأسفل لتصفح السجل، و%1 لمسح الشاشة.</translation> + </message> + <message> + <source>Type %1 for an overview of available commands.</source> + <translation>اكتب %1 للحصول على نظرة عامة على الأوامر المتوفرة.</translation> + </message> + <message> + <source>For more information on using this console type %1.</source> + <translation>لمزيد من المعلومات حول استخدام نوع وحدة التحكم هذه اكتب %1.</translation> + </message> + <message> + <source>WARNING: Scammers have been active, telling users to type commands here, stealing their wallet contents. Do not use this console without fully understanding the ramifications of a command.</source> + <translation>تحذير: المخادعون نشطون، ويطلبون من المستخدمين كتابة الأوامر هنا، من أجل سرقة محتويات محفظتهم. لا تستخدم وحدة التحكم هذه بدون فهم تبعات الأمر بشكل كامل.</translation> + </message> + <message> + <source>Network activity disabled</source> + <translation>تم تعطيل نشاط الشبكة</translation> + </message> + <message> + <source>(node id: %1)</source> + <translation>(معرف العقدة: %1)</translation> + </message> + <message> + <source>via %1</source> + <translation>خلال %1</translation> + </message> + <message> <source>never</source> <translation>ابدا</translation> </message> @@ -1254,6 +1742,22 @@ <translation>&رسالة:</translation> </message> <message> + <source>An optional message to attach to the payment request, which will be displayed when the request is opened. Note: The message will not be sent with the payment over the Bitcoin network.</source> + <translation>رسالة اختيارية لإرفاقها بطلب الدفع، والتي سيتم عرضها عند فتح الطلب. ملاحظة: لن يتم إرسال الرسالة مع الدفعة عبر شبكة البتكوين.</translation> + </message> + <message> + <source>An optional label to associate with the new receiving address.</source> + <translation>تسمية اختيارية لربطها بعنوان المستلم الجديد.</translation> + </message> + <message> + <source>Use this form to request payments. All fields are <b>optional</b>.</source> + <translation>استخدم هذا النموذج لطلب الدفعات. جميع الحقول <b>اختيارية</b>.</translation> + </message> + <message> + <source>An optional amount to request. Leave this empty or zero to not request a specific amount.</source> + <translation>مبلغ اختياري للطلب. اترك هذا فارغًا أو صفراً لعدم طلب مبلغ محدد.</translation> + </message> + <message> <source>Clear all fields of the form.</source> <translation>مسح كل حقول النموذج المطلوبة</translation> </message> @@ -1266,14 +1770,30 @@ <translation>سجل طلبات الدفع</translation> </message> <message> + <source>&Request payment</source> + <translation>&طلب دفعة</translation> + </message> + <message> + <source>Show the selected request (does the same as double clicking an entry)</source> + <translation>إظهار الطلب المحدد (يقوم بنفس نتيجة النقر المزدوج على أي إدخال)</translation> + </message> + <message> <source>Show</source> <translation>عرض</translation> </message> <message> + <source>Remove the selected entries from the list</source> + <translation>قم بإزالة الإدخالات المحددة من القائمة</translation> + </message> + <message> <source>Remove</source> <translation>ازل</translation> </message> <message> + <source>Copy URI</source> + <translation>نسخ العنوان</translation> + </message> + <message> <source>Copy label</source> <translation> انسخ التسمية</translation> </message> @@ -1305,6 +1825,10 @@ <translation>&حفظ الصورة</translation> </message> <message> + <source>Request payment to %1</source> + <translation>طلب الدفعة إلى %1</translation> + </message> + <message> <source>Payment information</source> <translation>معلومات الدفع</translation> </message> @@ -1328,7 +1852,19 @@ <source>Message</source> <translation>رسالة </translation> </message> - </context> + <message> + <source>Wallet</source> + <translation>محفظة</translation> + </message> + <message> + <source>Resulting URI too long, try to reduce the text for label / message.</source> + <translation>العنوان المستخدم طويل جدًا، حاول أن تقوم بتقليل نص التسمية / الرسالة.</translation> + </message> + <message> + <source>Error encoding URI into QR Code.</source> + <translation>خطأ في ترميز العنوان إلى الرمز المربع.</translation> + </message> +</context> <context> <name>RecentRequestsTableModel</name> <message> @@ -1351,7 +1887,15 @@ <source>(no message)</source> <translation>( لا رسائل )</translation> </message> - </context> + <message> + <source>(no amount requested)</source> + <translation>(لا يوجد مبلغ مطلوب)</translation> + </message> + <message> + <source>Requested</source> + <translation>تم الطلب</translation> + </message> +</context> <context> <name>SendCoinsDialog</name> <message> @@ -1359,6 +1903,14 @@ <translation>إرسال Coins</translation> </message> <message> + <source>Coin Control Features</source> + <translation>ميزات التحكم بالعملة</translation> + </message> + <message> + <source>Inputs...</source> + <translation>المدخلات...</translation> + </message> + <message> <source>automatically selected</source> <translation>اختيار تلقائيا</translation> </message> @@ -1391,6 +1943,14 @@ <translation>تعديل :</translation> </message> <message> + <source>If this is activated, but the change address is empty or invalid, change will be sent to a newly generated address.</source> + <translation>إذا تم تنشيط هذا، ولكن عنوان الفكة فارغ أو غير صالح، فسيتم إرسال الفكة إلى عنوان تم إنشاؤه حديثًا.</translation> + </message> + <message> + <source>Custom change address</source> + <translation>تغيير عنوان الفكة</translation> + </message> + <message> <source>Transaction Fee:</source> <translation>رسوم المعاملة:</translation> </message> @@ -1399,10 +1959,42 @@ <translation>إختر …</translation> </message> <message> + <source>Warning: Fee estimation is currently not possible.</source> + <translation>تحذير: تقدير الرسوم غير ممكن في الوقت الحالي.</translation> + </message> + <message> + <source>collapse fee-settings</source> + <translation>خفض اعدادات الرسوم</translation> + </message> + <message> + <source>per kilobyte</source> + <translation>لكل كيلوبايت</translation> + </message> + <message> <source>Hide</source> <translation>إخفاء</translation> </message> <message> + <source>Paying only the minimum fee is just fine as long as there is less transaction volume than space in the blocks. But be aware that this can end up in a never confirming transaction once there is more demand for bitcoin transactions than the network can process.</source> + <translation>إن دفع الحد الأدنى فقط من الرسوم يجوز طالما أن حجم المعاملات أقل من المساحة الموجودة في الكتل. ولكن كن على علم بأن هذا يمكن أن ينتهي في معاملة غير مؤكدة أبداً عندما يكون هناك طلب أكبر على معاملات البتكوين مما تستطيع الشبكة معالجته.</translation> + </message> + <message> + <source>(read the tooltip)</source> + <translation>(اقرأ تلميح الأدوات)</translation> + </message> + <message> + <source>Recommended:</source> + <translation>موصى به:</translation> + </message> + <message> + <source>Custom:</source> + <translation>تخصيص:</translation> + </message> + <message> + <source>(Smart fee not initialized yet. This usually takes a few blocks...)</source> + <translation>(الرسوم الذكية لم يتم تهيئتها بعد. عادة ما يستغرق ذلك بضع كتل ...)</translation> + </message> + <message> <source>Send to multiple recipients at once</source> <translation>إرسال إلى عدة مستلمين في وقت واحد</translation> </message> @@ -1419,6 +2011,18 @@ <translation>غبار:</translation> </message> <message> + <source>Confirmation time target:</source> + <translation>هدف وقت التأكيد:</translation> + </message> + <message> + <source>Enable Replace-By-Fee</source> + <translation>تفعيل الإستبدال بواسطة الرسوم</translation> + </message> + <message> + <source>With Replace-By-Fee (BIP-125) you can increase a transaction's fee after it is sent. Without this, a higher fee may be recommended to compensate for increased transaction delay risk.</source> + <translation>مع الإستبدال بواسطة الرسوم (BIP-125) يمكنك زيادة رسوم المعاملة بعد إرسالها. وبدون ذلك، قد نوصي برسوم أعلى للتعويض عن مخاطر تأخير المعاملة المتزايدة.</translation> + </message> + <message> <source>Clear &All</source> <translation>مسح الكل</translation> </message> @@ -1455,22 +2059,50 @@ <translation>نسخ البايتات </translation> </message> <message> + <source>Copy dust</source> + <translation>نسخ الغبار</translation> + </message> + <message> <source>Copy change</source> <translation>نسخ التعديل</translation> </message> <message> + <source>%1 (%2 blocks)</source> + <translation>%1 (%2 كثلة)</translation> + </message> + <message> <source>%1 to %2</source> <translation>%1 الى %2</translation> </message> <message> + <source>Are you sure you want to send?</source> + <translation>هل أنت متأكد من أنك تريد أن ترسل؟</translation> + </message> + <message> <source>or</source> <translation>أو</translation> </message> <message> + <source>You can increase the fee later (signals Replace-By-Fee, BIP-125).</source> + <translation>يمكنك زيادة الرسوم لاحقًا (بإشارة الإستبدال بواسطة الرسوم، BIP-125).</translation> + </message> + <message> + <source>Transaction fee</source> + <translation>رسوم المعاملة</translation> + </message> + <message> + <source>Not signalling Replace-By-Fee, BIP-125.</source> + <translation>لا يشير إلى الإستبدال بواسطة الرسوم، BIP-125.</translation> + </message> + <message> <source>Confirm send coins</source> <translation>تأكيد الإرسال Coins</translation> </message> <message> + <source>The recipient address is not valid. Please recheck.</source> + <translation>عنوان المستلم غير صالح. يرجى إعادة الفحص.</translation> + </message> + <message> <source>The amount to pay must be larger than 0.</source> <translation>المبلغ المدفوع يجب ان يكون اكبر من 0</translation> </message> @@ -1483,6 +2115,42 @@ <translation>المجموع يتجاوز رصيدك عندما يتم اضافة %1 رسوم العملية</translation> </message> <message> + <source>Duplicate address found: addresses should only be used once each.</source> + <translation>تم العثور على عنوان مكرر: يجب استخدام العناوين مرة واحدة فقط.</translation> + </message> + <message> + <source>Transaction creation failed!</source> + <translation>فشل في إنشاء المعاملة!</translation> + </message> + <message> + <source>The transaction was rejected with the following reason: %1</source> + <translation>تم رفض المعاملة للسبب التالي: %1</translation> + </message> + <message> + <source>A fee higher than %1 is considered an absurdly high fee.</source> + <translation>تعتبر الرسوم الأعلى من %1 رسوماً باهظة.</translation> + </message> + <message> + <source>Payment request expired.</source> + <translation>انتهاء صلاحية طلب الدفع.</translation> + </message> + <message> + <source>Pay only the required fee of %1</source> + <translation>دفع فقط الرسوم المطلوبة ل %1</translation> + </message> + <message> + <source>Warning: Invalid Bitcoin address</source> + <translation>تحذير: عنوان بتكوين غير صالح</translation> + </message> + <message> + <source>Warning: Unknown change address</source> + <translation>تحذير: عنوان الفكة غير معروف</translation> + </message> + <message> + <source>Confirm custom change address</source> + <translation>تأكيد تغيير العنوان الفكة</translation> + </message> + <message> <source>(no label)</source> <translation>(لا وصف)</translation> </message> @@ -1530,14 +2198,46 @@ <translation>ازل هذه المداخله</translation> </message> <message> + <source>The fee will be deducted from the amount being sent. The recipient will receive less bitcoins than you enter in the amount field. If multiple recipients are selected, the fee is split equally.</source> + <translation>سيتم خصم الرسوم من المبلغ الذي يتم إرساله. لذا سوف يتلقى المستلم مبلغ أقل من البتكوين المدخل في حقل المبلغ. في حالة تحديد عدة مستلمين، يتم تقسيم الرسوم بالتساوي.</translation> + </message> + <message> + <source>S&ubtract fee from amount</source> + <translation>طرح الرسوم من المبلغ</translation> + </message> + <message> + <source>Use available balance</source> + <translation>استخدام الرصيد المتاح</translation> + </message> + <message> <source>Message:</source> <translation>الرسائل</translation> </message> <message> + <source>This is an unauthenticated payment request.</source> + <translation>هذا طلب دفع لم يتم مصادقته.</translation> + </message> + <message> + <source>This is an authenticated payment request.</source> + <translation>هذا طلب دفع تمت مصادقته.</translation> + </message> + <message> + <source>Enter a label for this address to add it to the list of used addresses</source> + <translation>أدخل تسمية لهذا العنوان لإضافته إلى قائمة العناوين المستخدمة</translation> + </message> + <message> + <source>A message that was attached to the bitcoin: URI which will be stored with the transaction for your reference. Note: This message will not be sent over the Bitcoin network.</source> + <translation>الرسالة التي تم إرفاقها مع البتكوين: العنوان الذي سيتم تخزينه مع المعاملة للرجوع إليه. ملاحظة: لن يتم إرسال هذه الرسالة عبر شبكة البتكوين.</translation> + </message> + <message> <source>Pay To:</source> <translation>ادفع &الى :</translation> </message> <message> + <source>Memo:</source> + <translation>مذكرة:</translation> + </message> + <message> <source>Enter a label for this address to add it to your address book</source> <translation>إدخال تسمية لهذا العنوان لإضافته إلى دفتر العناوين الخاص بك</translation> </message> @@ -1552,6 +2252,10 @@ <context> <name>ShutdownWindow</name> <message> + <source>%1 is shutting down...</source> + <translation>اتمام إيقاف %1...</translation> + </message> + <message> <source>Do not shut down the computer until this window disappears.</source> <translation>لا توقف عمل الكمبيوتر حتى تختفي هذه النافذة</translation> </message> @@ -1559,10 +2263,18 @@ <context> <name>SignVerifyMessageDialog</name> <message> + <source>Signatures - Sign / Verify a Message</source> + <translation>التواقيع - التوقيع / التحقق من الرسالة</translation> + </message> + <message> <source>&Sign Message</source> <translation>&توقيع الرسالة</translation> </message> <message> + <source>The Bitcoin address to sign the message with</source> + <translation>عنوان البتكوين لتوقيع الرسالة به</translation> + </message> + <message> <source>Choose previously used address</source> <translation>اختر عنوانا مستخدم سابقا</translation> </message> @@ -1587,6 +2299,10 @@ <translation>التوقيع</translation> </message> <message> + <source>Copy the current signature to the system clipboard</source> + <translation>نسخ التوقيع الحالي إلى حافظة النظام</translation> + </message> + <message> <source>Sign the message to prove you own this Bitcoin address</source> <translation>وقع الرسالة لتثبت انك تمتلك عنوان البت كوين هذا</translation> </message> @@ -1595,6 +2311,10 @@ <translation>توقيع $الرسالة</translation> </message> <message> + <source>Reset all sign message fields</source> + <translation>إعادة تعيين كافة حقول رسالة التوقيع</translation> + </message> + <message> <source>Clear &All</source> <translation>مسح الكل</translation> </message> @@ -1603,10 +2323,22 @@ <translation>&تحقق رسالة</translation> </message> <message> + <source>The Bitcoin address the message was signed with</source> + <translation>عنوان البتكوين الذي تم توقيع الرسالة به</translation> + </message> + <message> + <source>Verify the message to ensure it was signed with the specified Bitcoin address</source> + <translation>تحقق من الرسالة للتأكد من توقيعها مع عنوان البتكوين المحدد</translation> + </message> + <message> <source>Verify &Message</source> <translation>تحقق &الرسالة</translation> </message> <message> + <source>Reset all verify message fields</source> + <translation>إعادة تعيين جميع حقول التحقق من الرسالة</translation> + </message> + <message> <source>Click "Sign Message" to generate signature</source> <translation>اضغط "توقيع الرسالة" لتوليد التوقيع</translation> </message> @@ -1639,10 +2371,18 @@ <translation>الرسالة موقعة.</translation> </message> <message> + <source>The signature could not be decoded.</source> + <translation>لا يمكن فك تشفير التوقيع.</translation> + </message> + <message> <source>Please check the signature and try again.</source> <translation>فضلا تاكد من التوقيع وحاول مرة اخرى</translation> </message> <message> + <source>The signature did not match the message digest.</source> + <translation>لم يتطابق التوقيع مع ملخص الرسالة.</translation> + </message> + <message> <source>Message verification failed.</source> <translation>فشلت عملية التأكد من الرسالة.</translation> </message> @@ -1660,7 +2400,11 @@ </context> <context> <name>TrafficGraphWidget</name> - </context> + <message> + <source>KB/s</source> + <translation>كيلوبايت/ث</translation> + </message> +</context> <context> <name>TransactionDesc</name> <message> @@ -1668,8 +2412,20 @@ <translation>مفتوح حتى %1</translation> </message> <message> - <source>%1/offline</source> - <translation>%1 غير متواجد</translation> + <source>conflicted with a transaction with %1 confirmations</source> + <translation>تعارضت مع معاملة لديها %1 تأكيدات</translation> + </message> + <message> + <source>in memory pool</source> + <translation>في تجمع الذاكرة</translation> + </message> + <message> + <source>not in memory pool</source> + <translation>ليس في تجمع الذاكرة</translation> + </message> + <message> + <source>abandoned</source> + <translation>مهجور</translation> </message> <message> <source>%1/unconfirmed</source> @@ -1684,10 +2440,6 @@ <translation>الحالة.</translation> </message> <message> - <source>, has not been successfully broadcast yet</source> - <translation>, لم يتم حتى الآن البث بنجاح</translation> - </message> - <message> <source>Date</source> <translation>تاريخ</translation> </message> @@ -1724,6 +2476,10 @@ <translation>علامة</translation> </message> <message> + <source>Credit</source> + <translation>رصيد</translation> + </message> + <message> <source>not accepted</source> <translation>غير مقبولة</translation> </message> @@ -1732,10 +2488,22 @@ <translation>دين</translation> </message> <message> + <source>Total debit</source> + <translation>إجمالي الخصم</translation> + </message> + <message> + <source>Total credit</source> + <translation>إجمالي الرصيد</translation> + </message> + <message> <source>Transaction fee</source> <translation>رسوم المعاملة</translation> </message> <message> + <source>Net amount</source> + <translation>صافي المبلغ</translation> + </message> + <message> <source>Message</source> <translation>رسالة </translation> </message> @@ -1748,14 +2516,30 @@ <translation>رقم المعاملة</translation> </message> <message> + <source>Transaction total size</source> + <translation>الحجم الكلي للمعاملات</translation> + </message> + <message> + <source>Output index</source> + <translation>مؤشر المخرجات</translation> + </message> + <message> <source>Merchant</source> <translation>تاجر</translation> </message> <message> + <source>Debug information</source> + <translation>معلومات التصحيح</translation> + </message> + <message> <source>Transaction</source> <translation>معاملة</translation> </message> <message> + <source>Inputs</source> + <translation>المدخلات</translation> + </message> + <message> <source>Amount</source> <translation>مبلغ</translation> </message> @@ -1774,7 +2558,11 @@ <source>This pane shows a detailed description of the transaction</source> <translation>يبين هذا الجزء وصفا مفصلا لهده المعاملة</translation> </message> - </context> + <message> + <source>Details for %1</source> + <translation>تفاصيل عن %1</translation> + </message> +</context> <context> <name>TransactionTableModel</name> <message> @@ -1794,16 +2582,24 @@ <translation>مفتوح حتى %1</translation> </message> <message> - <source>Offline</source> - <translation>غير متصل</translation> + <source>Unconfirmed</source> + <translation>غير مؤكد</translation> + </message> + <message> + <source>Abandoned</source> + <translation>مهجور</translation> + </message> + <message> + <source>Confirming (%1 of %2 recommended confirmations)</source> + <translation>قيد التأكيد (%1 من %2 تأكيد موصى به)</translation> </message> <message> <source>Conflicted</source> <translation>يتعارض</translation> </message> <message> - <source>This block was not received by any other nodes and will probably not be accepted!</source> - <translation>لم يتم تلقى هذه الكتلة (Block) من قبل أي العقد الأخرى وربما لن تكون مقبولة!</translation> + <source>Immature (%1 confirmations, will be available after %2)</source> + <translation>غير ناضجة (تأكيدات %1 ، ستكون متوفرة بعد %2)</translation> </message> <message> <source>Generated but not accepted</source> @@ -1854,6 +2650,10 @@ <translation>نوع المعاملات</translation> </message> <message> + <source>Whether or not a watch-only address is involved in this transaction.</source> + <translation>ما إذا كان العنوان المشاهدة فقط متضمنًا في هذه المعاملة أم لا.</translation> + </message> + <message> <source>Amount removed from or added to balance.</source> <translation>المبلغ الذي أزيل أو أضيف الى الرصيد</translation> </message> @@ -1909,10 +2709,22 @@ <translation>اخرى</translation> </message> <message> + <source>Enter address, transaction id, or label to search</source> + <translation>أدخل العنوان أو معرف المعاملة أو التصنيف للبحث</translation> + </message> + <message> <source>Min amount</source> <translation>الحد الأدنى</translation> </message> <message> + <source>Abandon transaction</source> + <translation>التخلي عن المعاملة</translation> + </message> + <message> + <source>Increase transaction fee</source> + <translation>زيادة رسوم المعاملة</translation> + </message> + <message> <source>Copy address</source> <translation> انسخ عنوان</translation> </message> @@ -1929,6 +2741,14 @@ <translation>نسخ رقم العملية</translation> </message> <message> + <source>Copy raw transaction</source> + <translation>نسخ المعاملة الخام</translation> + </message> + <message> + <source>Copy full transaction details</source> + <translation>نسخ كامل تفاصيل المعاملة</translation> + </message> + <message> <source>Edit label</source> <translation>عدل الوصف</translation> </message> @@ -1937,6 +2757,10 @@ <translation>عرض تفاصيل المعاملة</translation> </message> <message> + <source>Export Transaction History</source> + <translation>تصدير تفاصيل المعاملات</translation> + </message> + <message> <source>Comma separated file (*.csv)</source> <translation>ملف مفصول بفواصل (*.csv)</translation> </message> @@ -1945,6 +2769,10 @@ <translation>تأكيد</translation> </message> <message> + <source>Watch-only</source> + <translation>مشاهدة فقط</translation> + </message> + <message> <source>Date</source> <translation>تاريخ</translation> </message> @@ -1969,10 +2797,18 @@ <translation>فشل التصدير</translation> </message> <message> + <source>There was an error trying to save the transaction history to %1.</source> + <translation>حدث خطأ أثناء محاولة حفظ محفوظات المعاملة إلى %1.</translation> + </message> + <message> <source>Exporting Successful</source> <translation>نجح التصدير</translation> </message> <message> + <source>The transaction history was successfully saved to %1.</source> + <translation>تم حفظ محفوظات المعاملة بنجاح إلى %1.</translation> + </message> + <message> <source>Range:</source> <translation>المدى:</translation> </message> @@ -1983,7 +2819,11 @@ </context> <context> <name>UnitDisplayStatusBarControl</name> - </context> + <message> + <source>Unit to show amounts in. Click to select another unit.</source> + <translation>الوحدة لإظهار المبالغ فيها. انقر لتحديد وحدة أخرى.</translation> + </message> +</context> <context> <name>WalletFrame</name> <message> @@ -1998,14 +2838,42 @@ <translation>إرسال Coins</translation> </message> <message> + <source>Fee bump error</source> + <translation>خطأ في زيادة الرسوم</translation> + </message> + <message> + <source>Increasing transaction fee failed</source> + <translation>فشل في زيادة رسوم المعاملة</translation> + </message> + <message> + <source>Do you want to increase the fee?</source> + <translation>هل تريد زيادة الرسوم؟</translation> + </message> + <message> <source>Current fee:</source> <translation>الأجر الحالي:</translation> </message> <message> + <source>Increase:</source> + <translation>زيادة:</translation> + </message> + <message> <source>New fee:</source> <translation>أجر جديد:</translation> </message> - </context> + <message> + <source>Confirm fee bump</source> + <translation>تأكيد زيادة الرسوم</translation> + </message> + <message> + <source>Can't sign transaction.</source> + <translation>لا يمكن توقيع المعاملة.</translation> + </message> + <message> + <source>Could not commit transaction</source> + <translation>لا يمكن تنفيذ المعاملة</translation> + </message> +</context> <context> <name>WalletView</name> <message> @@ -2021,6 +2889,10 @@ <translation>نسخ احتياط للمحفظة</translation> </message> <message> + <source>Wallet Data (*.dat)</source> + <translation>بيانات المحفظة (*.dat)</translation> + </message> + <message> <source>Backup Failed</source> <translation>فشل النسخ الاحتياطي</translation> </message> @@ -2028,28 +2900,72 @@ <source>Backup Successful</source> <translation>نجاح النسخ الاحتياطي</translation> </message> + <message> + <source>The wallet data was successfully saved to %1.</source> + <translation>تم حفظ بيانات المحفظة بنجاح إلى %1.</translation> + </message> </context> <context> <name>bitcoin-core</name> <message> - <source>Options:</source> - <translation>خيارات: </translation> + <source>Error: A fatal internal error occurred, see debug.log for details</source> + <translation>خطأ: حدث خطأ داخلي فادح، راجع debug.log للحصول على التفاصيل</translation> + </message> + <message> + <source>Pruning blockstore...</source> + <translation>تجريد مخزن الكتل...</translation> </message> <message> - <source>Specify data directory</source> - <translation>حدد مجلد المعلومات</translation> + <source>Unable to start HTTP server. See debug log for details.</source> + <translation>غير قادر على بدء خادم ال HTTP. راجع سجل تصحيح الأخطاء للحصول على التفاصيل.</translation> </message> <message> <source>Bitcoin Core</source> <translation>جوهر بيتكوين</translation> </message> <message> - <source>Accept connections from outside (default: 1 if no -proxy or -connect)</source> - <translation>قبول الاتصالات من خارج</translation> + <source>Cannot obtain a lock on data directory %s. %s is probably already running.</source> + <translation>لا يمكن الحصول على قفل على دليل البيانات %s. من المحتمل أن %s يعمل بالفعل.</translation> + </message> + <message> + <source>Cannot provide specific connections and have addrman find outgoing connections at the same.</source> + <translation>لا يمكن توفير اتصالات محددة ولابد أن يكون لدى addrman اتصالات صادرة في نفس الوقت.</translation> + </message> + <message> + <source>Please contribute if you find %s useful. Visit %s for further information about the software.</source> + <translation>يرجى المساهمة إذا وجدت %s مفيداً. تفضل بزيارة %s لمزيد من المعلومات حول البرنامج.</translation> + </message> + <message> + <source>Change index out of range</source> + <translation>فهرس الفكة خارج النطاق</translation> + </message> + <message> + <source>Copyright (C) %i-%i</source> + <translation>حقوق الطبع والنشر (C) %i-%i</translation> + </message> + <message> + <source>Corrupted block database detected</source> + <translation>تم الكشف عن قاعدة بيانات كتل تالفة</translation> </message> <message> - <source>Connection options:</source> - <translation>خيارات الاتصال:</translation> + <source>Do you want to rebuild the block database now?</source> + <translation>هل تريد إعادة بناء قاعدة بيانات الكتل الآن؟</translation> + </message> + <message> + <source>Error creating %s: You can't create non-HD wallets with this version.</source> + <translation>خطأ في إنشاء %s: لا يمكنك إنشاء محافظ بلا خاصية الهرمية الحتمية non-HD باستخدام هذا الإصدار.</translation> + </message> + <message> + <source>Error loading %s</source> + <translation>خطأ في تحميل %s</translation> + </message> + <message> + <source>Error loading block database</source> + <translation>خطأ في تحميل قاعدة بيانات الكتل</translation> + </message> + <message> + <source>Error opening block database</source> + <translation>خطأ في فتح قاعدة بيانات الكتل</translation> </message> <message> <source>Error: Disk space is low!</source> @@ -2064,20 +2980,80 @@ <translation>استيراد...</translation> </message> <message> + <source>Incorrect or no genesis block found. Wrong datadir for network?</source> + <translation>لم يتم العثور على كتلة تكوين أو لم تكون صحيحة. datadir خاطئة للشبكة؟</translation> + </message> + <message> + <source>Initialization sanity check failed. %s is shutting down.</source> + <translation>فشل بالتحقق في اختبار التعقل. تم إيقاف %s.</translation> + </message> + <message> <source>Loading P2P addresses...</source> <translation>تحميل عناوين P2P...</translation> </message> <message> - <source>Use the test chain</source> - <translation>إستخدم السلسلة التجريبية</translation> + <source>Loading banlist...</source> + <translation>جاري تحميل قائمة الحظر...</translation> + </message> + <message> + <source>Not enough file descriptors available.</source> + <translation>لا تتوفر واصفات ملفات كافية.</translation> + </message> + <message> + <source>Prune cannot be configured with a negative value.</source> + <translation>لا يمكن تهيئة التجريد بقيمة سالبة.</translation> + </message> + <message> + <source>Prune mode is incompatible with -txindex.</source> + <translation>وضع التجريد غير متوافق مع -txindex.</translation> + </message> + <message> + <source>Replaying blocks...</source> + <translation>إعادة لعب الكتل...</translation> + </message> + <message> + <source>Rewinding blocks...</source> + <translation>العودة بالكتل...</translation> + </message> + <message> + <source>The source code is available from %s.</source> + <translation>شفرة المصدر متاحة من %s.</translation> + </message> + <message> + <source>Unsupported argument -tor found, use -onion.</source> + <translation>تم العثور على وسيطة غير مدعومة -tor ، استخدم -onion.</translation> + </message> + <message> + <source>Upgrading UTXO database</source> + <translation>ترقية قاعدة بيانات UTXO</translation> </message> <message> <source>Verifying blocks...</source> <translation>التحقق من الكتل...</translation> </message> <message> - <source>Wallet options:</source> - <translation>خيارات المحفظة :</translation> + <source>Wallet needed to be rewritten: restart %s to complete</source> + <translation>يلزم إعادة كتابة المحفظة: إعادة تشغيل %s لإكمال العملية</translation> + </message> + <message> + <source>The transaction amount is too small to send after the fee has been deducted</source> + <translation>قيمة المعاملة صغيرة جدًا ولا يمكن إرسالها بعد خصم الرسوم</translation> + </message> + <message> + <source>You need to rebuild the database using -reindex to go back to unpruned mode. This will redownload the entire blockchain</source> + <translation>تحتاج إلى إعادة إنشاء قاعدة البيانات باستخدام -reindex للعودة إلى الوضعية الغير مجردة. هذا سوف يعيد تحميل سلسلة الكتل بأكملها</translation> + </message> + <message> + <source>Error loading %s: You can't disable HD on an already existing HD wallet</source> + <translation>خطأ أثناء تحميل %s: لا يمكنك تعطيل خاصية الهرمية الحتمية HD في محفظة مفعلة بخاصية الهرمية الحتمية HD مسبقاً</translation> + </message> + <message> + <source>Error reading from database, shutting down.</source> + <translation>خطأ في القراءة من قاعدة البيانات ، والتوقف.</translation> + </message> + <message> + <source>Error upgrading chainstate database</source> + <translation>خطأ في ترقية قاعدة بيانات chainstate</translation> </message> <message> <source>Information</source> @@ -2108,6 +3084,14 @@ <translation>المعاملة كبيرة جدا</translation> </message> <message> + <source>Unable to bind to %s on this computer (bind returned error %s)</source> + <translation>يتعذر الربط مع %s على هذا الكمبيوتر (الربط انتج خطأ %s)</translation> + </message> + <message> + <source>Unable to generate initial keys</source> + <translation>غير قادر على توليد مفاتيح أولية</translation> + </message> + <message> <source>Verifying wallet(s)...</source> <translation>التحقق من المحفظة (المحافظ)...</translation> </message> @@ -2116,12 +3100,36 @@ <translation>تحذير</translation> </message> <message> + <source>Zapping all transactions from wallet...</source> + <translation>إزالة جميع المعاملات من المحفظة...</translation> + </message> + <message> + <source>Error loading %s: You can't enable HD on an already existing non-HD wallet</source> + <translation>خطأ أثناء تحميل %s: لا يمكنك تفعيل خاصية الهرمية الحتمية HD في محفظة لا تملك خاصية الهرمية الحتمية non-HD مسبقاً</translation> + </message> + <message> + <source>Warning: Wallet file corrupt, data salvaged! Original %s saved as %s in %s; if your balance or transactions are incorrect you should restore from a backup.</source> + <translation>تحذير: ملف المحفظة فاسد ، تم انقاذ البيانات! تم حفظ %s الأصلي ك %s في %s؛ إذا كان رصيدك أو كانت معاملاتك غير صحيحة، فيجب عليك الإستعادة من نسخة احتياطية.</translation> + </message> + <message> <source>%s is set very high!</source> <translation>%s عالٍ جداً</translation> </message> <message> - <source>Make the wallet broadcast transactions</source> - <translation>إنتاج معاملات بث المحفظة</translation> + <source>Starting network threads...</source> + <translation>بدء مؤشرات شبكة الاتصال...</translation> + </message> + <message> + <source>The wallet will avoid paying less than the minimum relay fee.</source> + <translation>سوف تتجنب المحفظة دفع أقل من الحد الأدنى لرسوم التتابع.</translation> + </message> + <message> + <source>Transaction amounts must not be negative</source> + <translation>يجب ألا تكون قيمة المعاملة سلبية</translation> + </message> + <message> + <source>Transaction must have at least one recipient</source> + <translation>يجب أن تحتوي المعاملة على مستلم واحد على الأقل</translation> </message> <message> <source>Insufficient funds</source> diff --git a/src/qt/locale/bitcoin_be_BY.ts b/src/qt/locale/bitcoin_be_BY.ts index 762f375a53..ab80936a59 100644 --- a/src/qt/locale/bitcoin_be_BY.ts +++ b/src/qt/locale/bitcoin_be_BY.ts @@ -30,6 +30,10 @@ <translation>Выдаліць абраны адрас са спісу</translation> </message> <message> + <source>Enter address or label to search</source> + <translation>Увядзіце адрас ці пазнаку для пошуку</translation> + </message> + <message> <source>Export the data in the current tab to a file</source> <translation>Экспартаваць гэтыя звесткі у файл</translation> </message> @@ -602,10 +606,6 @@ <translation>Адрас</translation> </message> <message> - <source>New receiving address</source> - <translation>Новы адрас для атрымання</translation> - </message> - <message> <source>New sending address</source> <translation>Новы адрас для дасылання</translation> </message> @@ -618,10 +618,6 @@ <translation>Рэдагаваць адрас дасылання</translation> </message> <message> - <source>The entered address "%1" is already in the address book.</source> - <translation>Уведзены адрас "%1" ужо ў кніге адрасоў</translation> - </message> - <message> <source>Could not unlock wallet.</source> <translation>Немагчыма разблакаваць гаманец</translation> </message> @@ -655,19 +651,7 @@ <source>Command-line options</source> <translation>Опцыі каманднага радка</translation> </message> - <message> - <source>Usage:</source> - <translation>Ужыванне:</translation> - </message> - <message> - <source>command-line options</source> - <translation>опцыі каманднага радка</translation> - </message> - <message> - <source>Start minimized</source> - <translation>Стартаваць ммінімізаванай</translation> - </message> - </context> +</context> <context> <name>Intro</name> <message> @@ -802,6 +786,10 @@ <source>Message</source> <translation>Паведамленне</translation> </message> + <message> + <source>Wallet</source> + <translation>Гаманец</translation> + </message> </context> <context> <name>RecentRequestsTableModel</name> @@ -986,10 +974,6 @@ <context> <name>TransactionDesc</name> <message> - <source>%1/offline</source> - <translation>%1/offline</translation> - </message> - <message> <source>%1/unconfirmed</source> <translation>%1/непацверджана</translation> </message> @@ -1002,10 +986,6 @@ <translation>Статус</translation> </message> <message> - <source>, has not been successfully broadcast yet</source> - <translation>, пакуль не было паспяхова транслявана</translation> - </message> - <message> <source>Date</source> <translation>Дата</translation> </message> @@ -1056,10 +1036,6 @@ <translation>Пацверджана (%1 пацверджанняў)</translation> </message> <message> - <source>This block was not received by any other nodes and will probably not be accepted!</source> - <translation>Гэты блок не быў прыняты іншымі вузламі і магчыма не будзе ўхвалены!</translation> - </message> - <message> <source>Generated but not accepted</source> <translation>Згенеравана, але не прынята</translation> </message> @@ -1250,22 +1226,6 @@ <context> <name>bitcoin-core</name> <message> - <source>Options:</source> - <translation>Опцыі:</translation> - </message> - <message> - <source>Specify data directory</source> - <translation>Вызначыць каталог даных</translation> - </message> - <message> - <source>Accept command line and JSON-RPC commands</source> - <translation>Прымаць камандны радок і JSON-RPC каманды</translation> - </message> - <message> - <source>Run in the background as a daemon and accept commands</source> - <translation>Запусціць у фоне як дэман і прымаць каманды</translation> - </message> - <message> <source>Bitcoin Core</source> <translation>Bitcoin Core</translation> </message> @@ -1302,30 +1262,14 @@ <translation>Не хапае файлавых дэскрыптараў.</translation> </message> <message> - <source>Use UPnP to map the listening port (default: %u)</source> - <translation>Use UPnP to map the listening port (default: %u)</translation> - </message> - <message> <source>Verifying blocks...</source> <translation>Праверка блокаў...</translation> </message> <message> - <source>Wallet options:</source> - <translation>Опцыі гаманца:</translation> - </message> - <message> <source>Information</source> <translation>Інфармацыя</translation> </message> <message> - <source>RPC server options:</source> - <translation>Опцыі RPC сервера:</translation> - </message> - <message> - <source>Send trace/debug info to console instead of debug.log file</source> - <translation>Слаць trace/debug звесткі ў кансоль замест файла debug.log</translation> - </message> - <message> <source>Signing transaction failed</source> <translation>Памылка подпісу транзакцыі</translation> </message> @@ -1342,22 +1286,10 @@ <translation>Транзакцыя занадта вялікая</translation> </message> <message> - <source>Username for JSON-RPC connections</source> - <translation>Імя карыстальника для JSON-RPC злучэнняў</translation> - </message> - <message> <source>Warning</source> <translation>Увага</translation> </message> <message> - <source>Password for JSON-RPC connections</source> - <translation>Пароль для JSON-RPC злучэнняў</translation> - </message> - <message> - <source>Execute command when the best block changes (%s in cmd is replaced by block hash)</source> - <translation>Выканаць каманду калі лепшы блок зменіцца (%s замяняецца на хэш блока)</translation> - </message> - <message> <source>Insufficient funds</source> <translation>Недастаткова сродкаў</translation> </message> diff --git a/src/qt/locale/bitcoin_bg.ts b/src/qt/locale/bitcoin_bg.ts index e893390f58..be7fed59a1 100644 --- a/src/qt/locale/bitcoin_bg.ts +++ b/src/qt/locale/bitcoin_bg.ts @@ -30,6 +30,10 @@ <translation>Изтрий избрания адрес от списъка</translation> </message> <message> + <source>Enter address or label to search</source> + <translation>Търсене по адрес или име</translation> + </message> + <message> <source>Export the data in the current tab to a file</source> <translation>Запишете данните от текущия раздел във файл</translation> </message> @@ -694,10 +698,6 @@ <translation>&Адрес</translation> </message> <message> - <source>New receiving address</source> - <translation>Нов адрес за получаване</translation> - </message> - <message> <source>New sending address</source> <translation>Нов адрес за изпращане</translation> </message> @@ -714,10 +714,6 @@ <translation>"%1" не е валиден Биткоин адрес.</translation> </message> <message> - <source>The entered address "%1" is already in the address book.</source> - <translation>Вече има адрес "%1" в списъка с адреси.</translation> - </message> - <message> <source>Could not unlock wallet.</source> <translation>Отключването на портфейла беше неуспешно.</translation> </message> @@ -767,42 +763,6 @@ <source>Command-line options</source> <translation>Списък с команди</translation> </message> - <message> - <source>Usage:</source> - <translation>Използване:</translation> - </message> - <message> - <source>command-line options</source> - <translation>Списък с налични команди</translation> - </message> - <message> - <source>UI Options:</source> - <translation>Опции на интерфейс:</translation> - </message> - <message> - <source>Choose data directory on startup (default: %u)</source> - <translation>Избери директория за данни при стартирване (по подразбиране: %u)</translation> - </message> - <message> - <source>Set language, for example "de_DE" (default: system locale)</source> - <translation>Избери език, примерно "de_DE" (по подразбиране: system locale)</translation> - </message> - <message> - <source>Start minimized</source> - <translation>Стартирай минимизиран</translation> - </message> - <message> - <source>Set SSL root certificates for payment request (default: -system-)</source> - <translation>Задай SSL root сертификат за молба за изплащане (по подразбиране: -system-)</translation> - </message> - <message> - <source>Show splash screen on startup (default: %u)</source> - <translation>Покажи splash екран при стартирване (по подразбиране %u)</translation> - </message> - <message> - <source>Reset all settings changed in the GUI</source> - <translation>Нулиране на всички настройки променени в GUI</translation> - </message> </context> <context> <name>Intro</name> @@ -1519,6 +1479,10 @@ <translation>Съобщение</translation> </message> <message> + <source>Wallet</source> + <translation>Портфейл</translation> + </message> + <message> <source>Error encoding URI into QR Code.</source> <translation>Грешка при създаването на QR Code от URI.</translation> </message> @@ -1681,14 +1645,14 @@ <translation>Наистина ли искате да изпратите?</translation> </message> <message> - <source>added as transaction fee</source> - <translation>добавено като такса за транзакция</translation> - </message> - <message> <source>or</source> <translation>или</translation> </message> <message> + <source>Transaction fee</source> + <translation>Такса</translation> + </message> + <message> <source>Confirm send coins</source> <translation>Потвърждаване</translation> </message> @@ -1930,10 +1894,6 @@ <translation>Подлежи на промяна до %1</translation> </message> <message> - <source>%1/offline</source> - <translation>%1/офлайн</translation> - </message> - <message> <source>%1/unconfirmed</source> <translation>%1/непотвърдени</translation> </message> @@ -1946,10 +1906,6 @@ <translation>Статус</translation> </message> <message> - <source>, has not been successfully broadcast yet</source> - <translation>, все още не е изпратено</translation> - </message> - <message> <source>Date</source> <translation>Дата</translation> </message> @@ -2080,10 +2036,6 @@ <translation>Подлежи на промяна до %1</translation> </message> <message> - <source>Offline</source> - <translation>Извън линия</translation> - </message> - <message> <source>Unconfirmed</source> <translation>Непотвърдено</translation> </message> @@ -2104,10 +2056,6 @@ <translation>Неплатим (%1 потвърждения, ще бъде платим след %2)</translation> </message> <message> - <source>This block was not received by any other nodes and will probably not be accepted!</source> - <translation>Блокът не е получен от останалите участници и най-вероятно няма да бъде одобрен.</translation> - </message> - <message> <source>Generated but not accepted</source> <translation>Генерирана, но отхвърлена от мрежата</translation> </message> @@ -2346,42 +2294,14 @@ <source>The wallet data was successfully saved to %1.</source> <translation>Информацията за портфейла беше успешно запазена в %1.</translation> </message> -</context> + </context> <context> <name>bitcoin-core</name> <message> - <source>Options:</source> - <translation>Опции:</translation> - </message> - <message> - <source>Specify data directory</source> - <translation>Определете директория за данните</translation> - </message> - <message> - <source>Connect to a node to retrieve peer addresses, and disconnect</source> - <translation>Свържете се към сървър за да можете да извлечете адресите на пиърите след което се разкачете.</translation> - </message> - <message> - <source>Specify your own public address</source> - <translation>Въведете Ваш публичен адрес</translation> - </message> - <message> <source>Bitcoin Core</source> <translation>Биткойн ядро</translation> </message> <message> - <source><category> can be:</source> - <translation><category> може да бъде:</translation> - </message> - <message> - <source>Accept connections from outside (default: 1 if no -proxy or -connect)</source> - <translation>Приемайте връзки отвън.(по подразбиране:1 в противен случай -proxy или -connect)</translation> - </message> - <message> - <source>Connection options:</source> - <translation>Настройки на връзката:</translation> - </message> - <message> <source>Do you want to rebuild the block database now?</source> <translation>Желаете ли да пресъздадете базата данни с блокове сега?</translation> </message> @@ -2406,22 +2326,10 @@ <translation>Проверка на блоковете...</translation> </message> <message> - <source>Wallet options:</source> - <translation>Настройки на портфейла:</translation> - </message> - <message> - <source>Connect through SOCKS5 proxy</source> - <translation>Свързване чрез SOCKS5 прокси</translation> - </message> - <message> <source>Information</source> <translation>Информация</translation> </message> <message> - <source>Send trace/debug info to console instead of debug.log file</source> - <translation>Изпрати локализиращата или дебъг информацията към конзолата, вместо файлът debug.log</translation> - </message> - <message> <source>This is experimental software.</source> <translation>Това е експериментален софтуер.</translation> </message> @@ -2434,30 +2342,10 @@ <translation>Транзакцията е твърде голяма</translation> </message> <message> - <source>Username for JSON-RPC connections</source> - <translation>Потребителско име за JSON-RPC връзките</translation> - </message> - <message> <source>Warning</source> <translation>Предупреждение</translation> </message> <message> - <source>Password for JSON-RPC connections</source> - <translation>Парола за JSON-RPC връзките</translation> - </message> - <message> - <source>Specify configuration file (default: %s)</source> - <translation>Назовете конфигурационен файл(по подразбиране %s)</translation> - </message> - <message> - <source>Specify connection timeout in milliseconds (minimum: 1, default: %d)</source> - <translation>Задайте време на изключване при проблеми със свързването в милисекунди(минимум:1, по подразбиране %d)</translation> - </message> - <message> - <source>Specify pid file (default: %s)</source> - <translation>Задайте pid файл(по подразбиране: %s)</translation> - </message> - <message> <source>Starting network threads...</source> <translation>Стартиране на мрежовите нишки...</translation> </message> diff --git a/src/qt/locale/bitcoin_bg_BG.ts b/src/qt/locale/bitcoin_bg_BG.ts index e08ca935fa..2bf9d4ff7f 100644 --- a/src/qt/locale/bitcoin_bg_BG.ts +++ b/src/qt/locale/bitcoin_bg_BG.ts @@ -442,10 +442,6 @@ <translation>Редактирайте адреса</translation> </message> <message> - <source>New receiving address</source> - <translation>Нов адрес за получаване</translation> - </message> - <message> <source>New sending address</source> <translation>Нов адрес за изпращане</translation> </message> @@ -678,6 +674,10 @@ <source>Label</source> <translation>Етикет</translation> </message> + <message> + <source>Wallet</source> + <translation>портфейл</translation> + </message> </context> <context> <name>RecentRequestsTableModel</name> diff --git a/src/qt/locale/bitcoin_ca.ts b/src/qt/locale/bitcoin_ca.ts index 22dcd36f94..2926736498 100644 --- a/src/qt/locale/bitcoin_ca.ts +++ b/src/qt/locale/bitcoin_ca.ts @@ -30,6 +30,10 @@ <translation>Elimina l'adreça sel·leccionada actualment de la llista</translation> </message> <message> + <source>Enter address or label to search</source> + <translation>Introduïu una adreça o una etiqueta per cercar</translation> + </message> + <message> <source>Export the data in the current tab to a file</source> <translation>Exporta les dades de la pestanya actual a un fitxer</translation> </message> @@ -132,6 +136,10 @@ <translation>Repetiu la nova contrasenya</translation> </message> <message> + <source>Show password</source> + <translation>Ensenya la contrasenya</translation> + </message> + <message> <source>Enter the new passphrase to the wallet.<br/>Please use a passphrase of <b>ten or more random characters</b>, or <b>eight or more words</b>.</source> <translation>Introduïu la contrasenya nova al moneder.<br/>Utilitzeu una contrasenya de <b>deu o més caràcters aleatoris</b>, o <b>vuit o més paraules</b>.</translation> </message> @@ -318,6 +326,14 @@ <translation>Obre un &URI...</translation> </message> <message> + <source>Wallet:</source> + <translation>Moneder:</translation> + </message> + <message> + <source>default wallet</source> + <translation>moneder per defecte</translation> + </message> + <message> <source>Click to disable network activity.</source> <translation>Feu clic per inhabilitar l'activitat de la xarxa.</translation> </message> @@ -338,6 +354,10 @@ <translation>S'estan reindexant els blocs al disc...</translation> </message> <message> + <source>Proxy is <b>enabled</b>: %1</source> + <translation>El servidor proxy està <b>activat</b>: %1</translation> + </message> + <message> <source>Send coins to a Bitcoin address</source> <translation>Envia monedes a una adreça Bitcoin</translation> </message> @@ -433,6 +453,10 @@ <source>&Command-line options</source> <translation>Opcions de la &línia d'ordres</translation> </message> + <message numerus="yes"> + <source>%n active connection(s) to Bitcoin network</source> + <translation><numerusform>%n connexió activa a la xarxa Bitcoin</numerusform><numerusform>%n connexions actives a la xarxa Bitcoin</numerusform></translation> + </message> <message> <source>Indexing blocks on disk...</source> <translation>S'estan indexant els blocs al disc...</translation> @@ -441,6 +465,10 @@ <source>Processing blocks on disk...</source> <translation>S'estan processant els blocs al disc...</translation> </message> + <message numerus="yes"> + <source>Processed %n block(s) of transaction history.</source> + <translation><numerusform>Processat %n bloc de l'històric de transaccions.</numerusform><numerusform>Processats %n blocs de l'històric de transaccions.</numerusform></translation> + </message> <message> <source>%1 behind</source> <translation>%1 darrere</translation> @@ -498,6 +526,12 @@ </translation> </message> <message> + <source>Wallet: %1 +</source> + <translation>Mondeder: %1 +</translation> + </message> + <message> <source>Type: %1 </source> <translation>Tipus: %1 @@ -718,10 +752,6 @@ <translation>&Adreça</translation> </message> <message> - <source>New receiving address</source> - <translation>Nova adreça de recepció</translation> - </message> - <message> <source>New sending address</source> <translation>Nova adreça d'enviament</translation> </message> @@ -738,8 +768,12 @@ <translation>L'adreça introduïda «%1» no és una adreça de Bitcoin vàlida.</translation> </message> <message> - <source>The entered address "%1" is already in the address book.</source> - <translation>L'adreça introduïda «%1» ja és present a la llibreta d'adreces.</translation> + <source>Address "%1" already exists as a receiving address with label "%2" and so cannot be added as a sending address.</source> + <translation>L'adreça "%1" ja existeix com una adreça per rebre amb l'etiqueta "%2" i per tant no pot ésser afegida com adreça per enviar.</translation> + </message> + <message> + <source>The entered address "%1" is already in the address book with label "%2".</source> + <translation>L'adreça introduïda "%1" ja existeix al directori d'adreces amb l'etiqueta "%2".</translation> </message> <message> <source>Could not unlock wallet.</source> @@ -791,42 +825,6 @@ <source>Command-line options</source> <translation>Opcions de línia d'ordres</translation> </message> - <message> - <source>Usage:</source> - <translation>Ús:</translation> - </message> - <message> - <source>command-line options</source> - <translation>Opcions de la línia d'ordres</translation> - </message> - <message> - <source>UI Options:</source> - <translation>Opcions d'interfície d'usuari:</translation> - </message> - <message> - <source>Choose data directory on startup (default: %u)</source> - <translation>Trieu el directori de dades a l'inici (per defecte: %u)</translation> - </message> - <message> - <source>Set language, for example "de_DE" (default: system locale)</source> - <translation>Defineix la llengua, per exemple «de_DE» (per defecte: la definida pel sistema)</translation> - </message> - <message> - <source>Start minimized</source> - <translation>Inicia minimitzat</translation> - </message> - <message> - <source>Set SSL root certificates for payment request (default: -system-)</source> - <translation>Defineix els certificats arrel SSL per a la sol·licitud de pagament (per defecte: els del sistema)</translation> - </message> - <message> - <source>Show splash screen on startup (default: %u)</source> - <translation>Mostra la pantalla de benvinguda a l'inici (per defecte: %u)</translation> - </message> - <message> - <source>Reset all settings changed in the GUI</source> - <translation>Reinicialitza tots els canvis de configuració fets des de la interfície gràfica</translation> - </message> </context> <context> <name>Intro</name> @@ -890,7 +888,15 @@ <source>Error</source> <translation>Error</translation> </message> - </context> + <message numerus="yes"> + <source>%n GB of free space available</source> + <translation><numerusform>%n GB d'espai lliure disponible</numerusform><numerusform>%n GB d'espai lliure disponibles</numerusform></translation> + </message> + <message numerus="yes"> + <source>(of %n GB needed)</source> + <translation><numerusform>(de %n GB necessari)</numerusform><numerusform>(de %n GB necessaris)</numerusform></translation> + </message> +</context> <context> <name>ModalOverlay</name> <message> @@ -1004,6 +1010,18 @@ <translation>Mostra si el proxy SOCKS5 predeterminat subministrat s'utilitza per arribar a altres nodes a través d'aquest tipus de xarxa.</translation> </message> <message> + <source>Use separate SOCKS&5 proxy to reach peers via Tor hidden services:</source> + <translation>Usi un proxy SOCKS&5 separat per connectar amb nodes a través dels serveis ocults de Tor:</translation> + </message> + <message> + <source>Hide the icon from the system tray.</source> + <translation>Amaga la icona de la safata del sistema</translation> + </message> + <message> + <source>&Hide tray icon</source> + <translation>Amaga la icona de la safata</translation> + </message> + <message> <source>Minimize instead of exit the application when the window is closed. When this option is enabled, the application will be closed only after selecting Exit in the menu.</source> <translation>Minimitza en comptes de sortir de l'aplicació quan la finestra es tanca. Quan s'habilita aquesta opció l'aplicació es tancara només quan se selecciona Surt del menú. </translation> </message> @@ -1036,6 +1054,22 @@ <translation>&Xarxa</translation> </message> <message> + <source>Disables some advanced features but all blocks will still be fully validated. Reverting this setting requires re-downloading the entire blockchain. Actual disk usage may be somewhat higher.</source> + <translation>Deshabilita unes característiques avançades però tots els blocs encara seran validats completament. Revertir aquesta configuració requereix tornar a descarregar la cadena de blocs sencera un altre cop. L'espai en ús del disc és possible que augmenti.</translation> + </message> + <message> + <source>Prune &block storage to</source> + <translation>Prunar emmagatzemament de &block a</translation> + </message> + <message> + <source>GB</source> + <translation>GB</translation> + </message> + <message> + <source>Reverting this setting requires re-downloading the entire blockchain.</source> + <translation>Revertir aquesta configuració requereix tornar a descarregar la cadena de blocs sencera un altre cop.</translation> + </message> + <message> <source>(0 = auto, <0 = leave that many cores free)</source> <translation>(0 = auto, <0 = deixa tants nuclis lliures)</translation> </message> @@ -1068,6 +1102,14 @@ <translation>Port obert amb &UPnP</translation> </message> <message> + <source>Accept connections from outside.</source> + <translation>Accepta connexions de fora</translation> + </message> + <message> + <source>Allow incomin&g connections</source> + <translation>Permet connexions entrants</translation> + </message> + <message> <source>Connect to the Bitcoin network through a SOCKS5 proxy.</source> <translation>Connecta a la xarxa Bitcoin a través d'un proxy SOCKS5.</translation> </message> @@ -1148,6 +1190,10 @@ <translation>Si voleu mostrar les funcions de control de monedes o no.</translation> </message> <message> + <source>&Third party transaction URLs</source> + <translation>URL de transaccions de tercers</translation> + </message> + <message> <source>&OK</source> <translation>&D'acord</translation> </message> @@ -1290,6 +1336,10 @@ <translation>Gestió d'URI</translation> </message> <message> + <source>'bitcoin://' is not a valid URI. Use 'bitcoin:' instead.</source> + <translation>'bitcoin://' no és una URI vàlida. Usi 'bitcoin:' en lloc seu.</translation> + </message> + <message> <source>Payment request fetch URL is invalid: %1</source> <translation>L'URL de recuperació de la sol·licitud de pagament no és vàlida: %1</translation> </message> @@ -1431,10 +1481,34 @@ <source>%1 ms</source> <translation>%1 ms</translation> </message> + <message numerus="yes"> + <source>%n second(s)</source> + <translation><numerusform>%n segon</numerusform><numerusform>%n segons</numerusform></translation> + </message> + <message numerus="yes"> + <source>%n minute(s)</source> + <translation><numerusform>%n minut</numerusform><numerusform>%n minuts</numerusform></translation> + </message> + <message numerus="yes"> + <source>%n hour(s)</source> + <translation><numerusform>%n hora</numerusform><numerusform>%n hores</numerusform></translation> + </message> + <message numerus="yes"> + <source>%n day(s)</source> + <translation><numerusform>%n dia</numerusform><numerusform>%n dies</numerusform></translation> + </message> + <message numerus="yes"> + <source>%n week(s)</source> + <translation><numerusform>%n setmana</numerusform><numerusform>%n setmanes</numerusform></translation> + </message> <message> <source>%1 and %2</source> <translation>%1 i %2</translation> </message> + <message numerus="yes"> + <source>%n year(s)</source> + <translation><numerusform>%n any</numerusform><numerusform>%n anys</numerusform></translation> + </message> <message> <source>%1 B</source> <translation>%1 B</translation> @@ -1463,12 +1537,16 @@ <context> <name>QObject::QObject</name> <message> + <source>Error parsing command line arguments: %1.</source> + <translation>Error interpretant els arguments de la línia de comandes: %1.</translation> + </message> + <message> <source>Error: Specified data directory "%1" does not exist.</source> <translation>Error: El directori de dades especificat «%1» no existeix.</translation> </message> <message> - <source>Error: Cannot parse configuration file: %1. Only use key=value syntax.</source> - <translation>Error: no es pot analitzar el fitxer de configuració: %1. Feu servir només la sintaxi clau=valor.</translation> + <source>Error: Cannot parse configuration file: %1.</source> + <translation>Error: No es pot interpretar el fitxer de configuració: %1.</translation> </message> <message> <source>Error: %1</source> @@ -1561,6 +1639,14 @@ <translation>Us de memoria</translation> </message> <message> + <source>Wallet: </source> + <translation>Moneder:</translation> + </message> + <message> + <source>(none)</source> + <translation>(cap)</translation> + </message> + <message> <source>&Reset</source> <translation>&Reset</translation> </message> @@ -1729,6 +1815,10 @@ <translation>Desbandeja per</translation> </message> <message> + <source>default wallet</source> + <translation>moneder per defecte</translation> + </message> + <message> <source>Welcome to the %1 RPC console.</source> <translation>Benvingut a la consola RPC de %1.</translation> </message> @@ -1737,6 +1827,14 @@ <translation>Utilitzeu les fletxes amunt i avall per navegar per l'historial i %1 per netejar la pantalla.</translation> </message> <message> + <source>Type %1 for an overview of available commands.</source> + <translation>Escriu %1 per veure un sumari de les comandes disponibles.</translation> + </message> + <message> + <source>For more information on using this console type %1.</source> + <translation>Per més informació per usar aquesta consola de comandes, escriu %1.</translation> + </message> + <message> <source>WARNING: Scammers have been active, telling users to type commands here, stealing their wallet contents. Do not use this console without fully understanding the ramifications of a command.</source> <translation>ADVERTIMENT: Els estafadors han estat actius, dient als usuaris que escriguin comandaments aquí, robant els contingut dels seus moneders. No utilitzeu aquesta consola sense comprendre completament les ramificacions d'un comandament.</translation> </message> @@ -1745,6 +1843,14 @@ <translation>Activitat de xarxa inhabilitada</translation> </message> <message> + <source>Executing command without any wallet</source> + <translation>Executant comanda sense cap moneder</translation> + </message> + <message> + <source>Executing command using "%1" wallet</source> + <translation>Executant comanda usant el moneder "%1"</translation> + </message> + <message> <source>(node id: %1)</source> <translation>(id del node: %1)</translation> </message> @@ -1816,6 +1922,14 @@ <translation>Neteja</translation> </message> <message> + <source>Native segwit addresses (aka Bech32 or BIP-173) reduce your transaction fees later on and offer better protection against typos, but old wallets don't support them. When unchecked, an address compatible with older wallets will be created instead.</source> + <translation>Les adreces segwit natives (més conegudes com Bech32 o BIP-173) redueixen les vostres comisions de les transaccions i ofereixen millor protecció contra errades tipogràfiques, però els moneders antics no les suporten. Quan desmarqui la casella, es generarà una adreça compatible amb moneders antics.</translation> + </message> + <message> + <source>Generate native segwit (Bech32) address</source> + <translation>Generar una adreça segwit nativa (Bech32)</translation> + </message> + <message> <source>Requested payments history</source> <translation>Historial de pagaments sol·licitats</translation> </message> @@ -1903,6 +2017,10 @@ <translation>Missatge</translation> </message> <message> + <source>Wallet</source> + <translation>Moneder</translation> + </message> + <message> <source>Resulting URI too long, try to reduce the text for label / message.</source> <translation>URI resultant massa llarga, intenta reduir el text per a la etiqueta / missatge</translation> </message> @@ -2017,12 +2135,16 @@ <translation>redueix els paràmetres de comissió</translation> </message> <message> - <source>per kilobyte</source> - <translation>per kilobyte</translation> + <source>Specify a custom fee per kB (1,000 bytes) of the transaction's virtual size. + +Note: Since the fee is calculated on a per-byte basis, a fee of "100 satoshis per kB" for a transaction size of 500 bytes (half of 1 kB) would ultimately yield a fee of only 50 satoshis.</source> + <translation>Especifiqui una comissió personalitzada per kB (1.000 bytes) de la mida virtual de la transacció. + +Nota: Com que la comissió es calcula en funció dels bytes, una comissió de "100 satoshis per cada kB" per una transacció de mida 500 bytes (la meitat de 1 kB) comportaria finalment una comissió de la transacció de només 50 satoshis.</translation> </message> <message> - <source>If the custom fee is set to 1000 satoshis and the transaction is only 250 bytes, then "per kilobyte" only pays 250 satoshis in fee, while "total at least" pays 1000 satoshis. For transactions bigger than a kilobyte both pay by kilobyte.</source> - <translation>Si la comissió personalitzada es defineix a 1000 satoshis i la transacció és de només 250 bytes, llavors «per kilobyte» només es paguen 250 satoshis en una comissió, mentre que amb la de «total com a mínim» es pagarien 1000 satoshis. Per a transaccions superiors al kilobyte, en tots dos casos es paga per kilobyte.</translation> + <source>per kilobyte</source> + <translation>per kilobyte</translation> </message> <message> <source>Hide</source> @@ -2069,6 +2191,14 @@ <translation>Temps de confirmació objectiu:</translation> </message> <message> + <source>Enable Replace-By-Fee</source> + <translation>Habilita Replace-By-Fee: substitució per comissió</translation> + </message> + <message> + <source>With Replace-By-Fee (BIP-125) you can increase a transaction's fee after it is sent. Without this, a higher fee may be recommended to compensate for increased transaction delay risk.</source> + <translation>Amb la substitució per comissió o Replace-By-Fee (BIP-125) pot incrementar la comissió de la transacció després d'enviar-la. Sense això, seria recomenable una comissió més alta per compensar el risc d'increment del retard de la transacció.</translation> + </message> + <message> <source>Clear &All</source> <translation>Neteja-ho &tot</translation> </message> @@ -2125,16 +2255,16 @@ <translation>Esteu segur que ho voleu enviar?</translation> </message> <message> - <source>added as transaction fee</source> - <translation>S'ha afegit una taxa de transacció</translation> + <source>or</source> + <translation>o</translation> </message> <message> - <source>Total Amount %1</source> - <translation>Import total %1</translation> + <source>You can increase the fee later (signals Replace-By-Fee, BIP-125).</source> + <translation>Pot incrementar la comissió més tard (senyala Replace-By-Fee o substitució per comissió, BIP-125).</translation> </message> <message> - <source>or</source> - <translation>o</translation> + <source>Transaction fee</source> + <translation>Comissió de transacció</translation> </message> <message> <source>Confirm send coins</source> @@ -2466,10 +2596,6 @@ <translation>produït un conflicte amb una transacció amb %1 confirmacions</translation> </message> <message> - <source>%1/offline</source> - <translation>%1/fora de línia</translation> - </message> - <message> <source>0/unconfirmed, %1</source> <translation>0/no confirmades, %1</translation> </message> @@ -2498,10 +2624,6 @@ <translation>Estat</translation> </message> <message> - <source>, has not been successfully broadcast yet</source> - <translation>, encara no ha estat emès correctement</translation> - </message> - <message> <source>Date</source> <translation>Data</translation> </message> @@ -2648,10 +2770,6 @@ <translation>Obert fins %1</translation> </message> <message> - <source>Offline</source> - <translation>Fora de línia</translation> - </message> - <message> <source>Unconfirmed</source> <translation>Sense confirmar</translation> </message> @@ -2676,10 +2794,6 @@ <translation>Immadur (%1 confirmacions, serà disponible després de %2)</translation> </message> <message> - <source>This block was not received by any other nodes and will probably not be accepted!</source> - <translation>Aquest bloc no ha estat rebut per cap altre node i probablement no serà acceptat!</translation> - </message> - <message> <source>Generated but not accepted</source> <translation>Generat però no acceptat</translation> </message> @@ -2986,38 +3100,14 @@ <source>The wallet data was successfully saved to %1.</source> <translation>S'han desat les dades del moneder correctament a %1.</translation> </message> -</context> + </context> <context> <name>bitcoin-core</name> <message> - <source>Options:</source> - <translation>Opcions:</translation> - </message> - <message> - <source>Specify data directory</source> - <translation>Especifica el directori de dades</translation> - </message> - <message> - <source>Connect to a node to retrieve peer addresses, and disconnect</source> - <translation>Connecta al node per obtenir les adreces de les connexions, i desconnecta</translation> - </message> - <message> - <source>Specify your own public address</source> - <translation>Especifiqueu la vostra adreça pública</translation> - </message> - <message> - <source>Accept command line and JSON-RPC commands</source> - <translation>Accepta la línia d'ordres i ordres JSON-RPC </translation> - </message> - <message> <source>Distributed under the MIT software license, see the accompanying file %s or %s</source> <translation>Distribuït sota la llicència del programari MIT, consulteu el fitxer d'acompanyament %s o %s</translation> </message> <message> - <source>If <category> is not supplied or if <category> = 1, output all debugging information.</source> - <translation>Si no es proporciona <category> o si <category> = 1, treu a la sortida tota la informació de depuració.</translation> - </message> - <message> <source>Prune configured below the minimum of %d MiB. Please use a higher number.</source> <translation>Poda configurada per sota el mínim de %d MiB. Utilitzeu un nombre superior.</translation> </message> @@ -3034,18 +3124,10 @@ <translation>Error: s'ha produït un error intern fatal. Vegeu debug.log per a més detalls</translation> </message> <message> - <source>Fee (in %s/kB) to add to transactions you send (default: %s)</source> - <translation>Comissió (en %s/kB) per afegir a les transaccions que envieu (per defecte: %s)</translation> - </message> - <message> <source>Pruning blockstore...</source> <translation>S'està podant la cadena de blocs...</translation> </message> <message> - <source>Run in the background as a daemon and accept commands</source> - <translation>Executa en segon pla com a programa dimoni i accepta ordres</translation> - </message> - <message> <source>Unable to start HTTP server. See debug log for details.</source> <translation>No s'ha pogut iniciar el servidor HTTP. Vegeu debug.log per a més detalls.</translation> </message> @@ -3058,54 +3140,14 @@ <translation>Els desenvolupadors %s</translation> </message> <message> - <source>A fee rate (in %s/kB) that will be used when fee estimation has insufficient data (default: %s)</source> - <translation>Una taxa de tarifes (en %s / kB) que s'utilitzarà quan l'estimació de tarifes no tingui prou dades (per defecte: %s)</translation> - </message> - <message> - <source>Accept relayed transactions received from whitelisted peers even when not relaying transactions (default: %d)</source> - <translation>Acceptar les transaccions retransmeses rebudes de nodes de llista blanca, fins i tot quan no es retransmetin transaccions (per defecte: %d)</translation> - </message> - <message> - <source>Bind to given address and always listen on it. Use [host]:port notation for IPv6</source> - <translation>Vincula a una adreça específica i sempre escolta-hi. Utilitza la notació [host]:port per IPv6</translation> - </message> - <message> <source>Cannot obtain a lock on data directory %s. %s is probably already running.</source> <translation>No es pot obtenir un bloqueig al directori de dades %s. %s probablement ja s'estigui executant.</translation> </message> <message> - <source>Delete all wallet transactions and only recover those parts of the blockchain through -rescan on startup</source> - <translation>Elimina totes les transaccions del moneder i només recupera aquelles de la cadena de blocs a través de -rescan a l'inici</translation> - </message> - <message> <source>Error reading %s! All keys read correctly, but transaction data or address book entries might be missing or incorrect.</source> <translation>S'ha produït un error en llegir %s. Totes les claus es llegeixen correctament, però les dades de la transacció o les entrades de la llibreta d'adreces podrien faltar o ser incorrectes.</translation> </message> <message> - <source>Exclude debugging information for a category. Can be used in conjunction with -debug=1 to output debug logs for all categories except one or more specified categories.</source> - <translation>Excloeu la informació de depuració d'una categoria. Pot ser usat juntament amb -debug = 1 per generar registres de depuració per a totes les categories, excepte una o més categories especificades.</translation> - </message> - <message> - <source>Execute command when a wallet transaction changes (%s in cmd is replaced by TxID)</source> - <translation>Executa una ordre quan una transacció del moneder canviï (%s en cmd es canvia per TxID)</translation> - </message> - <message> - <source>Extra transactions to keep in memory for compact block reconstructions (default: %u)</source> - <translation>Transaccions addicionals a conservar en memòria per a les reconstruccions de blocs compactes (per defecte: %u)</translation> - </message> - <message> - <source>If this block is in the chain assume that it and its ancestors are valid and potentially skip their script verification (0 to verify all, default: %s, testnet: %s)</source> - <translation>Si aquest bloc es troba a la cadena, suposa que ell i els seus avantpassats són vàlids i que es pot saltar la seva verificació d'script (0 per verificar-ho tot, per defecte: %s, testnet: %s)</translation> - </message> - <message> - <source>Maximum allowed median peer time offset adjustment. Local perspective of time may be influenced by peers forward or backward by this amount. (default: %u seconds)</source> - <translation>Màxim ajust mitjà permès per desplaçament del temps d'iguals. La perspectiva local del temps pot estar influenciada per iguals avançats o endarrerits per aquesta quantitat. (per defecte: %u segons)</translation> - </message> - <message> - <source>Maximum total fees (in %s) to use in a single wallet transaction or raw transaction; setting this too low may abort large transactions (default: %s)</source> - <translation>Tarifes totals màximes (en %s) per utilitzar-les en una sola transacció de monedes o transaccions en brut; establir-lo massa baix pot cancel·lar grans transaccions (per defecte: %s)</translation> - </message> - <message> <source>Please check that your computer's date and time are correct! If your clock is wrong, %s will not work properly.</source> <translation>Comproveu que la data i hora de l'ordinador són correctes. Si el rellotge és incorrecte, %s no funcionarà correctament.</translation> </message> @@ -3114,18 +3156,6 @@ <translation>Contribueix si trobes %s útil. Visita %s per obtenir més informació sobre el programari.</translation> </message> <message> - <source>Query for peer addresses via DNS lookup, if low on addresses (default: 1 unless -connect used)</source> - <translation>Consulta adreces d'iguals a través de la cerca del DNS, si tens poques adreces (per defecte: 1, tret que s'utilitzi la connexió)</translation> - </message> - <message> - <source>Reduce storage requirements by enabling pruning (deleting) of old blocks. This allows the pruneblockchain RPC to be called to delete specific blocks, and enables automatic pruning of old blocks if a target size in MiB is provided. This mode is incompatible with -txindex and -rescan. Warning: Reverting this setting requires re-downloading the entire blockchain. (default: 0 = disable pruning blocks, 1 = allow manual pruning via RPC, >%u = automatically prune block files to stay under the specified target size in MiB)</source> - <translation>Redueix els requisits d'emmagatzematge permetent la poda (supressió) dels blocs antics. Això permet executar la crida RPC prunblockclass per eliminar blocs específics i permet la poda automàtica de blocs antics si es proporciona una mida de destinació en MiB. Aquest mode és incompatible amb -txindex i -rescan. Advertència: si torna a iniciar aquesta configuració, cal que torneu a baixar la cadena de blocs completa. (per defecte: 0 = desactivar poda de blocs, 1 = permetre la poda manual a través de RPC,>%u = poda automàticament els fitxers de bloc per quedar sota la mida de destinació especificada en MiB)</translation> - </message> - <message> - <source>Set the number of script verification threads (%u to %d, 0 = auto, <0 = leave that many cores free, default: %d)</source> - <translation>Defineix el nombre de fils de verificació d'scripts (%u a %d, 0 = auto, <0 = deixa tants nuclis lliures, per defecte: %d)</translation> - </message> - <message> <source>The block database contains a block which appears to be from the future. This may be due to your computer's date and time being set incorrectly. Only rebuild the block database if you are sure that your computer's date and time are correct</source> <translation>La base de dades de blocs conté un bloc que sembla ser del futur. Això pot ser degut a que la data i l'hora del vostre ordinador s'estableix incorrectament. Només reconstruïu la base de dades de blocs si esteu segur que la data i l'hora del vostre ordinador són correctes</translation> </message> @@ -3146,18 +3176,6 @@ <translation>No es pot rebobinar la base de dades a un estat de pre-bifurcament. Haureu de tornar a descarregar la cadena de blocks</translation> </message> <message> - <source>Use UPnP to map the listening port (default: 1 when listening and no -proxy)</source> - <translation>Utilitzeu UPnP per mapejar el port d'escolta (per defecte: 1 quan s'escolta i no -proxy)</translation> - </message> - <message> - <source>Username and hashed password for JSON-RPC connections. The field <userpw> comes in the format: <USERNAME>:<SALT>$<HASH>. A canonical python script is included in share/rpcuser. The client then connects normally using the rpcuser=<USERNAME>/rpcpassword=<PASSWORD> pair of arguments. This option can be specified multiple times</source> - <translation>Nom d'usuari i contrasenya resumida per a les connexions JSON-RPC. El camp <userpw> ve en el format: <USERNAME> : <SALT> $ <HASH> . Un script canònic python està inclòs a share / rpcuser. El client es connecta normalment utilitzant rpcuser =<USERNAME>/ rpcpassword =<PASSWORD> com a parell d'arguments. Aquesta opció es pot especificar diverses vegades</translation> - </message> - <message> - <source>Wallet will not create transactions that violate mempool chain limits (default: %u)</source> - <translation>El moneder no crearà transaccions que infringeixin els límits de la cadena mempool (per defecte: %u)</translation> - </message> - <message> <source>Warning: The network does not appear to fully agree! Some miners appear to be experiencing issues.</source> <translation>Avís: la xarxa no sembla que hi estigui plenament d'acord. Alguns miners sembla que estan experimentant problemes.</translation> </message> @@ -3166,10 +3184,6 @@ <translation>Avís: sembla que no estem plenament d'acord amb els nostres iguals! Podria caler que actualitzar l'aplicació, o potser que ho facin altres nodes.</translation> </message> <message> - <source>Whether to save the mempool on shutdown and load on restart (default: %u)</source> - <translation>Si es guarda el mempool quan s'apaga i es carrega quan es reinicia (per defecte: %u)</translation> - </message> - <message> <source>%d of last 100 blocks have unexpected version</source> <translation>%d dels últims 100 blocs tenen una versió inesperada</translation> </message> @@ -3182,42 +3196,14 @@ <translation>-maxmempool ha de tenir almenys %d MB</translation> </message> <message> - <source><category> can be:</source> - <translation><category> pot ser:</translation> - </message> - <message> - <source>Accept connections from outside (default: 1 if no -proxy or -connect)</source> - <translation>Accepta connexions de fora (per defecte: 1 si no -proxy o -connect)</translation> - </message> - <message> - <source>Append comment to the user agent string</source> - <translation>Afegiu un comentari a la cadena de l'agent d'usuari</translation> - </message> - <message> - <source>Attempt to recover private keys from a corrupt wallet on startup</source> - <translation>Intent de recuperació de claus privades d'una cartera malmesa a l'inici</translation> - </message> - <message> - <source>Block creation options:</source> - <translation>Opcions de la creació de blocs:</translation> - </message> - <message> <source>Cannot resolve -%s address: '%s'</source> <translation>No es pot resoldre -%s adreça: '%s'</translation> </message> <message> - <source>Chain selection options:</source> - <translation>Opcions de selecció de cadenes:</translation> - </message> - <message> <source>Change index out of range</source> <translation>Canvieu l'índex fora de l'abast</translation> </message> <message> - <source>Connection options:</source> - <translation>Opcions de connexió:</translation> - </message> - <message> <source>Copyright (C) %i-%i</source> <translation>Copyright (C) %i-%i</translation> </message> @@ -3226,38 +3212,10 @@ <translation>S'ha detectat una base de dades de blocs corrupta</translation> </message> <message> - <source>Debugging/Testing options:</source> - <translation>Opcions de depuració/proves:</translation> - </message> - <message> - <source>Do not load the wallet and disable wallet RPC calls</source> - <translation>No carreguis el moneder i inhabilita les crides RPC del moneder</translation> - </message> - <message> <source>Do you want to rebuild the block database now?</source> <translation>Voleu reconstruir la base de dades de blocs ara?</translation> </message> <message> - <source>Enable publish hash block in <address></source> - <translation>Habiliteu publicar el bloc de hash a <address></translation> - </message> - <message> - <source>Enable publish hash transaction in <address></source> - <translation>Habilita la publicació de la transacció hash a <address></translation> - </message> - <message> - <source>Enable publish raw block in <address></source> - <translation>Habiliteu publicar el bloc cru a <address></translation> - </message> - <message> - <source>Enable publish raw transaction in <address></source> - <translation>Habiliteu publicar transaccions en cru a <address></translation> - </message> - <message> - <source>Enable transaction replacement in the memory pool (default: %u)</source> - <translation>Activa el reemplaçament de transaccions al grup de memòria (per defecte: %u)</translation> - </message> - <message> <source>Error initializing block database</source> <translation>Error carregant la base de dades de blocs</translation> </message> @@ -3318,10 +3276,6 @@ <translation>Import invàlid per -fallbackfee=<amount>: '%s'</translation> </message> <message> - <source>Keep the transaction memory pool below <n> megabytes (default: %u)</source> - <translation>Manteniu el grup de memòria de la transacció per sota de <n> megabytes (per defecte: %u)</translation> - </message> - <message> <source>Loading P2P addresses...</source> <translation>S'estan carregant les adreces P2P ...</translation> </message> @@ -3330,26 +3284,10 @@ <translation>Carregant banlist ...</translation> </message> <message> - <source>Location of the auth cookie (default: data dir)</source> - <translation>Ubicació de la cookie auth (per defecte: directori de dades)</translation> - </message> - <message> <source>Not enough file descriptors available.</source> <translation>No hi ha suficient descriptors de fitxers disponibles.</translation> </message> <message> - <source>Only connect to nodes in network <net> (ipv4, ipv6 or onion)</source> - <translation>Només connecta als nodes de la xarxa <net> (ipv4, ipv6 o onion)</translation> - </message> - <message> - <source>Print this help message and exit</source> - <translation>Imprimiu aquest missatge d'ajuda i sortiu</translation> - </message> - <message> - <source>Print version and exit</source> - <translation>Imprimir versió i sortir</translation> - </message> - <message> <source>Prune cannot be configured with a negative value.</source> <translation>La poda no es pot configurar amb un valor negatiu.</translation> </message> @@ -3358,14 +3296,6 @@ <translation>El mode de poda és incompatible amb -txindex.</translation> </message> <message> - <source>Rebuild chain state and block index from the blk*.dat files on disk</source> - <translation>Reconstrueix l'estat de la cadena i l'índex de blocs des dels fitxers blk*.dat del disc</translation> - </message> - <message> - <source>Rebuild chain state from the currently indexed blocks</source> - <translation>Reconstrueix l'estat de cadena dels blocs actualment indexats</translation> - </message> - <message> <source>Replaying blocks...</source> <translation>Reproduïnt blocs ...</translation> </message> @@ -3374,14 +3304,6 @@ <translation>Rebobinant blocs...</translation> </message> <message> - <source>Set database cache size in megabytes (%d to %d, default: %d)</source> - <translation>Defineix la mida de la memòria cau de la base de dades en megabytes (%d a %d, per defecte: %d)</translation> - </message> - <message> - <source>Specify wallet file (within data directory)</source> - <translation>Especifica un fitxer de moneder (dins del directori de dades)</translation> - </message> - <message> <source>The source code is available from %s.</source> <translation>El codi font està disponible a %s.</translation> </message> @@ -3414,14 +3336,6 @@ <translation>Actualització de la base de dades UTXO</translation> </message> <message> - <source>Use UPnP to map the listening port (default: %u)</source> - <translation>Utilitza UPnP per a mapejar el port d'escolta (per defecte: %u)</translation> - </message> - <message> - <source>Use the test chain</source> - <translation>Utilitza la cadena de proves</translation> - </message> - <message> <source>User Agent comment (%s) contains unsafe characters.</source> <translation>El comentari de l'agent d'usuari (%s) conté caràcters insegurs.</translation> </message> @@ -3430,90 +3344,26 @@ <translation>S'estan verificant els blocs...</translation> </message> <message> - <source>Wallet debugging/testing options:</source> - <translation>Opcions de depuració/proves del moneder:</translation> - </message> - <message> <source>Wallet needed to be rewritten: restart %s to complete</source> <translation>Cal reescriure el moneder: reinicieu %s per a completar-ho</translation> </message> <message> - <source>Wallet options:</source> - <translation>Opcions de moneder:</translation> - </message> - <message> - <source>Allow JSON-RPC connections from specified source. Valid for <ip> are a single IP (e.g. 1.2.3.4), a network/netmask (e.g. 1.2.3.4/255.255.255.0) or a network/CIDR (e.g. 1.2.3.4/24). This option can be specified multiple times</source> - <translation>Permet les connexions JSON-RPC d'una font específica. Vàlid per a <ip> són una IP individual (p. ex., 1.2.3.4), una xarxa / màscara de xarxa (p. ex., 1.2.3.4/255.255.255.0) o una xarxa/CIDR (p. ex., 1.2.3.4/24). Es pot especificar aquesta opció moltes vegades</translation> - </message> - <message> - <source>Bind to given address and whitelist peers connecting to it. Use [host]:port notation for IPv6</source> - <translation>Vincula l'adreça donada i posa a la llista blanca els iguals que s'hi connectin. Feu servir la notació [host]:port per a IPv6</translation> - </message> - <message> - <source>Create new files with system default permissions, instead of umask 077 (only effective with disabled wallet functionality)</source> - <translation>Crea fitxers nous amb els permisos per defecte del sistema, en comptes de l'umask 077 (només efectiu amb la funcionalitat de moneder inhabilitada)</translation> - </message> - <message> - <source>Discover own IP addresses (default: 1 when listening and no -externalip or -proxy)</source> - <translation>Descobreix l'adreça IP pròpia (per defecte: 1 quan s'escolta i no -externalip o -proxy)</translation> - </message> - <message> <source>Error: Listening for incoming connections failed (listen returned error %s)</source> <translation>Error: ha fallat escoltar les connexions entrants (l'escoltament ha retornat l'error %s)</translation> </message> <message> - <source>Execute command when a relevant alert is received or we see a really long fork (%s in cmd is replaced by message)</source> - <translation>Executa l'ordre quan es rebi un avís rellevant o veiem una forquilla molt llarga (%s en cmd és reemplaçat per un missatge)</translation> - </message> - <message> - <source>Fees (in %s/kB) smaller than this are considered zero fee for relaying, mining and transaction creation (default: %s)</source> - <translation>Les comissions (en %s/kB) més petites que això es consideren tarifes zero per a la retransmissió, la mineria i la creació de transaccions (per defecte: %s)</translation> - </message> - <message> - <source>If paytxfee is not set, include enough fee so transactions begin confirmation on average within n blocks (default: %u)</source> - <translation>Si no s'especifica una paytxfee (comissió de transacció de pagament), inclogueu suficient comissió per tal que les transaccions comencin a confirmar-se en una mitja de n blocs (per defecte: %u)</translation> - </message> - <message> <source>Invalid amount for -maxtxfee=<amount>: '%s' (must be at least the minrelay fee of %s to prevent stuck transactions)</source> <translation>Import no vàlid per a -maxtxfee=<amount>: '%s' (cal que sigui com a mínim la comissió de minrelay de %s per evitar que les comissions s'encallin)</translation> </message> <message> - <source>Maximum size of data in data carrier transactions we relay and mine (default: %u)</source> - <translation>Mida màxima de les dades en les transaccions de l'operador en què confiem i en les meves (per defecte: %u)</translation> - </message> - <message> - <source>Randomize credentials for every proxy connection. This enables Tor stream isolation (default: %u)</source> - <translation>Genera a l'atzar credencials per a cada connexió proxy. Això habilita l'aïllament del flux de Tor (per defecte: %u)</translation> - </message> - <message> <source>The transaction amount is too small to send after the fee has been deducted</source> <translation>L'import de la transacció és massa petit per enviar-la després que se'n dedueixi la comissió</translation> </message> <message> - <source>Whitelisted peers cannot be DoS banned and their transactions are always relayed, even if they are already in the mempool, useful e.g. for a gateway</source> - <translation>Els iguals en la llista blanca no poden ser bandejats per DoS i es transmetran sempre llurs transaccions, fins i tot si ja són a la mempool. Això és útil, p. ex., per a una passarel·la</translation> - </message> - <message> <source>You need to rebuild the database using -reindex to go back to unpruned mode. This will redownload the entire blockchain</source> <translation>Cal que torneu a construir la base de dades fent servir -reindex per tornar al mode no podat. Això tornarà a baixar la cadena de blocs sencera</translation> </message> <message> - <source>(default: %u)</source> - <translation>(per defecte: %u)</translation> - </message> - <message> - <source>Accept public REST requests (default: %u)</source> - <translation>Accepta sol·licituds REST públiques (per defecte: %u)</translation> - </message> - <message> - <source>Automatically create Tor hidden service (default: %d)</source> - <translation>Crea automàticament el servei ocult de Tor (per defecte: %d)</translation> - </message> - <message> - <source>Connect through SOCKS5 proxy</source> - <translation>Connecta a través del proxy SOCKS5</translation> - </message> - <message> <source>Error loading %s: You can't disable HD on an already existing HD wallet</source> <translation>S'ha produït un error en carregar %s: no es pot desactivar HD en un moneder HD ja existent</translation> </message> @@ -3526,10 +3376,6 @@ <translation>S'ha produït un error en actualitzar la base de dades de chainstate</translation> </message> <message> - <source>Imports blocks from external blk000??.dat file on startup</source> - <translation>Importa blocs de fitxers externs blk000?.dat a l'inici de l'apliació</translation> - </message> - <message> <source>Information</source> <translation>Informació</translation> </message> @@ -3550,42 +3396,14 @@ <translation>S'ha especificat una màscara de xarxa no vàlida a -whitelist: «%s»</translation> </message> <message> - <source>Keep at most <n> unconnectable transactions in memory (default: %u)</source> - <translation>Manté com a màxim <n> transaccions no connectables en memòria (per defecte: %u)</translation> - </message> - <message> <source>Need to specify a port with -whitebind: '%s'</source> <translation>Cal especificar un port amb -whitebind: «%s»</translation> </message> <message> - <source>Node relay options:</source> - <translation>Opcions de transmissió del node:</translation> - </message> - <message> - <source>RPC server options:</source> - <translation>Opcions del servidor RPC:</translation> - </message> - <message> <source>Reducing -maxconnections from %d to %d, because of system limitations.</source> <translation>Reducció de -maxconnections de %d a %d, a causa de les limitacions del sistema.</translation> </message> <message> - <source>Rescan the block chain for missing wallet transactions on startup</source> - <translation>Reescaneja la cadena de blocs per a les operacions del moneder que falten a l'inici</translation> - </message> - <message> - <source>Send trace/debug info to console instead of debug.log file</source> - <translation>Envia informació de traça/depuració a la consola en comptes del fitxer debug.log</translation> - </message> - <message> - <source>Show all debugging options (usage: --help -help-debug)</source> - <translation>Mostra totes les opcions de depuració (ús: --help --help-debug)</translation> - </message> - <message> - <source>Shrink debug.log file on client startup (default: 1 when no -debug)</source> - <translation>Redueix el fitxer debug.log durant l'inici del client (per defecte: 1 quan no -debug)</translation> - </message> - <message> <source>Signing transaction failed</source> <translation>Ha fallat la signatura de la transacció</translation> </message> @@ -3598,14 +3416,6 @@ <translation>Això és programari experimental.</translation> </message> <message> - <source>Tor control port password (default: empty)</source> - <translation>Contrasenya del port de control Tor (per defecte: buida)</translation> - </message> - <message> - <source>Tor control port to use if onion listening enabled (default: %s)</source> - <translation>Port de control de tor si l'escolta onion està habilitada (per defecte: %s)</translation> - </message> - <message> <source>Transaction amount too small</source> <translation>Import de la transacció massa petit</translation> </message> @@ -3622,14 +3432,6 @@ <translation>No s'ha pogut vincular a %s en aquest ordinador (la vinculació ha retornat l'error %s)</translation> </message> <message> - <source>Upgrade wallet to latest format on startup</source> - <translation>Actualitza el moneder al format més recent a l'inici de l'aplicació</translation> - </message> - <message> - <source>Username for JSON-RPC connections</source> - <translation>Nom d'usuari per a connexions JSON-RPC</translation> - </message> - <message> <source>Verifying wallet(s)...</source> <translation>S'està verificant el moneder(s) ...</translation> </message> @@ -3642,98 +3444,18 @@ <translation>Advertència: regles noves desconegudes activades (versionbit %i)</translation> </message> <message> - <source>Whether to operate in a blocks only mode (default: %u)</source> - <translation>Si s'ha d'operar en un mode de blocs només (per defecte: %u)</translation> - </message> - <message> - <source>You need to rebuild the database using -reindex to change -txindex</source> - <translation>Heu de reconstruir la base de dades mitjançant -reindex per canviar -txindex</translation> - </message> - <message> <source>Zapping all transactions from wallet...</source> <translation>Se suprimeixen totes les transaccions del moneder...</translation> </message> <message> - <source>ZeroMQ notification options:</source> - <translation>Opcions de notificació ZeroMQ:</translation> - </message> - <message> - <source>Password for JSON-RPC connections</source> - <translation>Contrasenya per a connexions JSON-RPC</translation> - </message> - <message> - <source>Execute command when the best block changes (%s in cmd is replaced by block hash)</source> - <translation>Executa l'ordre quan el millor bloc canviï (%s en cmd es reemplaça per un resum de bloc)</translation> - </message> - <message> - <source>Allow DNS lookups for -addnode, -seednode and -connect</source> - <translation>Permet consultes DNS per a -addnode, -seednode i -connect</translation> - </message> - <message> - <source>(1 = keep tx meta data e.g. account owner and payment request information, 2 = drop tx meta data)</source> - <translation>(1 = manté les metadades de les tx, p. ex., propietari del compte i informació de sol·licitud del pagament, 2 = prescindeix de les metadades de les tx)</translation> - </message> - <message> <source>-maxtxfee is set very high! Fees this large could be paid on a single transaction.</source> <translation>-maxtxfee especificat molt alt! Comissions tan grans podrien pagar-se en una única transacció.</translation> </message> <message> - <source>Bind to given address to listen for JSON-RPC connections. This option is ignored unless -rpcallowip is also passed. Port is optional and overrides -rpcport. Use [host]:port notation for IPv6. This option can be specified multiple times (default: 127.0.0.1 and ::1 i.e., localhost, or if -rpcallowip has been specified, 0.0.0.0 and :: i.e., all addresses)</source> - <translation>Enllaçar a una adreça determinada per escoltar les connexions JSON-RPC. Aquesta opció s'ignora a menys que -rpcallowip també s'especifiqui. El port és opcional i sobreescriu -rpcport. Utilitzeu la notació [host]:port per a IPv6. Aquesta opció es pot especificar diverses vegades (per defecte: 127.0.0.1 i :: 1, és a dir, localhost, o si s'ha especificat -rpcallowip, 0.0.0.0 i :: és a dir, totes les adreces)</translation> - </message> - <message> - <source>Do not keep transactions in the mempool longer than <n> hours (default: %u)</source> - <translation>No mantingueu les transaccions en el mempool més de <n> hora (per defecte: %u)</translation> - </message> - <message> - <source>Equivalent bytes per sigop in transactions for relay and mining (default: %u)</source> - <translation>Bytes equivalents per sigop en transaccions de relé i mineria (per defecte: %u)</translation> - </message> - <message> <source>Error loading %s: You can't enable HD on an already existing non-HD wallet</source> <translation>S'ha produït un error en carregar %s: no es pot activar HD en un moneder existent que no sigui HD</translation> </message> <message> - <source>Error loading wallet %s. -wallet parameter must only specify a filename (not a path).</source> - <translation>S'ha produït un error en carregar el moneder %s. El paràmetre -wallet només ha d'especificar un nom de fitxer (no una ruta d'accés).</translation> - </message> - <message> - <source>Fees (in %s/kB) smaller than this are considered zero fee for transaction creation (default: %s)</source> - <translation>Les comissions (en %s/kB) més petites que això es consideren comissions zero per a la creació de transaccions (per defecte: %s)</translation> - </message> - <message> - <source>Force relay of transactions from whitelisted peers even if they violate local relay policy (default: %d)</source> - <translation>Forçar la retranmissió de les transaccions de nodes de llista blanca encara que infringeixin la política de retransmissió local (per defecte: %d)</translation> - </message> - <message> - <source>How thorough the block verification of -checkblocks is (0-4, default: %u)</source> - <translation>Com d'exhaustiva és la verificació de blocs del -checkblocks (0-4, per defecte: %u)</translation> - </message> - <message> - <source>Maintain a full transaction index, used by the getrawtransaction rpc call (default: %u)</source> - <translation>Manté un índex complet de transaccions, utilitzat per la crida rpc getrawtransaction (per defecte: %u)</translation> - </message> - <message> - <source>Number of seconds to keep misbehaving peers from reconnecting (default: %u)</source> - <translation>Nombre de segons necessaris perquè els iguals de comportament qüestionable puguin tornar a connectar-se (per defecte: %u)</translation> - </message> - <message> - <source>Output debugging information (default: %u, supplying <category> is optional)</source> - <translation>Informació de sortida de la depuració (per defecte: %u, proporcionar <category> és opcional)</translation> - </message> - <message> - <source>Sets the serialization of raw transaction or block hex returned in non-verbose mode, non-segwit(0) or segwit(1) (default: %d)</source> - <translation>Estableix la serialització de transaccions crues o bloc hexadecimal retornat en mode no verbose, no-segwit (0) o segwit(1) (per defecte: %d)</translation> - </message> - <message> - <source>Support filtering of blocks and transaction with bloom filters (default: %u)</source> - <translation>Suport de filtrat de blocs i transaccions amb filtres bloom (per defecte: %u)</translation> - </message> - <message> - <source>The fee rate (in %s/kB) that indicates your tolerance for discarding change by adding it to the fee (default: %s). Note: An output is discarded if it is dust at this rate, but we will always discard up to the dust relay fee and a discard fee above that is limited by the fee estimate for the longest target</source> - <translation>El tipus de tarifa (en %s/kB) que indica la vostra tolerància per descartar el canvi afegint-lo a la tarifa (per defecte: %s). Nota: Es descarta una sortida si és polsim a aquesta tarifa, però sempre anem a descartar la quota de relleu de polsim i una tarifa de descartat per sobre d'això està limitada per l'estimació de tarifes per al destí més llarg</translation> - </message> - <message> <source>This is the transaction fee you may pay when fee estimates are not available.</source> <translation>Aquesta és la tarifa de transacció que podeu pagar quan les estimacions de tarifes no estan disponibles.</translation> </message> @@ -3746,10 +3468,6 @@ <translation>La longitud total de la cadena de la versió de xarxa (%i) supera la longitud màxima (%i). Redueix el nombre o la mida de uacomments.</translation> </message> <message> - <source>Tries to keep outbound traffic under the given target (in MiB per 24h), 0 = no limit (default: %d)</source> - <translation>Intenta mantenir el trànsit sortint sota l'objectiu indicat (a MiB per 24 hores), 0 = sense límit (per defecte: %d)</translation> - </message> - <message> <source>Unsupported argument -socks found. Setting SOCKS version isn't possible anymore, only SOCKS5 proxies are supported.</source> <translation>S'ha trobat l'argument -socks no compatible. L'establiment de la versió SOCKS ja no és possible, només es permeten els servidors proxy SOCKS5.</translation> </message> @@ -3758,10 +3476,6 @@ <translation>S'ha ignorat l'argument no acceptat -whitelistalways, utilitza -whitelistrelay i/o -whitelistforcerelay.</translation> </message> <message> - <source>Use separate SOCKS5 proxy to reach peers via Tor hidden services (default: %s)</source> - <translation>Utilitza un proxy SOCKS4 apart per a arribar als iguals a través de serveis ocults de Tor (per defecte: %s)</translation> - </message> - <message> <source>Warning: Unknown block versions being mined! It's possible unknown rules are in effect</source> <translation>Advertència: s'està minant versions de blocs desconegudes. És possible que s'estiguin aplicant regles desconegudes</translation> </message> @@ -3770,110 +3484,18 @@ <translation>Advertència: el moender està malmès, les dades es recuperen! Original %s guardat com a %s en %s; si el vostre saldo o transaccions són incorrectes, haureu de restaurar des d'una còpia de seguretat.</translation> </message> <message> - <source>Whitelist peers connecting from the given IP address (e.g. 1.2.3.4) or CIDR notated network (e.g. 1.2.3.0/24). Can be specified multiple times.</source> - <translation>Nodes de llista blanca s'estan connectant des de l'adreça IP indicada (p. Ex. 1.2.3.4) o la xarxa notificada per CIDR (p. Ex. 1.2.3.0/24). Es pot especificar diverses vegades.</translation> - </message> - <message> <source>%s is set very high!</source> <translation>%s està especificat molt alt!</translation> </message> <message> - <source>(default: %s)</source> - <translation>(per defecte: %s)</translation> - </message> - <message> - <source>Always query for peer addresses via DNS lookup (default: %u)</source> - <translation>Demana sempre les adreces dels iguals a través de consultes DNS (per defecte: %u)</translation> - </message> - <message> - <source>Error loading wallet %s. -wallet filename must be a regular file.</source> - <translation>S'ha produït un error en carregar el moneder %s. El nom del fitxer -wallet ha de ser un fitxer normal.</translation> - </message> - <message> <source>Error loading wallet %s. Duplicate -wallet filename specified.</source> <translation>S'ha produït un error en carregar el moneder %s. S'ha especificat un nom de fitxer duplicat -wallet.</translation> </message> <message> - <source>Error loading wallet %s. Invalid characters in -wallet filename.</source> - <translation>S'ha produït un error en carregar el moneder %s. Caràcters no vàlids al nom del fitxer -wallet.</translation> - </message> - <message> - <source>How many blocks to check at startup (default: %u, 0 = all)</source> - <translation>Quants blocs per comprovar a l'inici (per defecte: %u, 0 = tots)</translation> - </message> - <message> - <source>Include IP addresses in debug output (default: %u)</source> - <translation>Inclou l'adreça IP a la sortida de depuració (per defecte: %u)</translation> - </message> - <message> <source>Keypool ran out, please call keypoolrefill first</source> <translation>S'ha acabat el Keypool, si us plau, crideu a keypoolrefill primer</translation> </message> <message> - <source>Listen for JSON-RPC connections on <port> (default: %u or testnet: %u)</source> - <translation>Escolta les connexions JSON-RPC en <port> (per defecte: %u o testnet: %u)</translation> - </message> - <message> - <source>Listen for connections on <port> (default: %u or testnet: %u)</source> - <translation>Escolta les connexions en <port> (per defecte: %u o testnet: %u)</translation> - </message> - <message> - <source>Maintain at most <n> connections to peers (default: %u)</source> - <translation>Manté com a màxim <n> connexions a iguals (per defecte: %u)</translation> - </message> - <message> - <source>Make the wallet broadcast transactions</source> - <translation>Fes que el moneder faci difusió de les transaccions</translation> - </message> - <message> - <source>Maximum per-connection receive buffer, <n>*1000 bytes (default: %u)</source> - <translation>Memòria intermèdia màxima de recepció per connexió, <n>*1000 bytes (per defecte: %u)</translation> - </message> - <message> - <source>Maximum per-connection send buffer, <n>*1000 bytes (default: %u)</source> - <translation>Memòria intermèdia màxima d'enviament per connexió, <n>*1000 bytes (per defecte: %u)</translation> - </message> - <message> - <source>Prepend debug output with timestamp (default: %u)</source> - <translation>Posa davant de la sortida de depuració una marca horària (per defecte: %u)</translation> - </message> - <message> - <source>Relay and mine data carrier transactions (default: %u)</source> - <translation>Retransmet i mina les transaccions de l'operador (per defecte: %u)</translation> - </message> - <message> - <source>Relay non-P2SH multisig (default: %u)</source> - <translation>Retransmet multisig no P2SH (per defecte: %u)</translation> - </message> - <message> - <source>Set key pool size to <n> (default: %u)</source> - <translation>Defineix la mida clau disponible a <n> (per defecte: %u)</translation> - </message> - <message> - <source>Set maximum BIP141 block weight (default: %d)</source> - <translation>Estableix el pes màxim del bloc BIP141 (per defecte: %d)</translation> - </message> - <message> - <source>Set the number of threads to service RPC calls (default: %d)</source> - <translation>Defineix el nombre de fils a crides de servei RPC (per defecte: %d)</translation> - </message> - <message> - <source>Specify configuration file (default: %s)</source> - <translation>Especifica el fitxer de configuració (per defecte: %s)</translation> - </message> - <message> - <source>Specify connection timeout in milliseconds (minimum: 1, default: %d)</source> - <translation>Especifica el temps d'espera de la connexió en milisegons (mínim: 1, per defecte: %d)</translation> - </message> - <message> - <source>Specify pid file (default: %s)</source> - <translation>Especifica el fitxer pid (per defecte: %s)</translation> - </message> - <message> - <source>Spend unconfirmed change when sending transactions (default: %u)</source> - <translation>Gasta el canvi no confirmat en enviar les transaccions (per defecte: %u)</translation> - </message> - <message> <source>Starting network threads...</source> <translation>S'estan iniciant els fils de la xarxa...</translation> </message> @@ -3890,10 +3512,6 @@ <translation>Aquesta és la comissió de transacció que pagareu si envieu una transacció.</translation> </message> <message> - <source>Threshold for disconnecting misbehaving peers (default: %u)</source> - <translation>Llindar per a desconnectar els iguals de comportament qüestionable (per defecte: %u)</translation> - </message> - <message> <source>Transaction amounts must not be negative</source> <translation>Els imports de la transacció no han de ser negatius</translation> </message> diff --git a/src/qt/locale/bitcoin_ca@valencia.ts b/src/qt/locale/bitcoin_ca@valencia.ts index 107642f18b..b5e65bc4bf 100644 --- a/src/qt/locale/bitcoin_ca@valencia.ts +++ b/src/qt/locale/bitcoin_ca@valencia.ts @@ -30,6 +30,10 @@ <translation>Elimina l'adreça sel·leccionada actualment de la llista</translation> </message> <message> + <source>Enter address or label to search</source> + <translation>Introduïu una adreça o una etiqueta per cercar</translation> + </message> + <message> <source>Export the data in the current tab to a file</source> <translation>Exporta les dades de la pestanya actual a un fitxer</translation> </message> @@ -646,10 +650,6 @@ <translation>&Adreça</translation> </message> <message> - <source>New receiving address</source> - <translation>Nova adreça de recepció.</translation> - </message> - <message> <source>New sending address</source> <translation>Nova adreça d'enviament</translation> </message> @@ -666,10 +666,6 @@ <translation>L'adreça introduïda «%1» no és una adreça de Bitcoin vàlida.</translation> </message> <message> - <source>The entered address "%1" is already in the address book.</source> - <translation>L'adreça introduïda «%1» ja és present a la llibreta d'adreces.</translation> - </message> - <message> <source>Could not unlock wallet.</source> <translation>No s'ha pogut desbloquejar el moneder.</translation> </message> @@ -715,31 +711,7 @@ <source>Command-line options</source> <translation>Opcions de línia d'ordes</translation> </message> - <message> - <source>Usage:</source> - <translation>Ús:</translation> - </message> - <message> - <source>command-line options</source> - <translation>Opcions de la línia d'ordes</translation> - </message> - <message> - <source>UI Options:</source> - <translation>Opcions d'interfície:</translation> - </message> - <message> - <source>Set language, for example "de_DE" (default: system locale)</source> - <translation>Defineix un idioma, per exemple «de_DE» (per defecte: preferències locals de sistema)</translation> - </message> - <message> - <source>Start minimized</source> - <translation>Inicia minimitzat</translation> - </message> - <message> - <source>Set SSL root certificates for payment request (default: -system-)</source> - <translation>Defineix certificats arrel SSL per a la sol·licitud de pagament (per defecte: -sistema-)</translation> - </message> - </context> +</context> <context> <name>Intro</name> <message> @@ -1238,10 +1210,6 @@ <source>Error: Specified data directory "%1" does not exist.</source> <translation>Error: El directori de dades especificat «%1» no existeix.</translation> </message> - <message> - <source>Error: Cannot parse configuration file: %1. Only use key=value syntax.</source> - <translation>Error: no es pot analitzar el fitxer de configuració: %1. Feu servir només la sintaxi clau=valor.</translation> - </message> </context> <context> <name>QRImageWidget</name> @@ -1555,6 +1523,10 @@ <translation>Missatge</translation> </message> <message> + <source>Wallet</source> + <translation>Moneder</translation> + </message> + <message> <source>Resulting URI too long, try to reduce the text for label / message.</source> <translation>URI resultant massa llarga, intenta reduir el text per a la etiqueta / missatge</translation> </message> @@ -1657,10 +1629,6 @@ <translation>per kilobyte</translation> </message> <message> - <source>If the custom fee is set to 1000 satoshis and the transaction is only 250 bytes, then "per kilobyte" only pays 250 satoshis in fee, while "total at least" pays 1000 satoshis. For transactions bigger than a kilobyte both pay by kilobyte.</source> - <translation>Si la comissió personalitzada es defineix a 1000 satoshis i la transacció és de només 250 bytes, llavors «per kilobyte» només es paguen 250 satoshis en una comissió, mentre que amb la de «total com a mínim» es pagarien 1000 satoshis. Per a transaccions superiors al kilobyte, en tots dos casos es paga per kilobyte.</translation> - </message> - <message> <source>Hide</source> <translation>Amaga</translation> </message> @@ -1753,14 +1721,14 @@ <translation>Esteu segur que ho voleu enviar?</translation> </message> <message> - <source>added as transaction fee</source> - <translation>S'ha afegit una taxa de transacció</translation> - </message> - <message> <source>or</source> <translation>o</translation> </message> <message> + <source>Transaction fee</source> + <translation>Comissió de transacció</translation> + </message> + <message> <source>Confirm send coins</source> <translation>Confirma l'enviament de monedes</translation> </message> @@ -2066,10 +2034,6 @@ <translation>Obert fins %1</translation> </message> <message> - <source>%1/offline</source> - <translation>%1/fora de línia</translation> - </message> - <message> <source>%1/unconfirmed</source> <translation>%1/sense confirmar</translation> </message> @@ -2082,10 +2046,6 @@ <translation>Estat</translation> </message> <message> - <source>, has not been successfully broadcast yet</source> - <translation>, encara no ha estat emés correctement</translation> - </message> - <message> <source>Date</source> <translation>Data</translation> </message> @@ -2220,10 +2180,6 @@ <translation>Obert fins %1</translation> </message> <message> - <source>Offline</source> - <translation>Fora de línia</translation> - </message> - <message> <source>Unconfirmed</source> <translation>Sense confirmar</translation> </message> @@ -2244,10 +2200,6 @@ <translation>Immadur (%1 confirmacions, serà disponible després de %2)</translation> </message> <message> - <source>This block was not received by any other nodes and will probably not be accepted!</source> - <translation>Este bloc no ha estat rebut per cap altre node i probablement no serà acceptat!</translation> - </message> - <message> <source>Generated but not accepted</source> <translation>Generat però no acceptat</translation> </message> @@ -2502,30 +2454,10 @@ <source>The wallet data was successfully saved to %1.</source> <translation>S'han guardat les dades del moneder correctament a %1.</translation> </message> -</context> + </context> <context> <name>bitcoin-core</name> <message> - <source>Options:</source> - <translation>Opcions:</translation> - </message> - <message> - <source>Specify data directory</source> - <translation>Especifica el directori de dades</translation> - </message> - <message> - <source>Connect to a node to retrieve peer addresses, and disconnect</source> - <translation>Connecta al node per obtindre les adreces de les connexions, i desconnecta</translation> - </message> - <message> - <source>Specify your own public address</source> - <translation>Especifiqueu la vostra adreça pública</translation> - </message> - <message> - <source>Accept command line and JSON-RPC commands</source> - <translation>Accepta la línia d'ordes i ordes JSON-RPC </translation> - </message> - <message> <source>Error: A fatal internal error occurred, see debug.log for details</source> <translation>Error: s'ha produït un error intern fatal. Vegeu debug.log per a més detalls</translation> </message> @@ -2534,30 +2466,10 @@ <translation>S'està podant l'emmagatzemament de blocs...</translation> </message> <message> - <source>Run in the background as a daemon and accept commands</source> - <translation>Executa en segon pla com a programa dimoni i accepta ordes</translation> - </message> - <message> <source>Bitcoin Core</source> <translation>Bitcoin Core</translation> </message> <message> - <source>Bind to given address and always listen on it. Use [host]:port notation for IPv6</source> - <translation>Vincula a una adreça específica i sempre escolta-hi. Utilitza la notació [host]:port per IPv6</translation> - </message> - <message> - <source>Delete all wallet transactions and only recover those parts of the blockchain through -rescan on startup</source> - <translation>Elimina totes les transaccions del moneder i només recupera aquelles de la cadena de blocs a través de -rescan a l'inici</translation> - </message> - <message> - <source>Execute command when a wallet transaction changes (%s in cmd is replaced by TxID)</source> - <translation>Executa una orde quan una transacció del moneder canvie (%s en cmd es canvia per TxID)</translation> - </message> - <message> - <source>Set the number of script verification threads (%u to %d, 0 = auto, <0 = leave that many cores free, default: %d)</source> - <translation>Defineix el nombre de fils de verificació d'scripts (%u a %d, 0 = auto, <0 = deixa tants nuclis lliures, per defecte: %d)</translation> - </message> - <message> <source>This is a pre-release test build - use at your own risk - do not use for mining or merchant applications</source> <translation>Esta és una versió de pre-llançament - utilitza-la sota la teva responsabilitat - No usar per a minería o aplicacions de compra-venda</translation> </message> @@ -2570,34 +2482,10 @@ <translation>Avís: pareix que no estem plenament d'acord amb els nostres iguals! Podria caldre que actualitzar l'aplicació, o potser que ho facen altres nodes.</translation> </message> <message> - <source><category> can be:</source> - <translation><category> pot ser:</translation> - </message> - <message> - <source>Accept connections from outside (default: 1 if no -proxy or -connect)</source> - <translation>Accepta connexions de fora (per defecte: 1 si no -proxy o -connect)</translation> - </message> - <message> - <source>Block creation options:</source> - <translation>Opcions de la creació de blocs:</translation> - </message> - <message> - <source>Connection options:</source> - <translation>Opcions de connexió:</translation> - </message> - <message> <source>Corrupted block database detected</source> <translation>S'ha detectat una base de dades de blocs corrupta</translation> </message> <message> - <source>Debugging/Testing options:</source> - <translation>Opcions de depuració/proves:</translation> - </message> - <message> - <source>Do not load the wallet and disable wallet RPC calls</source> - <translation>No carreguis el moneder i inhabilita les crides RPC del moneder</translation> - </message> - <message> <source>Do you want to rebuild the block database now?</source> <translation>Voleu reconstruir la base de dades de blocs ara?</translation> </message> @@ -2638,10 +2526,6 @@ <translation>No hi ha suficient descriptors de fitxers disponibles.</translation> </message> <message> - <source>Only connect to nodes in network <net> (ipv4, ipv6 or onion)</source> - <translation>Només connecta als nodes de la xarxa <net> (ipv4, ipv6 o onion)</translation> - </message> - <message> <source>Prune cannot be configured with a negative value.</source> <translation>La poda no es pot configurar amb un valor negatiu.</translation> </message> @@ -2650,90 +2534,26 @@ <translation>El mode de poda és incompatible amb -txindex.</translation> </message> <message> - <source>Set database cache size in megabytes (%d to %d, default: %d)</source> - <translation>Defineix la mida de la memòria cau de la base de dades en megabytes (%d a %d, per defecte: %d)</translation> - </message> - <message> - <source>Specify wallet file (within data directory)</source> - <translation>Especifica un fitxer de moneder (dins del directori de dades)</translation> - </message> - <message> - <source>Use UPnP to map the listening port (default: %u)</source> - <translation>Utilitza UPnP per a mapejar el port d'escolta (per defecte: %u)</translation> - </message> - <message> <source>Verifying blocks...</source> <translation>S'estan verificant els blocs...</translation> </message> <message> - <source>Wallet options:</source> - <translation>Opcions de moneder:</translation> - </message> - <message> - <source>Allow JSON-RPC connections from specified source. Valid for <ip> are a single IP (e.g. 1.2.3.4), a network/netmask (e.g. 1.2.3.4/255.255.255.0) or a network/CIDR (e.g. 1.2.3.4/24). This option can be specified multiple times</source> - <translation>Permet les connexions JSON-RPC d'una font específica. Vàlid per a <ip> són una IP individual (p. ex., 1.2.3.4), una xarxa / màscara de xarxa (p. ex., 1.2.3.4/255.255.255.0) o una xarxa/CIDR (p. ex., 1.2.3.4/24). Es pot especificar esta opció moltes vegades</translation> - </message> - <message> - <source>Bind to given address and whitelist peers connecting to it. Use [host]:port notation for IPv6</source> - <translation>Vincula l'adreça donada i posa a la llista blanca els iguals que s'hi connecten. Feu servir la notació [host]:port per a IPv6</translation> - </message> - <message> - <source>Create new files with system default permissions, instead of umask 077 (only effective with disabled wallet functionality)</source> - <translation>Crea fitxers nous amb els permisos per defecte del sistema, en comptes de l'umask 077 (només efectiu amb la funcionalitat de moneder inhabilitada)</translation> - </message> - <message> - <source>Discover own IP addresses (default: 1 when listening and no -externalip or -proxy)</source> - <translation>Descobreix l'adreça IP pròpia (per defecte: 1 quan s'escolta i no -externalip o -proxy)</translation> - </message> - <message> <source>Error: Listening for incoming connections failed (listen returned error %s)</source> <translation>Error: ha fallat escoltar les connexions entrants (l'escoltament ha retornat l'error %s)</translation> </message> <message> - <source>Execute command when a relevant alert is received or we see a really long fork (%s in cmd is replaced by message)</source> - <translation>Executa l'orde quan es reba un avís rellevant o veiem una forquilla molt llarga (%s en cmd és reemplaçat per un missatge)</translation> - </message> - <message> - <source>If paytxfee is not set, include enough fee so transactions begin confirmation on average within n blocks (default: %u)</source> - <translation>Si no s'especifica una paytxfee (comissió de transacció de pagament), inclogueu suficient comissió per tal que les transaccions comencen a confirmar-se en una mitja de n blocs (per defecte: %u)</translation> - </message> - <message> <source>Invalid amount for -maxtxfee=<amount>: '%s' (must be at least the minrelay fee of %s to prevent stuck transactions)</source> <translation>Import no vàlid per a -maxtxfee=<amount>: '%s' (cal que siga com a mínim la comissió de minrelay de %s per evitar que les comissions s'encallin)</translation> </message> <message> - <source>Maximum size of data in data carrier transactions we relay and mine (default: %u)</source> - <translation>Mida màxima de les dades en les transaccions de l'operador en què confiem i en les meues (per defecte: %u)</translation> - </message> - <message> - <source>Randomize credentials for every proxy connection. This enables Tor stream isolation (default: %u)</source> - <translation>Genera a l'atzar credencials per a cada connexió proxy. Això habilita l'aïllament del flux de Tor (per defecte: %u)</translation> - </message> - <message> <source>The transaction amount is too small to send after the fee has been deducted</source> <translation>L'import de la transacció és massa petit per enviar-la després que se'n deduïsca la comissió</translation> </message> <message> - <source>Whitelisted peers cannot be DoS banned and their transactions are always relayed, even if they are already in the mempool, useful e.g. for a gateway</source> - <translation>Els iguals en la llista blanca no poden ser bandejats per DoS i es transmetran sempre llurs transaccions, fins i tot si ja són a la mempool. Això és útil, p. ex., per a una passarel·la</translation> - </message> - <message> <source>You need to rebuild the database using -reindex to go back to unpruned mode. This will redownload the entire blockchain</source> <translation>Cal que torneu a construir la base de dades fent servir -reindex per tornar al mode no podat. Això tornarà a baixar la cadena de blocs sencera</translation> </message> <message> - <source>(default: %u)</source> - <translation>(per defecte: %u)</translation> - </message> - <message> - <source>Accept public REST requests (default: %u)</source> - <translation>Accepta sol·licituds REST públiques (per defecte: %u)</translation> - </message> - <message> - <source>Connect through SOCKS5 proxy</source> - <translation>Connecta a través del proxy SOCKS5</translation> - </message> - <message> <source>Error reading from database, shutting down.</source> <translation>Error en llegir la base de dades, tancant.</translation> </message> @@ -2750,34 +2570,10 @@ <translation>S'ha especificat una màscara de xarxa no vàlida a -whitelist: «%s»</translation> </message> <message> - <source>Keep at most <n> unconnectable transactions in memory (default: %u)</source> - <translation>Manté com a màxim <n> transaccions no connectables en memòria (per defecte: %u)</translation> - </message> - <message> <source>Need to specify a port with -whitebind: '%s'</source> <translation>Cal especificar un port amb -whitebind: «%s»</translation> </message> <message> - <source>Node relay options:</source> - <translation>Opcions de transmissió del node:</translation> - </message> - <message> - <source>RPC server options:</source> - <translation>Opcions del servidor RPC:</translation> - </message> - <message> - <source>Send trace/debug info to console instead of debug.log file</source> - <translation>Envia informació de traça/depuració a la consola en comptes del fitxer debug.log</translation> - </message> - <message> - <source>Show all debugging options (usage: --help -help-debug)</source> - <translation>Mostra totes les opcions de depuració (ús: --help --help-debug)</translation> - </message> - <message> - <source>Shrink debug.log file on client startup (default: 1 when no -debug)</source> - <translation>Redueix el fitxer debug.log durant l'inici del client (per defecte: 1 quan no -debug)</translation> - </message> - <message> <source>Signing transaction failed</source> <translation>Ha fallat la signatura de la transacció</translation> </message> @@ -2806,138 +2602,14 @@ <translation>No s'ha pogut vincular a %s en este ordinador (la vinculació ha retornat l'error %s)</translation> </message> <message> - <source>Username for JSON-RPC connections</source> - <translation>Nom d'usuari per a connexions JSON-RPC</translation> - </message> - <message> <source>Warning</source> <translation>Avís</translation> </message> <message> - <source>You need to rebuild the database using -reindex to change -txindex</source> - <translation>Cal que reconstruïu la base de dades fent servir -reindex per canviar -txindex</translation> - </message> - <message> <source>Zapping all transactions from wallet...</source> <translation>Se suprimeixen totes les transaccions del moneder...</translation> </message> <message> - <source>Password for JSON-RPC connections</source> - <translation>Contrasenya per a connexions JSON-RPC</translation> - </message> - <message> - <source>Execute command when the best block changes (%s in cmd is replaced by block hash)</source> - <translation>Executa l'orde quan el millor bloc canvie (%s en cmd es reemplaça per un resum de bloc)</translation> - </message> - <message> - <source>Allow DNS lookups for -addnode, -seednode and -connect</source> - <translation>Permet consultes DNS per a -addnode, -seednode i -connect</translation> - </message> - <message> - <source>(1 = keep tx meta data e.g. account owner and payment request information, 2 = drop tx meta data)</source> - <translation>(1 = manté les metadades de les tx, p. ex., propietari del compte i informació de sol·licitud del pagament, 2 = prescindeix de les metadades de les tx)</translation> - </message> - <message> - <source>How thorough the block verification of -checkblocks is (0-4, default: %u)</source> - <translation>Com d'exhaustiva és la verificació de blocs del -checkblocks (0-4, per defecte: %u)</translation> - </message> - <message> - <source>Maintain a full transaction index, used by the getrawtransaction rpc call (default: %u)</source> - <translation>Manté un índex complet de transaccions, utilitzat per la crida rpc getrawtransaction (per defecte: %u)</translation> - </message> - <message> - <source>Number of seconds to keep misbehaving peers from reconnecting (default: %u)</source> - <translation>Nombre de segons necessaris perquè els iguals de comportament qüestionable puguen tornar a connectar-se (per defecte: %u)</translation> - </message> - <message> - <source>Output debugging information (default: %u, supplying <category> is optional)</source> - <translation>Informació d'eixida de la depuració (per defecte: %u, proporcionar <category> és opcional)</translation> - </message> - <message> - <source>Use separate SOCKS5 proxy to reach peers via Tor hidden services (default: %s)</source> - <translation>Utilitza un proxy SOCKS4 apart per a arribar als iguals a través de serveis ocults de Tor (per defecte: %s)</translation> - </message> - <message> - <source>(default: %s)</source> - <translation>(per defecte: %s)</translation> - </message> - <message> - <source>Always query for peer addresses via DNS lookup (default: %u)</source> - <translation>Demana sempre les adreces dels iguals a través de consultes DNS (per defecte: %u)</translation> - </message> - <message> - <source>How many blocks to check at startup (default: %u, 0 = all)</source> - <translation>Quants blocs per comprovar a l'inici (per defecte: %u, 0 = tots)</translation> - </message> - <message> - <source>Include IP addresses in debug output (default: %u)</source> - <translation>Inclou l'adreça IP a l'eixida de depuració (per defecte: %u)</translation> - </message> - <message> - <source>Listen for JSON-RPC connections on <port> (default: %u or testnet: %u)</source> - <translation>Escolta les connexions JSON-RPC en <port> (per defecte: %u o testnet: %u)</translation> - </message> - <message> - <source>Listen for connections on <port> (default: %u or testnet: %u)</source> - <translation>Escolta les connexions en <port> (per defecte: %u o testnet: %u)</translation> - </message> - <message> - <source>Maintain at most <n> connections to peers (default: %u)</source> - <translation>Manté com a màxim <n> connexions a iguals (per defecte: %u)</translation> - </message> - <message> - <source>Make the wallet broadcast transactions</source> - <translation>Fes que el moneder faça difusió de les transaccions</translation> - </message> - <message> - <source>Maximum per-connection receive buffer, <n>*1000 bytes (default: %u)</source> - <translation>Memòria intermèdia màxima de recepció per connexió, <n>*1000 bytes (per defecte: %u)</translation> - </message> - <message> - <source>Maximum per-connection send buffer, <n>*1000 bytes (default: %u)</source> - <translation>Memòria intermèdia màxima d'enviament per connexió, <n>*1000 bytes (per defecte: %u)</translation> - </message> - <message> - <source>Prepend debug output with timestamp (default: %u)</source> - <translation>Posa davant de l'eixida de depuració una marca horària (per defecte: %u)</translation> - </message> - <message> - <source>Relay and mine data carrier transactions (default: %u)</source> - <translation>Retransmet i mina les transaccions de l'operador (per defecte: %u)</translation> - </message> - <message> - <source>Relay non-P2SH multisig (default: %u)</source> - <translation>Retransmet multisig no P2SH (per defecte: %u)</translation> - </message> - <message> - <source>Set key pool size to <n> (default: %u)</source> - <translation>Defineix la mida clau disponible a <n> (per defecte: %u)</translation> - </message> - <message> - <source>Set the number of threads to service RPC calls (default: %d)</source> - <translation>Defineix el nombre de fils a crides de servei RPC (per defecte: %d)</translation> - </message> - <message> - <source>Specify configuration file (default: %s)</source> - <translation>Especifica el fitxer de configuració (per defecte: %s)</translation> - </message> - <message> - <source>Specify connection timeout in milliseconds (minimum: 1, default: %d)</source> - <translation>Especifica el temps d'espera de la connexió en milisegons (mínim: 1, per defecte: %d)</translation> - </message> - <message> - <source>Specify pid file (default: %s)</source> - <translation>Especifica el fitxer pid (per defecte: %s)</translation> - </message> - <message> - <source>Spend unconfirmed change when sending transactions (default: %u)</source> - <translation>Gasta el canvi no confirmat en enviar les transaccions (per defecte: %u)</translation> - </message> - <message> - <source>Threshold for disconnecting misbehaving peers (default: %u)</source> - <translation>Llindar per a desconnectar els iguals de comportament qüestionable (per defecte: %u)</translation> - </message> - <message> <source>Unknown network specified in -onlynet: '%s'</source> <translation>Xarxa desconeguda especificada a -onlynet: '%s'</translation> </message> diff --git a/src/qt/locale/bitcoin_ca_ES.ts b/src/qt/locale/bitcoin_ca_ES.ts index c45c5e07ec..03c5dd853e 100644 --- a/src/qt/locale/bitcoin_ca_ES.ts +++ b/src/qt/locale/bitcoin_ca_ES.ts @@ -30,6 +30,10 @@ <translation>Elimina l'adreça sel·leccionada actualment de la llista</translation> </message> <message> + <source>Enter address or label to search</source> + <translation>Introduïu una adreça o una etiqueta per cercar</translation> + </message> + <message> <source>Export the data in the current tab to a file</source> <translation>Exporta les dades de la pestanya actual a un fitxer</translation> </message> @@ -718,10 +722,6 @@ <translation>&Adreça</translation> </message> <message> - <source>New receiving address</source> - <translation>Nova adreça de recepció</translation> - </message> - <message> <source>New sending address</source> <translation>Nova adreça d'enviament</translation> </message> @@ -738,10 +738,6 @@ <translation>L'adreça introduïda «%1» no és una adreça de Bitcoin vàlida.</translation> </message> <message> - <source>The entered address "%1" is already in the address book.</source> - <translation>L'adreça introduïda «%1» ja és present a la llibreta d'adreces.</translation> - </message> - <message> <source>Could not unlock wallet.</source> <translation>No s'ha pogut desbloquejar el moneder.</translation> </message> @@ -791,42 +787,6 @@ <source>Command-line options</source> <translation>Opcions de línia d'ordres</translation> </message> - <message> - <source>Usage:</source> - <translation>Ús:</translation> - </message> - <message> - <source>command-line options</source> - <translation>Opcions de la línia d'ordres</translation> - </message> - <message> - <source>UI Options:</source> - <translation>Opcions d'interfície d'usuari:</translation> - </message> - <message> - <source>Choose data directory on startup (default: %u)</source> - <translation>Trieu el directori de dades a l'inici (per defecte: %u)</translation> - </message> - <message> - <source>Set language, for example "de_DE" (default: system locale)</source> - <translation>Defineix la llengua, per exemple «de_DE» (per defecte: la definida pel sistema)</translation> - </message> - <message> - <source>Start minimized</source> - <translation>Inicia minimitzat</translation> - </message> - <message> - <source>Set SSL root certificates for payment request (default: -system-)</source> - <translation>Defineix els certificats arrel SSL per a la sol·licitud de pagament (per defecte: els del sistema)</translation> - </message> - <message> - <source>Show splash screen on startup (default: %u)</source> - <translation>Mostra la pantalla de benvinguda a l'inici (per defecte: %u)</translation> - </message> - <message> - <source>Reset all settings changed in the GUI</source> - <translation>Reinicialitza tots els canvis de configuració fets des de la interfície gràfica</translation> - </message> </context> <context> <name>Intro</name> @@ -1407,10 +1367,6 @@ <translation>Error: El directori de dades especificat «%1» no existeix.</translation> </message> <message> - <source>Error: Cannot parse configuration file: %1. Only use key=value syntax.</source> - <translation>Error: no es pot analitzar el fitxer de configuració: %1. Feu servir només la sintaxi clau=valor.</translation> - </message> - <message> <source>Error: %1</source> <translation>Avís: %1</translation> </message> @@ -1791,6 +1747,10 @@ <translation>Missatge</translation> </message> <message> + <source>Wallet</source> + <translation>Moneder</translation> + </message> + <message> <source>Resulting URI too long, try to reduce the text for label / message.</source> <translation>URI resultant massa llarga, intenta reduir el text per a la etiqueta / missatge</translation> </message> @@ -1901,10 +1861,6 @@ <translation>per kilobyte</translation> </message> <message> - <source>If the custom fee is set to 1000 satoshis and the transaction is only 250 bytes, then "per kilobyte" only pays 250 satoshis in fee, while "total at least" pays 1000 satoshis. For transactions bigger than a kilobyte both pay by kilobyte.</source> - <translation>Si la comissió personalitzada es defineix a 1000 satoshis i la transacció és de només 250 bytes, llavors «per kilobyte» només es paguen 250 satoshis en una comissió, mentre que amb la de «total com a mínim» es pagarien 1000 satoshis. Per a transaccions superiors al kilobyte, en tots dos casos es paga per kilobyte.</translation> - </message> - <message> <source>Hide</source> <translation>Amaga</translation> </message> @@ -2001,18 +1957,14 @@ <translation>Esteu segur que ho voleu enviar?</translation> </message> <message> - <source>added as transaction fee</source> - <translation>S'ha afegit una taxa de transacció</translation> - </message> - <message> - <source>Total Amount %1</source> - <translation>Import total %1</translation> - </message> - <message> <source>or</source> <translation>o</translation> </message> <message> + <source>Transaction fee</source> + <translation>Comissió de transacció</translation> + </message> + <message> <source>Confirm send coins</source> <translation>Confirma l'enviament de monedes</translation> </message> @@ -2322,10 +2274,6 @@ <translation>Obert fins %1</translation> </message> <message> - <source>%1/offline</source> - <translation>%1/fora de línia</translation> - </message> - <message> <source>abandoned</source> <translation>abandonada</translation> </message> @@ -2342,10 +2290,6 @@ <translation>Estat</translation> </message> <message> - <source>, has not been successfully broadcast yet</source> - <translation>, encara no ha estat emès correctement</translation> - </message> - <message> <source>Date</source> <translation>Data</translation> </message> @@ -2484,10 +2428,6 @@ <translation>Obert fins %1</translation> </message> <message> - <source>Offline</source> - <translation>Fora de línia</translation> - </message> - <message> <source>Unconfirmed</source> <translation>Sense confirmar</translation> </message> @@ -2512,10 +2452,6 @@ <translation>Immadur (%1 confirmacions, serà disponible després de %2)</translation> </message> <message> - <source>This block was not received by any other nodes and will probably not be accepted!</source> - <translation>Aquest bloc no ha estat rebut per cap altre node i probablement no serà acceptat!</translation> - </message> - <message> <source>Generated but not accepted</source> <translation>Generat però no acceptat</translation> </message> @@ -2778,34 +2714,10 @@ <source>The wallet data was successfully saved to %1.</source> <translation>S'han desat les dades del moneder correctament a %1.</translation> </message> -</context> + </context> <context> <name>bitcoin-core</name> <message> - <source>Options:</source> - <translation>Opcions:</translation> - </message> - <message> - <source>Specify data directory</source> - <translation>Especifica el directori de dades</translation> - </message> - <message> - <source>Connect to a node to retrieve peer addresses, and disconnect</source> - <translation>Connecta al node per obtenir les adreces de les connexions, i desconnecta</translation> - </message> - <message> - <source>Specify your own public address</source> - <translation>Especifiqueu la vostra adreça pública</translation> - </message> - <message> - <source>Accept command line and JSON-RPC commands</source> - <translation>Accepta la línia d'ordres i ordres JSON-RPC </translation> - </message> - <message> - <source>If <category> is not supplied or if <category> = 1, output all debugging information.</source> - <translation>Si no es proporciona <category> o si <category> = 1, treu a la sortida tota la informació de depuració.</translation> - </message> - <message> <source>Prune configured below the minimum of %d MiB. Please use a higher number.</source> <translation>Poda configurada per sota el mínim de %d MiB. Utilitzeu un nombre superior.</translation> </message> @@ -2822,18 +2734,10 @@ <translation>Error: s'ha produït un error intern fatal. Vegeu debug.log per a més detalls</translation> </message> <message> - <source>Fee (in %s/kB) to add to transactions you send (default: %s)</source> - <translation>Comissió (en %s/kB) per afegir a les transaccions que envieu (per defecte: %s)</translation> - </message> - <message> <source>Pruning blockstore...</source> <translation>S'està podant la cadena de blocs...</translation> </message> <message> - <source>Run in the background as a daemon and accept commands</source> - <translation>Executa en segon pla com a programa dimoni i accepta ordres</translation> - </message> - <message> <source>Unable to start HTTP server. See debug log for details.</source> <translation>No s'ha pogut iniciar el servidor HTTP. Vegeu debug.log per a més detalls.</translation> </message> @@ -2842,22 +2746,6 @@ <translation>Bitcoin Core</translation> </message> <message> - <source>Bind to given address and always listen on it. Use [host]:port notation for IPv6</source> - <translation>Vincula a una adreça específica i sempre escolta-hi. Utilitza la notació [host]:port per IPv6</translation> - </message> - <message> - <source>Delete all wallet transactions and only recover those parts of the blockchain through -rescan on startup</source> - <translation>Elimina totes les transaccions del moneder i només recupera aquelles de la cadena de blocs a través de -rescan a l'inici</translation> - </message> - <message> - <source>Execute command when a wallet transaction changes (%s in cmd is replaced by TxID)</source> - <translation>Executa una ordre quan una transacció del moneder canviï (%s en cmd es canvia per TxID)</translation> - </message> - <message> - <source>Set the number of script verification threads (%u to %d, 0 = auto, <0 = leave that many cores free, default: %d)</source> - <translation>Defineix el nombre de fils de verificació d'scripts (%u a %d, 0 = auto, <0 = deixa tants nuclis lliures, per defecte: %d)</translation> - </message> - <message> <source>This is a pre-release test build - use at your own risk - do not use for mining or merchant applications</source> <translation>Aquesta és una versió de pre-llançament - utilitza-la sota la teva responsabilitat - No usar per a minería o aplicacions de compra-venda</translation> </message> @@ -2870,34 +2758,10 @@ <translation>Avís: sembla que no estem plenament d'acord amb els nostres iguals! Podria caler que actualitzar l'aplicació, o potser que ho facin altres nodes.</translation> </message> <message> - <source><category> can be:</source> - <translation><category> pot ser:</translation> - </message> - <message> - <source>Accept connections from outside (default: 1 if no -proxy or -connect)</source> - <translation>Accepta connexions de fora (per defecte: 1 si no -proxy o -connect)</translation> - </message> - <message> - <source>Block creation options:</source> - <translation>Opcions de la creació de blocs:</translation> - </message> - <message> - <source>Connection options:</source> - <translation>Opcions de connexió:</translation> - </message> - <message> <source>Corrupted block database detected</source> <translation>S'ha detectat una base de dades de blocs corrupta</translation> </message> <message> - <source>Debugging/Testing options:</source> - <translation>Opcions de depuració/proves:</translation> - </message> - <message> - <source>Do not load the wallet and disable wallet RPC calls</source> - <translation>No carreguis el moneder i inhabilita les crides RPC del moneder</translation> - </message> - <message> <source>Do you want to rebuild the block database now?</source> <translation>Voleu reconstruir la base de dades de blocs ara?</translation> </message> @@ -2938,10 +2802,6 @@ <translation>No hi ha suficient descriptors de fitxers disponibles.</translation> </message> <message> - <source>Only connect to nodes in network <net> (ipv4, ipv6 or onion)</source> - <translation>Només connecta als nodes de la xarxa <net> (ipv4, ipv6 o onion)</translation> - </message> - <message> <source>Prune cannot be configured with a negative value.</source> <translation>La poda no es pot configurar amb un valor negatiu.</translation> </message> @@ -2950,102 +2810,30 @@ <translation>El mode de poda és incompatible amb -txindex.</translation> </message> <message> - <source>Set database cache size in megabytes (%d to %d, default: %d)</source> - <translation>Defineix la mida de la memòria cau de la base de dades en megabytes (%d a %d, per defecte: %d)</translation> - </message> - <message> - <source>Specify wallet file (within data directory)</source> - <translation>Especifica un fitxer de moneder (dins del directori de dades)</translation> - </message> - <message> - <source>Use UPnP to map the listening port (default: %u)</source> - <translation>Utilitza UPnP per a mapejar el port d'escolta (per defecte: %u)</translation> - </message> - <message> - <source>Use the test chain</source> - <translation>Utilitza la cadena de proves</translation> - </message> - <message> <source>Verifying blocks...</source> <translation>S'estan verificant els blocs...</translation> </message> <message> - <source>Wallet debugging/testing options:</source> - <translation>Opcions de depuració/proves del moneder:</translation> - </message> - <message> <source>Wallet needed to be rewritten: restart %s to complete</source> <translation>Cal reescriure el moneder: reinicieu %s per a completar-ho</translation> </message> <message> - <source>Wallet options:</source> - <translation>Opcions de moneder:</translation> - </message> - <message> - <source>Allow JSON-RPC connections from specified source. Valid for <ip> are a single IP (e.g. 1.2.3.4), a network/netmask (e.g. 1.2.3.4/255.255.255.0) or a network/CIDR (e.g. 1.2.3.4/24). This option can be specified multiple times</source> - <translation>Permet les connexions JSON-RPC d'una font específica. Vàlid per a <ip> són una IP individual (p. ex., 1.2.3.4), una xarxa / màscara de xarxa (p. ex., 1.2.3.4/255.255.255.0) o una xarxa/CIDR (p. ex., 1.2.3.4/24). Es pot especificar aquesta opció moltes vegades</translation> - </message> - <message> - <source>Bind to given address and whitelist peers connecting to it. Use [host]:port notation for IPv6</source> - <translation>Vincula l'adreça donada i posa a la llista blanca els iguals que s'hi connectin. Feu servir la notació [host]:port per a IPv6</translation> - </message> - <message> - <source>Create new files with system default permissions, instead of umask 077 (only effective with disabled wallet functionality)</source> - <translation>Crea fitxers nous amb els permisos per defecte del sistema, en comptes de l'umask 077 (només efectiu amb la funcionalitat de moneder inhabilitada)</translation> - </message> - <message> - <source>Discover own IP addresses (default: 1 when listening and no -externalip or -proxy)</source> - <translation>Descobreix l'adreça IP pròpia (per defecte: 1 quan s'escolta i no -externalip o -proxy)</translation> - </message> - <message> <source>Error: Listening for incoming connections failed (listen returned error %s)</source> <translation>Error: ha fallat escoltar les connexions entrants (l'escoltament ha retornat l'error %s)</translation> </message> <message> - <source>Execute command when a relevant alert is received or we see a really long fork (%s in cmd is replaced by message)</source> - <translation>Executa l'ordre quan es rebi un avís rellevant o veiem una forquilla molt llarga (%s en cmd és reemplaçat per un missatge)</translation> - </message> - <message> - <source>If paytxfee is not set, include enough fee so transactions begin confirmation on average within n blocks (default: %u)</source> - <translation>Si no s'especifica una paytxfee (comissió de transacció de pagament), inclogueu suficient comissió per tal que les transaccions comencin a confirmar-se en una mitja de n blocs (per defecte: %u)</translation> - </message> - <message> <source>Invalid amount for -maxtxfee=<amount>: '%s' (must be at least the minrelay fee of %s to prevent stuck transactions)</source> <translation>Import no vàlid per a -maxtxfee=<amount>: '%s' (cal que sigui com a mínim la comissió de minrelay de %s per evitar que les comissions s'encallin)</translation> </message> <message> - <source>Maximum size of data in data carrier transactions we relay and mine (default: %u)</source> - <translation>Mida màxima de les dades en les transaccions de l'operador en què confiem i en les meves (per defecte: %u)</translation> - </message> - <message> - <source>Randomize credentials for every proxy connection. This enables Tor stream isolation (default: %u)</source> - <translation>Genera a l'atzar credencials per a cada connexió proxy. Això habilita l'aïllament del flux de Tor (per defecte: %u)</translation> - </message> - <message> <source>The transaction amount is too small to send after the fee has been deducted</source> <translation>L'import de la transacció és massa petit per enviar-la després que se'n dedueixi la comissió</translation> </message> <message> - <source>Whitelisted peers cannot be DoS banned and their transactions are always relayed, even if they are already in the mempool, useful e.g. for a gateway</source> - <translation>Els iguals en la llista blanca no poden ser bandejats per DoS i es transmetran sempre llurs transaccions, fins i tot si ja són a la mempool. Això és útil, p. ex., per a una passarel·la</translation> - </message> - <message> <source>You need to rebuild the database using -reindex to go back to unpruned mode. This will redownload the entire blockchain</source> <translation>Cal que torneu a construir la base de dades fent servir -reindex per tornar al mode no podat. Això tornarà a baixar la cadena de blocs sencera</translation> </message> <message> - <source>(default: %u)</source> - <translation>(per defecte: %u)</translation> - </message> - <message> - <source>Accept public REST requests (default: %u)</source> - <translation>Accepta sol·licituds REST públiques (per defecte: %u)</translation> - </message> - <message> - <source>Connect through SOCKS5 proxy</source> - <translation>Connecta a través del proxy SOCKS5</translation> - </message> - <message> <source>Error reading from database, shutting down.</source> <translation>Error en llegir la base de dades, tancant.</translation> </message> @@ -3062,34 +2850,10 @@ <translation>S'ha especificat una màscara de xarxa no vàlida a -whitelist: «%s»</translation> </message> <message> - <source>Keep at most <n> unconnectable transactions in memory (default: %u)</source> - <translation>Manté com a màxim <n> transaccions no connectables en memòria (per defecte: %u)</translation> - </message> - <message> <source>Need to specify a port with -whitebind: '%s'</source> <translation>Cal especificar un port amb -whitebind: «%s»</translation> </message> <message> - <source>Node relay options:</source> - <translation>Opcions de transmissió del node:</translation> - </message> - <message> - <source>RPC server options:</source> - <translation>Opcions del servidor RPC:</translation> - </message> - <message> - <source>Send trace/debug info to console instead of debug.log file</source> - <translation>Envia informació de traça/depuració a la consola en comptes del fitxer debug.log</translation> - </message> - <message> - <source>Show all debugging options (usage: --help -help-debug)</source> - <translation>Mostra totes les opcions de depuració (ús: --help --help-debug)</translation> - </message> - <message> - <source>Shrink debug.log file on client startup (default: 1 when no -debug)</source> - <translation>Redueix el fitxer debug.log durant l'inici del client (per defecte: 1 quan no -debug)</translation> - </message> - <message> <source>Signing transaction failed</source> <translation>Ha fallat la signatura de la transacció</translation> </message> @@ -3118,10 +2882,6 @@ <translation>No s'ha pogut vincular a %s en aquest ordinador (la vinculació ha retornat l'error %s)</translation> </message> <message> - <source>Username for JSON-RPC connections</source> - <translation>Nom d'usuari per a connexions JSON-RPC</translation> - </message> - <message> <source>Warning</source> <translation>Avís</translation> </message> @@ -3130,134 +2890,14 @@ <translation>Avís: regles noves desconegudes activades (versionbit %i)</translation> </message> <message> - <source>You need to rebuild the database using -reindex to change -txindex</source> - <translation>Cal que reconstruïu la base de dades fent servir -reindex per canviar -txindex</translation> - </message> - <message> <source>Zapping all transactions from wallet...</source> <translation>Se suprimeixen totes les transaccions del moneder...</translation> </message> <message> - <source>Password for JSON-RPC connections</source> - <translation>Contrasenya per a connexions JSON-RPC</translation> - </message> - <message> - <source>Execute command when the best block changes (%s in cmd is replaced by block hash)</source> - <translation>Executa l'ordre quan el millor bloc canviï (%s en cmd es reemplaça per un resum de bloc)</translation> - </message> - <message> - <source>Allow DNS lookups for -addnode, -seednode and -connect</source> - <translation>Permet consultes DNS per a -addnode, -seednode i -connect</translation> - </message> - <message> - <source>(1 = keep tx meta data e.g. account owner and payment request information, 2 = drop tx meta data)</source> - <translation>(1 = manté les metadades de les tx, p. ex., propietari del compte i informació de sol·licitud del pagament, 2 = prescindeix de les metadades de les tx)</translation> - </message> - <message> - <source>How thorough the block verification of -checkblocks is (0-4, default: %u)</source> - <translation>Com d'exhaustiva és la verificació de blocs del -checkblocks (0-4, per defecte: %u)</translation> - </message> - <message> - <source>Maintain a full transaction index, used by the getrawtransaction rpc call (default: %u)</source> - <translation>Manté un índex complet de transaccions, utilitzat per la crida rpc getrawtransaction (per defecte: %u)</translation> - </message> - <message> - <source>Number of seconds to keep misbehaving peers from reconnecting (default: %u)</source> - <translation>Nombre de segons necessaris perquè els iguals de comportament qüestionable puguin tornar a connectar-se (per defecte: %u)</translation> - </message> - <message> - <source>Output debugging information (default: %u, supplying <category> is optional)</source> - <translation>Informació de sortida de la depuració (per defecte: %u, proporcionar <category> és opcional)</translation> - </message> - <message> - <source>Use separate SOCKS5 proxy to reach peers via Tor hidden services (default: %s)</source> - <translation>Utilitza un proxy SOCKS4 apart per a arribar als iguals a través de serveis ocults de Tor (per defecte: %s)</translation> - </message> - <message> - <source>(default: %s)</source> - <translation>(per defecte: %s)</translation> - </message> - <message> - <source>Always query for peer addresses via DNS lookup (default: %u)</source> - <translation>Demana sempre les adreces dels iguals a través de consultes DNS (per defecte: %u)</translation> - </message> - <message> - <source>How many blocks to check at startup (default: %u, 0 = all)</source> - <translation>Quants blocs per comprovar a l'inici (per defecte: %u, 0 = tots)</translation> - </message> - <message> - <source>Include IP addresses in debug output (default: %u)</source> - <translation>Inclou l'adreça IP a la sortida de depuració (per defecte: %u)</translation> - </message> - <message> - <source>Listen for JSON-RPC connections on <port> (default: %u or testnet: %u)</source> - <translation>Escolta les connexions JSON-RPC en <port> (per defecte: %u o testnet: %u)</translation> - </message> - <message> - <source>Listen for connections on <port> (default: %u or testnet: %u)</source> - <translation>Escolta les connexions en <port> (per defecte: %u o testnet: %u)</translation> - </message> - <message> - <source>Maintain at most <n> connections to peers (default: %u)</source> - <translation>Manté com a màxim <n> connexions a iguals (per defecte: %u)</translation> - </message> - <message> - <source>Make the wallet broadcast transactions</source> - <translation>Fes que el moneder faci difusió de les transaccions</translation> - </message> - <message> - <source>Maximum per-connection receive buffer, <n>*1000 bytes (default: %u)</source> - <translation>Memòria intermèdia màxima de recepció per connexió, <n>*1000 bytes (per defecte: %u)</translation> - </message> - <message> - <source>Maximum per-connection send buffer, <n>*1000 bytes (default: %u)</source> - <translation>Memòria intermèdia màxima d'enviament per connexió, <n>*1000 bytes (per defecte: %u)</translation> - </message> - <message> - <source>Prepend debug output with timestamp (default: %u)</source> - <translation>Posa davant de la sortida de depuració una marca horària (per defecte: %u)</translation> - </message> - <message> - <source>Relay and mine data carrier transactions (default: %u)</source> - <translation>Retransmet i mina les transaccions de l'operador (per defecte: %u)</translation> - </message> - <message> - <source>Relay non-P2SH multisig (default: %u)</source> - <translation>Retransmet multisig no P2SH (per defecte: %u)</translation> - </message> - <message> - <source>Set key pool size to <n> (default: %u)</source> - <translation>Defineix la mida clau disponible a <n> (per defecte: %u)</translation> - </message> - <message> - <source>Set the number of threads to service RPC calls (default: %d)</source> - <translation>Defineix el nombre de fils a crides de servei RPC (per defecte: %d)</translation> - </message> - <message> - <source>Specify configuration file (default: %s)</source> - <translation>Especifica el fitxer de configuració (per defecte: %s)</translation> - </message> - <message> - <source>Specify connection timeout in milliseconds (minimum: 1, default: %d)</source> - <translation>Especifica el temps d'espera de la connexió en milisegons (mínim: 1, per defecte: %d)</translation> - </message> - <message> - <source>Specify pid file (default: %s)</source> - <translation>Especifica el fitxer pid (per defecte: %s)</translation> - </message> - <message> - <source>Spend unconfirmed change when sending transactions (default: %u)</source> - <translation>Gasta el canvi no confirmat en enviar les transaccions (per defecte: %u)</translation> - </message> - <message> <source>Starting network threads...</source> <translation>S'estan iniciant els fils de la xarxa...</translation> </message> <message> - <source>Threshold for disconnecting misbehaving peers (default: %u)</source> - <translation>Llindar per a desconnectar els iguals de comportament qüestionable (per defecte: %u)</translation> - </message> - <message> <source>Transaction amounts must not be negative</source> <translation>Els imports de la transacció no han de ser negatius</translation> </message> diff --git a/src/qt/locale/bitcoin_cs.ts b/src/qt/locale/bitcoin_cs.ts index 4ea142937c..260d79b766 100644 --- a/src/qt/locale/bitcoin_cs.ts +++ b/src/qt/locale/bitcoin_cs.ts @@ -7,19 +7,19 @@ </message> <message> <source>Create a new address</source> - <translation>Vytvořit novou adresu</translation> + <translation>Vytvoř novou adresu</translation> </message> <message> <source>&New</source> - <translation>&Nová/&Nový/&Nové</translation> + <translation>&Nová</translation> </message> <message> <source>Copy the currently selected address to the system clipboard</source> - <translation>Zkopíruj tuto adresu do schránky</translation> + <translation>Zkopíruj tuto adresu do systémové schránky</translation> </message> <message> <source>&Copy</source> - <translation>&Zkopírovat</translation> + <translation>&Kopíruj</translation> </message> <message> <source>C&lose</source> @@ -27,27 +27,31 @@ </message> <message> <source>Delete the currently selected address from the list</source> - <translation>Smazat tuto adresu ze seznamu</translation> + <translation>Smaž tuto adresu ze seznamu</translation> + </message> + <message> + <source>Enter address or label to search</source> + <translation>Zadej adresu nebo označení pro její vyhledání</translation> </message> <message> <source>Export the data in the current tab to a file</source> - <translation>Exportuj data z aktuálního panelu do souboru</translation> + <translation>Exportuj data z tohoto panelu do souboru</translation> </message> <message> <source>&Export</source> - <translation>&Exportovat</translation> + <translation>&Export</translation> </message> <message> <source>&Delete</source> - <translation>&Smaž</translation> + <translation>S&maž</translation> </message> <message> <source>Choose the address to send coins to</source> - <translation>Zvol adresu, na kterou pošleš coiny</translation> + <translation>Zvol adresu, na kterou pošleš mince</translation> </message> <message> <source>Choose the address to receive coins with</source> - <translation>Zvol adresu na příjem mincí</translation> + <translation>Zvol adres na příjem mincí</translation> </message> <message> <source>C&hoose</source> @@ -55,7 +59,7 @@ </message> <message> <source>Sending addresses</source> - <translation>Odesílající adresy</translation> + <translation>Odesílací adresy</translation> </message> <message> <source>Receiving addresses</source> @@ -67,27 +71,27 @@ </message> <message> <source>These are your Bitcoin addresses for receiving payments. It is recommended to use a new receiving address for each transaction.</source> - <translation>Tohle jsou tvé bitcoinové adresy pro příjem plateb. Je doporučeno pro každou transakci vždy vygenerovat novou adresu.</translation> + <translation>Tohle jsou tvé bitcoinové adresy pro příjem plateb. Nezapomeň si pro každou transakci vždy vygenerovat novou adresu.</translation> </message> <message> <source>&Copy Address</source> - <translation>&Zkopírovat adresu</translation> + <translation>&Kopíruj adresu</translation> </message> <message> <source>Copy &Label</source> - <translation>Kopíruj &Označ</translation> + <translation>Kopíruj &označení</translation> </message> <message> <source>&Edit</source> - <translation>&Upravit</translation> + <translation>&Uprav</translation> </message> <message> <source>Export Address List</source> - <translation>Exportuj seznam adres</translation> + <translation>Export seznamu adres</translation> </message> <message> <source>Comma separated file (*.csv)</source> - <translation>CSV formát (*.csv)</translation> + <translation>Formát CSV (*.csv)</translation> </message> <message> <source>Exporting Failed</source> @@ -133,7 +137,7 @@ </message> <message> <source>Show password</source> - <translation>Zobrazit heslo</translation> + <translation>Ukaž heslo</translation> </message> <message> <source>Enter the new passphrase to the wallet.<br/>Please use a passphrase of <b>ten or more random characters</b>, or <b>eight or more words</b>.</source> @@ -322,6 +326,14 @@ <translation>Načíst &URI...</translation> </message> <message> + <source>Wallet:</source> + <translation>Peněženka:</translation> + </message> + <message> + <source>default wallet</source> + <translation>výchozí peněženka</translation> + </message> + <message> <source>Click to disable network activity.</source> <translation>Kliknutím zařízneš spojení se sítí.</translation> </message> @@ -439,7 +451,7 @@ </message> <message numerus="yes"> <source>%n active connection(s) to Bitcoin network</source> - <translation><numerusform>%n aktivní spojení do bitcoinové sítě</numerusform><numerusform>%n aktivní spojení do bitcoinové sítě</numerusform><numerusform>%n aktivních spojení do bitcoinové sítě</numerusform></translation> + <translation><numerusform>%n aktivní spojení do bitcoinové sítě</numerusform><numerusform>%n aktivní spojení do bitcoinové sítě</numerusform><numerusform>%n aktivních spojení do bitcoinové sítě</numerusform><numerusform>%n aktivních spojení do bitcoinové sítě</numerusform></translation> </message> <message> <source>Indexing blocks on disk...</source> @@ -451,7 +463,7 @@ </message> <message numerus="yes"> <source>Processed %n block(s) of transaction history.</source> - <translation><numerusform>Zpracován %n blok transakční historie.</numerusform><numerusform>Zpracovány %n bloky transakční historie.</numerusform><numerusform>Zpracováno %n bloků transakční historie.</numerusform></translation> + <translation><numerusform>Zpracován %n blok transakční historie.</numerusform><numerusform>Zpracovány %n bloky transakční historie.</numerusform><numerusform>Zpracováno %n bloků transakční historie.</numerusform><numerusform>Zpracováno %n bloků transakční historie.</numerusform></translation> </message> <message> <source>%1 behind</source> @@ -730,10 +742,6 @@ <translation>&Adresa</translation> </message> <message> - <source>New receiving address</source> - <translation>Nová přijímací adresa</translation> - </message> - <message> <source>New sending address</source> <translation>Nová odesílací adresa</translation> </message> @@ -750,10 +758,6 @@ <translation>Zadaná adresa „%1“ není platná bitcoinová adresa.</translation> </message> <message> - <source>The entered address "%1" is already in the address book.</source> - <translation>Zadaná adresa „%1“ už v adresáři je.</translation> - </message> - <message> <source>Could not unlock wallet.</source> <translation>Nemohu odemknout peněženku.</translation> </message> @@ -803,42 +807,6 @@ <source>Command-line options</source> <translation>Argumenty příkazové řádky</translation> </message> - <message> - <source>Usage:</source> - <translation>Užití:</translation> - </message> - <message> - <source>command-line options</source> - <translation>možnosti příkazové řádky</translation> - </message> - <message> - <source>UI Options:</source> - <translation>Možnosti UI:</translation> - </message> - <message> - <source>Choose data directory on startup (default: %u)</source> - <translation>Zvolit při startu adresář pro data (výchozí: %u)</translation> - </message> - <message> - <source>Set language, for example "de_DE" (default: system locale)</source> - <translation>Nastavit jazyk, například „de_DE“ (výchozí: systémové nastavení)</translation> - </message> - <message> - <source>Start minimized</source> - <translation>Nastartovat minimalizovaně</translation> - </message> - <message> - <source>Set SSL root certificates for payment request (default: -system-)</source> - <translation>Nastavit kořenové SSL certifikáty pro platební požadavky (výchozí: -system-)</translation> - </message> - <message> - <source>Show splash screen on startup (default: %u)</source> - <translation>Zobrazit startovací obrazovku (výchozí: %u)</translation> - </message> - <message> - <source>Reset all settings changed in the GUI</source> - <translation>Vrátit všechny volby měněné v GUI na výchozí hodnoty</translation> - </message> </context> <context> <name>Intro</name> @@ -904,11 +872,11 @@ </message> <message numerus="yes"> <source>%n GB of free space available</source> - <translation><numerusform>%n GB volného místa</numerusform><numerusform>%n GB volného místa</numerusform><numerusform>%n GB volného místa</numerusform></translation> + <translation><numerusform>%n GB volného místa</numerusform><numerusform>%n GB volného místa</numerusform><numerusform>%n GB volného místa</numerusform><numerusform>%n GB volného místa</numerusform></translation> </message> <message numerus="yes"> <source>(of %n GB needed)</source> - <translation><numerusform>(z potřebného %n GB)</numerusform><numerusform>(z potřebných %n GB)</numerusform><numerusform>(z potřebných %n GB)</numerusform></translation> + <translation><numerusform>(z potřebného %n GB)</numerusform><numerusform>(z potřebných %n GB)</numerusform><numerusform>(z potřebných %n GB)</numerusform><numerusform>(z potřebných %n GB)</numerusform></translation> </message> </context> <context> @@ -1025,11 +993,15 @@ </message> <message> <source>Use separate SOCKS&5 proxy to reach peers via Tor hidden services:</source> - <translation>Použít samostatnou SOCKS5 proxy ke spojení s protějšky přes skryté služby v Toru:</translation> + <translation>Použít samostatnou SOCKS&5 proxy ke spojení s protějšky přes skryté služby v Toru:</translation> </message> <message> <source>Hide the icon from the system tray.</source> - <translation>Skrýt ikonu z panelu.</translation> + <translation>Skryje ikonu, která se zobrazuje v panelu.</translation> + </message> + <message> + <source>&Hide tray icon</source> + <translation>Skrýt &ikonu z panelu</translation> </message> <message> <source>Minimize instead of exit the application when the window is closed. When this option is enabled, the application will be closed only after selecting Exit in the menu.</source> @@ -1097,7 +1069,11 @@ </message> <message> <source>Accept connections from outside.</source> - <translation>Přijímat spojení z venku.</translation> + <translation>Přijímat spojení zvenčí.</translation> + </message> + <message> + <source>Allow incomin&g connections</source> + <translation>Přijí&mat příchozí spojení</translation> </message> <message> <source>Connect to the Bitcoin network through a SOCKS5 proxy.</source> @@ -1180,6 +1156,10 @@ <translation>Zda ukazovat možnosti pro ruční správu mincí nebo ne.</translation> </message> <message> + <source>&Third party transaction URLs</source> + <translation>&URL třetích stran pro transakce</translation> + </message> + <message> <source>&OK</source> <translation>&Budiž</translation> </message> @@ -1322,6 +1302,10 @@ <translation>Zpracování URI</translation> </message> <message> + <source>'bitcoin://' is not a valid URI. Use 'bitcoin:' instead.</source> + <translation>'bitcoin://' není platné URI. Místo toho použij 'bitcoin:'.</translation> + </message> + <message> <source>Payment request fetch URL is invalid: %1</source> <translation>Zdrojová URL platebního požadavku není platná: %1</translation> </message> @@ -1465,23 +1449,23 @@ </message> <message numerus="yes"> <source>%n second(s)</source> - <translation><numerusform>%n vteřinu</numerusform><numerusform>%n vteřiny</numerusform><numerusform>%n vteřin</numerusform></translation> + <translation><numerusform>%n vteřinu</numerusform><numerusform>%n vteřiny</numerusform><numerusform>%n vteřin</numerusform><numerusform>%n vteřin</numerusform></translation> </message> <message numerus="yes"> <source>%n minute(s)</source> - <translation><numerusform>%n minutu</numerusform><numerusform>%n minuty</numerusform><numerusform>%n minut</numerusform></translation> + <translation><numerusform>%n minutu</numerusform><numerusform>%n minuty</numerusform><numerusform>%n minut</numerusform><numerusform>%n minut</numerusform></translation> </message> <message numerus="yes"> <source>%n hour(s)</source> - <translation><numerusform>%n hodinu</numerusform><numerusform>%n hodiny</numerusform><numerusform>%n hodin</numerusform></translation> + <translation><numerusform>%n hodinu</numerusform><numerusform>%n hodiny</numerusform><numerusform>%n hodin</numerusform><numerusform>%n hodin</numerusform></translation> </message> <message numerus="yes"> <source>%n day(s)</source> - <translation><numerusform>%n den</numerusform><numerusform>%n dny</numerusform><numerusform>%n dnů</numerusform></translation> + <translation><numerusform>%n den</numerusform><numerusform>%n dny</numerusform><numerusform>%n dnů</numerusform><numerusform>%n dnů</numerusform></translation> </message> <message numerus="yes"> <source>%n week(s)</source> - <translation><numerusform>%n týden</numerusform><numerusform>%n týdny</numerusform><numerusform>%n týdnů</numerusform></translation> + <translation><numerusform>%n týden</numerusform><numerusform>%n týdny</numerusform><numerusform>%n týdnů</numerusform><numerusform>%n týdnů</numerusform></translation> </message> <message> <source>%1 and %2</source> @@ -1489,7 +1473,7 @@ </message> <message numerus="yes"> <source>%n year(s)</source> - <translation><numerusform>%n rok</numerusform><numerusform>%n roky</numerusform><numerusform>%n roků</numerusform></translation> + <translation><numerusform>%n rok</numerusform><numerusform>%n roky</numerusform><numerusform>%n roků</numerusform><numerusform>%n roků</numerusform></translation> </message> <message> <source>%1 B</source> @@ -1523,10 +1507,6 @@ <translation>Chyba: Zadaný adresář pro data „%1“ neexistuje.</translation> </message> <message> - <source>Error: Cannot parse configuration file: %1. Only use key=value syntax.</source> - <translation>Chyba: Nemohu zpracovat konfigurační soubor: %1. Používej pouze syntaxi klíč=hodnota.</translation> - </message> - <message> <source>Error: %1</source> <translation>Chyba: %1</translation> </message> @@ -1785,6 +1765,10 @@ <translation>&Odblokuj</translation> </message> <message> + <source>default wallet</source> + <translation>výchozí peněženka</translation> + </message> + <message> <source>Welcome to the %1 RPC console.</source> <translation>Vítej v RPC konzoli %1.</translation> </message> @@ -1959,6 +1943,10 @@ <translation>Zpráva</translation> </message> <message> + <source>Wallet</source> + <translation>Peněženka</translation> + </message> + <message> <source>Resulting URI too long, try to reduce the text for label / message.</source> <translation>Výsledná URI je příliš dlouhá, zkus zkrátit text označení/zprávy.</translation> </message> @@ -2077,10 +2065,6 @@ <translation>za kilobajt</translation> </message> <message> - <source>If the custom fee is set to 1000 satoshis and the transaction is only 250 bytes, then "per kilobyte" only pays 250 satoshis in fee, while "total at least" pays 1000 satoshis. For transactions bigger than a kilobyte both pay by kilobyte.</source> - <translation>Pokud je vlastní poplatek nastavený na 1000 satoshi a transakce má pouze 250 bajtů, tak „za kilobajt“ zaplatí poplatek jen 250 satoshi, zatímco „přinejmenším“ zaplatí 1000 satoshi. Pro transakce větší než kilobajt obě možnosti platí za kilobajt.</translation> - </message> - <message> <source>Hide</source> <translation>Skryj</translation> </message> @@ -2125,6 +2109,10 @@ <translation>Časové cílování potvrzení:</translation> </message> <message> + <source>Enable Replace-By-Fee</source> + <translation>Povolit možnost dodatečně transakci navýšit poplatek (tzv. „replace-by-fee“)</translation> + </message> + <message> <source>Clear &All</source> <translation>Všechno s&maž</translation> </message> @@ -2181,18 +2169,14 @@ <translation>Jsi si jistý, že tuhle transakci chceš poslat?</translation> </message> <message> - <source>added as transaction fee</source> - <translation>přidáno jakožto transakční poplatek</translation> - </message> - <message> - <source>Total Amount %1</source> - <translation>Celková částka %1</translation> - </message> - <message> <source>or</source> <translation>nebo</translation> </message> <message> + <source>Transaction fee</source> + <translation>Transakční poplatek</translation> + </message> + <message> <source>Confirm send coins</source> <translation>Potvrď odeslání mincí</translation> </message> @@ -2238,7 +2222,7 @@ </message> <message numerus="yes"> <source>Estimated to begin confirmation within %n block(s).</source> - <translation><numerusform>Potvrzování by podle odhadu mělo začít během %n bloku.</numerusform><numerusform>Potvrzování by podle odhadu mělo začít během %n bloků.</numerusform><numerusform>Potvrzování by podle odhadu mělo začít během %n bloků.</numerusform></translation> + <translation><numerusform>Potvrzování by podle odhadu mělo začít během %n bloku.</numerusform><numerusform>Potvrzování by podle odhadu mělo začít během %n bloků.</numerusform><numerusform>Potvrzování by podle odhadu mělo začít během %n bloků.</numerusform><numerusform>Potvrzování by podle odhadu mělo začít během %n bloků.</numerusform></translation> </message> <message> <source>Warning: Invalid Bitcoin address</source> @@ -2519,7 +2503,7 @@ <name>TransactionDesc</name> <message numerus="yes"> <source>Open for %n more block(s)</source> - <translation><numerusform>Otevřeno pro %n další blok</numerusform><numerusform>Otevřeno pro %n další bloky</numerusform><numerusform>Otevřeno pro %n dalších bloků</numerusform></translation> + <translation><numerusform>Otevřeno pro %n další blok</numerusform><numerusform>Otevřeno pro %n další bloky</numerusform><numerusform>Otevřeno pro %n dalších bloků</numerusform><numerusform>Otevřeno pro %n dalších bloků</numerusform></translation> </message> <message> <source>Open until %1</source> @@ -2530,10 +2514,6 @@ <translation>koliduje s transakcí o %1 konfirmacích</translation> </message> <message> - <source>%1/offline</source> - <translation>%1/offline</translation> - </message> - <message> <source>0/unconfirmed, %1</source> <translation>0/nepotvrzeno, %1</translation> </message> @@ -2562,14 +2542,6 @@ <translation>Stav</translation> </message> <message> - <source>, has not been successfully broadcast yet</source> - <translation>, ještě nebylo rozesláno</translation> - </message> - <message numerus="yes"> - <source>, broadcast through %n node(s)</source> - <translation><numerusform>, rozesláno přes %n uzel</numerusform><numerusform>, rozesláno přes %n uzly</numerusform><numerusform>, rozesláno přes %n uzlů</numerusform></translation> - </message> - <message> <source>Date</source> <translation>Datum</translation> </message> @@ -2611,7 +2583,7 @@ </message> <message numerus="yes"> <source>matures in %n more block(s)</source> - <translation><numerusform>dozraje po %n bloku</numerusform><numerusform>dozraje po %n blocích</numerusform><numerusform>dozraje po %n blocích</numerusform></translation> + <translation><numerusform>dozraje po %n bloku</numerusform><numerusform>dozraje po %n blocích</numerusform><numerusform>dozraje po %n blocích</numerusform><numerusform>dozraje po %n blocích</numerusform></translation> </message> <message> <source>not accepted</source> @@ -2717,17 +2689,13 @@ </message> <message numerus="yes"> <source>Open for %n more block(s)</source> - <translation><numerusform>Otevřeno pro %n další blok</numerusform><numerusform>Otevřeno pro %n další bloky</numerusform><numerusform>Otevřeno pro %n dalších bloků</numerusform></translation> + <translation><numerusform>Otevřeno pro %n další blok</numerusform><numerusform>Otevřeno pro %n další bloky</numerusform><numerusform>Otevřeno pro %n dalších bloků</numerusform><numerusform>Otevřeno pro %n dalších bloků</numerusform></translation> </message> <message> <source>Open until %1</source> <translation>Otřevřeno dokud %1</translation> </message> <message> - <source>Offline</source> - <translation>Offline</translation> - </message> - <message> <source>Unconfirmed</source> <translation>Nepotvrzeno</translation> </message> @@ -2752,10 +2720,6 @@ <translation>Nedozráno (%1 potvrzení, dozraje při %2 potvrzeních)</translation> </message> <message> - <source>This block was not received by any other nodes and will probably not be accepted!</source> - <translation>Tento blok nedostal žádný jiný uzel a pravděpodobně nebude akceptován!</translation> - </message> - <message> <source>Generated but not accepted</source> <translation>Vygenerováno, ale neakceptováno</translation> </message> @@ -2867,6 +2831,10 @@ <translation>Ostatní</translation> </message> <message> + <source>Enter address, transaction id, or label to search</source> + <translation>Zadej adresu, její označení nebo ID transakce pro vyhledání</translation> + </message> + <message> <source>Min amount</source> <translation>Minimální částka</translation> </message> @@ -3062,38 +3030,14 @@ <source>The wallet data was successfully saved to %1.</source> <translation>Data z peněženky byla v pořádku uložena do %1.</translation> </message> -</context> + </context> <context> <name>bitcoin-core</name> <message> - <source>Options:</source> - <translation>Možnosti:</translation> - </message> - <message> - <source>Specify data directory</source> - <translation>Adresář pro data</translation> - </message> - <message> - <source>Connect to a node to retrieve peer addresses, and disconnect</source> - <translation>Připojit se k uzlu, získat adresy jeho protějšků a odpojit se</translation> - </message> - <message> - <source>Specify your own public address</source> - <translation>Udej svou veřejnou adresu</translation> - </message> - <message> - <source>Accept command line and JSON-RPC commands</source> - <translation>Akceptovat příkazy z příkazové řádky a přes JSON-RPC</translation> - </message> - <message> <source>Distributed under the MIT software license, see the accompanying file %s or %s</source> <translation>Šířen pod softwarovou licencí MIT, viz přiložený soubor %s nebo %s</translation> </message> <message> - <source>If <category> is not supplied or if <category> = 1, output all debugging information.</source> - <translation>Pokud není <category> zadána nebo je <category> = 1, bude tisknout veškeré ladicí informace.</translation> - </message> - <message> <source>Prune configured below the minimum of %d MiB. Please use a higher number.</source> <translation>Prořezávání je nastaveno pod minimum %d MiB. Použij, prosím, nějaké vyšší číslo.</translation> </message> @@ -3110,18 +3054,10 @@ <translation>Chyba: Přihodila se závažná vnitřní chyba, podrobnosti viz v debug.log</translation> </message> <message> - <source>Fee (in %s/kB) to add to transactions you send (default: %s)</source> - <translation>Poplatek (v %s/kB), který se přidá ke každé odeslané transakci (výchozí: %s)</translation> - </message> - <message> <source>Pruning blockstore...</source> <translation>Prořezávám úložiště bloků...</translation> </message> <message> - <source>Run in the background as a daemon and accept commands</source> - <translation>Běžet na pozadí jako démon a přijímat příkazy</translation> - </message> - <message> <source>Unable to start HTTP server. See debug log for details.</source> <translation>Nemohu spustit HTTP server. Detaily viz v debug.log.</translation> </message> @@ -3134,54 +3070,18 @@ <translation>Vývojáři %s</translation> </message> <message> - <source>A fee rate (in %s/kB) that will be used when fee estimation has insufficient data (default: %s)</source> - <translation>Sazba poplatku (v %s/kB), která se použije, pokud nebude k dispozici dostatek dat pro automatický odhad poplatku (výchozí: %s)</translation> - </message> - <message> - <source>Accept relayed transactions received from whitelisted peers even when not relaying transactions (default: %d)</source> - <translation>Přijímat přeposílané transakce obdržené od vždy vítaných protějšků, i když transakce nepřeposíláme (výchozí: %d)</translation> - </message> - <message> - <source>Bind to given address and always listen on it. Use [host]:port notation for IPv6</source> - <translation>Poslouchat na zadané adrese. Pro zápis IPv6 adresy použij notaci [adresa]:port</translation> - </message> - <message> <source>Cannot obtain a lock on data directory %s. %s is probably already running.</source> <translation>Nedaří se mi získat zámek na datový adresář %s. %s pravděpodobně už jednou běží.</translation> </message> <message> - <source>Delete all wallet transactions and only recover those parts of the blockchain through -rescan on startup</source> - <translation>Smazat všechny transakce peněženky a při startu obnovit pouze relevantní části bločenky pomocí -rescan</translation> + <source>Cannot provide specific connections and have addrman find outgoing connections at the same.</source> + <translation>Nemohu poskytovat konkrétní spojení a současně chtít, aby addrman vyhledával odchozí spojení.</translation> </message> <message> <source>Error reading %s! All keys read correctly, but transaction data or address book entries might be missing or incorrect.</source> <translation>Nastala chyba při čtení souboru %s! Všechny klíče se přečetly správně, ale data o transakcích nebo záznamy v adresáři mohou chybět či být nesprávné.</translation> </message> <message> - <source>Exclude debugging information for a category. Can be used in conjunction with -debug=1 to output debug logs for all categories except one or more specified categories.</source> - <translation>Vyloučit ladicí informace dané kategorie. Dá se zkombinovat s -debug=1, aby se zaznamenávaly ladicí informace všech kategorií kromě jedné nebo několika zvolených.</translation> - </message> - <message> - <source>Execute command when a wallet transaction changes (%s in cmd is replaced by TxID)</source> - <translation>Spustit příkaz, když se objeví transakce týkající se peněženky (%s se v příkazu nahradí za TxID)</translation> - </message> - <message> - <source>Extra transactions to keep in memory for compact block reconstructions (default: %u)</source> - <translation>Počet extra transakcí, které se mají držet v paměti pro účely rekonstrukce kompaktních bloků (výchozí: %u)</translation> - </message> - <message> - <source>If this block is in the chain assume that it and its ancestors are valid and potentially skip their script verification (0 to verify all, default: %s, testnet: %s)</source> - <translation>Pokud je tenhle blok v bločence, tak předpokládat, že on i jeho následníci jsou platní, a potenciálně přeskočit ověřování jejich skriptů (0 = ověřovat vše, výchozí: %s, testnet: %s)</translation> - </message> - <message> - <source>Maximum allowed median peer time offset adjustment. Local perspective of time may be influenced by peers forward or backward by this amount. (default: %u seconds)</source> - <translation>Maximální povolené seřizování času mediánem časů protějšků. Místní vnímání času může být ovlivněno protějšky, a to dopředu nebo dozadu až o toto množství. (výchozí: %u vteřin)</translation> - </message> - <message> - <source>Maximum total fees (in %s) to use in a single wallet transaction or raw transaction; setting this too low may abort large transactions (default: %s)</source> - <translation>Horní hranice pro celkový poplatek (v %s) za jednu transakci z peněženky nebo jednu surovou transakci; příliš nízká hodnota může zmařit velké transakce (výchozí: %s)</translation> - </message> - <message> <source>Please check that your computer's date and time are correct! If your clock is wrong, %s will not work properly.</source> <translation>Zkontroluj, že máš v počítači správně nastavený datum a čas! Pokud jsou nastaveny špatně, %s nebude fungovat správně.</translation> </message> @@ -3190,22 +3090,6 @@ <translation>Prosíme, zapoj se nebo přispěj, pokud ti %s přijde užitečný. Více informací o programu je na %s.</translation> </message> <message> - <source>Query for peer addresses via DNS lookup, if low on addresses (default: 1 unless -connect used)</source> - <translation>Při nedostatku adres získat další protějšky z DNS (výchozí: 1, pokud není použito -connect)</translation> - </message> - <message> - <source>Reduce storage requirements by enabling pruning (deleting) of old blocks. This allows the pruneblockchain RPC to be called to delete specific blocks, and enables automatic pruning of old blocks if a target size in MiB is provided. This mode is incompatible with -txindex and -rescan. Warning: Reverting this setting requires re-downloading the entire blockchain. (default: 0 = disable pruning blocks, 1 = allow manual pruning via RPC, >%u = automatically prune block files to stay under the specified target size in MiB)</source> - <translation>Omezit nároky na úložný prostor prořezáváním (mazáním) starých bloků. Tato volba také umožní použít RPC volání pruneblockchain ke smazání konkrétních bloků a dále automatické prořezávání starých bloků, pokud je zadána cílová velikost souborů s bloky v MiB. Tento režim není slučitelný s -txindex ani -rescan. Upozornění: opětovná změna tohoto nastavení bude vyžadovat nové stažení celé bločenky. (výchozí: 0 = bloky neprořezávat, 1 = povolit ruční prořezávání skrze RPC, >%u = automatické prořezávání bloků tak, aby byla udržena cílová velikost souborů s bloky, v MiB)</translation> - </message> - <message> - <source>Set lowest fee rate (in %s/kB) for transactions to be included in block creation. (default: %s)</source> - <translation>Nastavit nejnižší akceptovatelný poplatek (v %s/kB) pro transakce, které mají být zahrnuty do nových bloků. (výchozí: %s)</translation> - </message> - <message> - <source>Set the number of script verification threads (%u to %d, 0 = auto, <0 = leave that many cores free, default: %d)</source> - <translation>Nastavení počtu vláken pro verifikaci skriptů (%u až %d, 0 = automaticky, <0 = nechat daný počet jader volný, výchozí: %d)</translation> - </message> - <message> <source>The block database contains a block which appears to be from the future. This may be due to your computer's date and time being set incorrectly. Only rebuild the block database if you are sure that your computer's date and time are correct</source> <translation>Databáze bloků obsahuje blok, který vypadá jako z budoucnosti, což může být kvůli špatně nastavenému datu a času na tvém počítači. Nech databázi bloků přestavět pouze v případě, že si jsi jistý, že máš na počítači správný datum a čas</translation> </message> @@ -3226,18 +3110,6 @@ <translation>Nedaří se mi vrátit databázi do stavu před štěpem. Budeš muset znovu stáhnout celou bločenku</translation> </message> <message> - <source>Use UPnP to map the listening port (default: 1 when listening and no -proxy)</source> - <translation>Použít UPnP k namapování naslouchacího portu (výchozí: 1, pokud naslouchá a nepoužívá -proxy)</translation> - </message> - <message> - <source>Username and hashed password for JSON-RPC connections. The field <userpw> comes in the format: <USERNAME>:<SALT>$<HASH>. A canonical python script is included in share/rpcuser. The client then connects normally using the rpcuser=<USERNAME>/rpcpassword=<PASSWORD> pair of arguments. This option can be specified multiple times</source> - <translation>Uživatelské jméno a zahašované heslo pro JSON-RPC spojení. Pole <userpw> má formát: <UŽIVATELSKÉ_JMÉNO>:<SŮL>$<HAŠ>. Pomocný pythonní skript je přiložen v share/rpcuser. Klient se pak už připojuje normálně pomocí páru argumentů rpcuser=<UŽIVATELSKÉ_JMÉNO>/rpcpassword=<HESLO>. Tuto volbu lze použít i vícekrát</translation> - </message> - <message> - <source>Wallet will not create transactions that violate mempool chain limits (default: %u)</source> - <translation>Peněženka nebude vytvářet transakce, které by porušovaly limity transakčního zásobníku na řetězce (výchozí: %u)</translation> - </message> - <message> <source>Warning: The network does not appear to fully agree! Some miners appear to be experiencing issues.</source> <translation>Upozornění: Síť podle všeho není v konzistentním stavu. Někteří těžaři jsou zřejmě v potížích.</translation> </message> @@ -3246,10 +3118,6 @@ <translation>Upozornění: Nesouhlasím zcela se svými protějšky! Možná potřebuji aktualizovat nebo ostatní uzly potřebují aktualizovat.</translation> </message> <message> - <source>Whether to save the mempool on shutdown and load on restart (default: %u)</source> - <translation>Zda uchovat transakční zásobník mezi vypnutím a zapnutím (výchozí: %u)</translation> - </message> - <message> <source>%d of last 100 blocks have unexpected version</source> <translation>%d z posledních 100 bloků má neočekávanou verzi</translation> </message> @@ -3262,42 +3130,14 @@ <translation>-maxmempool musí být alespoň %d MB</translation> </message> <message> - <source><category> can be:</source> - <translation><category> může být:</translation> - </message> - <message> - <source>Accept connections from outside (default: 1 if no -proxy or -connect)</source> - <translation>Přijímat spojení zvenčí (výchozí: 1, pokud není zadáno -proxy nebo -connect)</translation> - </message> - <message> - <source>Append comment to the user agent string</source> - <translation>Připojit komentář k typu klienta</translation> - </message> - <message> - <source>Attempt to recover private keys from a corrupt wallet on startup</source> - <translation>Pokusit se při startu zachránit soukromé klíče z poškozeného souboru s klíči</translation> - </message> - <message> - <source>Block creation options:</source> - <translation>Možnosti vytváření bloku:</translation> - </message> - <message> <source>Cannot resolve -%s address: '%s'</source> <translation>Nemohu přeložit -%s adresu: '%s'</translation> </message> <message> - <source>Chain selection options:</source> - <translation>Možnosti výběru bločenky:</translation> - </message> - <message> <source>Change index out of range</source> <translation>Index drobných je mimo platný rozsah</translation> </message> <message> - <source>Connection options:</source> - <translation>Možnosti připojení:</translation> - </message> - <message> <source>Copyright (C) %i-%i</source> <translation>Copyright (C) %i–%i</translation> </message> @@ -3306,36 +3146,12 @@ <translation>Bylo zjištěno poškození databáze bloků</translation> </message> <message> - <source>Debugging/Testing options:</source> - <translation>Možnosti ladění/testování:</translation> - </message> - <message> - <source>Do not load the wallet and disable wallet RPC calls</source> - <translation>Nenačítat peněženku a vypnout její RPC volání</translation> - </message> - <message> <source>Do you want to rebuild the block database now?</source> <translation>Chceš přestavět databázi bloků hned teď?</translation> </message> <message> - <source>Enable publish hash block in <address></source> - <translation>Zapnout oznamování hashů bloků na adrese <address></translation> - </message> - <message> - <source>Enable publish hash transaction in <address></source> - <translation>Zapnout oznamování hashů transakcí na adrese <address></translation> - </message> - <message> - <source>Enable publish raw block in <address></source> - <translation>Zapnout oznamování surových bloků na adrese <address></translation> - </message> - <message> - <source>Enable publish raw transaction in <address></source> - <translation>Zapnout oznamování surových transakcí na adrese <address></translation> - </message> - <message> - <source>Enable transaction replacement in the memory pool (default: %u)</source> - <translation>Povolit výměnu transakcí v transakčním zásobníku (výchozí: %u)</translation> + <source>Error creating %s: You can't create non-HD wallets with this version.</source> + <translation>Chyba při vytváření %s: v této verzi nemůžeš vytvářeš ne-HD peněženky.</translation> </message> <message> <source>Error initializing block database</source> @@ -3398,10 +3214,6 @@ <translation>Neplatná částka pro -fallbackfee=<částka>: '%s'</translation> </message> <message> - <source>Keep the transaction memory pool below <n> megabytes (default: %u)</source> - <translation>Udržovat zasobník transakcí menší než <n> megabajtů (výchozí: %u)</translation> - </message> - <message> <source>Loading P2P addresses...</source> <translation>Načítám P2P adresy…</translation> </message> @@ -3410,26 +3222,10 @@ <translation>Načítám seznam klateb...</translation> </message> <message> - <source>Location of the auth cookie (default: data dir)</source> - <translation>Místo pro autentizační cookie (výchozí: adresář pro data)</translation> - </message> - <message> <source>Not enough file descriptors available.</source> <translation>Je nedostatek deskriptorů souborů.</translation> </message> <message> - <source>Only connect to nodes in network <net> (ipv4, ipv6 or onion)</source> - <translation>Připojovat se pouze k uzlům v <net> síti (ipv4, ipv6 nebo onion)</translation> - </message> - <message> - <source>Print this help message and exit</source> - <translation>Vypsat tuto nápovědu a skončit</translation> - </message> - <message> - <source>Print version and exit</source> - <translation>Vypsat verzi a skončit</translation> - </message> - <message> <source>Prune cannot be configured with a negative value.</source> <translation>Prořezávání nemůže být zkonfigurováno s negativní hodnotou.</translation> </message> @@ -3438,14 +3234,6 @@ <translation>Prořezávací režim není kompatibilní s -txindex.</translation> </message> <message> - <source>Rebuild chain state and block index from the blk*.dat files on disk</source> - <translation>Znovu vytvořit stav a index bločenky z blk*.dat souborů na disku</translation> - </message> - <message> - <source>Rebuild chain state from the currently indexed blocks</source> - <translation>Znovu vytvořit stav bločenky z aktuálně indexovaných bloků</translation> - </message> - <message> <source>Replaying blocks...</source> <translation>Znovu aplikuji bloky…</translation> </message> @@ -3454,14 +3242,6 @@ <translation>Vracím bloky…</translation> </message> <message> - <source>Set database cache size in megabytes (%d to %d, default: %d)</source> - <translation>Nastavit velikost databázové vyrovnávací paměti v megabajtech (%d až %d, výchozí: %d)</translation> - </message> - <message> - <source>Specify wallet file (within data directory)</source> - <translation>Udej název souboru s peněženkou (v rámci datového adresáře)</translation> - </message> - <message> <source>The source code is available from %s.</source> <translation>Zdrojový kód je dostupný na %s.</translation> </message> @@ -3494,14 +3274,6 @@ <translation>Aktualizuji databázi neutracených výstupů (UTXO)</translation> </message> <message> - <source>Use UPnP to map the listening port (default: %u)</source> - <translation>Použít UPnP k namapování naslouchacího portu (výchozí: %u)</translation> - </message> - <message> - <source>Use the test chain</source> - <translation>Použít testovací bločenku</translation> - </message> - <message> <source>User Agent comment (%s) contains unsafe characters.</source> <translation>Komentář u typu klienta (%s) obsahuje riskantní znaky.</translation> </message> @@ -3510,90 +3282,26 @@ <translation>Ověřuji bloky…</translation> </message> <message> - <source>Wallet debugging/testing options:</source> - <translation>Možnosti ladění/testování peněženky:</translation> - </message> - <message> <source>Wallet needed to be rewritten: restart %s to complete</source> <translation>Soubor s peněženkou potřeboval přepsat: restartuj %s, aby se operace dokončila</translation> </message> <message> - <source>Wallet options:</source> - <translation>Možnosti peněženky:</translation> - </message> - <message> - <source>Allow JSON-RPC connections from specified source. Valid for <ip> are a single IP (e.g. 1.2.3.4), a network/netmask (e.g. 1.2.3.4/255.255.255.0) or a network/CIDR (e.g. 1.2.3.4/24). This option can be specified multiple times</source> - <translation>Povolit JSON-RPC spojení ze specifikovaného zdroje. Platnou hodnotou <ip> je jednotlivá IP adresa (např. 1.2.3.4), síť/maska (např. 1.2.3.4/255.255.255.0) nebo síť/CIDR (např. 1.2.3.4/24). Tuto volbu lze použít i vícekrát</translation> - </message> - <message> - <source>Bind to given address and whitelist peers connecting to it. Use [host]:port notation for IPv6</source> - <translation>Obsadit zadanou adresu a vždy vítat protějšky, které se na ni připojí. Pro zápis IPv6 adresy použij notaci [adresa]:port</translation> - </message> - <message> - <source>Create new files with system default permissions, instead of umask 077 (only effective with disabled wallet functionality)</source> - <translation>Vytvářet nové soubory s výchozími systémovými právy namísto umask 077 (uplatní se, pouze pokud je vypnutá funkce peněženky)</translation> - </message> - <message> - <source>Discover own IP addresses (default: 1 when listening and no -externalip or -proxy)</source> - <translation>Zjistit vlastní IP adresu (výchozí: 1, pokud naslouchá a není zadáno -externalip nebo -proxy)</translation> - </message> - <message> <source>Error: Listening for incoming connections failed (listen returned error %s)</source> <translation>Chyba: Nelze naslouchat příchozí spojení (listen vrátil chybu %s)</translation> </message> <message> - <source>Execute command when a relevant alert is received or we see a really long fork (%s in cmd is replaced by message)</source> - <translation>Spustit příkaz, když přijde relevantní upozornění nebo když dojde k opravdu dlouhému rozštěpení řetezce bloků (%s se v příkazu nahradí zprávou)</translation> - </message> - <message> - <source>Fees (in %s/kB) smaller than this are considered zero fee for relaying, mining and transaction creation (default: %s)</source> - <translation>Poplatky (v %s/kB) menší než tato hodnota jsou považovány za nulové pro účely přeposílání, těžení a vytváření transakcí (výchozí: %s)</translation> - </message> - <message> - <source>If paytxfee is not set, include enough fee so transactions begin confirmation on average within n blocks (default: %u)</source> - <translation>Pokud paytxfee není nastaveno, platit dostatečný poplatek na to, aby začaly být transakce potvrzovány v průměru během n bloků (výchozí: %u)</translation> - </message> - <message> <source>Invalid amount for -maxtxfee=<amount>: '%s' (must be at least the minrelay fee of %s to prevent stuck transactions)</source> <translation>Neplatná částka pro -maxtxfee=<amount>: '%s' (musí být alespoň jako poplatek minrelay %s, aby transakce nezůstávaly trčet)</translation> </message> <message> - <source>Maximum size of data in data carrier transactions we relay and mine (default: %u)</source> - <translation>Maximální velikost dat v transakcích nesoucích data, se kterou jsme ochotni je ještě přeposílat a těžit (výchozí: %u)</translation> - </message> - <message> - <source>Randomize credentials for every proxy connection. This enables Tor stream isolation (default: %u)</source> - <translation>Použít náhodné údaje pro každé proxy spojení. To umožní izolovat nesouvisející datové toky v Toru (výchozí: %u)</translation> - </message> - <message> <source>The transaction amount is too small to send after the fee has been deducted</source> <translation>Částka v transakci po odečtení poplatku je příliš malá na odeslání</translation> </message> <message> - <source>Whitelisted peers cannot be DoS banned and their transactions are always relayed, even if they are already in the mempool, useful e.g. for a gateway</source> - <translation>Na vždy vítané protějšky se nevztahuje DoS klatba a jejich transakce jsou vždy přeposílány, i když už třeba jsou v transakčním zásobníku, což je užitečné např. pro bránu</translation> - </message> - <message> <source>You need to rebuild the database using -reindex to go back to unpruned mode. This will redownload the entire blockchain</source> <translation>K návratu k neprořezávacímu režimu je potřeba přestavět databázi použitím -reindex. Také se znovu stáhne celá bločenka</translation> </message> <message> - <source>(default: %u)</source> - <translation>(výchozí: %u)</translation> - </message> - <message> - <source>Accept public REST requests (default: %u)</source> - <translation>Přijímat veřejné REST požadavky (výchozí: %u)</translation> - </message> - <message> - <source>Automatically create Tor hidden service (default: %d)</source> - <translation>Automaticky v Toru vytvářet skryté služby (výchozí: %d)</translation> - </message> - <message> - <source>Connect through SOCKS5 proxy</source> - <translation>Připojit se přes SOCKS5 proxy</translation> - </message> - <message> <source>Error loading %s: You can't disable HD on an already existing HD wallet</source> <translation>Chyba při načítání %s: nemůžeš vypnout HD u existující HD peněženky</translation> </message> @@ -3606,10 +3314,6 @@ <translation>Chyba při aktualizaci stavové databáze bločenky</translation> </message> <message> - <source>Imports blocks from external blk000??.dat file on startup</source> - <translation>Importovat při startu bloky z externího souboru blk000??.dat</translation> - </message> - <message> <source>Information</source> <translation>Informace</translation> </message> @@ -3630,42 +3334,14 @@ <translation>Ve -whitelist byla zadána neplatná podsíť: '%s'</translation> </message> <message> - <source>Keep at most <n> unconnectable transactions in memory (default: %u)</source> - <translation>Držet v paměti nejvýše <n> nespojitelných transakcí (výchozí: %u)</translation> - </message> - <message> <source>Need to specify a port with -whitebind: '%s'</source> <translation>V rámci -whitebind je třeba specifikovat i port: '%s'</translation> </message> <message> - <source>Node relay options:</source> - <translation>Možnosti přeposílání:</translation> - </message> - <message> - <source>RPC server options:</source> - <translation>Možnosti RPC serveru:</translation> - </message> - <message> <source>Reducing -maxconnections from %d to %d, because of system limitations.</source> <translation>Omezuji -maxconnections z %d na %d kvůli systémovým omezením.</translation> </message> <message> - <source>Rescan the block chain for missing wallet transactions on startup</source> - <translation>Přeskenovat při startu bločenku na chybějící transakce tvé pěněženky</translation> - </message> - <message> - <source>Send trace/debug info to console instead of debug.log file</source> - <translation>Posílat stopovací/ladicí informace do konzole místo do souboru debug.log</translation> - </message> - <message> - <source>Show all debugging options (usage: --help -help-debug)</source> - <translation>Zobrazit všechny možnosti ladění (užití: --help -help-debug)</translation> - </message> - <message> - <source>Shrink debug.log file on client startup (default: 1 when no -debug)</source> - <translation>Při spuštění klienta zmenšit soubor debug.log (výchozí: 1, pokud není zadáno -debug)</translation> - </message> - <message> <source>Signing transaction failed</source> <translation>Nepodařilo se podepsat transakci</translation> </message> @@ -3678,14 +3354,6 @@ <translation>Tohle je experimentální program.</translation> </message> <message> - <source>Tor control port password (default: empty)</source> - <translation>Heslo ovládacího portu Toru (výchozí: prázdné)</translation> - </message> - <message> - <source>Tor control port to use if onion listening enabled (default: %s)</source> - <translation>Ovládací port Toru, je-li zapnuté onion naslouchání (výchozí: %s)</translation> - </message> - <message> <source>Transaction amount too small</source> <translation>Částka v transakci je příliš malá</translation> </message> @@ -3702,12 +3370,8 @@ <translation>Nedaří se mi připojit na %s na tomhle počítači (operace bind vrátila chybu %s)</translation> </message> <message> - <source>Upgrade wallet to latest format on startup</source> - <translation>Převést při startu peněženku na nejnovější formát</translation> - </message> - <message> - <source>Username for JSON-RPC connections</source> - <translation>Uživatelské jméno pro JSON-RPC spojení</translation> + <source>Unable to generate initial keys</source> + <translation>Nepodařilo se mi vygenerovat počáteční klíče</translation> </message> <message> <source>Verifying wallet(s)...</source> @@ -3722,98 +3386,18 @@ <translation>Upozornění: aktivována neznámá nová pravidla (verzový bit %i)</translation> </message> <message> - <source>Whether to operate in a blocks only mode (default: %u)</source> - <translation>Zda fungovat v čistě blokovém režimu (výchozí: %u)</translation> - </message> - <message> - <source>You need to rebuild the database using -reindex to change -txindex</source> - <translation>Je třeba přestavět databázi použitím -reindex, aby bylo možné změnit -txindex</translation> - </message> - <message> <source>Zapping all transactions from wallet...</source> <translation>Vymazat všechny transakce z peněženky...</translation> </message> <message> - <source>ZeroMQ notification options:</source> - <translation>Možnosti ZeroMQ oznamování:</translation> - </message> - <message> - <source>Password for JSON-RPC connections</source> - <translation>Heslo pro JSON-RPC spojení</translation> - </message> - <message> - <source>Execute command when the best block changes (%s in cmd is replaced by block hash)</source> - <translation>Spustit příkaz, když se změní nejlepší blok (%s se v příkazu nahradí hashem bloku)</translation> - </message> - <message> - <source>Allow DNS lookups for -addnode, -seednode and -connect</source> - <translation>Povolit DNS dotazy pro -addnode (přidání uzlu), -seednode a -connect (připojení)</translation> - </message> - <message> - <source>(1 = keep tx meta data e.g. account owner and payment request information, 2 = drop tx meta data)</source> - <translation>(1 = ukládat transakční metadata, např. majitele účtu a informace o platebním požadavku, 2 = mazat transakční metadata)</translation> - </message> - <message> <source>-maxtxfee is set very high! Fees this large could be paid on a single transaction.</source> <translation>-maxtxfee je nastaveno velmi vysoko! Takto vysoký poplatek může být zaplacen v jednotlivé transakci.</translation> </message> <message> - <source>Bind to given address to listen for JSON-RPC connections. This option is ignored unless -rpcallowip is also passed. Port is optional and overrides -rpcport. Use [host]:port notation for IPv6. This option can be specified multiple times (default: 127.0.0.1 and ::1 i.e., localhost, or if -rpcallowip has been specified, 0.0.0.0 and :: i.e., all addresses)</source> - <translation>Čekat na zadané adrese na JSON-RPC spojení. Tato volba se ignoruje, pokud současně nezadáš i volbu -rpcallowip. Port je volitelný a má přednost před -rpcport. Pro zápis IPv6 adresy použij notaci [adresa]:port. Tuto volbu lze použít i vícekrát (výchozí: 127.0.0.1 a ::1, tzn. localhost, nebo pokud je zadáno -rpcallowip, tak 0.0.0.0 a ::, tzn. všechny adresy)</translation> - </message> - <message> - <source>Do not keep transactions in the mempool longer than <n> hours (default: %u)</source> - <translation>Nedržet transakce v zásobníku déle než <n> hodin (výchozí: %u)</translation> - </message> - <message> - <source>Equivalent bytes per sigop in transactions for relay and mining (default: %u)</source> - <translation>Ekvivalent bajtů za každý sigop v transakcích – pro účely přeposílání a těžení (výchozí: %u)</translation> - </message> - <message> <source>Error loading %s: You can't enable HD on an already existing non-HD wallet</source> <translation>Chyba při načítání %s: nemůžeš zapnout HD u existující ne-HD peněženky</translation> </message> <message> - <source>Error loading wallet %s. -wallet parameter must only specify a filename (not a path).</source> - <translation>Chyba při načítání peněženky %s. Parametr -wallet smí uvádět pouze název souboru (nikoli cestu k němu).</translation> - </message> - <message> - <source>Fees (in %s/kB) smaller than this are considered zero fee for transaction creation (default: %s)</source> - <translation>Poplatky (v %s/kB) menší než tato hodnota jsou považovány za nulové pro účely vytváření transakcí (výchozí: %s)</translation> - </message> - <message> - <source>Force relay of transactions from whitelisted peers even if they violate local relay policy (default: %d)</source> - <translation>Vynutit přeposílání transakcí od vždy vítaných protějšků (tj. těch na bílé listině), i když porušují místní zásady pro přeposílání (výchozí: %d)</translation> - </message> - <message> - <source>How thorough the block verification of -checkblocks is (0-4, default: %u)</source> - <translation>Jak moc důkladná má být verifikace bloků -checkblocks (0-4, výchozí: %u)</translation> - </message> - <message> - <source>Maintain a full transaction index, used by the getrawtransaction rpc call (default: %u)</source> - <translation>Spravovat úplný index transakcí, který je využíván rpc voláním getrawtransaction (výchozí: %u)</translation> - </message> - <message> - <source>Number of seconds to keep misbehaving peers from reconnecting (default: %u)</source> - <translation>Doba ve vteřinách, po kterou se nebudou moci zlobivé protějšky znovu připojit (výchozí: %u)</translation> - </message> - <message> - <source>Output debugging information (default: %u, supplying <category> is optional)</source> - <translation>Tisknout ladicí informace (výchozí: %u, zadání <category> je volitelné)</translation> - </message> - <message> - <source>Sets the serialization of raw transaction or block hex returned in non-verbose mode, non-segwit(0) or segwit(1) (default: %d)</source> - <translation>Nastaví serializaci surových transakcí nebo bloků, jak jsou vraceny v méně povídavém módu: ne-segwit (0) nebo segwit (1) (výchozí: %d)</translation> - </message> - <message> - <source>Support filtering of blocks and transaction with bloom filters (default: %u)</source> - <translation>Umožnit filtrování bloků a transakcí pomocí Bloomova filtru (výchozí: %u)</translation> - </message> - <message> - <source>The fee rate (in %s/kB) that indicates your tolerance for discarding change by adding it to the fee (default: %s). Note: An output is discarded if it is dust at this rate, but we will always discard up to the dust relay fee and a discard fee above that is limited by the fee estimate for the longest target</source> - <translation>Sazba poplatku (v %s/kB), která určuje tvou ochotu v případě potřeby proměnit drobné v poplatek (výchozí: %s). Poznámka: výstup se promění, pokud se při téhle sazbě změní v prach. Nicméně proměňovat budeme do výše poplatku pro přenos prachu a proměněný poplatek nad tuto výši bude omezený odhadem poplatku na nejdelší čas</translation> - </message> - <message> <source>This is the transaction fee you may pay when fee estimates are not available.</source> <translation>Toto je transakční poplatek, který se platí, pokud náhodou není k dispozici odhad poplatků.</translation> </message> @@ -3826,10 +3410,6 @@ <translation>Celková délka síťového identifikačního řetězce (%i) překročila svůj horní limit (%i). Omez počet nebo velikost voleb uacomment.</translation> </message> <message> - <source>Tries to keep outbound traffic under the given target (in MiB per 24h), 0 = no limit (default: %d)</source> - <translation>Pokusit se udržet odchozí provoz pod stanovenou hodnotou (v MiB za 24 hodin), 0 = bez omezení (výchozí: %d)</translation> - </message> - <message> <source>Unsupported argument -socks found. Setting SOCKS version isn't possible anymore, only SOCKS5 proxies are supported.</source> <translation>Byl použit nepodporovaný argument -socks. Nastavení verze SOCKS už není možné, podporovány jsou pouze SOCKS5 proxy.</translation> </message> @@ -3838,10 +3418,6 @@ <translation>Nepodporovaný argument -whitelistalwaysrelay se ignoruje, použij -whitelistrelay a/nebo -whitelistforcerelay.</translation> </message> <message> - <source>Use separate SOCKS5 proxy to reach peers via Tor hidden services (default: %s)</source> - <translation>Použít samostatnou SOCKS5 proxy ke spojení s protějšky přes skryté služby v Toru (výchozí: %s)</translation> - </message> - <message> <source>Warning: Unknown block versions being mined! It's possible unknown rules are in effect</source> <translation>Upozornění: Síť těží neznámé verze bloků! Je možné, že jsou v platnosti neznámá pravidla</translation> </message> @@ -3850,106 +3426,18 @@ <translation>Upozornění: soubor s peněženkou je poškozený, data jsou však zachráněna! Původní soubor %s je uložený jako %s v %s. Pokud nejsou stav tvého účtu nebo transakce v pořádku, zřejmě bys měl obnovit zálohu.</translation> </message> <message> - <source>Whitelist peers connecting from the given IP address (e.g. 1.2.3.4) or CIDR notated network (e.g. 1.2.3.0/24). Can be specified multiple times.</source> - <translation>Vždy vítat protějšky připojující se z dané IP adresy (např. 1.2.3.4) či podsítě (CIDR zápis, např. 1.2.3.0/24). Lze zadat i vícekrát.</translation> - </message> - <message> <source>%s is set very high!</source> <translation>%s je nastaveno velmi vysoko!</translation> </message> <message> - <source>(default: %s)</source> - <translation>(výchozí: %s)</translation> - </message> - <message> - <source>Always query for peer addresses via DNS lookup (default: %u)</source> - <translation>Vždy získávat adresy dalších protějšků přes DNS (výchozí: %u)</translation> - </message> - <message> - <source>Error loading wallet %s. -wallet filename must be a regular file.</source> - <translation>Chyba při načítání peněženky %s. -wallet musí být obyčejný soubor.</translation> - </message> - <message> <source>Error loading wallet %s. Duplicate -wallet filename specified.</source> <translation>Chyba při načítání peněženky %s. Udán duplicitní název souboru -wallet.</translation> </message> <message> - <source>Error loading wallet %s. Invalid characters in -wallet filename.</source> - <translation>Chyba při načítání peněženky %s. Neplatné znaky v názvu souboru -wallet.</translation> - </message> - <message> - <source>How many blocks to check at startup (default: %u, 0 = all)</source> - <translation>Kolik bloků při startu zkontrolovat (výchozí: %u, 0 = všechny)</translation> - </message> - <message> - <source>Include IP addresses in debug output (default: %u)</source> - <translation>Zaznamenávat do ladicích výstupů i IP adresy (výchozí: %u)</translation> - </message> - <message> <source>Keypool ran out, please call keypoolrefill first</source> <translation>Vyčerpal se zásobník klíčů, zavolej prvně, prosím, keypoolrefill</translation> </message> <message> - <source>Listen for JSON-RPC connections on <port> (default: %u or testnet: %u)</source> - <translation>Čekat na JSON-RPC spojení na <portu> (výchozí: %u nebo testnet: %u)</translation> - </message> - <message> - <source>Listen for connections on <port> (default: %u or testnet: %u)</source> - <translation>Čekat na spojení na <portu> (výchozí: %u nebo testnet: %u)</translation> - </message> - <message> - <source>Maintain at most <n> connections to peers (default: %u)</source> - <translation>Povolit nejvýše <n> protějšků (výchozí: %u)</translation> - </message> - <message> - <source>Make the wallet broadcast transactions</source> - <translation>Transakce z peněženky rozesílat</translation> - </message> - <message> - <source>Maximum per-connection receive buffer, <n>*1000 bytes (default: %u)</source> - <translation>Maximální velikost přijímacího bufferu pro každé spojení, <n>*1000 bajtů (výchozí: %u)</translation> - </message> - <message> - <source>Maximum per-connection send buffer, <n>*1000 bytes (default: %u)</source> - <translation>Maximální velikost odesílacího bufferu pro každé spojení, <n>*1000 bajtů (výchozí: %u)</translation> - </message> - <message> - <source>Prepend debug output with timestamp (default: %u)</source> - <translation>Připojit před ladicí výstup časové razítko (výchozí: %u)</translation> - </message> - <message> - <source>Relay and mine data carrier transactions (default: %u)</source> - <translation>Přeposílat a těžit transakce nesoucí data (výchozí: %u)</translation> - </message> - <message> - <source>Relay non-P2SH multisig (default: %u)</source> - <translation>Přeposílat ne-P2SH multisig (výchozí: %u)</translation> - </message> - <message> - <source>Set key pool size to <n> (default: %u)</source> - <translation>Nastavit zásobník klíčů na velikost <n> (výchozí: %u)</translation> - </message> - <message> - <source>Set maximum BIP141 block weight (default: %d)</source> - <translation>Nastavit maximální váhu bloku pro BIP141 (výchozí: %d)</translation> - </message> - <message> - <source>Set the number of threads to service RPC calls (default: %d)</source> - <translation>Nastavení počtu vláken pro servisní RPC volání (výchozí: %d)</translation> - </message> - <message> - <source>Specify configuration file (default: %s)</source> - <translation>Konfigurační soubor (výchozí: %s)</translation> - </message> - <message> - <source>Specify connection timeout in milliseconds (minimum: 1, default: %d)</source> - <translation>Zadej časový limit spojení v milivteřinách (minimum: 1, výchozí: %d)</translation> - </message> - <message> - <source>Spend unconfirmed change when sending transactions (default: %u)</source> - <translation>Utrácet i ještě nepotvrzené drobné při posílání transakcí (výchozí: %u)</translation> - </message> - <message> <source>Starting network threads...</source> <translation>Spouštím síťová vlákna…</translation> </message> @@ -3966,10 +3454,6 @@ <translation>Toto je poplatek, který zaplatíš za každou poslanou transakci.</translation> </message> <message> - <source>Threshold for disconnecting misbehaving peers (default: %u)</source> - <translation>Práh pro odpojování zlobivých protějšků (výchozí: %u)</translation> - </message> - <message> <source>Transaction amounts must not be negative</source> <translation>Částky v transakci nemohou být záporné</translation> </message> diff --git a/src/qt/locale/bitcoin_cy.ts b/src/qt/locale/bitcoin_cy.ts index 68adce3e61..ecc21332e3 100644 --- a/src/qt/locale/bitcoin_cy.ts +++ b/src/qt/locale/bitcoin_cy.ts @@ -623,10 +623,6 @@ </context> <context> <name>HelpMessageDialog</name> - <message> - <source>Usage:</source> - <translation>Cynefod:</translation> - </message> </context> <context> <name>Intro</name> @@ -778,6 +774,10 @@ <source>Label</source> <translation>Label</translation> </message> + <message> + <source>Wallet</source> + <translation>Waled</translation> + </message> </context> <context> <name>RecentRequestsTableModel</name> @@ -1038,10 +1038,6 @@ <context> <name>bitcoin-core</name> <message> - <source>Options:</source> - <translation>Opsiynau:</translation> - </message> - <message> <source>Bitcoin Core</source> <translation>Craidd Bitcoin</translation> </message> diff --git a/src/qt/locale/bitcoin_da.ts b/src/qt/locale/bitcoin_da.ts index 6143c412e4..21dc7831c3 100644 --- a/src/qt/locale/bitcoin_da.ts +++ b/src/qt/locale/bitcoin_da.ts @@ -30,8 +30,12 @@ <translation>Slet den markerede adresse fra listen</translation> </message> <message> + <source>Enter address or label to search</source> + <translation>Indtast adresse eller mærkat for at søge</translation> + </message> + <message> <source>Export the data in the current tab to a file</source> - <translation>Eksportér den aktuelle visning til en fil</translation> + <translation>Eksportér dataen i den aktuelle visning til en fil</translation> </message> <message> <source>&Export</source> @@ -322,6 +326,14 @@ <translation>&Åbn URI…</translation> </message> <message> + <source>Wallet:</source> + <translation>Tegnebog:</translation> + </message> + <message> + <source>default wallet</source> + <translation>Standard tegnebog</translation> + </message> + <message> <source>Click to disable network activity.</source> <translation>Klik for at deaktivere netværksaktivitet.</translation> </message> @@ -342,6 +354,10 @@ <translation>Genindekserer blokke på disken…</translation> </message> <message> + <source>Proxy is <b>enabled</b>: %1</source> + <translation>Proxy er <b>aktiveret</b>: %1</translation> + </message> + <message> <source>Send coins to a Bitcoin address</source> <translation>Send bitcoins til en Bitcoin-adresse</translation> </message> @@ -510,6 +526,12 @@ </translation> </message> <message> + <source>Wallet: %1 +</source> + <translation>Tegnebog: %1 +</translation> + </message> + <message> <source>Type: %1 </source> <translation>Type: %1 @@ -730,10 +752,6 @@ <translation>&Adresse</translation> </message> <message> - <source>New receiving address</source> - <translation>Ny modtagelsesadresse</translation> - </message> - <message> <source>New sending address</source> <translation>Ny afsendelsesadresse</translation> </message> @@ -750,8 +768,12 @@ <translation>Den indtastede adresse “%1” er ikke en gyldig Bitcoin-adresse.</translation> </message> <message> - <source>The entered address "%1" is already in the address book.</source> - <translation>Den indtastede adresse “%1” er allerede i adressebogen.</translation> + <source>Address "%1" already exists as a receiving address with label "%2" and so cannot be added as a sending address.</source> + <translation>Adressen "%1" eksisterer allerede som modtagende adresse med mærkat "%2" og kan derfor ikke tilføjes som sende adresse.</translation> + </message> + <message> + <source>The entered address "%1" is already in the address book with label "%2".</source> + <translation>Den indtastede adresse "%1" er allerede i adresse bogen med mærkat "%2".</translation> </message> <message> <source>Could not unlock wallet.</source> @@ -803,42 +825,6 @@ <source>Command-line options</source> <translation>Kommandolinjetilvalg</translation> </message> - <message> - <source>Usage:</source> - <translation>Anvendelse:</translation> - </message> - <message> - <source>command-line options</source> - <translation>kommandolinjetilvalg</translation> - </message> - <message> - <source>UI Options:</source> - <translation>Indstillinger for brugergrænseflade:</translation> - </message> - <message> - <source>Choose data directory on startup (default: %u)</source> - <translation>Vælg datamappe under opstart (standard: %u)</translation> - </message> - <message> - <source>Set language, for example "de_DE" (default: system locale)</source> - <translation>Vælg sprog; fx “da_DK” (standard: systemsprog)</translation> - </message> - <message> - <source>Start minimized</source> - <translation>Start minimeret</translation> - </message> - <message> - <source>Set SSL root certificates for payment request (default: -system-)</source> - <translation>Opsæt SSL-rodcertifikater til betalingsadmodninger (standard: -system-)</translation> - </message> - <message> - <source>Show splash screen on startup (default: %u)</source> - <translation>Vis startskærm under opstart (standard: %u)</translation> - </message> - <message> - <source>Reset all settings changed in the GUI</source> - <translation>Nulstil alle indstillinger, der er foretaget i den grafiske brugerflade</translation> - </message> </context> <context> <name>Intro</name> @@ -1068,6 +1054,22 @@ <translation>&Netværk</translation> </message> <message> + <source>Disables some advanced features but all blocks will still be fully validated. Reverting this setting requires re-downloading the entire blockchain. Actual disk usage may be somewhat higher.</source> + <translation>Deaktiverer nogle avancerede funktioner men alle blokke vil stadig blive fuldt validerede. Tilbagevending af denne indstilling kræver afhentning af hele blokkæden igen. Det aktuelle disk forbrug kan være noget højere.</translation> + </message> + <message> + <source>Prune &block storage to</source> + <translation>Beskære &blok opbevaring til</translation> + </message> + <message> + <source>GB</source> + <translation>GB</translation> + </message> + <message> + <source>Reverting this setting requires re-downloading the entire blockchain.</source> + <translation>Tilbagevending af denne indstilling kræver afhentning af hele blokkæden igen.</translation> + </message> + <message> <source>(0 = auto, <0 = leave that many cores free)</source> <translation>(0 = auto, <0 = efterlad så mange kerner fri)</translation> </message> @@ -1334,6 +1336,10 @@ <translation>URI-håndtering</translation> </message> <message> + <source>'bitcoin://' is not a valid URI. Use 'bitcoin:' instead.</source> + <translation>'bitcoin://' er ikke et gyldigt URI. Brug 'bitcoin:' istedet. </translation> + </message> + <message> <source>Payment request fetch URL is invalid: %1</source> <translation>Hentnings-URL for betalingsanmodning er ugyldig: %1</translation> </message> @@ -1531,12 +1537,16 @@ <context> <name>QObject::QObject</name> <message> + <source>Error parsing command line arguments: %1.</source> + <translation>Fejl ved fortolkning af kommandolinje argumenter: %1.</translation> + </message> + <message> <source>Error: Specified data directory "%1" does not exist.</source> <translation>Fejl: Angivet datamappe “%1” eksisterer ikke.</translation> </message> <message> - <source>Error: Cannot parse configuration file: %1. Only use key=value syntax.</source> - <translation>Fejl: Kan ikke fortolke konfigurationsfil: %1. Brug kun syntaksen nøgle=værdi.</translation> + <source>Error: Cannot parse configuration file: %1.</source> + <translation>Fejl: Kan ikke fortolke konfigurations filen: %1.</translation> </message> <message> <source>Error: %1</source> @@ -1629,6 +1639,14 @@ <translation>Hukommelsesforbrug</translation> </message> <message> + <source>Wallet: </source> + <translation>Tegnebog:</translation> + </message> + <message> + <source>(none)</source> + <translation>(ingen)</translation> + </message> + <message> <source>&Reset</source> <translation>&Nulstil</translation> </message> @@ -1797,6 +1815,10 @@ <translation>&Fjern bandlysning</translation> </message> <message> + <source>default wallet</source> + <translation>Standard tegnebog</translation> + </message> + <message> <source>Welcome to the %1 RPC console.</source> <translation>Velkommen til %1s RPC-konsol.</translation> </message> @@ -1809,6 +1831,10 @@ <translation>Tast %1 for en oversigt over de tilgængelige kommandoer.</translation> </message> <message> + <source>For more information on using this console type %1.</source> + <translation>For mere information om at bruge denne konsol, tast %1.</translation> + </message> + <message> <source>WARNING: Scammers have been active, telling users to type commands here, stealing their wallet contents. Do not use this console without fully understanding the ramifications of a command.</source> <translation>ADVARSEL: Svindlere har tidligere aktivt bedt brugere om at indtaste kommandoer her for at stjæle indholdet af deres tegnebøger. Brug ikke denne konsol uden fuldt ud at forstå følgerne af en kommando.</translation> </message> @@ -1817,6 +1843,14 @@ <translation>Netværksaktivitet deaktiveret</translation> </message> <message> + <source>Executing command without any wallet</source> + <translation>Udfører kommando uden en tegnebog</translation> + </message> + <message> + <source>Executing command using "%1" wallet</source> + <translation>Eksekverer kommando ved brug af "%1" tegnebog</translation> + </message> + <message> <source>(node id: %1)</source> <translation>(knude-id: %1)</translation> </message> @@ -1888,6 +1922,14 @@ <translation>Ryd</translation> </message> <message> + <source>Native segwit addresses (aka Bech32 or BIP-173) reduce your transaction fees later on and offer better protection against typos, but old wallets don't support them. When unchecked, an address compatible with older wallets will be created instead.</source> + <translation>Rene segwit-adresser (kendt som Bech32 eller BIP-173) reducerer dine transaktionsgebyrer i det lange løb og giver bedre beskyttelse imod tastefejl, men gamle tegnebøger understøtter dem ikke. Hvis dette ikke vælges, vil i stedet en adresse, der fungerer med ældre tegnebøger, oprettes.</translation> + </message> + <message> + <source>Generate native segwit (Bech32) address</source> + <translation>Generér rene segwit-adresser (Bech32)</translation> + </message> + <message> <source>Requested payments history</source> <translation>Historik over betalingsanmodninger</translation> </message> @@ -1896,10 +1938,6 @@ <translation>&Anmod om betaling</translation> </message> <message> - <source>Generate Bech32 address</source> - <translation>Generér Bech32-adresse</translation> - </message> - <message> <source>Show the selected request (does the same as double clicking an entry)</source> <translation>Vis den valgte anmodning (gør det samme som dobbeltklik på en indgang)</translation> </message> @@ -1979,6 +2017,10 @@ <translation>Besked</translation> </message> <message> + <source>Wallet</source> + <translation>Tegnebog</translation> + </message> + <message> <source>Resulting URI too long, try to reduce the text for label / message.</source> <translation>Resulterende URI var for lang; prøv at forkorte teksten til mærkaten/beskeden.</translation> </message> @@ -2093,12 +2135,16 @@ <translation>sammenfold gebyropsætning</translation> </message> <message> - <source>per kilobyte</source> - <translation>pr. kilobyte</translation> + <source>Specify a custom fee per kB (1,000 bytes) of the transaction's virtual size. + +Note: Since the fee is calculated on a per-byte basis, a fee of "100 satoshis per kB" for a transaction size of 500 bytes (half of 1 kB) would ultimately yield a fee of only 50 satoshis.</source> + <translation>Specificer et brugerdefineret gebyr per kB (1.000 bytes) af transaktionens virtuelle størrelse. + +Note: Siden gebyret er kalkuleret på en per-byte basis, et gebyr på "100 satoshis per kB" for en transkationsstørrelse på 500 bytes (halvdelen af 1kB) ville ultimativt udbytte et gebyr på kun 50 satoshis.</translation> </message> <message> - <source>If the custom fee is set to 1000 satoshis and the transaction is only 250 bytes, then "per kilobyte" only pays 250 satoshis in fee, while "total at least" pays 1000 satoshis. For transactions bigger than a kilobyte both pay by kilobyte.</source> - <translation>Hvis det brugertilpassede gebyr er sat til 1000 satoshis, og transaktionen kun fylder 250 byte, betaler “pr. kilobyte” kun 250 satoshis i gebyr, mens “total mindst” betaler 1000 satoshis. For transaktioner større end en kilobyte betaler begge pr. kilobyte.</translation> + <source>per kilobyte</source> + <translation>pr. kilobyte</translation> </message> <message> <source>Hide</source> @@ -2209,14 +2255,6 @@ <translation>Er du sikker på, at du vil sende?</translation> </message> <message> - <source>added as transaction fee</source> - <translation>tilføjet som transaktionsgebyr</translation> - </message> - <message> - <source>Total Amount %1</source> - <translation>Beløb i alt %1</translation> - </message> - <message> <source>or</source> <translation>eller</translation> </message> @@ -2225,10 +2263,26 @@ <translation>Du kan øge gebyret senere (signalerer erstat-med-gebyr, BIP-125).</translation> </message> <message> + <source>from wallet %1</source> + <translation>fra tegnebog %1</translation> + </message> + <message> + <source>Please, review your transaction.</source> + <translation>Venligst, vurder din transaktion.</translation> + </message> + <message> + <source>Transaction fee</source> + <translation>Transaktionsgebyr</translation> + </message> + <message> <source>Not signalling Replace-By-Fee, BIP-125.</source> <translation>Signalerer ikke erstat-med-gebyr, BIP-125.</translation> </message> <message> + <source>Total Amount</source> + <translation>Total Mængde</translation> + </message> + <message> <source>Confirm send coins</source> <translation>Bekræft afsendelse af bitcoins</translation> </message> @@ -2570,10 +2624,6 @@ <translation>i konflikt med en transaktion, der har %1 bekræftelser</translation> </message> <message> - <source>%1/offline</source> - <translation>%1/offline</translation> - </message> - <message> <source>0/unconfirmed, %1</source> <translation>0/ubekræftet, %1</translation> </message> @@ -2602,14 +2652,6 @@ <translation>Status</translation> </message> <message> - <source>, has not been successfully broadcast yet</source> - <translation>, er ikke blevet transmitteret endnu</translation> - </message> - <message numerus="yes"> - <source>, broadcast through %n node(s)</source> - <translation><numerusform>, transmitteret igennem %n knude</numerusform><numerusform>, transmitteret igennem %n knuder</numerusform></translation> - </message> - <message> <source>Date</source> <translation>Dato</translation> </message> @@ -2694,6 +2736,10 @@ <translation>Totalstørrelse af transaktion</translation> </message> <message> + <source>Transaction virtual size</source> + <translation>Transaktion virtuel størrelse</translation> + </message> + <message> <source>Output index</source> <translation>Outputindeks</translation> </message> @@ -2764,10 +2810,6 @@ <translation>Åben indtil %1</translation> </message> <message> - <source>Offline</source> - <translation>Offline</translation> - </message> - <message> <source>Unconfirmed</source> <translation>Ubekræftet</translation> </message> @@ -2792,10 +2834,6 @@ <translation>Umoden (%1 bekræftelser; vil være tilgængelig efter %2)</translation> </message> <message> - <source>This block was not received by any other nodes and will probably not be accepted!</source> - <translation>Denne blok blev ikke modtaget af nogen andre knuder og vil formentlig ikke blive accepteret!</translation> - </message> - <message> <source>Generated but not accepted</source> <translation>Genereret, men ikke accepteret</translation> </message> @@ -3106,38 +3144,18 @@ <source>The wallet data was successfully saved to %1.</source> <translation>Tegnebogsdata blev gemt til %1.</translation> </message> + <message> + <source>Cancel</source> + <translation>Fortryd</translation> + </message> </context> <context> <name>bitcoin-core</name> <message> - <source>Options:</source> - <translation>Indstillinger:</translation> - </message> - <message> - <source>Specify data directory</source> - <translation>Angiv datamappe</translation> - </message> - <message> - <source>Connect to a node to retrieve peer addresses, and disconnect</source> - <translation>Forbind til en knude for at modtage adresser på andre knuder, og afbryd derefter</translation> - </message> - <message> - <source>Specify your own public address</source> - <translation>Angiv din egen offentlige adresse</translation> - </message> - <message> - <source>Accept command line and JSON-RPC commands</source> - <translation>Acceptér kommandolinje- og JSON-RPC-kommandoer</translation> - </message> - <message> <source>Distributed under the MIT software license, see the accompanying file %s or %s</source> <translation>Distribueret under MIT-softwarelicensen; se den vedlagte fil %s eller %s</translation> </message> <message> - <source>If <category> is not supplied or if <category> = 1, output all debugging information.</source> - <translation>Hvis <category> ikke angives eller hvis <category> = 1, udskriv al fejlretningsinformation.</translation> - </message> - <message> <source>Prune configured below the minimum of %d MiB. Please use a higher number.</source> <translation>Beskæring er sat under minimumsgrænsen på %d MiB. Brug venligst et større tal.</translation> </message> @@ -3154,18 +3172,10 @@ <translation>Fejl: En alvorlig intern fejl er opstået. Se debug.log for detaljer</translation> </message> <message> - <source>Fee (in %s/kB) to add to transactions you send (default: %s)</source> - <translation>Gebyr (i %s/kB) der skal lægges til de transaktioner du sender (standard: %s)</translation> - </message> - <message> <source>Pruning blockstore...</source> <translation>Beskærer bloklager…</translation> </message> <message> - <source>Run in the background as a daemon and accept commands</source> - <translation>Kør i baggrunden som en service, og acceptér kommandoer</translation> - </message> - <message> <source>Unable to start HTTP server. See debug log for details.</source> <translation>Kunne ikke starte HTTP-server. Se fejlretningslog for detaljer.</translation> </message> @@ -3178,54 +3188,18 @@ <translation>Udviklerne af %s</translation> </message> <message> - <source>A fee rate (in %s/kB) that will be used when fee estimation has insufficient data (default: %s)</source> - <translation>En gebyrsats (i %s/kB), som vil blive brugt, hvis gebyrestimering har utilstrækkelig data (standard: %s)</translation> - </message> - <message> - <source>Accept relayed transactions received from whitelisted peers even when not relaying transactions (default: %d)</source> - <translation>Acceptér videresendte transaktioner, der modtages fra hvidlistede knuder, selv når transaktioner ikke videresendes (standard: %d)</translation> - </message> - <message> - <source>Bind to given address and always listen on it. Use [host]:port notation for IPv6</source> - <translation>Tildel til den givne adresse og lyt altid på den. Brug [vært]:port-notation for IPv6</translation> - </message> - <message> <source>Cannot obtain a lock on data directory %s. %s is probably already running.</source> <translation>Kan ikke opnå en lås på datamappe %s. %s kører sansynligvis allerede.</translation> </message> <message> - <source>Delete all wallet transactions and only recover those parts of the blockchain through -rescan on startup</source> - <translation>Slet alle transaktioner i tegnebogen og genskab kun disse dele af blokkæden gennem -rescan under opstart</translation> + <source>Cannot provide specific connections and have addrman find outgoing connections at the same.</source> + <translation>Kan ikke give specifikke forbindelser og få addrman til at finde udgående forbindelser på samme tid.</translation> </message> <message> <source>Error reading %s! All keys read correctly, but transaction data or address book entries might be missing or incorrect.</source> <translation>Fejl under læsning af %s! Alle nøgler blev læst korrekt, men transaktionsdata eller indgange i adressebogen kan mangle eller være ukorrekte.</translation> </message> <message> - <source>Exclude debugging information for a category. Can be used in conjunction with -debug=1 to output debug logs for all categories except one or more specified categories.</source> - <translation>Ekskludér fejlsøgningsinformation for en kategori. Kan bruges sammen med -debug=1 for at udskrive fejlsøgningslogs for alle kategorier undtaget én eller flere specificerede kategorier.</translation> - </message> - <message> - <source>Execute command when a wallet transaction changes (%s in cmd is replaced by TxID)</source> - <translation>Udfør kommando, når en transaktion i tegnebogen ændres (%s i kommandoen erstattes med TxID)</translation> - </message> - <message> - <source>Extra transactions to keep in memory for compact block reconstructions (default: %u)</source> - <translation>Ekstra transaktioner, der skal beholdes i hukommelsen til kompakte blokgenopbygninger (standard: %u)</translation> - </message> - <message> - <source>If this block is in the chain assume that it and its ancestors are valid and potentially skip their script verification (0 to verify all, default: %s, testnet: %s)</source> - <translation>Hvis denne blok er i kæden, så antag at den og dens forgængere er gyldige, og spring potentielt deres scriptverificering over (0 for at verificere alle, standard: %s, testnet: %s)</translation> - </message> - <message> - <source>Maximum allowed median peer time offset adjustment. Local perspective of time may be influenced by peers forward or backward by this amount. (default: %u seconds)</source> - <translation>Justering af maksimalt tilladt gennemsnitlig afvigelse fra peer-tid. Den lokale opfattelse af tid kan blive påvirket frem eller tilbage af peers med denne mængde tid. (standard: %u sekunder)</translation> - </message> - <message> - <source>Maximum total fees (in %s) to use in a single wallet transaction or raw transaction; setting this too low may abort large transactions (default: %s)</source> - <translation>Maksimalt totalgebyr (i %s) der må bruges i en enkelt tegnebogstransaktion eller rå transaktion; en for lav en værdi kan afbryde store transaktioner (standard: %s)</translation> - </message> - <message> <source>Please check that your computer's date and time are correct! If your clock is wrong, %s will not work properly.</source> <translation>Undersøg venligst at din computers dato og klokkeslet er korrekt indstillet! Hvis der er fejl i disse, vil %s ikke fungere korrekt.</translation> </message> @@ -3234,22 +3208,6 @@ <translation>Overvej venligst at bidrage til udviklingen, hvis du finder %s brugbar. Besøg %s for yderligere information om softwaren.</translation> </message> <message> - <source>Query for peer addresses via DNS lookup, if low on addresses (default: 1 unless -connect used)</source> - <translation>Hvis beholdning af adresser er lav, forespørg da adresser på andre knuder via DNS-opslag (standard: 1 med mindre -connect bruges)</translation> - </message> - <message> - <source>Reduce storage requirements by enabling pruning (deleting) of old blocks. This allows the pruneblockchain RPC to be called to delete specific blocks, and enables automatic pruning of old blocks if a target size in MiB is provided. This mode is incompatible with -txindex and -rescan. Warning: Reverting this setting requires re-downloading the entire blockchain. (default: 0 = disable pruning blocks, 1 = allow manual pruning via RPC, >%u = automatically prune block files to stay under the specified target size in MiB)</source> - <translation>Reducér pladskravene ved at beskære (slette, “prune”) gamle blokke. Dette tillader pruneblockchain-RPC'en at blive kaldt for at slette specifikke blokke, og det aktiverer automatisk beskæring af gamle blokke, hvis en målstørrelse i MiB er angivet. Denne tilstand er ikke kompatibel med -txindex og -rescan. Advarsel: Fortrydelse af denne indstilling kræver download af hele blokkæden igen. (standard: 0 = slå beskæring af blokke fra, 1 = tillad manuel beskæring via RPC, >%u = beskær automatisk blokfiler for at bliver under den angivne målstørrelse i MiB)</translation> - </message> - <message> - <source>Set lowest fee rate (in %s/kB) for transactions to be included in block creation. (default: %s)</source> - <translation>Sæt den laveste gebyrsats (i %s/kB) for transaktioner, der skal inkluderes i blokoprettelse. (standard: %s)</translation> - </message> - <message> - <source>Set the number of script verification threads (%u to %d, 0 = auto, <0 = leave that many cores free, default: %d)</source> - <translation>Sæt antallet af scriptverificeringstråde (%u til %d, 0 = auto, <0 = efterlad det antal kernet fri, standard: %d)</translation> - </message> - <message> <source>The block database contains a block which appears to be from the future. This may be due to your computer's date and time being set incorrectly. Only rebuild the block database if you are sure that your computer's date and time are correct</source> <translation>Blokdatabasen indeholder en blok, som ser ud til at være fra fremtiden. Dette kan skyldes, at din computers dato og tid ikke er sat korrekt. Genopbyg kun blokdatabasen, hvis du er sikker på, at din computers dato og tid er korrekt</translation> </message> @@ -3270,18 +3228,6 @@ <translation>Kan ikke spole databasen tilbage til en tilstand inden en splitning. Du er nødt til at downloade blokkæden igen</translation> </message> <message> - <source>Use UPnP to map the listening port (default: 1 when listening and no -proxy)</source> - <translation>Brug UPnP for at konfigurere den lyttende port (standard: 1 under lytning og ingen -proxy)</translation> - </message> - <message> - <source>Username and hashed password for JSON-RPC connections. The field <userpw> comes in the format: <USERNAME>:<SALT>$<HASH>. A canonical python script is included in share/rpcuser. The client then connects normally using the rpcuser=<USERNAME>/rpcpassword=<PASSWORD> pair of arguments. This option can be specified multiple times</source> - <translation>Brugernavn og hashet adgangskode for JSON-RPC-forbindelser. Feltet <userpw> er i formatet: <BRUGERNAVN>:<SALT>$<HASH>. Et kanonisk Python-skript er inkluderet i share/rpcuser. Klienten forbinder så normalt ved hjælp af argumentparret rpcuser=<BRUGERNAVN>/rpcpassword=<ADGANGSKODE>. Dette tilvalg kan angives flere gange</translation> - </message> - <message> - <source>Wallet will not create transactions that violate mempool chain limits (default: %u)</source> - <translation>Tegnebogen vil ikke oprette transaktioner, som overtræder begrænsningen for hukommelsespuljekæden (standard: %u)</translation> - </message> - <message> <source>Warning: The network does not appear to fully agree! Some miners appear to be experiencing issues.</source> <translation>Advarsel: Netværket ser ikke ud til at være fuldt ud enige! Enkelte minere ser ud til at opleve problemer.</translation> </message> @@ -3290,10 +3236,6 @@ <translation>Advarsel: Vi ser ikke ud til at være fuldt ud enige med andre knuder! Du kan være nødt til at opgradere, eller andre knuder kan være nødt til at opgradere.</translation> </message> <message> - <source>Whether to save the mempool on shutdown and load on restart (default: %u)</source> - <translation>Hvorvidt hukommelsespuljen skal gemmes under nedlukning og indlæses under genstart (standard: %u)</translation> - </message> - <message> <source>%d of last 100 blocks have unexpected version</source> <translation>%d af de seneste 100 blokke har en uventet version</translation> </message> @@ -3306,42 +3248,14 @@ <translation>-maxmempool skal være mindst %d MB</translation> </message> <message> - <source><category> can be:</source> - <translation><kategori> kan være:</translation> - </message> - <message> - <source>Accept connections from outside (default: 1 if no -proxy or -connect)</source> - <translation>Acceptér forbindelser udefra (standard: 1 hvis hverken -proxy eller -connect)</translation> - </message> - <message> - <source>Append comment to the user agent string</source> - <translation>Føj kommentar til brugeragentstrengen</translation> - </message> - <message> - <source>Attempt to recover private keys from a corrupt wallet on startup</source> - <translation>Forsøg at genskabe private nøgler fra en ødelagt tegnebog under opstart</translation> - </message> - <message> - <source>Block creation options:</source> - <translation>Blokoprettelsestilvalg:</translation> - </message> - <message> <source>Cannot resolve -%s address: '%s'</source> <translation>Kan ikke finde -%s-adressen: “%s”</translation> </message> <message> - <source>Chain selection options:</source> - <translation>Indstillinger for kædevalg:</translation> - </message> - <message> <source>Change index out of range</source> <translation>Ændr indeks uden for interval</translation> </message> <message> - <source>Connection options:</source> - <translation>Tilvalg for forbindelser:</translation> - </message> - <message> <source>Copyright (C) %i-%i</source> <translation>Ophavsret © %i-%i</translation> </message> @@ -3350,36 +3264,12 @@ <translation>Ødelagt blokdatabase opdaget</translation> </message> <message> - <source>Debugging/Testing options:</source> - <translation>Tilvalg for fejlfinding/test:</translation> - </message> - <message> - <source>Do not load the wallet and disable wallet RPC calls</source> - <translation>Indlæs ikke tegnebogen og deaktivér tegnebogs-RPC-kald</translation> - </message> - <message> <source>Do you want to rebuild the block database now?</source> <translation>Ønsker du at genopbygge blokdatabasen nu?</translation> </message> <message> - <source>Enable publish hash block in <address></source> - <translation>Aktivér offentliggørelse af hash-blok i <address></translation> - </message> - <message> - <source>Enable publish hash transaction in <address></source> - <translation>Aktivér offentliggørelse af hash-transaktion i <address></translation> - </message> - <message> - <source>Enable publish raw block in <address></source> - <translation>Aktivér offentliggørelse af rå blok i <address></translation> - </message> - <message> - <source>Enable publish raw transaction in <address></source> - <translation>Aktivér offentliggørelse af rå transaktion i <address></translation> - </message> - <message> - <source>Enable transaction replacement in the memory pool (default: %u)</source> - <translation>Aktivér transaktionserstatning i hukommelsespuljen (standard: %u)</translation> + <source>Error creating %s: You can't create non-HD wallets with this version.</source> + <translation>Fejl under oprettelse af %s: Du kan ikke oprette ikke-HD-tegnebøger med denne version.</translation> </message> <message> <source>Error initializing block database</source> @@ -3394,6 +3284,10 @@ <translation>Fejl under indlæsning af %s</translation> </message> <message> + <source>Error loading %s: Private keys can only be disabled during creation</source> + <translation>Fejl ved indlæsning af %s: Private nøgler kan kun deaktiveres under oprettelse</translation> + </message> + <message> <source>Error loading %s: Wallet corrupted</source> <translation>Fejl under indlæsning af %s: Tegnebog ødelagt</translation> </message> @@ -3418,6 +3312,10 @@ <translation>Lytning på enhver port mislykkedes. Brug -listen=0, hvis du ønsker dette.</translation> </message> <message> + <source>Failed to rescan the wallet during initialization</source> + <translation>Genindlæsning af tegnebogen under initialisering mislykkedes</translation> + </message> + <message> <source>Importing...</source> <translation>Importerer…</translation> </message> @@ -3427,7 +3325,7 @@ </message> <message> <source>Initialization sanity check failed. %s is shutting down.</source> - <translation>Klargøring af sundhedstjek mislykkedes. %s lukker ned.</translation> + <translation>Sundhedstjek under initialisering mislykkedes. %s lukker ned.</translation> </message> <message> <source>Invalid amount for -%s=<amount>: '%s'</source> @@ -3442,8 +3340,8 @@ <translation>Ugyldigt beløb for -fallbackfee=<beløb>: “%s”</translation> </message> <message> - <source>Keep the transaction memory pool below <n> megabytes (default: %u)</source> - <translation>Hold hukommelsespuljen med transaktioner under <n> megabyte (standard: %u)</translation> + <source>Upgrading txindex database</source> + <translation>Opgraderer txindex database</translation> </message> <message> <source>Loading P2P addresses...</source> @@ -3454,26 +3352,10 @@ <translation>Indlæser bandlysningsliste…</translation> </message> <message> - <source>Location of the auth cookie (default: data dir)</source> - <translation>Placering for autentificerings-cookie (standard: datamappe)</translation> - </message> - <message> <source>Not enough file descriptors available.</source> <translation>For få tilgængelige fildeskriptorer.</translation> </message> <message> - <source>Only connect to nodes in network <net> (ipv4, ipv6 or onion)</source> - <translation>Tilslut kun til knuder i netværk <net> (IPv4, IPv6 eller Onion)</translation> - </message> - <message> - <source>Print this help message and exit</source> - <translation>Udskriv denne hjælpetekst og afslut</translation> - </message> - <message> - <source>Print version and exit</source> - <translation>Udskriv version og afslut</translation> - </message> - <message> <source>Prune cannot be configured with a negative value.</source> <translation>Beskæring kan ikke opsættes med en negativ værdi.</translation> </message> @@ -3482,14 +3364,6 @@ <translation>Beskæringstilstand er ikke kompatibel med -txindex.</translation> </message> <message> - <source>Rebuild chain state and block index from the blk*.dat files on disk</source> - <translation>Genopbyg kædetilstand og blokindeks fra blk*.dat-filerne på disken</translation> - </message> - <message> - <source>Rebuild chain state from the currently indexed blocks</source> - <translation>Genopbyg kædetilstand ud fra de aktuelt indekserede blokke</translation> - </message> - <message> <source>Replaying blocks...</source> <translation>Genafspiller blokke…</translation> </message> @@ -3498,14 +3372,6 @@ <translation>Spoler blokke tilbage…</translation> </message> <message> - <source>Set database cache size in megabytes (%d to %d, default: %d)</source> - <translation>Sæt cache-størrelse for database i megabytes (%d til %d; standard: %d)</translation> - </message> - <message> - <source>Specify wallet file (within data directory)</source> - <translation>Angiv tegnebogsfil (inden for datamappe)</translation> - </message> - <message> <source>The source code is available from %s.</source> <translation>Kildekoden er tilgængelig fra %s.</translation> </message> @@ -3518,6 +3384,10 @@ <translation>Ikke i stand til at tildele til %s på denne computer. %s kører formodentlig allerede.</translation> </message> <message> + <source>Unable to generate keys</source> + <translation>U-istand til at generere nøgler</translation> + </message> + <message> <source>Unsupported argument -benchmark ignored, use -debug=bench.</source> <translation>Argument -benchmark understøttes ikke og ignoreres; brug -debug=bench.</translation> </message> @@ -3538,14 +3408,6 @@ <translation>Opgraderer UTXO-database</translation> </message> <message> - <source>Use UPnP to map the listening port (default: %u)</source> - <translation>Brug UPnP til at konfigurere den lyttende port (standard: %u)</translation> - </message> - <message> - <source>Use the test chain</source> - <translation>Brug testkæden</translation> - </message> - <message> <source>User Agent comment (%s) contains unsafe characters.</source> <translation>Brugeragent-kommentar (%s) indeholder usikre tegn.</translation> </message> @@ -3554,90 +3416,26 @@ <translation>Verificerer blokke…</translation> </message> <message> - <source>Wallet debugging/testing options:</source> - <translation>Tilvalg for fejlfinding/test af tegnebog:</translation> - </message> - <message> <source>Wallet needed to be rewritten: restart %s to complete</source> <translation>Det var nødvendigt at genskrive tegnebogen: Genstart %s for at gennemføre</translation> </message> <message> - <source>Wallet options:</source> - <translation>Tilvalg for tegnebog:</translation> - </message> - <message> - <source>Allow JSON-RPC connections from specified source. Valid for <ip> are a single IP (e.g. 1.2.3.4), a network/netmask (e.g. 1.2.3.4/255.255.255.0) or a network/CIDR (e.g. 1.2.3.4/24). This option can be specified multiple times</source> - <translation>Tillad JSON-RPC-forbindelser fra angivet kilde. Gyldig for <ip> er en enkelt IP (fx 1.2.3.4), et netværk/netmaske (fx 1.2.3.4/255.255.255.0) eller et netværk/CIDR (fx 1.2.3.4/24). Dette tilvalg kan angives flere gange</translation> - </message> - <message> - <source>Bind to given address and whitelist peers connecting to it. Use [host]:port notation for IPv6</source> - <translation>Tildel given adresse og sæt andre knuder, der forbinder til den, på hvidliste. Brug [vært]:port notation for IPv6</translation> - </message> - <message> - <source>Create new files with system default permissions, instead of umask 077 (only effective with disabled wallet functionality)</source> - <translation>Opret nye filer med systemstandard for rettigheder i stedet for umask 077 (kun virksomt med tegnebogsfunktionalitet deaktiveret)</translation> - </message> - <message> - <source>Discover own IP addresses (default: 1 when listening and no -externalip or -proxy)</source> - <translation>Opdag egne IP-adresser (standard: 1 under lytning og ingen -externalip eller -proxy)</translation> - </message> - <message> <source>Error: Listening for incoming connections failed (listen returned error %s)</source> <translation>Fejl: Lytning efter indkommende forbindelser mislykkedes (lytning resultarede i fejl %s)</translation> </message> <message> - <source>Execute command when a relevant alert is received or we see a really long fork (%s in cmd is replaced by message)</source> - <translation>Udfør kommando, når en relevant alarm modtages eller vi ser en virkelig lang udsplitning (%s i cmd erstattes af besked)</translation> - </message> - <message> - <source>Fees (in %s/kB) smaller than this are considered zero fee for relaying, mining and transaction creation (default: %s)</source> - <translation>Gebyrer (i %s/kB) mindre end dette opfattes som intet gebyr for videresendelse, mining og oprettelse af transaktioner (standard: %s)</translation> - </message> - <message> - <source>If paytxfee is not set, include enough fee so transactions begin confirmation on average within n blocks (default: %u)</source> - <translation>Hvis paytxfee ikke er sat, inkluderes nok gebyr til at transaktioner begynder at blive bekræftet ingen for gennemsnitligt n blokke (standard: %u)</translation> - </message> - <message> <source>Invalid amount for -maxtxfee=<amount>: '%s' (must be at least the minrelay fee of %s to prevent stuck transactions)</source> <translation>Ugyldigt beløb for -maxtxfee=<beløb>: “%s” (skal være på mindst minrelay-gebyret på %s for at undgå hængende transaktioner)</translation> </message> <message> - <source>Maximum size of data in data carrier transactions we relay and mine (default: %u)</source> - <translation>Maksimal størrelse på data i transaktioner til dataoverførsel, som vi videresender og miner (standard: %u)</translation> - </message> - <message> - <source>Randomize credentials for every proxy connection. This enables Tor stream isolation (default: %u)</source> - <translation>Brug tilfældige akkreditiver for hver proxy-forbindelse. Dette aktiverer strømisolation med Tor (standard: %u)</translation> - </message> - <message> <source>The transaction amount is too small to send after the fee has been deducted</source> <translation>Transaktionsbeløbet er for lille til at sende, når gebyret er trukket fra</translation> </message> <message> - <source>Whitelisted peers cannot be DoS banned and their transactions are always relayed, even if they are already in the mempool, useful e.g. for a gateway</source> - <translation>Andre knuder på hvidliste kan ikke DoS-bandlyses, og deres transaktioner videresendes altid, selv hvis de allerede er i hukommelsespuljen. Brugbart til fx et adgangspunkt</translation> - </message> - <message> <source>You need to rebuild the database using -reindex to go back to unpruned mode. This will redownload the entire blockchain</source> <translation>Du er nødt til at genopbygge databasen ved hjælp af -reindex for at gå tilbage til ikke-beskåret tilstand. Dette vil downloade hele blokkæden igen</translation> </message> <message> - <source>(default: %u)</source> - <translation>(standard: %u)</translation> - </message> - <message> - <source>Accept public REST requests (default: %u)</source> - <translation>Acceptér offentlige REST-anmodninger (standard: %u)</translation> - </message> - <message> - <source>Automatically create Tor hidden service (default: %d)</source> - <translation>Opret automatisk skjult Tor-tjeneste (standard: %d)</translation> - </message> - <message> - <source>Connect through SOCKS5 proxy</source> - <translation>Forbind gennem SOCKS5-proxy</translation> - </message> - <message> <source>Error loading %s: You can't disable HD on an already existing HD wallet</source> <translation>Fejl under indlæsning af %s: Du kan ikke slå HD fra på en allerede eksisterende HD-tegnebog</translation> </message> @@ -3650,10 +3448,6 @@ <translation>Fejl under opgradering af kædetilstandsdatabase</translation> </message> <message> - <source>Imports blocks from external blk000??.dat file on startup</source> - <translation>Importerer blokeringer fra ekstern blk000??.dat-fil under opstart</translation> - </message> - <message> <source>Information</source> <translation>Information</translation> </message> @@ -3674,46 +3468,24 @@ <translation>Ugyldig netmaske angivet i -whitelist: “%s”</translation> </message> <message> - <source>Keep at most <n> unconnectable transactions in memory (default: %u)</source> - <translation>Behold højest <n> uforbindelige transaktioner i hukommelsen (standard: %u)</translation> - </message> - <message> <source>Need to specify a port with -whitebind: '%s'</source> <translation>Nødt til at angive en port med -whitebinde: “%s”</translation> </message> <message> - <source>Node relay options:</source> - <translation>Videresendelsesvalgmuligheder for knude:</translation> - </message> - <message> - <source>RPC server options:</source> - <translation>Tilvalg for RPC-server:</translation> - </message> - <message> <source>Reducing -maxconnections from %d to %d, because of system limitations.</source> <translation>Reducerer -maxconnections fra %d til %d på grund af systembegrænsninger.</translation> </message> <message> - <source>Rescan the block chain for missing wallet transactions on startup</source> - <translation>Genindlæs blokkæden efter manglende tegnebogstransaktioner under opstart</translation> - </message> - <message> - <source>Send trace/debug info to console instead of debug.log file</source> - <translation>Send sporings-/fejlsøgningsinformation til konsollen i stedet for debug.log filen</translation> - </message> - <message> - <source>Show all debugging options (usage: --help -help-debug)</source> - <translation>Vis alle tilvalg for fejlsøgning (brug: --help -help-debug)</translation> - </message> - <message> - <source>Shrink debug.log file on client startup (default: 1 when no -debug)</source> - <translation>Formindsk debug.log filen ved klientopstart (standard: 1 hvis ikke -debug)</translation> - </message> - <message> <source>Signing transaction failed</source> <translation>Signering af transaktion mislykkedes</translation> </message> <message> + <source>Specified blocks directory "%s" does not exist. +</source> + <translation>Specificeret blokke mappe "%s" eksisterer ikke. +</translation> + </message> + <message> <source>The transaction amount is too small to pay the fee</source> <translation>Transaktionsbeløbet er for lille til at betale gebyret</translation> </message> @@ -3722,14 +3494,6 @@ <translation>Dette er eksperimentelt software.</translation> </message> <message> - <source>Tor control port password (default: empty)</source> - <translation>Adgangskode for Tor kontrolport (standard: tom)</translation> - </message> - <message> - <source>Tor control port to use if onion listening enabled (default: %s)</source> - <translation>Tor kontrolport, der skal bruges, hvis onion-lytning er aktiveret (standard: %s)</translation> - </message> - <message> <source>Transaction amount too small</source> <translation>Transaktionsbeløb er for lavt</translation> </message> @@ -3746,18 +3510,18 @@ <translation>Ikke i stand til at tildele til %s på denne computer (bind returnerede fejl %s)</translation> </message> <message> - <source>Upgrade wallet to latest format on startup</source> - <translation>Opgradér tegnebog til seneste format under opstart</translation> - </message> - <message> - <source>Username for JSON-RPC connections</source> - <translation>Brugernavn til JSON-RPC-forbindelser</translation> + <source>Unable to generate initial keys</source> + <translation>Kan ikke generere indledningsvise nøgler</translation> </message> <message> <source>Verifying wallet(s)...</source> <translation>Verificerer tegnebøger…</translation> </message> <message> + <source>Wallet %s resides outside wallet directory %s</source> + <translation>Tegnebog %s findes uden for tegnebogsmappen %s</translation> + </message> + <message> <source>Warning</source> <translation>Advarsel</translation> </message> @@ -3766,98 +3530,18 @@ <translation>Advarsel: Ukendte nye regler aktiveret (versionsbit %i)</translation> </message> <message> - <source>Whether to operate in a blocks only mode (default: %u)</source> - <translation>Hvorvidt der skal arbejdes i kun-blokke-tilstand (standard: %u)</translation> - </message> - <message> - <source>You need to rebuild the database using -reindex to change -txindex</source> - <translation>Du er nødt til at genopbygge databasen ved hjælp af -reindex for at ændre -txindex</translation> - </message> - <message> <source>Zapping all transactions from wallet...</source> <translation>Zapper alle transaktioner fra tegnebog…</translation> </message> <message> - <source>ZeroMQ notification options:</source> - <translation>ZeroMQ-notifikationsindstillinger:</translation> - </message> - <message> - <source>Password for JSON-RPC connections</source> - <translation>Adgangskode til JSON-RPC-forbindelser</translation> - </message> - <message> - <source>Execute command when the best block changes (%s in cmd is replaced by block hash)</source> - <translation>Udfør kommando, når den bedste blok ændres (%s i kommandoen erstattes med blokhash)</translation> - </message> - <message> - <source>Allow DNS lookups for -addnode, -seednode and -connect</source> - <translation>Tillad DNS-opslag for -addnode, -seednode og -connect</translation> - </message> - <message> - <source>(1 = keep tx meta data e.g. account owner and payment request information, 2 = drop tx meta data)</source> - <translation>(1 = behold metadata for transaktion, fx kontoindehaver og information om betalingsanmodning, 2 = drop metadata for transaktion)</translation> - </message> - <message> <source>-maxtxfee is set very high! Fees this large could be paid on a single transaction.</source> <translation>-maxtxfee er sat meget højt! Gebyrer så store risikeres betalt på en enkelt transaktion.</translation> </message> <message> - <source>Bind to given address to listen for JSON-RPC connections. This option is ignored unless -rpcallowip is also passed. Port is optional and overrides -rpcport. Use [host]:port notation for IPv6. This option can be specified multiple times (default: 127.0.0.1 and ::1 i.e., localhost, or if -rpcallowip has been specified, 0.0.0.0 and :: i.e., all addresses)</source> - <translation>Tildel til den givne adresse for at lytte efter JSON-RPC-forbindelser. Dette tilvalg ignoreres med mindre -rpcwallet også bruges. Port er valgfri og tilsidesætter -rpcport. Brug [vært]:port-notation for IPv6. Denne valgmulighed kan angives flere gange (standard: 127.0.0.1 og ::1, dvs. localhost, eller hvis -rpcallowip is angivet: 0.0.0.0 og ::, dvs. alle adresser)</translation> - </message> - <message> - <source>Do not keep transactions in the mempool longer than <n> hours (default: %u)</source> - <translation>Behold ikke transaktioner i hukommelsespuljen i mere end <n> timer (default: %u)</translation> - </message> - <message> - <source>Equivalent bytes per sigop in transactions for relay and mining (default: %u)</source> - <translation>Tilsvarende bytes pr. sigop i transaktioner, som videresendes og mines (standard: %u)</translation> - </message> - <message> <source>Error loading %s: You can't enable HD on an already existing non-HD wallet</source> <translation>Fejl under indlæsning af %s: Du kan ikke aktivere HD på en allerede eksisterende ikke-HD-tegnebog</translation> </message> <message> - <source>Error loading wallet %s. -wallet parameter must only specify a filename (not a path).</source> - <translation>Fejl under indlæsning af tegnebog %s. “-wallet”-parameteren kan kun angive et filnavn (ikke en sti).</translation> - </message> - <message> - <source>Fees (in %s/kB) smaller than this are considered zero fee for transaction creation (default: %s)</source> - <translation>Gebyrer (i %s/kB) mindre end dette opfattes som intet gebyr under oprettelse af transaktioner (standard: %s)</translation> - </message> - <message> - <source>Force relay of transactions from whitelisted peers even if they violate local relay policy (default: %d)</source> - <translation>Gennemtving videresendelse af transaktioner fra hvidlistede knuder, selv om de overtræder lokal videresendelsespolitik (standard: %d)</translation> - </message> - <message> - <source>How thorough the block verification of -checkblocks is (0-4, default: %u)</source> - <translation>Hvor gennemarbejdet blokverificeringen for -checkblocks er (0-4; standard: %u)</translation> - </message> - <message> - <source>Maintain a full transaction index, used by the getrawtransaction rpc call (default: %u)</source> - <translation>Vedligehold et komplet transaktionsindeks, der bruges af rpc-kaldet getrawtransaction (standard: %u)</translation> - </message> - <message> - <source>Number of seconds to keep misbehaving peers from reconnecting (default: %u)</source> - <translation>Antal sekunder, som knuder der opfører sig upassende, skal vente før reetablering (standard: %u)</translation> - </message> - <message> - <source>Output debugging information (default: %u, supplying <category> is optional)</source> - <translation>Udskriv fejlsøgningsinformation (standard: %u, angivelse af <kategori> er valgfri)</translation> - </message> - <message> - <source>Sets the serialization of raw transaction or block hex returned in non-verbose mode, non-segwit(0) or segwit(1) (default: %d)</source> - <translation>Indstiller serialiseringen af rå transaktioner eller blok-hex returneret i ikke-verbose tilstand, non-segwit(0) eller sigwit(1) (standard: %d)</translation> - </message> - <message> - <source>Support filtering of blocks and transaction with bloom filters (default: %u)</source> - <translation>Understøt filtrering af blokke og transaktioner med Bloom-filtre (standard: %u)</translation> - </message> - <message> - <source>The fee rate (in %s/kB) that indicates your tolerance for discarding change by adding it to the fee (default: %s). Note: An output is discarded if it is dust at this rate, but we will always discard up to the dust relay fee and a discard fee above that is limited by the fee estimate for the longest target</source> - <translation>Den gebyrsats (i %s/kB), som indikerer din tolerance for at kassere byttepenge ved at føje dem til gebyret (standard: %s). Bemærk: Et output kasseres, hvis det anses som støv ved denne rate, men der vil altid kasseres op til støvvideresendelsesgebyret, og et kasseringsgebyr derover er begrænset af gebyrestimatet for det længste mål</translation> - </message> - <message> <source>This is the transaction fee you may pay when fee estimates are not available.</source> <translation>Dette er transaktionsgebyret, du kan betale, når gebyrestimeringer ikke er tilgængelige.</translation> </message> @@ -3870,10 +3554,6 @@ <translation>Den totale længde på netværksversionsstrengen (%i) overstiger maksimallængden (%i). Reducér antaller af eller størrelsen på uacomments.</translation> </message> <message> - <source>Tries to keep outbound traffic under the given target (in MiB per 24h), 0 = no limit (default: %d)</source> - <translation>Prøver at holde udadgående traffik under det givne mål (i MiB pr. 24 timer), 0 = ingen grænse (standard: %d)</translation> - </message> - <message> <source>Unsupported argument -socks found. Setting SOCKS version isn't possible anymore, only SOCKS5 proxies are supported.</source> <translation>Argument -socks understøttes ikke. Det er ikke længere muligt at sætte SOCKS-version; kun SOCKS5-proxier understøttes.</translation> </message> @@ -3882,10 +3562,6 @@ <translation>Argument -whitelistalwaysrelay understøttes ikke og ignoreres; brug -whitelistrelay og/eller -whitelistforcerelay.</translation> </message> <message> - <source>Use separate SOCKS5 proxy to reach peers via Tor hidden services (default: %s)</source> - <translation>Brug separat SOCS5-proxy for at nå knuder via Tors skjulte tjenester (standard: %s)</translation> - </message> - <message> <source>Warning: Unknown block versions being mined! It's possible unknown rules are in effect</source> <translation>Advarsel: Ukendte blokversioner bliver minet! Det er muligt, at ukendte regler er i brug</translation> </message> @@ -3894,111 +3570,18 @@ <translation>Advarsel: Tegnebogsfil ødelagt, data reddet! Oprindelig %s gemt som %s i %s; hvis din saldo eller dine transaktioner er forkert, bør du genskabe fra en sikkerhedskopi.</translation> </message> <message> - <source>Whitelist peers connecting from the given IP address (e.g. 1.2.3.4) or CIDR notated network (e.g. 1.2.3.0/24). Can be specified multiple times.</source> - <translation>Sæt knuder på hvidliste, som forbinder fra den givne IP-adresse (fx 1.2.3.4) eller CIDR-noteret netværk (fx 1.2.3.0/24). Kan angives flere gange.</translation> - </message> - <message> <source>%s is set very high!</source> <translation>%s er meget højt sat!</translation> </message> <message> - <source>(default: %s)</source> - <translation>(standard: %s)</translation> - </message> - <message> - <source>Always query for peer addresses via DNS lookup (default: %u)</source> - <translation>Forespørg altid adresser på andre knuder via DNS-opslag (default: %u)</translation> - </message> - <message> - <source>Error loading wallet %s. -wallet filename must be a regular file.</source> - <translation>Fejl under indlæsning af tegnebog %s. -wallet filnavn skal være en almindelig fil.</translation> - </message> - <message> <source>Error loading wallet %s. Duplicate -wallet filename specified.</source> <translation>Fejl under indlæsning af tegnebog %s. -wallet filnavn angivet mere end én gang.</translation> </message> <message> - <source>Error loading wallet %s. Invalid characters in -wallet filename.</source> - <translation>Fejl under indlæsning af tegnebog %s. Ugyldige tegn i -wallet filnavn.</translation> - </message> - <message> - <source>How many blocks to check at startup (default: %u, 0 = all)</source> - <translation>Antal blokke som tjekkes ved opstart (standard: %u, 0 = alle)</translation> - </message> - <message> - <source>Include IP addresses in debug output (default: %u)</source> - <translation>Inkludér IP-adresser i fejlretningsoutput (standard: %u)</translation> - </message> - <message> <source>Keypool ran out, please call keypoolrefill first</source> <translation>Nøglepulje løb tør; kald venligst keypoolrefill først</translation> </message> <message> - <source>Listen for JSON-RPC connections on <port> (default: %u or testnet: %u)</source> - <translation>Lyt efter JSON-RPC-forbindelser på <port> (standard: %u eller testnet: %u)</translation> - </message> - <message> - <source>Listen for connections on <port> (default: %u or testnet: %u)</source> - <translation>Lyt efter forbindelser på <port> (standard: %u eller testnet: %u)</translation> - </message> - <message> - <source>Maintain at most <n> connections to peers (default: %u)</source> - <translation>Oprethold højest <n> forbindelser til andre knuder (standard: %u)</translation> - </message> - <message> - <source>Make the wallet broadcast transactions</source> - <translation>Få tegnebogen til at transmittere transaktioner</translation> - </message> - <message> - <source>Maximum per-connection receive buffer, <n>*1000 bytes (default: %u)</source> - <translation>Maksimum for modtagelsesbuffer pr. forbindelse, <n>*1000 byte (standard: %u)</translation> - </message> - <message> - <source>Maximum per-connection send buffer, <n>*1000 bytes (default: %u)</source> - <translation>Maksimum for afsendelsesbuffer pr. forbindelse, <n>*1000 byte (standard: %u)</translation> - </message> - <message> - <source>Prepend debug output with timestamp (default: %u)</source> - <translation>Føj tidsstempel foran fejlsøgningsoutput (standard: %u)</translation> - </message> - <message> - <source>Relay and mine data carrier transactions (default: %u)</source> - <translation>Videresend og udvind databærer-transaktioner (standard: %u)</translation> - </message> - <message> - <source>Relay non-P2SH multisig (default: %u)</source> - <translation>Videresend ikke-P2SH multisig (standard: %u)</translation> - </message> - <message> - <source>Set key pool size to <n> (default: %u)</source> - <translation>Sæt nøglepuljestørrelse til <n> (standard: %u) -</translation> - </message> - <message> - <source>Set maximum BIP141 block weight (default: %d)</source> - <translation>Sæt maksimal BIP141-blokvægt (standard: %d)</translation> - </message> - <message> - <source>Set the number of threads to service RPC calls (default: %d)</source> - <translation>Angiv antallet af tråde til at håndtere RPC-kald (standard: %d)</translation> - </message> - <message> - <source>Specify configuration file (default: %s)</source> - <translation>Angiv konfigurationsfil (standard: %s)</translation> - </message> - <message> - <source>Specify connection timeout in milliseconds (minimum: 1, default: %d)</source> - <translation>Angiv tilslutningstimeout i millisekunder (minimum: 1, standard: %d)</translation> - </message> - <message> - <source>Specify pid file (default: %s)</source> - <translation>Angiv pid-fil (standard: %s)</translation> - </message> - <message> - <source>Spend unconfirmed change when sending transactions (default: %u)</source> - <translation>Brug ubekræftede byttepenge under afsendelse af transaktioner (standard: %u)</translation> - </message> - <message> <source>Starting network threads...</source> <translation>Starter netværkstråde…</translation> </message> @@ -4015,10 +3598,6 @@ <translation>Dette er transaktionsgebyret, som betaler, når du sender en transaktion.</translation> </message> <message> - <source>Threshold for disconnecting misbehaving peers (default: %u)</source> - <translation>Grænse for afbrydelse af forbindelse til knuder, der opfører sig upassende (standard: %u)</translation> - </message> - <message> <source>Transaction amounts must not be negative</source> <translation>Transaktionsbeløb må ikke være negative</translation> </message> @@ -4039,6 +3618,26 @@ <translation>Manglende dækning</translation> </message> <message> + <source>Can't generate a change-address key. Private keys are disabled for this wallet.</source> + <translation>Kan ikke generere en bytte-adresse nøgle. Private nøgler er deaktiveret for denne tegnebog.</translation> + </message> + <message> + <source>Cannot upgrade a non HD split wallet without upgrading to support pre split keypool. Please use -upgradewallet=169900 or -upgradewallet with no version specified.</source> + <translation>Kan ikke opgradere en ikke HD dele tegnebog uden opgradering til at støtte før split nøglepool. Venligst brug -upgradewallet=169900 eller -upgradewallet med ingen version specificeret.</translation> + </message> + <message> + <source>Fee estimation failed. Fallbackfee is disabled. Wait a few blocks or enable -fallbackfee.</source> + <translation>Gebyr estimering fejlede. Tilbagefaldsgebyr er deaktiveret. Vent et par blokke eller aktiver -fallbackfee.</translation> + </message> + <message> + <source>Warning: Private keys detected in wallet {%s} with disabled private keys</source> + <translation>Advarsel: Private nøgler opdaget i tegnebog {%s} med deaktiverede private nøgler</translation> + </message> + <message> + <source>Cannot write to data directory '%s'; check permissions.</source> + <translation>Kan ikke skrive til datamappe '%s'; tjek tilladelser.</translation> + </message> + <message> <source>Loading block index...</source> <translation>Indlæser blokindeks…</translation> </message> diff --git a/src/qt/locale/bitcoin_de.ts b/src/qt/locale/bitcoin_de.ts index 31e01c3916..45d09655c4 100644 --- a/src/qt/locale/bitcoin_de.ts +++ b/src/qt/locale/bitcoin_de.ts @@ -7,7 +7,7 @@ </message> <message> <source>Create a new address</source> - <translation>Eine neue Adresse erstellen</translation> + <translation>Neue Adresse erstellen</translation> </message> <message> <source>&New</source> @@ -30,12 +30,16 @@ <translation>Ausgewählte Adresse aus der Liste entfernen</translation> </message> <message> + <source>Enter address or label to search</source> + <translation>Zu suchende Adresse oder Bezeichnung eingeben</translation> + </message> + <message> <source>Export the data in the current tab to a file</source> <translation>Daten der aktuellen Ansicht in eine Datei exportieren</translation> </message> <message> <source>&Export</source> - <translation>E&xportieren</translation> + <translation>&Exportieren</translation> </message> <message> <source>&Delete</source> @@ -55,15 +59,15 @@ </message> <message> <source>Sending addresses</source> - <translation>Sender_in Addresse</translation> + <translation>Senderaddressen</translation> </message> <message> <source>Receiving addresses</source> - <translation>Empfangsadressen</translation> + <translation>Empfängeradressen</translation> </message> <message> <source>These are your Bitcoin addresses for sending payments. Always check the amount and the receiving address before sending coins.</source> - <translation>Dies sind ihre Bitcoin-Adressen zum Tätigen von Überweisungen. Bitte prüfen Sie den Betrag und die Adresse des Empfängers, bevor Sie Bitcoins überweisen.</translation> + <translation>Dies sind Ihre Bitcoin-Adressen zum Tätigen von Überweisungen. Bitte prüfen Sie den Betrag und die Adresse des Empfängers, bevor Sie Bitcoins überweisen.</translation> </message> <message> <source>These are your Bitcoin addresses for receiving payments. It is recommended to use a new receiving address for each transaction.</source> @@ -145,7 +149,7 @@ </message> <message> <source>This operation needs your wallet passphrase to unlock the wallet.</source> - <translation>Dieser Vorgang benötigt ihre Passphrase, um die Brieftasche zu entsperren.</translation> + <translation>Dieser Vorgang benötigt Ihre Passphrase, um die Brieftasche zu entsperren.</translation> </message> <message> <source>Unlock wallet</source> @@ -322,6 +326,14 @@ <translation>&URI öffnen...</translation> </message> <message> + <source>Wallet:</source> + <translation>Brieftasche:</translation> + </message> + <message> + <source>default wallet</source> + <translation>Standard Brieftasche</translation> + </message> + <message> <source>Click to disable network activity.</source> <translation>Klicken zum Deaktivieren der Netzwerkaktivität.</translation> </message> @@ -342,6 +354,10 @@ <translation>Reindiziere Blöcke auf Datenträger...</translation> </message> <message> + <source>Proxy is <b>enabled</b>: %1</source> + <translation>Proxy ist <b>aktiviert</b>: %1</translation> + </message> + <message> <source>Send coins to a Bitcoin address</source> <translation>Bitcoins an eine Bitcoin-Adresse überweisen</translation> </message> @@ -510,6 +526,12 @@ </translation> </message> <message> + <source>Wallet: %1 +</source> + <translation>Brieftasche: %1 +</translation> + </message> + <message> <source>Type: %1 </source> <translation>Typ: %1 @@ -730,10 +752,6 @@ <translation>&Adresse</translation> </message> <message> - <source>New receiving address</source> - <translation>Neue Empfangsadresse</translation> - </message> - <message> <source>New sending address</source> <translation>Neue Zahlungsadresse</translation> </message> @@ -750,8 +768,12 @@ <translation>Die eingegebene Adresse "%1" ist keine gültige Bitcoin-Adresse.</translation> </message> <message> - <source>The entered address "%1" is already in the address book.</source> - <translation>Die eingegebene Adresse "%1" befindet sich bereits im Adressbuch.</translation> + <source>Address "%1" already exists as a receiving address with label "%2" and so cannot be added as a sending address.</source> + <translation>Die Adresse "%1" existiert bereits als Empfangsadresse mit dem Label "%2" und kann daher nicht als Sendeadresse hinzugefügt werden.</translation> + </message> + <message> + <source>The entered address "%1" is already in the address book with label "%2".</source> + <translation>Die eingegebene Adresse "%1" befindet sich bereits im Adressbuch mit der Bezeichnung "%2".</translation> </message> <message> <source>Could not unlock wallet.</source> @@ -803,42 +825,6 @@ <source>Command-line options</source> <translation>Kommandozeilenoptionen</translation> </message> - <message> - <source>Usage:</source> - <translation>Benutzung:</translation> - </message> - <message> - <source>command-line options</source> - <translation>Kommandozeilenoptionen</translation> - </message> - <message> - <source>UI Options:</source> - <translation>UI Einstellungen:</translation> - </message> - <message> - <source>Choose data directory on startup (default: %u)</source> - <translation>Datenverzeichnis beim Starten auswählen (Standard: %u)</translation> - </message> - <message> - <source>Set language, for example "de_DE" (default: system locale)</source> - <translation>Sprache einstellen, zum Beispiel "de_DE" (Standard: Systemgebietsschema)</translation> - </message> - <message> - <source>Start minimized</source> - <translation>Minimiert starten</translation> - </message> - <message> - <source>Set SSL root certificates for payment request (default: -system-)</source> - <translation>SSL-Wurzelzertifikate für Zahlungsanforderungen festlegen (Standard: Systemstandard)</translation> - </message> - <message> - <source>Show splash screen on startup (default: %u)</source> - <translation>Startbildschirm beim Starten anzeigen (Standard: %u)</translation> - </message> - <message> - <source>Reset all settings changed in the GUI</source> - <translation>Setze alle Einstellungen zurück, die über die grafische Oberfläche geändert wurden.</translation> - </message> </context> <context> <name>Intro</name> @@ -1064,6 +1050,22 @@ <translation>&Netzwerk</translation> </message> <message> + <source>Disables some advanced features but all blocks will still be fully validated. Reverting this setting requires re-downloading the entire blockchain. Actual disk usage may be somewhat higher.</source> + <translation>Deaktiviert einige erweiterte Funktionen, aber alle Blöcke werden trotzdem vollständig validiert. Um diese Einstellung rückgängig zu machen, muss die gesamte Blockkette erneut heruntergeladen werden. Die tatsächliche Festplattennutzung kann etwas höher sein.</translation> + </message> + <message> + <source>Prune &block storage to</source> + <translation>&block Speicher kürzen auf</translation> + </message> + <message> + <source>GB</source> + <translation>GB</translation> + </message> + <message> + <source>Reverting this setting requires re-downloading the entire blockchain.</source> + <translation>Wenn diese Einstellung rückgängig gemacht wird, muss die komplette Blockkette erneut heruntergeladen werden.</translation> + </message> + <message> <source>(0 = auto, <0 = leave that many cores free)</source> <translation>(0 = automatisch, <0 = so viele Kerne frei lassen)</translation> </message> @@ -1330,6 +1332,10 @@ <translation>URI-Verarbeitung</translation> </message> <message> + <source>'bitcoin://' is not a valid URI. Use 'bitcoin:' instead.</source> + <translation>'bitcoin://' ist kein gültiger URL. Bitte 'bitcoin:' nutzen.</translation> + </message> + <message> <source>Payment request fetch URL is invalid: %1</source> <translation>Abruf-URL der Zahlungsanforderung ist ungültig: %1</translation> </message> @@ -1418,7 +1424,7 @@ </message> <message> <source>NodeId</source> - <translation>Knoten Identität</translation> + <translation>Knotenkennung</translation> </message> <message> <source>Ping</source> @@ -1527,12 +1533,16 @@ <context> <name>QObject::QObject</name> <message> + <source>Error parsing command line arguments: %1.</source> + <translation>Fehler beim Verarbeiten von Befehlszeilenargumenten: %1</translation> + </message> + <message> <source>Error: Specified data directory "%1" does not exist.</source> <translation>Fehler: Angegebenes Datenverzeichnis "%1" existiert nicht.</translation> </message> <message> - <source>Error: Cannot parse configuration file: %1. Only use key=value syntax.</source> - <translation>Fehler: Konfigurationsdatei kann nicht analysiert werden: %1. Bitte nur "Schlüssel=Wert"-Syntax verwenden.</translation> + <source>Error: Cannot parse configuration file: %1.</source> + <translation>Fehler: Konfigurationsdatei konnte nicht Verarbeitet werden: %1.</translation> </message> <message> <source>Error: %1</source> @@ -1625,6 +1635,14 @@ <translation>Speichernutzung</translation> </message> <message> + <source>Wallet: </source> + <translation>Brieftasche:</translation> + </message> + <message> + <source>(none)</source> + <translation>(keine)</translation> + </message> + <message> <source>&Reset</source> <translation>&Zurücksetzen</translation> </message> @@ -1790,7 +1808,11 @@ </message> <message> <source>&Unban</source> - <translation>&Node entsperren</translation> + <translation>K&noten entsperren</translation> + </message> + <message> + <source>default wallet</source> + <translation>Standard Brieftasche</translation> </message> <message> <source>Welcome to the %1 RPC console.</source> @@ -1810,13 +1832,21 @@ </message> <message> <source>WARNING: Scammers have been active, telling users to type commands here, stealing their wallet contents. Do not use this console without fully understanding the ramifications of a command.</source> - <translation>WARNUNG: Betrüger sind aktiv gewesen und erklären den Benutzern, hier Befehle einzugeben und ihre Brieftascheninhalte zu stehlen. Verwenden Sie diese Konsole nicht, ohne die Verzweigungen eines Befehls vollständig zu verstehen.</translation> + <translation>WARNUNG: Betrüger sind aktiv gewesen, die Benutzer auffordern, hier Befehle einzugeben, um Brieftascheninhalte zu stehlen. Verwenden Sie diese Konsole nicht, ohne die Auswirkungen eines Befehls vollständig zu verstehen.</translation> </message> <message> <source>Network activity disabled</source> <translation>Netzwerkaktivität deaktiviert</translation> </message> <message> + <source>Executing command without any wallet</source> + <translation>Befehl wird ohne spezifizierte Brieftasche ausgeführt</translation> + </message> + <message> + <source>Executing command using "%1" wallet</source> + <translation>Befehl wird mit Brieftasche "%1" ausgeführt</translation> + </message> + <message> <source>(node id: %1)</source> <translation>(Knotenkennung: %1)</translation> </message> @@ -1888,20 +1918,20 @@ <translation>Zurücksetzen</translation> </message> <message> - <source>Requested payments history</source> - <translation>Verlauf der angeforderten Zahlungen</translation> + <source>Native segwit addresses (aka Bech32 or BIP-173) reduce your transaction fees later on and offer better protection against typos, but old wallets don't support them. When unchecked, an address compatible with older wallets will be created instead.</source> + <translation>Ureigene SegWit-Adressen (alias Bech32 oder BIP-173) werden Ihre Transaktionsgebühren senken und bieten besseren Tippfehlerschutz, werden jedoch von alten Brieftaschen nicht unterstützt. Wenn abgewählt, wird eine mit älteren Brieftaschen kompatible Adresse erstellt.</translation> </message> <message> - <source>&Request payment</source> - <translation>&Zahlung anfordern</translation> + <source>Generate native segwit (Bech32) address</source> + <translation>Generiere ureigene SegWit(Bech32)-Adresse</translation> </message> <message> - <source>Bech32 addresses (BIP-173) are cheaper to spend from and offer better protection against typos. When unchecked a P2SH wrapped SegWit address will be created, compatible with older wallets.</source> - <translation>Bech32 Adressen (BIP-173) sind günstiger zum senden und besser geschützt gegen Tippfehler. Wenn nicht gewählt wird eine P2SH verpackte SegWit Adresse generiert, kompatibel mit älteren Wallets.</translation> + <source>Requested payments history</source> + <translation>Verlauf der angeforderten Zahlungen</translation> </message> <message> - <source>Generate Bech32 address</source> - <translation>Erzeuge Bech32 Adresse</translation> + <source>&Request payment</source> + <translation>&Zahlung anfordern</translation> </message> <message> <source>Show the selected request (does the same as double clicking an entry)</source> @@ -1983,6 +2013,10 @@ <translation>Nachricht</translation> </message> <message> + <source>Wallet</source> + <translation>Wallet</translation> + </message> + <message> <source>Resulting URI too long, try to reduce the text for label / message.</source> <translation>Resultierende URI ist zu lang, bitte den Text für Bezeichnung/Nachricht kürzen.</translation> </message> @@ -2097,12 +2131,16 @@ <translation>Transaktionsgebühreneinstellungen ausblenden</translation> </message> <message> - <source>per kilobyte</source> - <translation>pro Kilobyte</translation> + <source>Specify a custom fee per kB (1,000 bytes) of the transaction's virtual size. + +Note: Since the fee is calculated on a per-byte basis, a fee of "100 satoshis per kB" for a transaction size of 500 bytes (half of 1 kB) would ultimately yield a fee of only 50 satoshis.</source> + <translation>Geben sie eine angepasste Gebühr pro kB (1.000 Byte) virtueller Größe der Transaktion an. + +Hinweis: Eine Gebühr von "100 Satoshis pro kB" bei einer Größe der Transaktion von 500 Byte (einem halben kB) würde eine Gebühr von 50 Satoshis ergeben, da die Gebühr pro Byte berechnet wird.</translation> </message> <message> - <source>If the custom fee is set to 1000 satoshis and the transaction is only 250 bytes, then "per kilobyte" only pays 250 satoshis in fee, while "total at least" pays 1000 satoshis. For transactions bigger than a kilobyte both pay by kilobyte.</source> - <translation>Wenn die benutzerdefinierte Gebühr 1000 Satoshis beträgt und die Transaktion nur 250 Byte groß ist, wird bei Auswahl von "pro Kilobyte" eine Gebühr in Höhe von 250 Satoshis, bei Auswahl von "Mindestbetrag" eine Gebühr in Höhe von 1000 Satoshis bezahlt. Bei Transaktionen die Größer als ein Kilobyte sind, werden bei beiden Optionen die Gebühren pro Kilobyte bezahlt.</translation> + <source>per kilobyte</source> + <translation>pro Kilobyte</translation> </message> <message> <source>Hide</source> @@ -2154,7 +2192,7 @@ </message> <message> <source>With Replace-By-Fee (BIP-125) you can increase a transaction's fee after it is sent. Without this, a higher fee may be recommended to compensate for increased transaction delay risk.</source> - <translation>Mit Replace-By-Fee (BIP-125) kann die Transaktionsgebühr nach dem senden erhöht werden. Ohne dies wird eine höhere Gebühr empfoohlen um das Risiko einer hohen Transaktionszeit zu reduzieren.</translation> + <translation>Mit Replace-By-Fee (BIP-125) kann die Transaktionsgebühr nach dem Senden erhöht werden. Ohne dies wird eine höhere Gebühr empfohlen, um das Risiko einer hohen Transaktionszeit zu reduzieren.</translation> </message> <message> <source>Clear &All</source> @@ -2213,14 +2251,6 @@ <translation>Wollen Sie die Überweisung ausführen?</translation> </message> <message> - <source>added as transaction fee</source> - <translation>als Transaktionsgebühr hinzugefügt</translation> - </message> - <message> - <source>Total Amount %1</source> - <translation>Gesamtbetrag %1</translation> - </message> - <message> <source>or</source> <translation>oder</translation> </message> @@ -2229,10 +2259,26 @@ <translation>Du kannst die Gebühr später erhöhen (Zeigt Replace-By-Fee, BIP-125).</translation> </message> <message> + <source>from wallet %1</source> + <translation>aus Brieftasche %1</translation> + </message> + <message> + <source>Please, review your transaction.</source> + <translation>Bitte überprüfen sie ihre Transaktion. </translation> + </message> + <message> + <source>Transaction fee</source> + <translation>Transaktionsgebühr</translation> + </message> + <message> <source>Not signalling Replace-By-Fee, BIP-125.</source> <translation>Replace-By-Fee, BIP-125 wird nicht angezeigt.</translation> </message> <message> + <source>Total Amount</source> + <translation>Gesamtbetrag</translation> + </message> + <message> <source>Confirm send coins</source> <translation>Überweisung bestätigen</translation> </message> @@ -2574,10 +2620,6 @@ <translation>steht im Konflikt mit einer Transaktion mit %1 Bestätigungen</translation> </message> <message> - <source>%1/offline</source> - <translation>%1/offline</translation> - </message> - <message> <source>0/unconfirmed, %1</source> <translation>%1/unbestätigt</translation> </message> @@ -2606,14 +2648,6 @@ <translation>Status</translation> </message> <message> - <source>, has not been successfully broadcast yet</source> - <translation>, wurde noch nicht erfolgreich übertragen</translation> - </message> - <message numerus="yes"> - <source>, broadcast through %n node(s)</source> - <translation><numerusform>, verteilt durch %n Knoten</numerusform><numerusform>, verteilt durch %n Knoten</numerusform></translation> - </message> - <message> <source>Date</source> <translation>Datum</translation> </message> @@ -2698,6 +2732,10 @@ <translation>Gesamte Transaktionsgröße</translation> </message> <message> + <source>Transaction virtual size</source> + <translation>Virtuelle Größe der Transaktion</translation> + </message> + <message> <source>Output index</source> <translation>Ausgabeindex</translation> </message> @@ -2768,10 +2806,6 @@ <translation>Offen bis %1</translation> </message> <message> - <source>Offline</source> - <translation>Offline</translation> - </message> - <message> <source>Unconfirmed</source> <translation>Unbestätigt</translation> </message> @@ -2796,10 +2830,6 @@ <translation>Unreif (%1 Bestätigungen, wird verfügbar sein nach %2)</translation> </message> <message> - <source>This block was not received by any other nodes and will probably not be accepted!</source> - <translation>Dieser Block wurde vom Netzwerk nicht angenommen und wird wahrscheinlich nicht bestätigt werden!</translation> - </message> - <message> <source>Generated but not accepted</source> <translation>Generiert, aber nicht akzeptiert</translation> </message> @@ -3110,38 +3140,18 @@ <source>The wallet data was successfully saved to %1.</source> <translation>Speichern der Wallet-Daten nach %1 war erfolgreich.</translation> </message> + <message> + <source>Cancel</source> + <translation>Abbrechen</translation> + </message> </context> <context> <name>bitcoin-core</name> <message> - <source>Options:</source> - <translation>Optionen:</translation> - </message> - <message> - <source>Specify data directory</source> - <translation>Datenverzeichnis festlegen</translation> - </message> - <message> - <source>Connect to a node to retrieve peer addresses, and disconnect</source> - <translation>Mit dem angegebenen Knoten verbinden, um Adressen von Gegenstellen abzufragen, danach trennen</translation> - </message> - <message> - <source>Specify your own public address</source> - <translation>Die eigene öffentliche Adresse angeben</translation> - </message> - <message> - <source>Accept command line and JSON-RPC commands</source> - <translation>Kommandozeilen- und JSON-RPC-Befehle annehmen</translation> - </message> - <message> <source>Distributed under the MIT software license, see the accompanying file %s or %s</source> <translation>Veröffentlicht unter der MIT-Softwarelizenz, siehe beiligende Datei %s oder %s.</translation> </message> <message> - <source>If <category> is not supplied or if <category> = 1, output all debugging information.</source> - <translation>Wenn <category> nicht angegeben wird oder <category>=1, jegliche Debugginginformationen ausgeben.</translation> - </message> - <message> <source>Prune configured below the minimum of %d MiB. Please use a higher number.</source> <translation>Kürzungsmodus wurde kleiner als das Minimum in Höhe von %d MiB konfiguriert. Bitte verwenden Sie einen größeren Wert.</translation> </message> @@ -3158,18 +3168,10 @@ <translation>Fehler: Ein schwerer interner Fehler ist aufgetreten, siehe debug.log für Details.</translation> </message> <message> - <source>Fee (in %s/kB) to add to transactions you send (default: %s)</source> - <translation>Gebühr (in %s/kB), die von Ihnen gesendeten Transaktionen hinzugefügt wird (Standard: %s)</translation> - </message> - <message> <source>Pruning blockstore...</source> <translation>Kürze Blockspeicher...</translation> </message> <message> - <source>Run in the background as a daemon and accept commands</source> - <translation>Als Hintergrunddienst ausführen und Befehle annehmen</translation> - </message> - <message> <source>Unable to start HTTP server. See debug log for details.</source> <translation>Kann HTTP Server nicht starten. Siehe debug log für Details.</translation> </message> @@ -3182,22 +3184,6 @@ <translation>Die %s-Entwickler</translation> </message> <message> - <source>A fee rate (in %s/kB) that will be used when fee estimation has insufficient data (default: %s)</source> - <translation>Eine Transaktionsgebühr (in %s/kB) wird genutzt, wenn für die Gebührenschützung zu wenig Daten vorliegen (Standardwert: %s)</translation> - </message> - <message> - <source>Accept relayed transactions received from whitelisted peers even when not relaying transactions (default: %d)</source> - <translation>Immer übermittelte Transaktionen von freigegebenen Peers akzeptieren, auch wenn keine Transaktionen übermittelt werden (Standard: %d)</translation> - </message> - <message> - <source>Add a node to connect to and attempt to keep the connection open (see the `addnode` RPC command help for more info)</source> - <translation>Mit dem angegebenen Knoten verbinden und versuchen die Verbindung aufrecht zu erhalten (Siehe die "addnode" RPC Kommando Hilfe für mehr Information)</translation> - </message> - <message> - <source>Bind to given address and always listen on it. Use [host]:port notation for IPv6</source> - <translation>An die angegebene Adresse binden und immer abhören. Für IPv6 "[Host]:Port"-Notation verwenden</translation> - </message> - <message> <source>Cannot obtain a lock on data directory %s. %s is probably already running.</source> <translation>Datenverzeichnis %s kann nicht gesperrt werden. Evtl. wurde %s bereits gestartet.</translation> </message> @@ -3206,42 +3192,10 @@ <translation>Kann keine Verbindungen herstellen und addrman gleichzeitig ausgehende Verbindungen suchen lassen.</translation> </message> <message> - <source>Connect only to the specified node(s); -connect=0 disables automatic connections (the rules for this peer are the same as for -addnode)</source> - <translation>Stellt lediglich die Verbindungen zum/zu den spezifischen Knoten her; -connect=0 deaktiviert die automatische Verbindungsherstellung (Die Regel für diesen Knoten ist die selbe wie für -addnode)</translation> - </message> - <message> - <source>Delete all wallet transactions and only recover those parts of the blockchain through -rescan on startup</source> - <translation>Alle Wallet-Transaktionen löschen und nur diese Teilbereiche der Blockkette durch -rescan beim Starten wiederherstellen</translation> - </message> - <message> <source>Error reading %s! All keys read correctly, but transaction data or address book entries might be missing or incorrect.</source> <translation>Lesen von %s fehlgeschlagen! Alle Schlüssel wurden korrekt gelesen, Transaktionsdaten bzw. Adressbucheinträge fehlen aber möglicherweise oder sind inkorrekt.</translation> </message> <message> - <source>Exclude debugging information for a category. Can be used in conjunction with -debug=1 to output debug logs for all categories except one or more specified categories.</source> - <translation>Debugging-Informationen für eine Kategorie ausschließen. Kann in Verbindung mit -debug = 1 verwendet werden, um Debug-Logs für alle Kategorien auszugeben, mit Ausnahme einer oder mehrerer spezifizierter Kategorien.</translation> - </message> - <message> - <source>Execute command when a wallet transaction changes (%s in cmd is replaced by TxID)</source> - <translation>Befehl ausführen wenn sich eine Wallet-Transaktion verändert (%s im Befehl wird durch die Transaktions-ID ersetzt)</translation> - </message> - <message> - <source>Extra transactions to keep in memory for compact block reconstructions (default: %u)</source> - <translation>Zusätzliche Transaktionen für kompakten Block-Nachbau im Speicher vorhalten (default: %u)</translation> - </message> - <message> - <source>If this block is in the chain assume that it and its ancestors are valid and potentially skip their script verification (0 to verify all, default: %s, testnet: %s)</source> - <translation>Sofern dieser Block Bestandteil der Blockchain ist, nehme an, dass er und seine Vorgänger gültig sind und überspringe ggf. dessen Skriptverifikation (0 um alle zu verifizieren, default: %s, testnet: %s)</translation> - </message> - <message> - <source>Maximum allowed median peer time offset adjustment. Local perspective of time may be influenced by peers forward or backward by this amount. (default: %u seconds)</source> - <translation>Maximal zulässige mediane Peer-Zeit-Offset-Einstellung. Lokale Perspektive der Zeit kann von Peers vorwärts oder rückwärts um diesen Betrag beeinflusst werden. (Voreinstellung: %u Sekunden)</translation> - </message> - <message> - <source>Maximum total fees (in %s) to use in a single wallet transaction or raw transaction; setting this too low may abort large transactions (default: %s)</source> - <translation>Maximale Gesamtgebühr (in %s) in einer Börsentransaktion; wird dies zu niedrig gesetzten können große Transaktionen abgebrochen werden (Standard: %s)</translation> - </message> - <message> <source>Please check that your computer's date and time are correct! If your clock is wrong, %s will not work properly.</source> <translation>Bitte korrigieren Sie die Datums- und Uhrzeiteinstellungen Ihres Computers, da %s ansonsten nicht ordnungsgemäß funktionieren wird.</translation> </message> @@ -3250,22 +3204,6 @@ <translation>Wenn sie %s nützlich finden, sind Helfer sehr gern gesehen. Besuchen Sie %s um mehr über das Softwareprojekt zu erfahren.</translation> </message> <message> - <source>Query for peer addresses via DNS lookup, if low on addresses (default: 1 unless -connect used)</source> - <translation>Adressen von Gegenstellen via DNS-Namensauflösung finden, falls zu wenige Adressen verfügbar sind (Standard: 1, außer bei -connect)</translation> - </message> - <message> - <source>Reduce storage requirements by enabling pruning (deleting) of old blocks. This allows the pruneblockchain RPC to be called to delete specific blocks, and enables automatic pruning of old blocks if a target size in MiB is provided. This mode is incompatible with -txindex and -rescan. Warning: Reverting this setting requires re-downloading the entire blockchain. (default: 0 = disable pruning blocks, 1 = allow manual pruning via RPC, >%u = automatically prune block files to stay under the specified target size in MiB)</source> - <translation>Speicherplatzanforderung durch Kürzen (Pruning) alter Blöcke reduzieren. Dies erlaubt das Aufrufen des sogenannten Pruneblockchain RPC zum Löschen spezifischer Blöcke und und aktiviert das automatische Pruning alter Blöcke, sofern eine Zielgröße in MIB angegeben wird. Dieser Modus ist nicht mit -txindex und -resacan kompatibel. Warnung: Das Rücksetzen dieser Einstellung erfordert das erneute Herunterladen der gesamten Blockchain. (Standard: 0 = deaktiviert das Pruning, 1 = erlaubt manuelles Pruning via RPC, >%u = automatisches Pruning der Blockdateien, um angegebene Maximalgröße nicht zu überschreiten)</translation> - </message> - <message> - <source>Set lowest fee rate (in %s/kB) for transactions to be included in block creation. (default: %s)</source> - <translation>Niedrigste Gebühr (in %s/kB) für Transaktionen einstellen, die bei der Blockerzeugung berücksichtigt werden sollen. (default: %s)</translation> - </message> - <message> - <source>Set the number of script verification threads (%u to %d, 0 = auto, <0 = leave that many cores free, default: %d)</source> - <translation>Maximale Anzahl an Skript-Verifizierungs-Threads festlegen (%u bis %d, 0 = automatisch, <0 = so viele Kerne frei lassen, Standard: %d)</translation> - </message> - <message> <source>The block database contains a block which appears to be from the future. This may be due to your computer's date and time being set incorrectly. Only rebuild the block database if you are sure that your computer's date and time are correct</source> <translation>Die Block-Datenbank enthält einen Block, der in der Zukunft auftaucht. Dies kann daran liegen, dass die Systemzeit Ihres Computers falsch eingestellt ist. Stellen Sie die Block-Datenbank nur wieder her, wenn Sie sich sicher sind, dass Ihre Systemzeit korrekt eingestellt ist.</translation> </message> @@ -3286,18 +3224,6 @@ <translation>Sie müssen die Datenbank mit Hilfe von -reindex neu aufbauen, um zum ungekürzten Modus zurückzukehren. Dies erfordert, dass die gesamte Blockkette erneut heruntergeladen wird.</translation> </message> <message> - <source>Use UPnP to map the listening port (default: 1 when listening and no -proxy)</source> - <translation>UPnP verwenden, um eine Portweiterleitung einzurichten (Standard: 1, wenn abgehört wird und -proxy nicht gesetzt ist)</translation> - </message> - <message> - <source>Username and hashed password for JSON-RPC connections. The field <userpw> comes in the format: <USERNAME>:<SALT>$<HASH>. A canonical python script is included in share/rpcuser. The client then connects normally using the rpcuser=<USERNAME>/rpcpassword=<PASSWORD> pair of arguments. This option can be specified multiple times</source> - <translation>Benutzername und gehashtes Passwort für JSON-RPC Verbindungen. Das Feld <userpw> kommt im Format: <USERNAME>:<SALT>$<HASH>. Ein kanonisches Pythonskript ist in share/rpcuser inbegriffen. Der client benutzt wie gehabt, die rpcuser/rpcpassword Parameter. Diese Option kann mehrere Male spezifiziert werden</translation> - </message> - <message> - <source>Wallet will not create transactions that violate mempool chain limits (default: %u)</source> - <translation>Das Wallet erzeugt keine Transaktionen, die das Mempool Chain Limit überschreiten (Standardeinstellung: %u)</translation> - </message> - <message> <source>Warning: The network does not appear to fully agree! Some miners appear to be experiencing issues.</source> <translation>Warnung: Das Netzwerk scheint nicht vollständig übereinzustimmen! Einige Miner scheinen Probleme zu haben.</translation> </message> @@ -3306,10 +3232,6 @@ <translation>Warnung: Wir scheinen nicht vollständig mit unseren Gegenstellen übereinzustimmen! Sie oder die anderen Knoten müssen unter Umständen Ihre Client-Software aktualisieren.</translation> </message> <message> - <source>Whether to save the mempool on shutdown and load on restart (default: %u)</source> - <translation>Gibt an, ob der mempool beim Beenden gespeichert und beim Starten wieder geladen werden soll (Standard: %u)</translation> - </message> - <message> <source>%d of last 100 blocks have unexpected version</source> <translation>%d der letzten 100 Blöcke haben eine unerwartete Version</translation> </message> @@ -3322,42 +3244,14 @@ <translation>-maxmempool muss mindestens %d MB betragen</translation> </message> <message> - <source><category> can be:</source> - <translation><category> kann sein:</translation> - </message> - <message> - <source>Accept connections from outside (default: 1 if no -proxy or -connect)</source> - <translation>Eingehende Verbindungen annehmen (Standard: 1, wenn nicht -proxy oder -connect)</translation> - </message> - <message> - <source>Append comment to the user agent string</source> - <translation>Hänge ein Kommentar zur User Agent-Zeichenkette an</translation> - </message> - <message> - <source>Attempt to recover private keys from a corrupt wallet on startup</source> - <translation>Es wird versucht, private Schlüssel beim Starten aus einem beschädigtem Wallet wiederherzustellen</translation> - </message> - <message> - <source>Block creation options:</source> - <translation>Blockerzeugungsoptionen:</translation> - </message> - <message> <source>Cannot resolve -%s address: '%s'</source> <translation>Kann Adresse in -%s nicht auflösen: '%s'</translation> </message> <message> - <source>Chain selection options:</source> - <translation>Chain Auswahloptionen:</translation> - </message> - <message> <source>Change index out of range</source> <translation>Position des Wechselgelds außerhalb des Bereichs</translation> </message> <message> - <source>Connection options:</source> - <translation>Verbindungsoptionen:</translation> - </message> - <message> <source>Copyright (C) %i-%i</source> <translation>Copyright (C) %i-%i</translation> </message> @@ -3366,38 +3260,10 @@ <translation>Beschädigte Blockdatenbank erkannt</translation> </message> <message> - <source>Debugging/Testing options:</source> - <translation>Debugging-/Testoptionen:</translation> - </message> - <message> - <source>Do not load the wallet and disable wallet RPC calls</source> - <translation>Die Wallet nicht laden und Wallet-RPC-Aufrufe deaktivieren</translation> - </message> - <message> <source>Do you want to rebuild the block database now?</source> <translation>Möchten Sie die Blockdatenbank jetzt neu aufbauen?</translation> </message> <message> - <source>Enable publish hash block in <address></source> - <translation>Aktiviere das Veröffentlichen des Hash-Blocks in <address></translation> - </message> - <message> - <source>Enable publish hash transaction in <address></source> - <translation>Aktiviere das Veröffentlichen der Hash-Transaktion in <address></translation> - </message> - <message> - <source>Enable publish raw block in <address></source> - <translation>Aktiviere das Veröffentlichen des Raw-Blocks in <address></translation> - </message> - <message> - <source>Enable publish raw transaction in <address></source> - <translation>Aktiviere das Veröffentlichen der Roh-Transaktion in <address></translation> - </message> - <message> - <source>Enable transaction replacement in the memory pool (default: %u)</source> - <translation>Maximal <n> nicht-verbindbare Transaktionen im Speicher halten (Standard: %u)</translation> - </message> - <message> <source>Error creating %s: You can't create non-HD wallets with this version.</source> <translation>Fehler beim Laden von %s: Sie können HD nicht aktivieren da sie derzeit eine nicht HD Brieftasche besitzen.</translation> </message> @@ -3414,6 +3280,11 @@ <translation>Fehler beim Laden von %s</translation> </message> <message> + <source>Error loading %s: Private keys can only be disabled during creation</source> + <translation>Fehler beim laden von %s: Private Schlüssel können nur bei der Erstellung deaktiviert werden +</translation> + </message> + <message> <source>Error loading %s: Wallet corrupted</source> <translation>Fehler beim Laden von %s: Das Wallet ist beschädigt</translation> </message> @@ -3466,8 +3337,8 @@ <translation>Ungültiger Betrag für -fallbackfee=<amount>: '%s'</translation> </message> <message> - <source>Keep the transaction memory pool below <n> megabytes (default: %u)</source> - <translation>Halten Sie den Transaktionsspeicherpool unter <n> Megabytes (Voreinstellung: %u)</translation> + <source>Upgrading txindex database</source> + <translation>Erneuern der txindex Datenbank</translation> </message> <message> <source>Loading P2P addresses...</source> @@ -3478,26 +3349,10 @@ <translation>Lade Sperrliste...</translation> </message> <message> - <source>Location of the auth cookie (default: data dir)</source> - <translation>Dateiort für das Auth-Cookie (Standard: Datenverzeichnis)</translation> - </message> - <message> <source>Not enough file descriptors available.</source> <translation>Nicht genügend Datei-Deskriptoren verfügbar.</translation> </message> <message> - <source>Only connect to nodes in network <net> (ipv4, ipv6 or onion)</source> - <translation>Nur zu Knoten des Netzwerktyps <net> verbinden (ipv4, ipv6 oder onion)</translation> - </message> - <message> - <source>Print this help message and exit</source> - <translation>Drucke diese Hilfemeldung und beende</translation> - </message> - <message> - <source>Print version and exit</source> - <translation>Gibt die Versionsnummer aus und beendet das Programm</translation> - </message> - <message> <source>Prune cannot be configured with a negative value.</source> <translation>Kürzungsmodus kann nicht mit einem negativen Wert konfiguriert werden.</translation> </message> @@ -3506,14 +3361,6 @@ <translation>Kürzungsmodus ist nicht mit -txindex kompatibel.</translation> </message> <message> - <source>Rebuild chain state and block index from the blk*.dat files on disk</source> - <translation>Blockkettenindex aus aktuellen Dateien blk000??.dat beim Starten wiederaufbauen</translation> - </message> - <message> - <source>Rebuild chain state from the currently indexed blocks</source> - <translation>Blockkettenzustand aus aktuelle indizierten Blöcken wiederaufbauen</translation> - </message> - <message> <source>Replaying blocks...</source> <translation>Blöcke werden nochmal neu verarbeitet ...</translation> </message> @@ -3522,18 +3369,6 @@ <translation>Verifiziere Blöcke...</translation> </message> <message> - <source>Send transactions with full-RBF opt-in enabled (RPC only, default: %u)</source> - <translation>Wähle alle zu sendenden Transaktionen als full-RBF opt-in aktiviert (Ausschließlich RPC, Standard: %u)</translation> - </message> - <message> - <source>Set database cache size in megabytes (%d to %d, default: %d)</source> - <translation>Größe des Datenbankcaches in Megabyte festlegen (%d bis %d, Standard: %d)</translation> - </message> - <message> - <source>Specify wallet file (within data directory)</source> - <translation>Wallet-Datei angeben (innerhalb des Datenverzeichnisses)</translation> - </message> - <message> <source>The source code is available from %s.</source> <translation>Der Quellcode ist von %s verfügbar.</translation> </message> @@ -3546,6 +3381,10 @@ <translation>Kann auf diesem Computer nicht an %s binden. Evtl. wurde %s bereits gestartet.</translation> </message> <message> + <source>Unable to generate keys</source> + <translation>Schlüssel können nicht generiert werden</translation> + </message> + <message> <source>Unsupported argument -benchmark ignored, use -debug=bench.</source> <translation>Nicht unterstütztes Argument -benchmark wurde ignoriert, bitte -debug=bench verwenden.</translation> </message> @@ -3559,15 +3398,7 @@ </message> <message> <source>Upgrading UTXO database</source> - <translation>Aktualisierung der UTXO Datenbank</translation> - </message> - <message> - <source>Use UPnP to map the listening port (default: %u)</source> - <translation>UPnP verwenden, um eine Portweiterleitung einzurichten (Standard: %u)</translation> - </message> - <message> - <source>Use the test chain</source> - <translation>Die Testchain verwenden</translation> + <translation>Aktualisierung der UTXO-Datenbank</translation> </message> <message> <source>User Agent comment (%s) contains unsafe characters.</source> @@ -3578,90 +3409,26 @@ <translation>Verifiziere Blöcke...</translation> </message> <message> - <source>Wallet debugging/testing options:</source> - <translation>Wallet Debugging-/Testoptionen:</translation> - </message> - <message> <source>Wallet needed to be rewritten: restart %s to complete</source> <translation>Wallet musste neu geschrieben werden: starten Sie %s zur Fertigstellung neu</translation> </message> <message> - <source>Wallet options:</source> - <translation>Wallet-Optionen:</translation> - </message> - <message> - <source>Allow JSON-RPC connections from specified source. Valid for <ip> are a single IP (e.g. 1.2.3.4), a network/netmask (e.g. 1.2.3.4/255.255.255.0) or a network/CIDR (e.g. 1.2.3.4/24). This option can be specified multiple times</source> - <translation>JSON-RPC-Verbindungen von der angegeben Quelle erlauben. Gültig für <ip> ist eine einzelne IP-Adresse (z.B. 1.2.3.4), ein Netzwerk bzw. eine Netzmaske (z.B. 1.2.3.4/255.255.255.0), oder die CIDR-Notation (z.B. 1.2.3.4/24). Kann mehrmals angegeben werden.</translation> - </message> - <message> - <source>Bind to given address and whitelist peers connecting to it. Use [host]:port notation for IPv6</source> - <translation>An die angegebene Adresse binden und Gegenstellen, die sich dorthin verbinden, immer zulassen. Für IPv6 "[Host]:Port"-Notation verwenden</translation> - </message> - <message> - <source>Create new files with system default permissions, instead of umask 077 (only effective with disabled wallet functionality)</source> - <translation>Neue Dateien mit Standard-Systemrechten erzeugen, anstatt mit umask 077 (nur mit deaktivierter Walletfunktion nutzbar)</translation> - </message> - <message> - <source>Discover own IP addresses (default: 1 when listening and no -externalip or -proxy)</source> - <translation>Eigene IP-Adressen ermitteln (Standard: 1, wenn abgehört wird und nicht -externalip oder -proxy)</translation> - </message> - <message> <source>Error: Listening for incoming connections failed (listen returned error %s)</source> <translation>Fehler: Abhören nach eingehenden Verbindungen fehlgeschlagen (listen meldete Fehler %s)</translation> </message> <message> - <source>Execute command when a relevant alert is received or we see a really long fork (%s in cmd is replaced by message)</source> - <translation>Befehl ausführen wenn ein relevanter Alarm empfangen wird oder wir einen wirklich langen Fork entdecken (%s im Befehl wird durch die Nachricht ersetzt)</translation> - </message> - <message> - <source>Fees (in %s/kB) smaller than this are considered zero fee for relaying, mining and transaction creation (default: %s)</source> - <translation>Niedrigere Gebühren (in %s/Kb) als diese werden bei der Transaktionserstellung als gebührenfrei angesehen (Standard: %s)</translation> - </message> - <message> - <source>If paytxfee is not set, include enough fee so transactions begin confirmation on average within n blocks (default: %u)</source> - <translation>Wenn -paytxfee nicht festgelegt wurde Gebühren einschließen, so dass mit der Bestätigung von Transaktionen im Schnitt innerhalb von n Blöcken begonnen wird (Standard: %u)</translation> - </message> - <message> <source>Invalid amount for -maxtxfee=<amount>: '%s' (must be at least the minrelay fee of %s to prevent stuck transactions)</source> <translation>Ungültiger Betrag für -maxtxfee=<amount>: '%s' (muss mindestens die minimale Weiterleitungsgebühr in Höhe von %s sein, um zu verhindern dass Transaktionen nicht bearbeitet werden)</translation> </message> <message> - <source>Maximum size of data in data carrier transactions we relay and mine (default: %u)</source> - <translation>Maximale Datengröße in "Data Carrier"-Transaktionen die weitergeleitet und erarbeitet werden (Standard: %u)</translation> - </message> - <message> - <source>Randomize credentials for every proxy connection. This enables Tor stream isolation (default: %u)</source> - <translation>Zufällige Anmeldedaten für jede Proxyverbindung verwenden. Dies aktiviert Tor-Datenflussisolation (Standard: %u)</translation> - </message> - <message> <source>The transaction amount is too small to send after the fee has been deducted</source> <translation>Der Transaktionsbetrag ist zum senden zu niedrig, nachdem die Gebühr abgezogen wurde.</translation> </message> <message> - <source>Whitelisted peers cannot be DoS banned and their transactions are always relayed, even if they are already in the mempool, useful e.g. for a gateway</source> - <translation>Erlaubte Gegenstellen werden nicht für DoS-Attacken gesperrt und ihre Transkationen werden immer weitergeleitet, auch wenn sie sich bereits im Speicherpool befinden, was z.B. für Gateways sinnvoll ist.</translation> - </message> - <message> <source>You need to rebuild the database using -reindex to go back to unpruned mode. This will redownload the entire blockchain</source> <translation>Sie müssen die Datenbank mit Hilfe von -reindex neu aufbauen, um zum ungekürzten Modus zurückzukehren. Dies erfordert, dass die gesamte Blockkette erneut heruntergeladen wird.</translation> </message> <message> - <source>(default: %u)</source> - <translation>(Standard: %u)</translation> - </message> - <message> - <source>Accept public REST requests (default: %u)</source> - <translation>Öffentliche REST-Anfragen annehmen (Standard: %u)</translation> - </message> - <message> - <source>Automatically create Tor hidden service (default: %d)</source> - <translation>Automatisch versteckten Tor-Dienst erstellen (Standard: %d)</translation> - </message> - <message> - <source>Connect through SOCKS5 proxy</source> - <translation>Über einen SOCKS5-Proxy &verbinden</translation> - </message> - <message> <source>Error loading %s: You can't disable HD on an already existing HD wallet</source> <translation>Fehler beim Laden von %s: Sie können die hierarchisch deterministische Schlüsselgeneration (HD) für eine bereits existierende HD-Brieftasche nicht deaktivieren</translation> </message> @@ -3674,10 +3441,6 @@ <translation>Fehler bei der Aktualisierung einer Kettenstatus-Datenbank</translation> </message> <message> - <source>Imports blocks from external blk000??.dat file on startup</source> - <translation>Blöcke beim Starten aus externer Datei blk000??.dat importieren</translation> - </message> - <message> <source>Information</source> <translation>Hinweis</translation> </message> @@ -3698,42 +3461,14 @@ <translation>Ungültige Netzmaske angegeben in -whitelist: '%s'</translation> </message> <message> - <source>Keep at most <n> unconnectable transactions in memory (default: %u)</source> - <translation>Maximal <n> nicht-verbindbare Transaktionen im Speicher halten (Standard: %u)</translation> - </message> - <message> <source>Need to specify a port with -whitebind: '%s'</source> <translation>Angabe eines Ports benötigt für -whitebind: '%s'</translation> </message> <message> - <source>Node relay options:</source> - <translation>Knoten-Weiterleitungsoptionen:</translation> - </message> - <message> - <source>RPC server options:</source> - <translation>RPC-Serveroptionen:</translation> - </message> - <message> <source>Reducing -maxconnections from %d to %d, because of system limitations.</source> <translation>Reduziere -maxconnections von %d zu %d, aufgrund von Systemlimitierungen.</translation> </message> <message> - <source>Rescan the block chain for missing wallet transactions on startup</source> - <translation>Blockkette beim Starten erneut nach fehlenden Wallet-Transaktionen durchsuchen</translation> - </message> - <message> - <source>Send trace/debug info to console instead of debug.log file</source> - <translation>Rückverfolgungs- und Debuginformationen an die Konsole senden, anstatt sie in debug.log zu schreiben</translation> - </message> - <message> - <source>Show all debugging options (usage: --help -help-debug)</source> - <translation>Zeige alle Debuggingoptionen (Benutzung: --help -help-debug)</translation> - </message> - <message> - <source>Shrink debug.log file on client startup (default: 1 when no -debug)</source> - <translation>Protokolldatei debug.log beim Starten des Clients kürzen (Standard: 1, wenn kein -debug)</translation> - </message> - <message> <source>Signing transaction failed</source> <translation>Signierung der Transaktion fehlgeschlagen</translation> </message> @@ -3750,6 +3485,12 @@ <translation>Angegebenes Verzeichniss "%s" ist kein Verzeichniss</translation> </message> <message> + <source>Specified blocks directory "%s" does not exist. +</source> + <translation>Angegebenes 'blocks'-Verzeichnis "%s" existiert nicht. +</translation> + </message> + <message> <source>The transaction amount is too small to pay the fee</source> <translation>Der Transaktionsbetrag ist zu niedrig, um die Gebühr zu bezahlen.</translation> </message> @@ -3758,14 +3499,6 @@ <translation>Dies ist experimentelle Software.</translation> </message> <message> - <source>Tor control port password (default: empty)</source> - <translation>TOR Kontrollport Passwort (Standard: leer)</translation> - </message> - <message> - <source>Tor control port to use if onion listening enabled (default: %s)</source> - <translation>Zu benutzender TOR Kontrollport wenn Onion Auflistung aktiv ist (Standard: %s)</translation> - </message> - <message> <source>Transaction amount too small</source> <translation>Transaktionsbetrag zu niedrig</translation> </message> @@ -3786,14 +3519,6 @@ <translation>Anfänglicher Schlüssel kann nicht generiert werden.</translation> </message> <message> - <source>Upgrade wallet to latest format on startup</source> - <translation>Wallet beim Starten auf das neueste Format aktualisieren</translation> - </message> - <message> - <source>Username for JSON-RPC connections</source> - <translation>Benutzername für JSON-RPC-Verbindungen</translation> - </message> - <message> <source>Verifying wallet(s)...</source> <translation>Verifiziere Wallet(s)...</translation> </message> @@ -3810,110 +3535,18 @@ <translation>Warnung: Unbekannte neue Regeln aktiviert (Versionsbit %i)</translation> </message> <message> - <source>Whether to operate in a blocks only mode (default: %u)</source> - <translation>Legt fest ob nur Blöcke Modus aktiv sein soll (Standard: %u)</translation> - </message> - <message> - <source>You need to rebuild the database using -reindex to change -txindex</source> - <translation>Sie müssen die Datenbank mit Hilfe von -reindex neu aufbauen, um -txindex zu ändern</translation> - </message> - <message> <source>Zapping all transactions from wallet...</source> <translation>Lösche alle Transaktionen aus Wallet...</translation> </message> <message> - <source>ZeroMQ notification options:</source> - <translation>ZeroMQ-Benachrichtigungsoptionen:</translation> - </message> - <message> - <source>Password for JSON-RPC connections</source> - <translation>Passwort für JSON-RPC-Verbindungen</translation> - </message> - <message> - <source>Execute command when the best block changes (%s in cmd is replaced by block hash)</source> - <translation>Befehl ausführen wenn der beste Block wechselt (%s im Befehl wird durch den Hash des Blocks ersetzt)</translation> - </message> - <message> - <source>Allow DNS lookups for -addnode, -seednode and -connect</source> - <translation>Erlaube DNS-Abfragen für -addnode, -seednode und -connect</translation> - </message> - <message> - <source>(1 = keep tx meta data e.g. account owner and payment request information, 2 = drop tx meta data)</source> - <translation>(1 = TX-Metadaten wie z.B. Accountbesitzer und Zahlungsanforderungsinformationen behalten, 2 = TX-Metadaten verwerfen)</translation> - </message> - <message> <source>-maxtxfee is set very high! Fees this large could be paid on a single transaction.</source> <translation>-maxtxfee ist auf einen sehr hohen Wert festgelegt! Gebühren dieser Höhe könnten für eine einzelne Transaktion bezahlt werden.</translation> </message> <message> - <source>Bind to given address to listen for JSON-RPC connections. This option is ignored unless -rpcallowip is also passed. Port is optional and overrides -rpcport. Use [host]:port notation for IPv6. This option can be specified multiple times (default: 127.0.0.1 and ::1 i.e., localhost, or if -rpcallowip has been specified, 0.0.0.0 and :: i.e., all addresses)</source> - <translation>An die angegebene Adresse binden und auf JSON-RPC-Verbindungen abhören. Diese Option wird ignoriert wenn '-rpcallowip' nicht auch angegeben ist. Die Angabe des Ports ist optional und überschreibt den Parameter '-rpcport'. Benutzen Sie die [host]:port Annotation für IPv6. Diese Option kann mehrmals angegeben werden. (Standard: 127.0.0.1 und ::1, z.B. localhost; Wenn '-rpcallowip' angegeben wurde werden alle Adressen verwendet, also 0.0.0.0 und ::)</translation> - </message> - <message> - <source>Do not keep transactions in the mempool longer than <n> hours (default: %u)</source> - <translation>Die Transaktion nicht länger im Speicherpool behalten als <n> Stunden (Standard: %u)</translation> - </message> - <message> - <source>Equivalent bytes per sigop in transactions for relay and mining (default: %u)</source> - <translation>Maximale Datengröße in "Data Carrier"-Transaktionen die weitergeleitet und erarbeitet werden (Standard: %u)</translation> - </message> - <message> <source>Error loading %s: You can't enable HD on an already existing non-HD wallet</source> <translation>Fehler beim Herunterladen von %s: Sie können keine hierarchisch deterministische Schlüsselgeneration (HD) auf eine bereits existierende nicht-HD Brieftasche (Wallet) aktivieren.</translation> </message> <message> - <source>Error loading wallet %s. -wallet parameter must only specify a filename (not a path).</source> - <translation>Fehler beim Laden der Brieftasche %s. Der Parameter -wallet darf nur ein Dateiname sein (kein Dateipfad).</translation> - </message> - <message> - <source>Fees (in %s/kB) smaller than this are considered zero fee for transaction creation (default: %s)</source> - <translation>Niedrigere Gebühren (in %s/Kb) als diese werden bei der Transaktionserstellung als gebührenfrei angesehen (Standard: %s)</translation> - </message> - <message> - <source>Force relay of transactions from whitelisted peers even if they violate local relay policy (default: %d)</source> - <translation>Leite Transaktionen von Peers auf der Positivliste auf jeden Fall weiter, auch wenn sie die lokale Weiterleitungsregeln verletzen (Standardeinstellung: %d)</translation> - </message> - <message> - <source>How thorough the block verification of -checkblocks is (0-4, default: %u)</source> - <translation>Legt fest, wie gründlich die Blockverifikation von -checkblocks ist (0-4, Standard: %u)</translation> - </message> - <message> - <source>Maintain a full transaction index, used by the getrawtransaction rpc call (default: %u)</source> - <translation>Einen vollständigen Transaktionsindex führen, der vom RPC-Befehl "getrawtransaction" genutzt wird (Standard: %u)</translation> - </message> - <message> - <source>Number of seconds to keep misbehaving peers from reconnecting (default: %u)</source> - <translation>Anzahl Sekunden, während denen sich nicht konform verhaltenden Gegenstellen die Wiederverbindung verweigert wird (Standard: %u)</translation> - </message> - <message> - <source>Output debugging information (default: %u, supplying <category> is optional)</source> - <translation>Debugginginformationen ausgeben (Standard: %u, <category> anzugeben ist optional)</translation> - </message> - <message> - <source>Set maximum BIP141 block weight to this * 4. Deprecated, use blockmaxweight</source> - <translation>Setzen von maximalem BIP141 Blockgewicht von * 4. ist veraltet, benutze blockmaxweight</translation> - </message> - <message> - <source>Sets the serialization of raw transaction or block hex returned in non-verbose mode, non-segwit(0) or segwit(1) (default: %d)</source> - <translation>Setzt die Serialisierung von Rohtransaktionen oder Block Hex-Daten auf non-verbose mode, nicht-Segwit(0) oder Segwit(1) (default: %d)</translation> - </message> - <message> - <source>Specify directory to hold wallets (default: <datadir>/wallets if it exists, otherwise <datadir>)</source> - <translation>Spezifiziere das Verzeichnis für das Wallet (Standard:<datadir>/wallets wenn es vorhanden ist, sonst <datadir>)</translation> - </message> - <message> - <source>Specify location of debug log file: this can be an absolute path or a path relative to the data directory (default: %s)</source> - <translation>Verzeichniss für das Debug Logfile: Es kann sich um einen absoluten oder relativen Pfad zum Datenverzeichniss handeln (Standard: %s)</translation> - </message> - <message> - <source>Support filtering of blocks and transaction with bloom filters (default: %u)</source> - <translation>Unterstütze Blöcke und Transaktionen mit Bloomfiltern zu filtern (default: %u)</translation> - </message> - <message> - <source>The fee rate (in %s/kB) that indicates your tolerance for discarding change by adding it to the fee (default: %s). Note: An output is discarded if it is dust at this rate, but we will always discard up to the dust relay fee and a discard fee above that is limited by the fee estimate for the longest target</source> - <translation>Die Transaktionsgebührrate (in %s/kB), die die Toleranz anzeigt für das Abschreiben von Wechselgeld, durch deren Zufügung zur Transaktionsgebühr (Standard: %s). Hinweis: Eine Ausgabe wird abgeschrieben, wenn sie bei Höhe dieser Rate "Staub" ist, aber es wird immer abgeschrieben bis zur Staub-Weiterleitungsgebühr, und eine Abschreibungsgebühr darüber ist begrenzt durch die Gebührenschätzung für das längste Ziel</translation> - </message> - <message> <source>This is the transaction fee you may pay when fee estimates are not available.</source> <translation>Das ist die Transaktionsgebühr, welche du zahlen müsstest, wenn die Gebührenschätzungen nicht verfügbar sind.</translation> </message> @@ -3926,10 +3559,6 @@ <translation>Gesamtlänge des Netzwerkversionstrings (%i) erreicht die maximale Länge (%i). Reduzieren Sie die Nummer oder die Größe von uacomments.</translation> </message> <message> - <source>Tries to keep outbound traffic under the given target (in MiB per 24h), 0 = no limit (default: %d)</source> - <translation>Versucht ausgehenden Datenverkehr unter dem gegebenen Wert zu halten (in MiB pro 24h), 0 = kein Limit (default: %d)</translation> - </message> - <message> <source>Unsupported argument -socks found. Setting SOCKS version isn't possible anymore, only SOCKS5 proxies are supported.</source> <translation>Nicht unterstützter Parameter -socks gefunden. Das Festlegen der SOCKS-Version ist nicht mehr möglich, nur noch SOCKS5-Proxies werden unterstützt.</translation> </message> @@ -3938,118 +3567,22 @@ <translation>Das Argument -whitelistalwaysrelay wird nicht unterstützt und deswegen ignoriert. Benutze -whitelistrelay und/oder -whitelistforcerelay.</translation> </message> <message> - <source>Use separate SOCKS5 proxy to reach peers via Tor hidden services (default: %s)</source> - <translation>Separaten SOCKS5-Proxy verwenden, um Gegenstellen über versteckte Tor-Dienste zu erreichen (Standard: %s)</translation> - </message> - <message> <source>Warning: Unknown block versions being mined! It's possible unknown rules are in effect</source> <translation>Warnung: Unbekannte Blockversion wird durch Mining erzeugt! Es ist möglich, dass unbekannte Regeln in Kraft sind.</translation> </message> <message> - <source>Whitelist peers connecting from the given IP address (e.g. 1.2.3.4) or CIDR notated network (e.g. 1.2.3.0/24). Can be specified multiple times.</source> - <translation>Gegenstellen die sich von der angegebenen IP-Adresse (e.g. 1.2.3.4) oder CIDR Notation (eg. 1.2.3.0/24) aus verbinden immer zulassen. Kann mehrmals angegeben werden.</translation> - </message> - <message> <source>%s is set very high!</source> <translation>%s wurde sehr hoch eingestellt!</translation> </message> <message> - <source>(default: %s)</source> - <translation>(Standard: %s)</translation> - </message> - <message> - <source>Always query for peer addresses via DNS lookup (default: %u)</source> - <translation>Adressen von Gegenstellen immer über DNS-Namensauflösung abfragen (Standard: %u)</translation> - </message> - <message> - <source>Error loading wallet %s. -wallet filename must be a regular file.</source> - <translation>Fehler beim Laden der Brieftasche %s. -wallet Dateiname muss eine normale Datei sein.</translation> - </message> - <message> <source>Error loading wallet %s. Duplicate -wallet filename specified.</source> <translation>Fehler beim Laden der Brieftasche %s. -wallet Dateiname doppelt angegeben.</translation> </message> <message> - <source>Error loading wallet %s. Invalid characters in -wallet filename.</source> - <translation>Fehler beim Laden der Brieftasche %s. -wallet Dateiname enthält ungültige Buchstaben.</translation> - </message> - <message> - <source>How many blocks to check at startup (default: %u, 0 = all)</source> - <translation>Wieviele Blöcke beim Starten geprüft werden sollen (Standard: %u, 0 = alle)</translation> - </message> - <message> - <source>Include IP addresses in debug output (default: %u)</source> - <translation>IP-Adressen in Debugausgabe einschließen (Standard: %u)</translation> - </message> - <message> <source>Keypool ran out, please call keypoolrefill first</source> <translation>Der Keypool ist erschöpft. Bitte rufen Sie zunächst keypoolrefill auf.</translation> </message> <message> - <source>Listen for JSON-RPC connections on <port> (default: %u or testnet: %u)</source> - <translation><port> nach JSON-RPC-Verbindungen abhören (Standard: %u oder Testnetz: %u)</translation> - </message> - <message> - <source>Listen for connections on <port> (default: %u or testnet: %u)</source> - <translation><port> nach Verbindungen abhören (Standard: %u oder Testnetz: %u)</translation> - </message> - <message> - <source>Maintain at most <n> connections to peers (default: %u)</source> - <translation>Maximal <n> Verbindungen zu Gegenstellen aufrechterhalten (Standard: %u)</translation> - </message> - <message> - <source>Make the wallet broadcast transactions</source> - <translation>Die Wallet soll Transaktionen übertragen/broadcasten</translation> - </message> - <message> - <source>Maximum per-connection receive buffer, <n>*1000 bytes (default: %u)</source> - <translation>Maximale Größe des Empfangspuffers pro Verbindung, <n> * 1000 Byte (Standard: %u)</translation> - </message> - <message> - <source>Maximum per-connection send buffer, <n>*1000 bytes (default: %u)</source> - <translation>Maximale Größe des Sendepuffers pro Verbindung, <n> * 1000 Byte (Standard: %u)</translation> - </message> - <message> - <source>Prepend debug output with timestamp (default: %u)</source> - <translation>Debugausgaben einen Zeitstempel voranstellen (Standard: %u)</translation> - </message> - <message> - <source>Relay and mine data carrier transactions (default: %u)</source> - <translation>"Data Carrier"-Transaktionen weiterleiten und erarbeiten (Standard: %u)</translation> - </message> - <message> - <source>Relay non-P2SH multisig (default: %u)</source> - <translation>Nicht-"P2SH-Multisig" weiterleiten (Standard: %u)</translation> - </message> - <message> - <source>Set key pool size to <n> (default: %u)</source> - <translation>Größe des Schlüsselpools festlegen auf <n> (Standard: %u)</translation> - </message> - <message> - <source>Set maximum BIP141 block weight (default: %d)</source> - <translation>Maximales BIP141 Blockgewicht festlegen (Standard: %d)</translation> - </message> - <message> - <source>Set the number of threads to service RPC calls (default: %d)</source> - <translation>Maximale Anzahl an Threads zur Verarbeitung von RPC-Anfragen festlegen (Standard: %d)</translation> - </message> - <message> - <source>Specify configuration file (default: %s)</source> - <translation>Konfigurationsdatei festlegen (Standard: %s)</translation> - </message> - <message> - <source>Specify connection timeout in milliseconds (minimum: 1, default: %d)</source> - <translation>Verbindungzeitüberschreitung in Millisekunden festlegen (Minimum: 1, Standard: %d)</translation> - </message> - <message> - <source>Specify pid file (default: %s)</source> - <translation>PID-Datei festlegen (Standard: %s)</translation> - </message> - <message> - <source>Spend unconfirmed change when sending transactions (default: %u)</source> - <translation>Unbestätigtes Wechselgeld darf beim Senden von Transaktionen ausgegeben werden (Standard: %u)</translation> - </message> - <message> <source>Starting network threads...</source> <translation>Netzwerk-Threads werden gestartet...</translation> </message> @@ -4066,10 +3599,6 @@ <translation>Dies ist die Gebühr, die beim Senden einer Transaktion fällig wird.</translation> </message> <message> - <source>Threshold for disconnecting misbehaving peers (default: %u)</source> - <translation>Schwellenwert, um Verbindungen zu sich nicht konform verhaltenden Gegenstellen zu beenden (Standard: %u)</translation> - </message> - <message> <source>Transaction amounts must not be negative</source> <translation>Transaktionsbeträge dürfen nicht negativ sein.</translation> </message> @@ -4090,6 +3619,26 @@ <translation>Unzureichender Kontostand</translation> </message> <message> + <source>Can't generate a change-address key. Private keys are disabled for this wallet.</source> + <translation>Es kann keinen privater Schlüssel für eine Wechselgeldaddresse generiert werden. Private Schlüssel sind für diese Brieftasche deaktiviert.</translation> + </message> + <message> + <source>Cannot upgrade a non HD split wallet without upgrading to support pre split keypool. Please use -upgradewallet=169900 or -upgradewallet with no version specified.</source> + <translation>Ein Wallet das kein geteiltes HD-Wallet ist, kann kein Upgrade erfahren, wenn nicht auch der Schlüsselpool vor der Teilung ein Upgrade erfahren hat. Bitte benutzen Sie upgradewallet=169900 oder -upgradewallet ohne Angabe einer Version.</translation> + </message> + <message> + <source>Fee estimation failed. Fallbackfee is disabled. Wait a few blocks or enable -fallbackfee.</source> + <translation>Die Gebührenabschätzung schlug fehl. Fallbackfee ist deaktiviert. Warten sie ein paar Blöcke oder aktivieren sie -fallbackfee.</translation> + </message> + <message> + <source>Warning: Private keys detected in wallet {%s} with disabled private keys</source> + <translation>Warnung: Es wurden private Schlüssel in der Brieftasche {%s} entdeckt, welche private Schlüssel jedoch deaktiviert hat.</translation> + </message> + <message> + <source>Cannot write to data directory '%s'; check permissions.</source> + <translation>Es konnte nicht in das Datenverzeichnis '%s' geschrieben werden; Überprüfen sie die Berechtigungen. </translation> + </message> + <message> <source>Loading block index...</source> <translation>Lade Blockindex...</translation> </message> diff --git a/src/qt/locale/bitcoin_el.ts b/src/qt/locale/bitcoin_el.ts index 62a93fa628..ee89afa6ad 100644 --- a/src/qt/locale/bitcoin_el.ts +++ b/src/qt/locale/bitcoin_el.ts @@ -5,6 +5,10 @@ <source>Create a new address</source> <translation>Δημιουργία νέου λογαριασμού</translation> </message> + <message> + <source>&Copy</source> + <translation>&Αντιγραφή</translation> + </message> </context> <context> <name>AddressTableModel</name> @@ -132,6 +136,10 @@ </context> <context> <name>ReceiveRequestDialog</name> + <message> + <source>Wallet</source> + <translation>Πορτοφόλι</translation> + </message> </context> <context> <name>RecentRequestsTableModel</name> diff --git a/src/qt/locale/bitcoin_el_GR.ts b/src/qt/locale/bitcoin_el_GR.ts index fb190a6f96..4557fd85aa 100644 --- a/src/qt/locale/bitcoin_el_GR.ts +++ b/src/qt/locale/bitcoin_el_GR.ts @@ -27,7 +27,11 @@ </message> <message> <source>Delete the currently selected address from the list</source> - <translation>Αντιγραφη της επιλεγμενης διεύθυνσης στο πρόχειρο του συστηματος</translation> + <translation>Διαγραφή της επιλεγμένης διεύθυνσης από τη λίστα</translation> + </message> + <message> + <source>Enter address or label to search</source> + <translation>Αναζήτηση με βάση τη διεύθυνση ή την επιγραφή</translation> </message> <message> <source>Export the data in the current tab to a file</source> @@ -83,7 +87,7 @@ </message> <message> <source>Export Address List</source> - <translation>Εξαγωγή Λίστας Διεύθυνσεων</translation> + <translation>Εξαγωγή Λίστας Διευθύνσεων</translation> </message> <message> <source>Comma separated file (*.csv)</source> @@ -132,6 +136,10 @@ <translation>Επανέλαβε τον νέο κωδικό πρόσβασης</translation> </message> <message> + <source>Show password</source> + <translation>Προβολή κωδικού πρόσβασης</translation> + </message> + <message> <source>Enter the new passphrase to the wallet.<br/>Please use a passphrase of <b>ten or more random characters</b>, or <b>eight or more words</b>.</source> <translation>Εισάγετε το νέο κωδικό πρόσβασης στο πορτοφόλι. <br/>Παρακαλώ χρησιμοποιείστε έναν κωδικό με <b>δέκα ή περισσότερους τυχαίους χαρακτήρες </b>, ή <b>οχτώ ή παραπάνω λέξεις </b>.</translation> </message> @@ -141,15 +149,15 @@ </message> <message> <source>This operation needs your wallet passphrase to unlock the wallet.</source> - <translation>Αυτη η ενεργεία χρειάζεται τον κωδικό του πορτοφολιού για να ξεκλειδώσει το πορτοφόλι.</translation> + <translation>Αυτή η ενέργεια χρειάζεται τον κωδικό του πορτοφολιού για να ξεκλειδώσει το πορτοφόλι.</translation> </message> <message> <source>Unlock wallet</source> - <translation>Ξεκλειδωσε το πορτοφολι</translation> + <translation>Ξεκλείδωσε το πορτοφόλι</translation> </message> <message> <source>This operation needs your wallet passphrase to decrypt the wallet.</source> - <translation>Αυτη η ενεργεια χρειάζεται τον κωδικο του πορτοφολιου για να αποκρυπτογραφησειι το πορτοφόλι.</translation> + <translation>Αυτή η ενέργεια χρειάζεται τον κωδικό του πορτοφολιού για να αποκρυπτογραφήσει το πορτοφόλι.</translation> </message> <message> <source>Decrypt wallet</source> @@ -168,6 +176,10 @@ <translation>Επιβεβαίωσε κρυπτογράφηση πορτοφολιού</translation> </message> <message> + <source>Warning: If you encrypt your wallet and lose your passphrase, you will <b>LOSE ALL OF YOUR BITCOINS</b>!</source> + <translation>Προσόχη! Εάν κρυπτογραφήσεις το πορτοφόλι σου και χάσεις τη φράση αποκατάστασης, θα <b> ΧΑΣΕΙΣ ΟΛΑ ΣΟΥ ΤΑ BITCOIN </b>!</translation> + </message> + <message> <source>Are you sure you wish to encrypt your wallet?</source> <translation>Είστε σίγουρος/η ότι θέλετε να κρυπτογραφήσετε το πορτοφόλι σας;</translation> </message> @@ -177,25 +189,57 @@ </message> <message> <source>%1 will close now to finish the encryption process. Remember that encrypting your wallet cannot fully protect your bitcoins from being stolen by malware infecting your computer.</source> - <translation>%1 θα κλείσει τώρα για να τελειώσει η διαδικασία κρυπτογράφησης. Να θυμάστε ότι κρυπρογραφόντας το πορτοφόλι σας δεν μπορείτε να προστατεύσετε πλήρως τα bitcoin σας απο κλοπή μέσω malware που μπορεί να προσβάλει τον υπολογιστή σας.</translation> + <translation>%1 θα κλείσει τώρα για να τελειώσει η διαδικασία κρυπτογράφησης. Να θυμάστε ότι κρυπτογραφόντας το πορτοφόλι σας δεν μπορείτε να προστατεύσετε πλήρως τα bitcoin σας απο κλοπή μέσω malware που μπορεί να προσβάλει τον υπολογιστή σας.</translation> + </message> + <message> + <source>IMPORTANT: Any previous backups you have made of your wallet file should be replaced with the newly generated, encrypted wallet file. For security reasons, previous backups of the unencrypted wallet file will become useless as soon as you start using the new, encrypted wallet.</source> + <translation>ΣΗΜΑΝΤΙΚΟ: Τα προηγούμενα αντίγραφα ασφαλείας που έχετε κάνει από το αρχείο του πορτοφόλιου σας θα πρέπει να αντικατασταθουν με το νέο που δημιουργείται, κρυπτογραφημένο αρχείο πορτοφόλιου. Για λόγους ασφαλείας, τα προηγούμενα αντίγραφα ασφαλείας του μη κρυπτογραφημένου αρχείου πορτοφόλιου θα καταστουν άχρηστα μόλις αρχίσετε να χρησιμοποιείτε το νέο κρυπτογραφημένο πορτοφόλι. </translation> </message> <message> <source>Wallet encryption failed</source> <translation>Η κρυπτογράφηση του πορτοφολιού απέτυχε</translation> </message> <message> + <source>Wallet encryption failed due to an internal error. Your wallet was not encrypted.</source> + <translation>Η κρυπτογράφηση του πορτοφολιού απέτυχε λογω εσωτερικού σφάλματος. Το πορτοφολι δεν κρυπτογραφηθηκε.</translation> + </message> + <message> + <source>The supplied passphrases do not match.</source> + <translation>Οι εισαχθέντες κωδικοί δεν ταιριάζουν.</translation> + </message> + <message> <source>Wallet unlock failed</source> - <translation>Το Ξεκλείδωμα του Πορτοφολιού Απέτυχε</translation> + <translation>Το ξεκλείδωμα του πορτοφολιού απέτυχε</translation> </message> - </context> + <message> + <source>The passphrase entered for the wallet decryption was incorrect.</source> + <translation>Ο κωδικος που εισήχθη για την αποκρυπτογραφηση του πορτοφολιού ήταν λαθος.</translation> + </message> + <message> + <source>Wallet decryption failed</source> + <translation> Η αποκρυπτογράφηση του πορτοφολιού απέτυχε </translation> + </message> + <message> + <source>Wallet passphrase was successfully changed.</source> + <translation>Η φράση πρόσβασης άλλαξε επιτυχώς</translation> + </message> + <message> + <source>Warning: The Caps Lock key is on!</source> + <translation>Προσοχη: το πλήκτρο Caps Lock είναι ενεργο.</translation> + </message> +</context> <context> <name>BanTableModel</name> + <message> + <source>IP/Netmask</source> + <translation>IP/Netmask</translation> + </message> </context> <context> <name>BitcoinGUI</name> <message> <source>Sign &message...</source> - <translation>Υπογραφή &Μηνύματος...</translation> + <translation>Υπογραφή &μηνύματος...</translation> </message> <message> <source>Synchronizing with network...</source> @@ -227,13 +271,17 @@ </message> <message> <source>Quit application</source> - <translation>Εξοδος από την εφαρμογή</translation> + <translation>Έξοδος από την εφαρμογή</translation> </message> <message> <source>&About %1</source> <translation>&Περί %1</translation> </message> <message> + <source>Show information about %1</source> + <translation>Εμφάνισε πληροφορίες σχετικά με %1</translation> + </message> + <message> <source>About &Qt</source> <translation>Σχετικά με &Qt</translation> </message> @@ -246,6 +294,10 @@ <translation>&Επιλογές...</translation> </message> <message> + <source>Modify configuration options for %1</source> + <translation>Επεργασία ρυθμισεων επιλογών για το %1</translation> + </message> + <message> <source>&Encrypt Wallet...</source> <translation>&Κρυπτογράφησε το πορτοφόλι</translation> </message> @@ -255,7 +307,7 @@ </message> <message> <source>&Change Passphrase...</source> - <translation>&Άλλαξε κωδικο πρόσβασης</translation> + <translation>&Άλλαξε Φράση Πρόσβασης</translation> </message> <message> <source>&Sending addresses...</source> @@ -270,8 +322,24 @@ <translation>'Ανοιγμα &URI</translation> </message> <message> + <source>Wallet:</source> + <translation>Πορτοφόλι</translation> + </message> + <message> + <source>Click to disable network activity.</source> + <translation>Κάντε κλικ για να απενεργοποιήσετε το δίκτυο.</translation> + </message> + <message> + <source>Network activity disabled.</source> + <translation>Η δραστηριότητα δικτύου είναι απενεργοποιημένη.</translation> + </message> + <message> + <source>Click to enable network activity again.</source> + <translation>Κάντε κλικ για να ενεργοποιήσετε τo δίκτυο ξανά.</translation> + </message> + <message> <source>Reindexing blocks on disk...</source> - <translation>Φόρτωση ευρετηρίου μπλοκ στον σκληρο δισκο...</translation> + <translation>Φόρτωση ευρετηρίου μπλοκ στον σκληρό δίσκο...</translation> </message> <message> <source>Send coins to a Bitcoin address</source> @@ -319,7 +387,7 @@ </message> <message> <source>Show or hide the main Window</source> - <translation>Εμφάνιση ή αποκρύψη του κεντρικου παράθυρου </translation> + <translation>Εμφάνιση ή απόκρυψη του κεντρικού παραθύρου</translation> </message> <message> <source>Encrypt the private keys that belong to your wallet</source> @@ -370,6 +438,14 @@ <translation>&Επιλογές γραμμής εντολών</translation> </message> <message> + <source>Indexing blocks on disk...</source> + <translation>Φόρτωση ευρετηρίου μπλοκ στον σκληρο δισκο...</translation> + </message> + <message> + <source>Processing blocks on disk...</source> + <translation>Φόρτωση ευρετηρίου μπλοκ στον σκληρο δισκο...</translation> + </message> + <message> <source>%1 behind</source> <translation>%1 πίσω</translation> </message> @@ -379,7 +455,7 @@ </message> <message> <source>Transactions after this will not yet be visible.</source> - <translation>Οι συναλλαγές μετά από αυτό δεν θα είναι ακόμη ορατες.</translation> + <translation>Οι συναλλαγές μετά από αυτό δεν θα είναι ακόμη ορατές.</translation> </message> <message> <source>Error</source> @@ -468,15 +544,15 @@ </message> <message> <source>Fee:</source> - <translation>Ταρίφα</translation> + <translation>Ταρίφα:</translation> </message> <message> <source>Dust:</source> - <translation>Σκόνη</translation> + <translation>Σκόνη:</translation> </message> <message> <source>After Fee:</source> - <translation>Ταρίφα αλλαγής</translation> + <translation>Ταρίφα αλλαγής:</translation> </message> <message> <source>Change:</source> @@ -535,10 +611,22 @@ <translation>Αντιγραφή ταυτότητας συναλλαγής</translation> </message> <message> + <source>yes</source> + <translation>ναι</translation> + </message> + <message> + <source>no</source> + <translation>όχι</translation> + </message> + <message> <source>(no label)</source> <translation>(χωρίς ετικέτα)</translation> </message> - </context> + <message> + <source>(change)</source> + <translation>(αλλαγή)</translation> + </message> +</context> <context> <name>EditAddressDialog</name> <message> @@ -562,10 +650,6 @@ <translation>&Διεύθυνση</translation> </message> <message> - <source>New receiving address</source> - <translation>Νέα Διεύθυνση Λήψης</translation> - </message> - <message> <source>New sending address</source> <translation>Νέα Διεύθυνση Αποστολής</translation> </message> @@ -573,6 +657,10 @@ <source>Edit receiving address</source> <translation>Διόρθωση Διεύθυνσης Λήψης</translation> </message> + <message> + <source>Edit sending address</source> + <translation> Επεξεργασία διεύθυνσης αποστολής</translation> + </message> </context> <context> <name>FreespaceChecker</name> @@ -609,17 +697,9 @@ </message> <message> <source>Command-line options</source> - <translation>επιλογής γραμμής εντολών</translation> - </message> - <message> - <source>Usage:</source> - <translation>Χρήση:</translation> - </message> - <message> - <source>command-line options</source> - <translation>επιλογής γραμμής εντολών</translation> + <translation>Επιλογές γραμμής εντολών</translation> </message> - </context> +</context> <context> <name>Intro</name> <message> @@ -662,6 +742,10 @@ <translation>Φόρμα</translation> </message> <message> + <source>Unknown...</source> + <translation>Άγνωστο...</translation> + </message> + <message> <source>Last block time</source> <translation>Χρόνος τελευταίου μπλοκ</translation> </message> @@ -674,11 +758,11 @@ <name>OpenURIDialog</name> <message> <source>Open URI</source> - <translation>'Ανοιγμα &URI</translation> + <translation>Άνοιγμα &URI</translation> </message> <message> <source>Open payment request from URI or file</source> - <translation>Ανοιχτό αίτημα πληρωμής από URI ή απο αρχείο</translation> + <translation>Ανοιχτό αίτημα πληρωμής από URI ή από αρχείο</translation> </message> <message> <source>URI:</source> @@ -721,19 +805,23 @@ </message> <message> <source>Third party URLs (e.g. a block explorer) that appear in the transactions tab as context menu items. %s in the URL is replaced by transaction hash. Multiple URLs are separated by vertical bar |.</source> - <translation>URLs από τρίτους (π.χ. ένας εξερευνητής μπλοκ) τα οποία εμφανίζονται στην καρτέλα συναλλαγών ως στοιχεία μενού. Το %s στα URL αντικαθιστάται από την τιμή της κατατεμαχισμένης συναλλαγής.</translation> + <translation>URLs από τρίτους (π.χ. ένας εξερευνητής μπλοκ) τα οποία εμφανίζονται στην καρτέλα συναλλαγών ως στοιχεία μενού. Το %s στα URL αντικαθίσταται από την τιμή της κατατεμαχισμένης συναλλαγής.</translation> </message> <message> <source>Active command-line options that override above options:</source> <translation>Ενεργές επιλογές γραμμής-εντολών που παρακάμπτουν τις παραπάνω επιλογές:</translation> </message> <message> + <source>Open Configuration File</source> + <translation>Άνοιγμα Αρχείου Ρυθμίσεων</translation> + </message> + <message> <source>Reset all client options to default.</source> - <translation>Επαναφορα όλων των επιλογων του πελάτη σε default.</translation> + <translation>Επαναφορά όλων των επιλογών του πελάτη στις αρχικές.</translation> </message> <message> <source>&Reset Options</source> - <translation>Επαναφορα ρυθμίσεων</translation> + <translation>Επαναφορά ρυθμίσεων</translation> </message> <message> <source>&Network</source> @@ -753,7 +841,7 @@ </message> <message> <source>Enable coin &control features</source> - <translation>Επιλογή κατα πόσο να αναδείχνονται οι δυνατότητες ελέγχου κερμάτων.</translation> + <translation>Ενεργοποίηση δυνατοτήτων ελέγχου κερμάτων</translation> </message> <message> <source>If you disable the spending of unconfirmed change, the change from a transaction cannot be used until that transaction has at least one confirmation. This also affects how your balance is computed.</source> @@ -773,7 +861,7 @@ </message> <message> <source>Connect to the Bitcoin network through a SOCKS5 proxy.</source> - <translation>Σύνδεση στο Bitcoin δίκτυο μέσω διαμεσολαβητή SOCKS5 (π.χ. για σύνδεση μέσω Tor)</translation> + <translation>Σύνδεση στο δίκτυο Bitcoin μέσω διαμεσολαβητή SOCKS5 (π.χ. για σύνδεση μέσω Tor)</translation> </message> <message> <source>&Connect through SOCKS5 proxy (default proxy):</source> @@ -797,7 +885,7 @@ </message> <message> <source>Show only a tray icon after minimizing the window.</source> - <translation>Εμφάνιση μόνο εικονιδίου στην περιοχή ειδοποιήσεων κατά την ελαχιστοποίηση</translation> + <translation>Εμφάνιση μόνο εικονιδίου στην περιοχή ειδοποιήσεων κατά την ελαχιστοποίηση.</translation> </message> <message> <source>&Minimize to the tray instead of the taskbar</source> @@ -813,7 +901,7 @@ </message> <message> <source>User Interface &language:</source> - <translation>Γλώσσα περιβάλλοντος εργασίας: </translation> + <translation>Γλώσσα περιβάλλοντος εργασίας:</translation> </message> <message> <source>&Unit to show amounts in:</source> @@ -825,8 +913,7 @@ </message> <message> <source>Whether to show coin control features or not.</source> - <translation>Επιλογή κατα πόσο να αναδείχνονται οι δυνατότητες ελέγχου κερμάτων. -</translation> + <translation>Επιλογή κατά πόσο να αναδείχνονται οι δυνατότητες ελέγχου κερμάτων.</translation> </message> <message> <source>&OK</source> @@ -846,7 +933,7 @@ </message> <message> <source>Confirm options reset</source> - <translation>Επιβεβαιώση των επιλογων επαναφοράς </translation> + <translation>Επιβεβαίωση των επιλογών επαναφοράς</translation> </message> <message> <source>Client restart required to activate changes.</source> @@ -901,7 +988,7 @@ </message> <message> <source>Mined balance that has not yet matured</source> - <translation>Εξορυγμενο υπόλοιπο που δεν έχει ακόμα ωριμάσει </translation> + <translation>Εξορυγμένο υπόλοιπο που δεν έχει ακόμα ωριμάσει</translation> </message> <message> <source>Balances</source> @@ -942,6 +1029,26 @@ </context> <context> <name>PaymentServer</name> + <message> + <source>Payment request error</source> + <translation>Σφάλμα αίτησης πληρωμής</translation> + </message> + <message> + <source>Cannot start bitcoin: click-to-pay handler</source> + <translation>Δεν είναι δυνατή η εκκίνηση του bitcoin: χειριστής click-to-pay</translation> + </message> + <message> + <source>URI handling</source> + <translation>URI χειριστής</translation> + </message> + <message> + <source>Payment request file handling</source> + <translation>Επεξεργασία αρχείου αίτησης πληρωμής</translation> + </message> + <message> + <source>Payment request rejected</source> + <translation>Η αίτηση πληρωμής απορρίφθηκε</translation> + </message> </context> <context> <name>PeerTableModel</name> @@ -970,11 +1077,11 @@ </message> <message> <source>%1 h</source> - <translation>%1 ώ</translation> + <translation>%1 h</translation> </message> <message> <source>%1 m</source> - <translation>%1 λ</translation> + <translation>%1 m</translation> </message> <message> <source>%1 s</source> @@ -1099,7 +1206,7 @@ </message> <message> <source>Ban Score</source> - <translation>Σκορ αποκλησμού</translation> + <translation>Σκορ Aποκλεισμού</translation> </message> <message> <source>Connection Time</source> @@ -1213,6 +1320,10 @@ <translation>Αφαίρεση</translation> </message> <message> + <source>Copy URI</source> + <translation>Αντιγραφή της επιλεγμένης διεύθυνσης στο πρόχειρο του συστήματος</translation> + </message> + <message> <source>Copy label</source> <translation>Αντιγραφή ετικέτας</translation> </message> @@ -1229,7 +1340,7 @@ </message> <message> <source>Copy &URI</source> - <translation>Αντιγραφη της επιλεγμενης διεύθυνσης στο πρόχειρο του συστηματος</translation> + <translation>Αντιγραφή της επιλεγμένης διεύθυνσης στο πρόχειρο του συστήματος</translation> </message> <message> <source>Copy &Address</source> @@ -1247,12 +1358,16 @@ <source>Label</source> <translation>Ετικέτα</translation> </message> + <message> + <source>Wallet</source> + <translation>Πορτοφόλι</translation> + </message> </context> <context> <name>RecentRequestsTableModel</name> <message> <source>Date</source> - <translation>Ημερομήνια</translation> + <translation>Ημερομηνία</translation> </message> <message> <source>Label</source> @@ -1271,7 +1386,7 @@ </message> <message> <source>Coin Control Features</source> - <translation>Χαρακτηρηστικά επιλογής κερμάτων</translation> + <translation>Χαρακτηριστικά επιλογής κερμάτων</translation> </message> <message> <source>Inputs...</source> @@ -1299,11 +1414,11 @@ </message> <message> <source>Fee:</source> - <translation>Ταρίφα</translation> + <translation>Ταρίφα:</translation> </message> <message> <source>After Fee:</source> - <translation>Ταρίφα αλλαγής</translation> + <translation>Ταρίφα αλλαγής:</translation> </message> <message> <source>Change:</source> @@ -1355,7 +1470,7 @@ </message> <message> <source>Dust:</source> - <translation>Σκόνη</translation> + <translation>Σκόνη:</translation> </message> <message> <source>Clear &All</source> @@ -1371,13 +1486,17 @@ </message> <message> <source>S&end</source> - <translation>Αποστολη</translation> + <translation>Αποστολή</translation> </message> <message> <source>Copy amount</source> <translation>Αντιγραφή ποσού</translation> </message> <message> + <source>Transaction fee</source> + <translation>Κόστος συναλλαγής</translation> + </message> + <message> <source>(no label)</source> <translation>(χωρίς ετικέτα)</translation> </message> @@ -1430,7 +1549,7 @@ </message> <message> <source>Enter a label for this address to add it to the list of used addresses</source> - <translation>Εισάγεται μία ετικέτα για αυτή την διεύθυνση για να προστεθεί στη λίστα με τις χρησιμοποιημένες διευθύνσεις</translation> + <translation>Εισάγετε μία ετικέτα για αυτή την διεύθυνση για να προστεθεί στη λίστα με τις χρησιμοποιημένες διευθύνσεις</translation> </message> <message> <source>Pay To:</source> @@ -1455,7 +1574,7 @@ <name>SignVerifyMessageDialog</name> <message> <source>Signatures - Sign / Verify a Message</source> - <translation>Υπογραφές - Είσοδος / Επαλήθευση μήνυματος </translation> + <translation>Υπογραφές - Είσοδος / Επαλήθευση Mηνύματος </translation> </message> <message> <source>&Sign Message</source> @@ -1491,11 +1610,11 @@ </message> <message> <source>Copy the current signature to the system clipboard</source> - <translation>Αντέγραφη της επιλεγμενης διεύθυνσης στο πρόχειρο του συστηματος</translation> + <translation>Αντιγραφή της επιλεγμένης υπογραφής στο πρόχειρο του συστήματος</translation> </message> <message> <source>Sign the message to prove you own this Bitcoin address</source> - <translation>Υπογράψτε ένα μήνυμα για ν' αποδείξετε πως σας ανήκει μια συγκεκριμένη διεύθυνση Bitcoin</translation> + <translation>Υπογράψτε το μήνυμα για να αποδείξετε πως σας ανήκει η συγκεκριμένη διεύθυνση Bitcoin</translation> </message> <message> <source>Sign &Message</source> @@ -1511,23 +1630,23 @@ </message> <message> <source>&Verify Message</source> - <translation>&Επιβεβαίωση μηνύματος</translation> + <translation>&Επιβεβαίωση Mηνύματος</translation> </message> <message> <source>The Bitcoin address the message was signed with</source> - <translation>Διεύθυνση Bitcoin η οποία το μήνυμα έχει υπογραφεί</translation> + <translation>Διεύθυνση Bitcoin με την οποία έχει υπογραφεί το μήνυμα</translation> </message> <message> <source>Verify the message to ensure it was signed with the specified Bitcoin address</source> - <translation>Υπογράψτε ένα μήνυμα για ν' αποδείξετε πως υπογραφθηκε απο μια συγκεκριμένη διεύθυνση Bitcoin</translation> + <translation>Επαληθεύστε το μήνυμα για να αποδείξετε πως υπογράφθηκε από τη συγκεκριμένη διεύθυνση Bitcoin</translation> </message> <message> <source>Verify &Message</source> - <translation>Επιβεβαίωση μηνύματος</translation> + <translation>Επιβεβαίωση Mηνύματος</translation> </message> <message> <source>Reset all verify message fields</source> - <translation>Επαναφορά όλων επαλήθευμενων πεδίων μήνυματος </translation> + <translation>Επαναφορά όλων των πεδίων επαλήθευσης μηνύματος</translation> </message> </context> <context> @@ -1551,10 +1670,6 @@ <translation>Ανοιχτό μέχρι %1</translation> </message> <message> - <source>%1/offline</source> - <translation>%1/αποσυνδεδεμένο</translation> - </message> - <message> <source>0/unconfirmed, %1</source> <translation>0/ανεπιβεβαίωτο, %1</translation> </message> @@ -1622,7 +1737,7 @@ <name>TransactionTableModel</name> <message> <source>Date</source> - <translation>Ημερομήνια</translation> + <translation>Ημερομηνία</translation> </message> <message> <source>Label</source> @@ -1673,7 +1788,7 @@ </message> <message> <source>Date</source> - <translation>Ημερομήνια</translation> + <translation>Ημερομηνία</translation> </message> <message> <source>Label</source> @@ -1707,112 +1822,52 @@ <context> <name>bitcoin-core</name> <message> - <source>Options:</source> - <translation>Επιλογές:</translation> - </message> - <message> - <source>Specify data directory</source> - <translation>Ορισμός φακέλου δεδομένων</translation> - </message> - <message> - <source>Connect to a node to retrieve peer addresses, and disconnect</source> - <translation>Σύνδεση σε έναν κόμβο για την ανάκτηση διευθύνσεων από ομοτίμους, και αποσυνδέσh</translation> - </message> - <message> - <source>Specify your own public address</source> - <translation>Διευκρινίστε τη δικιά σας δημόσια διεύθυνση.</translation> - </message> - <message> - <source>Accept command line and JSON-RPC commands</source> - <translation>Αποδοχή εντολών κονσόλας και JSON-RPC</translation> - </message> - <message> - <source>Run in the background as a daemon and accept commands</source> - <translation>Εκτέλεση στο παρασκήνιο κι αποδοχή εντολών</translation> - </message> - <message> <source>Bitcoin Core</source> <translation>Bitcoin Core</translation> </message> <message> - <source>Bind to given address and always listen on it. Use [host]:port notation for IPv6</source> - <translation>Αποθηκευση σε συγκεκριμένη διεύθυνση. Χρησιμοποιήστε τα πλήκτρα [Host] : συμβολισμός θύρα για IPv6</translation> - </message> - <message> - <source>Execute command when a wallet transaction changes (%s in cmd is replaced by TxID)</source> - <translation>Εκτέλεσε την εντολή όταν το καλύτερο μπλοκ αλλάξει(%s στην εντολή αντικαθίσταται από το hash του μπλοκ)</translation> - </message> - <message> - <source>Accept connections from outside (default: 1 if no -proxy or -connect)</source> - <translation>Να δέχεσαι συνδέσεις από έξω(προεπιλογή:1)</translation> - </message> - <message> - <source>Block creation options:</source> - <translation>Αποκλεισμός επιλογων δημιουργίας: </translation> - </message> - <message> - <source>Connection options:</source> - <translation>Επιλογές σύνδεσης:</translation> - </message> - <message> <source>Corrupted block database detected</source> - <translation>Εντοπισθηκε διεφθαρμενη βαση δεδομενων των μπλοκ</translation> + <translation>Εντοπίσθηκε διεφθαρμένη βάση δεδομένων των μπλοκ</translation> </message> <message> <source>Do you want to rebuild the block database now?</source> - <translation>Θελετε να δημιουργηθει τωρα η βαση δεδομενων του μπλοκ? </translation> + <translation>Θέλετε να δημιουργηθεί τώρα η βάση δεδομένων των μπλοκ;</translation> </message> <message> <source>Error initializing block database</source> - <translation>Σφάλμα κατά την ενεργοποίηση της βάσης δεδομένων μπλοκ</translation> + <translation>Σφάλμα κατά την ενεργοποίηση της βάσης δεδομένων των μπλοκ</translation> </message> <message> <source>Error initializing wallet database environment %s!</source> - <translation>Σφάλμα κατά την ενεργοποίηση της βάσης δεδομένων πορτοφόλιου %s!</translation> + <translation>Σφάλμα κατά την ενεργοποίηση της βάσης δεδομένων πορτοφολιού %s!</translation> </message> <message> <source>Error loading block database</source> - <translation>Σφάλμα φορτωσης της βασης δεδομενων των μπλοκ</translation> + <translation>Σφάλμα φόρτωσης της βάσης δεδομένων των μπλοκ</translation> </message> <message> <source>Error opening block database</source> - <translation>Σφάλμα φορτωσης της βασης δεδομενων των μπλοκ</translation> + <translation>Σφάλμα φόρτωσης της βάσης δεδομένων των μπλοκ</translation> </message> <message> <source>Error: Disk space is low!</source> - <translation>Προειδοποίηση: Χαμηλός χώρος στο δίσκο </translation> + <translation>Σφάλμα: Χαμηλός χώρος στο δίσκο!</translation> </message> <message> <source>Failed to listen on any port. Use -listen=0 if you want this.</source> - <translation>ταλαιπωρηθειτε για να ακούσετε σε οποιαδήποτε θύρα. Χρήση - ακούστε = 0 , αν θέλετε αυτό.</translation> + <translation>Αποτυχία παρακολούθησης σε οποιαδήποτε θύρα. Χρησιμοποιήστε -listen=0 αν θέλετε αυτό.</translation> </message> <message> <source>Importing...</source> - <translation>ΕΙσαγωγή...</translation> + <translation>Εισαγωγή...</translation> </message> <message> <source>Not enough file descriptors available.</source> - <translation>Δεν ειναι αρκετες περιγραφες αρχείων διαθέσιμες.</translation> - </message> - <message> - <source>Only connect to nodes in network <net> (ipv4, ipv6 or onion)</source> - <translation>Μόνο σύνδεση σε κόμβους του δικτύου <net> (ipv4, ipv6 ή onion)</translation> - </message> - <message> - <source>Specify wallet file (within data directory)</source> - <translation>Επιλέξτε αρχείο πορτοφολιού (μέσα απο κατάλογο δεδομένων)</translation> + <translation>Δεν υπάρχουν αρκετοί περιγραφείς αρχείων διαθέσιμοι.</translation> </message> <message> <source>Verifying blocks...</source> - <translation>Επαλήθευση των μπλοκ... </translation> - </message> - <message> - <source>Wallet options:</source> - <translation>Επιλογές πορτοφολιού:</translation> - </message> - <message> - <source>Connect through SOCKS5 proxy</source> - <translation>Σύνδεση μέσω διαμεσολαβητή SOCKS5</translation> + <translation>Επαλήθευση των μπλοκ...</translation> </message> <message> <source>Error reading from database, shutting down.</source> @@ -1823,26 +1878,6 @@ <translation>Πληροφορία</translation> </message> <message> - <source>Node relay options:</source> - <translation>Επιλογές αναμετάδοσης κόμβου: </translation> - </message> - <message> - <source>RPC server options:</source> - <translation>Επιλογές διακομιστή RPC:</translation> - </message> - <message> - <source>Send trace/debug info to console instead of debug.log file</source> - <translation>Αποστολή πληροφοριών εντοπισμού σφαλμάτων στην κονσόλα αντί του αρχείου debug.log</translation> - </message> - <message> - <source>Show all debugging options (usage: --help -help-debug)</source> - <translation>Προβολή όλων των επιλογών εντοπισμού σφαλμάτων (χρήση: --help -help-debug)</translation> - </message> - <message> - <source>Shrink debug.log file on client startup (default: 1 when no -debug)</source> - <translation>Συρρίκνωση του αρχείο debug.log κατα την εκκίνηση του πελάτη (προεπιλογή: 1 όταν δεν-debug)</translation> - </message> - <message> <source>Signing transaction failed</source> <translation>Η υπογραφή συναλλαγής απέτυχε </translation> </message> @@ -1852,15 +1887,11 @@ </message> <message> <source>Transaction amount too small</source> - <translation>Το ποσό της συναλλαγής είναι πολύ μικρο </translation> + <translation>Το ποσό της συναλλαγής είναι πολύ μικρό</translation> </message> <message> <source>Transaction too large</source> - <translation>Η συναλλαγή ειναι πολύ μεγάλη </translation> - </message> - <message> - <source>Username for JSON-RPC connections</source> - <translation>Όνομα χρήστη για τις συνδέσεις JSON-RPC</translation> + <translation>Η συναλλαγή είναι πολύ μεγάλη</translation> </message> <message> <source>Warning</source> @@ -1868,63 +1899,11 @@ </message> <message> <source>Zapping all transactions from wallet...</source> - <translation>Μεταφορά όλων των συναλλαγών απο το πορτοφόλι</translation> - </message> - <message> - <source>Password for JSON-RPC connections</source> - <translation>Κωδικός για τις συνδέσεις JSON-RPC</translation> - </message> - <message> - <source>Execute command when the best block changes (%s in cmd is replaced by block hash)</source> - <translation>Εκτέλεσε την εντολή όταν το καλύτερο μπλοκ αλλάξει(%s στην εντολή αντικαθίσταται από το hash του μπλοκ)</translation> - </message> - <message> - <source>Allow DNS lookups for -addnode, -seednode and -connect</source> - <translation>Να επιτρέπονται οι έλεγχοι DNS για προσθήκη και σύνδεση κόμβων</translation> - </message> - <message> - <source>How thorough the block verification of -checkblocks is (0-4, default: %u)</source> - <translation>Πόσο εξονυχιστική να είναι η επιβεβαίωση του μπλοκ (0-4, προεπιλογή: %u)</translation> - </message> - <message> - <source>Maintain a full transaction index, used by the getrawtransaction rpc call (default: %u)</source> - <translation>Διατηρήση ένος πλήρες ευρετήριου συναλλαγών (προεπιλογή: %u) </translation> - </message> - <message> - <source>Number of seconds to keep misbehaving peers from reconnecting (default: %u)</source> - <translation>Δευτερόλεπτα πριν επιτραπεί ξανά η σύνδεση των προβληματικών peers (προεπιλογή: %u)</translation> - </message> - <message> - <source>How many blocks to check at startup (default: %u, 0 = all)</source> - <translation>Πόσα μπλοκ να ελέγχθουν κατά την εκκίνηση (προεπιλογή: %u, 0 = όλα)</translation> - </message> - <message> - <source>Include IP addresses in debug output (default: %u)</source> - <translation>Να συμπεριληφθεί η διεύθυνση IP στην αναφορά? (προεπιλογή: %u)</translation> - </message> - <message> - <source>Maintain at most <n> connections to peers (default: %u)</source> - <translation>Μέγιστες αριθμός συνδέσεων με τους peers <n> (προεπιλογή: %u)</translation> - </message> - <message> - <source>Specify configuration file (default: %s)</source> - <translation>Ορίστε αρχείο ρυθμίσεων (προεπιλογή: %s)</translation> - </message> - <message> - <source>Specify connection timeout in milliseconds (minimum: 1, default: %d)</source> - <translation>Ορισμός λήξης χρονικού ορίου σε χιλιοστά του δευτερολέπτου(προεπιλογή: %d)</translation> - </message> - <message> - <source>Specify pid file (default: %s)</source> - <translation>Ορίστε αρχείο pid (προεπιλογή: %s)</translation> - </message> - <message> - <source>Threshold for disconnecting misbehaving peers (default: %u)</source> - <translation>Όριο αποσύνδεσης προβληματικών peers (προεπιλογή: %u)</translation> + <translation>Μεταφορά όλων των συναλλαγών από το πορτοφόλι</translation> </message> <message> <source>Unknown network specified in -onlynet: '%s'</source> - <translation>Άγνωστo δίκτυο ορίζεται σε onlynet: '%s'</translation> + <translation>Έχει οριστεί άγνωστo δίκτυο στο -onlynet: '%s'</translation> </message> <message> <source>Insufficient funds</source> diff --git a/src/qt/locale/bitcoin_en.ts b/src/qt/locale/bitcoin_en.ts index 1b51699b31..fbff2d36a0 100644 --- a/src/qt/locale/bitcoin_en.ts +++ b/src/qt/locale/bitcoin_en.ts @@ -959,7 +959,7 @@ <translation type="unfinished"></translation> </message> <message> - <location line="+71"/> + <location line="+75"/> <source>The entered address "%1" is not a valid Bitcoin address.</source> <translation type="unfinished"></translation> </message> @@ -1524,7 +1524,7 @@ <translation>default</translation> </message> <message> - <location line="+52"/> + <location line="+56"/> <source>none</source> <translation type="unfinished"></translation> </message> @@ -1842,12 +1842,12 @@ <translation type="unfinished">Amount</translation> </message> <message> - <location filename="../guiutil.cpp" line="+124"/> + <location filename="../guiutil.cpp" line="+115"/> <source>Enter a Bitcoin address (e.g. %1)</source> <translation type="unfinished"></translation> </message> <message> - <location line="+722"/> + <location line="+686"/> <source>%1 d</source> <translation type="unfinished"></translation> </message> @@ -1957,7 +1957,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoin.cpp" line="+193"/> + <location filename="../bitcoin.cpp" line="+192"/> <source>%1 didn't yet exit safely...</source> <translation type="unfinished"></translation> </message> @@ -1970,12 +1970,12 @@ <context> <name>QObject::QObject</name> <message> - <location filename="../bitcoin.cpp" line="-118"/> + <location filename="../bitcoin.cpp" line="-117"/> <source>Error parsing command line arguments: %1.</source> <translation type="unfinished"></translation> </message> <message> - <location line="+39"/> + <location line="+38"/> <source>Error: Specified data directory "%1" does not exist.</source> <translation type="unfinished"></translation> </message> @@ -3155,7 +3155,7 @@ Note: Since the fee is calculated on a per-byte basis, a fee of "100 satos <context> <name>ShutdownWindow</name> <message> - <location filename="../utilitydialog.cpp" line="+84"/> + <location filename="../utilitydialog.cpp" line="+83"/> <source>%1 is shutting down...</source> <translation type="unfinished"></translation> </message> @@ -4066,7 +4066,7 @@ Note: Since the fee is calculated on a per-byte basis, a fee of "100 satos <translation type="unfinished"></translation> </message> <message> - <location line="+22"/> + <location line="+28"/> <source>Prune configured below the minimum of %d MiB. Please use a higher number.</source> <translation type="unfinished"></translation> </message> @@ -4096,7 +4096,7 @@ Note: Since the fee is calculated on a per-byte basis, a fee of "100 satos <translation type="unfinished"></translation> </message> <message> - <location line="-178"/> + <location line="-184"/> <source>Bitcoin Core</source> <translation type="unfinished">Bitcoin Core</translation> </message> @@ -4121,7 +4121,12 @@ Note: Since the fee is calculated on a per-byte basis, a fee of "100 satos <translation type="unfinished"></translation> </message> <message> - <location line="+11"/> + <location line="+8"/> + <source>Group outputs by address, selecting all or none, instead of selecting on a per-output basis. Privacy is improved as an address is only used once (unless someone sends to it after spending from it), but may result in slightly higher fees as suboptimal coin selection may result due to the added limitation (default: %u)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+9"/> <source>Please check that your computer's date and time are correct! If your clock is wrong, %s will not work properly.</source> <translation type="unfinished"></translation> </message> @@ -4296,7 +4301,12 @@ Note: Since the fee is calculated on a per-byte basis, a fee of "100 satos <translation type="unfinished"></translation> </message> <message> - <location line="+47"/> + <location line="+21"/> + <source>Specified blocks directory "%s" does not exist.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+26"/> <source>Upgrading txindex database</source> <translation type="unfinished"></translation> </message> @@ -4396,12 +4406,12 @@ Note: Since the fee is calculated on a per-byte basis, a fee of "100 satos <translation type="unfinished"></translation> </message> <message> - <location line="-165"/> + <location line="-171"/> <source>Error: Listening for incoming connections failed (listen returned error %s)</source> <translation type="unfinished"></translation> </message> <message> - <location line="+5"/> + <location line="+11"/> <source>Invalid amount for -maxtxfee=<amount>: '%s' (must be at least the minrelay fee of %s to prevent stuck transactions)</source> <translation type="unfinished"></translation> </message> @@ -4486,13 +4496,7 @@ Note: Since the fee is calculated on a per-byte basis, a fee of "100 satos <translation type="unfinished"></translation> </message> <message> - <location line="+1"/> - <source>Specified blocks directory "%s" does not exist. -</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+3"/> + <location line="+4"/> <source>The transaction amount is too small to pay the fee</source> <translation type="unfinished"></translation> </message> @@ -4552,7 +4556,7 @@ Note: Since the fee is calculated on a per-byte basis, a fee of "100 satos <translation type="unfinished"></translation> </message> <message> - <location line="-191"/> + <location line="-197"/> <source>-maxtxfee is set very high! Fees this large could be paid on a single transaction.</source> <translation type="unfinished"></translation> </message> @@ -4562,7 +4566,7 @@ Note: Since the fee is calculated on a per-byte basis, a fee of "100 satos <translation type="unfinished"></translation> </message> <message> - <location line="+40"/> + <location line="+46"/> <source>This is the transaction fee you may pay when fee estimates are not available.</source> <translation type="unfinished"></translation> </message> @@ -4657,7 +4661,7 @@ Note: Since the fee is calculated on a per-byte basis, a fee of "100 satos <translation>Insufficient funds</translation> </message> <message> - <location line="-128"/> + <location line="-134"/> <source>Can't generate a change-address key. Private keys are disabled for this wallet.</source> <translation type="unfinished"></translation> </message> @@ -4672,7 +4676,7 @@ Note: Since the fee is calculated on a per-byte basis, a fee of "100 satos <translation type="unfinished"></translation> </message> <message> - <location line="+54"/> + <location line="+60"/> <source>Warning: Private keys detected in wallet {%s} with disabled private keys</source> <translation type="unfinished"></translation> </message> diff --git a/src/qt/locale/bitcoin_en_GB.ts b/src/qt/locale/bitcoin_en_GB.ts index dbb6a06874..7da223f52e 100644 --- a/src/qt/locale/bitcoin_en_GB.ts +++ b/src/qt/locale/bitcoin_en_GB.ts @@ -30,6 +30,10 @@ <translation>Delete the currently selected address from the list</translation> </message> <message> + <source>Enter address or label to search</source> + <translation>Enter address or label to search</translation> + </message> + <message> <source>Export the data in the current tab to a file</source> <translation>Export the data in the current tab to a file</translation> </message> @@ -322,6 +326,10 @@ <translation>Open &URI...</translation> </message> <message> + <source>Wallet:</source> + <translation>Wallet:</translation> + </message> + <message> <source>Click to disable network activity.</source> <translation>Click to disable network activity.</translation> </message> @@ -510,6 +518,12 @@ </translation> </message> <message> + <source>Wallet: %1 +</source> + <translation>Wallet: %1 +</translation> + </message> + <message> <source>Type: %1 </source> <translation>Type: %1 @@ -730,10 +744,6 @@ <translation>&Address</translation> </message> <message> - <source>New receiving address</source> - <translation>New receiving address</translation> - </message> - <message> <source>New sending address</source> <translation>New sending address</translation> </message> @@ -750,10 +760,6 @@ <translation>The entered address "%1" is not a valid Bitcoin address.</translation> </message> <message> - <source>The entered address "%1" is already in the address book.</source> - <translation>The entered address "%1" is already in the address book.</translation> - </message> - <message> <source>Could not unlock wallet.</source> <translation>Could not unlock wallet.</translation> </message> @@ -803,42 +809,6 @@ <source>Command-line options</source> <translation>Command-line options</translation> </message> - <message> - <source>Usage:</source> - <translation>Usage:</translation> - </message> - <message> - <source>command-line options</source> - <translation>command-line options</translation> - </message> - <message> - <source>UI Options:</source> - <translation>UI Options:</translation> - </message> - <message> - <source>Choose data directory on startup (default: %u)</source> - <translation>Choose data directory on startup (default: %u)</translation> - </message> - <message> - <source>Set language, for example "de_DE" (default: system locale)</source> - <translation>Set language, for example "de_DE" (default: system locale)</translation> - </message> - <message> - <source>Start minimized</source> - <translation>Start minimised</translation> - </message> - <message> - <source>Set SSL root certificates for payment request (default: -system-)</source> - <translation>Set SSL root certificates for payment request (default: -system-)</translation> - </message> - <message> - <source>Show splash screen on startup (default: %u)</source> - <translation>Show splash screen on startup (default: %u)</translation> - </message> - <message> - <source>Reset all settings changed in the GUI</source> - <translation>Reset all settings changed in the GUI</translation> - </message> </context> <context> <name>Intro</name> @@ -1068,6 +1038,10 @@ <translation>&Network</translation> </message> <message> + <source>GB</source> + <translation>GB</translation> + </message> + <message> <source>(0 = auto, <0 = leave that many cores free)</source> <translation>(0 = auto, <0 = leave that many cores free)</translation> </message> @@ -1535,10 +1509,6 @@ <translation>Error: Specified data directory "%1" does not exist.</translation> </message> <message> - <source>Error: Cannot parse configuration file: %1. Only use key=value syntax.</source> - <translation>Error: Cannot parse configuration file: %1. Only use key=value syntax.</translation> - </message> - <message> <source>Error: %1</source> <translation>Error: %1</translation> </message> @@ -1629,6 +1599,14 @@ <translation>Memory usage</translation> </message> <message> + <source>Wallet: </source> + <translation>Wallet:</translation> + </message> + <message> + <source>(none)</source> + <translation>(none)</translation> + </message> + <message> <source>&Reset</source> <translation>&Reset</translation> </message> @@ -1900,14 +1878,6 @@ <translation>&Request payment</translation> </message> <message> - <source>Bech32 addresses (BIP-173) are cheaper to spend from and offer better protection against typos. When unchecked a P2SH wrapped SegWit address will be created, compatible with older wallets.</source> - <translation>Bech32 addresses (BIP-173) are cheaper to spend from and offer better protection against typos. When unchecked a P2SH wrapped SegWit address will be created, compatible with older wallets.</translation> - </message> - <message> - <source>Generate Bech32 address</source> - <translation>Generate Bech32 address</translation> - </message> - <message> <source>Show the selected request (does the same as double clicking an entry)</source> <translation>Show the selected request (does the same as double clicking an entry)</translation> </message> @@ -1987,6 +1957,10 @@ <translation>Message</translation> </message> <message> + <source>Wallet</source> + <translation>Wallet</translation> + </message> + <message> <source>Resulting URI too long, try to reduce the text for label / message.</source> <translation>Resulting URI too long, try to reduce the text for label / message.</translation> </message> @@ -2105,10 +2079,6 @@ <translation>per kilobyte</translation> </message> <message> - <source>If the custom fee is set to 1000 satoshis and the transaction is only 250 bytes, then "per kilobyte" only pays 250 satoshis in fee, while "total at least" pays 1000 satoshis. For transactions bigger than a kilobyte both pay by kilobyte.</source> - <translation>If the custom fee is set to 1000 satoshis and the transaction is only 250 bytes, then "per kilobyte" only pays 250 satoshis in fee, while "total at least" pays 1000 satoshis. For transactions bigger than a kilobyte both pay by kilobyte.</translation> - </message> - <message> <source>Hide</source> <translation>Hide</translation> </message> @@ -2217,14 +2187,6 @@ <translation>Are you sure you want to send?</translation> </message> <message> - <source>added as transaction fee</source> - <translation>added as transaction fee</translation> - </message> - <message> - <source>Total Amount %1</source> - <translation>Total Amount %1</translation> - </message> - <message> <source>or</source> <translation>or</translation> </message> @@ -2233,6 +2195,10 @@ <translation>You can increase the fee later (signals Replace-By-Fee, BIP-125).</translation> </message> <message> + <source>Transaction fee</source> + <translation>Transaction fee</translation> + </message> + <message> <source>Not signalling Replace-By-Fee, BIP-125.</source> <translation>Not signalling Replace-By-Fee, BIP-125.</translation> </message> @@ -2578,10 +2544,6 @@ <translation>conflicted with a transaction with %1 confirmations</translation> </message> <message> - <source>%1/offline</source> - <translation>%1/offline</translation> - </message> - <message> <source>0/unconfirmed, %1</source> <translation>0/unconfirmed, %1</translation> </message> @@ -2610,14 +2572,6 @@ <translation>Status</translation> </message> <message> - <source>, has not been successfully broadcast yet</source> - <translation>, has not been successfully broadcast yet</translation> - </message> - <message numerus="yes"> - <source>, broadcast through %n node(s)</source> - <translation><numerusform>, broadcast through %n node</numerusform><numerusform>, broadcast through %n nodes</numerusform></translation> - </message> - <message> <source>Date</source> <translation>Date</translation> </message> @@ -2772,10 +2726,6 @@ <translation>Open until %1</translation> </message> <message> - <source>Offline</source> - <translation>Offline</translation> - </message> - <message> <source>Unconfirmed</source> <translation>Unconfirmed</translation> </message> @@ -2800,10 +2750,6 @@ <translation>Immature (%1 confirmations, will be available after %2)</translation> </message> <message> - <source>This block was not received by any other nodes and will probably not be accepted!</source> - <translation>This block was not received by any other nodes and will probably not be accepted!</translation> - </message> - <message> <source>Generated but not accepted</source> <translation>Generated but not accepted</translation> </message> @@ -3114,38 +3060,18 @@ <source>The wallet data was successfully saved to %1.</source> <translation>The wallet data was successfully saved to %1.</translation> </message> + <message> + <source>Cancel</source> + <translation>Cancel</translation> + </message> </context> <context> <name>bitcoin-core</name> <message> - <source>Options:</source> - <translation>Options:</translation> - </message> - <message> - <source>Specify data directory</source> - <translation>Specify data directory</translation> - </message> - <message> - <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> - <source>Specify your own public address</source> - <translation>Specify your own public address</translation> - </message> - <message> - <source>Accept command line and JSON-RPC commands</source> - <translation>Accept command line and JSON-RPC commands</translation> - </message> - <message> <source>Distributed under the MIT software license, see the accompanying file %s or %s</source> <translation>Distributed under the MIT software license, see the accompanying file %s or %s.</translation> </message> <message> - <source>If <category> is not supplied or if <category> = 1, output all debugging information.</source> - <translation>If <category> is not supplied or if <category> = 1, output all debugging information.</translation> - </message> - <message> <source>Prune configured below the minimum of %d MiB. Please use a higher number.</source> <translation>Prune configured below the minimum of %d MiB. Please use a higher number.</translation> </message> @@ -3162,18 +3088,10 @@ <translation>Error: A fatal internal error occurred, see debug.log for details</translation> </message> <message> - <source>Fee (in %s/kB) to add to transactions you send (default: %s)</source> - <translation>Fee (in %s/kB) to add to transactions you send (default: %s)</translation> - </message> - <message> <source>Pruning blockstore...</source> <translation>Pruning blockstore...</translation> </message> <message> - <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> <source>Unable to start HTTP server. See debug log for details.</source> <translation>Unable to start HTTP server. See debug log for details.</translation> </message> @@ -3186,22 +3104,6 @@ <translation>The %s developers</translation> </message> <message> - <source>A fee rate (in %s/kB) that will be used when fee estimation has insufficient data (default: %s)</source> - <translation>A fee rate (in %s/kB) that will be used when fee estimation has insufficient data (default: %s)</translation> - </message> - <message> - <source>Accept relayed transactions received from whitelisted peers even when not relaying transactions (default: %d)</source> - <translation>Accept relayed transactions received from whitelisted peers even when not relaying transactions (default: %d)</translation> - </message> - <message> - <source>Add a node to connect to and attempt to keep the connection open (see the `addnode` RPC command help for more info)</source> - <translation>Add a node to connect to and attempt to keep the connection open (see the `addnode` RPC command help for more info).</translation> - </message> - <message> - <source>Bind to given address and always listen on it. Use [host]:port notation for IPv6</source> - <translation>Bind to given address and always listen on it. Use [host]:port notation for IPv6</translation> - </message> - <message> <source>Cannot obtain a lock on data directory %s. %s is probably already running.</source> <translation>Cannot obtain a lock on data directory %s. %s is probably already running.</translation> </message> @@ -3210,42 +3112,10 @@ <translation>Cannot provide specific connections and have addrman find outgoing connections at the same.</translation> </message> <message> - <source>Connect only to the specified node(s); -connect=0 disables automatic connections (the rules for this peer are the same as for -addnode)</source> - <translation>Connect only to the specified node(s); -connect=0 disables automatic connections (the rules for this peer are the same as for -addnode).</translation> - </message> - <message> - <source>Delete all wallet transactions and only recover those parts of the blockchain through -rescan on startup</source> - <translation>Delete all wallet transactions and only recover those parts of the blockchain through -rescan on startup</translation> - </message> - <message> <source>Error reading %s! All keys read correctly, but transaction data or address book entries might be missing or incorrect.</source> <translation>Error reading %s! All keys read correctly, but transaction data or address book entries might be missing or incorrect.</translation> </message> <message> - <source>Exclude debugging information for a category. Can be used in conjunction with -debug=1 to output debug logs for all categories except one or more specified categories.</source> - <translation>Exclude debugging information for a category. Can be used in conjunction with -debug=1 to output debug logs for all categories except one or more specified categories.</translation> - </message> - <message> - <source>Execute command when a wallet transaction changes (%s in cmd is replaced by TxID)</source> - <translation>Execute command when a wallet transaction changes (%s in cmd is replaced by TxID)</translation> - </message> - <message> - <source>Extra transactions to keep in memory for compact block reconstructions (default: %u)</source> - <translation>Extra transactions to keep in memory for compact block reconstructions (default: %u).</translation> - </message> - <message> - <source>If this block is in the chain assume that it and its ancestors are valid and potentially skip their script verification (0 to verify all, default: %s, testnet: %s)</source> - <translation>If this block is in the chain assume that it and its ancestors are valid and potentially skip their script verification (0 to verify all, default: %s, testnet: %s).</translation> - </message> - <message> - <source>Maximum allowed median peer time offset adjustment. Local perspective of time may be influenced by peers forward or backward by this amount. (default: %u seconds)</source> - <translation>Maximum allowed median peer time offset adjustment. Local perspective of time may be influenced by peers forward or backward by this amount. (default: %u seconds)</translation> - </message> - <message> - <source>Maximum total fees (in %s) to use in a single wallet transaction or raw transaction; setting this too low may abort large transactions (default: %s)</source> - <translation>Maximum total fees (in %s) to use in a single wallet transaction or raw transaction; setting this too low may abort large transactions (default: %s)</translation> - </message> - <message> <source>Please check that your computer's date and time are correct! If your clock is wrong, %s will not work properly.</source> <translation>Please check that your computer's date and time are correct! If your clock is wrong, %s will not work properly.</translation> </message> @@ -3254,22 +3124,6 @@ <translation>Please contribute if you find %s useful. Visit %s for further information about the software.</translation> </message> <message> - <source>Query for peer addresses via DNS lookup, if low on addresses (default: 1 unless -connect used)</source> - <translation>Query for peer addresses via DNS lookup, if low on addresses (default: 1 unless -connect used).</translation> - </message> - <message> - <source>Reduce storage requirements by enabling pruning (deleting) of old blocks. This allows the pruneblockchain RPC to be called to delete specific blocks, and enables automatic pruning of old blocks if a target size in MiB is provided. This mode is incompatible with -txindex and -rescan. Warning: Reverting this setting requires re-downloading the entire blockchain. (default: 0 = disable pruning blocks, 1 = allow manual pruning via RPC, >%u = automatically prune block files to stay under the specified target size in MiB)</source> - <translation>Reduce storage requirements by enabling pruning (deleting) of old blocks. This allows the pruneblockchain RPC to be called to delete specific blocks and enables automatic pruning of old blocks if a target size in MiB is provided. This mode is incompatible with -txindex and -rescan. Warning: Reverting this setting requires re-downloading the entire blockchain. (default: 0 = disable pruning blocks, 1 = allow manual pruning via RPC, >%u = automatically prune block files to stay under the specified target size in MiB)</translation> - </message> - <message> - <source>Set lowest fee rate (in %s/kB) for transactions to be included in block creation. (default: %s)</source> - <translation>Set lowest fee rate (in %s/kB) for transactions to be included in block creation (default: %s).</translation> - </message> - <message> - <source>Set the number of script verification threads (%u to %d, 0 = auto, <0 = leave that many cores free, default: %d)</source> - <translation>Set the number of script verification threads (%u to %d, 0 = auto, <0 = leave that many cores free, default: %d)</translation> - </message> - <message> <source>The block database contains a block which appears to be from the future. This may be due to your computer's date and time being set incorrectly. Only rebuild the block database if you are sure that your computer's date and time are correct</source> <translation>The block database contains a block which appears to be from the future. This may be due to your computer's date and time being set incorrectly. Only rebuild the block database if you are sure that your computer's date and time are correct</translation> </message> @@ -3290,18 +3144,6 @@ <translation>Unable to rewind the database to a pre-fork state. You will need to re-download the blockchain</translation> </message> <message> - <source>Use UPnP to map the listening port (default: 1 when listening and no -proxy)</source> - <translation>Use UPnP to map the listening port (default: 1 when listening and no -proxy)</translation> - </message> - <message> - <source>Username and hashed password for JSON-RPC connections. The field <userpw> comes in the format: <USERNAME>:<SALT>$<HASH>. A canonical python script is included in share/rpcuser. The client then connects normally using the rpcuser=<USERNAME>/rpcpassword=<PASSWORD> pair of arguments. This option can be specified multiple times</source> - <translation>Username and hashed password for JSON-RPC connections. The field <userpw> comes in the format: <USERNAME>:<SALT>$<HASH>. A canonical python script is included in share/rpcuser. The client then connects normally using the rpcuser=<USERNAME>/rpcpassword=<PASSWORD> pair of arguments. This option can be specified multiple times.</translation> - </message> - <message> - <source>Wallet will not create transactions that violate mempool chain limits (default: %u)</source> - <translation>Wallet will not create transactions that violate mempool chain limits (default: %u).</translation> - </message> - <message> <source>Warning: The network does not appear to fully agree! Some miners appear to be experiencing issues.</source> <translation>Warning: The network does not appear to fully agree! Some miners appear to be experiencing issues.</translation> </message> @@ -3310,10 +3152,6 @@ <translation>Warning: We do not appear to fully agree with our peers! You may need to upgrade, or other nodes may need to upgrade.</translation> </message> <message> - <source>Whether to save the mempool on shutdown and load on restart (default: %u)</source> - <translation>Whether to save the mempool on shutdown and load on restart (default: %u).</translation> - </message> - <message> <source>%d of last 100 blocks have unexpected version</source> <translation>%d of last 100 blocks have unexpected version.</translation> </message> @@ -3326,42 +3164,14 @@ <translation>-maxmempool must be at least %d MB</translation> </message> <message> - <source><category> can be:</source> - <translation><category> can be:</translation> - </message> - <message> - <source>Accept connections from outside (default: 1 if no -proxy or -connect)</source> - <translation>Accept connections from outside (default: 1 if no -proxy or -connect)</translation> - </message> - <message> - <source>Append comment to the user agent string</source> - <translation>Append comment to the user agent string</translation> - </message> - <message> - <source>Attempt to recover private keys from a corrupt wallet on startup</source> - <translation>Attempt to recover private keys from a corrupt wallet on startup</translation> - </message> - <message> - <source>Block creation options:</source> - <translation>Block creation options:</translation> - </message> - <message> <source>Cannot resolve -%s address: '%s'</source> <translation>Cannot resolve -%s address: '%s'</translation> </message> <message> - <source>Chain selection options:</source> - <translation>Chain selection options:</translation> - </message> - <message> <source>Change index out of range</source> <translation>Change index out of range</translation> </message> <message> - <source>Connection options:</source> - <translation>Connection options:</translation> - </message> - <message> <source>Copyright (C) %i-%i</source> <translation>Copyright (C) %i-%i</translation> </message> @@ -3370,38 +3180,10 @@ <translation>Corrupted block database detected</translation> </message> <message> - <source>Debugging/Testing options:</source> - <translation>Debugging/Testing options:</translation> - </message> - <message> - <source>Do not load the wallet and disable wallet RPC calls</source> - <translation>Do not load the wallet and disable wallet RPC calls</translation> - </message> - <message> <source>Do you want to rebuild the block database now?</source> <translation>Do you want to rebuild the block database now?</translation> </message> <message> - <source>Enable publish hash block in <address></source> - <translation>Enable publish hash block in <address></translation> - </message> - <message> - <source>Enable publish hash transaction in <address></source> - <translation>Enable publish hash transaction in <address></translation> - </message> - <message> - <source>Enable publish raw block in <address></source> - <translation>Enable publish raw block in <address></translation> - </message> - <message> - <source>Enable publish raw transaction in <address></source> - <translation>Enable publish raw transaction in <address></translation> - </message> - <message> - <source>Enable transaction replacement in the memory pool (default: %u)</source> - <translation>Enable transaction replacement in the memory pool (default: %u)</translation> - </message> - <message> <source>Error creating %s: You can't create non-HD wallets with this version.</source> <translation>Error creating %s: You can't create non-HD wallets with this version.</translation> </message> @@ -3470,10 +3252,6 @@ <translation>Invalid amount for -fallbackfee=<amount>: '%s'</translation> </message> <message> - <source>Keep the transaction memory pool below <n> megabytes (default: %u)</source> - <translation>Keep the transaction memory pool below <n> megabytes (default: %u)</translation> - </message> - <message> <source>Loading P2P addresses...</source> <translation>Loading P2P addresses...</translation> </message> @@ -3482,26 +3260,10 @@ <translation>Loading banlist...</translation> </message> <message> - <source>Location of the auth cookie (default: data dir)</source> - <translation>Location of the auth cookie (default: data dir)</translation> - </message> - <message> <source>Not enough file descriptors available.</source> <translation>Not enough file descriptors available.</translation> </message> <message> - <source>Only connect to nodes in network <net> (ipv4, ipv6 or onion)</source> - <translation>Only connect to nodes in network <net> (ipv4, ipv6 or onion)</translation> - </message> - <message> - <source>Print this help message and exit</source> - <translation>Print this help message and exit</translation> - </message> - <message> - <source>Print version and exit</source> - <translation>Print version and exit</translation> - </message> - <message> <source>Prune cannot be configured with a negative value.</source> <translation>Prune cannot be configured with a negative value.</translation> </message> @@ -3510,14 +3272,6 @@ <translation>Prune mode is incompatible with -txindex.</translation> </message> <message> - <source>Rebuild chain state and block index from the blk*.dat files on disk</source> - <translation>Rebuild chain state and block index from the blk*.dat files on disk</translation> - </message> - <message> - <source>Rebuild chain state from the currently indexed blocks</source> - <translation>Rebuild chain state from the currently indexed blocks</translation> - </message> - <message> <source>Replaying blocks...</source> <translation>Replaying blocks...</translation> </message> @@ -3526,18 +3280,6 @@ <translation>Rewinding blocks...</translation> </message> <message> - <source>Send transactions with full-RBF opt-in enabled (RPC only, default: %u)</source> - <translation>Send transactions with full-RBF opt-in enabled (RPC only, default: %u).</translation> - </message> - <message> - <source>Set database cache size in megabytes (%d to %d, default: %d)</source> - <translation>Set database cache size in megabytes (%d to %d, default: %d)</translation> - </message> - <message> - <source>Specify wallet file (within data directory)</source> - <translation>Specify wallet file (within data directory)</translation> - </message> - <message> <source>The source code is available from %s.</source> <translation>The source code is available from %s.</translation> </message> @@ -3570,14 +3312,6 @@ <translation>Upgrading UTXO database</translation> </message> <message> - <source>Use UPnP to map the listening port (default: %u)</source> - <translation>Use UPnP to map the listening port (default: %u)</translation> - </message> - <message> - <source>Use the test chain</source> - <translation>Use the test chain</translation> - </message> - <message> <source>User Agent comment (%s) contains unsafe characters.</source> <translation>User Agent comment (%s) contains unsafe characters.</translation> </message> @@ -3586,90 +3320,26 @@ <translation>Verifying blocks...</translation> </message> <message> - <source>Wallet debugging/testing options:</source> - <translation>Wallet debugging/testing options:</translation> - </message> - <message> <source>Wallet needed to be rewritten: restart %s to complete</source> <translation>Wallet needed to be rewritten: restart %s to complete</translation> </message> <message> - <source>Wallet options:</source> - <translation>Wallet options:</translation> - </message> - <message> - <source>Allow JSON-RPC connections from specified source. Valid for <ip> are a single IP (e.g. 1.2.3.4), a network/netmask (e.g. 1.2.3.4/255.255.255.0) or a network/CIDR (e.g. 1.2.3.4/24). This option can be specified multiple times</source> - <translation>Allow JSON-RPC connections from specified source. Valid for <ip> are a single IP (e.g. 1.2.3.4), a network/netmask (e.g. 1.2.3.4/255.255.255.0) or a network/CIDR (e.g. 1.2.3.4/24). This option can be specified multiple times</translation> - </message> - <message> - <source>Bind to given address and whitelist peers connecting to it. Use [host]:port notation for IPv6</source> - <translation>Bind to given address and whitelist peers connecting to it. Use [host]:port notation for IPv6</translation> - </message> - <message> - <source>Create new files with system default permissions, instead of umask 077 (only effective with disabled wallet functionality)</source> - <translation>Create new files with system default permissions, instead of umask 077 (only effective with disabled wallet functionality)</translation> - </message> - <message> - <source>Discover own IP addresses (default: 1 when listening and no -externalip or -proxy)</source> - <translation>Discover own IP addresses (default: 1 when listening and no -externalip or -proxy)</translation> - </message> - <message> <source>Error: Listening for incoming connections failed (listen returned error %s)</source> <translation>Error: Listening for incoming connections failed (listen returned error %s)</translation> </message> <message> - <source>Execute command when a relevant alert is received or we see a really long fork (%s in cmd is replaced by message)</source> - <translation>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> - <source>Fees (in %s/kB) smaller than this are considered zero fee for relaying, mining and transaction creation (default: %s)</source> - <translation>Fees (in %s/kB) smaller than this are considered zero fee for relaying, mining and transaction creation (default: %s)</translation> - </message> - <message> - <source>If paytxfee is not set, include enough fee so transactions begin confirmation on average within n blocks (default: %u)</source> - <translation>If paytxfee is not set, include enough fee so transactions begin confirmation on average within n blocks (default: %u)</translation> - </message> - <message> <source>Invalid amount for -maxtxfee=<amount>: '%s' (must be at least the minrelay fee of %s to prevent stuck transactions)</source> <translation>Invalid amount for -maxtxfee=<amount>: '%s' (must be at least the minrelay fee of %s to prevent stuck transactions)</translation> </message> <message> - <source>Maximum size of data in data carrier transactions we relay and mine (default: %u)</source> - <translation>Maximum size of data in data carrier transactions we relay and mine (default: %u)</translation> - </message> - <message> - <source>Randomize credentials for every proxy connection. This enables Tor stream isolation (default: %u)</source> - <translation>Randomise credentials for every proxy connection. This enables Tor stream isolation (default: %u)</translation> - </message> - <message> <source>The transaction amount is too small to send after the fee has been deducted</source> <translation>The transaction amount is too small to send after the fee has been deducted</translation> </message> <message> - <source>Whitelisted peers cannot be DoS banned and their transactions are always relayed, even if they are already in the mempool, useful e.g. for a gateway</source> - <translation>Whitelisted peers cannot be DoS banned and their transactions are always relayed, even if they are already in the mempool, useful e.g. for a gateway</translation> - </message> - <message> <source>You need to rebuild the database using -reindex to go back to unpruned mode. This will redownload the entire blockchain</source> <translation>You need to rebuild the database using -reindex to go back to unpruned mode. This will redownload the entire blockchain</translation> </message> <message> - <source>(default: %u)</source> - <translation>(default: %u)</translation> - </message> - <message> - <source>Accept public REST requests (default: %u)</source> - <translation>Accept public REST requests (default: %u)</translation> - </message> - <message> - <source>Automatically create Tor hidden service (default: %d)</source> - <translation>Automatically create Tor hidden service (default: %d)</translation> - </message> - <message> - <source>Connect through SOCKS5 proxy</source> - <translation>Connect through SOCKS5 proxy</translation> - </message> - <message> <source>Error loading %s: You can't disable HD on an already existing HD wallet</source> <translation>Error loading %s: you can't disable HD on an already existing HD wallet.</translation> </message> @@ -3682,10 +3352,6 @@ <translation>Error upgrading chainstate database.</translation> </message> <message> - <source>Imports blocks from external blk000??.dat file on startup</source> - <translation>Imports blocks from external blk000??.dat file on startup</translation> - </message> - <message> <source>Information</source> <translation>Information</translation> </message> @@ -3706,42 +3372,14 @@ <translation>Invalid netmask specified in -whitelist: '%s'</translation> </message> <message> - <source>Keep at most <n> unconnectable transactions in memory (default: %u)</source> - <translation>Keep at most <n> unconnectable transactions in memory (default: %u)</translation> - </message> - <message> <source>Need to specify a port with -whitebind: '%s'</source> <translation>Need to specify a port with -whitebind: '%s'</translation> </message> <message> - <source>Node relay options:</source> - <translation>Node relay options:</translation> - </message> - <message> - <source>RPC server options:</source> - <translation>RPC server options:</translation> - </message> - <message> <source>Reducing -maxconnections from %d to %d, because of system limitations.</source> <translation>Reducing -maxconnections from %d to %d, because of system limitations.</translation> </message> <message> - <source>Rescan the block chain for missing wallet transactions on startup</source> - <translation>Rescan the block chain for missing wallet transactions on startup</translation> - </message> - <message> - <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> - <message> - <source>Show all debugging options (usage: --help -help-debug)</source> - <translation>Show all debugging options (usage: --help -help-debug)</translation> - </message> - <message> - <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> - <message> <source>Signing transaction failed</source> <translation>Signing transaction failed</translation> </message> @@ -3766,14 +3404,6 @@ <translation>This is experimental software.</translation> </message> <message> - <source>Tor control port password (default: empty)</source> - <translation>Tor control port password (default: empty)</translation> - </message> - <message> - <source>Tor control port to use if onion listening enabled (default: %s)</source> - <translation>Tor control port to use if onion listening enabled (default: %s)</translation> - </message> - <message> <source>Transaction amount too small</source> <translation>Transaction amount too small</translation> </message> @@ -3794,14 +3424,6 @@ <translation>Unable to generate initial keys.</translation> </message> <message> - <source>Upgrade wallet to latest format on startup</source> - <translation>Upgrade wallet to latest format on startup</translation> - </message> - <message> - <source>Username for JSON-RPC connections</source> - <translation>Username for JSON-RPC connections</translation> - </message> - <message> <source>Verifying wallet(s)...</source> <translation>Verifying wallet(s)...</translation> </message> @@ -3818,110 +3440,18 @@ <translation>Warning: unknown new rules activated (versionbit %i)</translation> </message> <message> - <source>Whether to operate in a blocks only mode (default: %u)</source> - <translation>Whether to operate in a blocks only mode (default: %u)</translation> - </message> - <message> - <source>You need to rebuild the database using -reindex to change -txindex</source> - <translation>You need to rebuild the database using -reindex to change -txindex</translation> - </message> - <message> <source>Zapping all transactions from wallet...</source> <translation>Zapping all transactions from wallet...</translation> </message> <message> - <source>ZeroMQ notification options:</source> - <translation>ZeroMQ notification options:</translation> - </message> - <message> - <source>Password for JSON-RPC connections</source> - <translation>Password for JSON-RPC connections</translation> - </message> - <message> - <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> - <source>Allow DNS lookups for -addnode, -seednode and -connect</source> - <translation>Allow DNS lookups for -addnode, -seednode and -connect</translation> - </message> - <message> - <source>(1 = keep tx meta data e.g. account owner and payment request information, 2 = drop tx meta data)</source> - <translation>(1 = keep tx meta data e.g. account owner and payment request information, 2 = drop tx meta data)</translation> - </message> - <message> <source>-maxtxfee is set very high! Fees this large could be paid on a single transaction.</source> <translation>-maxtxfee is set very high! Fees this large could be paid on a single transaction.</translation> </message> <message> - <source>Bind to given address to listen for JSON-RPC connections. This option is ignored unless -rpcallowip is also passed. Port is optional and overrides -rpcport. Use [host]:port notation for IPv6. This option can be specified multiple times (default: 127.0.0.1 and ::1 i.e., localhost, or if -rpcallowip has been specified, 0.0.0.0 and :: i.e., all addresses)</source> - <translation>Bind to given address to listen for JSON-RPC connections. This option is ignored unless -rpcallowip is also passed. Port is optional and overrides -rpcport. Use [host]:port notation for IPv6. This option can be specified multiple times (default: 127.0.0.1 and ::1 i.e., localhost, or if -rpcallowip has been specified, 0.0.0.0 and :: i.e., all addresses).</translation> - </message> - <message> - <source>Do not keep transactions in the mempool longer than <n> hours (default: %u)</source> - <translation>Do not keep transactions in the mempool longer than <n> hours (default: %u)</translation> - </message> - <message> - <source>Equivalent bytes per sigop in transactions for relay and mining (default: %u)</source> - <translation>Equivalent bytes per sigop in transactions for relay and mining (default: %u)</translation> - </message> - <message> <source>Error loading %s: You can't enable HD on an already existing non-HD wallet</source> <translation>Error loading %s: you can't enable HD on an already existing non-HD wallet.</translation> </message> <message> - <source>Error loading wallet %s. -wallet parameter must only specify a filename (not a path).</source> - <translation>Error loading wallet %s. The -wallet parameter must only specify a filename (not a path).</translation> - </message> - <message> - <source>Fees (in %s/kB) smaller than this are considered zero fee for transaction creation (default: %s)</source> - <translation>Fees (in %s/kB) smaller than this are considered zero fee for transaction creation (default: %s)</translation> - </message> - <message> - <source>Force relay of transactions from whitelisted peers even if they violate local relay policy (default: %d)</source> - <translation>Force relay of transactions from whitelisted peers, even if they violate local relay policy (default: %d).</translation> - </message> - <message> - <source>How thorough the block verification of -checkblocks is (0-4, default: %u)</source> - <translation>How thorough the block verification of -checkblocks is (0-4, default: %u)</translation> - </message> - <message> - <source>Maintain a full transaction index, used by the getrawtransaction rpc call (default: %u)</source> - <translation>Maintain a full transaction index, used by the getrawtransaction rpc call (default: %u)</translation> - </message> - <message> - <source>Number of seconds to keep misbehaving peers from reconnecting (default: %u)</source> - <translation>Number of seconds to keep misbehaving peers from reconnecting (default: %u)</translation> - </message> - <message> - <source>Output debugging information (default: %u, supplying <category> is optional)</source> - <translation>Output debugging information (default: %u, supplying <category> is optional)</translation> - </message> - <message> - <source>Set maximum BIP141 block weight to this * 4. Deprecated, use blockmaxweight</source> - <translation>Set maximum BIP141 block weight to this * 4. Deprecated, use blockmaxweight.</translation> - </message> - <message> - <source>Sets the serialization of raw transaction or block hex returned in non-verbose mode, non-segwit(0) or segwit(1) (default: %d)</source> - <translation>Sets the serialisation of raw transaction or block hex returned in non-verbose mode, non-segwit(0) or segwit(1) (default: %d).</translation> - </message> - <message> - <source>Specify directory to hold wallets (default: <datadir>/wallets if it exists, otherwise <datadir>)</source> - <translation>Specify directory to hold wallets (default: <datadir>/wallets if it exists, otherwise <datadir>).</translation> - </message> - <message> - <source>Specify location of debug log file: this can be an absolute path or a path relative to the data directory (default: %s)</source> - <translation>Specify location of debug log file: this can be an absolute path or a path relative to the data directory (default: %s).</translation> - </message> - <message> - <source>Support filtering of blocks and transaction with bloom filters (default: %u)</source> - <translation>Support filtering of blocks and transaction with bloom filters (default: %u)</translation> - </message> - <message> - <source>The fee rate (in %s/kB) that indicates your tolerance for discarding change by adding it to the fee (default: %s). Note: An output is discarded if it is dust at this rate, but we will always discard up to the dust relay fee and a discard fee above that is limited by the fee estimate for the longest target</source> - <translation>The fee rate (in %s/kB) that indicates your tolerance for discarding change by adding it to the fee (default: %s). Note: An output is discarded if it is dust at this rate, but we will always discard up to the dust relay fee and a discard fee above that is limited by the fee estimate for the longest target.</translation> - </message> - <message> <source>This is the transaction fee you may pay when fee estimates are not available.</source> <translation>This is the transaction fee you may pay when fee estimates are not available.</translation> </message> @@ -3934,10 +3464,6 @@ <translation>Total length of network version string (%i) exceeds maximum length (%i). Reduce the number or size of uacomments.</translation> </message> <message> - <source>Tries to keep outbound traffic under the given target (in MiB per 24h), 0 = no limit (default: %d)</source> - <translation>Tries to keep outbound traffic under the given target (in MiB per 24h), 0 = no limit (default: %d)</translation> - </message> - <message> <source>Unsupported argument -socks found. Setting SOCKS version isn't possible anymore, only SOCKS5 proxies are supported.</source> <translation>Unsupported argument -socks found. Setting SOCKS version isn't possible anymore, only SOCKS5 proxies are supported.</translation> </message> @@ -3946,10 +3472,6 @@ <translation>Unsupported argument -whitelistalwaysrelay ignored, use -whitelistrelay and/or -whitelistforcerelay.</translation> </message> <message> - <source>Use separate SOCKS5 proxy to reach peers via Tor hidden services (default: %s)</source> - <translation>Use separate SOCKS5 proxy to reach peers via Tor hidden services (default: %s)</translation> - </message> - <message> <source>Warning: Unknown block versions being mined! It's possible unknown rules are in effect</source> <translation>Warning: Unknown block versions being mined! It's possible unknown rules are in effect</translation> </message> @@ -3958,110 +3480,18 @@ <translation>Warning: Wallet file corrupt, data salvaged! Original %s saved as %s in %s; if your balance or transactions are incorrect you should restore from a backup.</translation> </message> <message> - <source>Whitelist peers connecting from the given IP address (e.g. 1.2.3.4) or CIDR notated network (e.g. 1.2.3.0/24). Can be specified multiple times.</source> - <translation>Whitelist peers connecting from the given IP address (e.g. 1.2.3.4) or CIDR notated network (e.g. 1.2.3.0/24). Can be specified multiple times.</translation> - </message> - <message> <source>%s is set very high!</source> <translation>%s is set very high!</translation> </message> <message> - <source>(default: %s)</source> - <translation>(default: %s)</translation> - </message> - <message> - <source>Always query for peer addresses via DNS lookup (default: %u)</source> - <translation>Always query for peer addresses via DNS lookup (default: %u)</translation> - </message> - <message> - <source>Error loading wallet %s. -wallet filename must be a regular file.</source> - <translation>Error loading wallet %s. The -wallet filename must be a regular file.</translation> - </message> - <message> <source>Error loading wallet %s. Duplicate -wallet filename specified.</source> <translation>Error loading wallet %s. Duplicate -wallet filename specified.</translation> </message> <message> - <source>Error loading wallet %s. Invalid characters in -wallet filename.</source> - <translation>Error loading wallet %s. Invalid characters in -wallet filename.</translation> - </message> - <message> - <source>How many blocks to check at startup (default: %u, 0 = all)</source> - <translation>How many blocks to check at startup (default: %u, 0 = all)</translation> - </message> - <message> - <source>Include IP addresses in debug output (default: %u)</source> - <translation>Include IP addresses in debug output (default: %u)</translation> - </message> - <message> <source>Keypool ran out, please call keypoolrefill first</source> <translation>Keypool ran out, please call keypoolrefill first.</translation> </message> <message> - <source>Listen for JSON-RPC connections on <port> (default: %u or testnet: %u)</source> - <translation>Listen for JSON-RPC connections on <port> (default: %u or testnet: %u)</translation> - </message> - <message> - <source>Listen for connections on <port> (default: %u or testnet: %u)</source> - <translation>Listen for connections on <port> (default: %u or testnet: %u)</translation> - </message> - <message> - <source>Maintain at most <n> connections to peers (default: %u)</source> - <translation>Maintain at most <n> connections to peers (default: %u)</translation> - </message> - <message> - <source>Make the wallet broadcast transactions</source> - <translation>Make the wallet broadcast transactions</translation> - </message> - <message> - <source>Maximum per-connection receive buffer, <n>*1000 bytes (default: %u)</source> - <translation>Maximum per-connection receive buffer, <n>*1000 bytes (default: %u)</translation> - </message> - <message> - <source>Maximum per-connection send buffer, <n>*1000 bytes (default: %u)</source> - <translation>Maximum per-connection send buffer, <n>*1000 bytes (default: %u)</translation> - </message> - <message> - <source>Prepend debug output with timestamp (default: %u)</source> - <translation>Prepend debug output with timestamp (default: %u)</translation> - </message> - <message> - <source>Relay and mine data carrier transactions (default: %u)</source> - <translation>Relay and mine data carrier transactions (default: %u)</translation> - </message> - <message> - <source>Relay non-P2SH multisig (default: %u)</source> - <translation>Relay non-P2SH multisig (default: %u)</translation> - </message> - <message> - <source>Set key pool size to <n> (default: %u)</source> - <translation>Set key pool size to <n> (default: %u)</translation> - </message> - <message> - <source>Set maximum BIP141 block weight (default: %d)</source> - <translation>Set maximum BIP141 block weight (default: %d)</translation> - </message> - <message> - <source>Set the number of threads to service RPC calls (default: %d)</source> - <translation>Set the number of threads to service RPC calls (default: %d)</translation> - </message> - <message> - <source>Specify configuration file (default: %s)</source> - <translation>Specify configuration file (default: %s)</translation> - </message> - <message> - <source>Specify connection timeout in milliseconds (minimum: 1, default: %d)</source> - <translation>Specify connection timeout in milliseconds (minimum: 1, default: %d)</translation> - </message> - <message> - <source>Specify pid file (default: %s)</source> - <translation>Specify pid file (default: %s)</translation> - </message> - <message> - <source>Spend unconfirmed change when sending transactions (default: %u)</source> - <translation>Spend unconfirmed change when sending transactions (default: %u)</translation> - </message> - <message> <source>Starting network threads...</source> <translation>Starting network threads...</translation> </message> @@ -4078,10 +3508,6 @@ <translation>This is the transaction fee you will pay if you send a transaction.</translation> </message> <message> - <source>Threshold for disconnecting misbehaving peers (default: %u)</source> - <translation>Threshold for disconnecting misbehaving peers (default: %u)</translation> - </message> - <message> <source>Transaction amounts must not be negative</source> <translation>Transaction amounts must not be negative.</translation> </message> diff --git a/src/qt/locale/bitcoin_eo.ts b/src/qt/locale/bitcoin_eo.ts index 15f54db27a..550ca2a82a 100644 --- a/src/qt/locale/bitcoin_eo.ts +++ b/src/qt/locale/bitcoin_eo.ts @@ -30,6 +30,10 @@ <translation>Forigi la elektitan adreson el la listo</translation> </message> <message> + <source>Enter address or label to search</source> + <translation>Tajpu adreson aŭ etikedon por serĉi</translation> + </message> + <message> <source>Export the data in the current tab to a file</source> <translation>Eksporti la datumojn el la aktuala langeto al dosiero</translation> </message> @@ -571,19 +575,7 @@ <source>Command-line options</source> <translation>Komandliniaj agordaĵoj</translation> </message> - <message> - <source>Usage:</source> - <translation>Uzado:</translation> - </message> - <message> - <source>command-line options</source> - <translation>komandliniaj agordaĵoj</translation> - </message> - <message> - <source>UI Options:</source> - <translation>Uzantinterfaco ebloj:</translation> - </message> - </context> +</context> <context> <name>Intro</name> <message> @@ -1099,6 +1091,10 @@ <translation>Mesaĝo</translation> </message> <message> + <source>Wallet</source> + <translation>Monujo</translation> + </message> + <message> <source>Resulting URI too long, try to reduce the text for label / message.</source> <translation>La rezultanta URI estas tro longa. Provu malplilongigi la tekston de la etikedo / mesaĝo.</translation> </message> @@ -1245,18 +1241,14 @@ <translation>Ĉu vi certas, ke vi volas sendi?</translation> </message> <message> - <source>added as transaction fee</source> - <translation>aldonita kiel krompago</translation> - </message> - <message> - <source>Total Amount %1</source> - <translation>Totala sumo %1</translation> - </message> - <message> <source>or</source> <translation>aŭ</translation> </message> <message> + <source>Transaction fee</source> + <translation>Krompago</translation> + </message> + <message> <source>Confirm send coins</source> <translation>Konfirmi sendon de bitmono</translation> </message> @@ -1498,10 +1490,6 @@ <translation>Malferma ĝis %1</translation> </message> <message> - <source>%1/offline</source> - <translation>%1/senkonekte</translation> - </message> - <message> <source>%1/unconfirmed</source> <translation>%1/nekonfirmite</translation> </message> @@ -1514,10 +1502,6 @@ <translation>Stato</translation> </message> <message> - <source>, has not been successfully broadcast yet</source> - <translation>, ankoraŭ ne elsendita sukcese</translation> - </message> - <message> <source>Date</source> <translation>Dato</translation> </message> @@ -1640,10 +1624,6 @@ <translation>Malferma ĝis %1</translation> </message> <message> - <source>Offline</source> - <translation>Senkonekte</translation> - </message> - <message> <source>Unconfirmed</source> <translation>Nekonfirmita</translation> </message> @@ -1652,10 +1632,6 @@ <translation>Konfirmita (%1 konfirmoj)</translation> </message> <message> - <source>This block was not received by any other nodes and will probably not be accepted!</source> - <translation>Tiun ĉi blokon ne ricevis ajna alia nodo, kaj ĝi verŝajne ne akceptiĝos!</translation> - </message> - <message> <source>Generated but not accepted</source> <translation>Kreita sed ne akceptita</translation> </message> @@ -1866,42 +1842,10 @@ <context> <name>bitcoin-core</name> <message> - <source>Options:</source> - <translation>Agordoj:</translation> - </message> - <message> - <source>Specify data directory</source> - <translation>Specifi dosieron por datumoj</translation> - </message> - <message> - <source>Connect to a node to retrieve peer addresses, and disconnect</source> - <translation>Konekti al nodo por ricevi adresojn de samtavolanoj, kaj malkonekti</translation> - </message> - <message> - <source>Specify your own public address</source> - <translation>Specifi vian propran publikan adreson</translation> - </message> - <message> - <source>Accept command line and JSON-RPC commands</source> - <translation>Akcepti komandojn JSON-RPC kaj el komandlinio</translation> - </message> - <message> - <source>Run in the background as a daemon and accept commands</source> - <translation>Ruli fone kiel demono kaj akcepti komandojn</translation> - </message> - <message> <source>Bitcoin Core</source> <translation>Kerno de Bitmono</translation> </message> <message> - <source>Bind to given address and always listen on it. Use [host]:port notation for IPv6</source> - <translation>Bindi al donita adreso kaj ĉiam aŭskulti per ĝi. Uzu la formaton [gastigo]:pordo por IPv6</translation> - </message> - <message> - <source>Execute command when a wallet transaction changes (%s in cmd is replaced by TxID)</source> - <translation>Plenumi komandon kiam monuja transakcio ŝanĝiĝas (%s en cmd anstataŭiĝas per TxID)</translation> - </message> - <message> <source>This is a pre-release test build - use at your own risk - do not use for mining or merchant applications</source> <translation>Tiu ĉi estas antaŭeldona testa versio - uzu laŭ via propra risko - ne uzu por minado aŭ por aplikaĵoj por vendistoj</translation> </message> @@ -1914,18 +1858,6 @@ <translation>Averto: ŝajne ni ne tute konsentas kun niaj samtavolanoj! Eble vi devas ĝisdatigi vian klienton, aŭ eble aliaj nodoj faru same.</translation> </message> <message> - <source><category> can be:</source> - <translation><category> povas esti:</translation> - </message> - <message> - <source>Accept connections from outside (default: 1 if no -proxy or -connect)</source> - <translation>Akcepti konektojn el ekstere (defaŭlte: 1 se ne estas -proxy nek -connect)</translation> - </message> - <message> - <source>Block creation options:</source> - <translation>Blok-kreaj agordaĵoj:</translation> - </message> - <message> <source>Corrupted block database detected</source> <translation>Difektita blokdatumbazo trovita</translation> </message> @@ -1966,34 +1898,14 @@ <translation>Nesufiĉa nombro de dosierpriskribiloj disponeblas.</translation> </message> <message> - <source>Specify wallet file (within data directory)</source> - <translation>Specifi monujan dosieron (ene de dosierujo por datumoj)</translation> - </message> - <message> <source>Verifying blocks...</source> <translation>Kontrolado de blokoj...</translation> </message> <message> - <source>Wallet options:</source> - <translation>Monujaj opcioj:</translation> - </message> - <message> - <source>Execute command when a relevant alert is received or we see a really long fork (%s in cmd is replaced by message)</source> - <translation>Plenumi komandon kiam rilata alerto riceviĝas, aŭ kiam ni vidas tre longan forkon (%s en cms anstataŭiĝas per mesaĝo)</translation> - </message> - <message> <source>Information</source> <translation>Informoj</translation> </message> <message> - <source>Send trace/debug info to console instead of debug.log file</source> - <translation>Sendi spurajn/sencimigajn informojn al la konzolo anstataŭ al dosiero debug.log</translation> - </message> - <message> - <source>Shrink debug.log file on client startup (default: 1 when no -debug)</source> - <translation>Malpligrandigi la sencimigan protokol-dosieron kiam kliento lanĉiĝas (defaŭlte: 1 kiam mankas -debug)</translation> - </message> - <message> <source>Signing transaction failed</source> <translation>Subskriba transakcio fiaskis</translation> </message> @@ -2010,30 +1922,10 @@ <translation>Transakcio estas tro granda</translation> </message> <message> - <source>Username for JSON-RPC connections</source> - <translation>Salutnomo por konektoj JSON-RPC</translation> - </message> - <message> <source>Warning</source> <translation>Averto</translation> </message> <message> - <source>You need to rebuild the database using -reindex to change -txindex</source> - <translation>Vi devas rekontrui la datumbazon kun -reindex por ŝanĝi -txindex</translation> - </message> - <message> - <source>Password for JSON-RPC connections</source> - <translation>Pasvorto por konektoj JSON-RPC</translation> - </message> - <message> - <source>Execute command when the best block changes (%s in cmd is replaced by block hash)</source> - <translation>Plenumi komandon kiam plej bona bloko ŝanĝiĝas (%s en cmd anstataŭiĝas per bloka haketaĵo)</translation> - </message> - <message> - <source>Allow DNS lookups for -addnode, -seednode and -connect</source> - <translation>Permesi DNS-elserĉojn por -addnote, -seednote kaj -connect</translation> - </message> - <message> <source>Unknown network specified in -onlynet: '%s'</source> <translation>Nekonata reto specifita en -onlynet: '%s'</translation> </message> diff --git a/src/qt/locale/bitcoin_es.ts b/src/qt/locale/bitcoin_es.ts index 3a5f442957..0ae126eb33 100644 --- a/src/qt/locale/bitcoin_es.ts +++ b/src/qt/locale/bitcoin_es.ts @@ -30,6 +30,10 @@ <translation>Eliminar la dirección seleccionada de la lista</translation> </message> <message> + <source>Enter address or label to search</source> + <translation>Introduzca una dirección o etiqueta que buscar</translation> + </message> + <message> <source>Export the data in the current tab to a file</source> <translation>Exportar los datos en la ficha actual a un archivo</translation> </message> @@ -322,6 +326,14 @@ <translation>Abrir &URI...</translation> </message> <message> + <source>Wallet:</source> + <translation>Monedero</translation> + </message> + <message> + <source>default wallet</source> + <translation>monedero predeterminado</translation> + </message> + <message> <source>Click to disable network activity.</source> <translation>Pulsar para deshabilitar la actividad de red.</translation> </message> @@ -342,6 +354,10 @@ <translation>Reindexando bloques en disco...</translation> </message> <message> + <source>Proxy is <b>enabled</b>: %1</source> + <translation>Proxy está<b>habilitado</b>: %1</translation> + </message> + <message> <source>Send coins to a Bitcoin address</source> <translation>Enviar bitcoins a una dirección Bitcoin</translation> </message> @@ -510,6 +526,11 @@ </translation> </message> <message> + <source>Wallet: %1 +</source> + <translation>Monedero: %1</translation> + </message> + <message> <source>Type: %1 </source> <translation>Tipo: %1 @@ -576,7 +597,7 @@ </message> <message> <source>Fee:</source> - <translation>Tasa:</translation> + <translation>Comisión:</translation> </message> <message> <source>Dust:</source> @@ -660,7 +681,7 @@ </message> <message> <source>Copy after fee</source> - <translation>Copiar después de couta</translation> + <translation>Copiar después de comisión</translation> </message> <message> <source>Copy bytes</source> @@ -688,7 +709,7 @@ </message> <message> <source>This label turns red if any recipient receives an amount smaller than the current dust threshold.</source> - <translation>Esta etiqueta se vuelve roja si algún destinatario recibe una cantidad inferior a la actual puerta polvorienta.</translation> + <translation>Esta etiqueta se vuelve roja si algún destinatario recibe una cantidad inferior al actual umbral de polvo.</translation> </message> <message> <source>Can vary +/- %1 satoshi(s) per input.</source> @@ -730,16 +751,12 @@ <translation>&Dirección</translation> </message> <message> - <source>New receiving address</source> - <translation>Nueva dirección de recivimiento</translation> - </message> - <message> <source>New sending address</source> <translation>Nueva dirección de envío</translation> </message> <message> <source>Edit receiving address</source> - <translation>Editar dirección de recivimiento</translation> + <translation>Editar dirección de recepción</translation> </message> <message> <source>Edit sending address</source> @@ -750,12 +767,16 @@ <translation>La dirección introducida "%1" no es una dirección Bitcoin válida.</translation> </message> <message> - <source>The entered address "%1" is already in the address book.</source> - <translation>La dirección introducida "%1" está ya en la agenda.</translation> + <source>Address "%1" already exists as a receiving address with label "%2" and so cannot be added as a sending address.</source> + <translation>La dirección "%1" ya existe como dirección de recepción con la etiqueta "%2" y, por lo tanto, no se puede agregar como dirección de envío.</translation> + </message> + <message> + <source>The entered address "%1" is already in the address book with label "%2".</source> + <translation>La dirección ingresada "%1" ya está en la libreta de direcciones con la etiqueta "%2".</translation> </message> <message> <source>Could not unlock wallet.</source> - <translation>Podría no desbloquear el monedero.</translation> + <translation>No se pudo desbloquear el monedero.</translation> </message> <message> <source>New key generation failed.</source> @@ -797,47 +818,11 @@ </message> <message> <source>About %1</source> - <translation>Acerda de %1</translation> + <translation>Acerca de %1</translation> </message> <message> <source>Command-line options</source> - <translation>Opciones de la línea de órdenes</translation> - </message> - <message> - <source>Usage:</source> - <translation>Uso:</translation> - </message> - <message> - <source>command-line options</source> - <translation>opciones de la consola de comandos</translation> - </message> - <message> - <source>UI Options:</source> - <translation>Opciones de interfaz de usuario:</translation> - </message> - <message> - <source>Choose data directory on startup (default: %u)</source> - <translation>Elegir directorio de datos al iniciar (predeterminado: %u)</translation> - </message> - <message> - <source>Set language, for example "de_DE" (default: system locale)</source> - <translation>Establecer el idioma, por ejemplo, "es_ES" (predeterminado: configuración regional del sistema)</translation> - </message> - <message> - <source>Start minimized</source> - <translation>Arrancar minimizado</translation> - </message> - <message> - <source>Set SSL root certificates for payment request (default: -system-)</source> - <translation>Establecer los certificados raíz SSL para solicitudes de pago (predeterminado: -system-)</translation> - </message> - <message> - <source>Show splash screen on startup (default: %u)</source> - <translation>Mostrar pantalla de bienvenida en el inicio (predeterminado: %u)</translation> - </message> - <message> - <source>Reset all settings changed in the GUI</source> - <translation>Reiniciar todos los ajustes modificados en el GUI</translation> + <translation>Opciones de la línea de comandos</translation> </message> </context> <context> @@ -852,7 +837,7 @@ </message> <message> <source>As this is the first time the program is launched, you can choose where %1 will store its data.</source> - <translation>Al ser la primera vez que se ejecuta el programa, puede elegir donde %1 almacenará sus datos.</translation> + <translation>Al ser la primera vez que se ejecuta el programa, puede elegir dónde %1 almacenará sus datos.</translation> </message> <message> <source>When you click OK, %1 will begin to download and process the full %4 block chain (%2GB) starting with the earliest transactions in %3 when %4 initially launched.</source> @@ -966,7 +951,7 @@ <name>OpenURIDialog</name> <message> <source>Open URI</source> - <translation>Abrir URI...</translation> + <translation>Abrir URI</translation> </message> <message> <source>Open payment request from URI or file</source> @@ -978,7 +963,7 @@ </message> <message> <source>Select payment request file</source> - <translation>Seleccionar archivo de sulicitud de pago</translation> + <translation>Seleccionar archivo de solicitud de pago</translation> </message> <message> <source>Select payment request file to open</source> @@ -1068,6 +1053,22 @@ <translation>&Red</translation> </message> <message> + <source>Disables some advanced features but all blocks will still be fully validated. Reverting this setting requires re-downloading the entire blockchain. Actual disk usage may be somewhat higher.</source> + <translation>Desactiva algunas características avanzadas, pero todos los bloques se validarán por completo. Revertir esta configuración requiere volver a descargar todo el blockchain. El uso real del disco puede ser algo mayor.</translation> + </message> + <message> + <source>Prune &block storage to</source> + <translation>Podar el almacenamiento de &bloques para</translation> + </message> + <message> + <source>GB</source> + <translation>GB</translation> + </message> + <message> + <source>Reverting this setting requires re-downloading the entire blockchain.</source> + <translation>Revertir estas configuraciones requiere re-descargar el blockchain entero.</translation> + </message> + <message> <source>(0 = auto, <0 = leave that many cores free)</source> <translation>(0 = automático, <0 = dejar libres ese número de núcleos)</translation> </message> @@ -1101,7 +1102,7 @@ </message> <message> <source>Accept connections from outside.</source> - <translation>Aceptar conexiones externas.</translation> + <translation>Aceptar conexiones desde el exterior.</translation> </message> <message> <source>Allow incomin&g connections</source> @@ -1129,7 +1130,7 @@ </message> <message> <source>Used for reaching peers via:</source> - <translation>Usado para alcanzar compañeros via:</translation> + <translation>Usado para alcanzar pares via:</translation> </message> <message> <source>IPv4</source> @@ -1205,7 +1206,7 @@ </message> <message> <source>none</source> - <translation>Ninguna</translation> + <translation>ninguna</translation> </message> <message> <source>Confirm options reset</source> @@ -1225,7 +1226,7 @@ </message> <message> <source>The configuration file is used to specify advanced user options which override GUI settings. Additionally, any command-line options will override this configuration file.</source> - <translation>El fichero de configuración se utiliza para especificar opciones de usuario avanzadas que reemplazar las configuraciones de la interfaz gráfica de usuario. Adicionalmente, se reemplazará cualquier opción introducida en la línea de órdenes.</translation> + <translation>El fichero de configuración se utiliza para especificar opciones de usuario avanzadas que reemplazar las configuraciones de la interfaz gráfica de usuario. Adicionalmente, cualquier opción introducida en la línea de comandos reemplazará a este fichero de configuración.</translation> </message> <message> <source>Error</source> @@ -1256,7 +1257,7 @@ </message> <message> <source>Watch-only:</source> - <translation>De observación:</translation> + <translation>Solo observación:</translation> </message> <message> <source>Available:</source> @@ -1296,7 +1297,7 @@ </message> <message> <source>Your current balance in watch-only addresses</source> - <translation>Su saldo actual en direcciones watch-only</translation> + <translation>Su saldo actual en direcciones watch-only (solo-observación)</translation> </message> <message> <source>Spendable:</source> @@ -1308,7 +1309,7 @@ </message> <message> <source>Unconfirmed transactions to watch-only addresses</source> - <translation>Transacciones sin confirmar en direcciones watch-only</translation> + <translation>Transacciones sin confirmar en direcciones watch-only (solo-observación)</translation> </message> <message> <source>Mined balance in watch-only addresses that has not yet matured</source> @@ -1316,7 +1317,7 @@ </message> <message> <source>Current total balance in watch-only addresses</source> - <translation>Saldo total en las direcciones watch-only</translation> + <translation>Saldo total en las direcciones watch-only (solo-observación)</translation> </message> </context> <context> @@ -1334,6 +1335,10 @@ <translation>Manejo de URI</translation> </message> <message> + <source>'bitcoin://' is not a valid URI. Use 'bitcoin:' instead.</source> + <translation>'bitcoin: //' no es un URI válido. Use 'bitcoin:' en su lugar.</translation> + </message> + <message> <source>Payment request fetch URL is invalid: %1</source> <translation>La búsqueda de solicitud de pago URL es válida: %1</translation> </message> @@ -1359,7 +1364,7 @@ </message> <message> <source>Payment request network doesn't match client network.</source> - <translation>La red de solicitud de pago no cimbina la red cliente.</translation> + <translation>La red de solicitud de pago no coincide con la red cliente.</translation> </message> <message> <source>Payment request expired.</source> @@ -1426,7 +1431,7 @@ </message> <message> <source>Ping</source> - <translation>Sonido</translation> + <translation>Ping</translation> </message> <message> <source>Sent</source> @@ -1531,12 +1536,16 @@ <context> <name>QObject::QObject</name> <message> + <source>Error parsing command line arguments: %1.</source> + <translation>Error al parsear los argumentos de la línea de comando: %1.</translation> + </message> + <message> <source>Error: Specified data directory "%1" does not exist.</source> <translation>Error: El directorio de datos «%1» especificado no existe.</translation> </message> <message> - <source>Error: Cannot parse configuration file: %1. Only use key=value syntax.</source> - <translation>Error: No se puede analizar el archivo de configuración: %1. Utilice únicamente la sintaxis clave=valor.</translation> + <source>Error: Cannot parse configuration file: %1.</source> + <translation>Error: No se puede analizar/parsear el archivo de configuración: %1.</translation> </message> <message> <source>Error: %1</source> @@ -1629,6 +1638,14 @@ <translation>Uso de memoria</translation> </message> <message> + <source>Wallet: </source> + <translation>Monedero:</translation> + </message> + <message> + <source>(none)</source> + <translation>(ninguno)</translation> + </message> + <message> <source>&Reset</source> <translation>&Reiniciar</translation> </message> @@ -1646,7 +1663,7 @@ </message> <message> <source>Banned peers</source> - <translation>Peers Bloqueados</translation> + <translation>Pares bloqueados</translation> </message> <message> <source>Select a peer to view detailed information.</source> @@ -1670,7 +1687,7 @@ </message> <message> <source>Synced Headers</source> - <translation>Sincronizar Cabeceras</translation> + <translation>Cabeceras Sincronizadas</translation> </message> <message> <source>Synced Blocks</source> @@ -1706,15 +1723,15 @@ </message> <message> <source>Last Send</source> - <translation>Ultimo envío</translation> + <translation>Último envío</translation> </message> <message> <source>Last Receive</source> - <translation>Ultima recepción</translation> + <translation>Última recepción</translation> </message> <message> <source>Ping Time</source> - <translation>Ping</translation> + <translation>Tiempo de Ping</translation> </message> <message> <source>The duration of a currently outstanding ping.</source> @@ -1726,7 +1743,7 @@ </message> <message> <source>Min Ping</source> - <translation>Sonido Mínimo</translation> + <translation>Min Ping</translation> </message> <message> <source>Time Offset</source> @@ -1794,7 +1811,11 @@ </message> <message> <source>&Unban</source> - <translation>&Unbano</translation> + <translation>&Unban</translation> + </message> + <message> + <source>default wallet</source> + <translation>Monedero predeterminado</translation> </message> <message> <source>Welcome to the %1 RPC console.</source> @@ -1821,6 +1842,14 @@ <translation>Actividad de red deshabilitada</translation> </message> <message> + <source>Executing command without any wallet</source> + <translation>Ejecutar comando sin monedero</translation> + </message> + <message> + <source>Executing command using "%1" wallet</source> + <translation>Ejecutar comando usando "%1" monedero</translation> + </message> + <message> <source>(node id: %1)</source> <translation>(nodo: %1)</translation> </message> @@ -1892,20 +1921,20 @@ <translation>Vaciar</translation> </message> <message> - <source>Requested payments history</source> - <translation>Historial de pagos solicitados</translation> + <source>Native segwit addresses (aka Bech32 or BIP-173) reduce your transaction fees later on and offer better protection against typos, but old wallets don't support them. When unchecked, an address compatible with older wallets will be created instead.</source> + <translation>Las direcciones segwit nativas (también conocidas como Bech32 o BIP-173) reducen las comisiones de transacción más adelante y ofrecen una mejor protección contra errores tipográficos, pero las billeteras antiguas no las admiten. Cuando no está marcada, se creará una dirección compatible con billeteras más antiguas.</translation> </message> <message> - <source>&Request payment</source> - <translation>&Solicitar pago</translation> + <source>Generate native segwit (Bech32) address</source> + <translation>Generar dirección segwit nativa (Bech32)</translation> </message> <message> - <source>Bech32 addresses (BIP-173) are cheaper to spend from and offer better protection against typos. When unchecked a P2SH wrapped SegWit address will be created, compatible with older wallets.</source> - <translation>Las direcciones Bech32 (BIP-173) son mas baratas al gastar y ofrecen mejor proteción contra errores de tipeo. Cuando no se marque una dirección SegWit envuelta en P2SH será creada, compatible con monederos antiguos. </translation> + <source>Requested payments history</source> + <translation>Historial de pagos solicitados</translation> </message> <message> - <source>Generate Bech32 address</source> - <translation>Generar dirección Bech32</translation> + <source>&Request payment</source> + <translation>&Solicitar pago</translation> </message> <message> <source>Show the selected request (does the same as double clicking an entry)</source> @@ -1917,7 +1946,7 @@ </message> <message> <source>Remove the selected entries from the list</source> - <translation>Borrar de la lista las direcciónes actualmente seleccionadas</translation> + <translation>Borrar las entradas seleccionadas de la lista</translation> </message> <message> <source>Remove</source> @@ -1929,7 +1958,7 @@ </message> <message> <source>Copy label</source> - <translation>Copiar capa</translation> + <translation>Copiar etiqueta</translation> </message> <message> <source>Copy message</source> @@ -1987,6 +2016,10 @@ <translation>Mensaje</translation> </message> <message> + <source>Wallet</source> + <translation>Monedero</translation> + </message> + <message> <source>Resulting URI too long, try to reduce the text for label / message.</source> <translation>URI resultante demasiado grande, trate de reducir el texto de etiqueta / mensaje.</translation> </message> @@ -2042,7 +2075,7 @@ </message> <message> <source>automatically selected</source> - <translation>Seleccionado automáticamente</translation> + <translation>seleccionado automáticamente</translation> </message> <message> <source>Insufficient funds!</source> @@ -2062,11 +2095,11 @@ </message> <message> <source>Fee:</source> - <translation>Tasa:</translation> + <translation>Comisión:</translation> </message> <message> <source>After Fee:</source> - <translation>Después de tasas:</translation> + <translation>Después de comisión:</translation> </message> <message> <source>Change:</source> @@ -2094,19 +2127,23 @@ </message> <message> <source>Warning: Fee estimation is currently not possible.</source> - <translation>Advertencia: En este momento no se puede estimar la cuota.</translation> + <translation>Advertencia: En este momento no se puede estimar la comisión.</translation> </message> <message> <source>collapse fee-settings</source> <translation>Colapsar ajustes de comisión.</translation> </message> <message> - <source>per kilobyte</source> - <translation>por kilobyte</translation> + <source>Specify a custom fee per kB (1,000 bytes) of the transaction's virtual size. + +Note: Since the fee is calculated on a per-byte basis, a fee of "100 satoshis per kB" for a transaction size of 500 bytes (half of 1 kB) would ultimately yield a fee of only 50 satoshis.</source> + <translation>Especifique una comisión personalizada por kB (1,000 bytes) del tamaño virtual de la transacción. + +Nota: Dado que la comisión se calcula por byte, una comisión de "100 satoshis por kB" para un tamaño de transacción de 500 bytes (la mitad de 1 kB) finalmente generará una comisión de solo 50 satoshis.</translation> </message> <message> - <source>If the custom fee is set to 1000 satoshis and the transaction is only 250 bytes, then "per kilobyte" only pays 250 satoshis in fee, while "total at least" pays 1000 satoshis. For transactions bigger than a kilobyte both pay by kilobyte.</source> - <translation>Si la comisión se establece en 1000 satoshis y la transacción está a sólo 250 bytes, entonces "por kilobyte" sólo paga 250 satoshis de cuota, mientras que "el mínimo total" pagaría 1.000 satoshis. Para las transacciones más grandes que un kilobyte ambos pagan por kilobyte</translation> + <source>per kilobyte</source> + <translation>por kilobyte</translation> </message> <message> <source>Hide</source> @@ -2190,7 +2227,7 @@ </message> <message> <source>Copy after fee</source> - <translation>Copiar después de couta</translation> + <translation>Copiar después de comisión</translation> </message> <message> <source>Copy bytes</source> @@ -2217,14 +2254,6 @@ <translation>¿Seguro que quiere enviar?</translation> </message> <message> - <source>added as transaction fee</source> - <translation>añadido como comisión de transacción</translation> - </message> - <message> - <source>Total Amount %1</source> - <translation>Cantidad total %1</translation> - </message> - <message> <source>or</source> <translation>o</translation> </message> @@ -2233,10 +2262,26 @@ <translation>Puede incrementar la comisión más tarde (usa Replace-By-Fee, BIP-125).</translation> </message> <message> + <source>from wallet %1</source> + <translation>de monedero %1</translation> + </message> + <message> + <source>Please, review your transaction.</source> + <translation>Por favor, revisa tu transacción</translation> + </message> + <message> + <source>Transaction fee</source> + <translation>Comisión de transacción</translation> + </message> + <message> <source>Not signalling Replace-By-Fee, BIP-125.</source> <translation>No usa Replace-By-Fee, BIP-125.</translation> </message> <message> + <source>Total Amount</source> + <translation>Monto total</translation> + </message> + <message> <source>Confirm send coins</source> <translation>Confirmar enviar monedas</translation> </message> @@ -2270,7 +2315,7 @@ </message> <message> <source>A fee higher than %1 is considered an absurdly high fee.</source> - <translation>Una comisión mayor que %1 se considera una cuota irracionalmente alta.</translation> + <translation>Una comisión mayor que %1 se considera una comisión irracionalmente alta.</translation> </message> <message> <source>Payment request expired.</source> @@ -2290,7 +2335,7 @@ </message> <message> <source>Warning: Unknown change address</source> - <translation>Alerta: dirección cambiada desconocida</translation> + <translation>Alerta: dirección de cambio desconocida</translation> </message> <message> <source>Confirm custom change address</source> @@ -2575,11 +2620,7 @@ </message> <message> <source>conflicted with a transaction with %1 confirmations</source> - <translation>Hay un conflicto con la traducción de las confirmaciones %1</translation> - </message> - <message> - <source>%1/offline</source> - <translation>%1/sin conexión</translation> + <translation>Hay un conflicto con una transacción con %1 confirmaciones</translation> </message> <message> <source>0/unconfirmed, %1</source> @@ -2587,11 +2628,11 @@ </message> <message> <source>in memory pool</source> - <translation>en el equipo de memoria</translation> + <translation>en el pool de memoria</translation> </message> <message> <source>not in memory pool</source> - <translation>no en el equipo de memoria</translation> + <translation>no en el pool de memoria</translation> </message> <message> <source>abandoned</source> @@ -2610,14 +2651,6 @@ <translation>Estado</translation> </message> <message> - <source>, has not been successfully broadcast yet</source> - <translation>, no ha sido emitido con éxito aún</translation> - </message> - <message numerus="yes"> - <source>, broadcast through %n node(s)</source> - <translation><numerusform>, transmitir a través de %n nodo</numerusform><numerusform>, transmitir a través de %n nodos</numerusform></translation> - </message> - <message> <source>Date</source> <translation>Fecha</translation> </message> @@ -2702,6 +2735,10 @@ <translation>Tamaño total de transacción</translation> </message> <message> + <source>Transaction virtual size</source> + <translation>Tamaño virtual de transacción</translation> + </message> + <message> <source>Output index</source> <translation>Indice de salida</translation> </message> @@ -2723,7 +2760,7 @@ </message> <message> <source>Inputs</source> - <translation>entradas</translation> + <translation>Entradas</translation> </message> <message> <source>Amount</source> @@ -2772,10 +2809,6 @@ <translation>Abierto hasta %1</translation> </message> <message> - <source>Offline</source> - <translation>Sin conexion</translation> - </message> - <message> <source>Unconfirmed</source> <translation>Sin confirmar</translation> </message> @@ -2800,10 +2833,6 @@ <translation>No disponible (%1 confirmaciones. Estarán disponibles al cabo de %2)</translation> </message> <message> - <source>This block was not received by any other nodes and will probably not be accepted!</source> - <translation>Este bloque no ha sido recibido por otros nodos y probablemente no sea aceptado!</translation> - </message> - <message> <source>Generated but not accepted</source> <translation>Generado pero no aceptado</translation> </message> @@ -2936,7 +2965,7 @@ </message> <message> <source>Copy label</source> - <translation>Copiar capa</translation> + <translation>Copiar etiqueta</translation> </message> <message> <source>Copy amount</source> @@ -3045,19 +3074,19 @@ </message> <message> <source>Fee bump error</source> - <translation>Error de incremento de cuota</translation> + <translation>Error de incremento de comisión</translation> </message> <message> <source>Increasing transaction fee failed</source> - <translation>Ha fallado el incremento de la cuota de transacción.</translation> + <translation>Ha fallado el incremento de la comisión de transacción.</translation> </message> <message> <source>Do you want to increase the fee?</source> - <translation>¿Desea incrementar la cuota?</translation> + <translation>¿Desea incrementar la comisión?</translation> </message> <message> <source>Current fee:</source> - <translation>Cuota actual:</translation> + <translation>Comisión actual:</translation> </message> <message> <source>Increase:</source> @@ -3065,11 +3094,11 @@ </message> <message> <source>New fee:</source> - <translation>Nueva cuota:</translation> + <translation>Nueva comisión:</translation> </message> <message> <source>Confirm fee bump</source> - <translation>Confirmar incremento de cuota.</translation> + <translation>Confirmar incremento de comisión.</translation> </message> <message> <source>Can't sign transaction.</source> @@ -3114,42 +3143,20 @@ <source>The wallet data was successfully saved to %1.</source> <translation>Los datos del monedero se han guardado con éxito en %1.</translation> </message> + <message> + <source>Cancel</source> + <translation>Cancelar</translation> + </message> </context> <context> <name>bitcoin-core</name> <message> - <source>Options:</source> - <translation>Opciones: -</translation> - </message> - <message> - <source>Specify data directory</source> - <translation>Especificar directorio para los datos</translation> - </message> - <message> - <source>Connect to a node to retrieve peer addresses, and disconnect</source> - <translation>Conectar a un nodo para obtener direcciones de pares y desconectar</translation> - </message> - <message> - <source>Specify your own public address</source> - <translation>Especifique su propia dirección pública</translation> - </message> - <message> - <source>Accept command line and JSON-RPC commands</source> - <translation>Aceptar comandos consola y JSON-RPC -</translation> - </message> - <message> <source>Distributed under the MIT software license, see the accompanying file %s or %s</source> <translation>Distribuido bajo la licencia de software MIT, vea el archivo adjunto %s o %s</translation> </message> <message> - <source>If <category> is not supplied or if <category> = 1, output all debugging information.</source> - <translation>Si <category> no es proporcionado o si <category> =1, muestra toda la información de depuración.</translation> - </message> - <message> <source>Prune configured below the minimum of %d MiB. Please use a higher number.</source> - <translation>La Poda se ha configurado por debajo del minimo de %d MiB. Por favor utiliza un valor mas alto.</translation> + <translation>La Poda se ha configurado por debajo del minimo de %d MiB. Por favor utiliza un valor más alto.</translation> </message> <message> <source>Prune: last wallet synchronisation goes beyond pruned data. You need to -reindex (download the whole blockchain again in case of pruned node)</source> @@ -3164,19 +3171,10 @@ <translation>Un error interno fatal ocurrió, ver debug.log para detalles</translation> </message> <message> - <source>Fee (in %s/kB) to add to transactions you send (default: %s)</source> - <translation>Comisión (en %s/KB) para agregar a las transacciones que envíe (por defecto: %s)</translation> - </message> - <message> <source>Pruning blockstore...</source> <translation>Poda blockstore ...</translation> </message> <message> - <source>Run in the background as a daemon and accept commands</source> - <translation>Ejecutar en segundo plano como daemon y aceptar comandos -</translation> - </message> - <message> <source>Unable to start HTTP server. See debug log for details.</source> <translation>No se ha podido comenzar el servidor HTTP. Ver debug log para detalles.</translation> </message> @@ -3189,22 +3187,6 @@ <translation>Los desarrolladores de %s</translation> </message> <message> - <source>A fee rate (in %s/kB) that will be used when fee estimation has insufficient data (default: %s)</source> - <translation>Una comision (en %s/kB) que sera usada cuando las estimacion de comision no disponga de suficientes datos (predeterminado: %s)</translation> - </message> - <message> - <source>Accept relayed transactions received from whitelisted peers even when not relaying transactions (default: %d)</source> - <translation>Aceptar transacciones retransmitidas recibidas desde nodos en la lista blanca incluso cuando no estés retransmitiendo transacciones (predeterminado: %d)</translation> - </message> - <message> - <source>Add a node to connect to and attempt to keep the connection open (see the `addnode` RPC command help for more info)</source> - <translation>Agregue un nodo para conectars e intentar mantener una conexión abierta (véase el comando de ayuda RPC "addnode" para mas información)</translation> - </message> - <message> - <source>Bind to given address and always listen on it. Use [host]:port notation for IPv6</source> - <translation>Vincular a la dirección dada y escuchar siempre en ella. Utilice la notación [host]:port para IPv6</translation> - </message> - <message> <source>Cannot obtain a lock on data directory %s. %s is probably already running.</source> <translation>No se puede bloquear el directorio %s. %s ya se está ejecutando.</translation> </message> @@ -3213,42 +3195,10 @@ <translation>No es posible mostrar las conexiones indicadas y tener addrman buscando conexiones al mismo tiempo.</translation> </message> <message> - <source>Connect only to the specified node(s); -connect=0 disables automatic connections (the rules for this peer are the same as for -addnode)</source> - <translation>Conectar solo al nodo(s) especificado(s); -connect=0 deshabilita conexiones automáticas (las reglas para este nodo son las mismas que para -addnode)</translation> - </message> - <message> - <source>Delete all wallet transactions and only recover those parts of the blockchain through -rescan on startup</source> - <translation>Borrar todas las transacciones del monedero y sólo recuperar aquellas partes de la cadena de bloques por medio de -rescan on startup.</translation> - </message> - <message> <source>Error reading %s! All keys read correctly, but transaction data or address book entries might be missing or incorrect.</source> <translation>Error leyendo %s!. Todas las claves se han leido correctamente, pero los datos de transacciones o la libreta de direcciones pueden faltar o ser incorrectos.</translation> </message> <message> - <source>Exclude debugging information for a category. Can be used in conjunction with -debug=1 to output debug logs for all categories except one or more specified categories.</source> - <translation>Descartar información de depuración para una categoría. Puede utilizarse simultáneamente con -debug=1 para escribir información de depuración de todas las categorías a excepción de una o más categorías. </translation> - </message> - <message> - <source>Execute command when a wallet transaction changes (%s in cmd is replaced by TxID)</source> - <translation>Ejecutar comando cuando una transacción del monedero cambia (%s en cmd se remplazará por TxID)</translation> - </message> - <message> - <source>Extra transactions to keep in memory for compact block reconstructions (default: %u)</source> - <translation>Transacciones extra a mantener en la memoria para reconstrucciones de bloque compacto (predeterminado: %u)</translation> - </message> - <message> - <source>If this block is in the chain assume that it and its ancestors are valid and potentially skip their script verification (0 to verify all, default: %s, testnet: %s)</source> - <translation>Si este bloque está en la cadena asuma que sus predecesores y él son válidos y potencialmente se saltan su script de verificación (0 para verificar todo, predeterminado: %s, testnet: %s)</translation> - </message> - <message> - <source>Maximum allowed median peer time offset adjustment. Local perspective of time may be influenced by peers forward or backward by this amount. (default: %u seconds)</source> - <translation>Ajuste máximo permitido del tiempo offset medio de pares. La perspectiva local de tiempo se verá influenciada por los pares anteriores y posteriores a esta cantidad. (Por defecto: %u segundos)</translation> - </message> - <message> - <source>Maximum total fees (in %s) to use in a single wallet transaction or raw transaction; setting this too low may abort large transactions (default: %s)</source> - <translation>Máximas comisiones totales (en %s) para utilizar en una sola transacción del monedero; establecer esto demasiado bajo puede abortar grandes transacciones (predeterminado: %s)</translation> - </message> - <message> <source>Please check that your computer's date and time are correct! If your clock is wrong, %s will not work properly.</source> <translation>Por favor, compruebe si la fecha y hora en su computadora son correctas! Si su reloj esta mal, %s no trabajara correctamente. </translation> </message> @@ -3257,22 +3207,6 @@ <translation>Contribuya si encuentra %s de utilidad. Visite %s para mas información acerca del programa.</translation> </message> <message> - <source>Query for peer addresses via DNS lookup, if low on addresses (default: 1 unless -connect used)</source> - <translation>Consultar las direcciones de pares mediante búsqueda DNS, si existen pocas direcciones (por defecto: 1 excepto si se está usando -connect)</translation> - </message> - <message> - <source>Reduce storage requirements by enabling pruning (deleting) of old blocks. This allows the pruneblockchain RPC to be called to delete specific blocks, and enables automatic pruning of old blocks if a target size in MiB is provided. This mode is incompatible with -txindex and -rescan. Warning: Reverting this setting requires re-downloading the entire blockchain. (default: 0 = disable pruning blocks, 1 = allow manual pruning via RPC, >%u = automatically prune block files to stay under the specified target size in MiB)</source> - <translation>Reducir los requerimientos de almacenamiento habilitando la poda (eliminación) de los bloques viejos. Esto permite que la cadena de bloqueo RPC sea llamada para eliminar bloques específicos, y habilita la poda automática de bloques viejos si se provee el tamaño de un objetivo en MiB. Este modo es incompatible con -txindex and -rescan. Precaución: Revertir este ajuste requiere volver a descargar la cadena de bloqueo completa. (predefinido: 0 = deshabilita bloques de poda, 1 = permite la poda manual mediante RPC, >%u = elimina automáticamente los archivos de bloqueo para permanecer bajo el tamaño del objetivo especificado en MiB)</translation> - </message> - <message> - <source>Set lowest fee rate (in %s/kB) for transactions to be included in block creation. (default: %s)</source> - <translation>Establecer la tasa más baja (en %s/kB) por transacciones para incluirse en la creación de bloque. (predeterminado: %s)</translation> - </message> - <message> - <source>Set the number of script verification threads (%u to %d, 0 = auto, <0 = leave that many cores free, default: %d)</source> - <translation>Establecer el número de hilos (threads) de verificación de scripts (entre %u y %d, 0 = automático, <0 = dejar libres ese número de núcleos; predeterminado: %d)</translation> - </message> - <message> <source>The block database contains a block which appears to be from the future. This may be due to your computer's date and time being set incorrectly. Only rebuild the block database if you are sure that your computer's date and time are correct</source> <translation>La base de datos de bloques contiene un bloque que parece ser del futuro. Esto puede ser porque la fecha y hora de tu ordenador están mal ajustados. Reconstruye la base de datos de bloques solo si estas seguro de que la fecha y hora de tu ordenador estan ajustados correctamente.</translation> </message> @@ -3293,18 +3227,6 @@ <translation>No es posible reconstruir la base de datos a un estado anterior. Debe descargar de nuevo la cadena de bloques.</translation> </message> <message> - <source>Use UPnP to map the listening port (default: 1 when listening and no -proxy)</source> - <translation>Utiliza UPnP para asignar el puerto de escucha (predeterminado: 1 cuando esta escuchando sin -proxy)</translation> - </message> - <message> - <source>Username and hashed password for JSON-RPC connections. The field <userpw> comes in the format: <USERNAME>:<SALT>$<HASH>. A canonical python script is included in share/rpcuser. The client then connects normally using the rpcuser=<USERNAME>/rpcpassword=<PASSWORD> pair of arguments. This option can be specified multiple times</source> - <translation>Nombre de usuario y contraseña numerada para conexiones JSON-RPC. El campo <userpw> viene en el formato: <USERNAME>:<SALT>$<HASH>. Un script canónico de python está incluído en compartir/usuario rpc. Entonces el cliente se conecta normalmente utilizando la pareja de argumentos usuario rpc=<USERNAME>/contraseña rpc=<PASSWORD>. Esta opción puede ser especificada múltiples veces</translation> - </message> - <message> - <source>Wallet will not create transactions that violate mempool chain limits (default: %u)</source> - <translation>El monedero no creará transacciones que violen los límites de la cadena mempool (predeterminado: %u)</translation> - </message> - <message> <source>Warning: The network does not appear to fully agree! Some miners appear to be experiencing issues.</source> <translation>Advertencia: ¡La red no parece coincidir del todo! Algunos mineros parecen estar experimentando problemas.</translation> </message> @@ -3313,10 +3235,6 @@ <translation>Advertencia: ¡No parecemos estar del todo con nuestros pares! Puede que necesite actualizarse, o puede que otros nodos necesiten actualizarse.</translation> </message> <message> - <source>Whether to save the mempool on shutdown and load on restart (default: %u)</source> - <translation>Indica si guardar el mempool al cerrar y cargar al reiniciar (por defecto: %u)</translation> - </message> - <message> <source>%d of last 100 blocks have unexpected version</source> <translation>%d de los últimos 100 bloques tienen versión no esperada</translation> </message> @@ -3329,42 +3247,14 @@ <translation>-maxmempool debe ser por lo menos de %d MB</translation> </message> <message> - <source><category> can be:</source> - <translation><category> puede ser:</translation> - </message> - <message> - <source>Accept connections from outside (default: 1 if no -proxy or -connect)</source> - <translation>Aceptar conexiones desde el exterior (predeterminado: 1 si no -proxy o -connect)</translation> - </message> - <message> - <source>Append comment to the user agent string</source> - <translation>Adjunta un comentario a la linea de agente de usuario</translation> - </message> - <message> - <source>Attempt to recover private keys from a corrupt wallet on startup</source> - <translation>Intento de recuperar claves privadas de un monedero corrupto en arranque</translation> - </message> - <message> - <source>Block creation options:</source> - <translation>Opciones de creación de bloques:</translation> - </message> - <message> <source>Cannot resolve -%s address: '%s'</source> <translation>No se puede resolver -%s direccion: '%s'</translation> </message> <message> - <source>Chain selection options:</source> - <translation>Opciones de selección en cadena:</translation> - </message> - <message> <source>Change index out of range</source> <translation>Cambio de indice fuera de rango</translation> </message> <message> - <source>Connection options:</source> - <translation>Opciones de conexión:</translation> - </message> - <message> <source>Copyright (C) %i-%i</source> <translation>Copyright (C) %i-%i</translation> </message> @@ -3373,38 +3263,10 @@ <translation>Corrupción de base de datos de bloques detectada.</translation> </message> <message> - <source>Debugging/Testing options:</source> - <translation>Opciones de depuración/pruebas:</translation> - </message> - <message> - <source>Do not load the wallet and disable wallet RPC calls</source> - <translation>No cargar el monedero y desactivar las llamadas RPC del monedero</translation> - </message> - <message> <source>Do you want to rebuild the block database now?</source> <translation>¿Quieres reconstruir la base de datos de bloques ahora?</translation> </message> <message> - <source>Enable publish hash block in <address></source> - <translation>Activar publicar bloque .hash en <.Address></translation> - </message> - <message> - <source>Enable publish hash transaction in <address></source> - <translation>Activar publicar transacción .hash en <.Address></translation> - </message> - <message> - <source>Enable publish raw block in <address></source> - <translation>Habilita la publicacion de bloques en bruto en <direccion></translation> - </message> - <message> - <source>Enable publish raw transaction in <address></source> - <translation>Habilitar publicar transacción en rama en <dirección></translation> - </message> - <message> - <source>Enable transaction replacement in the memory pool (default: %u)</source> - <translation>Habilita el reemplazamiento de transacciones en la piscina de memoria (predeterminado: %u)</translation> - </message> - <message> <source>Error creating %s: You can't create non-HD wallets with this version.</source> <translation>Error generando %s: Con esta versin no puede crear monederos no-HD.</translation> </message> @@ -3421,6 +3283,10 @@ <translation>Error cargando %s</translation> </message> <message> + <source>Error loading %s: Private keys can only be disabled during creation</source> + <translation>Error cargando %s: las claves privadas solo pueden ser deshabilitado durante la creación</translation> + </message> + <message> <source>Error loading %s: Wallet corrupted</source> <translation>Error cargando %s: Monedero dañado</translation> </message> @@ -3473,8 +3339,8 @@ <translation>Cantidad inválida para -fallbackfee=<amount>: '%s'</translation> </message> <message> - <source>Keep the transaction memory pool below <n> megabytes (default: %u)</source> - <translation>Mantener la memoria de transacciones por debajo de <n> megabytes (predeterminado: %u)</translation> + <source>Upgrading txindex database</source> + <translation>Actualización de la base de datos txindex</translation> </message> <message> <source>Loading P2P addresses...</source> @@ -3485,26 +3351,10 @@ <translation>Cargando banlist...</translation> </message> <message> - <source>Location of the auth cookie (default: data dir)</source> - <translation>Ubicación de la cookie de autenticación (default: data dir)</translation> - </message> - <message> <source>Not enough file descriptors available.</source> <translation>No hay suficientes descriptores de archivo disponibles. </translation> </message> <message> - <source>Only connect to nodes in network <net> (ipv4, ipv6 or onion)</source> - <translation>Sólo conectar a nodos en redes <net> (ipv4, ipv6 o onion)</translation> - </message> - <message> - <source>Print this help message and exit</source> - <translation>Imprimir este mensaje de ayuda y salir</translation> - </message> - <message> - <source>Print version and exit</source> - <translation>Imprimir versión y salir</translation> - </message> - <message> <source>Prune cannot be configured with a negative value.</source> <translation>Pode no se puede configurar con un valor negativo.</translation> </message> @@ -3513,14 +3363,6 @@ <translation>El modo recorte es incompatible con -txindex.</translation> </message> <message> - <source>Rebuild chain state and block index from the blk*.dat files on disk</source> - <translation>Reconstruir el estado de la cadena e indice de bloques a partir de los ficheros blk*.dat en disco</translation> - </message> - <message> - <source>Rebuild chain state from the currently indexed blocks</source> - <translation>Reconstruir el estado de la cadena a partir de los bloques indexados</translation> - </message> - <message> <source>Replaying blocks...</source> <translation>Reproduciendo bloques ...</translation> </message> @@ -3529,14 +3371,6 @@ <translation>Verificando bloques...</translation> </message> <message> - <source>Set database cache size in megabytes (%d to %d, default: %d)</source> - <translation>Asignar tamaño del cache en megabytes (entre %d y %d; predeterminado: %d)</translation> - </message> - <message> - <source>Specify wallet file (within data directory)</source> - <translation>Especificar archivo de monedero (dentro del directorio de datos)</translation> - </message> - <message> <source>The source code is available from %s.</source> <translation>El código fuente esta disponible desde %s.</translation> </message> @@ -3549,6 +3383,10 @@ <translation>No se ha podido conectar con %s en este equipo. %s es posible que este todavia en ejecución.</translation> </message> <message> + <source>Unable to generate keys</source> + <translation>Incapaz de generar claves</translation> + </message> + <message> <source>Unsupported argument -benchmark ignored, use -debug=bench.</source> <translation>El argumento -benchmark no es soportado y ha sido ignorado, utiliza -debug=bench</translation> </message> @@ -3569,14 +3407,6 @@ <translation>Actualizando la base de datos UTXO</translation> </message> <message> - <source>Use UPnP to map the listening port (default: %u)</source> - <translation>Usar UPnP para asignar el puerto de escucha (predeterminado:: %u)</translation> - </message> - <message> - <source>Use the test chain</source> - <translation>Utilice la cadena de prueba</translation> - </message> - <message> <source>User Agent comment (%s) contains unsafe characters.</source> <translation>El comentario del Agente de Usuario (%s) contiene caracteres inseguros.</translation> </message> @@ -3585,90 +3415,26 @@ <translation>Verificando bloques...</translation> </message> <message> - <source>Wallet debugging/testing options:</source> - <translation>Opciones de depuración/pruebas de monedero:</translation> - </message> - <message> <source>Wallet needed to be rewritten: restart %s to complete</source> <translation>Es necesario reescribir el monedero: reiniciar %s para completar</translation> </message> <message> - <source>Wallet options:</source> - <translation>Opciones de monedero:</translation> - </message> - <message> - <source>Allow JSON-RPC connections from specified source. Valid for <ip> are a single IP (e.g. 1.2.3.4), a network/netmask (e.g. 1.2.3.4/255.255.255.0) or a network/CIDR (e.g. 1.2.3.4/24). This option can be specified multiple times</source> - <translation>Permitir conexiones JSON-RPC de origen especificado. Válido para son una sola IP (por ejemplo 1.2.3.4), una red/máscara de red (por ejemplo 1.2.3.4/255.255.255.0) o una red/CIDR (e.g. 1.2.3.4/24). Esta opción se puede especificar varias veces</translation> - </message> - <message> - <source>Bind to given address and whitelist peers connecting to it. Use [host]:port notation for IPv6</source> - <translation>Ligar a las direcciones especificadas y poner en lista blanca a los equipos conectados a ellas. Usar la notación para IPv6 [host]:puerto.</translation> - </message> - <message> - <source>Create new files with system default permissions, instead of umask 077 (only effective with disabled wallet functionality)</source> - <translation>Crear nuevos archivos con permisos por defecto del sistema, en lugar de umask 077 (sólo efectivo con la funcionalidad de monedero desactivada)</translation> - </message> - <message> - <source>Discover own IP addresses (default: 1 when listening and no -externalip or -proxy)</source> - <translation>Descubra direcciones IP propias (por defecto: 1 cuando se escucha y nadie -externalip o -proxy)</translation> - </message> - <message> <source>Error: Listening for incoming connections failed (listen returned error %s)</source> <translation>Error: la escucha para conexiones entrantes falló (la escucha regresó el error %s)</translation> </message> <message> - <source>Execute command when a relevant alert is received or we see a really long fork (%s in cmd is replaced by message)</source> - <translation>Ejecutar un comando cuando se reciba una alerta importante o cuando veamos un fork demasiado largo (%s en cmd se reemplazará por el mensaje)</translation> - </message> - <message> - <source>Fees (in %s/kB) smaller than this are considered zero fee for relaying, mining and transaction creation (default: %s)</source> - <translation>Las comisiones (en %s/kB) mas pequeñas que esto se consideran como cero comisión para la retransmisión, minería y creación de la transacción (predeterminado: %s)</translation> - </message> - <message> - <source>If paytxfee is not set, include enough fee so transactions begin confirmation on average within n blocks (default: %u)</source> - <translation>Si el pago de comisión no está establecido, incluir la cuota suficiente para que las transacciones comiencen la confirmación en una media de n bloques ( por defecto :%u)</translation> - </message> - <message> <source>Invalid amount for -maxtxfee=<amount>: '%s' (must be at least the minrelay fee of %s to prevent stuck transactions)</source> <translation>Cantidad no válida para -maxtxfee=<amount>: '%s' (debe ser por lo menos la comisión mínima de %s para prevenir transacciones atascadas)</translation> </message> <message> - <source>Maximum size of data in data carrier transactions we relay and mine (default: %u)</source> - <translation>El tamaño máximo de los datos en las operaciones de transporte de datos que transmitimos y el mio (default: %u)</translation> - </message> - <message> - <source>Randomize credentials for every proxy connection. This enables Tor stream isolation (default: %u)</source> - <translation>Aleatorizar las credenciales para cada conexión proxy. Esto habilita la Tor stream isolation (por defecto: %u)</translation> - </message> - <message> <source>The transaction amount is too small to send after the fee has been deducted</source> <translation>Monto de transacción muy pequeña luego de la deducción por comisión</translation> </message> <message> - <source>Whitelisted peers cannot be DoS banned and their transactions are always relayed, even if they are already in the mempool, useful e.g. for a gateway</source> - <translation>A los equipos en lista blanca no se les pueden prohibir los ataques DoS y sus transacciones siempre son retransmitidas, incluso si ya están en el mempool, es útil por ejemplo para un gateway.</translation> - </message> - <message> <source>You need to rebuild the database using -reindex to go back to unpruned mode. This will redownload the entire blockchain</source> <translation>Necesitas reconstruir la base de datos utilizando -reindex para volver al modo sin recorte. Esto volverá a descargar toda la cadena de bloques</translation> </message> <message> - <source>(default: %u)</source> - <translation>(por defecto: %u)</translation> - </message> - <message> - <source>Accept public REST requests (default: %u)</source> - <translation>Aceptar solicitudes públicas en FERIADOS (por defecto: %u)</translation> - </message> - <message> - <source>Automatically create Tor hidden service (default: %d)</source> - <translation>Automáticamente crea el servicio Tor oculto (por defecto: %d)</translation> - </message> - <message> - <source>Connect through SOCKS5 proxy</source> - <translation>Conectar usando SOCKS5 proxy</translation> - </message> - <message> <source>Error loading %s: You can't disable HD on an already existing HD wallet</source> <translation>Error cargando %s: No puedes deshabilitar HD en un monedero HD ya existente</translation> </message> @@ -3681,10 +3447,6 @@ <translation>Error actualizando la base de datos chainstate</translation> </message> <message> - <source>Imports blocks from external blk000??.dat file on startup</source> - <translation>Importa los bloques desde un archivo externo blk000?.dat</translation> - </message> - <message> <source>Information</source> <translation>Información</translation> </message> @@ -3705,42 +3467,14 @@ <translation>Máscara de red inválida especificada en -whitelist: '%s'</translation> </message> <message> - <source>Keep at most <n> unconnectable transactions in memory (default: %u)</source> - <translation>Mantener como máximo <n> transacciones no conectables en memoria (por defecto: %u)</translation> - </message> - <message> <source>Need to specify a port with -whitebind: '%s'</source> <translation>Necesita especificar un puerto con -whitebind: '%s'</translation> </message> <message> - <source>Node relay options:</source> - <translation>Opciones de nodos de retransmisión:</translation> - </message> - <message> - <source>RPC server options:</source> - <translation>Opciones de servidor RPC:</translation> - </message> - <message> <source>Reducing -maxconnections from %d to %d, because of system limitations.</source> <translation>Reduciendo -maxconnections de %d a %d, debido a limitaciones del sistema.</translation> </message> <message> - <source>Rescan the block chain for missing wallet transactions on startup</source> - <translation>Rescanea la cadena de bloques para buscar transacciones perdidas del monedero</translation> - </message> - <message> - <source>Send trace/debug info to console instead of debug.log file</source> - <translation>Enviar información de trazas/depuración a la consola en lugar de al archivo debug.log</translation> - </message> - <message> - <source>Show all debugging options (usage: --help -help-debug)</source> - <translation>Muestra todas las opciones de depuración (uso: --help -help-debug)</translation> - </message> - <message> - <source>Shrink debug.log file on client startup (default: 1 when no -debug)</source> - <translation>Reducir el archivo debug.log al iniciar el cliente (predeterminado: 1 sin -debug)</translation> - </message> - <message> <source>Signing transaction failed</source> <translation>Transacción falló</translation> </message> @@ -3757,6 +3491,12 @@ <translation>El -walletdir "%s" indicado no es un directorio</translation> </message> <message> + <source>Specified blocks directory "%s" does not exist. +</source> + <translation>El directorio de bloques especificado "%s" no existe. +</translation> + </message> + <message> <source>The transaction amount is too small to pay the fee</source> <translation>Cantidad de la transacción demasiado pequeña para pagar la comisión</translation> </message> @@ -3765,20 +3505,12 @@ <translation>Este software es experimental.</translation> </message> <message> - <source>Tor control port password (default: empty)</source> - <translation>Contraseña del puerto de control de Tor (predeterminado: vacio)</translation> - </message> - <message> - <source>Tor control port to use if onion listening enabled (default: %s)</source> - <translation>Puerto de control de Tor a utilizar si la escucha de onion esta activada (predeterminado: %s)</translation> - </message> - <message> <source>Transaction amount too small</source> <translation>Cantidad de la transacción demasiado pequeña</translation> </message> <message> <source>Transaction too large for fee policy</source> - <translation>Operación demasiado grande para la política de tasas</translation> + <translation>Transacción demasiado grande para la política de comisiones</translation> </message> <message> <source>Transaction too large</source> @@ -3793,15 +3525,6 @@ <translation>No es posible generar llaves iniciales</translation> </message> <message> - <source>Upgrade wallet to latest format on startup</source> - <translation>Actualizar el monedero al último formato al inicio</translation> - </message> - <message> - <source>Username for JSON-RPC connections</source> - <translation>Nombre de usuario para las conexiones JSON-RPC -</translation> - </message> - <message> <source>Verifying wallet(s)...</source> <translation>Verificando monedero(s)...</translation> </message> @@ -3818,115 +3541,20 @@ <translation>Advertencia: nuevas reglas desconocidas activadas (versionbit %i)</translation> </message> <message> - <source>Whether to operate in a blocks only mode (default: %u)</source> - <translation>Si se debe o no operar en un modo de solo bloques (predeterminado: %u)</translation> - </message> - <message> - <source>You need to rebuild the database using -reindex to change -txindex</source> - <translation>Necesita reconstruir las bases de datos con la opción -reindex para modificar -txindex</translation> - </message> - <message> <source>Zapping all transactions from wallet...</source> <translation>Eliminando todas las transacciones del monedero...</translation> </message> <message> - <source>ZeroMQ notification options:</source> - <translation>Opciones de notificación ZeroQM:</translation> - </message> - <message> - <source>Password for JSON-RPC connections</source> - <translation>Contraseña para las conexiones JSON-RPC -</translation> - </message> - <message> - <source>Execute command when the best block changes (%s in cmd is replaced by block hash)</source> - <translation>Ejecutar un comando cuando cambia el mejor bloque (%s en cmd se sustituye por el hash de bloque)</translation> - </message> - <message> - <source>Allow DNS lookups for -addnode, -seednode and -connect</source> - <translation>Permitir búsquedas DNS para -addnode, -seednode y -connect</translation> - </message> - <message> - <source>(1 = keep tx meta data e.g. account owner and payment request information, 2 = drop tx meta data)</source> - <translation>(1 = mantener los meta datos de transacción, por ejemplo: propietario e información de pago, 2 = omitir los metadatos)</translation> - </message> - <message> <source>-maxtxfee is set very high! Fees this large could be paid on a single transaction.</source> <translation>-maxtxfee tiene un ajuste muy elevado! Comisiones muy grandes podrían ser pagadas en una única transaccion.</translation> </message> <message> - <source>Bind to given address to listen for JSON-RPC connections. This option is ignored unless -rpcallowip is also passed. Port is optional and overrides -rpcport. Use [host]:port notation for IPv6. This option can be specified multiple times (default: 127.0.0.1 and ::1 i.e., localhost, or if -rpcallowip has been specified, 0.0.0.0 and :: i.e., all addresses)</source> - <translation>Vincular a la dirección dada para escuchar las conexiones JSON-RPC. Esta opción se ignora a menos que también se pase -rpcallowip. El puerto es opcional y reemplaza -rpcport. Utiliza la notación [host]:puerto para IPv6. Esta opción se puede especificar varias veces (por defecto: 127.0.0.1 y :: 1 es decir, localhost o si se ha especificado -rpcallowip, 0.0.0.0 y :: es decir, todas las direcciones)</translation> - </message> - <message> - <source>Do not keep transactions in the mempool longer than <n> hours (default: %u)</source> - <translation>No mantener transacciones en la memoria mas de <n> horas (predeterminado: %u)</translation> - </message> - <message> - <source>Equivalent bytes per sigop in transactions for relay and mining (default: %u)</source> - <translation>Bytes equivalentes por sigop en transacciones para retrasmisión y minado (predeterminado: %u)</translation> - </message> - <message> <source>Error loading %s: You can't enable HD on an already existing non-HD wallet</source> <translation>Error cargando %s: No puedes habilitar HD en un monedero no HD ya existente</translation> </message> <message> - <source>Error loading wallet %s. -wallet parameter must only specify a filename (not a path).</source> - <translation>Error cargando monedero %s. El parámetro -wallet solo debe indicar un nombre de fichero (no una ruta).</translation> - </message> - <message> - <source>Fees (in %s/kB) smaller than this are considered zero fee for transaction creation (default: %s)</source> - <translation>Las comisiones (en %s/kB) menores que esto son consideradas de cero comision para la creacion de transacciones (predeterminado: %s)</translation> - </message> - <message> - <source>Force relay of transactions from whitelisted peers even if they violate local relay policy (default: %d)</source> - <translation>Fuerza la retransmisión de transacciones desde nodos en la lista blanca incluso si violan la política de retransmisiones local (predeterminado: %d)</translation> - </message> - <message> - <source>How thorough the block verification of -checkblocks is (0-4, default: %u)</source> - <translation>Nivel de rigor en la verificación de bloques de -checkblocks (0-4; predeterminado: %u)</translation> - </message> - <message> - <source>Maintain a full transaction index, used by the getrawtransaction rpc call (default: %u)</source> - <translation>Mantener el índice completo de transacciones, usado por la llamada rpc de getrawtransaction (por defecto: %u)</translation> - </message> - <message> - <source>Number of seconds to keep misbehaving peers from reconnecting (default: %u)</source> - <translation>Número de segundos en que se evita la reconexión de pares con mal comportamiento (predeterminado: %u)</translation> - </message> - <message> - <source>Output debugging information (default: %u, supplying <category> is optional)</source> - <translation>Mostrar depuración (por defecto: %u, proporcionar <category> es opcional)</translation> - </message> - <message> - <source>Set maximum BIP141 block weight to this * 4. Deprecated, use blockmaxweight</source> - <translation>Configurar máximo peso de bloque BIP141 a este * 4. -Descontinuado, use blockmaxweight</translation> - </message> - <message> - <source>Sets the serialization of raw transaction or block hex returned in non-verbose mode, non-segwit(0) or segwit(1) (default: %d)</source> - <translation>https://www.transifex.com/joyful-world/breaking-english/ -Establecer la serialización de las transacciones sin procesar o el bloque hex devuelto en non-verbose mode, non-segwit(O) o segwit(1) (default: %d)</translation> - </message> - <message> - <source>Specify directory to hold wallets (default: <datadir>/wallets if it exists, otherwise <datadir>)</source> - <translation>Indique directorio para guardar monederos (por defecto: <datadir>/monederos si existe, sino <datadir>)</translation> - </message> - <message> - <source>Specify location of debug log file: this can be an absolute path or a path relative to the data directory (default: %s)</source> - <translation>Indique ubicación del archivo de registro de depuración: este puede estar en un camino absoluto o un camino relativo del directorio de datos (por defecto: %s)</translation> - </message> - <message> - <source>Support filtering of blocks and transaction with bloom filters (default: %u)</source> - <translation>Admite filtrado de bloques, y transacciones con filtros Bloom. Reduce la carga de red. ( por defecto :%u)</translation> - </message> - <message> - <source>The fee rate (in %s/kB) that indicates your tolerance for discarding change by adding it to the fee (default: %s). Note: An output is discarded if it is dust at this rate, but we will always discard up to the dust relay fee and a discard fee above that is limited by the fee estimate for the longest target</source> - <translation>La comisión (en %s/kB) que indica tu tolerancia para descartar el cambio y añadirlo a la comisión (por defecto: %s). Nota: Una salida se descarta si es polvo a esa tasa, pero solo se desechará hasta la comisión de reenvío de polvo y una comisión de descarte por encima de eso está limitada por la estimación de la comisión para el objetivo más largo</translation> - </message> - <message> <source>This is the transaction fee you may pay when fee estimates are not available.</source> - <translation>Esta es la tarifa de cuota que debe pagar cuando las estimaciones de tarifas no estén disponibles.</translation> + <translation>Esta es la comisión de transacción que debe pagar cuando las estimaciones de comisión no estén disponibles.</translation> </message> <message> <source>This product includes software developed by the OpenSSL Project for use in the OpenSSL Toolkit %s and cryptographic software written by Eric Young and UPnP software written by Thomas Bernard.</source> @@ -3937,10 +3565,6 @@ Establecer la serialización de las transacciones sin procesar o el bloque hex d <translation>La longitud total de la cadena de versión de red ( %i ) supera la longitud máxima ( %i ) . Reducir el número o tamaño de uacomments .</translation> </message> <message> - <source>Tries to keep outbound traffic under the given target (in MiB per 24h), 0 = no limit (default: %d)</source> - <translation>Intenta de mantener el Tráfico de salida , bajo el Objetivo Determinado (en MiB por 24h) , 0 = sin limite (Por Defecto :%d )</translation> - </message> - <message> <source>Unsupported argument -socks found. Setting SOCKS version isn't possible anymore, only SOCKS5 proxies are supported.</source> <translation>Error: argumento -socks encontrado. El ajuste de la versión SOCKS ya no es posible, sólo proxies SOCKS5 son compatibles.</translation> </message> @@ -3949,10 +3573,6 @@ Establecer la serialización de las transacciones sin procesar o el bloque hex d <translation>El argumento no soportado -whitelistalwaysrelay ha sido ignorado, utiliza -whitelistrelay y/o -whitelistforcerelay.</translation> </message> <message> - <source>Use separate SOCKS5 proxy to reach peers via Tor hidden services (default: %s)</source> - <translation>Usar distintos proxys SOCKS5 para comunicarse vía Tor de forma anónima (Por defecto: %s)</translation> - </message> - <message> <source>Warning: Unknown block versions being mined! It's possible unknown rules are in effect</source> <translation>Advertencia: Se están minando versiones de bloques desconocidas! Es posible que normas desconocidas estén activas</translation> </message> @@ -3961,110 +3581,18 @@ Establecer la serialización de las transacciones sin procesar o el bloque hex d <translation>Aviso: fichero de monedero corrupto, datos recuperados! Original %s guardado como %s en %s; si su balance de transacciones es incorrecto, debe restaurar desde una copia de seguridad.</translation> </message> <message> - <source>Whitelist peers connecting from the given IP address (e.g. 1.2.3.4) or CIDR notated network (e.g. 1.2.3.0/24). Can be specified multiple times.</source> - <translation>Los pares de listas blancas que se conectan desde la dirección IP dada (por ejemplo, 1.2.3.4) o la red marcada CIDR (por ejemplo, 1.2.3.0/24). Se puede especificar varias veces.</translation> - </message> - <message> <source>%s is set very high!</source> <translation>¡%s se establece muy alto!</translation> </message> <message> - <source>(default: %s)</source> - <translation>(predeterminado: %s)</translation> - </message> - <message> - <source>Always query for peer addresses via DNS lookup (default: %u)</source> - <translation>Siempre consultar direcciones de otros equipos por medio de DNS lookup (por defecto: %u)</translation> - </message> - <message> - <source>Error loading wallet %s. -wallet filename must be a regular file.</source> - <translation>Error cargando el monedero %s. El nombre de fichero -wallet debe ser un fichero normal.</translation> - </message> - <message> <source>Error loading wallet %s. Duplicate -wallet filename specified.</source> <translation>Error cargando el monedero %s. Se ha especificado un nombre de fichero -wallet duplicado.</translation> </message> <message> - <source>Error loading wallet %s. Invalid characters in -wallet filename.</source> - <translation>Error cargando el monedero %s. Caracteres inválidos en el nombre de fichero -wallet.</translation> - </message> - <message> - <source>How many blocks to check at startup (default: %u, 0 = all)</source> - <translation>Cuántos bloques comprobar al iniciar (predeterminado: %u, 0 = todos)</translation> - </message> - <message> - <source>Include IP addresses in debug output (default: %u)</source> - <translation>Incluir direcciones IP en la salida de depuración (por defecto: %u)</translation> - </message> - <message> <source>Keypool ran out, please call keypoolrefill first</source> <translation>Keypool se ha agotado, llame a keypoolrefill primero</translation> </message> <message> - <source>Listen for JSON-RPC connections on <port> (default: %u or testnet: %u)</source> - <translation>Escuchar conexiones JSON-RPC en <puerto> (predeterminado: %u o testnet: %u)</translation> - </message> - <message> - <source>Listen for connections on <port> (default: %u or testnet: %u)</source> - <translation>Escuchar conexiones en <puerto> (predeterminado: %u o testnet: %u)</translation> - </message> - <message> - <source>Maintain at most <n> connections to peers (default: %u)</source> - <translation>Mantener como máximo <n> conexiones a pares (predeterminado: %u)</translation> - </message> - <message> - <source>Make the wallet broadcast transactions</source> - <translation>Realiza las operaciones de difusión del monedero</translation> - </message> - <message> - <source>Maximum per-connection receive buffer, <n>*1000 bytes (default: %u)</source> - <translation>Búfer de recepción máximo por conexión, <n>*1000 bytes (por defecto: %u)</translation> - </message> - <message> - <source>Maximum per-connection send buffer, <n>*1000 bytes (default: %u)</source> - <translation>Búfer de recepción máximo por conexión, , <n>*1000 bytes (por defecto: %u)</translation> - </message> - <message> - <source>Prepend debug output with timestamp (default: %u)</source> - <translation>Anteponer marca temporal a la información de depuración (por defecto: %u)</translation> - </message> - <message> - <source>Relay and mine data carrier transactions (default: %u)</source> - <translation>Retransmitir y minar transacciones de transporte de datos (por defecto: %u)</translation> - </message> - <message> - <source>Relay non-P2SH multisig (default: %u)</source> - <translation>Relay non-P2SH multisig (default: %u)</translation> - </message> - <message> - <source>Set key pool size to <n> (default: %u)</source> - <translation>Ajustar el número de claves en reserva <n> (predeterminado: %u)</translation> - </message> - <message> - <source>Set maximum BIP141 block weight (default: %d)</source> - <translation>Establecer peso máximo bloque BIP141 (predeterminado: %d)</translation> - </message> - <message> - <source>Set the number of threads to service RPC calls (default: %d)</source> - <translation>Establecer el número de procesos para llamadas del servicio RPC (por defecto: %d)</translation> - </message> - <message> - <source>Specify configuration file (default: %s)</source> - <translation>Especificar archivo de configuración (por defecto: %s)</translation> - </message> - <message> - <source>Specify connection timeout in milliseconds (minimum: 1, default: %d)</source> - <translation>Especificar tiempo de espera de la conexión (mínimo: 1, por defecto: %d)</translation> - </message> - <message> - <source>Specify pid file (default: %s)</source> - <translation>Especificar archivo pid (predeterminado: %s)</translation> - </message> - <message> - <source>Spend unconfirmed change when sending transactions (default: %u)</source> - <translation>Usar cambio aún no confirmado al enviar transacciones (predeterminado: %u)</translation> - </message> - <message> <source>Starting network threads...</source> <translation>Iniciando funciones de red...</translation> </message> @@ -4074,15 +3602,11 @@ Establecer la serialización de las transacciones sin procesar o el bloque hex d </message> <message> <source>This is the minimum transaction fee you pay on every transaction.</source> - <translation>Esta es la tarifa mínima de transacción que usted paga en cada transacción.</translation> + <translation>Esta es la comisión mínima de transacción que usted paga en cada transacción.</translation> </message> <message> <source>This is the transaction fee you will pay if you send a transaction.</source> - <translation>Esta es la cuota de transacción que pagará si envía una transacción.</translation> - </message> - <message> - <source>Threshold for disconnecting misbehaving peers (default: %u)</source> - <translation>Umbral para la desconexión de pares con mal comportamiento (predeterminado: %u)</translation> + <translation>Esta es la comisión de transacción que pagará si envía una transacción.</translation> </message> <message> <source>Transaction amounts must not be negative</source> @@ -4105,6 +3629,26 @@ Establecer la serialización de las transacciones sin procesar o el bloque hex d <translation>Fondos insuficientes</translation> </message> <message> + <source>Can't generate a change-address key. Private keys are disabled for this wallet.</source> + <translation>No se puede generar una clave de cambio de dirección. Las claves privadas están deshabilitadas para este monedero.</translation> + </message> + <message> + <source>Cannot upgrade a non HD split wallet without upgrading to support pre split keypool. Please use -upgradewallet=169900 or -upgradewallet with no version specified.</source> + <translation>No se puede actualizar un monedero dividido sin HD sin actualizar para admitir el keypool pre dividido. Utilice -upgradewallet = 169900 o -upgradewallet sin una versión especificada.</translation> + </message> + <message> + <source>Fee estimation failed. Fallbackfee is disabled. Wait a few blocks or enable -fallbackfee.</source> + <translation>Estimación de la comisión fallida. Fallbackfee está deshabilitado. Espere unos pocos bloques o habilite -fallbackfee.</translation> + </message> + <message> + <source>Warning: Private keys detected in wallet {%s} with disabled private keys</source> + <translation>Advertencia: claves privadas detectadas en el monedero {%s} con claves privadas deshabilitadas</translation> + </message> + <message> + <source>Cannot write to data directory '%s'; check permissions.</source> + <translation>No se puede escribir en el directorio de datos '%s'; verificar permisos.</translation> + </message> + <message> <source>Loading block index...</source> <translation>Cargando el índice de bloques...</translation> </message> diff --git a/src/qt/locale/bitcoin_es_CL.ts b/src/qt/locale/bitcoin_es_CL.ts index 48acd165d5..f8b13e398f 100644 --- a/src/qt/locale/bitcoin_es_CL.ts +++ b/src/qt/locale/bitcoin_es_CL.ts @@ -30,6 +30,10 @@ <translation>Eliminar la dirección seleccionada de la lista</translation> </message> <message> + <source>Enter address or label to search</source> + <translation>Introduce una dirección o etiqueta para buscar</translation> + </message> + <message> <source>Export the data in the current tab to a file</source> <translation>Exportar los datos de la pestaña actual a un archivo</translation> </message> @@ -41,13 +45,85 @@ <source>&Delete</source> <translation>&Borrar</translation> </message> - </context> + <message> + <source>Choose the address to send coins to</source> + <translation>Selecciones la dirección para enviar monedas a</translation> + </message> + <message> + <source>Choose the address to receive coins with</source> + <translation>Selecciona la dirección para recibir monedas con</translation> + </message> + <message> + <source>C&hoose</source> + <translation>Seleccione</translation> + </message> + <message> + <source>Sending addresses</source> + <translation>Enviando direcciones</translation> + </message> + <message> + <source>Receiving addresses</source> + <translation>Recibiendo direcciones</translation> + </message> + <message> + <source>These are your Bitcoin addresses for sending payments. Always check the amount and the receiving address before sending coins.</source> + <translation>Estas son tus direcciones de Bitcoin para recibir pagos. Siempre revise el monto y la dirección de envío antes de enviar criptomonedas.</translation> + </message> + <message> + <source>These are your Bitcoin addresses for receiving payments. It is recommended to use a new receiving address for each transaction.</source> + <translation>Estas son tus direcciones para recibir pagos. Es recomendable utilizar una nueva dirección para cada transacción.</translation> + </message> + <message> + <source>&Copy Address</source> + <translation>Copiar dirección</translation> + </message> + <message> + <source>Copy &Label</source> + <translation>Copiar etiqueta</translation> + </message> + <message> + <source>&Edit</source> + <translation>Editar</translation> + </message> + <message> + <source>Export Address List</source> + <translation>Exportar lista de direcciones</translation> + </message> + <message> + <source>Comma separated file (*.csv)</source> + <translation>Archivos separados por coma (*.csv)</translation> + </message> + <message> + <source>Exporting Failed</source> + <translation>Exportación fallida</translation> + </message> + <message> + <source>There was an error trying to save the address list to %1. Please try again.</source> + <translation>Había un error intentando guardar la lista de direcciones en %1. Por favor inténtelo de nuevo.</translation> + </message> +</context> <context> <name>AddressTableModel</name> - </context> + <message> + <source>Label</source> + <translation>Etiqueta</translation> + </message> + <message> + <source>Address</source> + <translation>Dirección</translation> + </message> + <message> + <source>(no label)</source> + <translation>(sin etiqueta)</translation> + </message> +</context> <context> <name>AskPassphraseDialog</name> <message> + <source>Passphrase Dialog</source> + <translation>Dialogo de contraseña</translation> + </message> + <message> <source>Enter passphrase</source> <translation>Introduce contraseña actual </translation> </message> @@ -59,10 +135,110 @@ <source>Repeat new passphrase</source> <translation>Repite nueva contraseña</translation> </message> - </context> + <message> + <source>Show password</source> + <translation>Mostrar contraseña</translation> + </message> + <message> + <source>Enter the new passphrase to the wallet.<br/>Please use a passphrase of <b>ten or more random characters</b>, or <b>eight or more words</b>.</source> + <translation>Introduce la nueva contraseña para la billetera.<br/>Por favor utiliza una contraseña de<b>10 o más caracteres aleatorios</b>, u <b>ocho o más palabras</b>.</translation> + </message> + <message> + <source>Encrypt wallet</source> + <translation>Codificar billetera</translation> + </message> + <message> + <source>This operation needs your wallet passphrase to unlock the wallet.</source> + <translation>Esta operación necesita la contraseña para desbloquear la billetera.</translation> + </message> + <message> + <source>Unlock wallet</source> + <translation>Desbloquea billetera</translation> + </message> + <message> + <source>This operation needs your wallet passphrase to decrypt the wallet.</source> + <translation>Esta operación necesita la contraseña para decodificar la billetara.</translation> + </message> + <message> + <source>Decrypt wallet</source> + <translation>Decodificar cartera</translation> + </message> + <message> + <source>Change passphrase</source> + <translation>Cambia contraseña</translation> + </message> + <message> + <source>Enter the old passphrase and new passphrase to the wallet.</source> + <translation>Introduzca la contraseña antigua y la nueva para la billetera.</translation> + </message> + <message> + <source>Confirm wallet encryption</source> + <translation>Confirmar cifrado del monedero</translation> + </message> + <message> + <source>Warning: If you encrypt your wallet and lose your passphrase, you will <b>LOSE ALL OF YOUR BITCOINS</b>!</source> + <translation>Advertencia: Si encriptas tu billetera y pierdes tu contraseña, vas a perder<b>TODOS TUS BITCOINS</b>!</translation> + </message> + <message> + <source>Are you sure you wish to encrypt your wallet?</source> + <translation>¿Seguro que quieres seguir codificando la billetera?</translation> + </message> + <message> + <source>Wallet encrypted</source> + <translation>Billetera codificada</translation> + </message> + <message> + <source>%1 will close now to finish the encryption process. Remember that encrypting your wallet cannot fully protect your bitcoins from being stolen by malware infecting your computer.</source> + <translation>%1 se cerrará para finalizar el proceso de encriptación. Recuerda que encriptar tu billetera no protege completamente a tus bitcoins de ser robados por virus y malwares en tu computadora.</translation> + </message> + <message> + <source>IMPORTANT: Any previous backups you have made of your wallet file should be replaced with the newly generated, encrypted wallet file. For security reasons, previous backups of the unencrypted wallet file will become useless as soon as you start using the new, encrypted wallet.</source> + <translation>IMPORTANTE: Cualquier respaldo anterior que hayas hecho del archivo de tu billetera debe ser reemplazado por el nuevo archivo encriptado que has generado. Por razones de seguridad, todos los respaldos realizados anteriormente serán inutilizables al momento de que utilices tu nueva billetera encriptada.</translation> + </message> + <message> + <source>Wallet encryption failed</source> + <translation>Falló la codificación de la billetera</translation> + </message> + <message> + <source>Wallet encryption failed due to an internal error. Your wallet was not encrypted.</source> + <translation>El proceso de encriptación de la billetera fallo por culpa de un problema interno. Tu billetera no fue encriptada.</translation> + </message> + <message> + <source>The supplied passphrases do not match.</source> + <translation>La contraseña introducida no coincide.</translation> + </message> + <message> + <source>Wallet unlock failed</source> + <translation>Ha fallado el desbloqueo de la billetera</translation> + </message> + <message> + <source>The passphrase entered for the wallet decryption was incorrect.</source> + <translation>La contraseña introducida para el cifrado del monedero es incorrecta.</translation> + </message> + <message> + <source>Wallet decryption failed</source> + <translation>Ha fallado la decodificación de la billetera</translation> + </message> + <message> + <source>Wallet passphrase was successfully changed.</source> + <translation>La contraseña del monedero ha sido cambiada con éxito.</translation> + </message> + <message> + <source>Warning: The Caps Lock key is on!</source> + <translation>Precaucion: Mayúsculas Activadas</translation> + </message> +</context> <context> <name>BanTableModel</name> - </context> + <message> + <source>IP/Netmask</source> + <translation>IP/Máscara</translation> + </message> + <message> + <source>Banned Until</source> + <translation>Suspendido hasta</translation> + </message> +</context> <context> <name>BitcoinGUI</name> <message> @@ -78,6 +254,10 @@ <translation>&Vista general</translation> </message> <message> + <source>Node</source> + <translation>Nodo</translation> + </message> + <message> <source>Show general overview of wallet</source> <translation>Muestra una vista general de la billetera</translation> </message> @@ -102,6 +282,10 @@ <translation>S&obre %1</translation> </message> <message> + <source>Show information about %1</source> + <translation>Mostrar Información sobre %1</translation> + </message> + <message> <source>About &Qt</source> <translation>Acerca de</translation> </message> @@ -114,6 +298,10 @@ <translation>&Opciones</translation> </message> <message> + <source>Modify configuration options for %1</source> + <translation>Modificar las opciones de configuración para %1</translation> + </message> + <message> <source>&Encrypt Wallet...</source> <translation>&Codificar la billetera...</translation> </message> @@ -138,6 +326,22 @@ <translation>Abrir y url...</translation> </message> <message> + <source>Click to disable network activity.</source> + <translation>Click para deshabilitar la actividad de red.</translation> + </message> + <message> + <source>Network activity disabled.</source> + <translation>Actividad de red deshabilitada</translation> + </message> + <message> + <source>Click to enable network activity again.</source> + <translation>Click para volver a habilitar la actividad de red.</translation> + </message> + <message> + <source>Syncing Headers (%1%)...</source> + <translation>Sincronizando cabeceras (%1%)...</translation> + </message> + <message> <source>Reindexing blocks on disk...</source> <translation>Cargando el index de bloques...</translation> </message> @@ -186,10 +390,22 @@ <translation>&Mostrar/Ocultar</translation> </message> <message> + <source>Show or hide the main Window</source> + <translation>Mostrar u ocultar la ventana principal</translation> + </message> + <message> + <source>Encrypt the private keys that belong to your wallet</source> + <translation>Cifrar las claves privadas de su monedero</translation> + </message> + <message> <source>Sign messages with your Bitcoin addresses to prove you own them</source> <translation>Firmar un mensaje para provar que usted es dueño de esta dirección</translation> </message> <message> + <source>Verify messages to ensure they were signed with specified Bitcoin addresses</source> + <translation>Verificar mensajes comprobando que están firmados con direcciones Bitcoin concretas</translation> + </message> + <message> <source>&File</source> <translation>&Archivo</translation> </message> @@ -210,6 +426,50 @@ <translation>Pide pagos (genera codigos QR and bitcoin: URls)</translation> </message> <message> + <source>Show the list of used sending addresses and labels</source> + <translation>Mostrar la lista de direcciones de envío y etiquetas</translation> + </message> + <message> + <source>Show the list of used receiving addresses and labels</source> + <translation>Mostrar la lista de direcciones de recepción y etiquetas</translation> + </message> + <message> + <source>Open a bitcoin: URI or payment request</source> + <translation>Abrir un identificador URI bitcoin o una petición de pago</translation> + </message> + <message> + <source>&Command-line options</source> + <translation>&Opciones de linea de comando</translation> + </message> + <message numerus="yes"> + <source>%n active connection(s) to Bitcoin network</source> + <translation><numerusform>%n conexión activa hacia la red Bitcoin</numerusform><numerusform>%n conexiones activas hacia la red Bitcoin</numerusform></translation> + </message> + <message> + <source>Indexing blocks on disk...</source> + <translation>Indexando bloques en disco...</translation> + </message> + <message> + <source>Processing blocks on disk...</source> + <translation>Procesando bloques en disco...</translation> + </message> + <message numerus="yes"> + <source>Processed %n block(s) of transaction history.</source> + <translation><numerusform>%n bloque procesado del historial de transacciones.</numerusform><numerusform>%n bloques procesados del historial de transacciones.</numerusform></translation> + </message> + <message> + <source>%1 behind</source> + <translation>%1 atrás</translation> + </message> + <message> + <source>Last received block was generated %1 ago.</source> + <translation>El último bloque recibido fue generado hace %1</translation> + </message> + <message> + <source>Transactions after this will not yet be visible.</source> + <translation>Las transacciones posteriores aún no están visibles.</translation> + </message> + <message> <source>Error</source> <translation>Error</translation> </message> @@ -226,10 +486,52 @@ <translation>Actualizado</translation> </message> <message> + <source>Show the %1 help message to get a list with possible Bitcoin command-line options</source> + <translation>Mostrar el mensaje de ayuda %1 para obtener una lista de los posibles comandos de Bitcoin</translation> + </message> + <message> + <source>%1 client</source> + <translation>%1 cliente</translation> + </message> + <message> + <source>Connecting to peers...</source> + <translation>Conectando a pares...</translation> + </message> + <message> <source>Catching up...</source> <translation>Recuperando...</translation> </message> <message> + <source>Date: %1 +</source> + <translation>Fecha: %1 +</translation> + </message> + <message> + <source>Amount: %1 +</source> + <translation>Cantidad: %1 +</translation> + </message> + <message> + <source>Type: %1 +</source> + <translation>Tipo: %1 +</translation> + </message> + <message> + <source>Label: %1 +</source> + <translation>Etiqueta %1 +</translation> + </message> + <message> + <source>Address: %1 +</source> + <translation>Dirección %1 +</translation> + </message> + <message> <source>Sent transaction</source> <translation>Transacción enviada</translation> </message> @@ -238,6 +540,14 @@ <translation>Transacción entrante</translation> </message> <message> + <source>HD key generation is <b>enabled</b></source> + <translation>La generación de clave HD está <b>habilitada</b></translation> + </message> + <message> + <source>HD key generation is <b>disabled</b></source> + <translation>La generación de clave HD está <b>deshabilitada</b></translation> + </message> + <message> <source>Wallet is <b>encrypted</b> and currently <b>unlocked</b></source> <translation>La billetera esta <b>codificada</b> y actualmente <b>desbloqueda</b></translation> </message> @@ -245,10 +555,26 @@ <source>Wallet is <b>encrypted</b> and currently <b>locked</b></source> <translation>La billetera esta <b>codificada</b> y actualmente <b>bloqueda</b></translation> </message> - </context> + <message> + <source>A fatal error occurred. Bitcoin can no longer continue safely and will quit.</source> + <translation>Ha ocurrido un error fatal. Bitcoin no puede seguir seguro y se cerrará.</translation> + </message> +</context> <context> <name>CoinControlDialog</name> <message> + <source>Coin Selection</source> + <translation>Selección de moneda</translation> + </message> + <message> + <source>Quantity:</source> + <translation>Cantidad:</translation> + </message> + <message> + <source>Bytes:</source> + <translation>Bytes:</translation> + </message> + <message> <source>Amount:</source> <translation>Cantidad:</translation> </message> @@ -258,10 +584,42 @@ </translation> </message> <message> + <source>Dust:</source> + <translation>Polvo:</translation> + </message> + <message> + <source>After Fee:</source> + <translation>Después de aplicar la comisión:</translation> + </message> + <message> + <source>Change:</source> + <translation>Cambio:</translation> + </message> + <message> + <source>(un)select all</source> + <translation>(des)marcar todos</translation> + </message> + <message> + <source>Tree mode</source> + <translation>Modo árbol</translation> + </message> + <message> + <source>List mode</source> + <translation>Modo lista</translation> + </message> + <message> <source>Amount</source> <translation>Cantidad</translation> </message> <message> + <source>Received with label</source> + <translation>Recibido con etiqueta</translation> + </message> + <message> + <source>Received with address</source> + <translation>Recibido con dirección</translation> + </message> + <message> <source>Date</source> <translation>Fecha</translation> </message> @@ -273,7 +631,87 @@ <source>Confirmed</source> <translation>Confirmado</translation> </message> - </context> + <message> + <source>Copy address</source> + <translation>Copiar dirección</translation> + </message> + <message> + <source>Copy label</source> + <translation>Copiar etiqueta</translation> + </message> + <message> + <source>Copy amount</source> + <translation>Copiar Cantidad</translation> + </message> + <message> + <source>Copy transaction ID</source> + <translation>Copiar ID de transacción</translation> + </message> + <message> + <source>Lock unspent</source> + <translation>Bloquear lo no gastado</translation> + </message> + <message> + <source>Unlock unspent</source> + <translation>Desbloquear lo no gastado</translation> + </message> + <message> + <source>Copy quantity</source> + <translation>Copiar cantidad</translation> + </message> + <message> + <source>Copy fee</source> + <translation>Copiar comisión</translation> + </message> + <message> + <source>Copy after fee</source> + <translation>Copiar después de la comisión</translation> + </message> + <message> + <source>Copy bytes</source> + <translation>Copiar bytes</translation> + </message> + <message> + <source>Copy dust</source> + <translation>Copiar polvo</translation> + </message> + <message> + <source>Copy change</source> + <translation>Copiar cambio</translation> + </message> + <message> + <source>(%1 locked)</source> + <translation>(%1 bloqueado)</translation> + </message> + <message> + <source>yes</source> + <translation>si</translation> + </message> + <message> + <source>no</source> + <translation>no</translation> + </message> + <message> + <source>This label turns red if any recipient receives an amount smaller than the current dust threshold.</source> + <translation>Está etiqueta se vuelve roja si algún receptor recibe una cantidad inferior al límite actual establecido para el polvo.</translation> + </message> + <message> + <source>Can vary +/- %1 satoshi(s) per input.</source> + <translation>Puede variar +/- %1 satoshi(s) por entrada.</translation> + </message> + <message> + <source>(no label)</source> + <translation>(sin etiqueta)</translation> + </message> + <message> + <source>change from %1 (%2)</source> + <translation>cambia desde %1 (%2)</translation> + </message> + <message> + <source>(change)</source> + <translation>(cambio)</translation> + </message> +</context> <context> <name>EditAddressDialog</name> <message> @@ -285,17 +723,65 @@ <translation>&Etiqueta</translation> </message> <message> + <source>The label associated with this address list entry</source> + <translation>La etiqueta asociada con esta entrada de la lista de direcciones</translation> + </message> + <message> + <source>The address associated with this address list entry. This can only be modified for sending addresses.</source> + <translation>La dirección asociada con esta entrada en la libreta de direcciones. Solo puede ser modificada para direcciones de envío.</translation> + </message> + <message> <source>&Address</source> <translation>&Dirección</translation> </message> - </context> + <message> + <source>New sending address</source> + <translation>Nueva dirección para enviar</translation> + </message> + <message> + <source>Edit receiving address</source> + <translation>Editar dirección de recepción</translation> + </message> + <message> + <source>Edit sending address</source> + <translation>Editar dirección de envio</translation> + </message> + <message> + <source>The entered address "%1" is not a valid Bitcoin address.</source> + <translation>La dirección introducida "%1" no es una dirección Bitcoin valida.</translation> + </message> + <message> + <source>Could not unlock wallet.</source> + <translation>No se pudo desbloquear la billetera.</translation> + </message> + <message> + <source>New key generation failed.</source> + <translation>La generación de nueva clave falló.</translation> + </message> +</context> <context> <name>FreespaceChecker</name> <message> + <source>A new data directory will be created.</source> + <translation>Un nuevo directorio de datos será creado.</translation> + </message> + <message> <source>name</source> <translation>Nombre</translation> </message> - </context> + <message> + <source>Directory already exists. Add %1 if you intend to create a new directory here.</source> + <translation>El directorio ya existe. Agrega %1 si deseas crear un nuevo directorio aquí.</translation> + </message> + <message> + <source>Path already exists, and is not a directory.</source> + <translation>Ruta de acceso existente, pero no es un directorio.</translation> + </message> + <message> + <source>Cannot create data directory here.</source> + <translation>Es imposible crear la carpeta de datos aquí.</translation> + </message> +</context> <context> <name>HelpMessageDialog</name> <message> @@ -303,14 +789,18 @@ <translation>versión</translation> </message> <message> - <source>Command-line options</source> - <translation>opciones de linea de comando</translation> + <source>(%1-bit)</source> + <translation>(%1-bit)</translation> </message> <message> - <source>Usage:</source> - <translation>Uso:</translation> + <source>About %1</source> + <translation>Sobre %1</translation> </message> - </context> + <message> + <source>Command-line options</source> + <translation>opciones de linea de comando</translation> + </message> +</context> <context> <name>Intro</name> <message> @@ -318,28 +808,140 @@ <translation>bienvenido</translation> </message> <message> + <source>Welcome to %1.</source> + <translation>Bienvenido a %1.</translation> + </message> + <message> + <source>As this is the first time the program is launched, you can choose where %1 will store its data.</source> + <translation>Al ser la primera vez que se ejecuta el programa, puede elegir donde %1 almacenará sus datos.</translation> + </message> + <message> + <source>This initial synchronisation is very demanding, and may expose hardware problems with your computer that had previously gone unnoticed. Each time you run %1, it will continue downloading where it left off.</source> + <translation>El primer proceso de sincronización consume muchos recursos, y es posible que puedan ocurrir problemas de hardware que anteriormente no hayas notado. Cada vez que ejecutes %1 automáticamente se reiniciará el proceso de sincronización desde el punto que lo dejaste anteriormente.</translation> + </message> + <message> + <source>If you have chosen to limit block chain storage (pruning), the historical data must still be downloaded and processed, but will be deleted afterward to keep your disk usage low.</source> + <translation>Si elegiste la opción de limitar el tamaño del blockchain (pruning), de igual manera será descargada y procesada la información histórica, pero será eliminada al finalizar este proceso para disminuir el uso del disco duro.</translation> + </message> + <message> + <source>Use the default data directory</source> + <translation>Usar el directorio de datos predeterminado</translation> + </message> + <message> + <source>Use a custom data directory:</source> + <translation>usar un directorio de datos personalizado:</translation> + </message> + <message> <source>Bitcoin</source> <translation>Bitcoin</translation> </message> <message> + <source>At least %1 GB of data will be stored in this directory, and it will grow over time.</source> + <translation>Al menos %1 GB de información será almacenado en este directorio, y seguirá creciendo a través del tiempo.</translation> + </message> + <message> + <source>Approximately %1 GB of data will be stored in this directory.</source> + <translation>Aproximadamente %1 GB de información será almacenado en este directorio.</translation> + </message> + <message> + <source>%1 will download and store a copy of the Bitcoin block chain.</source> + <translation>%1 descargará y almacenará una copia del blockchain de Bitcoin.</translation> + </message> + <message> + <source>The wallet will also be stored in this directory.</source> + <translation>El monedero también será almacenado en este directorio.</translation> + </message> + <message> + <source>Error: Specified data directory "%1" cannot be created.</source> + <translation>Error: El directorio de datos especificado "%1" no pudo ser creado.</translation> + </message> + <message> <source>Error</source> <translation>Error</translation> </message> - </context> + <message numerus="yes"> + <source>%n GB of free space available</source> + <translation><numerusform>%n GB de espacio libre disponible</numerusform><numerusform>%n GB de espacio libre disponible</numerusform></translation> + </message> + <message numerus="yes"> + <source>(of %n GB needed)</source> + <translation><numerusform>(de %n GB requerido)</numerusform><numerusform>(de %n GB requeridos)</numerusform></translation> + </message> +</context> <context> <name>ModalOverlay</name> <message> <source>Form</source> <translation>Formulario</translation> </message> - </context> + <message> + <source>Recent transactions may not yet be visible, and therefore your wallet's balance might be incorrect. This information will be correct once your wallet has finished synchronizing with the bitcoin network, as detailed below.</source> + <translation>Las transacciones recientes aún no pueden ser visibles, y por lo tanto el saldo de su monedero podría ser incorrecto. Esta información será correcta cuando su monedero haya terminado de sincronizarse con la red de bitcoin, como se detalla abajo.</translation> + </message> + <message> + <source>Attempting to spend bitcoins that are affected by not-yet-displayed transactions will not be accepted by the network.</source> + <translation>La red no aceptará el intentar gastar bitcoins que están afectados por transacciones aún no mostradas.</translation> + </message> + <message> + <source>Number of blocks left</source> + <translation>Número de bloques restantes</translation> + </message> + <message> + <source>Unknown...</source> + <translation>Desconocido...</translation> + </message> + <message> + <source>Last block time</source> + <translation>Hora del último bloque</translation> + </message> + <message> + <source>Progress</source> + <translation>Progreso</translation> + </message> + <message> + <source>Progress increase per hour</source> + <translation>Avance del progreso por hora</translation> + </message> + <message> + <source>calculating...</source> + <translation>calculando...</translation> + </message> + <message> + <source>Estimated time left until synced</source> + <translation>Tiempo estimado restante hasta la sincronización</translation> + </message> + <message> + <source>Hide</source> + <translation>Ocultar</translation> + </message> + <message> + <source>Unknown. Syncing Headers (%1)...</source> + <translation>Desconocido. Sincronizando cabeceras (%1)...</translation> + </message> +</context> <context> <name>OpenURIDialog</name> <message> + <source>Open URI</source> + <translation>Abrir URI</translation> + </message> + <message> + <source>Open payment request from URI or file</source> + <translation>Abrir solicitud de pago desde URI o un archivo</translation> + </message> + <message> <source>URI:</source> <translation>url:</translation> </message> - </context> + <message> + <source>Select payment request file</source> + <translation>Seleccionar archivo de solicitud de pago</translation> + </message> + <message> + <source>Select payment request file to open</source> + <translation>Seleccionar archivo de solicitud de pago para abrir</translation> + </message> +</context> <context> <name>OptionsDialog</name> <message> @@ -351,10 +953,62 @@ <translation>&Principal</translation> </message> <message> + <source>Automatically start %1 after logging in to the system.</source> + <translation>Iniciar automáticamente %1 al inicial el sistema.</translation> + </message> + <message> + <source>&Start %1 on system login</source> + <translation>&Iniciar %1 al iniciar el sistema</translation> + </message> + <message> + <source>Size of &database cache</source> + <translation>Tamaño del caché de la base de &datos</translation> + </message> + <message> + <source>MB</source> + <translation>MB</translation> + </message> + <message> + <source>Number of script &verification threads</source> + <translation>Número de hilos de &verificación de scripts</translation> + </message> + <message> + <source>IP address of the proxy (e.g. IPv4: 127.0.0.1 / IPv6: ::1)</source> + <translation>Dirección IP del proxy (Ejemplo. IPv4: 127.0.0.1 / IPv6: ::1)</translation> + </message> + <message> + <source>Shows if the supplied default SOCKS5 proxy is used to reach peers via this network type.</source> + <translation>Muestra si el proxy SOCKS5 por defecto se utiliza para conectarse a pares a través de este tipo de red.</translation> + </message> + <message> + <source>Minimize instead of exit the application when the window is closed. When this option is enabled, the application will be closed only after selecting Exit in the menu.</source> + <translation>Minimizar en vez de salir de la aplicación cuando la ventana está cerrada. Cuando se activa esta opción, la aplicación sólo se cerrará después de seleccionar Salir en el menú.</translation> + </message> + <message> + <source>Third party URLs (e.g. a block explorer) that appear in the transactions tab as context menu items. %s in the URL is replaced by transaction hash. Multiple URLs are separated by vertical bar |.</source> + <translation>URLs de terceros (por ejemplo, un explorador de bloques) que aparecen en la pestaña de transacciones como elementos del menú contextual. El %s en la URL es reemplazado por el valor hash de la transacción. Se pueden separar múltiples URLs por una barra vertical |.</translation> + </message> + <message> + <source>Active command-line options that override above options:</source> + <translation>Opciones activas de la terminal que tienen preferencia sobre las opciones anteriores:</translation> + </message> + <message> + <source>Open the %1 configuration file from the working directory.</source> + <translation>Abrir el archivo de configuración %1 en el directorio de trabajo.</translation> + </message> + <message> + <source>Open Configuration File</source> + <translation>Abrir archivo de configuración</translation> + </message> + <message> <source>Reset all client options to default.</source> <translation>Reestablece todas las opciones.</translation> </message> <message> + <source>&Reset Options</source> + <translation>&Restablecer opciones</translation> + </message> + <message> <source>&Network</source> <translation>&Red</translation> </message> @@ -367,6 +1021,14 @@ <translation>experto</translation> </message> <message> + <source>Enable coin &control features</source> + <translation>Habilitar opciones de &control de monedero</translation> + </message> + <message> + <source>&Spend unconfirmed change</source> + <translation>Gastar cambio sin confirmar</translation> + </message> + <message> <source>Automatically open the Bitcoin client port on the router. This only works when your router supports UPnP and it is enabled.</source> <translation>Abre automáticamente el puerto del cliente Bitcoin en el router. Esto funciona solo cuando tu router es compatible con UPnP y está habilitado.</translation> </message> @@ -375,6 +1037,14 @@ <translation>Direcciona el puerto usando &UPnP</translation> </message> <message> + <source>Accept connections from outside.</source> + <translation>Aceptar conexiones externas.</translation> + </message> + <message> + <source>Connect to the Bitcoin network through a SOCKS5 proxy.</source> + <translation>Conectar a la red de Bitcoin a través de un proxy SOCKS5</translation> + </message> + <message> <source>Proxy &IP:</source> <translation>&IP Proxy:</translation> </message> @@ -387,6 +1057,26 @@ <translation>Puerto del servidor proxy (ej. 9050)</translation> </message> <message> + <source>Used for reaching peers via:</source> + <translation>Usado para alcanzar compañeros vía:</translation> + </message> + <message> + <source>IPv4</source> + <translation>IPv4</translation> + </message> + <message> + <source>IPv6</source> + <translation>IPv6</translation> + </message> + <message> + <source>Tor</source> + <translation>Tor</translation> + </message> + <message> + <source>Connect to the Bitcoin network through a separate SOCKS5 proxy for Tor hidden services.</source> + <translation>Conectar a la red de Bitcoin a través de un proxy SOCKS5 diferente para los servicios anónimos de Tor.</translation> + </message> + <message> <source>&Window</source> <translation>y windows </translation> @@ -408,6 +1098,10 @@ <translation>&Mostrado</translation> </message> <message> + <source>User Interface &language:</source> + <translation>&Lenguaje de la interfaz:</translation> + </message> + <message> <source>&Unit to show amounts in:</source> <translation>&Unidad en la que mostrar cantitades:</translation> </message> @@ -416,6 +1110,10 @@ <translation>Elige la subdivisión por defecto para mostrar cantidaded en la interfaz cuando se envien monedas</translation> </message> <message> + <source>Whether to show coin control features or not.</source> + <translation>Mostrar o no funcionalidad de Coin Control</translation> + </message> + <message> <source>&OK</source> <translation>&OK</translation> </message> @@ -428,14 +1126,46 @@ <translation>predeterminado</translation> </message> <message> + <source>none</source> + <translation>Nada</translation> + </message> + <message> <source>Confirm options reset</source> <translation>Confirmar reestablecimiento de las opciones</translation> </message> <message> + <source>Client restart required to activate changes.</source> + <translation>Es necesario reiniciar el cliente para activar los cambios.</translation> + </message> + <message> + <source>Client will be shut down. Do you want to proceed?</source> + <translation>El cliente se cerrará. Desea proceder?</translation> + </message> + <message> + <source>Configuration options</source> + <translation>Opciones de configuración</translation> + </message> + <message> + <source>The configuration file is used to specify advanced user options which override GUI settings. Additionally, any command-line options will override this configuration file.</source> + <translation>El archivo de configuración es utilizado para especificar opciones avanzadas del usuario, que invalidan los ajustes predeterminados. Adicionalmente, cualquier opción ingresada por la línea de comandos invalidará este archivo de configuración.</translation> + </message> + <message> <source>Error</source> <translation>Error</translation> </message> - </context> + <message> + <source>The configuration file could not be opened.</source> + <translation>El archivo de configuración no pudo ser abierto.</translation> + </message> + <message> + <source>This change would require a client restart.</source> + <translation>Estos cambios requieren el reinicio del cliente.</translation> + </message> + <message> + <source>The supplied proxy address is invalid.</source> + <translation>El proxy ingresado es inválido. </translation> + </message> +</context> <context> <name>OverviewPage</name> <message> @@ -443,16 +1173,156 @@ <translation>Formulario</translation> </message> <message> + <source>The displayed information may be out of date. Your wallet automatically synchronizes with the Bitcoin network after a connection is established, but this process has not completed yet.</source> + <translation>La información entregada puede estar desactualizada. Tu billetera se sincroniza automáticamente con la red de Bitcoin después de establecer una conexión, pero este proceso aún no se ha completado.</translation> + </message> + <message> + <source>Watch-only:</source> + <translation>Solo observación:</translation> + </message> + <message> + <source>Available:</source> + <translation>Disponible:</translation> + </message> + <message> + <source>Your current spendable balance</source> + <translation>Tu saldo disponible para gastar</translation> + </message> + <message> + <source>Pending:</source> + <translation>Pendiente:</translation> + </message> + <message> + <source>Total of transactions that have yet to be confirmed, and do not yet count toward the spendable balance</source> + <translation>Total de transacciones que aún no se han sido confirmadas, y que no son contabilizadas dentro del saldo disponible para gastar</translation> + </message> + <message> + <source>Immature:</source> + <translation>Inmaduro:</translation> + </message> + <message> + <source>Mined balance that has not yet matured</source> + <translation>Saldo minado que no ha madurado</translation> + </message> + <message> + <source>Balances</source> + <translation>Saldos</translation> + </message> + <message> <source>Total:</source> <translation>Total:</translation> </message> + <message> + <source>Your current total balance</source> + <translation>Saldo total actual</translation> + </message> + <message> + <source>Spendable:</source> + <translation>Utilizable:</translation> + </message> + <message> + <source>Recent transactions</source> + <translation>Transacciones recientes</translation> + </message> </context> <context> <name>PaymentServer</name> - </context> + <message> + <source>Payment request error</source> + <translation>Error en la solicitud de pago</translation> + </message> + <message> + <source>URI handling</source> + <translation>Manejo de URI</translation> + </message> + <message> + <source>Payment request fetch URL is invalid: %1</source> + <translation>Lectura de URL para la solicitud de pagos es invalida: %1</translation> + </message> + <message> + <source>Invalid payment address %1</source> + <translation>Dirección de pago inválida %1</translation> + </message> + <message> + <source>Payment request file handling</source> + <translation>Manejo del archivo de solicitud de pago</translation> + </message> + <message> + <source>Payment request rejected</source> + <translation>Solicitud de pago rechazada</translation> + </message> + <message> + <source>Payment request network doesn't match client network.</source> + <translation>Red de solicitud de pagos no coincide con la red del cliente.</translation> + </message> + <message> + <source>Payment request expired.</source> + <translation>Solicitud de pago expirada</translation> + </message> + <message> + <source>Payment request is not initialized.</source> + <translation>La solicitud de pago no se ha iniciado.</translation> + </message> + <message> + <source>Invalid payment request.</source> + <translation>Solicitud de pago invalida.</translation> + </message> + <message> + <source>Requested payment amount of %1 is too small (considered dust).</source> + <translation>El monto para la solicitud de pago de %1 es muy pequeño (considera el dust).</translation> + </message> + <message> + <source>Refund from %1</source> + <translation>Reembolsar desde %1</translation> + </message> + <message> + <source>Error communicating with %1: %2</source> + <translation>Fallo al comunicar con %1: %2</translation> + </message> + <message> + <source>Payment request cannot be parsed!</source> + <translation>La solicitud de pago no puede ser analizada!</translation> + </message> + <message> + <source>Bad response from server %1</source> + <translation>Mala respuesta desde el servidor %1</translation> + </message> + <message> + <source>Network request error</source> + <translation>Error en petición de la red</translation> + </message> + <message> + <source>Payment acknowledged</source> + <translation>Pago declarado</translation> + </message> +</context> <context> <name>PeerTableModel</name> - </context> + <message> + <source>User Agent</source> + <translation>User Agent</translation> + </message> + <message> + <source>Node/Service</source> + <translation>Nodo/Servicio</translation> + </message> + <message> + <source>NodeId</source> + <translation>ID del nodo</translation> + </message> + <message> + <source>Ping</source> + <translation>Ping</translation> + </message> + <message> + <source>Sent</source> + <translation>Enviado</translation> + </message> + <message> + <source>Received</source> + <translation>Recibido</translation> + </message> +</context> <context> <name>QObject</name> <message> @@ -460,24 +1330,96 @@ <translation>Cantidad</translation> </message> <message> + <source>Enter a Bitcoin address (e.g. %1)</source> + <translation>Ingresa una dirección de Bitcoin (Ejemplo: %1)</translation> + </message> + <message> + <source>%1 d</source> + <translation>%1 d</translation> + </message> + <message> + <source>%1 h</source> + <translation>%1 h</translation> + </message> + <message> + <source>%1 m</source> + <translation>%1 m</translation> + </message> + <message> + <source>%1 s</source> + <translation>%1 s</translation> + </message> + <message> + <source>None</source> + <translation>Nada</translation> + </message> + <message> <source>N/A</source> <translation>N/A</translation> </message> <message> + <source>%1 ms</source> + <translation>%1 ms</translation> + </message> + <message numerus="yes"> + <source>%n second(s)</source> + <translation><numerusform>%n segundo</numerusform><numerusform>%n segundos</numerusform></translation> + </message> + <message> <source>%1 and %2</source> <translation>%1 y %2</translation> </message> <message> + <source>%1 B</source> + <translation>%1 B</translation> + </message> + <message> + <source>%1 MB</source> + <translation>%1 MB</translation> + </message> + <message> + <source>%1 GB</source> + <translation>%1 GB</translation> + </message> + <message> + <source>%1 didn't yet exit safely...</source> + <translation>%1 aun no se ha cerrado de forma segura...</translation> + </message> + <message> <source>unknown</source> <translation>desconocido</translation> </message> </context> <context> <name>QObject::QObject</name> - </context> + <message> + <source>Error: Specified data directory "%1" does not exist.</source> + <translation>Error: El directorio de datos "%1" especificado no existe.</translation> + </message> + <message> + <source>Error: %1</source> + <translation>Error: %1</translation> + </message> +</context> <context> <name>QRImageWidget</name> - </context> + <message> + <source>&Save Image...</source> + <translation>Guardar imagen...</translation> + </message> + <message> + <source>&Copy Image</source> + <translation>&Copiar imagen</translation> + </message> + <message> + <source>Save QR Code</source> + <translation>Guardar código QR</translation> + </message> + <message> + <source>PNG Image (*.png)</source> + <translation>Imagen PNG (*.png)</translation> + </message> +</context> <context> <name>RPCConsole</name> <message> @@ -501,6 +1443,14 @@ <translation>General</translation> </message> <message> + <source>Using BerkeleyDB version</source> + <translation>Utilizando la versión de BerkeleyDB</translation> + </message> + <message> + <source>Datadir</source> + <translation>Datadir</translation> + </message> + <message> <source>Startup time</source> <translation>Tiempo de inicio</translation> </message> @@ -521,11 +1471,123 @@ <translation>Bloquea cadena</translation> </message> <message> + <source>Current number of blocks</source> + <translation>Cantidad de bloques actual</translation> + </message> + <message> + <source>Memory Pool</source> + <translation>Memory Pool</translation> + </message> + <message> + <source>Current number of transactions</source> + <translation>Numero total de transacciones</translation> + </message> + <message> + <source>Memory usage</source> + <translation>Memoria utilizada</translation> + </message> + <message> + <source>&Reset</source> + <translation>&Reestablecer</translation> + </message> + <message> + <source>Received</source> + <translation>Recibido</translation> + </message> + <message> + <source>Sent</source> + <translation>Enviado</translation> + </message> + <message> + <source>&Peers</source> + <translation>&Peers</translation> + </message> + <message> + <source>Banned peers</source> + <translation>Peers baneados</translation> + </message> + <message> + <source>Select a peer to view detailed information.</source> + <translation>Selecciona un peer para ver la información detallada.</translation> + </message> + <message> + <source>Whitelisted</source> + <translation>En la lista blanca</translation> + </message> + <message> + <source>Direction</source> + <translation>Dirección</translation> + </message> + <message> <source>Version</source> <translation>version </translation> </message> <message> + <source>Starting Block</source> + <translation>Bloque de inicio</translation> + </message> + <message> + <source>Synced Headers</source> + <translation>Cabeceras sincronizadas</translation> + </message> + <message> + <source>Synced Blocks</source> + <translation>Bloques sincronizados</translation> + </message> + <message> + <source>User Agent</source> + <translation>User Agent</translation> + </message> + <message> + <source>Decrease font size</source> + <translation>Disminuir tamaño de fuente</translation> + </message> + <message> + <source>Increase font size</source> + <translation>Aumentar tamaño de fuente</translation> + </message> + <message> + <source>Services</source> + <translation>Servicios</translation> + </message> + <message> + <source>Ban Score</source> + <translation>Puntuación de bloqueo</translation> + </message> + <message> + <source>Connection Time</source> + <translation>Duración de la conexión</translation> + </message> + <message> + <source>Last Send</source> + <translation>Ultimo envío</translation> + </message> + <message> + <source>Last Receive</source> + <translation>Ultima recepción</translation> + </message> + <message> + <source>Ping Time</source> + <translation>Tiempo de Ping</translation> + </message> + <message> + <source>Ping Wait</source> + <translation>Espera de Ping</translation> + </message> + <message> + <source>Min Ping</source> + <translation>Ping minimo</translation> + </message> + <message> + <source>Time Offset</source> + <translation>Desplazamiento de tiempo</translation> + </message> + <message> + <source>Last block time</source> + <translation>Hora del último bloque</translation> + </message> + <message> <source>&Open</source> <translation>&Abrir</translation> </message> @@ -534,14 +1596,106 @@ <translation>&Consola</translation> </message> <message> + <source>&Network Traffic</source> + <translation>&Tráfico de Red</translation> + </message> + <message> <source>Totals</source> <translation>Total:</translation> </message> <message> + <source>In:</source> + <translation>Entrada:</translation> + </message> + <message> + <source>Out:</source> + <translation>Salida:</translation> + </message> + <message> + <source>Debug log file</source> + <translation>Archivo del registro de depuración</translation> + </message> + <message> <source>Clear console</source> <translation>Limpiar Consola</translation> </message> - </context> + <message> + <source>1 &hour</source> + <translation>1 &hora</translation> + </message> + <message> + <source>1 &day</source> + <translation>1 &día</translation> + </message> + <message> + <source>1 &week</source> + <translation>1 semana</translation> + </message> + <message> + <source>1 &year</source> + <translation>1 año</translation> + </message> + <message> + <source>&Disconnect</source> + <translation>&Desconectar</translation> + </message> + <message> + <source>Ban for</source> + <translation>Prohibir para</translation> + </message> + <message> + <source>&Unban</source> + <translation>&Desbloquear</translation> + </message> + <message> + <source>Welcome to the %1 RPC console.</source> + <translation>Bienvenido a la consola RPC %1.</translation> + </message> + <message> + <source>Use up and down arrows to navigate history, and %1 to clear screen.</source> + <translation>Usa las flechas (arriba y abajo) para navegar por el historial, y %1 para limpiar la consola.</translation> + </message> + <message> + <source>WARNING: Scammers have been active, telling users to type commands here, stealing their wallet contents. Do not use this console without fully understanding the ramifications of a command.</source> + <translation>ADVERTENCIA: No uses esta consola sin comprender las consecuencias de la ejecución de cada comando.</translation> + </message> + <message> + <source>Network activity disabled</source> + <translation>Actividad de red desactivada</translation> + </message> + <message> + <source>(node id: %1)</source> + <translation>(identificador del nodo: %1)</translation> + </message> + <message> + <source>via %1</source> + <translation>via %1</translation> + </message> + <message> + <source>never</source> + <translation>nunca</translation> + </message> + <message> + <source>Inbound</source> + <translation>Entrante</translation> + </message> + <message> + <source>Outbound</source> + <translation>Saliente</translation> + </message> + <message> + <source>Yes</source> + <translation>Si</translation> + </message> + <message> + <source>No</source> + <translation>No</translation> + </message> + <message> + <source>Unknown</source> + <translation>Desconocido</translation> + </message> +</context> <context> <name>ReceiveCoinsDialog</name> <message> @@ -556,7 +1710,63 @@ <source>&Message:</source> <translation>&mensaje</translation> </message> - </context> + <message> + <source>An optional message to attach to the payment request, which will be displayed when the request is opened. Note: The message will not be sent with the payment over the Bitcoin network.</source> + <translation>Mensaje opcional adjunto a la solicitud de pago, que será mostrado cuando la solicitud sea abierta. Nota: Este mensaje no será enviado con el pago a través de la red Bitcoin.</translation> + </message> + <message> + <source>Use this form to request payments. All fields are <b>optional</b>.</source> + <translation>Usa este formulario para solicitar un pago. Todos los campos son <b>opcionales</b>.</translation> + </message> + <message> + <source>An optional amount to request. Leave this empty or zero to not request a specific amount.</source> + <translation>Monto opcional a solicitar. Deja este campo vacío o en cero si no quieres definir un monto específico.</translation> + </message> + <message> + <source>Clear all fields of the form.</source> + <translation>Limpiar todos los campos del formulario.</translation> + </message> + <message> + <source>Clear</source> + <translation>Limpiar</translation> + </message> + <message> + <source>Requested payments history</source> + <translation>Historial de pagos solicitados</translation> + </message> + <message> + <source>&Request payment</source> + <translation>Solicitud de pago</translation> + </message> + <message> + <source>Show</source> + <translation>Mostrar</translation> + </message> + <message> + <source>Remove the selected entries from the list</source> + <translation>Borrar de la lista las direcciones seleccionadas</translation> + </message> + <message> + <source>Remove</source> + <translation>Eliminar</translation> + </message> + <message> + <source>Copy URI</source> + <translation>Copiar URI</translation> + </message> + <message> + <source>Copy label</source> + <translation>Copiar etiqueta</translation> + </message> + <message> + <source>Copy message</source> + <translation>Copiar mensaje</translation> + </message> + <message> + <source>Copy amount</source> + <translation>Copiar Cantidad</translation> + </message> +</context> <context> <name>ReceiveRequestDialog</name> <message> @@ -564,6 +1774,10 @@ <translation>Código QR </translation> </message> <message> + <source>Copy &URI</source> + <translation>Copiar &URI</translation> + </message> + <message> <source>Copy &Address</source> <translation>&Copia dirección</translation> </message> @@ -571,10 +1785,74 @@ <source>&Save Image...</source> <translation>Guardar imagen...</translation> </message> - </context> + <message> + <source>Request payment to %1</source> + <translation>Solicitar pago a %1</translation> + </message> + <message> + <source>Payment information</source> + <translation>Información del pago</translation> + </message> + <message> + <source>URI</source> + <translation>URI</translation> + </message> + <message> + <source>Address</source> + <translation>Dirección</translation> + </message> + <message> + <source>Amount</source> + <translation>Cantidad</translation> + </message> + <message> + <source>Label</source> + <translation>Etiqueta</translation> + </message> + <message> + <source>Message</source> + <translation>Mensaje</translation> + </message> + <message> + <source>Wallet</source> + <translation>Cartera</translation> + </message> + <message> + <source>Error encoding URI into QR Code.</source> + <translation>Fallo al codificar URI en código QR.</translation> + </message> +</context> <context> <name>RecentRequestsTableModel</name> - </context> + <message> + <source>Date</source> + <translation>Fecha</translation> + </message> + <message> + <source>Label</source> + <translation>Etiqueta</translation> + </message> + <message> + <source>Message</source> + <translation>Mensaje</translation> + </message> + <message> + <source>(no label)</source> + <translation>(sin etiqueta)</translation> + </message> + <message> + <source>(no message)</source> + <translation>(sin mensaje)</translation> + </message> + <message> + <source>(no amount requested)</source> + <translation>(no existe monto solicitado)</translation> + </message> + <message> + <source>Requested</source> + <translation>Solicitado</translation> + </message> +</context> <context> <name>SendCoinsDialog</name> <message> @@ -582,10 +1860,30 @@ <translation>Enviar monedas</translation> </message> <message> + <source>Coin Control Features</source> + <translation>Características de Coin Control</translation> + </message> + <message> + <source>Inputs...</source> + <translation>Entradas...</translation> + </message> + <message> + <source>automatically selected</source> + <translation>Seleccionado automaticamente</translation> + </message> + <message> <source>Insufficient funds!</source> <translation>Fondos insuficientes</translation> </message> <message> + <source>Quantity:</source> + <translation>Cantidad:</translation> + </message> + <message> + <source>Bytes:</source> + <translation>Bytes:</translation> + </message> + <message> <source>Amount:</source> <translation>Cantidad:</translation> </message> @@ -595,10 +1893,54 @@ </translation> </message> <message> + <source>After Fee:</source> + <translation>Después de aplicar la comisión:</translation> + </message> + <message> + <source>Change:</source> + <translation>Cambio:</translation> + </message> + <message> + <source>Custom change address</source> + <translation>Dirección de cambio personalizada</translation> + </message> + <message> <source>Transaction Fee:</source> <translation>Comisión transacción:</translation> </message> <message> + <source>Choose...</source> + <translation>Seleccione</translation> + </message> + <message> + <source>Warning: Fee estimation is currently not possible.</source> + <translation>Advertencia: En este momento no se puede estimar la cuota.</translation> + </message> + <message> + <source>collapse fee-settings</source> + <translation>Colapsar ajustes de comisión.</translation> + </message> + <message> + <source>per kilobyte</source> + <translation>por kilobyte</translation> + </message> + <message> + <source>Hide</source> + <translation>Ocultar</translation> + </message> + <message> + <source>(read the tooltip)</source> + <translation>(leer la sugerencia)</translation> + </message> + <message> + <source>Recommended:</source> + <translation>Recomendado:</translation> + </message> + <message> + <source>Custom:</source> + <translation>Personalizado:</translation> + </message> + <message> <source>Send to multiple recipients at once</source> <translation>Enviar a múltiples destinatarios</translation> </message> @@ -607,6 +1949,18 @@ <translation>&Agrega destinatario</translation> </message> <message> + <source>Clear all fields of the form.</source> + <translation>Limpiar todos los campos del formulario.</translation> + </message> + <message> + <source>Dust:</source> + <translation>Polvo:</translation> + </message> + <message> + <source>Confirmation time target:</source> + <translation>Objetivo de tiempo de confirmación</translation> + </message> + <message> <source>Clear &All</source> <translation>&Borra todos</translation> </message> @@ -622,7 +1976,115 @@ <source>S&end</source> <translation>&Envía</translation> </message> - </context> + <message> + <source>Copy quantity</source> + <translation>Copiar cantidad</translation> + </message> + <message> + <source>Copy amount</source> + <translation>Copiar Cantidad</translation> + </message> + <message> + <source>Copy fee</source> + <translation>Copiar comisión</translation> + </message> + <message> + <source>Copy after fee</source> + <translation>Copiar después de la comisión</translation> + </message> + <message> + <source>Copy bytes</source> + <translation>Copiar bytes</translation> + </message> + <message> + <source>Copy dust</source> + <translation>Copiar polvo</translation> + </message> + <message> + <source>Copy change</source> + <translation>Copiar cambio</translation> + </message> + <message> + <source>%1 (%2 blocks)</source> + <translation>%1 (%2 bloques)</translation> + </message> + <message> + <source>%1 to %2</source> + <translation>%1 a %2</translation> + </message> + <message> + <source>Are you sure you want to send?</source> + <translation>¿Seguro que quiere enviar?</translation> + </message> + <message> + <source>or</source> + <translation>o</translation> + </message> + <message> + <source>Transaction fee</source> + <translation>Comisión de transacción</translation> + </message> + <message> + <source>Confirm send coins</source> + <translation>Confirmar el envió de monedas</translation> + </message> + <message> + <source>The recipient address is not valid. Please recheck.</source> + <translation>La dirección de envío no es válida. Por favor revisala.</translation> + </message> + <message> + <source>The amount to pay must be larger than 0.</source> + <translation>La cantidad por pagar tiene que ser mayor que 0.</translation> + </message> + <message> + <source>The amount exceeds your balance.</source> + <translation>El monto sobrepasa tu saldo.</translation> + </message> + <message> + <source>The total exceeds your balance when the %1 transaction fee is included.</source> + <translation>El total sobrepasa tu saldo cuando se incluyen %1 como comisión de envió.</translation> + </message> + <message> + <source>Transaction creation failed!</source> + <translation>¡Fallo al crear la transacción!</translation> + </message> + <message> + <source>The transaction was rejected with the following reason: %1</source> + <translation>Se ha rechazado la transacción por la siguiente razón: %1</translation> + </message> + <message> + <source>A fee higher than %1 is considered an absurdly high fee.</source> + <translation>Una comisión mayor que %1 se considera como una comisión absurda-mente alta.</translation> + </message> + <message> + <source>Payment request expired.</source> + <translation>Solicitud de pago expirada</translation> + </message> + <message> + <source>Pay only the required fee of %1</source> + <translation>Pagar únicamente la comisión requerida de %1</translation> + </message> + <message> + <source>Warning: Invalid Bitcoin address</source> + <translation>Peligro: Dirección de Bitcoin inválida</translation> + </message> + <message> + <source>Warning: Unknown change address</source> + <translation>Peligro: Dirección de cambio desconocida</translation> + </message> + <message> + <source>Confirm custom change address</source> + <translation>Confirma dirección de cambio personalizada</translation> + </message> + <message> + <source>The address you selected for change is not part of this wallet. Any or all funds in your wallet may be sent to this address. Are you sure?</source> + <translation>La dirección de cambio que ingresaste no es parte de tu monedero. Parte de tus fondos serán enviados a esta dirección. ¿Estás seguro?</translation> + </message> + <message> + <source>(no label)</source> + <translation>(sin etiqueta)</translation> + </message> +</context> <context> <name>SendCoinsEntry</name> <message> @@ -638,6 +2100,18 @@ <translation>&Etiqueta:</translation> </message> <message> + <source>Choose previously used address</source> + <translation>Seleccionar dirección usada anteriormente</translation> + </message> + <message> + <source>This is a normal payment.</source> + <translation>Este es un pago normal</translation> + </message> + <message> + <source>The Bitcoin address to send the payment to</source> + <translation>Dirección Bitcoin a enviar el pago</translation> + </message> + <message> <source>Alt+A</source> <translation>Alt+A</translation> </message> @@ -650,27 +2124,79 @@ <translation>Alt+P</translation> </message> <message> + <source>Remove this entry</source> + <translation>Quitar esta entrada</translation> + </message> + <message> + <source>S&ubtract fee from amount</source> + <translation>Restar comisiones del monto.</translation> + </message> + <message> <source>Message:</source> <translation>Mensaje:</translation> </message> <message> + <source>This is an unauthenticated payment request.</source> + <translation>Esta es una petición de pago no autentificada.</translation> + </message> + <message> + <source>This is an authenticated payment request.</source> + <translation>Esta es una petición de pago autentificada.</translation> + </message> + <message> + <source>Enter a label for this address to add it to the list of used addresses</source> + <translation>Introduce una etiqueta para esta dirección para añadirla a la lista de direcciones utilizadas</translation> + </message> + <message> <source>Pay To:</source> <translation>Pagar a:</translation> </message> - </context> + <message> + <source>Memo:</source> + <translation>Memo:</translation> + </message> + <message> + <source>Enter a label for this address to add it to your address book</source> + <translation>Introduce una etiqueta a esta dirección para añadirla a tu guía</translation> + </message> +</context> <context> <name>SendConfirmationDialog</name> - </context> + <message> + <source>Yes</source> + <translation>Si</translation> + </message> +</context> <context> <name>ShutdownWindow</name> - </context> + <message> + <source>%1 is shutting down...</source> + <translation>%1 se esta cerrando...</translation> + </message> + <message> + <source>Do not shut down the computer until this window disappears.</source> + <translation>No apague el equipo hasta que desaparezca esta ventana.</translation> + </message> +</context> <context> <name>SignVerifyMessageDialog</name> <message> + <source>Signatures - Sign / Verify a Message</source> + <translation>Firmas - Firmar / verificar un mensaje</translation> + </message> + <message> <source>&Sign Message</source> <translation>&Firmar Mensaje</translation> </message> <message> + <source>The Bitcoin address to sign the message with</source> + <translation>Dirección Bitcoin con la que firmar el mensaje</translation> + </message> + <message> + <source>Choose previously used address</source> + <translation>Seleccionar dirección usada anteriormente</translation> + </message> + <message> <source>Alt+A</source> <translation>Alt+A</translation> </message> @@ -691,6 +2217,10 @@ <translation>Firma</translation> </message> <message> + <source>Copy the current signature to the system clipboard</source> + <translation>Copiar la firma actual al portapapeles del sistema</translation> + </message> + <message> <source>Sign the message to prove you own this Bitcoin address</source> <translation>Firmar un mensjage para probar que usted es dueño de esta dirección</translation> </message> @@ -699,6 +2229,10 @@ <translation>Firmar Mensaje</translation> </message> <message> + <source>Reset all sign message fields</source> + <translation>Limpiar todos los campos de la firma de mensaje</translation> + </message> + <message> <source>Clear &All</source> <translation>&Borra todos</translation> </message> @@ -707,10 +2241,74 @@ <translation>&Firmar Mensaje</translation> </message> <message> + <source>The Bitcoin address the message was signed with</source> + <translation>La dirección Bitcoin con la que se firmó el mensaje</translation> + </message> + <message> + <source>Verify the message to ensure it was signed with the specified Bitcoin address</source> + <translation>Verifica el mensaje para asegurar que fue firmado con la dirección de Bitcoin especificada.</translation> + </message> + <message> <source>Verify &Message</source> <translation>&Firmar Mensaje</translation> </message> - </context> + <message> + <source>Reset all verify message fields</source> + <translation>Limpiar todos los campos de la verificación de mensaje</translation> + </message> + <message> + <source>Click "Sign Message" to generate signature</source> + <translation>Click en "Firmar mensaje" para generar una firma</translation> + </message> + <message> + <source>The entered address is invalid.</source> + <translation>La dirección ingresada es inválida</translation> + </message> + <message> + <source>Please check the address and try again.</source> + <translation>Por favor, revisa la dirección e intenta nuevamente.</translation> + </message> + <message> + <source>The entered address does not refer to a key.</source> + <translation>La dirección ingresada no corresponde a una llave válida.</translation> + </message> + <message> + <source>Wallet unlock was cancelled.</source> + <translation>El desbloqueo del monedero fue cancelado.</translation> + </message> + <message> + <source>Private key for the entered address is not available.</source> + <translation>La llave privada para la dirección introducida no está disponible.</translation> + </message> + <message> + <source>Message signing failed.</source> + <translation>Falló la firma del mensaje.</translation> + </message> + <message> + <source>Message signed.</source> + <translation>Mensaje firmado.</translation> + </message> + <message> + <source>The signature could not be decoded.</source> + <translation>La firma no pudo decodificarse.</translation> + </message> + <message> + <source>Please check the signature and try again.</source> + <translation>Por favor compruebe la firma e intente de nuevo.</translation> + </message> + <message> + <source>The signature did not match the message digest.</source> + <translation>La firma no se combinó con el mensaje.</translation> + </message> + <message> + <source>Message verification failed.</source> + <translation>Falló la verificación del mensaje.</translation> + </message> + <message> + <source>Message verified.</source> + <translation>Mensaje verificado.</translation> + </message> +</context> <context> <name>SplashScreen</name> <message> @@ -727,92 +2325,829 @@ </context> <context> <name>TransactionDesc</name> - </context> + <message> + <source>Open until %1</source> + <translation>Abierto hasta %1</translation> + </message> + <message> + <source>conflicted with a transaction with %1 confirmations</source> + <translation>Hay un conflicto con la traducción de las confirmaciones %1</translation> + </message> + <message> + <source>0/unconfirmed, %1</source> + <translation>0/no confirmado, %1</translation> + </message> + <message> + <source>in memory pool</source> + <translation>en el equipo de memoria</translation> + </message> + <message> + <source>not in memory pool</source> + <translation>no en el equipo de memoria</translation> + </message> + <message> + <source>abandoned</source> + <translation>abandonado</translation> + </message> + <message> + <source>%1/unconfirmed</source> + <translation>%1/no confirmado</translation> + </message> + <message> + <source>%1 confirmations</source> + <translation>confirmaciones %1</translation> + </message> + <message> + <source>Status</source> + <translation>Estado</translation> + </message> + <message> + <source>Date</source> + <translation>Fecha</translation> + </message> + <message> + <source>Source</source> + <translation>Fuente</translation> + </message> + <message> + <source>Generated</source> + <translation>Generado</translation> + </message> + <message> + <source>From</source> + <translation>Desde</translation> + </message> + <message> + <source>unknown</source> + <translation>desconocido</translation> + </message> + <message> + <source>To</source> + <translation>Para</translation> + </message> + <message> + <source>own address</source> + <translation>dirección personal</translation> + </message> + <message> + <source>watch-only</source> + <translation>Solo observación</translation> + </message> + <message> + <source>label</source> + <translation>etiqueta</translation> + </message> + <message> + <source>Credit</source> + <translation>Credito</translation> + </message> + <message> + <source>not accepted</source> + <translation>no aceptada</translation> + </message> + <message> + <source>Debit</source> + <translation>Débito</translation> + </message> + <message> + <source>Total debit</source> + <translation>Total enviado</translation> + </message> + <message> + <source>Total credit</source> + <translation>Crédito total</translation> + </message> + <message> + <source>Transaction fee</source> + <translation>Comisión de transacción</translation> + </message> + <message> + <source>Net amount</source> + <translation>Cantidad total</translation> + </message> + <message> + <source>Message</source> + <translation>Mensaje</translation> + </message> + <message> + <source>Comment</source> + <translation>Comentario</translation> + </message> + <message> + <source>Transaction ID</source> + <translation>Identificador de transacción (ID)</translation> + </message> + <message> + <source>Transaction total size</source> + <translation>Tamaño total de transacción</translation> + </message> + <message> + <source>Output index</source> + <translation>Indice de salida</translation> + </message> + <message> + <source>Merchant</source> + <translation>Vendedor</translation> + </message> + <message> + <source>Debug information</source> + <translation>Información de depuración</translation> + </message> + <message> + <source>Transaction</source> + <translation>Transacción</translation> + </message> + <message> + <source>Inputs</source> + <translation>Entradas</translation> + </message> + <message> + <source>Amount</source> + <translation>Cantidad</translation> + </message> + <message> + <source>true</source> + <translation>verdadero</translation> + </message> + <message> + <source>false</source> + <translation>falso</translation> + </message> +</context> <context> <name>TransactionDescDialog</name> <message> <source>This pane shows a detailed description of the transaction</source> <translation>Esta ventana muestra información detallada sobre la transacción</translation> </message> - </context> + <message> + <source>Details for %1</source> + <translation>Detalles para %1</translation> + </message> +</context> <context> <name>TransactionTableModel</name> - </context> + <message> + <source>Date</source> + <translation>Fecha</translation> + </message> + <message> + <source>Type</source> + <translation>Tipo</translation> + </message> + <message> + <source>Label</source> + <translation>Etiqueta</translation> + </message> + <message> + <source>Open until %1</source> + <translation>Abierto hasta %1</translation> + </message> + <message> + <source>Unconfirmed</source> + <translation>Sin confirmar</translation> + </message> + <message> + <source>Abandoned</source> + <translation>Abandonado</translation> + </message> + <message> + <source>Confirming (%1 of %2 recommended confirmations)</source> + <translation>Confirmando (%1 de %2 confirmaciones recomendadas)</translation> + </message> + <message> + <source>Confirmed (%1 confirmations)</source> + <translation>Confirmado (%1 confirmaciones)</translation> + </message> + <message> + <source>Conflicted</source> + <translation>En conflicto</translation> + </message> + <message> + <source>Immature (%1 confirmations, will be available after %2)</source> + <translation>Inmaduro (%1 confirmación(es), Estarán disponibles después de %2)</translation> + </message> + <message> + <source>Generated but not accepted</source> + <translation>Generado pero no aceptado</translation> + </message> + <message> + <source>Received with</source> + <translation>Recibido con</translation> + </message> + <message> + <source>Received from</source> + <translation>Recibido de</translation> + </message> + <message> + <source>Sent to</source> + <translation>Enviado a</translation> + </message> + <message> + <source>Payment to yourself</source> + <translation>Pago a ti mismo</translation> + </message> + <message> + <source>Mined</source> + <translation>Minado</translation> + </message> + <message> + <source>watch-only</source> + <translation>Solo observación</translation> + </message> + <message> + <source>(n/a)</source> + <translation>(n/a)</translation> + </message> + <message> + <source>(no label)</source> + <translation>(sin etiqueta)</translation> + </message> + <message> + <source>Transaction status. Hover over this field to show number of confirmations.</source> + <translation>Estado de transacción. Pasa el ratón sobre este campo para ver el numero de confirmaciones.</translation> + </message> + <message> + <source>Date and time that the transaction was received.</source> + <translation>Fecha y hora cuando se recibió la transacción</translation> + </message> + <message> + <source>Type of transaction.</source> + <translation>Tipo de transacción.</translation> + </message> + <message> + <source>Amount removed from or added to balance.</source> + <translation>Cantidad restada o añadida al balance</translation> + </message> +</context> <context> <name>TransactionView</name> - </context> + <message> + <source>All</source> + <translation>Todo</translation> + </message> + <message> + <source>Today</source> + <translation>Hoy</translation> + </message> + <message> + <source>This week</source> + <translation>Esta semana</translation> + </message> + <message> + <source>This month</source> + <translation>Este mes</translation> + </message> + <message> + <source>Last month</source> + <translation>Mes pasado</translation> + </message> + <message> + <source>This year</source> + <translation>Este año</translation> + </message> + <message> + <source>Range...</source> + <translation>Rango...</translation> + </message> + <message> + <source>Received with</source> + <translation>Recibido con</translation> + </message> + <message> + <source>Sent to</source> + <translation>Enviado a</translation> + </message> + <message> + <source>To yourself</source> + <translation>A ti mismo</translation> + </message> + <message> + <source>Mined</source> + <translation>Minado</translation> + </message> + <message> + <source>Other</source> + <translation>Otra</translation> + </message> + <message> + <source>Min amount</source> + <translation>Cantidad mínima</translation> + </message> + <message> + <source>Abandon transaction</source> + <translation>Transacción abandonada</translation> + </message> + <message> + <source>Increase transaction fee</source> + <translation>Incrementar cuota de transacción</translation> + </message> + <message> + <source>Copy address</source> + <translation>Copiar dirección</translation> + </message> + <message> + <source>Copy label</source> + <translation>Copiar etiqueta</translation> + </message> + <message> + <source>Copy amount</source> + <translation>Copiar Cantidad</translation> + </message> + <message> + <source>Copy transaction ID</source> + <translation>Copiar ID de transacción</translation> + </message> + <message> + <source>Copy raw transaction</source> + <translation>Copiar transacción bruta</translation> + </message> + <message> + <source>Copy full transaction details</source> + <translation>Copiar todos los detalles de la transacción</translation> + </message> + <message> + <source>Edit label</source> + <translation>Editar etiqueta</translation> + </message> + <message> + <source>Show transaction details</source> + <translation>Mostrar detalles de la transacción</translation> + </message> + <message> + <source>Export Transaction History</source> + <translation>Exportar historial de transacciones</translation> + </message> + <message> + <source>Comma separated file (*.csv)</source> + <translation>Archivos separados por coma (*.csv)</translation> + </message> + <message> + <source>Confirmed</source> + <translation>Archivo separado de coma (*.csv)</translation> + </message> + <message> + <source>Watch-only</source> + <translation>Solo observación</translation> + </message> + <message> + <source>Date</source> + <translation>Fecha</translation> + </message> + <message> + <source>Type</source> + <translation>Tipo</translation> + </message> + <message> + <source>Label</source> + <translation>Etiqueta</translation> + </message> + <message> + <source>Address</source> + <translation>Dirección</translation> + </message> + <message> + <source>ID</source> + <translation>ID</translation> + </message> + <message> + <source>Exporting Failed</source> + <translation>Exportación fallida</translation> + </message> + <message> + <source>Exporting Successful</source> + <translation>Exportación exitosa</translation> + </message> + <message> + <source>The transaction history was successfully saved to %1.</source> + <translation>La transacción ha sido guardada en %1.</translation> + </message> + <message> + <source>Range:</source> + <translation>Rango:</translation> + </message> + <message> + <source>to</source> + <translation>para</translation> + </message> +</context> <context> <name>UnitDisplayStatusBarControl</name> - </context> + <message> + <source>Unit to show amounts in. Click to select another unit.</source> + <translation>Unidad en la que se muestran las cantidades. Haga clic para seleccionar otra unidad.</translation> + </message> +</context> <context> <name>WalletFrame</name> - </context> + <message> + <source>No wallet has been loaded.</source> + <translation>No se ha cargado ningún monedero</translation> + </message> +</context> <context> <name>WalletModel</name> - </context> + <message> + <source>Send Coins</source> + <translation>Enviar monedas</translation> + </message> + <message> + <source>Fee bump error</source> + <translation>Error de incremento de cuota</translation> + </message> + <message> + <source>Increasing transaction fee failed</source> + <translation>Ha fallado el incremento de la cuota de transacción.</translation> + </message> + <message> + <source>Do you want to increase the fee?</source> + <translation>¿Desea incrementar la cuota?</translation> + </message> + <message> + <source>Current fee:</source> + <translation>Comisión actual:</translation> + </message> + <message> + <source>Increase:</source> + <translation>Incremento:</translation> + </message> + <message> + <source>New fee:</source> + <translation>Nueva comisión:</translation> + </message> + <message> + <source>Confirm fee bump</source> + <translation>Confirmar incremento de comisión</translation> + </message> + <message> + <source>Can't sign transaction.</source> + <translation>No se ha podido firmar la transacción.</translation> + </message> + <message> + <source>Could not commit transaction</source> + <translation>No se pudo confirmar la transacción</translation> + </message> +</context> <context> <name>WalletView</name> + <message> + <source>&Export</source> + <translation>Exportar</translation> + </message> + <message> + <source>Export the data in the current tab to a file</source> + <translation>Exportar los datos de la pestaña actual a un archivo</translation> + </message> + <message> + <source>Backup Wallet</source> + <translation>Respaldar monedero</translation> + </message> + <message> + <source>Wallet Data (*.dat)</source> + <translation>Archivo de respaldo (*.dat)</translation> + </message> + <message> + <source>Backup Failed</source> + <translation>Ha fallado el respaldo</translation> + </message> + <message> + <source>There was an error trying to save the wallet data to %1.</source> + <translation>Ha habido un error al intentar guardar los datos del monedero a %1.</translation> + </message> + <message> + <source>Backup Successful</source> + <translation>Respaldo exitoso</translation> + </message> + <message> + <source>The wallet data was successfully saved to %1.</source> + <translation>Los datos del monedero se han guardado con éxito en %1.</translation> + </message> </context> <context> <name>bitcoin-core</name> <message> - <source>Options:</source> - <translation>Opciones: -</translation> + <source>Distributed under the MIT software license, see the accompanying file %s or %s</source> + <translation>Distribuido bajo la licencia de software MIT, vea el archivo adjunto %s o %s</translation> </message> <message> - <source>Specify data directory</source> - <translation>Especifica directorio para los datos -</translation> + <source>Prune configured below the minimum of %d MiB. Please use a higher number.</source> + <translation>La Poda se ha configurado por debajo del mínimo de %d MiB. Por favor utiliza un valor mas alto.</translation> </message> <message> - <source>Accept command line and JSON-RPC commands</source> - <translation>Aceptar comandos consola y JSON-RPC -</translation> + <source>Rescans are not possible in pruned mode. You will need to use -reindex which will download the whole blockchain again.</source> + <translation>No es es posible re-escanear en modo prune. Debes usar -reindex el cual descargara toda la blockchain de nuevo.</translation> </message> <message> - <source>Run in the background as a daemon and accept commands</source> - <translation>Correr como demonio y acepta comandos -</translation> + <source>Error: A fatal internal error occurred, see debug.log for details</source> + <translation>Error: Un error interno fatal ha ocurrido, ver debug.log para detalles</translation> + </message> + <message> + <source>Pruning blockstore...</source> + <translation>Poda blockstore...</translation> + </message> + <message> + <source>Unable to start HTTP server. See debug log for details.</source> + <translation>No se ha podido iniciar el servidor HTTP. Ver debug log para detalles.</translation> </message> <message> <source>Bitcoin Core</source> <translation>bitcoin core</translation> </message> <message> + <source>The %s developers</source> + <translation>Los desarrolladores de %s</translation> + </message> + <message> + <source>%d of last 100 blocks have unexpected version</source> + <translation>%d de los últimos 100 bloques tienen una versión no esperada</translation> + </message> + <message> + <source>%s corrupt, salvage failed</source> + <translation>%s corrupto. Fracasó la recuperación</translation> + </message> + <message> + <source>-maxmempool must be at least %d MB</source> + <translation>-maxmempool debe ser por lo menos de %d MB</translation> + </message> + <message> + <source>Cannot resolve -%s address: '%s'</source> + <translation>No se puede resolver -%s direccion: '%s'</translation> + </message> + <message> + <source>Change index out of range</source> + <translation>Cambio de indice fuera de rango</translation> + </message> + <message> + <source>Copyright (C) %i-%i</source> + <translation>Copyright (C) %i-%i</translation> + </message> + <message> + <source>Corrupted block database detected</source> + <translation>Corrupción de base de datos de bloques detectada.</translation> + </message> + <message> + <source>Do you want to rebuild the block database now?</source> + <translation>¿Quieres reconstruir la base de datos de bloques ahora?</translation> + </message> + <message> + <source>Error initializing block database</source> + <translation>Error al inicializar la base de datos de bloques</translation> + </message> + <message> + <source>Error initializing wallet database environment %s!</source> + <translation>Error al iniciar el entorno de la base de datos del monedero %s</translation> + </message> + <message> + <source>Error loading %s</source> + <translation>Error cargando %s</translation> + </message> + <message> + <source>Error loading %s: Wallet corrupted</source> + <translation>Error cargando %s: Monedero corrupto</translation> + </message> + <message> + <source>Error loading %s: Wallet requires newer version of %s</source> + <translation>Error cargando %s: Monedero requiere una versión mas reciente de %s</translation> + </message> + <message> <source>Error loading block database</source> <translation>Error cargando blkindex.dat</translation> </message> <message> + <source>Error opening block database</source> + <translation>Error cargando base de datos de bloques</translation> + </message> + <message> <source>Error: Disk space is low!</source> <translation>Atención: Poco espacio en el disco duro</translation> </message> <message> + <source>Failed to listen on any port. Use -listen=0 if you want this.</source> + <translation>Ha fallado la escucha en todos los puertos. Usa -listen=0 si desea esto.</translation> + </message> + <message> + <source>Importing...</source> + <translation>Importando...</translation> + </message> + <message> + <source>Incorrect or no genesis block found. Wrong datadir for network?</source> + <translation>Incorrecto o bloque de génesis no encontrado. ¿datadir equivocada para la red?</translation> + </message> + <message> + <source>Initialization sanity check failed. %s is shutting down.</source> + <translation>La inicialización de la verificación de validez falló. Se está apagando %s.</translation> + </message> + <message> + <source>Invalid amount for -%s=<amount>: '%s'</source> + <translation>Monto invalido para -%s=<amount>: '%s'</translation> + </message> + <message> + <source>Invalid amount for -discardfee=<amount>: '%s'</source> + <translation>Monto invalido para -discardfee=<amount>: '%s'</translation> + </message> + <message> + <source>Invalid amount for -fallbackfee=<amount>: '%s'</source> + <translation>Monto invalido para -fallbackfee=<amount>: '%s'</translation> + </message> + <message> + <source>Loading P2P addresses...</source> + <translation>Cargando direcciones P2P...</translation> + </message> + <message> + <source>Loading banlist...</source> + <translation>Cargando banlist...</translation> + </message> + <message> + <source>Not enough file descriptors available.</source> + <translation>No hay suficientes descriptores de archivo disponibles.</translation> + </message> + <message> + <source>Replaying blocks...</source> + <translation>Reproduciendo bloques...</translation> + </message> + <message> + <source>Rewinding blocks...</source> + <translation>Rebobinando bloques...</translation> + </message> + <message> + <source>The source code is available from %s.</source> + <translation>El código fuente esta disponible desde %s.</translation> + </message> + <message> + <source>Transaction fee and change calculation failed</source> + <translation>El cálculo de la comisión de transacción y del cambio han fallado</translation> + </message> + <message> + <source>Unsupported argument -benchmark ignored, use -debug=bench.</source> + <translation>El argumento -benchmark no es soportado y ha sido ignorado, usa -debug=bench</translation> + </message> + <message> + <source>Unsupported argument -debugnet ignored, use -debug=net.</source> + <translation>El argumento -debugnet no es soportado, usa -debug=ned.</translation> + </message> + <message> + <source>Unsupported argument -tor found, use -onion.</source> + <translation>El argumento -tor no es soportado, usa -onion.</translation> + </message> + <message> + <source>Upgrading UTXO database</source> + <translation>Actualizando la base de datos UTXO</translation> + </message> + <message> + <source>Verifying blocks...</source> + <translation>Verificando bloques...</translation> + </message> + <message> + <source>Error loading %s: You can't disable HD on an already existing HD wallet</source> + <translation>Error cargando %s: No puedes deshabilitar HD en un monedero HD ya existente</translation> + </message> + <message> + <source>Error reading from database, shutting down.</source> + <translation>Error al leer la base de datos, cerrando aplicación.</translation> + </message> + <message> + <source>Error upgrading chainstate database</source> + <translation>Error actualizando la base de datos chainstate</translation> + </message> + <message> <source>Information</source> <translation>Información</translation> </message> <message> - <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> + <source>Invalid -onion address or hostname: '%s'</source> + <translation>Dirección de -onion o dominio '%s' inválido</translation> </message> <message> - <source>Username for JSON-RPC connections</source> - <translation>Usuario para las conexiones JSON-RPC -</translation> + <source>Invalid netmask specified in -whitelist: '%s'</source> + <translation>Máscara de red inválida especificada en -whitelist: '%s'</translation> + </message> + <message> + <source>Need to specify a port with -whitebind: '%s'</source> + <translation>Necesita especificar un puerto con -whitebind: '%s'</translation> + </message> + <message> + <source>Reducing -maxconnections from %d to %d, because of system limitations.</source> + <translation>Reduciendo -maxconnections de %d a %d, debido a limitaciones del sistema.</translation> + </message> + <message> + <source>Signing transaction failed</source> + <translation>Firma de transacción fallida</translation> + </message> + <message> + <source>The transaction amount is too small to pay the fee</source> + <translation>El monto a transferir es muy pequeño para pagar el impuesto</translation> + </message> + <message> + <source>This is experimental software.</source> + <translation>Este es un software experimental.</translation> + </message> + <message> + <source>Transaction amount too small</source> + <translation>Monto a transferir muy pequeño</translation> + </message> + <message> + <source>Transaction too large for fee policy</source> + <translation>Operación demasiado grande para la política de comision</translation> + </message> + <message> + <source>Transaction too large</source> + <translation>Transacción muy grande</translation> + </message> + <message> + <source>Unable to bind to %s on this computer (bind returned error %s)</source> + <translation>No es posible conectar con %s en este sistema (bind ha devuelto el error %s)</translation> + </message> + <message> + <source>Verifying wallet(s)...</source> + <translation>Verificando billetera(s)...</translation> </message> <message> <source>Warning</source> <translation>Atención</translation> </message> <message> - <source>Password for JSON-RPC connections</source> - <translation>Contraseña para las conexiones JSON-RPC -</translation> + <source>Warning: unknown new rules activated (versionbit %i)</source> + <translation>Advertencia: nuevas reglas desconocidas activadas (versionbit %i)</translation> </message> <message> - <source>Allow DNS lookups for -addnode, -seednode and -connect</source> - <translation>Permite búsqueda DNS para addnode y connect -</translation> + <source>Zapping all transactions from wallet...</source> + <translation>Eliminando todas las transacciones del monedero...</translation> + </message> + <message> + <source>-maxtxfee is set very high! Fees this large could be paid on a single transaction.</source> + <translation>-maxtxfee tiene un valor muy elevado! Comisiones muy grandes podrían ser pagadas en una única transacción.</translation> + </message> + <message> + <source>Error loading %s: You can't enable HD on an already existing non-HD wallet</source> + <translation>Error cargando %s: No puedes habilitar HD en un monedero no HD ya existente</translation> + </message> + <message> + <source>This is the transaction fee you may pay when fee estimates are not available.</source> + <translation>Impuesto por transacción que pagarás cuando la estimación de impuesto no esté disponible.</translation> + </message> + <message> + <source>Total length of network version string (%i) exceeds maximum length (%i). Reduce the number or size of uacomments.</source> + <translation>La longitud total de la cadena de versión de red ( %i ) supera la longitud máxima ( %i ) . Reducir el número o tamaño de uacomments .</translation> + </message> + <message> + <source>Unsupported argument -socks found. Setting SOCKS version isn't possible anymore, only SOCKS5 proxies are supported.</source> + <translation>Argumento -socks no soportado. La configuración de la versión SOCKS ya no es posible, sólo los proxies SOCKS5 son compatibles.</translation> + </message> + <message> + <source>Unsupported argument -whitelistalwaysrelay ignored, use -whitelistrelay and/or -whitelistforcerelay.</source> + <translation>Argumento -whitelistalwaysrelay no soportado ha sido ignorado, utiliza -whitelistrelay y/o -whitelistforcerelay</translation> + </message> + <message> + <source>Warning: Unknown block versions being mined! It's possible unknown rules are in effect</source> + <translation>Advertencia: Se están minando versiones de bloques desconocidas! Es posible que reglas desconocidas estén activas</translation> + </message> + <message> + <source>Warning: Wallet file corrupt, data salvaged! Original %s saved as %s in %s; if your balance or transactions are incorrect you should restore from a backup.</source> + <translation>Advertencia: Archivo de monedero corrupto, datos recuperados! Original %s guardado como %s en %s; si su balance de transacciones es incorrecto, debe restaurar desde una copia de seguridad.</translation> + </message> + <message> + <source>%s is set very high!</source> + <translation>¡%s esta configurado muy alto!</translation> + </message> + <message> + <source>Error loading wallet %s. Duplicate -wallet filename specified.</source> + <translation>Error cargando el monedero %s. Se ha especificado un nombre de fichero -wallet duplicado.</translation> + </message> + <message> + <source>Keypool ran out, please call keypoolrefill first</source> + <translation>Keypool se ha agotado, llame a keypoolrefill primero</translation> + </message> + <message> + <source>Starting network threads...</source> + <translation>Iniciando procesos de red...</translation> + </message> + <message> + <source>The wallet will avoid paying less than the minimum relay fee.</source> + <translation>La billetera no permitirá pagar menos que la fee de transmisión mínima (relay fee).</translation> + </message> + <message> + <source>This is the minimum transaction fee you pay on every transaction.</source> + <translation>Mínimo de impuesto que pagarás con cada transacción.</translation> + </message> + <message> + <source>This is the transaction fee you will pay if you send a transaction.</source> + <translation>Impuesto por transacción a pagar si envías una transacción.</translation> + </message> + <message> + <source>Transaction amounts must not be negative</source> + <translation>El monto de la transacción no puede ser negativo</translation> + </message> + <message> + <source>Transaction has too long of a mempool chain</source> + <translation>La transacción tiene demasiado tiempo de una cadena de mempool</translation> + </message> + <message> + <source>Transaction must have at least one recipient</source> + <translation>La transacción debe incluir al menos un destinatario.</translation> + </message> + <message> + <source>Unknown network specified in -onlynet: '%s'</source> + <translation>La red especificada en -onlynet: '%s' es desconocida</translation> </message> <message> <source>Insufficient funds</source> diff --git a/src/qt/locale/bitcoin_es_CO.ts b/src/qt/locale/bitcoin_es_CO.ts index 9c6bcdff72..812d5ac70f 100644 --- a/src/qt/locale/bitcoin_es_CO.ts +++ b/src/qt/locale/bitcoin_es_CO.ts @@ -502,6 +502,10 @@ Exportar los datos en la pestaña actual a un archivo</translation> <translation>Comisión:</translation> </message> <message> + <source>Dust:</source> + <translation>Polvo:</translation> + </message> + <message> <source>After Fee:</source> <translation>Después de comisión:</translation> </message> @@ -510,6 +514,10 @@ Exportar los datos en la pestaña actual a un archivo</translation> <translation>Cambio:</translation> </message> <message> + <source>(un)select all</source> + <translation>(de)seleccionar todo</translation> + </message> + <message> <source>Tree mode</source> <translation>Modo árbol</translation> </message> @@ -582,6 +590,10 @@ Exportar los datos en la pestaña actual a un archivo</translation> <translation>Copiar bytes</translation> </message> <message> + <source>Copy dust</source> + <translation>Copiar polvo</translation> + </message> + <message> <source>Copy change</source> <translation>Copiar cambio</translation> </message> @@ -594,6 +606,10 @@ Exportar los datos en la pestaña actual a un archivo</translation> <translation>no</translation> </message> <message> + <source>This label turns red if any recipient receives an amount smaller than the current dust threshold.</source> + <translation>Está etiqueta se vuelve roja si algún receptor recibe una cantidad inferior al límite actual establecido para el polvo.</translation> + </message> + <message> <source>(no label)</source> <translation>(no etiqueta)</translation> </message> @@ -625,10 +641,6 @@ Exportar los datos en la pestaña actual a un archivo</translation> <translation>Y dirección</translation> </message> <message> - <source>New receiving address</source> - <translation>Nueva dirección de recepción</translation> - </message> - <message> <source>New sending address</source> <translation>Nueva dirección de envío</translation> </message> @@ -686,34 +698,6 @@ Exportar los datos en la pestaña actual a un archivo</translation> <source>Command-line options</source> <translation>Opciones de línea de comando</translation> </message> - <message> - <source>Usage:</source> - <translation>Uso:</translation> - </message> - <message> - <source>command-line options</source> - <translation>opciones de línea de comando</translation> - </message> - <message> - <source>UI Options:</source> - <translation>Opciones de UI:</translation> - </message> - <message> - <source>Set language, for example "de_DE" (default: system locale)</source> - <translation>Establecer el idioma, por ejemplo "de_DE" (predeterminado: configuración regional del sistema)</translation> - </message> - <message> - <source>Start minimized</source> - <translation>Iniciar minimizado</translation> - </message> - <message> - <source>Set SSL root certificates for payment request (default: -system-)</source> - <translation>Establecer certificados raíz SSL para solicitud de pago (predeterminado: -sistema-)</translation> - </message> - <message> - <source>Reset all settings changed in the GUI</source> - <translation>Restablecer todas las configuraciones modificadas en la GUI</translation> - </message> </context> <context> <name>Intro</name> @@ -1631,14 +1615,6 @@ Exportar los datos en la pestaña actual a un archivo</translation> <translation>Solicitar pago</translation> </message> <message> - <source>Bech32 addresses (BIP-173) are cheaper to spend from and offer better protection against typos. When unchecked a P2SH wrapped SegWit address will be created, compatible with older wallets.</source> - <translation>Las direcciones Bech32 (BIP-173) son más baratas para gastar y ofrecen una mejor protección contra los errores tipográficos. Cuando no se selecciona, se creará una dirección SegWit envuelta en P2SH, compatible con monederos más antiguos.</translation> - </message> - <message> - <source>Generate Bech32 address</source> - <translation>Generar dirección Bech32</translation> - </message> - <message> <source>Show the selected request (does the same as double clicking an entry)</source> <translation>Mostrar la solicitud seleccionada (hace lo mismo que hacer doble clic en una entrada)</translation> </message> @@ -1701,6 +1677,10 @@ Exportar los datos en la pestaña actual a un archivo</translation> <source>Label</source> <translation>Etiqueta</translation> </message> + <message> + <source>Wallet</source> + <translation>Billetera</translation> + </message> </context> <context> <name>RecentRequestsTableModel</name> @@ -1752,6 +1732,10 @@ Exportar los datos en la pestaña actual a un archivo</translation> <translation>Borre todos los campos del formulario.</translation> </message> <message> + <source>Dust:</source> + <translation>Polvo:</translation> + </message> + <message> <source>Copy quantity</source> <translation>Cantidad de copia</translation> </message> @@ -1773,6 +1757,10 @@ Tarifa de copia</translation> <translation>Copiar bytes</translation> </message> <message> + <source>Copy dust</source> + <translation>Copiar polvo</translation> + </message> + <message> <source>Copy change</source> <translation>Copiar cambio</translation> </message> @@ -1911,6 +1899,10 @@ Exportar los datos en la pestaña actual a un archivo</translation> <translation>Bitcoin Core</translation> </message> <message> + <source>This is the transaction fee you may discard if change is smaller than dust at this level</source> + <translation>Esta es la cuota de transacción que puede descartar si el cambio es más pequeño que el polvo a este nivel.</translation> + </message> + <message> <source>Information</source> <translation>Información</translation> </message> diff --git a/src/qt/locale/bitcoin_es_DO.ts b/src/qt/locale/bitcoin_es_DO.ts index 59ed82943f..387a3ef540 100644 --- a/src/qt/locale/bitcoin_es_DO.ts +++ b/src/qt/locale/bitcoin_es_DO.ts @@ -2,6 +2,10 @@ <context> <name>AddressBookPage</name> <message> + <source>Right-click to edit address or label</source> + <translation>Haga clic con el botón derecho para editar una dirección o etiqueta</translation> + </message> + <message> <source>Create a new address</source> <translation>Crear una nueva dirección</translation> </message> @@ -26,6 +30,10 @@ <translation>Borrar de la lista la dirección seleccionada</translation> </message> <message> + <source>Enter address or label to search</source> + <translation>Introduzca una dirección o etiqueta que buscar</translation> + </message> + <message> <source>Export the data in the current tab to a file</source> <translation>Exportar a un archivo los datos de esta pestaña</translation> </message> @@ -37,9 +45,57 @@ <source>&Delete</source> <translation>&Eliminar</translation> </message> - </context> + <message> + <source>Choose the address to send coins to</source> + <translation>Escoja la dirección a la que se enviarán monedas</translation> + </message> + <message> + <source>Choose the address to receive coins with</source> + <translation>Escoja la dirección donde quiere recibir monedas</translation> + </message> + <message> + <source>Sending addresses</source> + <translation>Direcciones de envío</translation> + </message> + <message> + <source>Receiving addresses</source> + <translation>Direcciones de recepción</translation> + </message> + <message> + <source>These are your Bitcoin addresses for sending payments. Always check the amount and the receiving address before sending coins.</source> + <translation>Estas son sus direcciones Bitcoin para enviar pagos. Compruebe siempre la cantidad y la dirección de recibo antes de transferir monedas.</translation> + </message> + <message> + <source>These are your Bitcoin addresses for receiving payments. It is recommended to use a new receiving address for each transaction.</source> + <translation>Estas son sus direcciones de Bitcoin para recibir pagos. Se recomienda utilizar una nueva dirección de recepción para cada transacción.</translation> + </message> + <message> + <source>Export Address List</source> + <translation>Exportar la Lista de Direcciones </translation> + </message> + <message> + <source>Comma separated file (*.csv)</source> + <translation>Archivo de columnas separadas por coma (*.csv)</translation> + </message> + <message> + <source>Exporting Failed</source> + <translation>La exportación falló</translation> + </message> + <message> + <source>There was an error trying to save the address list to %1. Please try again.</source> + <translation>Hubo un error al intentar guardar la lista de direcciones a %1. Por favor trate de nuevo.</translation> + </message> +</context> <context> <name>AddressTableModel</name> + <message> + <source>Label</source> + <translation>Etiqueta</translation> + </message> + <message> + <source>Address</source> + <translation>Dirección</translation> + </message> </context> <context> <name>AskPassphraseDialog</name> @@ -59,6 +115,58 @@ <source>Repeat new passphrase</source> <translation>Repita la nueva contraseña</translation> </message> + <message> + <source>Show password</source> + <translation>Mostrar contraseña</translation> + </message> + <message> + <source>Enter the new passphrase to the wallet.<br/>Please use a passphrase of <b>ten or more random characters</b>, or <b>eight or more words</b>.</source> + <translation>Introduzca la nueva contraseña para el monedero. <br/>Por favor use una contraseña de <b>diez o más caracteres aleatorios</b>, u <b>ocho o más palabras</b>.</translation> + </message> + <message> + <source>Encrypt wallet</source> + <translation>Cifrar monedero</translation> + </message> + <message> + <source>This operation needs your wallet passphrase to unlock the wallet.</source> + <translation>Esta operación requiere su contraseña para desbloquear el monedero.</translation> + </message> + <message> + <source>Unlock wallet</source> + <translation>Desbloquear monedero</translation> + </message> + <message> + <source>This operation needs your wallet passphrase to decrypt the wallet.</source> + <translation>Esta operación requiere su contraseña para descifrar el monedero.</translation> + </message> + <message> + <source>Decrypt wallet</source> + <translation>Descifrar monedero</translation> + </message> + <message> + <source>Enter the old passphrase and new passphrase to the wallet.</source> + <translation>Introduzca la contraseña anterior y la contraseña nueva para este monedero.</translation> + </message> + <message> + <source>Confirm wallet encryption</source> + <translation>Confirme cifrado del monedero</translation> + </message> + <message> + <source>Warning: If you encrypt your wallet and lose your passphrase, you will <b>LOSE ALL OF YOUR BITCOINS</b>!</source> + <translation>Atención: Si cifra su monedero y pierde la contraseña, perderá ¡<b>TODOS SUS BITCOINS</b>!</translation> + </message> + <message> + <source>Are you sure you wish to encrypt your wallet?</source> + <translation>¿Está seguro que desea cifrar su monedero?</translation> + </message> + <message> + <source>Wallet encrypted</source> + <translation>Monedero cifrado</translation> + </message> + <message> + <source>%1 will close now to finish the encryption process. Remember that encrypting your wallet cannot fully protect your bitcoins from being stolen by malware infecting your computer.</source> + <translation>%1 se cerrará ahora para finalizar el proceso de cifrado. Recuerde que el cifrado de su monedero no puede proteger de manera completa su Bitcoin de robo por malware que esté infectando su sistema.</translation> + </message> </context> <context> <name>BanTableModel</name> @@ -397,15 +505,7 @@ <source>Command-line options</source> <translation>Opciones de la línea de órdenes</translation> </message> - <message> - <source>Usage:</source> - <translation>Uso:</translation> - </message> - <message> - <source>command-line options</source> - <translation>opciones de la línea de órdenes</translation> - </message> - </context> +</context> <context> <name>Intro</name> <message> @@ -820,9 +920,25 @@ <source>&Save Image...</source> <translation>Guardar Imagen...</translation> </message> + <message> + <source>Address</source> + <translation>Dirección</translation> + </message> + <message> + <source>Label</source> + <translation>Etiqueta</translation> + </message> + <message> + <source>Wallet</source> + <translation>Monedero</translation> + </message> </context> <context> <name>RecentRequestsTableModel</name> + <message> + <source>Label</source> + <translation>Etiqueta</translation> + </message> </context> <context> <name>SendCoinsDialog</name> @@ -910,6 +1026,10 @@ <source>S&end</source> <translation>&Enviar</translation> </message> + <message> + <source>Transaction fee</source> + <translation>Comisión de transacción</translation> + </message> </context> <context> <name>SendCoinsEntry</name> @@ -1069,9 +1189,29 @@ </context> <context> <name>TransactionTableModel</name> + <message> + <source>Label</source> + <translation>Etiqueta</translation> + </message> </context> <context> <name>TransactionView</name> + <message> + <source>Comma separated file (*.csv)</source> + <translation>Archivo de columnas separadas por coma (*.csv)</translation> + </message> + <message> + <source>Label</source> + <translation>Etiqueta</translation> + </message> + <message> + <source>Address</source> + <translation>Dirección</translation> + </message> + <message> + <source>Exporting Failed</source> + <translation>La exportación falló</translation> + </message> </context> <context> <name>UnitDisplayStatusBarControl</name> @@ -1088,57 +1228,10 @@ <context> <name>bitcoin-core</name> <message> - <source>Options:</source> - <translation>Opciones: -</translation> - </message> - <message> - <source>Specify data directory</source> - <translation>Especificar directorio para los datos</translation> - </message> - <message> - <source>Connect to a node to retrieve peer addresses, and disconnect</source> - <translation>Conectar a un nodo para obtener direcciones de pares y desconectar</translation> - </message> - <message> - <source>Specify your own public address</source> - <translation>Especifique su propia dirección pública</translation> - </message> - <message> - <source>Accept command line and JSON-RPC commands</source> - <translation>Aceptar comandos consola y JSON-RPC -</translation> - </message> - <message> - <source>Run in the background as a daemon and accept commands</source> - <translation>Ejecutar en segundo plano como daemon y aceptar comandos -</translation> - </message> - <message> <source>Bitcoin Core</source> <translation>Núcleo de Bitcoin</translation> </message> <message> - <source>Bind to given address and always listen on it. Use [host]:port notation for IPv6</source> - <translation>Vincular a la dirección dada y escuchar siempre en ella. Utilice la notación [host]:port para IPv6</translation> - </message> - <message> - <source>Execute command when a wallet transaction changes (%s in cmd is replaced by TxID)</source> - <translation>Ejecutar comando cuando una transacción del monedero cambia (%s en cmd se remplazará por TxID)</translation> - </message> - <message> - <source><category> can be:</source> - <translation><category> puede ser:</translation> - </message> - <message> - <source>Accept connections from outside (default: 1 if no -proxy or -connect)</source> - <translation>Aceptar conexiones desde el exterior (predeterminado: 1 si no -proxy o -connect)</translation> - </message> - <message> - <source>Block creation options:</source> - <translation>Opciones de creación de bloques:</translation> - </message> - <message> <source>Corrupted block database detected</source> <translation>Corrupción de base de datos de bloques detectada.</translation> </message> @@ -1179,38 +1272,14 @@ <translation>No hay suficientes descriptores de archivo disponibles. </translation> </message> <message> - <source>Specify wallet file (within data directory)</source> - <translation>Especificar archivo de monedero (dentro del directorio de datos)</translation> - </message> - <message> <source>Verifying blocks...</source> <translation>Verificando bloques...</translation> </message> <message> - <source>Execute command when a relevant alert is received or we see a really long fork (%s in cmd is replaced by message)</source> - <translation>Ejecutar un comando cuando se reciba una alerta importante o cuando veamos un fork demasiado largo (%s en cmd se reemplazará por el mensaje)</translation> - </message> - <message> <source>Information</source> <translation>Información</translation> </message> <message> - <source>RPC server options:</source> - <translation>Opciones del sservidor RPC:</translation> - </message> - <message> - <source>Send trace/debug info to console instead of debug.log file</source> - <translation>Enviar información de trazas/depuración a la consola en lugar de al archivo debug.log</translation> - </message> - <message> - <source>Show all debugging options (usage: --help -help-debug)</source> - <translation>Mostrar todas las opciones de depuración (uso: --help -help-debug)</translation> - </message> - <message> - <source>Shrink debug.log file on client startup (default: 1 when no -debug)</source> - <translation>Reducir el archivo debug.log al iniciar el cliente (predeterminado: 1 sin -debug)</translation> - </message> - <message> <source>Signing transaction failed</source> <translation>Transacción falló</translation> </message> @@ -1223,28 +1292,10 @@ <translation>Transacción demasiado grande</translation> </message> <message> - <source>Username for JSON-RPC connections</source> - <translation>Nombre de usuario para las conexiones JSON-RPC -</translation> - </message> - <message> <source>Warning</source> <translation>Aviso</translation> </message> <message> - <source>Password for JSON-RPC connections</source> - <translation>Contraseña para las conexiones JSON-RPC -</translation> - </message> - <message> - <source>Execute command when the best block changes (%s in cmd is replaced by block hash)</source> - <translation>Ejecutar un comando cuando cambia el mejor bloque (%s en cmd se sustituye por el hash de bloque)</translation> - </message> - <message> - <source>Allow DNS lookups for -addnode, -seednode and -connect</source> - <translation>Permitir búsquedas DNS para -addnode, -seednode y -connect</translation> - </message> - <message> <source>Unknown network specified in -onlynet: '%s'</source> <translation>La red especificada en -onlynet '%s' es desconocida</translation> </message> diff --git a/src/qt/locale/bitcoin_es_ES.ts b/src/qt/locale/bitcoin_es_ES.ts index f79940e812..1b196cb13f 100644 --- a/src/qt/locale/bitcoin_es_ES.ts +++ b/src/qt/locale/bitcoin_es_ES.ts @@ -30,6 +30,10 @@ <translation>Eliminar la dirección seleccionada de la lista</translation> </message> <message> + <source>Enter address or label to search</source> + <translation>Introduzca una dirección o etiqueta que buscar</translation> + </message> + <message> <source>Export the data in the current tab to a file</source> <translation>Exportar los datos en la ficha actual a un archivo</translation> </message> @@ -726,10 +730,6 @@ <translation>&Dirección</translation> </message> <message> - <source>New receiving address</source> - <translation>Nueva dirección de recivimiento</translation> - </message> - <message> <source>New sending address</source> <translation>Nueva dirección de envío</translation> </message> @@ -746,10 +746,6 @@ <translation>La dirección introducida "%1" no es una dirección Bitcoin válida.</translation> </message> <message> - <source>The entered address "%1" is already in the address book.</source> - <translation>La dirección introducida "%1" está ya en la agenda.</translation> - </message> - <message> <source>Could not unlock wallet.</source> <translation>Podría no desbloquear el monedero.</translation> </message> @@ -799,42 +795,6 @@ <source>Command-line options</source> <translation>Opciones de la línea de órdenes</translation> </message> - <message> - <source>Usage:</source> - <translation>Uso:</translation> - </message> - <message> - <source>command-line options</source> - <translation>opciones de la consola de comandos</translation> - </message> - <message> - <source>UI Options:</source> - <translation>Opciones de interfaz de usuario:</translation> - </message> - <message> - <source>Choose data directory on startup (default: %u)</source> - <translation>Elegir directorio de datos al iniciar (predeterminado: %u)</translation> - </message> - <message> - <source>Set language, for example "de_DE" (default: system locale)</source> - <translation>Establecer el idioma, por ejemplo, "es_ES" (predeterminado: configuración regional del sistema)</translation> - </message> - <message> - <source>Start minimized</source> - <translation>Arrancar minimizado</translation> - </message> - <message> - <source>Set SSL root certificates for payment request (default: -system-)</source> - <translation>Establecer los certificados raíz SSL para solicitudes de pago (predeterminado: -system-)</translation> - </message> - <message> - <source>Show splash screen on startup (default: %u)</source> - <translation>Mostrar pantalla de bienvenida en el inicio (predeterminado: %u)</translation> - </message> - <message> - <source>Reset all settings changed in the GUI</source> - <translation>Reiniciar todos los ajustes modificados en el GUI</translation> - </message> </context> <context> <name>Intro</name> @@ -1431,10 +1391,6 @@ <translation>Error: directorio especificado "%1" no existe.</translation> </message> <message> - <source>Error: Cannot parse configuration file: %1. Only use key=value syntax.</source> - <translation>Error: no se puede interpretar el archivo de configuración: %1. Utilize exclusivamente sintaxis clave=valor.</translation> - </message> - <message> <source>Error: %1</source> <translation>Error: %1</translation> </message> @@ -1855,6 +1811,10 @@ <translation>Mensaje</translation> </message> <message> + <source>Wallet</source> + <translation>Monedero</translation> + </message> + <message> <source>Resulting URI too long, try to reduce the text for label / message.</source> <translation>URI resultante demasiado grande, trate de reducir el texto de etiqueta / mensaje.</translation> </message> @@ -1965,10 +1925,6 @@ <translation>por kilobyte</translation> </message> <message> - <source>If the custom fee is set to 1000 satoshis and the transaction is only 250 bytes, then "per kilobyte" only pays 250 satoshis in fee, while "total at least" pays 1000 satoshis. For transactions bigger than a kilobyte both pay by kilobyte.</source> - <translation>Si la tarifa de aduana se establece en 1000 satoshis y la transacción está a sólo 250 bytes, entonces "por kilobyte" sólo paga 250 satoshis de cuota, mientras que "el mínimo total" pagaría 1.000 satoshis. Para las transacciones más grandes que un kilobyte ambos pagan por kilobyte</translation> - </message> - <message> <source>Hide</source> <translation>Ocultar</translation> </message> @@ -2065,18 +2021,14 @@ <translation>¿Seguro que quiere enviar?</translation> </message> <message> - <source>added as transaction fee</source> - <translation>añadido como transacción de cuota</translation> - </message> - <message> - <source>Total Amount %1</source> - <translation>Cantidad total %1</translation> - </message> - <message> <source>or</source> <translation>o</translation> </message> <message> + <source>Transaction fee</source> + <translation>Comisión de transacción</translation> + </message> + <message> <source>Confirm send coins</source> <translation>Confirmar enviar monedas</translation> </message> @@ -2406,10 +2358,6 @@ <translation>Hay un conflicto con la traducción de las confirmaciones %1</translation> </message> <message> - <source>%1/offline</source> - <translation>%1/sin conexión</translation> - </message> - <message> <source>0/unconfirmed, %1</source> <translation>0/no confirmado, %1</translation> </message> @@ -2438,10 +2386,6 @@ <translation>Estado</translation> </message> <message> - <source>, has not been successfully broadcast yet</source> - <translation>, no ha sido emitido con éxito aún</translation> - </message> - <message> <source>Date</source> <translation>Fecha</translation> </message> @@ -2588,10 +2532,6 @@ <translation>Abierto hasta %1</translation> </message> <message> - <source>Offline</source> - <translation>Sin conexion</translation> - </message> - <message> <source>Unconfirmed</source> <translation>Sin confirmar</translation> </message> @@ -2616,10 +2556,6 @@ <translation>No disponible (%1 confirmaciones. Estarán disponibles al cabo de %2)</translation> </message> <message> - <source>This block was not received by any other nodes and will probably not be accepted!</source> - <translation>Este bloque no ha sido recibido por otros nodos y probablemente no sea aceptado!</translation> - </message> - <message> <source>Generated but not accepted</source> <translation>Generado pero no aceptado</translation> </message> @@ -2886,36 +2822,10 @@ <source>The wallet data was successfully saved to %1.</source> <translation>Los datos del monedero se han guardado con éxito en %1.</translation> </message> -</context> + </context> <context> <name>bitcoin-core</name> <message> - <source>Options:</source> - <translation>Opciones: -</translation> - </message> - <message> - <source>Specify data directory</source> - <translation>Especificar directorio para los datos</translation> - </message> - <message> - <source>Connect to a node to retrieve peer addresses, and disconnect</source> - <translation>Conectar a un nodo para obtener direcciones de pares y desconectar</translation> - </message> - <message> - <source>Specify your own public address</source> - <translation>Especifique su propia dirección pública</translation> - </message> - <message> - <source>Accept command line and JSON-RPC commands</source> - <translation>Aceptar comandos consola y JSON-RPC -</translation> - </message> - <message> - <source>If <category> is not supplied or if <category> = 1, output all debugging information.</source> - <translation>Si <category> no es proporcionado o si <category> =1, muestra toda la información de depuración.</translation> - </message> - <message> <source>Prune configured below the minimum of %d MiB. Please use a higher number.</source> <translation>La Poda se ha configurado por debajo del minimo de %d MiB. Por favor utiliza un valor mas alto.</translation> </message> @@ -2932,19 +2842,10 @@ <translation>Un error interno fatal ocurrió, ver debug.log para detalles</translation> </message> <message> - <source>Fee (in %s/kB) to add to transactions you send (default: %s)</source> - <translation>Comisión (en %s/KB) para agregar a las transacciones que envíe (por defecto: %s)</translation> - </message> - <message> <source>Pruning blockstore...</source> <translation>Poda blockstore ...</translation> </message> <message> - <source>Run in the background as a daemon and accept commands</source> - <translation>Ejecutar en segundo plano como daemon y aceptar comandos -</translation> - </message> - <message> <source>Unable to start HTTP server. See debug log for details.</source> <translation>No se ha podido comenzar el servidor HTTP. Ver debug log para detalles.</translation> </message> @@ -2957,42 +2858,14 @@ <translation>Los %s desarrolladores</translation> </message> <message> - <source>A fee rate (in %s/kB) that will be used when fee estimation has insufficient data (default: %s)</source> - <translation>Una comision (en %s/kB) que sera usada cuando las estimacion de comision no disponga de suficientes datos (predeterminado: %s)</translation> - </message> - <message> - <source>Accept relayed transactions received from whitelisted peers even when not relaying transactions (default: %d)</source> - <translation>Aceptar transacciones retransmitidas recibidas desde nodos en la lista blanca incluso cuando no estés retransmitiendo transacciones (predeterminado: %d)</translation> - </message> - <message> - <source>Bind to given address and always listen on it. Use [host]:port notation for IPv6</source> - <translation>Vincular a la dirección dada y escuchar siempre en ella. Utilice la notación [host]:port para IPv6</translation> - </message> - <message> <source>Cannot obtain a lock on data directory %s. %s is probably already running.</source> <translation>No se puede bloquear el directorio %s. %s ya se está ejecutando.</translation> </message> <message> - <source>Delete all wallet transactions and only recover those parts of the blockchain through -rescan on startup</source> - <translation>Borrar todas las transacciones del monedero y sólo recuperar aquellas partes de la cadena de bloques por medio de -rescan on startup.</translation> - </message> - <message> <source>Error reading %s! All keys read correctly, but transaction data or address book entries might be missing or incorrect.</source> <translation>Error leyendo %s!. Todas las claves se han leido correctamente, pero los datos de transacciones o la libreta de direcciones pueden faltar o ser incorrectos.</translation> </message> <message> - <source>Execute command when a wallet transaction changes (%s in cmd is replaced by TxID)</source> - <translation>Ejecutar comando cuando una transacción del monedero cambia (%s en cmd se remplazará por TxID)</translation> - </message> - <message> - <source>Maximum allowed median peer time offset adjustment. Local perspective of time may be influenced by peers forward or backward by this amount. (default: %u seconds)</source> - <translation>Ajuste máximo permitido del tiempo offset medio de pares. La perspectiva local de tiempo se verá influenciada por los pares anteriores y posteriores a esta cantidad. (Por defecto: %u segundos)</translation> - </message> - <message> - <source>Maximum total fees (in %s) to use in a single wallet transaction or raw transaction; setting this too low may abort large transactions (default: %s)</source> - <translation>Máximas comisiones totales (en %s) para utilizar en una sola transacción de la cartera; establecer esto demasiado bajo puede abortar grandes transacciones (predeterminado: %s)</translation> - </message> - <message> <source>Please check that your computer's date and time are correct! If your clock is wrong, %s will not work properly.</source> <translation>Por favor, compruebe si la fecha y hora en su computadora son correctas! Si su reloj esta mal, %s no trabajara correctamente. </translation> </message> @@ -3001,10 +2874,6 @@ <translation>Contribuya si encuentra %s de utilidad. Visite %s para mas información acerca del programa.</translation> </message> <message> - <source>Set the number of script verification threads (%u to %d, 0 = auto, <0 = leave that many cores free, default: %d)</source> - <translation>Establecer el número de hilos (threads) de verificación de scripts (entre %u y %d, 0 = automático, <0 = dejar libres ese número de núcleos; predeterminado: %d)</translation> - </message> - <message> <source>The block database contains a block which appears to be from the future. This may be due to your computer's date and time being set incorrectly. Only rebuild the block database if you are sure that your computer's date and time are correct</source> <translation>La base de datos de bloques contiene un bloque que parece ser del futuro. Esto puede ser porque la fecha y hora de tu ordenador están mal ajustados. Reconstruye la base de datos de bloques solo si estas seguro de que la fecha y hora de tu ordenador estan ajustados correctamente.</translation> </message> @@ -3013,14 +2882,6 @@ <translation>No es posible reconstruir la base de datos a un estado anterior. Debe descargar de nuevo la cadena de bloques.</translation> </message> <message> - <source>Use UPnP to map the listening port (default: 1 when listening and no -proxy)</source> - <translation>Utiliza UPnP para asignar el puerto de escucha (predeterminado: 1 cuando esta escuchando sin -proxy)</translation> - </message> - <message> - <source>Wallet will not create transactions that violate mempool chain limits (default: %u)</source> - <translation>La cartera no creara transacciones que violan los limites de memoria de la cadena (por defecto: %u)</translation> - </message> - <message> <source>%s corrupt, salvage failed</source> <translation>%s corrupto. Fracasó la recuperacion</translation> </message> @@ -3029,42 +2890,14 @@ <translation>-maxmempool debe ser por lo menos de %d MB</translation> </message> <message> - <source><category> can be:</source> - <translation><category> puede ser:</translation> - </message> - <message> - <source>Accept connections from outside (default: 1 if no -proxy or -connect)</source> - <translation>Aceptar conexiones desde el exterior (predeterminado: 1 si no -proxy o -connect)</translation> - </message> - <message> - <source>Append comment to the user agent string</source> - <translation>Adjunta un comentario a la linea de agente de usuario</translation> - </message> - <message> - <source>Attempt to recover private keys from a corrupt wallet on startup</source> - <translation>Intento de recuperar claves privadas de un monedero corrupto en arranque</translation> - </message> - <message> - <source>Block creation options:</source> - <translation>Opciones de creación de bloques:</translation> - </message> - <message> <source>Cannot resolve -%s address: '%s'</source> <translation>No se puede resolver -%s direccion: '%s'</translation> </message> <message> - <source>Chain selection options:</source> - <translation>Opciones de selección de cadena:</translation> - </message> - <message> <source>Change index out of range</source> <translation>Cambio de indice fuera de rango</translation> </message> <message> - <source>Connection options:</source> - <translation>Opciones de conexión:</translation> - </message> - <message> <source>Copyright (C) %i-%i</source> <translation>Copyright (C) %i-%i</translation> </message> @@ -3073,38 +2906,10 @@ <translation>Corrupción de base de datos de bloques detectada.</translation> </message> <message> - <source>Debugging/Testing options:</source> - <translation>Opciones de depuración/pruebas:</translation> - </message> - <message> - <source>Do not load the wallet and disable wallet RPC calls</source> - <translation>No cargar el monedero y desactivar las llamadas RPC del monedero</translation> - </message> - <message> <source>Do you want to rebuild the block database now?</source> <translation>¿Quieres reconstruir la base de datos de bloques ahora?</translation> </message> <message> - <source>Enable publish hash block in <address></source> - <translation>Activar publicar bloque .hash en <.Address></translation> - </message> - <message> - <source>Enable publish hash transaction in <address></source> - <translation>Activar publicar transacción .hash en <.Address></translation> - </message> - <message> - <source>Enable publish raw block in <address></source> - <translation>Habilita la publicacion de bloques en bruto en <direccion></translation> - </message> - <message> - <source>Enable publish raw transaction in <address></source> - <translation>Habilitar publicar transacción en rama en <dirección></translation> - </message> - <message> - <source>Enable transaction replacement in the memory pool (default: %u)</source> - <translation>Habilita el reemplazamiento de transacciones en la piscina de memoria (predeterminado: %u)</translation> - </message> - <message> <source>Error initializing block database</source> <translation>Error al inicializar la base de datos de bloques</translation> </message> @@ -3161,34 +2966,14 @@ <translation>Cantidad inválida para -fallbackfee=<amount>: '%s'</translation> </message> <message> - <source>Keep the transaction memory pool below <n> megabytes (default: %u)</source> - <translation>Mantener la memoria de transacciones por debajo de <n> megabytes (predeterminado: %u)</translation> - </message> - <message> <source>Loading banlist...</source> <translation>Cargando banlist...</translation> </message> <message> - <source>Location of the auth cookie (default: data dir)</source> - <translation>Ubicación de la cookie de autenticación (default: data dir)</translation> - </message> - <message> <source>Not enough file descriptors available.</source> <translation>No hay suficientes descriptores de archivo disponibles. </translation> </message> <message> - <source>Only connect to nodes in network <net> (ipv4, ipv6 or onion)</source> - <translation>Sólo conectar a nodos en redes <net> (ipv4, ipv6 o onion)</translation> - </message> - <message> - <source>Print this help message and exit</source> - <translation>Imprimir este mensaje de ayuda y salir</translation> - </message> - <message> - <source>Print version and exit</source> - <translation>Imprimir versión y salir</translation> - </message> - <message> <source>Prune cannot be configured with a negative value.</source> <translation>Pode no se puede configurar con un valor negativo.</translation> </message> @@ -3197,26 +2982,10 @@ <translation>El modo recorte es incompatible con -txindex.</translation> </message> <message> - <source>Rebuild chain state and block index from the blk*.dat files on disk</source> - <translation>Reconstruir el estado de la cadena e indice de bloques a partir de los ficheros blk*.dat en disco</translation> - </message> - <message> - <source>Rebuild chain state from the currently indexed blocks</source> - <translation>Reconstruir el estado de la cadena a partir de los bloques indexados</translation> - </message> - <message> <source>Rewinding blocks...</source> <translation>Verificando bloques...</translation> </message> <message> - <source>Set database cache size in megabytes (%d to %d, default: %d)</source> - <translation>Asignar tamaño de cache en megabytes (entre %d y %d; predeterminado: %d)</translation> - </message> - <message> - <source>Specify wallet file (within data directory)</source> - <translation>Especificar archivo de monedero (dentro del directorio de datos)</translation> - </message> - <message> <source>The source code is available from %s.</source> <translation>El código fuente esta disponible desde %s.</translation> </message> @@ -3237,14 +3006,6 @@ <translation>Parámetros no compatibles -tor encontrados, use -onion .</translation> </message> <message> - <source>Use UPnP to map the listening port (default: %u)</source> - <translation>Usar UPnP para asignar el puerto de escucha (predeterminado:: %u)</translation> - </message> - <message> - <source>Use the test chain</source> - <translation>Utilizar la cadena de test</translation> - </message> - <message> <source>User Agent comment (%s) contains unsafe characters.</source> <translation>El comentario del Agente de Usuario (%s) contiene caracteres inseguros.</translation> </message> @@ -3253,98 +3014,30 @@ <translation>Verificando bloques...</translation> </message> <message> - <source>Wallet debugging/testing options:</source> - <translation>Opciones de depuración/pruebas de monedero:</translation> - </message> - <message> <source>Wallet needed to be rewritten: restart %s to complete</source> <translation>Es necesario reescribir el monedero: reiniciar %s para completar</translation> </message> <message> - <source>Wallet options:</source> - <translation>Opciones de monedero:</translation> - </message> - <message> - <source>Allow JSON-RPC connections from specified source. Valid for <ip> are a single IP (e.g. 1.2.3.4), a network/netmask (e.g. 1.2.3.4/255.255.255.0) or a network/CIDR (e.g. 1.2.3.4/24). This option can be specified multiple times</source> - <translation>Permitir conexiones JSON-RPC de origen especificado. Válido para son una sola IP (por ejemplo 1.2.3.4), una red/máscara de red (por ejemplo 1.2.3.4/255.255.255.0) o una red/CIDR (e.g. 1.2.3.4/24). Esta opción se puede especificar varias veces</translation> - </message> - <message> - <source>Bind to given address and whitelist peers connecting to it. Use [host]:port notation for IPv6</source> - <translation>Ligar a las direcciones especificadas y poner en lista blanca a los equipos conectados a ellas. Usar la notación para IPv6 [host]:puerto.</translation> - </message> - <message> - <source>Create new files with system default permissions, instead of umask 077 (only effective with disabled wallet functionality)</source> - <translation>Crear nuevos archivos con permisos por defecto del sistema, en lugar de umask 077 (sólo efectivo con la funcionalidad de monedero desactivada)</translation> - </message> - <message> - <source>Discover own IP addresses (default: 1 when listening and no -externalip or -proxy)</source> - <translation>Descubra direcciones IP propias (por defecto: 1 cuando se escucha y nadie -externalip o -proxy)</translation> - </message> - <message> <source>Error: Listening for incoming connections failed (listen returned error %s)</source> <translation>Error: la escucha para conexiones entrantes falló (la escucha regresó el error %s)</translation> </message> <message> - <source>Execute command when a relevant alert is received or we see a really long fork (%s in cmd is replaced by message)</source> - <translation>Ejecutar un comando cuando se reciba una alerta importante o cuando veamos un fork demasiado largo (%s en cmd se reemplazará por el mensaje)</translation> - </message> - <message> - <source>Fees (in %s/kB) smaller than this are considered zero fee for relaying, mining and transaction creation (default: %s)</source> - <translation>Las comisiones (en %s/kB) mas pequeñas que esto se consideran como cero comisión para la retransmisión, minería y creación de la transacción (predeterminado: %s)</translation> - </message> - <message> - <source>If paytxfee is not set, include enough fee so transactions begin confirmation on average within n blocks (default: %u)</source> - <translation>Si el pago de comisión no está establecido, incluir la cuota suficiente para que las transacciones comiencen la confirmación en una media de n bloques ( por defecto :%u)</translation> - </message> - <message> <source>Invalid amount for -maxtxfee=<amount>: '%s' (must be at least the minrelay fee of %s to prevent stuck transactions)</source> <translation>Cantidad no válida para -maxtxfee=<amount>: '%s' (debe ser por lo menos la cuota de comisión mínima de %s para prevenir transacciones atascadas)</translation> </message> <message> - <source>Maximum size of data in data carrier transactions we relay and mine (default: %u)</source> - <translation>El tamaño máximo de los datos en las operaciones de transporte de datos que transmitimos y el mio (default: %u)</translation> - </message> - <message> - <source>Randomize credentials for every proxy connection. This enables Tor stream isolation (default: %u)</source> - <translation>Aleatorizar las credenciales para cada conexión proxy. Esto habilita la Tor stream isolation (por defecto: %u)</translation> - </message> - <message> <source>The transaction amount is too small to send after the fee has been deducted</source> <translation>Monto de transacción muy pequeña luego de la deducción por comisión</translation> </message> <message> - <source>Whitelisted peers cannot be DoS banned and their transactions are always relayed, even if they are already in the mempool, useful e.g. for a gateway</source> - <translation>A los equipos en lista blanca no se les pueden prohibir los ataques DoS y sus transacciones siempre son retransmitidas, incluso si ya están en el mempool, es útil por ejemplo para un gateway.</translation> - </message> - <message> <source>You need to rebuild the database using -reindex to go back to unpruned mode. This will redownload the entire blockchain</source> <translation>Necesitas reconstruir la base de datos utilizando -reindex para volver al modo sin recorte. Esto volverá a descargar toda la cadena de bloques</translation> </message> <message> - <source>(default: %u)</source> - <translation>(por defecto: %u)</translation> - </message> - <message> - <source>Accept public REST requests (default: %u)</source> - <translation>Aceptar solicitudes públicas en FERIADOS (por defecto: %u)</translation> - </message> - <message> - <source>Automatically create Tor hidden service (default: %d)</source> - <translation>Automáticamente crea el servicio Tor oculto (por defecto: %d)</translation> - </message> - <message> - <source>Connect through SOCKS5 proxy</source> - <translation>Conectar usando SOCKS5 proxy</translation> - </message> - <message> <source>Error reading from database, shutting down.</source> <translation>Error al leer la base de datos, cerrando.</translation> </message> <message> - <source>Imports blocks from external blk000??.dat file on startup</source> - <translation>Importa los bloques desde un archivo externo blk000?.dat</translation> - </message> - <message> <source>Information</source> <translation>Información</translation> </message> @@ -3357,42 +3050,14 @@ <translation>Máscara de red inválida especificada en -whitelist: '%s'</translation> </message> <message> - <source>Keep at most <n> unconnectable transactions in memory (default: %u)</source> - <translation>Mantener como máximo <n> transacciones no conectables en memoria (por defecto: %u)</translation> - </message> - <message> <source>Need to specify a port with -whitebind: '%s'</source> <translation>Necesita especificar un puerto con -whitebind: '%s'</translation> </message> <message> - <source>Node relay options:</source> - <translation>Opciones de nodos de retransmisión:</translation> - </message> - <message> - <source>RPC server options:</source> - <translation>Opciones de servidor RPC:</translation> - </message> - <message> <source>Reducing -maxconnections from %d to %d, because of system limitations.</source> <translation>Reduciendo -maxconnections de %d a %d, debido a limitaciones del sistema.</translation> </message> <message> - <source>Rescan the block chain for missing wallet transactions on startup</source> - <translation>Rescanea la cadena de bloques para transacciones perdidas de la cartera</translation> - </message> - <message> - <source>Send trace/debug info to console instead of debug.log file</source> - <translation>Enviar información de trazas/depuración a la consola en lugar de al archivo debug.log</translation> - </message> - <message> - <source>Show all debugging options (usage: --help -help-debug)</source> - <translation>Muestra todas las opciones de depuración (uso: --help -help-debug)</translation> - </message> - <message> - <source>Shrink debug.log file on client startup (default: 1 when no -debug)</source> - <translation>Reducir el archivo debug.log al iniciar el cliente (predeterminado: 1 sin -debug)</translation> - </message> - <message> <source>Signing transaction failed</source> <translation>Transacción falló</translation> </message> @@ -3405,14 +3070,6 @@ <translation>Este software es experimental.</translation> </message> <message> - <source>Tor control port password (default: empty)</source> - <translation>Contraseña del puerto de control de Tor (predeterminado: vacio)</translation> - </message> - <message> - <source>Tor control port to use if onion listening enabled (default: %s)</source> - <translation>Puerto de control de Tor a utilizar si la escucha de onion esta activada (predeterminado: %s)</translation> - </message> - <message> <source>Transaction amount too small</source> <translation>Cantidad de la transacción demasiado pequeña</translation> </message> @@ -3429,15 +3086,6 @@ <translation>No es posible conectar con %s en este sistema (bind ha dado el error %s)</translation> </message> <message> - <source>Upgrade wallet to latest format on startup</source> - <translation>Actualizar el monedero al último formato al inicio</translation> - </message> - <message> - <source>Username for JSON-RPC connections</source> - <translation>Nombre de usuario para las conexiones JSON-RPC -</translation> - </message> - <message> <source>Warning</source> <translation>Aviso</translation> </message> @@ -3446,75 +3094,14 @@ <translation>Advertencia: nuevas reglas desconocidas activadas (versionbit %i)</translation> </message> <message> - <source>Whether to operate in a blocks only mode (default: %u)</source> - <translation>Si se debe o no operar en un modo de solo bloques (predeterminado: %u)</translation> - </message> - <message> <source>Zapping all transactions from wallet...</source> <translation>Eliminando todas las transacciones del monedero...</translation> </message> <message> - <source>ZeroMQ notification options:</source> - <translation>Opciones de notificación ZeroQM:</translation> - </message> - <message> - <source>Password for JSON-RPC connections</source> - <translation>Contraseña para las conexiones JSON-RPC -</translation> - </message> - <message> - <source>Execute command when the best block changes (%s in cmd is replaced by block hash)</source> - <translation>Ejecutar un comando cuando cambia el mejor bloque (%s en cmd se sustituye por el hash de bloque)</translation> - </message> - <message> - <source>Allow DNS lookups for -addnode, -seednode and -connect</source> - <translation>Permitir búsquedas DNS para -addnode, -seednode y -connect</translation> - </message> - <message> - <source>(1 = keep tx meta data e.g. account owner and payment request information, 2 = drop tx meta data)</source> - <translation>(1 = mantener los meta datos de transacción, por ejemplo: propietario e información de pago, 2 = omitir los metadatos)</translation> - </message> - <message> <source>-maxtxfee is set very high! Fees this large could be paid on a single transaction.</source> <translation>-maxtxfee tiene un ajuste muy elevado! Comisiones muy grandes podrían ser pagadas en una única transaccion.</translation> </message> <message> - <source>Do not keep transactions in the mempool longer than <n> hours (default: %u)</source> - <translation>No mantener transacciones en la memoria mas de <n> horas (predeterminado: %u)</translation> - </message> - <message> - <source>Equivalent bytes per sigop in transactions for relay and mining (default: %u)</source> - <translation>Bytes equivalentes por sigop en transacciones para retrasmisión y minado (predeterminado: %u)</translation> - </message> - <message> - <source>Fees (in %s/kB) smaller than this are considered zero fee for transaction creation (default: %s)</source> - <translation>Las comisiones (en %s/kB) menores que esto son consideradas de cero comision para la creacion de transacciones (predeterminado: %s)</translation> - </message> - <message> - <source>Force relay of transactions from whitelisted peers even if they violate local relay policy (default: %d)</source> - <translation>Fuerza la retransmisión de transacciones desde nodos en la lista blanca incluso si violan la política de retransmisiones local (predeterminado: %d)</translation> - </message> - <message> - <source>How thorough the block verification of -checkblocks is (0-4, default: %u)</source> - <translation>Nivel de rigor en la verificación de bloques de -checkblocks (0-4; predeterminado: %u)</translation> - </message> - <message> - <source>Maintain a full transaction index, used by the getrawtransaction rpc call (default: %u)</source> - <translation>Mantener el índice completo de transacciones, usado por la llamada rpc de getrawtransaction (por defecto: %u)</translation> - </message> - <message> - <source>Number of seconds to keep misbehaving peers from reconnecting (default: %u)</source> - <translation>Número de segundos en que se evita la reconexión de pares con mal comportamiento (predeterminado: %u)</translation> - </message> - <message> - <source>Output debugging information (default: %u, supplying <category> is optional)</source> - <translation>Mostrar depuración (por defecto: %u, proporcionar <category> es opcional)</translation> - </message> - <message> - <source>Support filtering of blocks and transaction with bloom filters (default: %u)</source> - <translation>Admite filtrado de bloques, y transacciones con filtros Bloom. Reduce la carga de red. ( por defecto :%u)</translation> - </message> - <message> <source>This is the transaction fee you may pay when fee estimates are not available.</source> <translation>Esta es la comisión que debe pagar cuando la estimación de comisión no esta disponible.</translation> </message> @@ -3531,10 +3118,6 @@ <translation>El argumento no soportado -whitelistalwaysrelay ha sido ignorado, utiliza -whitelistrelay y/o -whitelistforcerelay.</translation> </message> <message> - <source>Use separate SOCKS5 proxy to reach peers via Tor hidden services (default: %s)</source> - <translation>Usar distintos proxys SOCKS5 para comunicarse vía Tor de forma anónima (Por defecto: %s)</translation> - </message> - <message> <source>Warning: Unknown block versions being mined! It's possible unknown rules are in effect</source> <translation>Advertencia: Se están minando versiones de bloques desconocidas! Es posible que normas desconocidas estén activas</translation> </message> @@ -3547,86 +3130,6 @@ <translation>%s es demasiado alto!</translation> </message> <message> - <source>(default: %s)</source> - <translation>(predeterminado: %s)</translation> - </message> - <message> - <source>Always query for peer addresses via DNS lookup (default: %u)</source> - <translation>Siempre consultar direcciones de otros equipos por medio de DNS lookup (por defecto: %u)</translation> - </message> - <message> - <source>How many blocks to check at startup (default: %u, 0 = all)</source> - <translation>Cuántos bloques comprobar al iniciar (predeterminado: %u, 0 = todos)</translation> - </message> - <message> - <source>Include IP addresses in debug output (default: %u)</source> - <translation>Incluir direcciones IP en la salida de depuración (por defecto: %u)</translation> - </message> - <message> - <source>Listen for JSON-RPC connections on <port> (default: %u or testnet: %u)</source> - <translation>Escuchar conexiones JSON-RPC en <puerto> (predeterminado: %u o testnet: %u)</translation> - </message> - <message> - <source>Listen for connections on <port> (default: %u or testnet: %u)</source> - <translation>Escuchar conexiones en <puerto> (predeterminado: %u o testnet: %u)</translation> - </message> - <message> - <source>Maintain at most <n> connections to peers (default: %u)</source> - <translation>Mantener como máximo <n> conexiones a pares (predeterminado: %u)</translation> - </message> - <message> - <source>Make the wallet broadcast transactions</source> - <translation>Realiza las operaciones de difusión del monedero</translation> - </message> - <message> - <source>Maximum per-connection receive buffer, <n>*1000 bytes (default: %u)</source> - <translation>Búfer de recepción máximo por conexión, <n>*1000 bytes (por defecto: %u)</translation> - </message> - <message> - <source>Maximum per-connection send buffer, <n>*1000 bytes (default: %u)</source> - <translation>Búfer de recepción máximo por conexión, , <n>*1000 bytes (por defecto: %u)</translation> - </message> - <message> - <source>Prepend debug output with timestamp (default: %u)</source> - <translation>Anteponer marca temporal a la información de depuración (por defecto: %u)</translation> - </message> - <message> - <source>Relay and mine data carrier transactions (default: %u)</source> - <translation>Retransmitir y minar transacciones de transporte de datos (por defecto: %u)</translation> - </message> - <message> - <source>Relay non-P2SH multisig (default: %u)</source> - <translation>Relay non-P2SH multisig (default: %u)</translation> - </message> - <message> - <source>Set key pool size to <n> (default: %u)</source> - <translation>Ajustar el número de claves en reserva <n> (predeterminado: %u)</translation> - </message> - <message> - <source>Set maximum BIP141 block weight (default: %d)</source> - <translation>Establecer peso máximo bloque BIP141 (predeterminado: %d)</translation> - </message> - <message> - <source>Set the number of threads to service RPC calls (default: %d)</source> - <translation>Establecer el número de procesos para llamadas del servicio RPC (por defecto: %d)</translation> - </message> - <message> - <source>Specify configuration file (default: %s)</source> - <translation>Especificar archivo de configuración (por defecto: %s)</translation> - </message> - <message> - <source>Specify connection timeout in milliseconds (minimum: 1, default: %d)</source> - <translation>Especificar tiempo de espera de la conexión (mínimo: 1, por defecto: %d)</translation> - </message> - <message> - <source>Specify pid file (default: %s)</source> - <translation>Especificar archivo pid (predeterminado: %s)</translation> - </message> - <message> - <source>Spend unconfirmed change when sending transactions (default: %u)</source> - <translation>Usar cambio aún no confirmado al enviar transacciones (predeterminado: %u)</translation> - </message> - <message> <source>Starting network threads...</source> <translation>Iniciando funciones de red...</translation> </message> @@ -3639,10 +3142,6 @@ <translation>Esta es la comisión que pagará si envia la transacción.</translation> </message> <message> - <source>Threshold for disconnecting misbehaving peers (default: %u)</source> - <translation>Umbral para la desconexión de pares con mal comportamiento (predeterminado: %u)</translation> - </message> - <message> <source>Transaction amounts must not be negative</source> <translation>Las cantidades de las transacciones no pueden ser negativas.</translation> </message> diff --git a/src/qt/locale/bitcoin_es_MX.ts b/src/qt/locale/bitcoin_es_MX.ts index d4ca4aa587..e1f79c5056 100644 --- a/src/qt/locale/bitcoin_es_MX.ts +++ b/src/qt/locale/bitcoin_es_MX.ts @@ -30,6 +30,10 @@ <translation>Eliminar la dirección actualmente seleccionada de la lista</translation> </message> <message> + <source>Enter address or label to search</source> + <translation>Ingrese dirección o capa a buscar </translation> + </message> + <message> <source>Export the data in the current tab to a file</source> <translation>Exportar la información en la tabla actual a un archivo</translation> </message> @@ -66,9 +70,25 @@ <translation>Estas son tus direcciones de Bitcoin para enviar pagos. Siempre revisa el monto y la dirección de envío antes de enviar monedas.</translation> </message> <message> + <source>These are your Bitcoin addresses for receiving payments. It is recommended to use a new receiving address for each transaction.</source> + <translation>Estas son sus direcciones de Bitcoin para recibir pagos. Se recomienda utilizar una nueva dirección de recepción para cada transacción.</translation> + </message> + <message> <source>&Copy Address</source> <translation>&Copiar dirección</translation> </message> + <message> + <source>Copy &Label</source> + <translation>copiar y etiquetar</translation> + </message> + <message> + <source>&Edit</source> + <translation>Editar</translation> + </message> + <message> + <source>Export Address List</source> + <translation>Exportar lista de direcciones </translation> + </message> </context> <context> <name>AddressTableModel</name> @@ -353,15 +373,7 @@ <source>Command-line options</source> <translation>opciones de la Linea de comandos</translation> </message> - <message> - <source>Usage:</source> - <translation>Uso:</translation> - </message> - <message> - <source>command-line options</source> - <translation>Opciones de comando de lineas</translation> - </message> - </context> +</context> <context> <name>Intro</name> <message> @@ -476,6 +488,10 @@ <source>Copy &Address</source> <translation>&Copiar dirección</translation> </message> + <message> + <source>Wallet</source> + <translation>Cartera</translation> + </message> </context> <context> <name>RecentRequestsTableModel</name> @@ -640,26 +656,14 @@ <context> <name>bitcoin-core</name> <message> - <source>Options:</source> - <translation>Opciones:</translation> - </message> - <message> <source>Bitcoin Core</source> <translation>nucleo Bitcoin</translation> </message> <message> - <source><category> can be:</source> - <translation><categoria> puede ser:</translation> - </message> - <message> <source>Verifying blocks...</source> <translation>Verificando bloques...</translation> </message> <message> - <source>Wallet options:</source> - <translation>Opciones de cartera:</translation> - </message> - <message> <source>Information</source> <translation>Información </translation> </message> diff --git a/src/qt/locale/bitcoin_es_UY.ts b/src/qt/locale/bitcoin_es_UY.ts index 05549ad7da..32524b45e7 100644 --- a/src/qt/locale/bitcoin_es_UY.ts +++ b/src/qt/locale/bitcoin_es_UY.ts @@ -30,6 +30,10 @@ <translation>Eliminar la dirección seleccionada de la lista</translation> </message> <message> + <source>Enter address or label to search</source> + <translation>Ingresar la dirección o etiqueta para buscar</translation> + </message> + <message> <source>Export the data in the current tab to a file</source> <translation>Exportar los datos en la pestaña actual a un archivo</translation> </message> @@ -335,6 +339,10 @@ <source>Copy &Address</source> <translation>Copiar Dirección</translation> </message> + <message> + <source>Wallet</source> + <translation>Billetera</translation> + </message> </context> <context> <name>RecentRequestsTableModel</name> @@ -467,10 +475,6 @@ <context> <name>bitcoin-core</name> <message> - <source>Options:</source> - <translation>Opciones:</translation> - </message> - <message> <source>Information</source> <translation>Información</translation> </message> diff --git a/src/qt/locale/bitcoin_es_VE.ts b/src/qt/locale/bitcoin_es_VE.ts index 81058c615a..9c7fb2e2a0 100644 --- a/src/qt/locale/bitcoin_es_VE.ts +++ b/src/qt/locale/bitcoin_es_VE.ts @@ -42,6 +42,10 @@ <translation>&Borrar</translation> </message> <message> + <source>Choose the address to send coins to</source> + <translation>Escoja la direccion a enviar las monedas</translation> + </message> + <message> <source>Choose the address to receive coins with</source> <translation>Elige la dirección para recibir monedas</translation> </message> @@ -54,6 +58,14 @@ <translation>Direcciones de recepción</translation> </message> <message> + <source>These are your Bitcoin addresses for sending payments. Always check the amount and the receiving address before sending coins.</source> + <translation>Estas son tus direcciones Bitcoin para realizar pagos. Verifica siempre el monto y la dirección de recepción antes de enviar monedas. </translation> + </message> + <message> + <source>These are your Bitcoin addresses for receiving payments. It is recommended to use a new receiving address for each transaction.</source> + <translation>Estas son tus direcciones Bitcoin para recibir pagos. Es recomendable usar una nueva dirección de recibo para cada transacción.</translation> + </message> + <message> <source>Copy &Label</source> <translation>Copiar &Etiqueta</translation> </message> @@ -409,15 +421,7 @@ <source>Command-line options</source> <translation>Opciones de línea de comandos</translation> </message> - <message> - <source>Usage:</source> - <translation>Uso:</translation> - </message> - <message> - <source>command-line options</source> - <translation>opciones de línea de comandos</translation> - </message> - </context> +</context> <context> <name>Intro</name> <message> @@ -572,6 +576,10 @@ <source>Copy &Address</source> <translation>&Copiar Dirección</translation> </message> + <message> + <source>Wallet</source> + <translation>Billetera</translation> + </message> </context> <context> <name>RecentRequestsTableModel</name> @@ -684,64 +692,64 @@ <context> <name>bitcoin-core</name> <message> - <source>Options:</source> - <translation>Opciones:</translation> + <source>Bitcoin Core</source> + <translation>Bitcoin Core</translation> </message> <message> - <source>Specify data directory</source> - <translation>Especifique directorio de datos</translation> + <source>Information</source> + <translation>Información</translation> </message> <message> - <source>Connect to a node to retrieve peer addresses, and disconnect</source> - <translation>Conecte un nodo para recuperar direcciones pares, y desconecte</translation> + <source>Transaction amount too small</source> + <translation>Transacción muy pequeña</translation> </message> <message> - <source>Specify your own public address</source> - <translation>Especifique su propia dirección pública</translation> + <source>Transaction too large</source> + <translation>Transacción muy grande</translation> </message> <message> - <source>Accept command line and JSON-RPC commands</source> - <translation>Aceptar linea de comando y comandos JSON-RPC</translation> + <source>Warning</source> + <translation>Advertencia</translation> </message> <message> - <source>Run in the background as a daemon and accept commands</source> - <translation>Correr en segundo plano como daemon y aceptar comandos</translation> + <source>This is the minimum transaction fee you pay on every transaction.</source> + <translation>Esta es la tarifa mínima a pagar en cada transacción.</translation> </message> <message> - <source>Bitcoin Core</source> - <translation>Bitcoin Core</translation> + <source>This is the transaction fee you will pay if you send a transaction.</source> + <translation>Esta es la tarifa a pagar si realizas una transacción.</translation> </message> <message> - <source>Bind to given address and always listen on it. Use [host]:port notation for IPv6</source> - <translation>Enlazar dirección dada y siempre escuchar en ella. Usar [host]:port notación para IPv6</translation> + <source>Transaction amounts must not be negative</source> + <translation>Los montos de la transacción no debe ser negativo</translation> </message> <message> - <source>Delete all wallet transactions and only recover those parts of the blockchain through -rescan on startup</source> - <translation>Borrar todas las transacciones de la billetera y solo recuperar aquellas partes de la cadena de bloques a través de -rescan en el inicio del sistema.</translation> + <source>Transaction has too long of a mempool chain</source> + <translation>La transacción tiene largo tiempo en una cadena mempool</translation> </message> <message> - <source>Execute command when a wallet transaction changes (%s in cmd is replaced by TxID)</source> - <translation>Ejecutar comando cuando una transacción de la billetera cambia (%s en cmd es reemplazado por TxID)</translation> + <source>Transaction must have at least one recipient</source> + <translation>La transacción debe tener al menos un destinatario</translation> </message> <message> - <source>Set the number of script verification threads (%u to %d, 0 = auto, <0 = leave that many cores free, default: %d)</source> - <translation>Fija el número de verificación de hilos de script (%u a %d, 0 = auto, <0 = leave that many cores free, default: %d)</translation> + <source>Insufficient funds</source> + <translation>Fondos insuficientes</translation> </message> <message> - <source>Information</source> - <translation>Información</translation> + <source>Loading wallet...</source> + <translation>Cargando monedero...</translation> </message> <message> - <source>Transaction amount too small</source> - <translation>Transacción muy pequeña</translation> + <source>Cannot downgrade wallet</source> + <translation>No se puede rebajar monedero</translation> </message> <message> - <source>Transaction too large</source> - <translation>Transacción muy grande</translation> + <source>Rescanning...</source> + <translation>Escaneando...</translation> </message> <message> - <source>Warning</source> - <translation>Advertencia</translation> + <source>Done loading</source> + <translation>Carga lista</translation> </message> <message> <source>Error</source> diff --git a/src/qt/locale/bitcoin_et.ts b/src/qt/locale/bitcoin_et.ts index 408d6eb840..8291a50b1c 100644 --- a/src/qt/locale/bitcoin_et.ts +++ b/src/qt/locale/bitcoin_et.ts @@ -30,6 +30,10 @@ <translation>Kustuta märgistatud aadress loetelust</translation> </message> <message> + <source>Enter address or label to search</source> + <translation>Otsimiseks sisesta märgis või aadress</translation> + </message> + <message> <source>Export the data in the current tab to a file</source> <translation>Ekspordi kuvatava vahelehe sisu faili</translation> </message> @@ -610,10 +614,6 @@ <translation>&Aadress</translation> </message> <message> - <source>New receiving address</source> - <translation>Uus vastu võttev aadress</translation> - </message> - <message> <source>New sending address</source> <translation>Uus saatev aadress</translation> </message> @@ -630,10 +630,6 @@ <translation>Sisestatud aadress "%1" ei ole korrektne Bitcoin aadress.</translation> </message> <message> - <source>The entered address "%1" is already in the address book.</source> - <translation>Sisestatud aadress "%1" on juba aadressi raamatus.</translation> - </message> - <message> <source>Could not unlock wallet.</source> <translation>Rahakoti lahtilukustamine ebaõnnestus.</translation> </message> @@ -659,23 +655,7 @@ <source>Command-line options</source> <translation>Käsurea valikud</translation> </message> - <message> - <source>Usage:</source> - <translation>Kasutus:</translation> - </message> - <message> - <source>command-line options</source> - <translation>käsurea valikud</translation> - </message> - <message> - <source>UI Options:</source> - <translation>Kasutajaliidese Suvandid:</translation> - </message> - <message> - <source>Show splash screen on startup (default: %u)</source> - <translation>Käivitamisel kuva laadimisekraani (vaikimisi %u)</translation> - </message> - </context> +</context> <context> <name>Intro</name> <message> @@ -1175,6 +1155,10 @@ <translation>Sõnum</translation> </message> <message> + <source>Wallet</source> + <translation>Rahakott</translation> + </message> + <message> <source>Resulting URI too long, try to reduce the text for label / message.</source> <translation>URI liiga pikk, proovi vähendada märke / sõnumi pikkust.</translation> </message> @@ -1329,14 +1313,14 @@ <translation>Oled kindel, et soovid saata?</translation> </message> <message> - <source>added as transaction fee</source> - <translation>lisatud kui tehingutasu</translation> - </message> - <message> <source>or</source> <translation>või</translation> </message> <message> + <source>Transaction fee</source> + <translation>Tehingutasu</translation> + </message> + <message> <source>Confirm send coins</source> <translation>Müntide saatmise kinnitamine</translation> </message> @@ -1586,10 +1570,6 @@ <translation>Avatud kuni %1</translation> </message> <message> - <source>%1/offline</source> - <translation>%1/offline'is</translation> - </message> - <message> <source>%1/unconfirmed</source> <translation>%1/kinnitamata</translation> </message> @@ -1602,10 +1582,6 @@ <translation>Olek</translation> </message> <message> - <source>, has not been successfully broadcast yet</source> - <translation>, veel esitlemata</translation> - </message> - <message> <source>Date</source> <translation>Kuupäev</translation> </message> @@ -1732,10 +1708,6 @@ <translation>Kinnitatud (%1 kinnitust)</translation> </message> <message> - <source>This block was not received by any other nodes and will probably not be accepted!</source> - <translation>Antud klotsi pole saanud ükski osapool ning tõenäoliselt seda ei aktsepteerita!</translation> - </message> - <message> <source>Generated but not accepted</source> <translation>Loodud, kuid aktsepteerimata</translation> </message> @@ -1946,54 +1918,14 @@ <context> <name>bitcoin-core</name> <message> - <source>Options:</source> - <translation>Valikud:</translation> - </message> - <message> - <source>Specify data directory</source> - <translation>Täpsusta andmekataloog</translation> - </message> - <message> - <source>Connect to a node to retrieve peer addresses, and disconnect</source> - <translation>Peeri aadressi saamiseks ühendu korraks node'iga</translation> - </message> - <message> - <source>Specify your own public address</source> - <translation>Täpsusta enda avalik aadress</translation> - </message> - <message> - <source>Accept command line and JSON-RPC commands</source> - <translation>Luba käsurea ning JSON-RPC käsklusi</translation> - </message> - <message> - <source>Run in the background as a daemon and accept commands</source> - <translation>Tööta taustal ning aktsepteeri käsklusi</translation> - </message> - <message> <source>Bitcoin Core</source> <translation>Bitcoini tuumik</translation> </message> <message> - <source>Bind to given address and always listen on it. Use [host]:port notation for IPv6</source> - <translation>Määratud aadressiga sidumine ning sellelt kuulamine. IPv6 jaoks kasuta vormingut [host]:port</translation> - </message> - <message> - <source>Execute command when a wallet transaction changes (%s in cmd is replaced by TxID)</source> - <translation>Käivita käsklus, kui rahakoti tehing muutub (%s cmd's muudetakse TxID'ks)</translation> - </message> - <message> <source>This is a pre-release test build - use at your own risk - do not use for mining or merchant applications</source> <translation>See on test-versioon - kasutamine omal riisikol - ära kasuta mining'uks ega kaupmeeste programmides</translation> </message> <message> - <source>Accept connections from outside (default: 1 if no -proxy or -connect)</source> - <translation>Luba välisühendusi (vaikeväärtus: 1 kui puudub -proxy või -connect)</translation> - </message> - <message> - <source>Block creation options:</source> - <translation>Blokeeri loomise valikud:</translation> - </message> - <message> <source>Corrupted block database detected</source> <translation>Tuvastati vigane bloki andmebaas</translation> </message> @@ -2030,30 +1962,10 @@ <translation>Kontrollin blokke...</translation> </message> <message> - <source>Wallet options:</source> - <translation>Rahakoti valikud:</translation> - </message> - <message> - <source>(default: %u)</source> - <translation>(vaikimisi: %u)</translation> - </message> - <message> <source>Information</source> <translation>Informatsioon</translation> </message> <message> - <source>RPC server options:</source> - <translation>RPC serveri valikud:</translation> - </message> - <message> - <source>Send trace/debug info to console instead of debug.log file</source> - <translation>Saada jälitus/debug, debug.log faili asemel, konsooli</translation> - </message> - <message> - <source>Shrink debug.log file on client startup (default: 1 when no -debug)</source> - <translation>Kahanda programmi käivitamisel debug.log faili (vaikeväärtus: 1, kui ei ole -debug)</translation> - </message> - <message> <source>Signing transaction failed</source> <translation>Tehingu allkirjastamine ebaõnnestus</translation> </message> @@ -2070,30 +1982,10 @@ <translation>Tehing liiga suur</translation> </message> <message> - <source>Username for JSON-RPC connections</source> - <translation>JSON-RPC ühenduste kasutajatunnus</translation> - </message> - <message> <source>Warning</source> <translation>Hoiatus</translation> </message> <message> - <source>Password for JSON-RPC connections</source> - <translation>JSON-RPC ühenduste salasõna</translation> - </message> - <message> - <source>Execute command when the best block changes (%s in cmd is replaced by block hash)</source> - <translation>Käivita käsklus, kui parim plokk muutub (käskluse %s asendatakse ploki hash'iga)</translation> - </message> - <message> - <source>Allow DNS lookups for -addnode, -seednode and -connect</source> - <translation>-addnode, -seednode ja -connect tohivad kasutada DNS lookup'i</translation> - </message> - <message> - <source>(default: %s)</source> - <translation>(vaikimisi: %s)</translation> - </message> - <message> <source>Unknown network specified in -onlynet: '%s'</source> <translation>Kirjeldatud tundmatu võrgustik -onlynet'is: '%s'</translation> </message> diff --git a/src/qt/locale/bitcoin_et_EE.ts b/src/qt/locale/bitcoin_et_EE.ts index fb7c0ee3e4..4778e9492b 100644 --- a/src/qt/locale/bitcoin_et_EE.ts +++ b/src/qt/locale/bitcoin_et_EE.ts @@ -257,15 +257,7 @@ <source>Command-line options</source> <translation>Käsurea valikud</translation> </message> - <message> - <source>Usage:</source> - <translation>Kasutus:</translation> - </message> - <message> - <source>command-line options</source> - <translation>käsurea valikud</translation> - </message> - </context> +</context> <context> <name>Intro</name> <message> @@ -508,6 +500,10 @@ <source>Message</source> <translation>Sõnum</translation> </message> + <message> + <source>Wallet</source> + <translation>Rahakott</translation> + </message> </context> <context> <name>RecentRequestsTableModel</name> @@ -764,10 +760,6 @@ <context> <name>bitcoin-core</name> <message> - <source>Options:</source> - <translation>Valikud:</translation> - </message> - <message> <source>Bitcoin Core</source> <translation>Bitcoin Core</translation> </message> diff --git a/src/qt/locale/bitcoin_eu_ES.ts b/src/qt/locale/bitcoin_eu_ES.ts index d890d7ed22..1abc55acce 100644 --- a/src/qt/locale/bitcoin_eu_ES.ts +++ b/src/qt/locale/bitcoin_eu_ES.ts @@ -30,6 +30,10 @@ <translation>Ezabatu aukeratutako helbideak listatik</translation> </message> <message> + <source>Enter address or label to search</source> + <translation>Bilatzeko, helbide edo etiketa sartu</translation> + </message> + <message> <source>Export the data in the current tab to a file</source> <translation>Uneko fitxategian datuak esportatu</translation> </message> @@ -336,10 +340,6 @@ <translation>&Helbidea</translation> </message> <message> - <source>New receiving address</source> - <translation>Jasotzeko helbide berria</translation> - </message> - <message> <source>New sending address</source> <translation>Bidaltzeko helbide berria</translation> </message> @@ -352,10 +352,6 @@ <translation>Bidaltzeko helbidea editatu</translation> </message> <message> - <source>The entered address "%1" is already in the address book.</source> - <translation>Sartu berri den helbidea, "%1", helbide-liburuan dago jadanik.</translation> - </message> - <message> <source>Could not unlock wallet.</source> <translation>Ezin da diruzorroa desblokeatu.</translation> </message> @@ -604,10 +600,6 @@ <translation>%1 konfirmazio</translation> </message> <message> - <source>, has not been successfully broadcast yet</source> - <translation>, ez da oraindik arrakastaz igorri</translation> - </message> - <message> <source>Date</source> <translation>Data</translation> </message> @@ -658,10 +650,6 @@ <translation>Konfirmatuta (%1 konfirmazio)</translation> </message> <message> - <source>This block was not received by any other nodes and will probably not be accepted!</source> - <translation>Bloke hau ez du beste inongo nodok jaso, eta seguruenik ez da onartuko!</translation> - </message> - <message> <source>Generated but not accepted</source> <translation>Sortua, baina ez onartua</translation> </message> @@ -820,10 +808,6 @@ <context> <name>bitcoin-core</name> <message> - <source>Options:</source> - <translation>Aukerak:</translation> - </message> - <message> <source>Rescanning...</source> <translation>Birbilatzen...</translation> </message> diff --git a/src/qt/locale/bitcoin_fa.ts b/src/qt/locale/bitcoin_fa.ts index 1e27c1cf97..1fa0d9fb44 100644 --- a/src/qt/locale/bitcoin_fa.ts +++ b/src/qt/locale/bitcoin_fa.ts @@ -3,11 +3,11 @@ <name>AddressBookPage</name> <message> <source>Right-click to edit address or label</source> - <translation>برای تغییر آدرس و یا برچسب کلیک راست کنید.</translation> + <translation>برای تغییر آدرس و یا برچسب کلیک راست کنید</translation> </message> <message> <source>Create a new address</source> - <translation>ایجاد نشانی جدید</translation> + <translation>ایجاد آدرس جدید</translation> </message> <message> <source>&New</source> @@ -15,7 +15,7 @@ </message> <message> <source>Copy the currently selected address to the system clipboard</source> - <translation>کپی نشانی انتخاب شده کنونی به حافظهی سیستم</translation> + <translation>کپیبرداری از آدرس منتخب به حافظهٔ سیستم</translation> </message> <message> <source>&Copy</source> @@ -27,11 +27,15 @@ </message> <message> <source>Delete the currently selected address from the list</source> - <translation>حذف نشانی انتخابشده کنونی از لیست</translation> + <translation>حذف آدرس منتخب از لیست</translation> + </message> + <message> + <source>Enter address or label to search</source> + <translation>برای جستوجو نشانی یا برچسب را وارد کنید</translation> </message> <message> <source>Export the data in the current tab to a file</source> - <translation>خروجی گرفتن دادههای برگهی فعلی به یک فایل</translation> + <translation>صدور دادههای برگهٔ فعلی به یک پرونده</translation> </message> <message> <source>&Export</source> @@ -43,35 +47,35 @@ </message> <message> <source>Choose the address to send coins to</source> - <translation>آدرس مورد نظر برای ارسال کوین ها را انتخاب کنید</translation> + <translation>آدرس مورد نظر برای ارسال سکهها را انتخاب کنید</translation> </message> <message> <source>Choose the address to receive coins with</source> - <translation>آدرس موردنظر برای دریافت کوین ها را انتخاب کنید.</translation> + <translation>آدرس موردنظر برای دریافت سکهها را انتخاب کنید</translation> </message> <message> <source>C&hoose</source> - <translation>انتخاب</translation> + <translation>ان&تخاب</translation> </message> <message> <source>Sending addresses</source> - <translation>آدرس های فرستنده</translation> + <translation>آدرسهای ارسالی</translation> </message> <message> <source>Receiving addresses</source> - <translation>آدرس های گیرنده</translation> + <translation>آدرسهای دریافتی</translation> </message> <message> <source>These are your Bitcoin addresses for sending payments. Always check the amount and the receiving address before sending coins.</source> - <translation>اینها آدرس های شما برای فرستادن پرداخت هاست. همیشه قبل از فرستادن سکه ها مقدار و آدرس دریافت کننده را چک کنید.</translation> + <translation>اینها آدرسهای بیتکوین برای پرداختها هستند. همیشه قبل از فرستادن سکهها مقدار و آدرس دریافتکننده را بررسی نمایید.</translation> </message> <message> <source>These are your Bitcoin addresses for receiving payments. It is recommended to use a new receiving address for each transaction.</source> - <translation>این ها آدرس های بیت کوین شما برای دریافت پرداخت ها می باشد. توصیه میشود برای هر تراکنش از یک آدرس دریافت جدید استفاده کنید.</translation> + <translation>اینها آدرسهای بیتکوین شما برای دریافت مبالغ میباشد. توصیه میشود برای هر تراکنش از یک آدرس جدید استفاده کنید.</translation> </message> <message> <source>&Copy Address</source> - <translation>کپی کردن آدرس</translation> + <translation>کپ&ی کردن آدرس</translation> </message> <message> <source>Copy &Label</source> @@ -93,7 +97,11 @@ <source>Exporting Failed</source> <translation>صدور موفق نبود</translation> </message> - </context> + <message> + <source>There was an error trying to save the address list to %1. Please try again.</source> + <translation>خطا در ذخیرهسازی لیست آدرسها در %1.</translation> + </message> +</context> <context> <name>AddressTableModel</name> <message> @@ -128,12 +136,16 @@ <translation>تکرار گذرواژهٔ جدید</translation> </message> <message> + <source>Show password</source> + <translation>نمایش گذرواژه</translation> + </message> + <message> <source>Encrypt wallet</source> <translation>رمزنگاری کیف پول</translation> </message> <message> <source>This operation needs your wallet passphrase to unlock the wallet.</source> - <translation>این عملیات نیاز به عبارت کیف پول شما برای بازگشایی کیف پول دارد</translation> + <translation>این عملیات نیاز به عبارت کیف پول شما برای بازگشایی کیف پول دارد.</translation> </message> <message> <source>Unlock wallet</source> @@ -403,7 +415,7 @@ </message> <message numerus="yes"> <source>%n active connection(s) to Bitcoin network</source> - <translation><numerusform>%n ارتباط فعال با شبکهٔ بیتکوین</numerusform></translation> + <translation><numerusform>%n ارتباط فعال با شبکهٔ بیتکوین</numerusform><numerusform>%n ارتباط فعال با شبکهٔ بیتکوین</numerusform></translation> </message> <message> <source>Processing blocks on disk...</source> @@ -411,7 +423,7 @@ </message> <message numerus="yes"> <source>Processed %n block(s) of transaction history.</source> - <translation><numerusform>پردازش %n بلاک از تاریخچه ی تراکنش ها </numerusform></translation> + <translation><numerusform>پردازش %n بلاک از تاریخچه ی تراکنش ها </numerusform><numerusform>پردازش %n بلاک از تاریخچه ی تراکنش ها </numerusform></translation> </message> <message> <source>%1 behind</source> @@ -634,10 +646,6 @@ <translation>&نشانی</translation> </message> <message> - <source>New receiving address</source> - <translation>نشانی گیرنده جدید</translation> - </message> - <message> <source>New sending address</source> <translation>نشانی فرستنده جدید</translation> </message> @@ -654,14 +662,14 @@ <translation>نشانی وارد شده "%1" یک نشانی معتبر بیتکوین نیست.</translation> </message> <message> - <source>The entered address "%1" is already in the address book.</source> - <translation>نشانی وارد شده «%1» در حال حاضر در دفترچه وجود دارد.</translation> - </message> - <message> <source>Could not unlock wallet.</source> <translation>نمیتوان کیف پول را رمزگشایی کرد.</translation> </message> - </context> + <message> + <source>New key generation failed.</source> + <translation>تولید کلید جدید ناموفق بود.</translation> + </message> +</context> <context> <name>FreespaceChecker</name> <message> @@ -703,35 +711,7 @@ <source>Command-line options</source> <translation>گزینههای خطفرمان</translation> </message> - <message> - <source>Usage:</source> - <translation>استفاده:</translation> - </message> - <message> - <source>command-line options</source> - <translation>گزینههای خط فرمان</translation> - </message> - <message> - <source>UI Options:</source> - <translation>گزینههای رابط کاربری:</translation> - </message> - <message> - <source>Set language, for example "de_DE" (default: system locale)</source> - <translation>زبان را تنظیم کنید؛ برای مثال «de_DE» (پیشفرض: زبان سیستم)</translation> - </message> - <message> - <source>Start minimized</source> - <translation>شروع برنامه به صورت کوچکشده</translation> - </message> - <message> - <source>Set SSL root certificates for payment request (default: -system-)</source> - <translation>تنظیم گواهی ریشه SSl برای درخواست پرداخت (پیشفرض: -system-)</translation> - </message> - <message> - <source>Show splash screen on startup (default: %u)</source> - <translation>نمایش پنجرهٔ خوشامدگویی در ابتدای اجرای برنامه (پیشفرض: %u)</translation> - </message> - </context> +</context> <context> <name>Intro</name> <message> @@ -760,7 +740,7 @@ </message> <message numerus="yes"> <source>%n GB of free space available</source> - <translation><numerusform>%n گیگابایت فضا موجود است</numerusform></translation> + <translation><numerusform>%n گیگابایت فضا موجود است</numerusform><numerusform>%n گیگابایت فضا موجود است</numerusform></translation> </message> </context> <context> @@ -1145,6 +1125,10 @@ <translation>استخر حافظه</translation> </message> <message> + <source>Current number of transactions</source> + <translation>تعداد تراکنش های فعلی</translation> + </message> + <message> <source>Memory usage</source> <translation>مصرف حافظه</translation> </message> @@ -1296,6 +1280,10 @@ <translation>کپی برچسب</translation> </message> <message> + <source>Copy message</source> + <translation>کپی پیام</translation> + </message> + <message> <source>Copy amount</source> <translation>کپی مقدار</translation> </message> @@ -1322,17 +1310,37 @@ <source>Label</source> <translation>برچسب</translation> </message> + <message> + <source>Message</source> + <translation>پیام</translation> + </message> + <message> + <source>Wallet</source> + <translation>کیف پول</translation> + </message> </context> <context> <name>RecentRequestsTableModel</name> <message> + <source>Date</source> + <translation>تاریخ</translation> + </message> + <message> <source>Label</source> <translation>برچسب</translation> </message> <message> + <source>Message</source> + <translation>پیام</translation> + </message> + <message> <source>(no label)</source> <translation>(بدون برچسب)</translation> </message> + <message> + <source>(no message)</source> + <translation>(بدون پیام)</translation> + </message> </context> <context> <name>SendCoinsDialog</name> @@ -1449,6 +1457,14 @@ <translation>کپی کردن تغییر</translation> </message> <message> + <source>or</source> + <translation>یا</translation> + </message> + <message> + <source>Transaction fee</source> + <translation>هزینهٔ تراکنش</translation> + </message> + <message> <source>(no label)</source> <translation>(بدون برچسب)</translation> </message> @@ -1613,21 +1629,85 @@ </context> <context> <name>TransactionDesc</name> + <message> + <source>Status</source> + <translation>وضعیت</translation> + </message> + <message> + <source>Date</source> + <translation>تاریخ</translation> + </message> + <message> + <source>Source</source> + <translation>منبع</translation> + </message> + <message> + <source>Generated</source> + <translation>تولید شده</translation> + </message> + <message> + <source>From</source> + <translation>از</translation> + </message> + <message> + <source>To</source> + <translation>به</translation> + </message> + <message> + <source>Credit</source> + <translation>اعتبار</translation> + </message> + <message> + <source>Message</source> + <translation>پیام</translation> + </message> + <message> + <source>Transaction</source> + <translation>تراکنش</translation> + </message> + <message> + <source>Inputs</source> + <translation>ورودی ها</translation> + </message> </context> <context> <name>TransactionDescDialog</name> <message> <source>This pane shows a detailed description of the transaction</source> - <translation>این پانل شامل توصیف کاملی از جزئیات تراکنش است</translation> + <translation>این پنل شامل توصیف کاملی از جزئیات تراکنش است</translation> </message> </context> <context> <name>TransactionTableModel</name> <message> + <source>Date</source> + <translation>تاریخ</translation> + </message> + <message> + <source>Type</source> + <translation>نوع</translation> + </message> + <message> <source>Label</source> <translation>برچسب</translation> </message> <message> + <source>Received with</source> + <translation>دریافت شد با</translation> + </message> + <message> + <source>Received from</source> + <translation>دریافت شد از</translation> + </message> + <message> + <source>Sent to</source> + <translation>فرستاده شد به</translation> + </message> + <message> + <source>(n/a)</source> + <translation>(نامعلوم)</translation> + </message> + <message> <source>(no label)</source> <translation>(بدون برچسب)</translation> </message> @@ -1635,6 +1715,38 @@ <context> <name>TransactionView</name> <message> + <source>All</source> + <translation>همه</translation> + </message> + <message> + <source>Today</source> + <translation>امروز</translation> + </message> + <message> + <source>This week</source> + <translation>این هفته</translation> + </message> + <message> + <source>This month</source> + <translation>این ماه</translation> + </message> + <message> + <source>Last month</source> + <translation>ماه قبل</translation> + </message> + <message> + <source>This year</source> + <translation>امسال</translation> + </message> + <message> + <source>Received with</source> + <translation>دریافت شد با</translation> + </message> + <message> + <source>Sent to</source> + <translation>فرستاده شد به</translation> + </message> + <message> <source>Copy address</source> <translation>کپی ادرس</translation> </message> @@ -1651,10 +1763,30 @@ <translation>کپی شناسهٔ تراکنش</translation> </message> <message> + <source>Edit label</source> + <translation>ویرایش برچسب</translation> + </message> + <message> + <source>Show transaction details</source> + <translation>نمایش جزئیات تراکنش</translation> + </message> + <message> + <source>Export Transaction History</source> + <translation>استخراج تاریخچه تراکنش ها</translation> + </message> + <message> <source>Comma separated file (*.csv)</source> <translation>فایل جدا شده با ویرگول(*.csv)</translation> </message> <message> + <source>Date</source> + <translation>تاریخ</translation> + </message> + <message> + <source>Type</source> + <translation>نوع</translation> + </message> + <message> <source>Label</source> <translation>برچسب</translation> </message> @@ -1666,7 +1798,11 @@ <source>Exporting Failed</source> <translation>صدور موفق نبود</translation> </message> - </context> + <message> + <source>to</source> + <translation>به</translation> + </message> +</context> <context> <name>UnitDisplayStatusBarControl</name> </context> @@ -1678,58 +1814,18 @@ </context> <context> <name>WalletView</name> + <message> + <source>Export the data in the current tab to a file</source> + <translation>صدور دادههای برگهٔ فعلی به یک پرونده</translation> + </message> </context> <context> <name>bitcoin-core</name> <message> - <source>Options:</source> - <translation>گزینهها:</translation> - </message> - <message> - <source>Specify data directory</source> - <translation>مشخص کردن دایرکتوری دادهها</translation> - </message> - <message> - <source>Connect to a node to retrieve peer addresses, and disconnect</source> - <translation>اتصال به یک گره برای دریافت آدرسهای همتا و قطع اتصال پس از اتمام عملیات</translation> - </message> - <message> - <source>Specify your own public address</source> - <translation>آدرس عمومی خود را مشخص کنید</translation> - </message> - <message> - <source>Accept command line and JSON-RPC commands</source> - <translation>پذیرش دستورات خط فرمان و دستورات JSON-RPC</translation> - </message> - <message> - <source>Run in the background as a daemon and accept commands</source> - <translation>اجرا در پشت زمینه بهصورت یک سرویس و پذیرش دستورات</translation> - </message> - <message> <source>Bitcoin Core</source> <translation> هسته Bitcoin </translation> </message> <message> - <source>Bind to given address and always listen on it. Use [host]:port notation for IPv6</source> - <translation>مقید به نشانی داده شده باشید و همیشه از آن پیروی کنید. از نشانه گذاری استاندار IPv6 به صورت Host]:Port] استفاده کنید.</translation> - </message> - <message> - <source>Execute command when a wallet transaction changes (%s in cmd is replaced by TxID)</source> - <translation>هنگامی که یک تراکنش در کیف پولی رخ می دهد، دستور را اجرا کن(%s در دستورات بوسیله ی TxID جایگزین می شود)</translation> - </message> - <message> - <source>Accept connections from outside (default: 1 if no -proxy or -connect)</source> - <translation>پذیرش اتصالات از بیرون (پیش فرض:1 بدون پراکسی یا اتصال)</translation> - </message> - <message> - <source>Block creation options:</source> - <translation>بستن گزینه ایجاد</translation> - </message> - <message> - <source>Connection options:</source> - <translation>گزینههای اتصال:</translation> - </message> - <message> <source>Copyright (C) %i-%i</source> <translation>حق تألیف (C) %i-%i</translation> </message> @@ -1774,36 +1870,16 @@ <translation>بارگذاری لیستسیاه...</translation> </message> <message> - <source>Print this help message and exit</source> - <translation>چاپ ایت پیام کمک و خروج</translation> - </message> - <message> - <source>Print version and exit</source> - <translation>چاپ نسخه و خروج</translation> - </message> - <message> <source>Verifying blocks...</source> <translation>در حال بازبینی بلوکها...</translation> </message> <message> - <source>Wallet options:</source> - <translation>گزینههای کیف پول:</translation> - </message> - <message> - <source>(default: %u)</source> - <translation>(پیشفرض %u)</translation> - </message> - <message> <source>Information</source> <translation>اطلاعات</translation> </message> <message> - <source>Send trace/debug info to console instead of debug.log file</source> - <translation>اطلاعات ردگیری/اشکالزدایی را به جای فایل لاگ اشکالزدایی به کنسول بفرستید</translation> - </message> - <message> - <source>Shrink debug.log file on client startup (default: 1 when no -debug)</source> - <translation>فایل debug.log را در startup مشتری کوچک کن (پیش فرض:1 اگر اشکال زدایی روی نداد)</translation> + <source>This is experimental software.</source> + <translation>این یک نرم افزار آزمایشی است.</translation> </message> <message> <source>Transaction amount too small</source> @@ -1814,10 +1890,6 @@ <translation>تراکنش بسیار بزرگ است</translation> </message> <message> - <source>Username for JSON-RPC connections</source> - <translation>JSON-RPC شناسه برای ارتباطات</translation> - </message> - <message> <source>Warning</source> <translation>هشدار</translation> </message> @@ -1826,22 +1898,6 @@ <translation>هشدار: قوانین جدید ناشناختهای فعال شدهاند (نسخهبیت %i)</translation> </message> <message> - <source>Password for JSON-RPC connections</source> - <translation>JSON-RPC عبارت عبور برای ارتباطات</translation> - </message> - <message> - <source>Execute command when the best block changes (%s in cmd is replaced by block hash)</source> - <translation>زمانی که بهترین بلاک تغییر کرد، دستور را اجرا کن (%s در cmd با block hash جایگزین شده است)</translation> - </message> - <message> - <source>Allow DNS lookups for -addnode, -seednode and -connect</source> - <translation>به DNS اجازه بده تا برای addnode ، seednode و اتصال جستجو کند</translation> - </message> - <message> - <source>(default: %s)</source> - <translation>(پیشفرض %s)</translation> - </message> - <message> <source>Unknown network specified in -onlynet: '%s'</source> <translation>شبکه مشخص شده غیرقابل شناسایی در onlynet: '%s'</translation> </message> diff --git a/src/qt/locale/bitcoin_fa_IR.ts b/src/qt/locale/bitcoin_fa_IR.ts index 77b0046a34..7912f43582 100644 --- a/src/qt/locale/bitcoin_fa_IR.ts +++ b/src/qt/locale/bitcoin_fa_IR.ts @@ -30,6 +30,10 @@ <translation>حذف آدرس های انتخاب شده از لیست</translation> </message> <message> + <source>Enter address or label to search</source> + <translation>آدرس یا برچسب را برای جستجو وارد کنید</translation> + </message> + <message> <source>Export the data in the current tab to a file</source> <translation>صدور داده نوار جاری به یک فایل</translation> </message> @@ -132,6 +136,10 @@ <translation>رمز/پَس فرِیز را دوباره وارد کنید</translation> </message> <message> + <source>Show password</source> + <translation>نمایش گذرواژه</translation> + </message> + <message> <source>Enter the new passphrase to the wallet.<br/>Please use a passphrase of <b>ten or more random characters</b>, or <b>eight or more words</b>.</source> <translation>رمز جدید را در کیفپول وارد کنید. <br/>لطفا از رمزی استفاده کنید که<b> حداقل ۱۰ کاراکتر راندوم</b>یا<b>حداقل ۸ کلمه داشته باشد</b>.</translation> </message> @@ -242,6 +250,10 @@ <translation>بازبینی</translation> </message> <message> + <source>Node</source> + <translation>گره</translation> + </message> + <message> <source>Show general overview of wallet</source> <translation>نمای کلی از wallet را نشان بده</translation> </message> @@ -306,6 +318,14 @@ <translation>دریافت آدرس ها</translation> </message> <message> + <source>Wallet:</source> + <translation>کیف پول:</translation> + </message> + <message> + <source>default wallet</source> + <translation>کیف پول پیشفرض</translation> + </message> + <message> <source>Click to disable network activity.</source> <translation>برای غیرفعالکردن فعالیت شبکه کلیک کنید.</translation> </message> @@ -358,6 +378,10 @@ <translation>ارسال</translation> </message> <message> + <source>&Receive</source> + <translation>دریافت</translation> + </message> + <message> <source>&Show / Hide</source> <translation>نمایش/ عدم نمایش</translation> </message> @@ -411,7 +435,7 @@ </message> <message numerus="yes"> <source>%n active connection(s) to Bitcoin network</source> - <translation><numerusform>%n ارتباط فعال به شبکه بیتکوین</numerusform></translation> + <translation><numerusform>%n ارتباط فعال به شبکه بیتکوین</numerusform><numerusform>%n ارتباط فعال به شبکه بیتکوین</numerusform></translation> </message> <message> <source>Indexing blocks on disk...</source> @@ -423,13 +447,29 @@ </message> <message numerus="yes"> <source>Processed %n block(s) of transaction history.</source> - <translation><numerusform>%n بلاک از تاریخچه تراکنش، پردازش شد.</numerusform></translation> + <translation><numerusform>%n بلاک از تاریخچه تراکنش، پردازش شد.</numerusform><numerusform>%n بلاک از تاریخچه تراکنش، پردازش شد.</numerusform></translation> + </message> + <message> + <source>%1 behind</source> + <translation>%1 قبل</translation> + </message> + <message> + <source>Transactions after this will not yet be visible.</source> + <translation>تراکنشهای بعد از این تراکنش هنوز در دسترس نیستند.</translation> </message> <message> <source>Error</source> <translation>خطا</translation> </message> <message> + <source>Warning</source> + <translation>هشدار</translation> + </message> + <message> + <source>Information</source> + <translation>اطلاعات</translation> + </message> + <message> <source>Up to date</source> <translation>به روز</translation> </message> @@ -438,6 +478,18 @@ <translation>در حال روزآمد سازی..</translation> </message> <message> + <source>Amount: %1 +</source> + <translation>مبلغ: %1 +</translation> + </message> + <message> + <source>Address: %1 +</source> + <translation>آدرس: %1 +</translation> + </message> + <message> <source>Sent transaction</source> <translation>تراکنش ارسالی</translation> </message> @@ -481,6 +533,14 @@ <translation>(عدم)انتخاب همه</translation> </message> <message> + <source>Tree mode</source> + <translation>حالت درختی</translation> + </message> + <message> + <source>List mode</source> + <translation>حالت لیستی</translation> + </message> + <message> <source>Amount</source> <translation>میزان</translation> </message> @@ -556,10 +616,6 @@ <translation>آدرس</translation> </message> <message> - <source>New receiving address</source> - <translation>آدرس دریافتی جدید</translation> - </message> - <message> <source>New sending address</source> <translation>آدرس ارسالی جدید</translation> </message> @@ -571,6 +627,10 @@ <source>Edit sending address</source> <translation>ویرایش آدرس ارسالی</translation> </message> + <message> + <source>The entered address "%1" is not a valid Bitcoin address.</source> + <translation>آدرس وارد شده "%1" آدرس معتبر بیت کوین نیست.</translation> + </message> </context> <context> <name>FreespaceChecker</name> @@ -585,10 +645,6 @@ <source>version</source> <translation>نسخه</translation> </message> - <message> - <source>Usage:</source> - <translation>میزان استفاده:</translation> - </message> </context> <context> <name>Intro</name> @@ -597,10 +653,18 @@ <translation>خوش آمدید</translation> </message> <message> + <source>Welcome to %1.</source> + <translation>به %1 خوش آمدید.</translation> + </message> + <message> <source>Bitcoin</source> <translation>بیت کوین</translation> </message> <message> + <source>The wallet will also be stored in this directory.</source> + <translation>کیف پول هم در همین دایرکتوری ذخیره میشود.</translation> + </message> + <message> <source>Error</source> <translation>خطا</translation> </message> @@ -612,10 +676,22 @@ <translation>فرم</translation> </message> <message> + <source>Number of blocks left</source> + <translation>تعداد بلوکهای باقیمانده</translation> + </message> + <message> <source>Unknown...</source> <translation>ناشناس...</translation> </message> <message> + <source>Last block time</source> + <translation>زمان آخرین بلوک</translation> + </message> + <message> + <source>Progress</source> + <translation>پیشرفت</translation> + </message> + <message> <source>calculating...</source> <translation>در حال محاسبه...</translation> </message> @@ -754,6 +830,14 @@ <source>Current number of blocks</source> <translation>تعداد زنجیره های حاضر</translation> </message> + <message> + <source>Last block time</source> + <translation>زمان آخرین بلوک</translation> + </message> + <message> + <source>default wallet</source> + <translation>کیف پول پیشفرض</translation> + </message> </context> <context> <name>ReceiveCoinsDialog</name> @@ -796,6 +880,10 @@ <source>Label</source> <translation>برچسب</translation> </message> + <message> + <source>Wallet</source> + <translation>کیف پول</translation> + </message> </context> <context> <name>RecentRequestsTableModel</name> @@ -1080,56 +1168,16 @@ <context> <name>bitcoin-core</name> <message> - <source>Options:</source> - <translation>انتخابها:</translation> - </message> - <message> - <source>Specify data directory</source> - <translation>دایرکتوری داده را مشخص کن</translation> - </message> - <message> - <source>Accept command line and JSON-RPC commands</source> - <translation>command line و JSON-RPC commands را قبول کنید</translation> - </message> - <message> - <source>Run in the background as a daemon and accept commands</source> - <translation>به عنوان daemon بک گراند را اجرا کنید و دستورات را قبول نمایید</translation> - </message> - <message> <source>The transaction amount is too small to send after the fee has been deducted</source> <translation>مبلغ تراکنش کمتر از آن است که پس از کسر هزینه تراکنش قابل ارسال باشد</translation> </message> <message> - <source>RPC server options:</source> - <translation>گزینه های سرویس دهنده RPC:</translation> - </message> - <message> - <source>Send trace/debug info to console instead of debug.log file</source> - <translation>ارسال اطلاعات پیگیری/خطایابی به کنسول به جای ارسال به فایل debug.log</translation> - </message> - <message> - <source>Username for JSON-RPC connections</source> - <translation>شناسه کاربری برای ارتباطاتِ JSON-RPC</translation> - </message> - <message> - <source>Password for JSON-RPC connections</source> - <translation>رمز برای ارتباطاتِ JSON-RPC</translation> - </message> - <message> - <source>Execute command when the best block changes (%s in cmd is replaced by block hash)</source> - <translation>دستور را وقتی بهترین بلاک تغییر کرد اجرا کن (%s در دستور توسط block hash جایگزین شده است)</translation> - </message> - <message> - <source>Set the number of threads to service RPC calls (default: %d)</source> - <translation>تنظیم تعداد ریسمان ها برای سرویس دهی فراخوانی های RPC (پیش فرض: %d)</translation> - </message> - <message> - <source>Specify configuration file (default: %s)</source> - <translation>فایل تنظیمات را مشخص کنید (پیش فرض: %s)</translation> + <source>Information</source> + <translation>اطلاعات</translation> </message> <message> - <source>Specify pid file (default: %s)</source> - <translation>فایل pid را مشخص کنید (پیش فرض: %s)</translation> + <source>Warning</source> + <translation>هشدار</translation> </message> <message> <source>Insufficient funds</source> diff --git a/src/qt/locale/bitcoin_fi.ts b/src/qt/locale/bitcoin_fi.ts index cf8610c345..ea97d48b10 100644 --- a/src/qt/locale/bitcoin_fi.ts +++ b/src/qt/locale/bitcoin_fi.ts @@ -30,6 +30,10 @@ <translation>Poista valittu osoite listalta</translation> </message> <message> + <source>Enter address or label to search</source> + <translation>Anna etsittävä osoite tai tunniste</translation> + </message> + <message> <source>Export the data in the current tab to a file</source> <translation>Vie auki olevan välilehden tiedot tiedostoon</translation> </message> @@ -722,10 +726,6 @@ <translation>&Osoite</translation> </message> <message> - <source>New receiving address</source> - <translation>Uusi vastaanotto-osoite</translation> - </message> - <message> <source>New sending address</source> <translation>Uusi lähetysosoite</translation> </message> @@ -742,10 +742,6 @@ <translation>Antamasi osoite "%1" ei ole kelvollinen Bitcoin-osoite.</translation> </message> <message> - <source>The entered address "%1" is already in the address book.</source> - <translation>Antamasi osoite "%1" on jo osoitekirjassa</translation> - </message> - <message> <source>Could not unlock wallet.</source> <translation>Lompakkoa ei voitu avata.</translation> </message> @@ -795,42 +791,6 @@ <source>Command-line options</source> <translation>Komentorivi parametrit</translation> </message> - <message> - <source>Usage:</source> - <translation>Käyttö:</translation> - </message> - <message> - <source>command-line options</source> - <translation>komentorivi parametrit</translation> - </message> - <message> - <source>UI Options:</source> - <translation>Käyttöliittymän asetukset:</translation> - </message> - <message> - <source>Choose data directory on startup (default: %u)</source> - <translation>Valitse datahakemisto käynnistyksen yhteydessä (oletus: %u)</translation> - </message> - <message> - <source>Set language, for example "de_DE" (default: system locale)</source> - <translation>Aseta kieli, esimerkiksi "de_DE" (oletus: järjestelmän kieli)</translation> - </message> - <message> - <source>Start minimized</source> - <translation>Käynnistä pienennettynä</translation> - </message> - <message> - <source>Set SSL root certificates for payment request (default: -system-)</source> - <translation>Aseta maksupyynnöille SSL-juurivarmenteet (oletus: -system-)</translation> - </message> - <message> - <source>Show splash screen on startup (default: %u)</source> - <translation>Näytä aloitusruutu käynnistyksen yhteydessä (oletus: %u)</translation> - </message> - <message> - <source>Reset all settings changed in the GUI</source> - <translation>Nollaa kaikki graafisen käyttöliittymän kautta tehdyt muutokset</translation> - </message> </context> <context> <name>Intro</name> @@ -1008,6 +968,14 @@ <translation>Ilmoittaa, mikäli oletetettua SOCKS5-välityspalvelinta käytetään vertaisten tavoittamiseen tämän verkkotyypin kautta.</translation> </message> <message> + <source>Hide the icon from the system tray.</source> + <translation>Piilota kuvake järjestelmäpalkista.</translation> + </message> + <message> + <source>&Hide tray icon</source> + <translation>&Piilota tehtäväpalkin kuvake</translation> + </message> + <message> <source>Minimize instead of exit the application when the window is closed. When this option is enabled, the application will be closed only after selecting Exit in the menu.</source> <translation>Minimoi ikkuna ohjelman sulkemisen sijasta kun ikkuna suljetaan. Kun tämä asetus on käytössä, ohjelma suljetaan vain valittaessa valikosta Poistu.</translation> </message> @@ -1072,6 +1040,14 @@ <translation>Portin uudelleenohjaus &UPnP:llä</translation> </message> <message> + <source>Accept connections from outside.</source> + <translation>Hyväksy yhteysiä ulkopuolelta</translation> + </message> + <message> + <source>Allow incomin&g connections</source> + <translation>Hyväksy sisääntulevia yhteyksiä</translation> + </message> + <message> <source>Connect to the Bitcoin network through a SOCKS5 proxy.</source> <translation>Yhdistä Bitcoin-verkkoon SOCKS5-välityspalvelimen kautta.</translation> </message> @@ -1152,6 +1128,10 @@ <translation>Näytetäänkö kolikkokontrollin ominaisuuksia vai ei</translation> </message> <message> + <source>&Third party transaction URLs</source> + <translation>&Kolmannen osapuolen rahansiirto URL:t</translation> + </message> + <message> <source>&OK</source> <translation>&OK</translation> </message> @@ -1381,6 +1361,10 @@ <translation>Noodi/Palvelu</translation> </message> <message> + <source>NodeId</source> + <translation>NodeId</translation> + </message> + <message> <source>Ping</source> <translation>Vasteaika</translation> </message> @@ -1467,10 +1451,6 @@ <translation>Virhe: Annettua data-hakemistoa "%1" ei ole olemassa.</translation> </message> <message> - <source>Error: Cannot parse configuration file: %1. Only use key=value syntax.</source> - <translation>Virhe: asetustiedostoa %1 ei voida jäsentää. Käytä vain avain=arvo merkintätapaa.</translation> - </message> - <message> <source>Error: %1</source> <translation>Virhe: %1</translation> </message> @@ -1737,6 +1717,10 @@ <translation>Käytä nuolia ylös ja alas selataksesi historiaa, sekä %1 tyhjentääkseksi ruudun.</translation> </message> <message> + <source>For more information on using this console type %1.</source> + <translation>Lisätietoja konsolin käytöstä saat kirjoittamalla %1.</translation> + </message> + <message> <source>WARNING: Scammers have been active, telling users to type commands here, stealing their wallet contents. Do not use this console without fully understanding the ramifications of a command.</source> <translation>VAROITUS: aktiiviset huijarit neuvovat kirjoittamaan komentoja tähän komentoriviin, varastaen lompakkosi sisällön. Älä käytä komentoriviä ilman täyttä ymmärrystä kirjoittamasi komennon toiminnasta.</translation> </message> @@ -1824,10 +1808,6 @@ <translation>&Vastaanota maksu</translation> </message> <message> - <source>Generate Bech32 address</source> - <translation>Luo Bech32-osoite</translation> - </message> - <message> <source>Show the selected request (does the same as double clicking an entry)</source> <translation>Näytä valittu pyyntö (sama toiminta kuin alkion tuplaklikkaus)</translation> </message> @@ -1907,6 +1887,10 @@ <translation>Viesti</translation> </message> <message> + <source>Wallet</source> + <translation>Lompakko</translation> + </message> + <message> <source>Resulting URI too long, try to reduce the text for label / message.</source> <translation>Tuloksen URI on liian pitkä, yritä lyhentää otsikon tai viestin tekstiä.</translation> </message> @@ -2025,10 +2009,6 @@ <translation>per kilotavu</translation> </message> <message> - <source>If the custom fee is set to 1000 satoshis and the transaction is only 250 bytes, then "per kilobyte" only pays 250 satoshis in fee, while "total at least" pays 1000 satoshis. For transactions bigger than a kilobyte both pay by kilobyte.</source> - <translation>Jos määritelty palkkio on asetettu 1000 satoshiin ja siirto on vain 250 tavua, niin "kilotavua kohti" maksaa vain 250 satoshin palkkion, kun "vähintään" maksaa 1000 satoshia. Kilotavua suuremmilla siirroilla molemmat maksavat jokaista kilotavua kohti.</translation> - </message> - <message> <source>Hide</source> <translation>Piilota</translation> </message> @@ -2069,6 +2049,10 @@ <translation>Vahvistusajan tavoite:</translation> </message> <message> + <source>Enable Replace-By-Fee</source> + <translation>Käytä Replace-By-Fee:tä</translation> + </message> + <message> <source>Clear &All</source> <translation>&Tyhjennnä Kaikki</translation> </message> @@ -2125,18 +2109,14 @@ <translation>Oletko varma, että haluat lähettää?</translation> </message> <message> - <source>added as transaction fee</source> - <translation>lisätty rahansiirtomaksuna</translation> - </message> - <message> - <source>Total Amount %1</source> - <translation>Kokonaismäärä %1</translation> - </message> - <message> <source>or</source> <translation>tai</translation> </message> <message> + <source>Transaction fee</source> + <translation>Siirtokulu</translation> + </message> + <message> <source>Confirm send coins</source> <translation>Vahvista kolikoiden lähetys</translation> </message> @@ -2252,6 +2232,10 @@ <translation>V&ähennä maksukulu määrästä</translation> </message> <message> + <source>Use available balance</source> + <translation>Käytä saatavilla oleva saldo</translation> + </message> + <message> <source>Message:</source> <translation>Viesti:</translation> </message> @@ -2466,10 +2450,6 @@ <translation>ristiriidassa maksutapahtumalle, jolla on %1 varmistusta</translation> </message> <message> - <source>%1/offline</source> - <translation>%1/ei linjalla</translation> - </message> - <message> <source>0/unconfirmed, %1</source> <translation>0/varmistamaton, %1</translation> </message> @@ -2498,10 +2478,6 @@ <translation>Tila</translation> </message> <message> - <source>, has not been successfully broadcast yet</source> - <translation>, ei ole vielä onnistuneesti kuulutettu</translation> - </message> - <message> <source>Date</source> <translation>Aika</translation> </message> @@ -2644,10 +2620,6 @@ <translation>Avoinna %1 asti</translation> </message> <message> - <source>Offline</source> - <translation>Ei yhteydessä</translation> - </message> - <message> <source>Unconfirmed</source> <translation>Varmistamaton</translation> </message> @@ -2672,10 +2644,6 @@ <translation>Epäkypsä (%1 varmistusta, saatavilla %2 jälkeen)</translation> </message> <message> - <source>This block was not received by any other nodes and will probably not be accepted!</source> - <translation>Tätä lohkoa ei vastaanotettu mistään muusta solmusta ja sitä ei mahdollisesti hyväksytä!</translation> - </message> - <message> <source>Generated but not accepted</source> <translation>Luotu, mutta ei hyäksytty</translation> </message> @@ -2787,6 +2755,10 @@ <translation>Muu</translation> </message> <message> + <source>Enter address, transaction id, or label to search</source> + <translation>Kirjoita osoite, siirron tunniste tai nimiö etsiäksesi</translation> + </message> + <message> <source>Min amount</source> <translation>Minimimäärä</translation> </message> @@ -2924,10 +2896,18 @@ <translation>Nykyinen palkkio:</translation> </message> <message> + <source>Increase:</source> + <translation>Korota:</translation> + </message> + <message> <source>New fee:</source> <translation>Uusi palkkio:</translation> </message> <message> + <source>Confirm fee bump</source> + <translation>Vahvista palkkion korotus</translation> + </message> + <message> <source>Can't sign transaction.</source> <translation>Siirtoa ei voida allekirjoittaa.</translation> </message> @@ -2970,38 +2950,14 @@ <source>The wallet data was successfully saved to %1.</source> <translation>Lompakko tallennettiin onnistuneesti tiedostoon %1.</translation> </message> -</context> + </context> <context> <name>bitcoin-core</name> <message> - <source>Options:</source> - <translation>Asetukset:</translation> - </message> - <message> - <source>Specify data directory</source> - <translation>Määritä data-hakemisto</translation> - </message> - <message> - <source>Connect to a node to retrieve peer addresses, and disconnect</source> - <translation>Yhdistä noodiin hakeaksesi naapurien osoitteet ja katkaise yhteys</translation> - </message> - <message> - <source>Specify your own public address</source> - <translation>Määritä julkinen osoitteesi</translation> - </message> - <message> - <source>Accept command line and JSON-RPC commands</source> - <translation>Hyväksy merkkipohjaiset- ja JSON-RPC-käskyt</translation> - </message> - <message> <source>Distributed under the MIT software license, see the accompanying file %s or %s</source> <translation>Jaettu MIT -ohjelmistolisenssin alaisuudessa, katso mukana tuleva %s tiedosto tai %s</translation> </message> <message> - <source>If <category> is not supplied or if <category> = 1, output all debugging information.</source> - <translation>Jos <category> on toimittamatta tai jos <category> = 1, tulosta kaikki debug-tieto.</translation> - </message> - <message> <source>Prune configured below the minimum of %d MiB. Please use a higher number.</source> <translation>Karsinta konfiguroitu alle minimin %d MiB. Käytä surempaa numeroa.</translation> </message> @@ -3018,18 +2974,10 @@ <translation>Virhe: Kriittinen sisäinen virhe kohdattiin, katso debug.log lisätietoja varten</translation> </message> <message> - <source>Fee (in %s/kB) to add to transactions you send (default: %s)</source> - <translation>Kulu (muodossa %s/kB) joka lisätään rahansiirtoihin joita lähetät (oletus: %s)</translation> - </message> - <message> <source>Pruning blockstore...</source> <translation>Karsitaan lohkovarastoa...</translation> </message> <message> - <source>Run in the background as a daemon and accept commands</source> - <translation>Aja taustalla daemonina ja hyväksy komennot</translation> - </message> - <message> <source>Unable to start HTTP server. See debug log for details.</source> <translation>HTTP-palvelinta ei voitu käynnistää. Katso debug-lokista lisätietoja.</translation> </message> @@ -3042,42 +2990,14 @@ <translation>%s kehittäjät</translation> </message> <message> - <source>A fee rate (in %s/kB) that will be used when fee estimation has insufficient data (default: %s)</source> - <translation>Kulusuhde (%s/kt) jota käytetään, kun kulun arviointiin tarvittava tietomäärä ei riitä (oletus: %s)</translation> - </message> - <message> - <source>Accept relayed transactions received from whitelisted peers even when not relaying transactions (default: %d)</source> - <translation>Hyväksy valkolistatuilta vertaisilta vastaanotetut, välitetyt siirrot silloinkin, kun siirtojen välitys ei ole käytössä (oletus: %d)</translation> - </message> - <message> - <source>Bind to given address and always listen on it. Use [host]:port notation for IPv6</source> - <translation>Kytkeydy annettuun osoitteeseen ja pidä linja aina auki. Käytä [host]:portin merkintätapaa IPv6:lle.</translation> - </message> - <message> <source>Cannot obtain a lock on data directory %s. %s is probably already running.</source> <translation>Ei voida lukita data-hakemistoa %s. %s on luultavasti jo käynnissä.</translation> </message> <message> - <source>Delete all wallet transactions and only recover those parts of the blockchain through -rescan on startup</source> - <translation>Poista kaikki lompakon rahasiirrot ja palauta vain määrätyt osat lohkoketjusta -rescan -valitsimella käynnistyksen yhteydessä.</translation> - </message> - <message> <source>Error reading %s! All keys read correctly, but transaction data or address book entries might be missing or incorrect.</source> <translation>Virhe luettaessa %s! Avaimet luetttiin oikein, mutta rahansiirtotiedot tai osoitekirjan sisältö saattavat olla puutteellisia tai vääriä.</translation> </message> <message> - <source>Execute command when a wallet transaction changes (%s in cmd is replaced by TxID)</source> - <translation>Suorita käsky kun lompakossa rahansiirto muuttuu (%s cmd on vaihdettu TxID kanssa)</translation> - </message> - <message> - <source>Extra transactions to keep in memory for compact block reconstructions (default: %u)</source> - <translation>Muistissa pidettävien rahansiirtojen määrä tiiviiden lohkojen muodostusta varten (oletus: %u)</translation> - </message> - <message> - <source>If this block is in the chain assume that it and its ancestors are valid and potentially skip their script verification (0 to verify all, default: %s, testnet: %s)</source> - <translation>Jos tämä lohko on ketjussa, oleta lohkon sekä sen edeltäjien olevan kelvollisia ja mahdollisesti ohita niiden skriptin vahvistus (0 vahvistaa kaiken, oletus: %s, testnet: %s)</translation> - </message> - <message> <source>Please check that your computer's date and time are correct! If your clock is wrong, %s will not work properly.</source> <translation>Tarkistathan että tietokoneesi päivämäärä ja kellonaika ovat oikeassa! Jos kellosi on väärässä, %s ei toimi oikein.</translation> </message> @@ -3086,18 +3006,6 @@ <translation>Ole hyvä ja avusta, jos %s on mielestäsi hyödyllinen. Vieraile %s saadaksesi lisää tietoa ohjelmistosta.</translation> </message> <message> - <source>Query for peer addresses via DNS lookup, if low on addresses (default: 1 unless -connect used)</source> - <translation>Pyydä vertaisten osoitteita DNS-kyselyjen avulla, mikäli osoitteita on vähän (oletus: 1, ellei -connect valitsinta käytetä)</translation> - </message> - <message> - <source>Set lowest fee rate (in %s/kB) for transactions to be included in block creation. (default: %s)</source> - <translation>Aseta lohkon luonnissa lisättävien siirtojen vähimmäispalkkion suhde (%s/kt) (oletus: %s)</translation> - </message> - <message> - <source>Set the number of script verification threads (%u to %d, 0 = auto, <0 = leave that many cores free, default: %d)</source> - <translation>Aseta script varmistuksen threadien lukumäärä (%u - %d, 0= auto, <0 = jätä näin monta ydintä vapaaksi, oletus: %d)</translation> - </message> - <message> <source>The block database contains a block which appears to be from the future. This may be due to your computer's date and time being set incorrectly. Only rebuild the block database if you are sure that your computer's date and time are correct</source> <translation>Lohkotietokanta sisältää lohkon, joka vaikuttaa olevan tulevaisuudesta. Tämä saattaa johtua tietokoneesi virheellisesti asetetuista aika-asetuksista. Rakenna lohkotietokanta uudelleen vain jos olet varma, että tietokoneesi päivämäärä ja aika ovat oikein.</translation> </message> @@ -3114,10 +3022,6 @@ <translation>Tietokantaa ei onnistuttu palauttamaan tilaan ennen haarautumista. Lohkoketju pitää ladata uudestaan.</translation> </message> <message> - <source>Use UPnP to map the listening port (default: 1 when listening and no -proxy)</source> - <translation>Käytä UPnP:ta kuuntelevan portin kartoitukseen (oletus: 1 kun kuunnellaan ja -proxy ei käytössä)</translation> - </message> - <message> <source>Warning: The network does not appear to fully agree! Some miners appear to be experiencing issues.</source> <translation>Varoitus: Tietoverkko ei ole sovussa! Luohijat näyttävät kokevan virhetilanteita.</translation> </message> @@ -3126,10 +3030,6 @@ <translation>Varoitus: Olemme ristiriidassa vertaisten kanssa! Sinun tulee päivittää tai toisten solmujen tulee päivitää.</translation> </message> <message> - <source>Whether to save the mempool on shutdown and load on restart (default: %u)</source> - <translation>Tallennetaanko muistivaranto sulkemisen yhteydessä ja ladataanko se käynnistyksessä (oletus: %u)</translation> - </message> - <message> <source>%d of last 100 blocks have unexpected version</source> <translation>%d viimeisestä 100 lohkosta sisälsi odottamattoman versiotiedon</translation> </message> @@ -3142,30 +3042,10 @@ <translation>-maxmempool on oltava vähintään %d MB</translation> </message> <message> - <source><category> can be:</source> - <translation><category> voi olla:</translation> - </message> - <message> - <source>Accept connections from outside (default: 1 if no -proxy or -connect)</source> - <translation>Hyväksy yhteyksiä ulkopuolelta (vakioasetus: 1 jos -proxy tai -connect ei määritelty)</translation> - </message> - <message> - <source>Attempt to recover private keys from a corrupt wallet on startup</source> - <translation>Yritä palauttaa yksityiset avaimet korruptoituneesta lompakosta käynnistyksen yhteydessä</translation> - </message> - <message> - <source>Block creation options:</source> - <translation>Lohkon luonnin asetukset:</translation> - </message> - <message> <source>Cannot resolve -%s address: '%s'</source> <translation>-%s -osoitteen '%s' selvittäminen epäonnistui</translation> </message> <message> - <source>Connection options:</source> - <translation>Yhteyden valinnat:</translation> - </message> - <message> <source>Copyright (C) %i-%i</source> <translation>Tekijänoikeus (C) %i-%i</translation> </message> @@ -3174,24 +3054,12 @@ <translation>Vioittunut lohkotietokanta havaittu</translation> </message> <message> - <source>Debugging/Testing options:</source> - <translation>Debuggaus/Testauksen valinnat:</translation> - </message> - <message> - <source>Do not load the wallet and disable wallet RPC calls</source> - <translation>Älä lataa lompakkoa ja poista lompakon RPC kutsut</translation> - </message> - <message> <source>Do you want to rebuild the block database now?</source> <translation>Haluatko uudelleenrakentaa lohkotietokannan nyt?</translation> </message> <message> - <source>Enable publish raw transaction in <address></source> - <translation>Ota rahansiirtojen raakavedosten julkaisu käyttöön osoitteessa <address></translation> - </message> - <message> - <source>Enable transaction replacement in the memory pool (default: %u)</source> - <translation>Ota rahansiirron korvaaminen käyttöön muistivarannossa (oletus: %u)</translation> + <source>Error creating %s: You can't create non-HD wallets with this version.</source> + <translation>Virhe luodessa %s: Et voi luoda ei-HD lompakkoja tällä versiolla.</translation> </message> <message> <source>Error initializing block database</source> @@ -3254,10 +3122,6 @@ <translation>Virheellinen määrä -fallbackfee=<amount>: '%s'</translation> </message> <message> - <source>Keep the transaction memory pool below <n> megabytes (default: %u)</source> - <translation>Pidä siirtojen muistivaranto alle <n> megatavun (oletus: %u)</translation> - </message> - <message> <source>Loading P2P addresses...</source> <translation>Ladataan P2P-vertaisten osoitteita...</translation> </message> @@ -3266,26 +3130,10 @@ <translation>Ladataan kieltolistaa...</translation> </message> <message> - <source>Location of the auth cookie (default: data dir)</source> - <translation>Todennusevästeen sijainti (oletus: datahakemisto)</translation> - </message> - <message> <source>Not enough file descriptors available.</source> <translation>Ei tarpeeksi tiedostomerkintöjä vapaana.</translation> </message> <message> - <source>Only connect to nodes in network <net> (ipv4, ipv6 or onion)</source> - <translation>Yhdistä vain solmukohtiin <net>-verkossa (ipv4, ipv6 tai onion)</translation> - </message> - <message> - <source>Print this help message and exit</source> - <translation>Näytä tämä ohjeviesti ja poistu</translation> - </message> - <message> - <source>Print version and exit</source> - <translation>Näytä versio ja poistu.</translation> - </message> - <message> <source>Prune cannot be configured with a negative value.</source> <translation>Karsintaa ei voi toteuttaa negatiivisella arvolla.</translation> </message> @@ -3294,26 +3142,10 @@ <translation>Karsittu tila ei ole yhteensopiva -txindex:n kanssa.</translation> </message> <message> - <source>Rebuild chain state and block index from the blk*.dat files on disk</source> - <translation>Muodosta ketjun tila ja lohkoindeksi levyllä olevista blk*.dat -tiedostoista</translation> - </message> - <message> - <source>Rebuild chain state from the currently indexed blocks</source> - <translation>Muodosta ketjun tila tällä hetkellä indeksoiduista lohkoista</translation> - </message> - <message> <source>Rewinding blocks...</source> <translation>Varmistetaan lohkoja...</translation> </message> <message> - <source>Set database cache size in megabytes (%d to %d, default: %d)</source> - <translation>Aseta tietokannan välimuistin koko megatavuissa (%d - %d, oletus: %d</translation> - </message> - <message> - <source>Specify wallet file (within data directory)</source> - <translation>Aseta lompakkotiedosto (data-hakemiston sisällä)</translation> - </message> - <message> <source>The source code is available from %s.</source> <translation>Lähdekoodi löytyy %s.</translation> </message> @@ -3346,98 +3178,26 @@ <translation>Päivitetään UTXO-tietokantaa</translation> </message> <message> - <source>Use UPnP to map the listening port (default: %u)</source> - <translation>Käytä UPnP:ta kuuntelevan portin kartoittamiseen (oletus: %u)</translation> - </message> - <message> - <source>Use the test chain</source> - <translation>Käytä testiketjua</translation> - </message> - <message> <source>Verifying blocks...</source> <translation>Varmistetaan lohkoja...</translation> </message> <message> - <source>Wallet debugging/testing options:</source> - <translation>Lompakon debug- ja testausvalinnat:</translation> - </message> - <message> <source>Wallet needed to be rewritten: restart %s to complete</source> <translation>Lompakko tarvitsee uudelleenkirjoittaa: käynnistä %s uudelleen</translation> </message> <message> - <source>Wallet options:</source> - <translation>Lompakon valinnat:</translation> - </message> - <message> - <source>Allow JSON-RPC connections from specified source. Valid for <ip> are a single IP (e.g. 1.2.3.4), a network/netmask (e.g. 1.2.3.4/255.255.255.0) or a network/CIDR (e.g. 1.2.3.4/24). This option can be specified multiple times</source> - <translation>Salli JSON-RPC-yhteydet määritetystä lähteestä. Kelvolliset arvot <ip> ovat yksittäinen IP (esim. 1.2.3.4), verkko/verkkomaski (esim. 1.2.3.4/255.255.255.0) tai verkko/luokaton reititys (esim. 1.2.3.4/24). Tätä valintatapaa voidaan käyttää useita kertoja</translation> - </message> - <message> - <source>Bind to given address and whitelist peers connecting to it. Use [host]:port notation for IPv6</source> - <translation>Kytkeydy osoitteeseen ja valkolistaa siihen yhdistävät vertaiset. Käytä [isäntä]:portti -merkintätapaa IPv6:lle</translation> - </message> - <message> - <source>Create new files with system default permissions, instead of umask 077 (only effective with disabled wallet functionality)</source> - <translation>Luo uudet tiedostot järjestelmän oletusoikeuksilla, älä umask 077:llä (toimii vain, jos lompakkotoiminto on poissa käytöstä)</translation> - </message> - <message> - <source>Discover own IP addresses (default: 1 when listening and no -externalip or -proxy)</source> - <translation>Paljasta omat IP-osoitteet (oletus: 1 kun kuunnellaan ja -externalip tai -proxy ei ole käytössä)</translation> - </message> - <message> <source>Error: Listening for incoming connections failed (listen returned error %s)</source> <translation>Virhe: Saapuvien yhteyksien kuuntelu epäonnistui (kuuntelu palautti virheen %s)</translation> </message> <message> - <source>Execute command when a relevant alert is received or we see a really long fork (%s in cmd is replaced by message)</source> - <translation>Aja komento kun olennainen hälytys vastaanotetaan tai nähdään todella pitkä haara (%s komennossa korvataan viestillä)</translation> - </message> - <message> - <source>Fees (in %s/kB) smaller than this are considered zero fee for relaying, mining and transaction creation (default: %s)</source> - <translation>Tätä pienempiä palkkioita (%s/kt) kohdellaan väittäessä, louhittaessa ja siirtoja luodessa nollana (oletus: %s)</translation> - </message> - <message> - <source>If paytxfee is not set, include enough fee so transactions begin confirmation on average within n blocks (default: %u)</source> - <translation>Mikäli paytxfee -valitsinta ei ole asetettu, sisällytä riittävä maksu, jotta siirron vahvistus alkaa keskimäärin n lohkon sisällä (oletus: %u)</translation> - </message> - <message> - <source>Maximum size of data in data carrier transactions we relay and mine (default: %u)</source> - <translation>Suurin tietoa kantavien rahasiirtojen tietomäärä, joita välitetään ja louhitaan (oletus: %u)</translation> - </message> - <message> - <source>Randomize credentials for every proxy connection. This enables Tor stream isolation (default: %u)</source> - <translation>Satunnaista tunnisteet jokaiselle välityspalvelinyhteydelle. Tämä mahdollistaa Tor -virran eristämisen (oletus: %u)</translation> - </message> - <message> <source>The transaction amount is too small to send after the fee has been deducted</source> <translation>Siirtomäärä on liian pieni lähetettäväksi kulun vähentämisen jälkeen.</translation> </message> <message> - <source>Whitelisted peers cannot be DoS banned and their transactions are always relayed, even if they are already in the mempool, useful e.g. for a gateway</source> - <translation>Valkolistattuja vertaisia eivät voi DoS -estää, joten niiden siirrot välitetään aina, myös silloin, kun ne ovat jo muistivarannossa. Hyödyllinen esim. yhdyskäytävälle</translation> - </message> - <message> <source>You need to rebuild the database using -reindex to go back to unpruned mode. This will redownload the entire blockchain</source> <translation>Palataksesi karsimattomaan tilaan joudut uudelleenrakentamaan tietokannan -reindex -valinnalla. Tämä lataa koko lohkoketjun uudestaan.</translation> </message> <message> - <source>(default: %u)</source> - <translation>(oletus: %u)</translation> - </message> - <message> - <source>Accept public REST requests (default: %u)</source> - <translation>Hyväksy julkisia REST-pyyntöjä (oletus: %u)</translation> - </message> - <message> - <source>Automatically create Tor hidden service (default: %d)</source> - <translation>Luo Tor-salattu palvelu automaattisesti (oletus: %d)</translation> - </message> - <message> - <source>Connect through SOCKS5 proxy</source> - <translation>Yhdistä SOCKS5 proxin kautta</translation> - </message> - <message> <source>Error loading %s: You can't disable HD on an already existing HD wallet</source> <translation>Virhe ladattaessa %s: Et voi poistaa HD-ominaisuutta jo olemassa olevasta HD-lompakosta.</translation> </message> @@ -3446,10 +3206,6 @@ <translation>Virheitä tietokantaa luettaessa, ohjelma pysäytetään.</translation> </message> <message> - <source>Imports blocks from external blk000??.dat file on startup</source> - <translation>Tuo lohkot ulkoisesta blk000??.dat -tiedostosta käynnistettäessä</translation> - </message> - <message> <source>Information</source> <translation>Tietoa</translation> </message> @@ -3470,42 +3226,14 @@ <translation>Kelvoton verkkopeite määritelty argumentissa -whitelist: '%s'</translation> </message> <message> - <source>Keep at most <n> unconnectable transactions in memory (default: %u)</source> - <translation>Pidä enimmillään <n> yhdistämiskelvotonta rahansiirtoa muistissa (oletus: %u)</translation> - </message> - <message> <source>Need to specify a port with -whitebind: '%s'</source> <translation>Pitää määritellä portti argumentilla -whitebind: '%s'</translation> </message> <message> - <source>Node relay options:</source> - <translation>Välityssolmukohdan asetukset:</translation> - </message> - <message> - <source>RPC server options:</source> - <translation>RPC-palvelimen valinnat:</translation> - </message> - <message> <source>Reducing -maxconnections from %d to %d, because of system limitations.</source> <translation>Vähennetään -maxconnections arvoa %d:stä %d:hen järjestelmän rajoitusten vuoksi.</translation> </message> <message> - <source>Rescan the block chain for missing wallet transactions on startup</source> - <translation>Uudelleenskannaa lohkoketju käynnistyksen yhteydessä puuttuvien lompakon rahansiirtojen vuoksi</translation> - </message> - <message> - <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> - <message> - <source>Show all debugging options (usage: --help -help-debug)</source> - <translation>Näytä kaikki debuggaus valinnat: (käyttö: --help -help-debug)</translation> - </message> - <message> - <source>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> - <message> <source>Signing transaction failed</source> <translation>Siirron vahvistus epäonnistui</translation> </message> @@ -3518,14 +3246,6 @@ <translation>Tämä on ohjelmistoa kokeelliseen käyttöön.</translation> </message> <message> - <source>Tor control port password (default: empty)</source> - <translation>Tor-hallintaportin salasana (oletus: tyhjä)</translation> - </message> - <message> - <source>Tor control port to use if onion listening enabled (default: %s)</source> - <translation>Tor-hallintaportti jota käytetään jos onion-kuuntelu on käytössä (oletus: %s)</translation> - </message> - <message> <source>Transaction amount too small</source> <translation>Siirtosumma liian pieni</translation> </message> @@ -3542,14 +3262,6 @@ <translation>Kytkeytyminen kohteeseen %s ei onnistunut tällä tietokonella (kytkeytyminen palautti virheen %s)</translation> </message> <message> - <source>Upgrade wallet to latest format on startup</source> - <translation>Päivitä lompakko viimeisimpään formaattiin käynnistyksen yhteydessä</translation> - </message> - <message> - <source>Username for JSON-RPC connections</source> - <translation>Käyttäjätunnus JSON-RPC-yhteyksille</translation> - </message> - <message> <source>Verifying wallet(s)...</source> <translation>Varmistetaan lompakko(ja)...</translation> </message> @@ -3562,70 +3274,18 @@ <translation>Varoitus: tuntemattomia uusia sääntöjä aktivoitu (versiobitti %i)</translation> </message> <message> - <source>Whether to operate in a blocks only mode (default: %u)</source> - <translation>Toimitaanko tilassa jossa ainoastaan lohkot sallitaan (oletus: %u)</translation> - </message> - <message> - <source>You need to rebuild the database using -reindex to change -txindex</source> - <translation>Sinun tulee uudelleenrakentaa tietokanta -reindex -valitsimella vaihtaaksesi -txindex -arvoa</translation> - </message> - <message> <source>Zapping all transactions from wallet...</source> <translation>Tyhjennetään kaikki rahansiirrot lompakosta....</translation> </message> <message> - <source>ZeroMQ notification options:</source> - <translation>ZeroMQ-ilmoitusasetukset:</translation> - </message> - <message> - <source>Password for JSON-RPC connections</source> - <translation>Salasana JSON-RPC-yhteyksille</translation> - </message> - <message> - <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> - <source>Allow DNS lookups for -addnode, -seednode and -connect</source> - <translation>Salli DNS kyselyt -addnode, -seednode ja -connect yhteydessä</translation> - </message> - <message> <source>-maxtxfee is set very high! Fees this large could be paid on a single transaction.</source> <translation>-maxtxfee on asetettu erittäin suureksi! Tämänkokoisia kuluja saatetaan maksaa yhdessä rahansiirrossa.</translation> </message> <message> - <source>Do not keep transactions in the mempool longer than <n> hours (default: %u)</source> - <translation>Älä pidä rahansiirtoja muistivarannoissa kauemmin kuin <n> tuntia (oletus: %u)</translation> - </message> - <message> <source>Error loading %s: You can't enable HD on an already existing non-HD wallet</source> <translation>Virhe ladattaessa %s: Et voi ottaa HD:ta käyttöön jo olemassa olevalle ei-HD -lompakolle.</translation> </message> <message> - <source>Error loading wallet %s. -wallet parameter must only specify a filename (not a path).</source> - <translation>Virhe ladattaessa lompakkoa %s. -wallet -valitsimen pitää osoittaa tiedostonimeen (ei polkuun).</translation> - </message> - <message> - <source>Force relay of transactions from whitelisted peers even if they violate local relay policy (default: %d)</source> - <translation>Pakota rahansiirtojen välitys valkolistatuilta vertaisilta, vaikka ne rikkoisivatkin paikallisia välitysmääräyksiä (oletus: %d)</translation> - </message> - <message> - <source>How thorough the block verification of -checkblocks is (0-4, default: %u)</source> - <translation>Kuinka läpikäyvä lohkojen -checkblocks -todennus on (0-4, oletus: %u)</translation> - </message> - <message> - <source>Number of seconds to keep misbehaving peers from reconnecting (default: %u)</source> - <translation>Kuinka monta sekuntia huonosti käyttäytyviä vertaisia estetään yhdistämästä (oletus: %u)</translation> - </message> - <message> - <source>Output debugging information (default: %u, supplying <category> is optional)</source> - <translation>Tulosta debuggaustieto (oletus: %u, annettu <category> valinnainen)</translation> - </message> - <message> - <source>Tries to keep outbound traffic under the given target (in MiB per 24h), 0 = no limit (default: %d)</source> - <translation>Pyrkii pitämään lähtevän liikenteen alle annetun tavoitetteen (megatavuina 24 tunnissa). 0 = ei rajaa (oletus: %d)</translation> - </message> - <message> <source>Unsupported argument -socks found. Setting SOCKS version isn't possible anymore, only SOCKS5 proxies are supported.</source> <translation>Ei tuettu argumentti -socks löytynyt. SOCKS -version asetusta ei enää tueta, ainoastaan SOCKS5 -välityspalvelimet on tuettu.</translation> </message> @@ -3634,10 +3294,6 @@ <translation>Argumenttia -whitelistalwaysrelay ei tueta ja se ohitettiin. Käytä -whitelistrelay ja/tai -whitelistforcerelay.</translation> </message> <message> - <source>Use separate SOCKS5 proxy to reach peers via Tor hidden services (default: %s)</source> - <translation>Käytä erillistä SOCKS5-proxyä tavoittaaksesi vertaisia Tor-piilopalveluiden kautta (oletus: %s)</translation> - </message> - <message> <source>Warning: Unknown block versions being mined! It's possible unknown rules are in effect</source> <translation>Varoitus: Tuntemattomia lohkoversioita louhitaan! Tuntemattomia sääntöjä saattaa olla voimassa</translation> </message> @@ -3646,102 +3302,14 @@ <translation>%s on asetettu todella korkeaksi!</translation> </message> <message> - <source>(default: %s)</source> - <translation>(oletus: %s)</translation> - </message> - <message> - <source>Always query for peer addresses via DNS lookup (default: %u)</source> - <translation>Pyydä vertaisten osoitteita aina DNS-kyselyjen avulla (oletus: %u)</translation> - </message> - <message> - <source>Error loading wallet %s. -wallet filename must be a regular file.</source> - <translation>Virhe ladattaessa lompakkoa %s. -wallet tiedostonimen pitää osoittaa tavalliseen tiedostoon.</translation> - </message> - <message> <source>Error loading wallet %s. Duplicate -wallet filename specified.</source> <translation>Virhe ladattaessa lompakkoa %s. -wallet -tiedostonimi esiintyy useaan kertaan.</translation> </message> <message> - <source>Error loading wallet %s. Invalid characters in -wallet filename.</source> - <translation>Virhe ladattaessa lompakkoa %s. -wallet tiedostonimi sisältää virheellisiä merkkejä.</translation> - </message> - <message> - <source>How many blocks to check at startup (default: %u, 0 = all)</source> - <translation>Kuinka monta lohkoa tarkistetaan käynnistyksessä (oletus: %u, 0 = kaikki)</translation> - </message> - <message> - <source>Include IP addresses in debug output (default: %u)</source> - <translation>Sisällytä IP-osoitteet virheenkorjauslokissa (oletus: %u)</translation> - </message> - <message> <source>Keypool ran out, please call keypoolrefill first</source> <translation>Avainallas tyhjentyi, ole hyvä ja kutsu keypoolrefill ensin</translation> </message> <message> - <source>Listen for JSON-RPC connections on <port> (default: %u or testnet: %u)</source> - <translation>Kuuntele JSON-RPC-yhteyksiä portissa <port> (oletus: %u tai testnet: %u)</translation> - </message> - <message> - <source>Listen for connections on <port> (default: %u or testnet: %u)</source> - <translation>Kuuntele yhteyksiä portissa <port> (oletus: %u tai testnet: %u)</translation> - </message> - <message> - <source>Maintain at most <n> connections to peers (default: %u)</source> - <translation>Ylläpidä enimmillään <n> yhteyttä vertaisiin (oletus: %u)</translation> - </message> - <message> - <source>Make the wallet broadcast transactions</source> - <translation>Aseta lompakko kuuluttamaan rahansiirtoja</translation> - </message> - <message> - <source>Maximum per-connection receive buffer, <n>*1000 bytes (default: %u)</source> - <translation>Maksimi yhteyttä kohden käytettävä vastaanottopuskurin koko, <n>*1000 tavua (oletus: %u)</translation> - </message> - <message> - <source>Maximum per-connection send buffer, <n>*1000 bytes (default: %u)</source> - <translation>Maksimi yhteyttä kohden käytettävä lähetyspuskurin koko, <n>*1000 tavua (oletus: %u)</translation> - </message> - <message> - <source>Prepend debug output with timestamp (default: %u)</source> - <translation>Lisää debug-tietojen alkuun aikaleimat (oletus: %u)</translation> - </message> - <message> - <source>Relay and mine data carrier transactions (default: %u)</source> - <translation>Välitä ja louhi dataa kantavia rahansiirtoja (oletus: %u)</translation> - </message> - <message> - <source>Relay non-P2SH multisig (default: %u)</source> - <translation>Välitä ei-P2SH-multisig (oletus: %u)</translation> - </message> - <message> - <source>Set key pool size to <n> (default: %u)</source> - <translation>Aseta avainaltaan kooksi <n> (oletus: %u)</translation> - </message> - <message> - <source>Set maximum BIP141 block weight (default: %d)</source> - <translation>Aseta suurin BIP141-lohkopaino (oletus: %d)</translation> - </message> - <message> - <source>Set the number of threads to service RPC calls (default: %d)</source> - <translation>Aseta RPC-kutsujen palvelemiseen tarkoitettujen säikeiden lukumäärä (oletus: %d)</translation> - </message> - <message> - <source>Specify configuration file (default: %s)</source> - <translation>Määritä asetustiedosto (oletus: %s)</translation> - </message> - <message> - <source>Specify connection timeout in milliseconds (minimum: 1, default: %d)</source> - <translation>Määritä yhteyden aikakatkaisu millisekunneissa (minimi: 1, oletus: %d)</translation> - </message> - <message> - <source>Specify pid file (default: %s)</source> - <translation>Määritä pid-tiedosto (oletus: %s)</translation> - </message> - <message> - <source>Spend unconfirmed change when sending transactions (default: %u)</source> - <translation>Käytä vahvistamattomia vaihtorahoja lähetettäessä rahansiirtoja (oletus: %u)</translation> - </message> - <message> <source>Starting network threads...</source> <translation>Käynnistetään verkkoa...</translation> </message> @@ -3754,10 +3322,6 @@ <translation>Tämä on lähetyksestä maksettava maksu jonka maksat</translation> </message> <message> - <source>Threshold for disconnecting misbehaving peers (default: %u)</source> - <translation>Aikaväli sopimattomien vertaisten yhteyksien katkaisuun (oletus: %u)</translation> - </message> - <message> <source>Transaction amounts must not be negative</source> <translation>Lähetyksen siirtosumman tulee olla positiivinen</translation> </message> diff --git a/src/qt/locale/bitcoin_fr.ts b/src/qt/locale/bitcoin_fr.ts index 22a98e132f..52e7bda368 100644 --- a/src/qt/locale/bitcoin_fr.ts +++ b/src/qt/locale/bitcoin_fr.ts @@ -11,7 +11,7 @@ </message> <message> <source>&New</source> - <translation>&Nouveau</translation> + <translation>&Nouvelle</translation> </message> <message> <source>Copy the currently selected address to the system clipboard</source> @@ -30,6 +30,10 @@ <translation>Supprimer de la liste l’adresse sélectionnée actuellement</translation> </message> <message> + <source>Enter address or label to search</source> + <translation>Saisir une adresse ou une étiquette à rechercher</translation> + </message> + <message> <source>Export the data in the current tab to a file</source> <translation>Exporter les données de l’onglet actuel vers un fichier</translation> </message> @@ -322,6 +326,14 @@ <translation>Ouvrir une &URI...</translation> </message> <message> + <source>Wallet:</source> + <translation>Porte-monnaie :</translation> + </message> + <message> + <source>default wallet</source> + <translation>porte-monnaie par défaut</translation> + </message> + <message> <source>Click to disable network activity.</source> <translation>Cliquer pour désactiver l’activité réseau.</translation> </message> @@ -342,6 +354,10 @@ <translation>Réindexation des blocs sur le disque...</translation> </message> <message> + <source>Proxy is <b>enabled</b>: %1</source> + <translation>Le serveur mandataire est <b>activé</b> : %1</translation> + </message> + <message> <source>Send coins to a Bitcoin address</source> <translation>Envoyer des pièces à une adresse Bitcoin</translation> </message> @@ -510,6 +526,12 @@ </translation> </message> <message> + <source>Wallet: %1 +</source> + <translation>Porte-monnaie : %1 +</translation> + </message> + <message> <source>Type: %1 </source> <translation>Type : %1 @@ -730,10 +752,6 @@ <translation>&Adresse</translation> </message> <message> - <source>New receiving address</source> - <translation>Nouvelle adresse de réception</translation> - </message> - <message> <source>New sending address</source> <translation>Nouvelle adresse d’envoi</translation> </message> @@ -750,8 +768,12 @@ <translation>L’adresse saisie « %1 » n’est pas une adresse Bitcoin valide.</translation> </message> <message> - <source>The entered address "%1" is already in the address book.</source> - <translation>L’adresse saisie « %1 » est déjà présente dans le carnet d’adresses.</translation> + <source>Address "%1" already exists as a receiving address with label "%2" and so cannot be added as a sending address.</source> + <translation>L’adresse « %1 » existe déjà en tant qu’adresse de réception avec l’étiquette « %2 » et ne peut donc pas être ajoutée en tant qu’adresse d’envoi.</translation> + </message> + <message> + <source>The entered address "%1" is already in the address book with label "%2".</source> + <translation>L’adresse saisie « %1 » est déjà présente dans le carnet d’adresses avec l’étiquette « %2 ».</translation> </message> <message> <source>Could not unlock wallet.</source> @@ -803,42 +825,6 @@ <source>Command-line options</source> <translation>Options de ligne de commande</translation> </message> - <message> - <source>Usage:</source> - <translation>Utilisation :</translation> - </message> - <message> - <source>command-line options</source> - <translation>options de ligne de commande</translation> - </message> - <message> - <source>UI Options:</source> - <translation>Options de l’IU :</translation> - </message> - <message> - <source>Choose data directory on startup (default: %u)</source> - <translation>Choisir un répertoire de données au démarrage (par défaut : %u)</translation> - </message> - <message> - <source>Set language, for example "de_DE" (default: system locale)</source> - <translation>Définir la langue, par exemple « fr_CH » (par défaut : la langue du système)</translation> - </message> - <message> - <source>Start minimized</source> - <translation>Démarrer minimisé</translation> - </message> - <message> - <source>Set SSL root certificates for payment request (default: -system-)</source> - <translation>Définir les certificats SSL racine pour les requêtes de paiement (par défaut : -system-)</translation> - </message> - <message> - <source>Show splash screen on startup (default: %u)</source> - <translation>Afficher l’écran d’accueil au démarrage (par défaut : %u)</translation> - </message> - <message> - <source>Reset all settings changed in the GUI</source> - <translation>Réinitialiser tous les paramètres changés dans l’IUG</translation> - </message> </context> <context> <name>Intro</name> @@ -896,7 +882,7 @@ </message> <message> <source>Error: Specified data directory "%1" cannot be created.</source> - <translation>Erreur : le répertoire de données indiqué « %1 » ne peut pas être créé.</translation> + <translation>Erreur : Le répertoire de données indiqué « %1 » ne peut pas être créé.</translation> </message> <message> <source>Error</source> @@ -1029,7 +1015,7 @@ </message> <message> <source>Hide the icon from the system tray.</source> - <translation>Masquer l'icône dans la zone de notification.</translation> + <translation>Cacher l’icône dans la zone de notification.</translation> </message> <message> <source>&Hide tray icon</source> @@ -1037,7 +1023,7 @@ </message> <message> <source>Minimize instead of exit the application when the window is closed. When this option is enabled, the application will be closed only after selecting Exit in the menu.</source> - <translation>Minimiser au lieu de quitter l’application lorsque la fenêtre est fermée. Si cette option est activée, l’application ne sera fermée qu’en sélectionnant Quitter dans le menu.</translation> + <translation>Quand la fenêtre est fermée, réduire au lieu de quitter l’application. Si cette option est activée, l’application ne sera fermée qu’en sélectionnant Quitter dans le menu.</translation> </message> <message> <source>Third party URLs (e.g. a block explorer) that appear in the transactions tab as context menu items. %s in the URL is replaced by transaction hash. Multiple URLs are separated by vertical bar |.</source> @@ -1068,6 +1054,22 @@ <translation>&Réseau</translation> </message> <message> + <source>Disables some advanced features but all blocks will still be fully validated. Reverting this setting requires re-downloading the entire blockchain. Actual disk usage may be somewhat higher.</source> + <translation>Désactive certaines fonctions avancées, mais tous les blocs seront quand même validés entièrement. Changer ce paramètre à sa valeur antérieure exige de retélécharger la chaîne de blocs dans son intégralité. L’espace disque utilisé pourrait être un peu plus élevé.</translation> + </message> + <message> + <source>Prune &block storage to</source> + <translation>Élaguer l’espace de stockage des &blocs jusqu’à</translation> + </message> + <message> + <source>GB</source> + <translation>Go</translation> + </message> + <message> + <source>Reverting this setting requires re-downloading the entire blockchain.</source> + <translation>Changer ce paramètre à sa valeur antérieure exige de retélécharger la chaîne de blocs dans son intégralité.</translation> + </message> + <message> <source>(0 = auto, <0 = leave that many cores free)</source> <translation>(0 = auto, < 0 = laisser ce nombre de cœurs inutilisés)</translation> </message> @@ -1157,11 +1159,11 @@ </message> <message> <source>&Minimize to the tray instead of the taskbar</source> - <translation>&Minimiser dans la zone de notification au lieu de la barre des tâches</translation> + <translation>&Réduire dans la zone de notification au lieu de la barre des tâches</translation> </message> <message> <source>M&inimize on close</source> - <translation>M&inimiser lors de la fermeture</translation> + <translation>Ré&duire lors de la fermeture</translation> </message> <message> <source>&Display</source> @@ -1334,6 +1336,10 @@ <translation>Gestion des URI</translation> </message> <message> + <source>'bitcoin://' is not a valid URI. Use 'bitcoin:' instead.</source> + <translation>'bitcoin://' n’est pas une URI valide. Utilisez plutôt 'bitcoin:'.</translation> + </message> + <message> <source>Payment request fetch URL is invalid: %1</source> <translation>L’URL de récupération de la demande de paiement est invalide : %1</translation> </message> @@ -1531,12 +1537,16 @@ <context> <name>QObject::QObject</name> <message> + <source>Error parsing command line arguments: %1.</source> + <translation>Erreur d’analyse des arguments de ligne de commande : %1.</translation> + </message> + <message> <source>Error: Specified data directory "%1" does not exist.</source> - <translation>Erreur : le répertoire de données indiqué « %1 » n’existe pas.</translation> + <translation>Erreur : Le répertoire de données indiqué « %1 » n’existe pas.</translation> </message> <message> - <source>Error: Cannot parse configuration file: %1. Only use key=value syntax.</source> - <translation>Erreur : impossible d’analyser le fichier de configuration : %1. N’utiliser que la syntaxe clef=valeur.</translation> + <source>Error: Cannot parse configuration file: %1.</source> + <translation>Erreur : Impossible d’analyser le fichier de configuration : %1.</translation> </message> <message> <source>Error: %1</source> @@ -1629,6 +1639,14 @@ <translation>Utilisation de la mémoire</translation> </message> <message> + <source>Wallet: </source> + <translation>Porte-monnaie :</translation> + </message> + <message> + <source>(none)</source> + <translation>(aucun)</translation> + </message> + <message> <source>&Reset</source> <translation>&Réinitialiser</translation> </message> @@ -1797,6 +1815,10 @@ <translation>&Réhabiliter</translation> </message> <message> + <source>default wallet</source> + <translation>porte-monnaie par défaut</translation> + </message> + <message> <source>Welcome to the %1 RPC console.</source> <translation>Bienvenue sur la console RPC de %1.</translation> </message> @@ -1821,6 +1843,14 @@ <translation>L’activité réseau est désactivée.</translation> </message> <message> + <source>Executing command without any wallet</source> + <translation>Exécution de la commande sans aucun porte-monnaie</translation> + </message> + <message> + <source>Executing command using "%1" wallet</source> + <translation>Exécution de la commande en utilisant le porte-monnaie « %1 »</translation> + </message> + <message> <source>(node id: %1)</source> <translation>(ID de nœud : %1)</translation> </message> @@ -1892,20 +1922,20 @@ <translation>Effacer</translation> </message> <message> - <source>Requested payments history</source> - <translation>Historique des paiements demandés</translation> + <source>Native segwit addresses (aka Bech32 or BIP-173) reduce your transaction fees later on and offer better protection against typos, but old wallets don't support them. When unchecked, an address compatible with older wallets will be created instead.</source> + <translation>Les adresses SegWit natives (aussi appelées Bech32 ou BIP-173) réduisent vos frais de transaction ultérieurs et offrent une meilleure protection contre les erreurs de frappe, mais les anciens porte-monnaie ne les prennent pas en charge. Si cette option n’est pas cochée, une adresse compatible avec les anciens porte-monnaie sera plutôt créée.</translation> </message> <message> - <source>&Request payment</source> - <translation>&Demander un paiement</translation> + <source>Generate native segwit (Bech32) address</source> + <translation>Générer une adresse SegWit native (Bech32)</translation> </message> <message> - <source>Bech32 addresses (BIP-173) are cheaper to spend from and offer better protection against typos. When unchecked a P2SH wrapped SegWit address will be created, compatible with older wallets.</source> - <translation>Il est moins coûteux de dépenser à partir d’adresses Bech32 (BIP-173). Elles offrent aussi une meilleure protection contre les fautes de frappe. Si cette option n’est pas cochée, une adresse SegWit enveloppée dans un P2SH sera créée, compatible avec les anciens porte-monnaie.</translation> + <source>Requested payments history</source> + <translation>Historique des paiements demandés</translation> </message> <message> - <source>Generate Bech32 address</source> - <translation>Générer une adresse Bech32</translation> + <source>&Request payment</source> + <translation>&Demander un paiement</translation> </message> <message> <source>Show the selected request (does the same as double clicking an entry)</source> @@ -1987,6 +2017,10 @@ <translation>Message</translation> </message> <message> + <source>Wallet</source> + <translation>Porte-monnaie</translation> + </message> + <message> <source>Resulting URI too long, try to reduce the text for label / message.</source> <translation>L’URI résultante est trop longue. Essayez de réduire le texte de l’étiquette ou du message.</translation> </message> @@ -2101,12 +2135,16 @@ <translation>réduire les paramètres des frais</translation> </message> <message> - <source>per kilobyte</source> - <translation>par kilo-octet</translation> + <source>Specify a custom fee per kB (1,000 bytes) of the transaction's virtual size. + +Note: Since the fee is calculated on a per-byte basis, a fee of "100 satoshis per kB" for a transaction size of 500 bytes (half of 1 kB) would ultimately yield a fee of only 50 satoshis.</source> + <translation>Déterminer des frais personnalisés par Ko (1 000 octets) de la taille virtuelle de la transaction. + +Note : Les frais étant calculés par octet, des frais de « 100 satoshis par Ko » pour une transaction d’une taille de 500 octets (la moitié de 1 Ko) donneront des frais de seulement 50 satoshis.</translation> </message> <message> - <source>If the custom fee is set to 1000 satoshis and the transaction is only 250 bytes, then "per kilobyte" only pays 250 satoshis in fee, while "total at least" pays 1000 satoshis. For transactions bigger than a kilobyte both pay by kilobyte.</source> - <translation>Si les frais personnalisés sont définis à 1 000 satoshis et que la transaction est seulement de 250 octets, le « par kilo-octet » ne paiera donc que 250 satoshis de frais, alors que le « total au moins » paiera 1 000 satoshis. Pour des transactions supérieures à un kilo-octet, les deux paieront par kilo-octet.</translation> + <source>per kilobyte</source> + <translation>par kilo-octet</translation> </message> <message> <source>Hide</source> @@ -2217,14 +2255,6 @@ <translation>Voulez-vous vraiment envoyer ?</translation> </message> <message> - <source>added as transaction fee</source> - <translation>ajoutés comme frais de transaction</translation> - </message> - <message> - <source>Total Amount %1</source> - <translation>Montant total %1</translation> - </message> - <message> <source>or</source> <translation>ou</translation> </message> @@ -2233,10 +2263,26 @@ <translation>Vous pouvez augmenter les frais ultérieurement (signale Remplacer-par-des-frais, BIP-125).</translation> </message> <message> + <source>from wallet %1</source> + <translation>du porte-monnaie %1</translation> + </message> + <message> + <source>Please, review your transaction.</source> + <translation>Veuillez vérifier votre transaction.</translation> + </message> + <message> + <source>Transaction fee</source> + <translation>Frais de transaction</translation> + </message> + <message> <source>Not signalling Replace-By-Fee, BIP-125.</source> <translation>Ne signale pas Remplacer-par-des-frais, BIP-125.</translation> </message> <message> + <source>Total Amount</source> + <translation>Montant total</translation> + </message> + <message> <source>Confirm send coins</source> <translation>Confirmer l’envoi de pièces</translation> </message> @@ -2578,10 +2624,6 @@ <translation>est en conflit avec une transaction ayant %1 confirmations</translation> </message> <message> - <source>%1/offline</source> - <translation>%1/hors ligne</translation> - </message> - <message> <source>0/unconfirmed, %1</source> <translation>0/non confirmées, %1</translation> </message> @@ -2610,14 +2652,6 @@ <translation>État</translation> </message> <message> - <source>, has not been successfully broadcast yet</source> - <translation>, n’a pas encore été diffusée avec succès</translation> - </message> - <message numerus="yes"> - <source>, broadcast through %n node(s)</source> - <translation><numerusform>, diffusée par %n nœud</numerusform><numerusform>, diffusée par %n nœuds</numerusform></translation> - </message> - <message> <source>Date</source> <translation>Date</translation> </message> @@ -2702,6 +2736,10 @@ <translation>Taille totale de la transaction</translation> </message> <message> + <source>Transaction virtual size</source> + <translation>Taille virtuelle de la transaction</translation> + </message> + <message> <source>Output index</source> <translation>Index de sorties</translation> </message> @@ -2772,10 +2810,6 @@ <translation>Ouvert jusqu’à %1</translation> </message> <message> - <source>Offline</source> - <translation>Hors ligne</translation> - </message> - <message> <source>Unconfirmed</source> <translation>Non confirmée</translation> </message> @@ -2800,10 +2834,6 @@ <translation>Immature (%1 confirmations, sera disponible après %2)</translation> </message> <message> - <source>This block was not received by any other nodes and will probably not be accepted!</source> - <translation>Ce bloc n’a été reçu par aucun autre nœud et ne sera probablement pas accepté !</translation> - </message> - <message> <source>Generated but not accepted</source> <translation>Générée mais refusée</translation> </message> @@ -2916,7 +2946,7 @@ </message> <message> <source>Enter address, transaction id, or label to search</source> - <translation>Saisir l'adresse, l’ID de transaction ou l'étiquette à chercher</translation> + <translation>Saisir l’adresse, l’ID de transaction ou l’étiquette à chercher</translation> </message> <message> <source>Min amount</source> @@ -3114,38 +3144,18 @@ <source>The wallet data was successfully saved to %1.</source> <translation>Les données du porte-monnaie ont été enregistrées avec succès vers %1</translation> </message> + <message> + <source>Cancel</source> + <translation>Annuler</translation> + </message> </context> <context> <name>bitcoin-core</name> <message> - <source>Options:</source> - <translation>Options :</translation> - </message> - <message> - <source>Specify data directory</source> - <translation>Indiquer le répertoire de données</translation> - </message> - <message> - <source>Connect to a node to retrieve peer addresses, and disconnect</source> - <translation>Se connecter à un nœud pour obtenir des adresses de pairs puis se déconnecter</translation> - </message> - <message> - <source>Specify your own public address</source> - <translation>Indiquer votre propre adresse publique</translation> - </message> - <message> - <source>Accept command line and JSON-RPC commands</source> - <translation>Accepter les commandes JSON-RPC et en ligne de commande</translation> - </message> - <message> <source>Distributed under the MIT software license, see the accompanying file %s or %s</source> <translation>Distribué sous la licence MIT d’utilisation d’un logiciel. Consulter le fichier joint %s ou %s</translation> </message> <message> - <source>If <category> is not supplied or if <category> = 1, output all debugging information.</source> - <translation>Si <category> n’est pas indiqué ou si <category> = 1, extraire toutes les données de débogage.</translation> - </message> - <message> <source>Prune configured below the minimum of %d MiB. Please use a higher number.</source> <translation>L’élagage est configuré au-dessous du minimum de %d Mio. Veuillez utiliser un nombre plus élevé.</translation> </message> @@ -3159,21 +3169,13 @@ </message> <message> <source>Error: A fatal internal error occurred, see debug.log for details</source> - <translation>Erreur : une erreur interne fatale s’est produite. Voir debug.log pour plus de détails</translation> - </message> - <message> - <source>Fee (in %s/kB) to add to transactions you send (default: %s)</source> - <translation>Les frais (en %s/ko) à ajouter aux transactions que vous envoyez (par défaut : %s)</translation> + <translation>Erreur : Une erreur interne fatale s’est produite. Voir debug.log pour plus de détails</translation> </message> <message> <source>Pruning blockstore...</source> <translation>Élagage du magasin de blocs...</translation> </message> <message> - <source>Run in the background as a daemon and accept commands</source> - <translation>Fonctionner en arrière-plan en tant que démon et accepter les commandes</translation> - </message> - <message> <source>Unable to start HTTP server. See debug log for details.</source> <translation>Impossible de démarrer le serveur HTTP. Voir le journal de débogage pour plus de détails.</translation> </message> @@ -3186,22 +3188,6 @@ <translation>Les développeurs de %s</translation> </message> <message> - <source>A fee rate (in %s/kB) that will be used when fee estimation has insufficient data (default: %s)</source> - <translation>Un taux de frais (en %s/Ko) qui sera utilisé si l’estimation de frais ne possède pas suffisamment de données (par défaut : %s)</translation> - </message> - <message> - <source>Accept relayed transactions received from whitelisted peers even when not relaying transactions (default: %d)</source> - <translation>Accepter les transactions relayées reçues de pairs de la liste blanche même si le nœud ne relaie pas les transactions (par défaut : %d)</translation> - </message> - <message> - <source>Add a node to connect to and attempt to keep the connection open (see the `addnode` RPC command help for more info)</source> - <translation>Ajouter un nœud auquel se connecter et tenter de garder la connexion ouverte (voir l’aide de la commande RPC « addnode » pour plus d’infos)</translation> - </message> - <message> - <source>Bind to given address and always listen on it. Use [host]:port notation for IPv6</source> - <translation>Se lier à l’adresse donnée et toujours l’écouter. Utiliser la notation [host]:port pour l’IPv6</translation> - </message> - <message> <source>Cannot obtain a lock on data directory %s. %s is probably already running.</source> <translation>Impossible d’obtenir un verrou sur le répertoire de données %s. %s fonctionne probablement déjà.</translation> </message> @@ -3210,38 +3196,10 @@ <translation>Il est impossible de fournir des connexions particulières et en même temps demander à addrman de trouver les connexions sortantes.</translation> </message> <message> - <source>Connect only to the specified node(s); -connect=0 disables automatic connections (the rules for this peer are the same as for -addnode)</source> - <translation>Se connecter seulement aux nœuds précisés ; -connect=0 désactive les connexions automatiques (les règles pour ce pair sont identiques à celles de -addnode)</translation> - </message> - <message> - <source>Delete all wallet transactions and only recover those parts of the blockchain through -rescan on startup</source> - <translation>Supprimer toutes les transactions du porte-monnaie et ne récupérer que ces parties de la chaîne de blocs avec -rescan au démarrage</translation> - </message> - <message> <source>Error reading %s! All keys read correctly, but transaction data or address book entries might be missing or incorrect.</source> <translation>Erreur de lecture de %s ! Toutes les clés ont été lues correctement, mais les données transactionnelles ou les entrées du carnet d’adresses sont peut-être manquantes ou incorrectes.</translation> </message> <message> - <source>Exclude debugging information for a category. Can be used in conjunction with -debug=1 to output debug logs for all categories except one or more specified categories.</source> - <translation>Exclure les informations de débogage pour une catégorie. Peut être utilisé en combinaison avec -debug=1 pour sortir les journaux de débogage pour toutes les catégories sauf une ou plusieurs particulières.</translation> - </message> - <message> - <source>Execute command when a wallet transaction changes (%s in cmd is replaced by TxID)</source> - <translation>Exécuter la commande lorsqu’une transaction de porte-monnaie change (%s dans la commande est remplacée par TxID)</translation> - </message> - <message> - <source>If this block is in the chain assume that it and its ancestors are valid and potentially skip their script verification (0 to verify all, default: %s, testnet: %s)</source> - <translation>Si ce bloc est dans la chaîne, supposer qu’il est valide, ainsi que ces ancêtres, et ignorer potentiellement la vérification de leur script (0 pour tout vérifier, valeur par défaut : %s, réseau de test : %s)</translation> - </message> - <message> - <source>Maximum allowed median peer time offset adjustment. Local perspective of time may be influenced by peers forward or backward by this amount. (default: %u seconds)</source> - <translation>Réglage moyen maximal autorisé de décalage de l’heure d’un pair. La perspective locale du temps peut être influencée par les pairs, en avance ou en retard, de cette valeur. (Par défaut : %u secondes)</translation> - </message> - <message> - <source>Maximum total fees (in %s) to use in a single wallet transaction or raw transaction; setting this too low may abort large transactions (default: %s)</source> - <translation>Frais totaux maximaux (en %s) à utiliser en une seule transaction de porte-monnaie ou transaction brute ; les définir trop bas pourrait interrompre les grosses transactions (par défaut : %s)</translation> - </message> - <message> <source>Please check that your computer's date and time are correct! If your clock is wrong, %s will not work properly.</source> <translation>Veuillez vérifier que l’heure et la date de votre ordinateur sont justes ! Si votre horloge n’est pas à l’heure, %s ne fonctionnera pas correctement.</translation> </message> @@ -3250,22 +3208,6 @@ <translation>Si vous trouvez %s utile, vous pouvez y contribuer. Vous trouverez davantage d’informations à propos du logiciel sur %s.</translation> </message> <message> - <source>Query for peer addresses via DNS lookup, if low on addresses (default: 1 unless -connect used)</source> - <translation>Demander les adresses de pairs par consultation DNS si l’on manque d’adresses (par défaut : 1 sauf si -connect est utilisé)</translation> - </message> - <message> - <source>Reduce storage requirements by enabling pruning (deleting) of old blocks. This allows the pruneblockchain RPC to be called to delete specific blocks, and enables automatic pruning of old blocks if a target size in MiB is provided. This mode is incompatible with -txindex and -rescan. Warning: Reverting this setting requires re-downloading the entire blockchain. (default: 0 = disable pruning blocks, 1 = allow manual pruning via RPC, >%u = automatically prune block files to stay under the specified target size in MiB)</source> - <translation>Réduire les exigences de stockage en activant l’élagage (suppression) des anciens blocs. Cela permet d’appeler le RPC « pruneblockchain » pour supprimer des blocs précis et active l’élagage automatique des anciens blocs si une taille cible en Mio est fournie. Ce mode n’est pas compatible avec -txindex et -rescan. Avertissement : ramener ce paramètre à sa valeur antérieure exige de retélécharger l’intégralité de la chaîne de blocs (par défaut : 0 = désactiver l’élagage des blocs, 1 = permettre l’élagage manuel par RPC, >%u = élaguer automatiquement les fichiers de blocs pour rester en deçà de la taille cible précisée en Mio).</translation> - </message> - <message> - <source>Set lowest fee rate (in %s/kB) for transactions to be included in block creation. (default: %s)</source> - <translation>Définir le taux minimal de frais (en %s/Ko) pour les transactions à inclure dans la création de blocs (par défaut : %s)</translation> - </message> - <message> - <source>Set the number of script verification threads (%u to %d, 0 = auto, <0 = leave that many cores free, default: %d)</source> - <translation>Définir le nombre de fils de vérification des scripts (%u à %d, 0 = auto, < 0 = laisser ce nombre de cœurs inutilisés, par défaut : %d)</translation> - </message> - <message> <source>The block database contains a block which appears to be from the future. This may be due to your computer's date and time being set incorrectly. Only rebuild the block database if you are sure that your computer's date and time are correct</source> <translation>La base de données de blocs contient un bloc qui semble provenir du futur. Cela pourrait être causé par la date et l’heure erronées de votre ordinateur. Ne reconstruisez la base de données de blocs que si vous êtes certain que la date et l’heure de votre ordinateur sont justes.</translation> </message> @@ -3286,18 +3228,6 @@ <translation>Impossible de rebobiner la base de données à un état préfourche. Vous devrez retélécharger la chaîne de blocs</translation> </message> <message> - <source>Use UPnP to map the listening port (default: 1 when listening and no -proxy)</source> - <translation>Utiliser l’UPnP pour mapper le port d’écoute (par défaut : 1 en écoute et sans -proxy)</translation> - </message> - <message> - <source>Username and hashed password for JSON-RPC connections. The field <userpw> comes in the format: <USERNAME>:<SALT>$<HASH>. A canonical python script is included in share/rpcuser. The client then connects normally using the rpcuser=<USERNAME>/rpcpassword=<PASSWORD> pair of arguments. This option can be specified multiple times</source> - <translation>Nom d’utilisateur et mot de passe haché pour les connexions JSON-RPC. Le champ <userpw> est au format : <USERNAME>:<SALT>$<HASH>. Un script python canonique est inclus dans share/rpcuser. Le client se connecte ensuite normalement en utilisant la paire d’arguments rpcuser=<USERNAME>/rpcpassword=<PASSWORD>. Cette option peut être précisée plusieurs fois.</translation> - </message> - <message> - <source>Wallet will not create transactions that violate mempool chain limits (default: %u)</source> - <translation>Un porte-monnaie ne créera aucune transaction qui enfreint les limites de chaîne de la réserve de mémoire (par défaut : %u)</translation> - </message> - <message> <source>Warning: The network does not appear to fully agree! Some miners appear to be experiencing issues.</source> <translation>Avertissement : le réseau ne semble pas totalement d’accord ! Certains mineurs semblent éprouver des problèmes.</translation> </message> @@ -3306,10 +3236,6 @@ <translation>Avertissement : nous ne semblons pas être en accord complet avec nos pairs ! Une mise à niveau pourrait être nécessaire pour vous ou pour d’autres nœuds du réseau.</translation> </message> <message> - <source>Whether to save the mempool on shutdown and load on restart (default: %u)</source> - <translation>Enregistrer ou non la réserve de mémoire lors de la fermeture et la charger ou non lors du redémarrage (par défaut : %u)</translation> - </message> - <message> <source>%d of last 100 blocks have unexpected version</source> <translation>%d des 100 derniers blocs ont une version inattendue</translation> </message> @@ -3322,42 +3248,14 @@ <translation>-maxmempool doit être d’au moins %d Mo</translation> </message> <message> - <source><category> can be:</source> - <translation><category> peut être :</translation> - </message> - <message> - <source>Accept connections from outside (default: 1 if no -proxy or -connect)</source> - <translation>Accepter les connexions entrantes (par défaut : 1 si aucun -proxy ou -connect )</translation> - </message> - <message> - <source>Append comment to the user agent string</source> - <translation>Ajouter un commentaire à la chaîne d’agent utilisateur</translation> - </message> - <message> - <source>Attempt to recover private keys from a corrupt wallet on startup</source> - <translation>Tenter de récupérer les clés privées d’un porte-monnaie corrompu lors du démarrage</translation> - </message> - <message> - <source>Block creation options:</source> - <translation>Options de création de blocs :</translation> - </message> - <message> <source>Cannot resolve -%s address: '%s'</source> <translation>Impossible de résoudre l’adresse -%s : « %s »</translation> </message> <message> - <source>Chain selection options:</source> - <translation>Options de sélection de la chaîne :</translation> - </message> - <message> <source>Change index out of range</source> <translation>L’index de changement est hors échelle</translation> </message> <message> - <source>Connection options:</source> - <translation>Options de connexion :</translation> - </message> - <message> <source>Copyright (C) %i-%i</source> <translation>Tous droits réservés (C) %i-%i</translation> </message> @@ -3366,38 +3264,10 @@ <translation>Une base de données de blocs corrompue a été détectée</translation> </message> <message> - <source>Debugging/Testing options:</source> - <translation>Options de débogage/de test :</translation> - </message> - <message> - <source>Do not load the wallet and disable wallet RPC calls</source> - <translation>Ne pas charger le porte-monnaie et désactiver les appels RPC</translation> - </message> - <message> <source>Do you want to rebuild the block database now?</source> <translation>Voulez-vous reconstruire la base de données de blocs maintenant ?</translation> </message> <message> - <source>Enable publish hash block in <address></source> - <translation>Activer la publication du bloc de hachage dans <address></translation> - </message> - <message> - <source>Enable publish hash transaction in <address></source> - <translation>Activer la publication de la transaction de hachage dans <address></translation> - </message> - <message> - <source>Enable publish raw block in <address></source> - <translation>Activer la publication du bloc brut dans <address></translation> - </message> - <message> - <source>Enable publish raw transaction in <address></source> - <translation>Activer la publication de la transaction brute dans <address></translation> - </message> - <message> - <source>Enable transaction replacement in the memory pool (default: %u)</source> - <translation>Activer le remplacement de transactions dans la réserve de mémoire (par défaut : %u)</translation> - </message> - <message> <source>Error creating %s: You can't create non-HD wallets with this version.</source> <translation>Erreur de création de %s : vous ne pouvez pas créer de porte-monnaie non HD avec cette version.</translation> </message> @@ -3414,6 +3284,10 @@ <translation>Erreur de chargement de %s</translation> </message> <message> + <source>Error loading %s: Private keys can only be disabled during creation</source> + <translation>Erreur de chargement de %s : les clés privées ne peuvent être désactivées qu’à la création.</translation> + </message> + <message> <source>Error loading %s: Wallet corrupted</source> <translation>Erreur de chargement de %s : porte-monnaie corrompu</translation> </message> @@ -3431,7 +3305,7 @@ </message> <message> <source>Error: Disk space is low!</source> - <translation>Erreur : l’espace disque est faible !</translation> + <translation>Erreur : Il reste peu d’espace disque !</translation> </message> <message> <source>Failed to listen on any port. Use -listen=0 if you want this.</source> @@ -3466,8 +3340,8 @@ <translation>Montant invalide pour -fallbackfee=<amount> : « %s »</translation> </message> <message> - <source>Keep the transaction memory pool below <n> megabytes (default: %u)</source> - <translation>Garder la réserve de mémoire transactionnelle sous <n> mégaoctets (par défaut : %u)</translation> + <source>Upgrading txindex database</source> + <translation>Mise à niveau de la base de données txindex</translation> </message> <message> <source>Loading P2P addresses...</source> @@ -3478,26 +3352,10 @@ <translation>Chargement de la liste d’interdiction...</translation> </message> <message> - <source>Location of the auth cookie (default: data dir)</source> - <translation>Emplacement du fichier témoin auth (par défaut : data dir)</translation> - </message> - <message> <source>Not enough file descriptors available.</source> <translation>Pas assez de descripteurs de fichiers proposés.</translation> </message> <message> - <source>Only connect to nodes in network <net> (ipv4, ipv6 or onion)</source> - <translation>Seulement se connecter aux nœuds du réseau <net> (IPv4, IPv6 ou oignon)</translation> - </message> - <message> - <source>Print this help message and exit</source> - <translation>Imprimer ce message d’aide et quitter</translation> - </message> - <message> - <source>Print version and exit</source> - <translation>Imprimer la version et quitter</translation> - </message> - <message> <source>Prune cannot be configured with a negative value.</source> <translation>L’élagage ne peut pas être configuré avec une valeur négative.</translation> </message> @@ -3506,14 +3364,6 @@ <translation>Le mode élagage n’est pas compatible avec -txindex.</translation> </message> <message> - <source>Rebuild chain state and block index from the blk*.dat files on disk</source> - <translation>Reconstruire l’état de la chaîne et l’index des blocs à partir des fichiers blk*.dat sur le disque</translation> - </message> - <message> - <source>Rebuild chain state from the currently indexed blocks</source> - <translation>Reconstruire l’état de la chaîne à partir des blocs indexés actuellement</translation> - </message> - <message> <source>Replaying blocks...</source> <translation>Relecture des blocs...</translation> </message> @@ -3522,18 +3372,6 @@ <translation>Rebobinage des blocs...</translation> </message> <message> - <source>Send transactions with full-RBF opt-in enabled (RPC only, default: %u)</source> - <translation>Envoyer les transactions avec « full-RBF opt-in » activé (RPC seulement, par défaut : %u)</translation> - </message> - <message> - <source>Set database cache size in megabytes (%d to %d, default: %d)</source> - <translation>Définir la taille du cache de la base de données en mégaoctets (%d à %d, default: %d)</translation> - </message> - <message> - <source>Specify wallet file (within data directory)</source> - <translation>Indiquer le fichier de porte-monnaie (dans le répertoire de données)</translation> - </message> - <message> <source>The source code is available from %s.</source> <translation>Le code source se trouve sur %s.</translation> </message> @@ -3546,6 +3384,10 @@ <translation>Impossible de se lier à %s sur cet ordinateur. %s fonctionne probablement déjà.</translation> </message> <message> + <source>Unable to generate keys</source> + <translation>Impossible de générer les clés</translation> + </message> + <message> <source>Unsupported argument -benchmark ignored, use -debug=bench.</source> <translation>Argument non pris en charge -benchmark ignoré, utiliser -debug=bench.</translation> </message> @@ -3566,14 +3408,6 @@ <translation>Mise à niveau de la base de données UTXO</translation> </message> <message> - <source>Use UPnP to map the listening port (default: %u)</source> - <translation>Utiliser l’UPnP pour mapper le port d’écoute (par défaut : %u)</translation> - </message> - <message> - <source>Use the test chain</source> - <translation>Utiliser la chaîne de test</translation> - </message> - <message> <source>User Agent comment (%s) contains unsafe characters.</source> <translation>Le commentaire d’agent utilisateur (%s) contient des caractères dangereux.</translation> </message> @@ -3582,90 +3416,26 @@ <translation>Vérification des blocs... </translation> </message> <message> - <source>Wallet debugging/testing options:</source> - <translation>Options de débogage/de test du porte-monnaie :</translation> - </message> - <message> <source>Wallet needed to be rewritten: restart %s to complete</source> <translation>Le porte-monnaie devait être réécrit : redémarrer %s pour terminer l’opération.</translation> </message> <message> - <source>Wallet options:</source> - <translation>Options du porte-monnaie :</translation> - </message> - <message> - <source>Allow JSON-RPC connections from specified source. Valid for <ip> are a single IP (e.g. 1.2.3.4), a network/netmask (e.g. 1.2.3.4/255.255.255.0) or a network/CIDR (e.g. 1.2.3.4/24). This option can be specified multiple times</source> - <translation>Permettre les connexions JSON-RPC de sources spécifiques. Valide pour <ip> qui sont une IP simple (p. ex. 1.2.3.4), un réseau/masque réseau (p. ex. 1.2.3.4/255.255.255.0) ou un réseau/CIDR (p. ex. 1.2.3.4/24). Cette option peut être être précisée plusieurs fois</translation> - </message> - <message> - <source>Bind to given address and whitelist peers connecting to it. Use [host]:port notation for IPv6</source> - <translation>Se lier à l’adresse donnée et aux pairs s’y connectant. Utiliser la notation [host]:port pour l’IPv6</translation> - </message> - <message> - <source>Create new files with system default permissions, instead of umask 077 (only effective with disabled wallet functionality)</source> - <translation>Créer de nouveaux fichiers avec les permissions système par défaut, au lieu de umask 077 (effectif seulement avec la fonction du porte-monnaie désactivée)</translation> - </message> - <message> - <source>Discover own IP addresses (default: 1 when listening and no -externalip or -proxy)</source> - <translation>Découvrir ses propres adresses (par défaut : 1 en écoute et sans externalip ou -proxy)</translation> - </message> - <message> <source>Error: Listening for incoming connections failed (listen returned error %s)</source> - <translation>Erreur : l’écoute des connexions entrantes a échoué (l’écoute a retourné l’erreur %s)</translation> - </message> - <message> - <source>Execute command when a relevant alert is received or we see a really long fork (%s in cmd is replaced by message)</source> - <translation>Exécuter une commande lorsqu’une alerte pertinente est reçue, ou si nous voyons une bifurcation vraiment étendue (%s dans la commande est remplacé par le message)</translation> - </message> - <message> - <source>Fees (in %s/kB) smaller than this are considered zero fee for relaying, mining and transaction creation (default: %s)</source> - <translation>Les frais (en %s/Ko) inférieurs à ce seuil sont considérés comme étant nuls pour le relais, le minage et la création de transactions (par défaut : %s)</translation> - </message> - <message> - <source>If paytxfee is not set, include enough fee so transactions begin confirmation on average within n blocks (default: %u)</source> - <translation>Si paytxfee n’est pas défini, inclure suffisamment de frais afin que les transactions commencent la confirmation en moyenne avant n blocs (par défaut : %u)</translation> + <translation>Erreur : L’écoute des connexions entrantes a échoué (l’écoute a retourné l’erreur %s)</translation> </message> <message> <source>Invalid amount for -maxtxfee=<amount>: '%s' (must be at least the minrelay fee of %s to prevent stuck transactions)</source> <translation>Montant invalide pour -maxtxfee=<amount> : « %s » (doit être au moins les frais minrelay de %s pour prévenir le blocage des transactions)</translation> </message> <message> - <source>Maximum size of data in data carrier transactions we relay and mine (default: %u)</source> - <translation>Quantité maximale de données dans les transactions du porteur de données que nous relayons et minons (par défaut : %u)</translation> - </message> - <message> - <source>Randomize credentials for every proxy connection. This enables Tor stream isolation (default: %u)</source> - <translation>Aléer les authentifiants pour chaque connexion mandataire. Cela active l’isolement de flux de Tor (par défaut : %u) </translation> - </message> - <message> <source>The transaction amount is too small to send after the fee has been deducted</source> <translation>Le montant de la transaction est trop bas pour être envoyé une fois que les frais ont été déduits</translation> </message> <message> - <source>Whitelisted peers cannot be DoS banned and their transactions are always relayed, even if they are already in the mempool, useful e.g. for a gateway</source> - <translation>Les pairs de la liste blanche ne peuvent pas être bannis DoS et leurs transactions sont toujours relayées, même si elles sont déjà dans le mempool, utile p. ex. pour une passerelle</translation> - </message> - <message> <source>You need to rebuild the database using -reindex to go back to unpruned mode. This will redownload the entire blockchain</source> <translation>Vous devez reconstruire la base de données en utilisant -reindex afin de revenir au mode sans élagage. Cela retéléchargera complètement la chaîne de blocs.</translation> </message> <message> - <source>(default: %u)</source> - <translation>(par défaut : %u)</translation> - </message> - <message> - <source>Accept public REST requests (default: %u)</source> - <translation>Accepter les demandes REST publiques (par défaut : %u)</translation> - </message> - <message> - <source>Automatically create Tor hidden service (default: %d)</source> - <translation>Créer automatiquement un service caché Tor (par défaut : %d)</translation> - </message> - <message> - <source>Connect through SOCKS5 proxy</source> - <translation>Se connecter par un mandataire SOCKS5</translation> - </message> - <message> <source>Error loading %s: You can't disable HD on an already existing HD wallet</source> <translation>Erreur de chargement de %s : vous ne pouvez pas désactiver HD sur un porte-monnaie HD existant</translation> </message> @@ -3678,10 +3448,6 @@ <translation>Erreur de mise à niveau de la base de données d’état de la chaîne</translation> </message> <message> - <source>Imports blocks from external blk000??.dat file on startup</source> - <translation>Importe des blocs à partir d’un fichier blk000??.dat externe lors du démarrage</translation> - </message> - <message> <source>Information</source> <translation>Informations</translation> </message> @@ -3702,46 +3468,24 @@ <translation>Masque réseau invalide indiqué dans -whitelist : « %s »</translation> </message> <message> - <source>Keep at most <n> unconnectable transactions in memory (default: %u)</source> - <translation>Garder au plus <n> transactions non connectables en mémoire (par défaut : %u)</translation> - </message> - <message> <source>Need to specify a port with -whitebind: '%s'</source> <translation>Un port doit être précisé avec -whitebind : « %s »</translation> </message> <message> - <source>Node relay options:</source> - <translation>Options de relais du nœud :</translation> - </message> - <message> - <source>RPC server options:</source> - <translation>Options du serveur RPC :</translation> - </message> - <message> <source>Reducing -maxconnections from %d to %d, because of system limitations.</source> <translation>Réduction de -maxconnections de %d à %d, due aux restrictions du système</translation> </message> <message> - <source>Rescan the block chain for missing wallet transactions on startup</source> - <translation>Réanalyser la chaîne de blocs au démarrage, à la recherche de transactions de porte-monnaie manquantes</translation> - </message> - <message> - <source>Send trace/debug info to console instead of debug.log file</source> - <translation>Envoyer les infos de débogage/trace à la console au lieu du fichier debug.log</translation> - </message> - <message> - <source>Show all debugging options (usage: --help -help-debug)</source> - <translation>Montrer toutes les options de débogage (utilisation : --help --help-debug)</translation> - </message> - <message> - <source>Shrink debug.log file on client startup (default: 1 when no -debug)</source> - <translation>Réduire le fichier debug.log lors du démarrage du client (par défaut : 1 sans -debug)</translation> - </message> - <message> <source>Signing transaction failed</source> <translation>Échec de signature de la transaction</translation> </message> <message> + <source>Specified blocks directory "%s" does not exist. +</source> + <translation>Le répertoire de blocs indiqué « %s » n’existe pas. +</translation> + </message> + <message> <source>The transaction amount is too small to pay the fee</source> <translation>Le montant de la transaction est trop bas pour que les frais soient payés</translation> </message> @@ -3750,14 +3494,6 @@ <translation>Ceci est un logiciel expérimental.</translation> </message> <message> - <source>Tor control port password (default: empty)</source> - <translation>Mot de passe du port de contrôle Tor (par défaut : vide)</translation> - </message> - <message> - <source>Tor control port to use if onion listening enabled (default: %s)</source> - <translation>Port de contrôle Tor à utiliser si l’écoute onion est activée (par défaut :%s)</translation> - </message> - <message> <source>Transaction amount too small</source> <translation>Le montant de la transaction est trop bas</translation> </message> @@ -3778,14 +3514,6 @@ <translation>Impossible de générer les clés initiales</translation> </message> <message> - <source>Upgrade wallet to latest format on startup</source> - <translation>Mettre à niveau le porte-monnaie au démarrage vers le format le plus récent</translation> - </message> - <message> - <source>Username for JSON-RPC connections</source> - <translation>Nom d’utilisateur pour les connexions JSON-RPC</translation> - </message> - <message> <source>Verifying wallet(s)...</source> <translation>Vérification des porte-monnaie...</translation> </message> @@ -3802,106 +3530,18 @@ <translation>Avertissement : nouvelles règles inconnues activées (bit de version %i)</translation> </message> <message> - <source>Whether to operate in a blocks only mode (default: %u)</source> - <translation>Fonctionner ou non en mode blocs seulement (par défaut : %u)</translation> - </message> - <message> - <source>You need to rebuild the database using -reindex to change -txindex</source> - <translation>Vous devez reconstruire la base de données en utilisant -reindex afin de modifier -txindex</translation> - </message> - <message> <source>Zapping all transactions from wallet...</source> <translation>Supprimer toutes les transactions du porte-monnaie...</translation> </message> <message> - <source>ZeroMQ notification options:</source> - <translation>Options de notification ZeroMQ</translation> - </message> - <message> - <source>Password for JSON-RPC connections</source> - <translation>Mot de passe pour les connexions JSON-RPC</translation> - </message> - <message> - <source>Execute command when the best block changes (%s in cmd is replaced by block hash)</source> - <translation>Exécuter la commande lorsque le meilleur bloc change (%s dans cmd est remplacé par le hachage du bloc)</translation> - </message> - <message> - <source>Allow DNS lookups for -addnode, -seednode and -connect</source> - <translation>Autoriser les recherches DNS pour -addnode, -seednode et -connect</translation> - </message> - <message> - <source>(1 = keep tx meta data e.g. account owner and payment request information, 2 = drop tx meta data)</source> - <translation>(1 = conserver les métadonnées de transmission, p. ex. les informations du propriétaire du compte et de demande de paiement, 2 = abandonner les métadonnées de transmission)</translation> - </message> - <message> <source>-maxtxfee is set very high! Fees this large could be paid on a single transaction.</source> <translation>La valeur -maxtxfee est très élevée ! Des frais aussi élevés pourraient être payés en une seule transaction.</translation> </message> <message> - <source>Bind to given address to listen for JSON-RPC connections. This option is ignored unless -rpcallowip is also passed. Port is optional and overrides -rpcport. Use [host]:port notation for IPv6. This option can be specified multiple times (default: 127.0.0.1 and ::1 i.e., localhost, or if -rpcallowip has been specified, 0.0.0.0 and :: i.e., all addresses)</source> - <translation>Se lier à l’adresse donnée pour écouter des connexions JSON-RPC. Cette option est ignorée à moins que -rpcallowip soit aussi passé. Le port est facultatif et remplace -rpcport. Utiliser la notation [host]:port pour l’IPv6. Cette option peut être précisée plusieurs fois (par défaut : 127.0.0.1 et ::1 c.-à-d. l’hôte local ou si -rpcallowip a été précisé, 0.0.0.0 et :: c.-à-d. toutes les adresses)</translation> - </message> - <message> - <source>Do not keep transactions in the mempool longer than <n> hours (default: %u)</source> - <translation>Ne pas conserver de transactions dans la réserve de mémoire plus de <n> heures (par défaut : %u)</translation> - </message> - <message> - <source>Equivalent bytes per sigop in transactions for relay and mining (default: %u)</source> - <translation>Octets équivalents par sigop dans les transactions pour relayer et miner (par défaut : %u)</translation> - </message> - <message> <source>Error loading %s: You can't enable HD on an already existing non-HD wallet</source> <translation>Erreur de chargement de %s : vous ne pouvez pas activer HD sur un porte-monnaie non HD existant</translation> </message> <message> - <source>Error loading wallet %s. -wallet parameter must only specify a filename (not a path).</source> - <translation>Erreur de chargement du porte-monnaie %s. Le paramètre -wallet ne doit indiquer qu’un nom de fichier (pas un chemin).</translation> - </message> - <message> - <source>Fees (in %s/kB) smaller than this are considered zero fee for transaction creation (default: %s)</source> - <translation>Les frais (en %s/Ko) inférieurs à ce seuil sont considérés comme étant nuls pour la création de transactions (par défaut : %s)</translation> - </message> - <message> - <source>Force relay of transactions from whitelisted peers even if they violate local relay policy (default: %d)</source> - <translation>Forcer le relais de transactions des pairs de la liste blanche même s’ils transgressent la politique locale de relais (par défaut : %d)</translation> - </message> - <message> - <source>How thorough the block verification of -checkblocks is (0-4, default: %u)</source> - <translation>Degré de profondeur de la vérification des blocs -checkblocks (0-4, par défaut : %u)</translation> - </message> - <message> - <source>Maintain a full transaction index, used by the getrawtransaction rpc call (default: %u)</source> - <translation>Maintenir un index complet des transactions, utilisé par l’appel RPC getrawtransaction (obtenir la transaction brute) (par défaut : %u)</translation> - </message> - <message> - <source>Number of seconds to keep misbehaving peers from reconnecting (default: %u)</source> - <translation>Délai en secondes de refus de reconnexion pour les pairs présentant un mauvais comportement (par défaut : %u)</translation> - </message> - <message> - <source>Output debugging information (default: %u, supplying <category> is optional)</source> - <translation>Extraire les informations de débogage (par défaut : %u, fournir <category> est facultatif)</translation> - </message> - <message> - <source>Sets the serialization of raw transaction or block hex returned in non-verbose mode, non-segwit(0) or segwit(1) (default: %d)</source> - <translation>Définit la sérialisation de la transaction brute ou les données hexa de bloc retournées en mode non-verbose, non-segwit(0) ou segwit(1) (par défaut : %d)</translation> - </message> - <message> - <source>Specify directory to hold wallets (default: <datadir>/wallets if it exists, otherwise <datadir>)</source> - <translation>Indiquer le répertoire où placer les porte-monnaie (par défaut : <datadir>/wallets s’il existe, autrement <datadir>)</translation> - </message> - <message> - <source>Specify location of debug log file: this can be an absolute path or a path relative to the data directory (default: %s)</source> - <translation>Indiquer l’emplacement du fichier journal de débogage : ce peut être un chemin absolu ou un chemin relatif au répertoire de données (par défaut : %s)</translation> - </message> - <message> - <source>Support filtering of blocks and transaction with bloom filters (default: %u)</source> - <translation>Prendre en charge le filtrage des blocs et des transactions avec les filtres bloom (par défaut : %u)</translation> - </message> - <message> - <source>The fee rate (in %s/kB) that indicates your tolerance for discarding change by adding it to the fee (default: %s). Note: An output is discarded if it is dust at this rate, but we will always discard up to the dust relay fee and a discard fee above that is limited by the fee estimate for the longest target</source> - <translation>Le taux de frais (en %s/Ko) qui indique votre tolérance à renoncer à la monnaie en l’ajoutant aux frais (par défaut : %s). Note : une sortie est rejetée si elle est considérée comme poussière pour ce taux, mais nous rejetterons toujours jusqu’aux frais de relais poussière et des frais de rejet par delà cette valeur qui sont limités par l’estimation de frais pour la cible la plus longue </translation> - </message> - <message> <source>This is the transaction fee you may pay when fee estimates are not available.</source> <translation>Il s’agit des frais de transaction que vous pourriez payer si aucune estimation de frais n’est proposée.</translation> </message> @@ -3914,10 +3554,6 @@ <translation>La taille totale de la chaîne de version de réseau (%i) dépasse la longueur maximale (%i). Réduire le nombre ou la taille des commentaires uacomments.</translation> </message> <message> - <source>Tries to keep outbound traffic under the given target (in MiB per 24h), 0 = no limit (default: %d)</source> - <translation>Tente de garder le trafic sortant sous la cible donnée (en Mio par 24 h), 0 = sans limite (par défaut : %d)</translation> - </message> - <message> <source>Unsupported argument -socks found. Setting SOCKS version isn't possible anymore, only SOCKS5 proxies are supported.</source> <translation>L’argument non pris en charge -socks a été trouvé. Il n’est plus possible de définir la version de SOCKS, seuls les mandataires SOCKS5 sont pris en charge.</translation> </message> @@ -3926,10 +3562,6 @@ <translation>Argument non pris charge -whitelistalwaysrelay ignoré, utiliser -whitelistrelay et/ou -whitelistforcerelay.</translation> </message> <message> - <source>Use separate SOCKS5 proxy to reach peers via Tor hidden services (default: %s)</source> - <translation>Utiliser un serveur mandataire SOCKS5 séparé pour atteindre les pairs par les services cachés de Tor (par défaut : %s)</translation> - </message> - <message> <source>Warning: Unknown block versions being mined! It's possible unknown rules are in effect</source> <translation>Avertissement : des versions de blocs inconnues sont minées ! Il est possible que des règles inconnues soient en vigueur</translation> </message> @@ -3938,110 +3570,18 @@ <translation>Avertissement : le fichier du porte-monnaie est corrompu, les données ont été récupérées ! Le fichier %s original a été enregistré en tant que %s dans %s ; si votre solde ou vos transactions sont incorrects, vous devriez restaurer une sauvegarde.</translation> </message> <message> - <source>Whitelist peers connecting from the given IP address (e.g. 1.2.3.4) or CIDR notated network (e.g. 1.2.3.0/24). Can be specified multiple times.</source> - <translation>Pairs de la liste blanche se connectant à partir de l’adresse IP donnée (p. ex. 1.2.3.4) ou du réseau noté CIDR (p. ex. 1.2.3.0/24). Peut être précisé plusieurs fois.</translation> - </message> - <message> <source>%s is set very high!</source> <translation>La valeur %s est très élevée !</translation> </message> <message> - <source>(default: %s)</source> - <translation>(par défaut : %s)</translation> - </message> - <message> - <source>Always query for peer addresses via DNS lookup (default: %u)</source> - <translation>Toujours demander les adresses des pairs par recherche DNS (par défaut : %u)</translation> - </message> - <message> - <source>Error loading wallet %s. -wallet filename must be a regular file.</source> - <translation>Erreur de chargement du porte-monnaie %s. Le paramètre -wallet doit être un fichier ordinaire.</translation> - </message> - <message> <source>Error loading wallet %s. Duplicate -wallet filename specified.</source> <translation>Erreur de chargement du porte-monnaie %s. Le nom de fichier -wallet indiqué est un doublon.</translation> </message> <message> - <source>Error loading wallet %s. Invalid characters in -wallet filename.</source> - <translation>Erreur de chargement du porte-monnaie %s. Il y a des caractères invalides dans le nom de fichier -wallet.</translation> - </message> - <message> - <source>How many blocks to check at startup (default: %u, 0 = all)</source> - <translation>Nombre de blocs à vérifier au démarrage (par défaut : %u, 0 = tous)</translation> - </message> - <message> - <source>Include IP addresses in debug output (default: %u)</source> - <translation>Inclure les adresses IP à la sortie de débogage (par défaut : %u)</translation> - </message> - <message> <source>Keypool ran out, please call keypoolrefill first</source> <translation>La réserve de clés est épuisée, veuillez d’abord appeler « keypoolrefill »</translation> </message> <message> - <source>Listen for JSON-RPC connections on <port> (default: %u or testnet: %u)</source> - <translation>Écouter les connexions JSON-RPC sur <port> (par défaut : %u ou tesnet : %u)</translation> - </message> - <message> - <source>Listen for connections on <port> (default: %u or testnet: %u)</source> - <translation>Écouter les connexions sur <port> (par défaut : %u ou tesnet : %u)</translation> - </message> - <message> - <source>Maintain at most <n> connections to peers (default: %u)</source> - <translation>Garder au plus <n> connexions avec les pairs (par défaut : %u)</translation> - </message> - <message> - <source>Make the wallet broadcast transactions</source> - <translation>Obliger le porte-monnaie à diffuser les transactions</translation> - </message> - <message> - <source>Maximum per-connection receive buffer, <n>*1000 bytes (default: %u)</source> - <translation>Tampon maximal de réception par connexion, <n>*1000 octets (par défaut : %u)</translation> - </message> - <message> - <source>Maximum per-connection send buffer, <n>*1000 bytes (default: %u)</source> - <translation>Tampon maximal d’envoi par connexion », <n>*1000 octets (par défaut : %u)</translation> - </message> - <message> - <source>Prepend debug output with timestamp (default: %u)</source> - <translation>Ajouter l’estampille temporelle au début de la sortie de débogage (par défaut : %u)</translation> - </message> - <message> - <source>Relay and mine data carrier transactions (default: %u)</source> - <translation>Relayer et miner les transactions du porteur de données (par défaut : %u)</translation> - </message> - <message> - <source>Relay non-P2SH multisig (default: %u)</source> - <translation>Relayer les multisignatures non-P2SH (par défaut : %u)</translation> - </message> - <message> - <source>Set key pool size to <n> (default: %u)</source> - <translation>Définir la taille de la réserve de clés à <n> (par défaut : %u)</translation> - </message> - <message> - <source>Set maximum BIP141 block weight (default: %d)</source> - <translation>Définir le poids maximal de bloc BIP141 (par défaut : %d)</translation> - </message> - <message> - <source>Set the number of threads to service RPC calls (default: %d)</source> - <translation>Définir le nombre de fils pour les appels RPC (par défaut : %d)</translation> - </message> - <message> - <source>Specify configuration file (default: %s)</source> - <translation>Indiquer le fichier de configuration (par défaut : %s)</translation> - </message> - <message> - <source>Specify connection timeout in milliseconds (minimum: 1, default: %d)</source> - <translation>Indiquer le délai d’expiration de la connexion en millisecondes (minimum : 1, par défaut : %d)</translation> - </message> - <message> - <source>Specify pid file (default: %s)</source> - <translation>Indiquer le fichier pid (par défaut : %s)</translation> - </message> - <message> - <source>Spend unconfirmed change when sending transactions (default: %u)</source> - <translation>Dépenser la monnaie non confirmée lors de l’envoi de transactions (par défaut : %u)</translation> - </message> - <message> <source>Starting network threads...</source> <translation>Démarrage des processus réseau...</translation> </message> @@ -4058,10 +3598,6 @@ <translation>Il s’agit des frais minimaux que vous payez si vous envoyez une transaction.</translation> </message> <message> - <source>Threshold for disconnecting misbehaving peers (default: %u)</source> - <translation>Seuil de déconnexion des pairs présentant un mauvais comportement (par défaut : %u)</translation> - </message> - <message> <source>Transaction amounts must not be negative</source> <translation>Les montants transactionnels ne doivent pas être négatifs</translation> </message> @@ -4082,6 +3618,26 @@ <translation>Fonds insuffisants</translation> </message> <message> + <source>Can't generate a change-address key. Private keys are disabled for this wallet.</source> + <translation>Impossible de générer une clé d’adresse de monnaie. Les clés privées sont désactivées pour ce porte-monnaie.</translation> + </message> + <message> + <source>Cannot upgrade a non HD split wallet without upgrading to support pre split keypool. Please use -upgradewallet=169900 or -upgradewallet with no version specified.</source> + <translation>Impossible de mettre à niveau un porte-monnaie divisé non-HD sans mettre à niveau pour prendre en charge la réserve de clés antérieure à la division. Veuillez utiliser -upgradewallet=169900 ou -upgradewallet sans indiquer de version.</translation> + </message> + <message> + <source>Fee estimation failed. Fallbackfee is disabled. Wait a few blocks or enable -fallbackfee.</source> + <translation>Échec d’estimation des frais. L’option de frais de repli est désactivée. Attendez quelques blocs ou activez -fallbackfee.</translation> + </message> + <message> + <source>Warning: Private keys detected in wallet {%s} with disabled private keys</source> + <translation>Avertissement : Des clés privées ont été détectées dans le porte-monnaie {%s} dont les clés privées sont désactivées.</translation> + </message> + <message> + <source>Cannot write to data directory '%s'; check permissions.</source> + <translation>Impossible d’écrire dans le répertoire de données '%s' ; veuillez vérifier les droits.</translation> + </message> + <message> <source>Loading block index...</source> <translation>Chargement de l’index des blocs…</translation> </message> diff --git a/src/qt/locale/bitcoin_fr_FR.ts b/src/qt/locale/bitcoin_fr_FR.ts index 147c388832..10582127c4 100644 --- a/src/qt/locale/bitcoin_fr_FR.ts +++ b/src/qt/locale/bitcoin_fr_FR.ts @@ -30,6 +30,10 @@ <translation>Supprimer l'adresse sélectionnée de la liste</translation> </message> <message> + <source>Enter address or label to search</source> + <translation>Entrez une adresse ou une étiquette à rechercher</translation> + </message> + <message> <source>Export the data in the current tab to a file</source> <translation>Exporter les données de l'onglet courant vers un fichier</translation> </message> @@ -326,6 +330,14 @@ <translation>Cliquez pour désactiver l'activité du réseau.</translation> </message> <message> + <source>Network activity disabled.</source> + <translation>Activité réseau désactivée</translation> + </message> + <message> + <source>Click to enable network activity again.</source> + <translation>Cliquez pour réactiver l'activité réseau</translation> + </message> + <message> <source>Syncing Headers (%1%)...</source> <translation>Synchronisation des entêtes (%1%)...</translation> </message> @@ -390,6 +402,10 @@ <translation>Signer vos messages avec vos adresses Bitcoin pour prouver que vous les détenez</translation> </message> <message> + <source>Verify messages to ensure they were signed with specified Bitcoin addresses</source> + <translation>Vérifier les messages pour s'assurer qu'ils soient signés avec les adresses Bitcoin spécifiées</translation> + </message> + <message> <source>&File</source> <translation>&Fichier</translation> </message> @@ -414,6 +430,10 @@ <translation>Montrer la liste des adresses d'envois utilisées et les étiquettes</translation> </message> <message> + <source>Show the list of used receiving addresses and labels</source> + <translation>Afficher la liste des labels et adresses de réception utilisées</translation> + </message> + <message> <source>Open a bitcoin: URI or payment request</source> <translation>Ouvrir un bitcoin: URI ou demande de paiement</translation> </message> @@ -421,11 +441,19 @@ <source>&Command-line options</source> <translation>&Options de ligne de commande</translation> </message> + <message numerus="yes"> + <source>%n active connection(s) to Bitcoin network</source> + <translation><numerusform>%n connexion active avec le réseau Bitcoin</numerusform><numerusform>%n connexions actives avec le réseau Bitcoin</numerusform></translation> + </message> <message> <source>Indexing blocks on disk...</source> <translation>Indexation des blocs sur le disque...</translation> </message> <message> + <source>Processing blocks on disk...</source> + <translation>Traitement des blocs sur le disque</translation> + </message> + <message> <source>%1 behind</source> <translation>en retard de %1</translation> </message> @@ -454,10 +482,18 @@ <translation>À jour</translation> </message> <message> + <source>Show the %1 help message to get a list with possible Bitcoin command-line options</source> + <translation>Afficher le %1 message d'aide pour récupérer une liste des options de ligne de commande Bitcoin</translation> + </message> + <message> <source>%1 client</source> <translation>%1 client</translation> </message> <message> + <source>Connecting to peers...</source> + <translation>Connexion au pairs...</translation> + </message> + <message> <source>Catching up...</source> <translation>Rattrapage...</translation> </message> @@ -500,6 +536,14 @@ <translation>Transaction entrante</translation> </message> <message> + <source>HD key generation is <b>enabled</b></source> + <translation>Génération de clé HD <b>activée</b></translation> + </message> + <message> + <source>HD key generation is <b>disabled</b></source> + <translation>Génération de clé HD <b>désactivée</b></translation> + </message> + <message> <source>Wallet is <b>encrypted</b> and currently <b>unlocked</b></source> <translation>Le porte-monnaie est <b>chiffré</b> et est actuellement <b>déverrouillé</b></translation> </message> @@ -507,7 +551,11 @@ <source>Wallet is <b>encrypted</b> and currently <b>locked</b></source> <translation>Le porte-monnaie est <b>chiffré</b> et est actuellement <b>verrouillé</b></translation> </message> - </context> + <message> + <source>A fatal error occurred. Bitcoin can no longer continue safely and will quit.</source> + <translation>Une erreur fatale a eu lieu. Bitcoin ne peut plus continuer en toute sécurité et va s'éteindre</translation> + </message> +</context> <context> <name>CoinControlDialog</name> <message> @@ -639,6 +687,10 @@ <translation>non</translation> </message> <message> + <source>This label turns red if any recipient receives an amount smaller than the current dust threshold.</source> + <translation>Cette étiquette devient rouge si un bénéficiaire reçoit une somme plus basse que la limite actuelle de poussière.</translation> + </message> + <message> <source>Can vary +/- %1 satoshi(s) per input.</source> <translation>Peut varier de +/- %1 satoshi(s) par entrée.</translation> </message> @@ -666,12 +718,16 @@ <translation>&Étiquette</translation> </message> <message> - <source>&Address</source> - <translation>&Adresse</translation> + <source>The label associated with this address list entry</source> + <translation>L'étiquette associée à cette entrée du carnet d'adresses</translation> </message> <message> - <source>New receiving address</source> - <translation>Nouvelle adresse de réception</translation> + <source>The address associated with this address list entry. This can only be modified for sending addresses.</source> + <translation>L'adresse associée avec cette entrée du carnet d'adresses. Ne peut être modifiée que pour les adresses d'envoi.</translation> + </message> + <message> + <source>&Address</source> + <translation>&Adresse</translation> </message> <message> <source>New sending address</source> @@ -690,10 +746,6 @@ <translation>L'adresse entrée "%1" n'est pas une adresse Bitcoin valide.</translation> </message> <message> - <source>The entered address "%1" is already in the address book.</source> - <translation>L'adresse fournie « %1 » est déjà présente dans le carnet d'adresses.</translation> - </message> - <message> <source>Could not unlock wallet.</source> <translation>Impossible de déverrouiller le porte-monnaie.</translation> </message> @@ -713,6 +765,10 @@ <translation>nom</translation> </message> <message> + <source>Directory already exists. Add %1 if you intend to create a new directory here.</source> + <translation>Le répertoire existe déjà. Ajouter %1 si vous voulez créer un nouveau répertoire ici.</translation> + </message> + <message> <source>Path already exists, and is not a directory.</source> <translation>Le chemin existe déjà et ce n'est pas un répertoire. </translation> </message> @@ -739,23 +795,7 @@ <source>Command-line options</source> <translation>Options de ligne de commande</translation> </message> - <message> - <source>Usage:</source> - <translation>Utilisation :</translation> - </message> - <message> - <source>command-line options</source> - <translation>Options de ligne de commande</translation> - </message> - <message> - <source>UI Options:</source> - <translation>Options interface graphique:</translation> - </message> - <message> - <source>Start minimized</source> - <translation>Démarrer sous forme minimisée</translation> - </message> - </context> +</context> <context> <name>Intro</name> <message> @@ -779,6 +819,18 @@ <translation>Bitcoin</translation> </message> <message> + <source>At least %1 GB of data will be stored in this directory, and it will grow over time.</source> + <translation>Environ %1 GB de données seront stockées dans ce répertoire, et cela augmentera au cours du temps.</translation> + </message> + <message> + <source>Approximately %1 GB of data will be stored in this directory.</source> + <translation>Environ %1 GB de données seront stockées dans ce répertoire.</translation> + </message> + <message> + <source>The wallet will also be stored in this directory.</source> + <translation>Le porte-monnaie sera aussi stocké dans ce répertoire.</translation> + </message> + <message> <source>Error: Specified data directory "%1" cannot be created.</source> <translation>Erreur: Le répertoire de données "%1" n'a pas pu être créé. </translation> </message> @@ -1434,6 +1486,10 @@ <source>Message</source> <translation>Message</translation> </message> + <message> + <source>Wallet</source> + <translation>Portefeuille</translation> + </message> </context> <context> <name>RecentRequestsTableModel</name> @@ -1589,18 +1645,14 @@ <translation>Êtes-vous sûr de vouloir envoyer ?</translation> </message> <message> - <source>added as transaction fee</source> - <translation>Ajoute en tant que frais de transaction</translation> - </message> - <message> - <source>Total Amount %1</source> - <translation>Montant Total %1</translation> - </message> - <message> <source>or</source> <translation>ou</translation> </message> <message> + <source>Transaction fee</source> + <translation>Frais de transaction</translation> + </message> + <message> <source>Confirm send coins</source> <translation>Confirmer l'envoi des pièces</translation> </message> @@ -1810,10 +1862,6 @@ <translation>État</translation> </message> <message> - <source>, has not been successfully broadcast yet</source> - <translation>, n'a pas encore été diffusée avec succès</translation> - </message> - <message> <source>Date</source> <translation>Date</translation> </message> @@ -1944,10 +1992,6 @@ <translation>Ouvert jusqu'à %1</translation> </message> <message> - <source>Offline</source> - <translation>Hors ligne</translation> - </message> - <message> <source>Unconfirmed</source> <translation>Non Confirmé</translation> </message> @@ -1960,10 +2004,6 @@ <translation>Confirmée (%1 confirmations)</translation> </message> <message> - <source>This block was not received by any other nodes and will probably not be accepted!</source> - <translation>Ce bloc n'a été reçu par aucun autre nœud et ne sera probablement pas accepté !</translation> - </message> - <message> <source>Generated but not accepted</source> <translation>Généré mais pas accepté</translation> </message> @@ -2190,26 +2230,6 @@ <context> <name>bitcoin-core</name> <message> - <source>Options:</source> - <translation>Options :</translation> - </message> - <message> - <source>Specify data directory</source> - <translation>Spécifier le répertoire de données</translation> - </message> - <message> - <source>Specify your own public address</source> - <translation>Spécifier votre adresse publique </translation> - </message> - <message> - <source>Accept command line and JSON-RPC commands</source> - <translation>Accepter les commandes de JSON-RPC et de la ligne de commande</translation> - </message> - <message> - <source>Run in the background as a daemon and accept commands</source> - <translation>Fonctionner en arrière-plan en tant que démon et accepter les commandes</translation> - </message> - <message> <source>Unable to start HTTP server. See debug log for details.</source> <translation>Impossible de démarrer le serveur HTTP. Voir le journal de débogage pour plus de détails.</translation> </message> @@ -2218,22 +2238,6 @@ <translation>Bitcoin Core</translation> </message> <message> - <source><category> can be:</source> - <translation><category> peut être:</translation> - </message> - <message> - <source>Block creation options:</source> - <translation>Options de création de bloc:</translation> - </message> - <message> - <source>Connection options:</source> - <translation>Options de connexion:</translation> - </message> - <message> - <source>Debugging/Testing options:</source> - <translation>Options de débogage/test </translation> - </message> - <message> <source>Importing...</source> <translation> Importation ...</translation> @@ -2243,32 +2247,16 @@ Importation ...</translation> <translation>Vérifications des blocs...</translation> </message> <message> - <source>Wallet options:</source> - <translation>Options du portefeuille:</translation> - </message> - <message> - <source>(default: %u)</source> - <translation>(défaut: %u)</translation> - </message> - <message> - <source>Connect through SOCKS5 proxy</source> - <translation>Connecté au travers du proxy SOCKS5</translation> - </message> - <message> <source>Information</source> <translation>Information</translation> </message> <message> - <source>Node relay options:</source> - <translation>Options du relais de nœud: </translation> + <source>Invalid -onion address or hostname: '%s'</source> + <translation>Adresse ou nom d'hôte -onion invalide: '%s'</translation> </message> <message> - <source>RPC server options:</source> - <translation>Options de serveur RPC:</translation> - </message> - <message> - <source>Send trace/debug info to console instead of debug.log file</source> - <translation>Envoyer les informations de débogage/trace à la console au lieu du fichier debug.log</translation> + <source>Invalid -proxy address or hostname: '%s'</source> + <translation>Adresse -proxy invalide: '%s'</translation> </message> <message> <source>Signing transaction failed</source> @@ -2291,26 +2279,10 @@ Importation ...</translation> <translation>Transaction trop grande</translation> </message> <message> - <source>Username for JSON-RPC connections</source> - <translation>Nom d'utilisateur pour les connexions JSON-RPC</translation> - </message> - <message> <source>Warning</source> <translation>Attention</translation> </message> <message> - <source>Password for JSON-RPC connections</source> - <translation>Mot de passe pour les connexions JSON-RPC</translation> - </message> - <message> - <source>(default: %s)</source> - <translation>(défaut: %s)</translation> - </message> - <message> - <source>Specify pid file (default: %s)</source> - <translation>Spécifier le pid du fichier (défaut: %s)</translation> - </message> - <message> <source>Insufficient funds</source> <translation>Fonds insuffisants</translation> </message> diff --git a/src/qt/locale/bitcoin_gl.ts b/src/qt/locale/bitcoin_gl.ts index f241ae6384..b1a5cd7b64 100644 --- a/src/qt/locale/bitcoin_gl.ts +++ b/src/qt/locale/bitcoin_gl.ts @@ -26,6 +26,10 @@ <translation>Borrar a dirección actualmente seleccionada da listaxe</translation> </message> <message> + <source>Enter address or label to search</source> + <translation>Introduce dirección ou etiqueta para buscar</translation> + </message> + <message> <source>Export the data in the current tab to a file</source> <translation>Exportar os datos da pestaña actual a un arquivo.</translation> </message> @@ -381,15 +385,7 @@ <source>Command-line options</source> <translation>Opcións da liña de comandos</translation> </message> - <message> - <source>Usage:</source> - <translation>Emprego:</translation> - </message> - <message> - <source>command-line options</source> - <translation>opcións da liña de comandos</translation> - </message> - </context> +</context> <context> <name>Intro</name> <message> @@ -752,6 +748,10 @@ <source>&Save Image...</source> <translation>&Gardar Imaxe...</translation> </message> + <message> + <source>Wallet</source> + <translation>Moedeiro</translation> + </message> </context> <context> <name>RecentRequestsTableModel</name> @@ -818,6 +818,10 @@ <source>S&end</source> <translation>&Enviar</translation> </message> + <message> + <source>Transaction fee</source> + <translation>Tarifa de transacción</translation> + </message> </context> <context> <name>SendCoinsEntry</name> @@ -996,54 +1000,10 @@ <context> <name>bitcoin-core</name> <message> - <source>Options:</source> - <translation>Opcións:</translation> - </message> - <message> - <source>Specify data directory</source> - <translation>Especificar directorio de datos</translation> - </message> - <message> - <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> - <source>Specify your own public address</source> - <translation>Especificar a túa propia dirección pública</translation> - </message> - <message> - <source>Accept command line and JSON-RPC commands</source> - <translation>Aceptar liña de comandos e comandos JSON-RPC</translation> - </message> - <message> - <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> <source>Bitcoin Core</source> <translation>Core de Bitcoin</translation> </message> <message> - <source>Bind to given address and always listen on it. Use [host]:port notation for IPv6</source> - <translation>Enlazar a unha dirección dada e escoitar sempre nela. Emprega a notación [host]:post para IPv6</translation> - </message> - <message> - <source>Execute command when a wallet transaction changes (%s in cmd is replaced by TxID)</source> - <translation>Executar comando cando unha transacción do moedeiro cambia (%s no comando é substituído por TxID)</translation> - </message> - <message> - <source><category> can be:</source> - <translation><categoría> pode ser:</translation> - </message> - <message> - <source>Accept connections from outside (default: 1 if no -proxy or -connect)</source> - <translation>Aceptar conexións de fóra (por defecto: 1 se non -proxy ou -connect)</translation> - </message> - <message> - <source>Block creation options:</source> - <translation>Opcións de creación de bloque:</translation> - </message> - <message> <source>Corrupted block database detected</source> <translation>Detectada base de datos de bloques corrupta.</translation> </message> @@ -1084,30 +1044,14 @@ <translation>Non hai suficientes descritores de arquivo dispoñibles.</translation> </message> <message> - <source>Specify wallet file (within data directory)</source> - <translation>Especificar arquivo do moedeiro (dentro do directorio de datos)</translation> - </message> - <message> <source>Verifying blocks...</source> <translation>Verificando bloques...</translation> </message> <message> - <source>Execute command when a relevant alert is received or we see a really long fork (%s in cmd is replaced by message)</source> - <translation>Executar comando cando se recibe unha alerta relevante ou vemos un fork realmente longo (%s no cmd é substituído pola mensaxe)</translation> - </message> - <message> <source>Information</source> <translation>Información</translation> </message> <message> - <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> - <message> - <source>Shrink debug.log file on client startup (default: 1 when no -debug)</source> - <translation>Recortar o arquivo debug.log ao arrancar o cliente (por defecto: 1 cando no-debug)</translation> - </message> - <message> <source>Signing transaction failed</source> <translation>Fallou a sinatura da transacción</translation> </message> @@ -1120,30 +1064,10 @@ <translation>A transacción é demasiado grande</translation> </message> <message> - <source>Username for JSON-RPC connections</source> - <translation>Nome de usuario para conexións JSON-RPC</translation> - </message> - <message> <source>Warning</source> <translation>Precaución</translation> </message> <message> - <source>You need to rebuild the database using -reindex to change -txindex</source> - <translation>Precisas reconstruír a base de datos empregando -reindex para cambiar -txindex</translation> - </message> - <message> - <source>Password for JSON-RPC connections</source> - <translation>Contrasinal para conexións JSON-RPC</translation> - </message> - <message> - <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> - <source>Allow DNS lookups for -addnode, -seednode and -connect</source> - <translation>Permitir lookup de DNS para -addnote, -seednote e -connect</translation> - </message> - <message> <source>Unknown network specified in -onlynet: '%s'</source> <translation>Rede descoñecida especificada en -onlynet: '%s'</translation> </message> diff --git a/src/qt/locale/bitcoin_he.ts b/src/qt/locale/bitcoin_he.ts index bae077056a..cf884f0fc7 100644 --- a/src/qt/locale/bitcoin_he.ts +++ b/src/qt/locale/bitcoin_he.ts @@ -3,7 +3,7 @@ <name>AddressBookPage</name> <message> <source>Right-click to edit address or label</source> - <translation>לחץ מקש ימני כדי לערוך כתובת או תווית</translation> + <translation>יש ללחוץ על הכפתור הימני כדי לערוך כתובת או תווית</translation> </message> <message> <source>Create a new address</source> @@ -15,7 +15,7 @@ </message> <message> <source>Copy the currently selected address to the system clipboard</source> - <translation>העתקת הכתובת המסומנת ללוח הגזירים</translation> + <translation>העתק את הכתובת המסומנת ללוח העריכה</translation> </message> <message> <source>&Copy</source> @@ -30,6 +30,10 @@ <translation>מחיקת הכתובת שנבחרה מהרשימה</translation> </message> <message> + <source>Enter address or label to search</source> + <translation>נא להזין כתובת או תווית לחיפוש</translation> + </message> + <message> <source>Export the data in the current tab to a file</source> <translation>יצוא הנתונים מהלשונית הנוכחית לקובץ</translation> </message> @@ -75,7 +79,7 @@ </message> <message> <source>Copy &Label</source> - <translation>העתקת &תוית</translation> + <translation>העתקת &תווית</translation> </message> <message> <source>&Edit</source> @@ -132,6 +136,10 @@ <translation>נא לחזור על מילת הצופן החדשה</translation> </message> <message> + <source>Show password</source> + <translation>הצג סיסמא</translation> + </message> + <message> <source>Enter the new passphrase to the wallet.<br/>Please use a passphrase of <b>ten or more random characters</b>, or <b>eight or more words</b>.</source> <translation>נא להזין את מילת הצופן לארנק.<br/>נא להשתמש במילת צופן המורכבת מ<b>עשרה או יותר תווים אקראיים</b>, או <b>שמונה מילים ומעלה</b>.</translation> </message> @@ -318,6 +326,14 @@ <translation>פתיחת &כתובת משאב…</translation> </message> <message> + <source>Wallet:</source> + <translation>ארנק:</translation> + </message> + <message> + <source>default wallet</source> + <translation>ארנק בררת מחדל</translation> + </message> + <message> <source>Click to disable network activity.</source> <translation>יש ללחוץ כדי לנטרל פעילות רשת.</translation> </message> @@ -338,6 +354,10 @@ <translation>המקטעים נוספים למפתח בכונן…</translation> </message> <message> + <source>Proxy is <b>enabled</b>: %1</source> + <translation>שרת הפרוקסי <b>פעיל</b>: %1</translation> + </message> + <message> <source>Send coins to a Bitcoin address</source> <translation>שליחת מטבעות לכתובת ביטקוין</translation> </message> @@ -435,11 +455,11 @@ </message> <message numerus="yes"> <source>%n active connection(s) to Bitcoin network</source> - <translation><numerusform>חיבור אחד פעיל לרשת ביטקוין</numerusform><numerusform>%n חיבורים פעילים לרשת ביטקוין</numerusform></translation> + <translation><numerusform>חיבור אחד פעיל לרשת ביטקוין</numerusform><numerusform>%n חיבורים פעילים לרשת ביטקוין</numerusform><numerusform>%n חיבורים פעילים לרשת ביטקוין</numerusform><numerusform>%n חיבורים פעילים לרשת ביטקוין</numerusform></translation> </message> <message> <source>Indexing blocks on disk...</source> - <translation>מאנדקס את הבלוקים על הכונן...</translation> + <translation>המקטעים על הכונן מסודרים באינדקס…</translation> </message> <message> <source>Processing blocks on disk...</source> @@ -502,6 +522,12 @@ </translation> </message> <message> + <source>Wallet: %1 +</source> + <translation>ארנק: %1 +</translation> + </message> + <message> <source>Type: %1 </source> <translation>סוג: %1 @@ -722,10 +748,6 @@ <translation>&כתובת</translation> </message> <message> - <source>New receiving address</source> - <translation>כתובת קבלה חדשה</translation> - </message> - <message> <source>New sending address</source> <translation>כתובת שליחה חדשה</translation> </message> @@ -742,8 +764,12 @@ <translation>הכתובת שהוקלדה „%1” היא אינה כתובת ביטקוין תקנית.</translation> </message> <message> - <source>The entered address "%1" is already in the address book.</source> - <translation>הכתובת שהוקלדה „%1” כבר נמצאת בספר הכתובות.</translation> + <source>Address "%1" already exists as a receiving address with label "%2" and so cannot be added as a sending address.</source> + <translation>כתובת "%1" כבר קיימת ככתובת מקבלת עם תווית "%2" ולכן לא ניתן להוסיף אותה ככתובת שולחת</translation> + </message> + <message> + <source>The entered address "%1" is already in the address book with label "%2".</source> + <translation>הכתובת שהוכנסה "%1" כבר נמצאת בפנקס הכתובות עם התווית "%2".</translation> </message> <message> <source>Could not unlock wallet.</source> @@ -795,42 +821,6 @@ <source>Command-line options</source> <translation>אפשרויות שורת פקודה</translation> </message> - <message> - <source>Usage:</source> - <translation>שימוש:</translation> - </message> - <message> - <source>command-line options</source> - <translation>אפשרויות שורת פקודה</translation> - </message> - <message> - <source>UI Options:</source> - <translation>אפשרויות ממשק</translation> - </message> - <message> - <source>Choose data directory on startup (default: %u)</source> - <translation>נא לבחור תיקיית נתונים עם הפתיחה (בררת מחדל: %u)</translation> - </message> - <message> - <source>Set language, for example "de_DE" (default: system locale)</source> - <translation>הגדרת השפה, לדוגמה „he_IL” (בררת מחדל: שפת העמרכת)</translation> - </message> - <message> - <source>Start minimized</source> - <translation>התחלה במצב ממוזער</translation> - </message> - <message> - <source>Set SSL root certificates for payment request (default: -system-)</source> - <translation>הגדרת אישורי בסיס SSL לבקשות תשלומים (בררת מחדל: -מערכת-)</translation> - </message> - <message> - <source>Show splash screen on startup (default: %u)</source> - <translation>הצגת מסך פתיחה בעת הפעלה (בררת מחדל: %u)</translation> - </message> - <message> - <source>Reset all settings changed in the GUI</source> - <translation>איפוס כל שינויי הגדרות התצוגה</translation> - </message> </context> <context> <name>Intro</name> @@ -896,11 +886,11 @@ </message> <message numerus="yes"> <source>%n GB of free space available</source> - <translation><numerusform>ג״ב של מקום פנוי זמין</numerusform><numerusform>%n ג״ב של מקום פנוי זמינים</numerusform></translation> + <translation><numerusform>ג״ב של מקום פנוי זמין</numerusform><numerusform>%n ג״ב של מקום פנוי זמינים</numerusform><numerusform>%n ג״ב של מקום פנוי זמינים</numerusform><numerusform>%n ג״ב של מקום פנוי זמינים</numerusform></translation> </message> <message numerus="yes"> <source>(of %n GB needed)</source> - <translation><numerusform>(מתוך %n ג״ב נדרשים)</numerusform><numerusform>(מתוך %n ג״ב נדרשים)</numerusform></translation> + <translation><numerusform>(מתוך %n ג״ב נדרשים)</numerusform><numerusform>(מתוך %n ג״ב נדרשים)</numerusform><numerusform>(מתוך %n ג״ב נדרשים)</numerusform><numerusform>(מתוך %n ג״ב נדרשים)</numerusform></translation> </message> </context> <context> @@ -1012,6 +1002,10 @@ <translation>כתובת ה־IP של המתווך (לדוגמה IPv4: 127.0.0.1 / IPv6: ::1)</translation> </message> <message> + <source>Hide the icon from the system tray.</source> + <translation>הסתר את סמל מגש המערכת</translation> + </message> + <message> <source>Minimize instead of exit the application when the window is closed. When this option is enabled, the application will be closed only after selecting Exit in the menu.</source> <translation>מזער ואל תצא מהאפליקציה עם סגירת החלון. כאשר אפשרות זו דלוקה, האפליקציה תיסגר רק בבחירת ״יציאה״ בתפריט.</translation> </message> @@ -1044,6 +1038,18 @@ <translation>&רשת</translation> </message> <message> + <source>Disables some advanced features but all blocks will still be fully validated. Reverting this setting requires re-downloading the entire blockchain. Actual disk usage may be somewhat higher.</source> + <translation>משבית מספר תכונות מתקדמות אבל כל הבלוקים עדיין יעברו אימות מלא. שינוי של הגדרה זו מצריך הורדה מחדש של הבלוקצ'יין. נצילות הדיסק עלולה לעלות.</translation> + </message> + <message> + <source>GB</source> + <translation>ג״ב</translation> + </message> + <message> + <source>Reverting this setting requires re-downloading the entire blockchain.</source> + <translation>שינוי הגדרה זו מצריך הורדה מחדש של הבלוקצ'יין</translation> + </message> + <message> <source>(0 = auto, <0 = leave that many cores free)</source> <translation>(0 = אוטומטי, <0 = להשאיר כזאת כמות של ליבות חופשיות)</translation> </message> @@ -1076,10 +1082,22 @@ <translation>מיפוי פתחה באמצעות UPnP</translation> </message> <message> + <source>Accept connections from outside.</source> + <translation>אשר חיבורים חיצוניים</translation> + </message> + <message> + <source>Allow incomin&g connections</source> + <translation>לאפשר חיבורים &נכנסים</translation> + </message> + <message> <source>Connect to the Bitcoin network through a SOCKS5 proxy.</source> <translation>התחבר לרשת הביטקוין דרך פרוקסי SOCKS5.</translation> </message> <message> + <source>&Connect through SOCKS5 proxy (default proxy):</source> + <translation>להתחבר &דרך מתווך SOCKS5 (מתווך בררת מחדל):</translation> + </message> + <message> <source>Proxy &IP:</source> <translation>כתובת ה־IP של המ&תווך:</translation> </message> @@ -1108,6 +1126,10 @@ <translation>Tor</translation> </message> <message> + <source>Connect to the Bitcoin network through a separate SOCKS5 proxy for Tor hidden services.</source> + <translation>התחברות לרשת ביטקוין דרך מתווך SOCKS5 נפרד לשירותי Tor נסתרים.</translation> + </message> + <message> <source>&Window</source> <translation>&חלון</translation> </message> @@ -1290,6 +1312,14 @@ <translation>טיפול בכתובות</translation> </message> <message> + <source>'bitcoin://' is not a valid URI. Use 'bitcoin:' instead.</source> + <translation>'//:bitcoin' אינה כתובת URI תקינה. השתמשו במקום ב ':bitcoin'.</translation> + </message> + <message> + <source>Payment request fetch URL is invalid: %1</source> + <translation>כתובת ה URL של בקשת התשלום אינה תקינה : %1</translation> + </message> + <message> <source>Invalid payment address %1</source> <translation>כתובת תשלום שגויה %1</translation> </message> @@ -1338,6 +1368,10 @@ <translation>זיכוי מאת %1</translation> </message> <message> + <source>Payment request %1 is too large (%2 bytes, allowed %3 bytes).</source> + <translation>בקשת התשלום %1 גדולה מדי (%2 בתים, מורשה %3 בתים).</translation> + </message> + <message> <source>Error communicating with %1: %2</source> <translation>שגיאה בעת יצירת קשר עם %1: %2</translation> </message> @@ -1425,23 +1459,23 @@ </message> <message numerus="yes"> <source>%n second(s)</source> - <translation><numerusform>שנייה אחת</numerusform><numerusform>%n שניות</numerusform></translation> + <translation><numerusform>שנייה אחת</numerusform><numerusform>%n שניות</numerusform><numerusform>%n שניות</numerusform><numerusform>%n שניות</numerusform></translation> </message> <message numerus="yes"> <source>%n minute(s)</source> - <translation><numerusform>דקה אחת</numerusform><numerusform>%n דקות</numerusform></translation> + <translation><numerusform>דקה אחת</numerusform><numerusform>%n דקות</numerusform><numerusform>%n דקות</numerusform><numerusform>%n דקות</numerusform></translation> </message> <message numerus="yes"> <source>%n hour(s)</source> - <translation><numerusform>שעה אחת</numerusform><numerusform>%n שעות</numerusform></translation> + <translation><numerusform>שעה אחת</numerusform><numerusform>%n שעות</numerusform><numerusform>%n שעות</numerusform><numerusform>%n שעות</numerusform></translation> </message> <message numerus="yes"> <source>%n day(s)</source> - <translation><numerusform>יום אחד</numerusform><numerusform>%n ימים</numerusform></translation> + <translation><numerusform>יום אחד</numerusform><numerusform>%n ימים</numerusform><numerusform>%n ימים</numerusform><numerusform>%n ימים</numerusform></translation> </message> <message numerus="yes"> <source>%n week(s)</source> - <translation><numerusform>שבוע אחד</numerusform><numerusform>%n שבועות</numerusform></translation> + <translation><numerusform>שבוע אחד</numerusform><numerusform>%n שבועות</numerusform><numerusform>%n שבועות</numerusform><numerusform>%n שבועות</numerusform></translation> </message> <message> <source>%1 and %2</source> @@ -1449,7 +1483,7 @@ </message> <message numerus="yes"> <source>%n year(s)</source> - <translation><numerusform>שנה אחת</numerusform><numerusform>%n שנים</numerusform></translation> + <translation><numerusform>שנה אחת</numerusform><numerusform>%n שנים</numerusform><numerusform>%n שנים</numerusform><numerusform>%n שנים</numerusform></translation> </message> <message> <source>%1 B</source> @@ -1479,12 +1513,16 @@ <context> <name>QObject::QObject</name> <message> + <source>Error parsing command line arguments: %1.</source> + <translation>שגיאה בפענוח ארגומנטים בשורת הפקודה: %1.</translation> + </message> + <message> <source>Error: Specified data directory "%1" does not exist.</source> <translation>שגיאה: תיקיית הנתונים שצוינה „%1” אינה קיימת.</translation> </message> <message> - <source>Error: Cannot parse configuration file: %1. Only use key=value syntax.</source> - <translation>שגיאה: לא ניתן לפענח את התצורה: %1. יש להשתמש אך ורק בתחביר מפתח=ערך.</translation> + <source>Error: Cannot parse configuration file: %1.</source> + <translation>שגיאה: כשל בפענוח קובץ הקונפיגורציה: %1.</translation> </message> <message> <source>Error: %1</source> @@ -1570,11 +1608,19 @@ </message> <message> <source>Current number of transactions</source> - <translation>מספר הפעולה הנוכחי</translation> + <translation>מספר עסקאות נוכחי</translation> </message> <message> <source>Memory usage</source> - <translation>שימוש בזכרון</translation> + <translation>ניצול זכרון</translation> + </message> + <message> + <source>Wallet: </source> + <translation>ארנק:</translation> + </message> + <message> + <source>(none)</source> + <translation>(אין)</translation> </message> <message> <source>&Reset</source> @@ -1665,6 +1711,10 @@ <translation>פינג</translation> </message> <message> + <source>Min Ping</source> + <translation>פינג מינימלי</translation> + </message> + <message> <source>Time Offset</source> <translation>הפרש זמן</translation> </message> @@ -1733,6 +1783,10 @@ <translation>&שחרור חסימה</translation> </message> <message> + <source>default wallet</source> + <translation>ארנק בררת מחדל</translation> + </message> + <message> <source>Welcome to the %1 RPC console.</source> <translation>ברוך בואך למסוף ה־RPC של %1.</translation> </message> @@ -1741,6 +1795,14 @@ <translation>יש להשתמש בחצים למעלה ומלטה כדי לנווט בהסיטוריה וב־%1 כדי לנקות את המסך.</translation> </message> <message> + <source>Type %1 for an overview of available commands.</source> + <translation>הקלידו %1 לקבלת סקירה של הפקודות הזמינות.</translation> + </message> + <message> + <source>For more information on using this console type %1.</source> + <translation>למידע נוסף על שימוש במסוף בקרה מסוג זה %1.</translation> + </message> + <message> <source>WARNING: Scammers have been active, telling users to type commands here, stealing their wallet contents. Do not use this console without fully understanding the ramifications of a command.</source> <translation>אזהרה! ישנם רמאים הנוהגים לשכנע משתמשים להקליד פקודות כאן ועל ידי כך לגנוב את תכולת הארנק שלהם. אל תשתמש במסוף הבקרה מבלי שאתה מבין באופן מלא את המשמעות של הפקודה!</translation> </message> @@ -1749,6 +1811,14 @@ <translation>פעילות הרשת נוטרלה</translation> </message> <message> + <source>Executing command without any wallet</source> + <translation>מבצע פקודה ללא כל ארנק</translation> + </message> + <message> + <source>Executing command using "%1" wallet</source> + <translation>מבצע פקודה באמצעות ארנק "%1" </translation> + </message> + <message> <source>via %1</source> <translation>דרך %1</translation> </message> @@ -1816,6 +1886,14 @@ <translation>ניקוי</translation> </message> <message> + <source>Native segwit addresses (aka Bech32 or BIP-173) reduce your transaction fees later on and offer better protection against typos, but old wallets don't support them. When unchecked, an address compatible with older wallets will be created instead.</source> + <translation>כתובות segwit טבעיות (כלומר Bech32 או BIP-173) מפחיתות את עמלת העסקה שלכם בהמשך ומציעות הגנה נגד שגיאות כתיב, אך ארנקים ישנים לא תומכים בהן. אם לא סומן, כתובת תאימה לארנקים ישנים תיווצר במקום.</translation> + </message> + <message> + <source>Generate native segwit (Bech32) address</source> + <translation>הפקת כתובת segwit טבעית (Bech32)</translation> + </message> + <message> <source>Requested payments history</source> <translation>היסטוריית בקשות תשלום</translation> </message> @@ -1903,10 +1981,18 @@ <translation>הודעה</translation> </message> <message> + <source>Wallet</source> + <translation>ארנק</translation> + </message> + <message> <source>Resulting URI too long, try to reduce the text for label / message.</source> <translation>הכתובת שנוצרה ארוכה מדי, כדאי לנסות לקצר את הטקסט של התווית / הודעה.</translation> </message> - </context> + <message> + <source>Error encoding URI into QR Code.</source> + <translation>שגיאה בקידוד ה URI לברקוד.</translation> + </message> +</context> <context> <name>RecentRequestsTableModel</name> <message> @@ -2001,6 +2087,10 @@ <translation>בחר...</translation> </message> <message> + <source>Using the fallbackfee can result in sending a transaction that will take several hours or days (or never) to confirm. Consider choosing your fee manually or wait until you have validated the complete chain.</source> + <translation>שימוש בעמלת בררת המחדל עלול לגרום לשליחת עסקה שתכלל בבלוק עוד מספר שעות או ימים (או לעולם לא). נא שקלו בחירה ידנית של העמלה או המתינו לאימות מלא של הבלוקצ'יין.</translation> + </message> + <message> <source>Warning: Fee estimation is currently not possible.</source> <translation>אזהרה</translation> </message> @@ -2009,6 +2099,14 @@ <translation>צמצום הגדרות עמלה</translation> </message> <message> + <source>Specify a custom fee per kB (1,000 bytes) of the transaction's virtual size. + +Note: Since the fee is calculated on a per-byte basis, a fee of "100 satoshis per kB" for a transaction size of 500 bytes (half of 1 kB) would ultimately yield a fee of only 50 satoshis.</source> + <translation>ציינו עמלה מותאמת אישית פר קילובייט (1000 בתים) של הגודל הוירטואלי של העסקה. + +לתשומת לבכם: מאחר והעמלה מחושבת על בסיס פר-בית, עמלה של "100 סטושי פר קילובייט" עבור עסקה בגודל 500 בתים (חצי קילובייט) תפיק בסופו של דבר עמלה של 50 סטושי בלבד.</translation> + </message> + <message> <source>per kilobyte</source> <translation>עבור קילו-בית</translation> </message> @@ -2017,6 +2115,10 @@ <translation>הסתר</translation> </message> <message> + <source>Paying only the minimum fee is just fine as long as there is less transaction volume than space in the blocks. But be aware that this can end up in a never confirming transaction once there is more demand for bitcoin transactions than the network can process.</source> + <translation>זה בסדר לשלם את העמלה המינימלית כל עוד נפח הטרנזקציות קטן מנפח הבלוקים. אבל יש להיזהר כיוון שבמידה והעומס ברשת גדל, העיסקה עלולה לא להיות מאושרת לעולם.</translation> + </message> + <message> <source>Recommended:</source> <translation>מומלץ:</translation> </message> @@ -2025,6 +2127,10 @@ <translation>מותאם אישית:</translation> </message> <message> + <source>(Smart fee not initialized yet. This usually takes a few blocks...)</source> + <translation>(שירות עמלה חכמה לא אותחל עדיין. יש להמתין מספר בלוקים...)</translation> + </message> + <message> <source>Send to multiple recipients at once</source> <translation>שליחה למספר מוטבים בו־זמנית</translation> </message> @@ -2041,6 +2147,18 @@ <translation>אבק:</translation> </message> <message> + <source>Confirmation time target:</source> + <translation>זמן לקבלת אישור:</translation> + </message> + <message> + <source>Enable Replace-By-Fee</source> + <translation>אפשר ״החלפה-על ידי עמלה״</translation> + </message> + <message> + <source>With Replace-By-Fee (BIP-125) you can increase a transaction's fee after it is sent. Without this, a higher fee may be recommended to compensate for increased transaction delay risk.</source> + <translation>באמצעות עמלה-ניתנת-לשינוי (BIP-125) תוכלו להגדיל עמלת עסקה גם לאחר שליחתה. ללא אפשרות זו, עמלה גבוהה יותר יכולה להיות מומלצת כדי להקטין את הסיכון בעיכוב אישור העסקה.</translation> + </message> + <message> <source>Clear &All</source> <translation>&ניקוי הכול</translation> </message> @@ -2089,16 +2207,24 @@ <translation>לשלוח?</translation> </message> <message> - <source>added as transaction fee</source> - <translation>נוספה עמלת העברה</translation> + <source>or</source> + <translation>או</translation> </message> <message> - <source>Total Amount %1</source> - <translation>סכום כולל %1</translation> + <source>You can increase the fee later (signals Replace-By-Fee, BIP-125).</source> + <translation>תוכלו להגדיל את העמלה מאוחר יותר (איתות Replace-By-Fee, BIP-125).</translation> </message> <message> - <source>or</source> - <translation>או</translation> + <source>Please, review your transaction.</source> + <translation>אנא עברו שוב על העסקה שלכם.</translation> + </message> + <message> + <source>Transaction fee</source> + <translation>עמלת העברה</translation> + </message> + <message> + <source>Total Amount</source> + <translation>סכום כולל</translation> </message> <message> <source>Confirm send coins</source> @@ -2117,6 +2243,10 @@ <translation>הסכום חורג מהמאזן שלך.</translation> </message> <message> + <source>The total exceeds your balance when the %1 transaction fee is included.</source> + <translation>הסכום גבוה מהמאזן שלכם לאחר כלילת עמלת עסקה %1.</translation> + </message> + <message> <source>Duplicate address found: addresses should only be used once each.</source> <translation>נמצאה כתובת כפולה: יש להשתמש בכל כתובת פעם אחת בלבד.</translation> </message> @@ -2212,6 +2342,10 @@ <translation>ה&חסרת העמלה מהסכום</translation> </message> <message> + <source>Use available balance</source> + <translation>השתמש בכלל היתרה</translation> + </message> + <message> <source>Message:</source> <translation>הודעה:</translation> </message> @@ -2418,6 +2552,10 @@ <translation>פתוחה עד %1</translation> </message> <message> + <source>conflicted with a transaction with %1 confirmations</source> + <translation>ישנה סתירה עם עסקה שעברה %1 אימותים</translation> + </message> + <message> <source>in memory pool</source> <translation>במאגר הזיכרון</translation> </message> @@ -2430,6 +2568,10 @@ <translation>ננטש</translation> </message> <message> + <source>%1 confirmations</source> + <translation>%1 אימותים</translation> + </message> + <message> <source>Status</source> <translation>מצב</translation> </message> @@ -2473,6 +2615,10 @@ <source>Credit</source> <translation>אשראי</translation> </message> + <message numerus="yes"> + <source>matures in %n more block(s)</source> + <translation><numerusform>הבשלה בעוד בלוק %n</numerusform><numerusform>הבשלה בעוד %n בלוקים</numerusform><numerusform>הבשלה בעוד %n בלוקים</numerusform><numerusform>הבשלה בעוד %n בלוקים</numerusform></translation> + </message> <message> <source>not accepted</source> <translation>לא התקבל</translation> @@ -2514,6 +2660,10 @@ <translation>גודל ההעברה הכללי</translation> </message> <message> + <source>Transaction virtual size</source> + <translation>גודל וירטואלי של עסקה</translation> + </message> + <message> <source>Output index</source> <translation>מפתח פלט</translation> </message> @@ -2522,6 +2672,10 @@ <translation>סוחר</translation> </message> <message> + <source>Generated coins must mature %1 blocks before they can be spent. When you generated this block, it was broadcast to the network to be added to the block chain. If it fails to get into the chain, its state will change to "not accepted" and it won't be spendable. This may occasionally happen if another node generates a block within a few seconds of yours.</source> + <translation>מטבעות מופקים חייבים להבשיל במשך %1 בלוקים לפני שניתן לבזבזם. כשהפקתם בלוק זה, הבלוק שודר לרשת לצורך הוספה לבלוקצ'יין. אם הבלוק לא יתווסף לבלוקצ'יין, מצב הבלוק ישונה ל "לא התקבל" ולא יהיה ניתן לבזבזו. מצב זה עלול לקרות כאשר שרת ביטקוין אחר מפיק בלוק בהפרש של כמה שניות משלכם.</translation> + </message> + <message> <source>Debug information</source> <translation>פרטי ניפוי שגיאות</translation> </message> @@ -2573,17 +2727,13 @@ </message> <message numerus="yes"> <source>Open for %n more block(s)</source> - <translation><numerusform>פתוחה למשך בלוק אחד נוסף</numerusform><numerusform>פתוחה למשך %n בלוקים נוספים</numerusform></translation> + <translation><numerusform>פתוחה למשך בלוק אחד נוסף</numerusform><numerusform>פתוחה למשך %n בלוקים נוספים</numerusform><numerusform>פתוחה למשך %n בלוקים נוספים</numerusform><numerusform>פתוחה למשך %n בלוקים נוספים</numerusform></translation> </message> <message> <source>Open until %1</source> <translation>פתוחה עד %1</translation> </message> <message> - <source>Offline</source> - <translation>לא מקוונת</translation> - </message> - <message> <source>Unconfirmed</source> <translation>לא מאושרת</translation> </message> @@ -2608,10 +2758,6 @@ <translation>צעירה (%1 אישורים, תהיה זמינה לאחר %2)</translation> </message> <message> - <source>This block was not received by any other nodes and will probably not be accepted!</source> - <translation>בלוק זה לא התקבל על ידי אף צומת אחר וככל הנראה לא יאושר!</translation> - </message> - <message> <source>Generated but not accepted</source> <translation>הבלוק יוצר אך לא אושר</translation> </message> @@ -2659,7 +2805,15 @@ <source>Type of transaction.</source> <translation>סוג ההעברה.</translation> </message> - </context> + <message> + <source>User-defined intent/purpose of the transaction.</source> + <translation>ייעוד/תכלית מגדר ע"י המשתמש של העסקה.</translation> + </message> + <message> + <source>Amount removed from or added to balance.</source> + <translation>סכום ירד או התווסף למאזן</translation> + </message> +</context> <context> <name>TransactionView</name> <message> @@ -2711,6 +2865,10 @@ <translation>אחר</translation> </message> <message> + <source>Enter address, transaction id, or label to search</source> + <translation>הכנס כתובת, מזהה העברה, או תווית לחיפוש</translation> + </message> + <message> <source>Min amount</source> <translation>סכום מזערי</translation> </message> @@ -2719,6 +2877,10 @@ <translation>נטישת העברה</translation> </message> <message> + <source>Increase transaction fee</source> + <translation>הגדל עמלת העברה</translation> + </message> + <message> <source>Copy address</source> <translation>העתקת הכתובת</translation> </message> @@ -2832,6 +2994,10 @@ <translation>שליחת מטבעות</translation> </message> <message> + <source>Increasing transaction fee failed</source> + <translation>כשל בהעלאת עמלת עסקה</translation> + </message> + <message> <source>Do you want to increase the fee?</source> <translation>להגדיל את העמלה?</translation> </message> @@ -2890,36 +3056,20 @@ <source>The wallet data was successfully saved to %1.</source> <translation>נתוני הארנק נשמרו בהצלחה אל %1.</translation> </message> + <message> + <source>Cancel</source> + <translation>ביטול</translation> + </message> </context> <context> <name>bitcoin-core</name> <message> - <source>Options:</source> - <translation>אפשרויות:</translation> - </message> - <message> - <source>Specify data directory</source> - <translation>ציון תיקיית נתונים</translation> - </message> - <message> - <source>Connect to a node to retrieve peer addresses, and disconnect</source> - <translation>יש להתחבר למפרק כדי לדלות כתובות עמיתים ואז להתנתק</translation> - </message> - <message> - <source>Specify your own public address</source> - <translation>נא לציין את הכתובת הפומבית שלך</translation> - </message> - <message> - <source>Accept command line and JSON-RPC commands</source> - <translation>קבלת פקודות משורת הפקודה ומ־JSON-RPC</translation> - </message> - <message> <source>Error: A fatal internal error occurred, see debug.log for details</source> <translation>שגיאה: סניה קלמה קריטית פנימית קרטה, פנה ל debug.log לפרטים</translation> </message> <message> - <source>Run in the background as a daemon and accept commands</source> - <translation>ריצה כסוכן ברקע וקבלת פקודות</translation> + <source>Unable to start HTTP server. See debug log for details.</source> + <translation>שרת ה HTTP לא עלה. ראו את ה debug לוג לפרטים.</translation> </message> <message> <source>Bitcoin Core</source> @@ -2930,58 +3080,42 @@ <translation>ה %s מפתחים</translation> </message> <message> - <source>Bind to given address and always listen on it. Use [host]:port notation for IPv6</source> - <translation>להתאגד לכתובת נתונה להאזין לה תמיד. יש להשתמש בצורה [host]:port עבור IPv6.</translation> + <source>Please check that your computer's date and time are correct! If your clock is wrong, %s will not work properly.</source> + <translation>נא בדקו שהתאריך והשעה במחשב שלכם נכונים! אם השעון שלכם לא מסונכרן, %s לא יעבוד כהלכה.</translation> </message> <message> - <source>Delete all wallet transactions and only recover those parts of the blockchain through -rescan on startup</source> - <translation>מחיקת כל העברות הארנק ולשחזר רק את החלקים המסוימים בשרשרת המקטעים באמצעות -rescan עם ההפעלה</translation> + <source>Please contribute if you find %s useful. Visit %s for further information about the software.</source> + <translation>אנא שקלו תרומה אם מצאתם את %s שימושי. בקרו ב %s למידע נוסף על התוכנה.</translation> </message> <message> - <source>Execute command when a wallet transaction changes (%s in cmd is replaced by TxID)</source> - <translation>ביצוע פקודה כאשר העברה בארנק משתנה (%s ב־cmd יוחלף ב־TxID)</translation> + <source>The block database contains a block which appears to be from the future. This may be due to your computer's date and time being set incorrectly. Only rebuild the block database if you are sure that your computer's date and time are correct</source> + <translation>מאגר נתוני הבלוקים מכיל בלוק עם תאריך עתידי. הדבר יכול להיגרם מתאריך ושעה שגויים במחשב שלכם. בצעו בנייה מחדש של מאגר נתוני הבלוקים רק אם אתם בטוחים שהתאריך והשעה במחשבכם נכונים</translation> </message> <message> - <source>Use UPnP to map the listening port (default: 1 when listening and no -proxy)</source> - <translation>שימוש ב־UPnP כדי למפות את הפתחה להאזנה (בררת מחדל: 1 בעת האזנה ובלי -proxy)</translation> + <source>This is a pre-release test build - use at your own risk - do not use for mining or merchant applications</source> + <translation>קוד זה הינו גרסת טסט טרום-פרסומית. *שימוש על אחריותכם בלבד* אין לעשות שימוש בקוד לצרכי כריית בלוקים או אפליקציות מסחר.</translation> </message> <message> - <source>Warning: The network does not appear to fully agree! Some miners appear to be experiencing issues.</source> - <translation>אזהרה: נראה כי הרשת אינה מסכימה באופן מלא! חלק מהכורים חווים תקלות.</translation> - </message> - <message> - <source>-maxmempool must be at least %d MB</source> - <translation>-maxmempool חייב להיות לפחות %d מ״ב</translation> - </message> - <message> - <source><category> can be:</source> - <translation><קטגוריה> יכולה להיות:</translation> + <source>Unable to replay blocks. You will need to rebuild the database using -reindex-chainstate.</source> + <translation> שידור-חוזר של הבלוקים לא הצליח. תצטרכו לבצע בנייה מחדש של מאגר הנתונים באמצעות הדגל reindex-chainstate-.</translation> </message> <message> - <source>Accept connections from outside (default: 1 if no -proxy or -connect)</source> - <translation>קבלת חיבורים מבחוץ (בררת מחדל: 1 ללא -proxy או -connect)</translation> + <source>Unable to rewind the database to a pre-fork state. You will need to redownload the blockchain</source> + <translation>הרצה-לאחור של מאגר הנתונים למצב טרום-פיצולי לא הצליחה. תצטרכו להוריד מחדש את הבלוקצ'יין.</translation> </message> <message> - <source>Append comment to the user agent string</source> - <translation>הוספת הערה למחרוזת סוכן המשתמש</translation> - </message> - <message> - <source>Block creation options:</source> - <translation>אפשרויות יצירת מקטע:</translation> + <source>Warning: The network does not appear to fully agree! Some miners appear to be experiencing issues.</source> + <translation>אזהרה: נראה כי הרשת אינה מסכימה באופן מלא! חלק מהכורים חווים תקלות.</translation> </message> <message> - <source>Chain selection options:</source> - <translation>אפשרויות בחירת שרשרת:</translation> + <source>-maxmempool must be at least %d MB</source> + <translation>-maxmempool חייב להיות לפחות %d מ״ב</translation> </message> <message> <source>Change index out of range</source> <translation>אינדקס העודף מחוץ לתחום</translation> </message> <message> - <source>Connection options:</source> - <translation>הגדרות חיבור:</translation> - </message> - <message> <source>Copyright (C) %i-%i</source> <translation>כל הזכויות שמורות (C) %i-%i</translation> </message> @@ -2990,18 +3124,14 @@ <translation>התגלה מסד נתוני מקטעים לא תקין</translation> </message> <message> - <source>Debugging/Testing options:</source> - <translation>אפשרויות ניפוי/בדיקה:</translation> - </message> - <message> - <source>Do not load the wallet and disable wallet RPC calls</source> - <translation>לא לטעון את הארנק ולנטרל קריאות RPC</translation> - </message> - <message> <source>Do you want to rebuild the block database now?</source> <translation>האם לבנות מחדש את מסד נתוני המקטעים?</translation> </message> <message> + <source>Error creating %s: You can't create non-HD wallets with this version.</source> + <translation>שגיאה ביצירת %s: אין אפשרות ליצור ארנקים שאינם HD בגרסה זו.</translation> + </message> + <message> <source>Error initializing block database</source> <translation>שגיאה באתחול מסד נתוני המקטעים</translation> </message> @@ -3030,6 +3160,10 @@ <translation>האזנה נכשלה בכל פורט. השתמש ב- -listen=0 אם ברצונך בכך.</translation> </message> <message> + <source>Failed to rescan the wallet during initialization</source> + <translation>כשל בסריקה מחדש של הארנק בזמן האתחול</translation> + </message> + <message> <source>Importing...</source> <translation>מתבצע יבוא…</translation> </message> @@ -3046,6 +3180,14 @@ <translation>סכום שגוי עבור -fallbackfee=<amount>: '%s'</translation> </message> <message> + <source>Upgrading txindex database</source> + <translation>שדרוג מאגר נתוני txindex </translation> + </message> + <message> + <source>Loading P2P addresses...</source> + <translation>טעינת כתובות P2P...</translation> + </message> + <message> <source>Loading banlist...</source> <translation>טוען רשימת חסומים...</translation> </message> @@ -3054,58 +3196,34 @@ <translation>אין מספיק מידע על הקובץ</translation> </message> <message> - <source>Only connect to nodes in network <net> (ipv4, ipv6 or onion)</source> - <translation>תמיד להתחבר למפרקים ברשת <net> (ipv4, ipv6 או onion)</translation> + <source>The source code is available from %s.</source> + <translation>קוד המקור זמין ב %s.</translation> </message> <message> - <source>Print this help message and exit</source> - <translation>להדפיס הודעת עזרה זו ולצאת</translation> + <source>Transaction fee and change calculation failed</source> + <translation>החישוב עבור עמלת העיסקה והעודף נכשל</translation> </message> <message> - <source>Print version and exit</source> - <translation>הדפס גירסא וצא</translation> + <source>Unable to generate keys</source> + <translation>כשל בהפקת מפתחות</translation> </message> <message> - <source>Set database cache size in megabytes (%d to %d, default: %d)</source> - <translation>הגדרת גודל מטמון מסדי הנתונים במגה בתים (%d עד %d, בררת מחדל: %d)</translation> - </message> - <message> - <source>Specify wallet file (within data directory)</source> - <translation>ציון קובץ ארנק (בתוך תיקיית הנתונים)</translation> + <source>Upgrading UTXO database</source> + <translation>שדרוג מאגר נתוני UTXO </translation> </message> <message> <source>Verifying blocks...</source> <translation>המקטעים מאומתים…</translation> </message> <message> - <source>Wallet debugging/testing options:</source> - <translation>אפשרות דיבוג/בדיקת ארנק:</translation> - </message> - <message> <source>Wallet needed to be rewritten: restart %s to complete</source> <translation>יש לכתוב את הארנק מחדש: יש להפעיל את %s כדי להמשיך</translation> </message> <message> - <source>Wallet options:</source> - <translation>אפשרויות הארנק:</translation> - </message> - <message> - <source>Execute command when a relevant alert is received or we see a really long fork (%s in cmd is replaced by message)</source> - <translation>הרץ פקודה כאשר ההתראה הרלוונטית מתקבלת או כשאנחנו עדים לפיצול ארוך מאוד (%s בשורת הפקודה יוחלף ע"י ההודעה)</translation> - </message> - <message> <source>The transaction amount is too small to send after the fee has been deducted</source> <translation>סכום העברה נמוך מדי לשליחה אחרי גביית העמלה</translation> </message> <message> - <source>(default: %u)</source> - <translation>(בררת מחדל: %u)</translation> - </message> - <message> - <source>Connect through SOCKS5 proxy</source> - <translation>התחברות דרך מתווך SOCKS5</translation> - </message> - <message> <source>Information</source> <translation>מידע</translation> </message> @@ -3122,26 +3240,6 @@ <translation>עליך לציין פתחה עם -whitebind: '%s'</translation> </message> <message> - <source>Node relay options:</source> - <translation>אפשרויות ממסר מפרק:</translation> - </message> - <message> - <source>RPC server options:</source> - <translation>הגדרות שרת RPC</translation> - </message> - <message> - <source>Send trace/debug info to console instead of debug.log file</source> - <translation>שלח מידע דיבאג ועקבה לקונסולה במקום לקובץ debug.log</translation> - </message> - <message> - <source>Show all debugging options (usage: --help -help-debug)</source> - <translation>הצגת כל אפשרויות הניפוי (שימוש: --help -help-debug)</translation> - </message> - <message> - <source>Shrink debug.log file on client startup (default: 1 when no -debug)</source> - <translation>כיווץ הקובץ debug.log בהפעלת הלקוח (בררת מחדל: 1 ללא -debug)</translation> - </message> - <message> <source>Signing transaction failed</source> <translation>החתימה על ההעברה נכשלה</translation> </message> @@ -3170,86 +3268,14 @@ <translation>לא ניתן להתאגד עם הפתחה %s במחשב זה (פעולת האיגוד החזירה את השגיאה %s)</translation> </message> <message> - <source>Upgrade wallet to latest format on startup</source> - <translation>עדכן ארק לפורמט העדכני בהפעלה</translation> - </message> - <message> - <source>Username for JSON-RPC connections</source> - <translation>שם משתמש לחיבורי JSON-RPC</translation> - </message> - <message> <source>Warning</source> <translation>אזהרה</translation> </message> <message> - <source>Password for JSON-RPC connections</source> - <translation>ססמה לחיבורי JSON-RPC</translation> - </message> - <message> - <source>Execute command when the best block changes (%s in cmd is replaced by block hash)</source> - <translation>יש לבצע פקודה זו כשהמקטע הטוב ביותר משתנה (%s בפקודה יוחלף בגיבוב המקטע)</translation> - </message> - <message> - <source>Allow DNS lookups for -addnode, -seednode and -connect</source> - <translation>הפעלת בדיקת DNS עבור -addnode, -seednode ו־-connect</translation> - </message> - <message> <source>Unsupported argument -socks found. Setting SOCKS version isn't possible anymore, only SOCKS5 proxies are supported.</source> <translation>המשתנה -socks נמצא אך אין בו תמיכה עוד. הגדרת גרסת SOCKS אינה אפשרית עוד, קיימת תמיכה רק ב־SOCKS5.</translation> </message> <message> - <source>(default: %s)</source> - <translation>(ברירת מחדל: %s)</translation> - </message> - <message> - <source>Always query for peer addresses via DNS lookup (default: %u)</source> - <translation>תמיד לתשאל את כתובת העמיתים באמצעות חיפוש DNS (בררת מחדל: %u)</translation> - </message> - <message> - <source>How many blocks to check at startup (default: %u, 0 = all)</source> - <translation>כמה מקטעים לבדוק עם ההפעלה (בררת מחדל: %u, 0 = הכול)</translation> - </message> - <message> - <source>Include IP addresses in debug output (default: %u)</source> - <translation>לכלול את כתובת ה־IP בפלט ניפוי השגיאות (בררת מחדל: %u)</translation> - </message> - <message> - <source>Listen for JSON-RPC connections on <port> (default: %u or testnet: %u)</source> - <translation>האזנה לחיבורי JSON-RPC דרך <port> (בררת מחדל: %u או ברשת הבדיקה: %u)</translation> - </message> - <message> - <source>Listen for connections on <port> (default: %u or testnet: %u)</source> - <translation>האזנה לחיבורים על גבי <port> (בררת מחדל: %u או לרשת הבדיקה: %u)</translation> - </message> - <message> - <source>Maintain at most <n> connections to peers (default: %u)</source> - <translation>לשמור על <n> חיבורים לעמיתים לכל היותר (בררת מחדל: %u)</translation> - </message> - <message> - <source>Make the wallet broadcast transactions</source> - <translation>להגדיר את הארנק להפצת העברות</translation> - </message> - <message> - <source>Set key pool size to <n> (default: %u)</source> - <translation>הגדרת גודל מאגר המפתחות לכדי <n> (בררת מחדל: %u)</translation> - </message> - <message> - <source>Set maximum BIP141 block weight (default: %d)</source> - <translation>הגדרת משקל מרבי למקטע BIP141 (בררת מחדל: %d)</translation> - </message> - <message> - <source>Specify configuration file (default: %s)</source> - <translation>הגדרת קובץ תצורה (בררת מחדל: %s)</translation> - </message> - <message> - <source>Specify connection timeout in milliseconds (minimum: 1, default: %d)</source> - <translation>ציון תפוגת זמן ההמתנה לחיבור במילישניות (מינימום: 1, בררת מחדל: %d)</translation> - </message> - <message> - <source>Specify pid file (default: %s)</source> - <translation>ציון קובץ pid (בררת מחדל: %s)</translation> - </message> - <message> <source>Starting network threads...</source> <translation>תהליכי הרשת מופעלים…</translation> </message> @@ -3262,10 +3288,6 @@ <translation>זו עמלת ההעברה שתיגבה ממך במידה של שליחת העברה.</translation> </message> <message> - <source>Threshold for disconnecting misbehaving peers (default: %u)</source> - <translation>סף לניתוק עמיתים סוררים (בררת מחדל: %u)</translation> - </message> - <message> <source>Transaction amounts must not be negative</source> <translation>סכומי ההעברה לא יכולים להיות שליליים</translation> </message> @@ -3282,6 +3304,14 @@ <translation>אין מספיק כספים</translation> </message> <message> + <source>Warning: Private keys detected in wallet {%s} with disabled private keys</source> + <translation>אזהרה: זוהו מפתחות פרטיים בארנק {%s} עם מפתחות פרטיים מושבתים</translation> + </message> + <message> + <source>Cannot write to data directory '%s'; check permissions.</source> + <translation>לא ניתן לכתוב אל תיקיית הנתונים ‚%s’, נא לבדוק את ההרשאות.</translation> + </message> + <message> <source>Loading block index...</source> <translation>מפתח המקטעים נטען…</translation> </message> diff --git a/src/qt/locale/bitcoin_hi_IN.ts b/src/qt/locale/bitcoin_hi_IN.ts index 62b46f40ac..51d6770b1a 100644 --- a/src/qt/locale/bitcoin_hi_IN.ts +++ b/src/qt/locale/bitcoin_hi_IN.ts @@ -7,7 +7,7 @@ </message> <message> <source>Create a new address</source> - <translation>नया पता लिखिए !</translation> + <translation>एक नया पता बनाएं</translation> </message> <message> <source>&New</source> @@ -22,6 +22,14 @@ <translation>सूची से वर्तमान में चयनित पता हटाएं</translation> </message> <message> + <source>Enter address or label to search</source> + <translation>ढूँदने के लिए कृपा करके पता या लेबल टाइप करे !</translation> + </message> + <message> + <source>Export the data in the current tab to a file</source> + <translation>डेटा को मौजूदा टैब से एक फ़ाइल में निर्यात करें</translation> + </message> + <message> <source>&Export</source> <translation>&निर्यात</translation> </message> @@ -49,6 +57,10 @@ <source>These are your Bitcoin addresses for sending payments. Always check the amount and the receiving address before sending coins.</source> <translation>ये भुगतान भेजने के लिए ये आपके बिटकॉइन पते हैं। हमेशा सिक्के भेजने से पहले राशि और प्राप्तकर्ता पते की जांच करें।</translation> </message> + <message> + <source>These are your Bitcoin addresses for receiving payments. It is recommended to use a new receiving address for each transaction.</source> + <translation>भुगतान प्राप्त करने के लिए ये आपके बीटकोइन पते हैं प्रत्येक लेनदेन के लिए एक नया प्राप्त पता उपयोग करने की सिफारिश की जाती है।</translation> + </message> </context> <context> <name>AddressTableModel</name> @@ -218,10 +230,6 @@ <source>version</source> <translation>संस्करण</translation> </message> - <message> - <source>Usage:</source> - <translation>खपत :</translation> - </message> </context> <context> <name>Intro</name> @@ -331,6 +339,10 @@ <source>Copy &Address</source> <translation>&पता कॉपी करे</translation> </message> + <message> + <source>Wallet</source> + <translation>वॉलेट</translation> + </message> </context> <context> <name>RecentRequestsTableModel</name> @@ -455,22 +467,14 @@ <source>&Export</source> <translation>&निर्यात</translation> </message> + <message> + <source>Export the data in the current tab to a file</source> + <translation>डेटा को मौजूदा टैब से एक फ़ाइल में निर्यात करें</translation> + </message> </context> <context> <name>bitcoin-core</name> <message> - <source>Options:</source> - <translation>विकल्प:</translation> - </message> - <message> - <source>Specify data directory</source> - <translation>डेटा डायरेक्टरी बताएं </translation> - </message> - <message> - <source>Run in the background as a daemon and accept commands</source> - <translation>बैकग्राउंड में डेमॉन बन कर रन करे तथा कमांड्स स्वीकार करें </translation> - </message> - <message> <source>Verifying blocks...</source> <translation>ब्लॉक्स जाँचे जा रहा है...</translation> </message> diff --git a/src/qt/locale/bitcoin_hr.ts b/src/qt/locale/bitcoin_hr.ts index 8595068422..2bd6c7df03 100644 --- a/src/qt/locale/bitcoin_hr.ts +++ b/src/qt/locale/bitcoin_hr.ts @@ -30,6 +30,10 @@ <translation>Brisanje trenutno odabrane adrese s popisa.</translation> </message> <message> + <source>Enter address or label to search</source> + <translation>Unesite adresu ili oznaku za pretraživanje</translation> + </message> + <message> <source>Export the data in the current tab to a file</source> <translation>Izvoz podataka iz trenutnog lista u datoteku</translation> </message> @@ -602,10 +606,6 @@ <translation>&Adresa</translation> </message> <message> - <source>New receiving address</source> - <translation>Nova adresa za primanje</translation> - </message> - <message> <source>New sending address</source> <translation>Nova adresa za slanje</translation> </message> @@ -622,10 +622,6 @@ <translation>Upisana adresa "%1" nije valjana bitcoin adresa.</translation> </message> <message> - <source>The entered address "%1" is already in the address book.</source> - <translation>Upisana adresa "%1" je već u adresaru.</translation> - </message> - <message> <source>Could not unlock wallet.</source> <translation>Ne mogu otključati novčanik.</translation> </message> @@ -663,19 +659,7 @@ <source>Command-line options</source> <translation>Opcije programa u naredbenoj liniji</translation> </message> - <message> - <source>Usage:</source> - <translation>Upotreba:</translation> - </message> - <message> - <source>command-line options</source> - <translation>opcije programa u naredbenoj liniji</translation> - </message> - <message> - <source>Start minimized</source> - <translation>Pokreni minimiziran</translation> - </message> - </context> +</context> <context> <name>Intro</name> <message> @@ -1075,6 +1059,10 @@ <translation>Poruka</translation> </message> <message> + <source>Wallet</source> + <translation>Novčanik</translation> + </message> + <message> <source>Resulting URI too long, try to reduce the text for label / message.</source> <translation>URI je predug, probajte skratiti tekst za naslov / poruku.</translation> </message> @@ -1181,6 +1169,10 @@ <translation>ili</translation> </message> <message> + <source>Transaction fee</source> + <translation>Naknada za transakciju</translation> + </message> + <message> <source>Confirm send coins</source> <translation>Potvrdi slanje novca</translation> </message> @@ -1314,10 +1306,6 @@ <translation>Otvoren do %1</translation> </message> <message> - <source>%1/offline</source> - <translation>%1 nije dostupan</translation> - </message> - <message> <source>%1/unconfirmed</source> <translation>%1/nepotvrđeno</translation> </message> @@ -1330,10 +1318,6 @@ <translation>Status</translation> </message> <message> - <source>, has not been successfully broadcast yet</source> - <translation>, još nije bio uspješno emitiran</translation> - </message> - <message> <source>Date</source> <translation>Datum</translation> </message> @@ -1440,10 +1424,6 @@ <translation>Potvrđen (%1 potvrda)</translation> </message> <message> - <source>This block was not received by any other nodes and will probably not be accepted!</source> - <translation>Ovaj blok nije bio primljen od strane bilo kojeg drugog čvora i vjerojatno neće biti prihvaćen!</translation> - </message> - <message> <source>Generated but not accepted</source> <translation>Generirano, ali nije prihvaćeno</translation> </message> @@ -1650,34 +1630,10 @@ <context> <name>bitcoin-core</name> <message> - <source>Options:</source> - <translation>Postavke:</translation> - </message> - <message> - <source>Specify data directory</source> - <translation>Odaberi direktorij za datoteke</translation> - </message> - <message> - <source>Specify your own public address</source> - <translation>Odaberi vlastitu javnu adresu</translation> - </message> - <message> - <source>Accept command line and JSON-RPC commands</source> - <translation>Prihvati komande iz tekst moda i JSON-RPC</translation> - </message> - <message> - <source>Run in the background as a daemon and accept commands</source> - <translation>Izvršavaj u pozadini kao uslužnik i prihvaćaj komande</translation> - </message> - <message> <source>Bitcoin Core</source> <translation>Bitcoin Core</translation> </message> <message> - <source>Block creation options:</source> - <translation>Opcije za kreiranje bloka:</translation> - </message> - <message> <source>Error: Disk space is low!</source> <translation>Pogreška: Nema dovoljno prostora na disku!</translation> </message> @@ -1686,30 +1642,10 @@ <translation>Informacija</translation> </message> <message> - <source>Send trace/debug info to console instead of debug.log file</source> - <translation>Šalji trace/debug informacije na konzolu umjesto u debug.log datoteku</translation> - </message> - <message> - <source>Username for JSON-RPC connections</source> - <translation>Korisničko ime za JSON-RPC veze</translation> - </message> - <message> <source>Warning</source> <translation>Upozorenje</translation> </message> <message> - <source>Password for JSON-RPC connections</source> - <translation>Lozinka za JSON-RPC veze</translation> - </message> - <message> - <source>Execute command when the best block changes (%s in cmd is replaced by block hash)</source> - <translation>Izvršite naredbu kada se najbolji blok promjeni (%s u cmd je zamjenjen sa block hash)</translation> - </message> - <message> - <source>Allow DNS lookups for -addnode, -seednode and -connect</source> - <translation>Dozvoli DNS upite za -addnode, -seednode i -connect</translation> - </message> - <message> <source>Insufficient funds</source> <translation>Nedovoljna sredstva</translation> </message> diff --git a/src/qt/locale/bitcoin_hu.ts b/src/qt/locale/bitcoin_hu.ts index 05cc28402a..3a3990c265 100644 --- a/src/qt/locale/bitcoin_hu.ts +++ b/src/qt/locale/bitcoin_hu.ts @@ -30,6 +30,10 @@ <translation>Kiválasztott cím törlése a listából</translation> </message> <message> + <source>Enter address or label to search</source> + <translation>Írja be a keresendő címet vagy címkét</translation> + </message> + <message> <source>Export the data in the current tab to a file</source> <translation>Jelenlegi nézet exportálása fájlba</translation> </message> @@ -128,6 +132,10 @@ <translation>Új jelszó újra</translation> </message> <message> + <source>Show password</source> + <translation>Jelszó megjelenítése</translation> + </message> + <message> <source>Enter the new passphrase to the wallet.<br/>Please use a passphrase of <b>ten or more random characters</b>, or <b>eight or more words</b>.</source> <translation>Gépelje be az új kulcsmondatot a pénztárcához.<br/> Kérem a kulcsmondatban használjon <b> tíz vagy több véletlenszerű karaktert </b>, vagy <b> nyolc vagy több szót </b>.</translation> @@ -327,6 +335,10 @@ Kérem a kulcsmondatban használjon <b> tíz vagy több véletlenszerű ka <translation>Kattintson a hálózati tevékenység újbóli engedélyezéséhez.</translation> </message> <message> + <source>Syncing Headers (%1%)...</source> + <translation>Fejlécek Szinkronizálása (%1%)...</translation> + </message> + <message> <source>Reindexing blocks on disk...</source> <translation>Lemezen lévő blokkok újraindexelése...</translation> </message> @@ -719,10 +731,6 @@ Kérem a kulcsmondatban használjon <b> tíz vagy több véletlenszerű ka <translation>&Cím</translation> </message> <message> - <source>New receiving address</source> - <translation>Új fogadó cím</translation> - </message> - <message> <source>New sending address</source> <translation>Új küldő cím</translation> </message> @@ -739,10 +747,6 @@ Kérem a kulcsmondatban használjon <b> tíz vagy több véletlenszerű ka <translation>A megadott "%1" cím nem egy érvényes Bitcoin-cím.</translation> </message> <message> - <source>The entered address "%1" is already in the address book.</source> - <translation>A megadott "%1" cím már szerepel a címjegyzékben.</translation> - </message> - <message> <source>Could not unlock wallet.</source> <translation>Tárca feloldása sikertelen</translation> </message> @@ -788,42 +792,6 @@ Kérem a kulcsmondatban használjon <b> tíz vagy több véletlenszerű ka <source>Command-line options</source> <translation>Parancssoros opciók</translation> </message> - <message> - <source>Usage:</source> - <translation>Használat:</translation> - </message> - <message> - <source>command-line options</source> - <translation>parancssoros opciók</translation> - </message> - <message> - <source>UI Options:</source> - <translation>Kezelőfelület beállításai:</translation> - </message> - <message> - <source>Choose data directory on startup (default: %u)</source> - <translation>Adatkönyvtár kiválasztása induláskor (alapértelmezett: %u)</translation> - </message> - <message> - <source>Set language, for example "de_DE" (default: system locale)</source> - <translation>Nyelvbeállítás, például "de_DE" (alapértelmezett: rendszer nyelve)</translation> - </message> - <message> - <source>Start minimized</source> - <translation>Indítás lekicsinyítve</translation> - </message> - <message> - <source>Set SSL root certificates for payment request (default: -system-)</source> - <translation>SLL gyökér-igazolások megadása fizetési kérelmekhez (alapértelmezett: -system-)</translation> - </message> - <message> - <source>Show splash screen on startup (default: %u)</source> - <translation>Indítóképernyő mutatása induláskor (alapértelmezett: %u)</translation> - </message> - <message> - <source>Reset all settings changed in the GUI</source> - <translation>A grafikus felület összes megváltoztatott beállításának a visszaállítása</translation> - </message> </context> <context> <name>Intro</name> @@ -1005,6 +973,10 @@ Kérem a kulcsmondatban használjon <b> tíz vagy több véletlenszerű ka <translation>Megmutatja, hogy az alapértelmezett SOCKS5 proxy van-e használatban, hogy elérje a párokat ennél a hálózati típusnál.</translation> </message> <message> + <source>Hide the icon from the system tray.</source> + <translation>Ikon elrejtése a tálcáról.</translation> + </message> + <message> <source>Minimize instead of exit the application when the window is closed. When this option is enabled, the application will be closed only after selecting Exit in the menu.</source> <translation>Az alkalmazásból való kilépés helyett az eszköztárba kicsinyíti az alkalmazást az ablak bezárásakor. Ez esetben az alkalmazás csak a Kilépés menüponttal zárható be.</translation> </message> @@ -1069,6 +1041,14 @@ Kérem a kulcsmondatban használjon <b> tíz vagy több véletlenszerű ka <translation>&UPnP port-feltérképezés</translation> </message> <message> + <source>Accept connections from outside.</source> + <translation>Külső csatlakozások elfogadása.</translation> + </message> + <message> + <source>Allow incomin&g connections</source> + <translation>Bejövő kapcsolatok engedélyezése.</translation> + </message> + <message> <source>Connect to the Bitcoin network through a SOCKS5 proxy.</source> <translation>Csatlakozás a Bitcoin hálózatához SOCKS5 proxyn keresztül</translation> </message> @@ -1149,6 +1129,10 @@ Kérem a kulcsmondatban használjon <b> tíz vagy több véletlenszerű ka <translation>Mutassa a pénzküldés beállításait vagy ne.</translation> </message> <message> + <source>&Third party transaction URLs</source> + <translation>&Harmadik féltől származó tranzakció URL-ek</translation> + </message> + <message> <source>&OK</source> <translation>&OK</translation> </message> @@ -1746,6 +1730,10 @@ Kérem a kulcsmondatban használjon <b> tíz vagy több véletlenszerű ka <translation>Használja a fel és le nyilakat az előzményekben való navigáláshoz, és %1 -et a képernyő törlésére.</translation> </message> <message> + <source>For more information on using this console type %1.</source> + <translation>Több információért használja a konzolban a %1 parancsot.</translation> + </message> + <message> <source>WARNING: Scammers have been active, telling users to type commands here, stealing their wallet contents. Do not use this console without fully understanding the ramifications of a command.</source> <translation>FIGYELEM: Csalók megpróbálnak felhasználókat rávenni, hogy parancsokat írjanak be ide, és ellopják a tárca tartalmát. Ne használja ezt a konzolt anélkül, hogy teljesen megértené egy parancs kiadásának a következményeit.</translation> </message> @@ -1825,6 +1813,14 @@ Kérem a kulcsmondatban használjon <b> tíz vagy több véletlenszerű ka <translation>Törlés</translation> </message> <message> + <source>Native segwit addresses (aka Bech32 or BIP-173) reduce your transaction fees later on and offer better protection against typos, but old wallets don't support them. When unchecked, an address compatible with older wallets will be created instead.</source> + <translation>Segwit címek (Bech32 vagy BIP-173) csökkentik a tranzakciók díját és jobb védelmet biztosítanak gépelési hibával szemben, de a régi pénztárcák nem támogatják. Ha nincs aktiválva, egy régi pénztárcával is kompatibilis cím lesz létrehozva.</translation> + </message> + <message> + <source>Generate native segwit (Bech32) address</source> + <translation>Segwit cím (Bech32) létrehozása</translation> + </message> + <message> <source>Requested payments history</source> <translation>A kért kifizetések története</translation> </message> @@ -1912,6 +1908,10 @@ Kérem a kulcsmondatban használjon <b> tíz vagy több véletlenszerű ka <translation>Üzenet</translation> </message> <message> + <source>Wallet</source> + <translation>Tárca</translation> + </message> + <message> <source>Resulting URI too long, try to reduce the text for label / message.</source> <translation>A keletkezett URI túl hosszú, próbálja meg csökkenteni a cimke / üzenet szövegének méretét.</translation> </message> @@ -2034,6 +2034,10 @@ Kérem a kulcsmondatban használjon <b> tíz vagy több véletlenszerű ka <translation>Elrejtés</translation> </message> <message> + <source>Paying only the minimum fee is just fine as long as there is less transaction volume than space in the blocks. But be aware that this can end up in a never confirming transaction once there is more demand for bitcoin transactions than the network can process.</source> + <translation>Alacsony díj is megfelelő, ha nincs több tranzakció mint amennyi hely a blokkokban. Figyelem! Ha a hálózat túlterhelt, lehetséges, hogy a tranzakció nem lesz megerősítve.</translation> + </message> + <message> <source>(read the tooltip)</source> <translation>(olvasd el a gyorstippet)</translation> </message> @@ -2062,6 +2066,14 @@ Kérem a kulcsmondatban használjon <b> tíz vagy több véletlenszerű ka <translation>Por-határ:</translation> </message> <message> + <source>Confirmation time target:</source> + <translation>Várható megerősítési idő:</translation> + </message> + <message> + <source>Enable Replace-By-Fee</source> + <translation>Replace-By-Fee bekapcsolása</translation> + </message> + <message> <source>Clear &All</source> <translation>Mindent &töröl</translation> </message> @@ -2110,16 +2122,16 @@ Kérem a kulcsmondatban használjon <b> tíz vagy több véletlenszerű ka <translation>Biztosan el akarja küldeni?</translation> </message> <message> - <source>added as transaction fee</source> - <translation>hozzáadva, mint tranzakciós díj</translation> + <source>or</source> + <translation>vagy</translation> </message> <message> - <source>Total Amount %1</source> - <translation>Teljes Összeg %1</translation> + <source>You can increase the fee later (signals Replace-By-Fee, BIP-125).</source> + <translation>Később növelheti a tranzakció díját (lásd Replace-By-Fee, BIP-125).</translation> </message> <message> - <source>or</source> - <translation>vagy</translation> + <source>Transaction fee</source> + <translation>Tranzakciós díj</translation> </message> <message> <source>Confirm send coins</source> @@ -2233,10 +2245,22 @@ Kérem a kulcsmondatban használjon <b> tíz vagy több véletlenszerű ka <translation>&Vonja le a díjat az összegből</translation> </message> <message> + <source>Use available balance</source> + <translation>Elérhető egyenleg használata</translation> + </message> + <message> <source>Message:</source> <translation>Üzenet:</translation> </message> <message> + <source>This is an unauthenticated payment request.</source> + <translation>Ez egy nem hitelesített fizetési kérelem.</translation> + </message> + <message> + <source>This is an authenticated payment request.</source> + <translation>Ez egy hitelesített fizetési kérelem.</translation> + </message> + <message> <source>Enter a label for this address to add it to the list of used addresses</source> <translation>Adjon egy címkét ehhez a címhez, hogy bekerüljön a használt címek közé</translation> </message> @@ -2407,10 +2431,6 @@ Kérem a kulcsmondatban használjon <b> tíz vagy több véletlenszerű ka <translation>%1 -ig megnyitva</translation> </message> <message> - <source>%1/offline</source> - <translation>%1/offline</translation> - </message> - <message> <source>0/unconfirmed, %1</source> <translation>0/megerősítetlen, %1</translation> </message> @@ -2439,10 +2459,6 @@ Kérem a kulcsmondatban használjon <b> tíz vagy több véletlenszerű ka <translation>Állapot</translation> </message> <message> - <source>, has not been successfully broadcast yet</source> - <translation>, még nem sikerült közvetíteni</translation> - </message> - <message> <source>Date</source> <translation>Dátum</translation> </message> @@ -2573,10 +2589,6 @@ Kérem a kulcsmondatban használjon <b> tíz vagy több véletlenszerű ka <translation>%1 -ig megnyitva</translation> </message> <message> - <source>Offline</source> - <translation>Offline</translation> - </message> - <message> <source>Unconfirmed</source> <translation>Megerősítetlen</translation> </message> @@ -2601,10 +2613,6 @@ Kérem a kulcsmondatban használjon <b> tíz vagy több véletlenszerű ka <translation>Éretlen (%1 megerősítés, %2 után lesz elérhető)</translation> </message> <message> - <source>This block was not received by any other nodes and will probably not be accepted!</source> - <translation>Ezt a blokkot egyetlen másik csomópont sem kapta meg, így valószínűleg nem lesz elfogadva!</translation> - </message> - <message> <source>Generated but not accepted</source> <translation>Generálva, de nincs elfogadva</translation> </message> @@ -2833,6 +2841,10 @@ Kérem a kulcsmondatban használjon <b> tíz vagy több véletlenszerű ka <translation>Jelenlegi díj:</translation> </message> <message> + <source>Increase:</source> + <translation>Növekedés:</translation> + </message> + <message> <source>New fee:</source> <translation>Új díj:</translation> </message> @@ -2840,7 +2852,11 @@ Kérem a kulcsmondatban használjon <b> tíz vagy több véletlenszerű ka <source>Can't sign transaction.</source> <translation>Tranzakció aláírása sikertelen.</translation> </message> - </context> + <message> + <source>Could not commit transaction</source> + <translation>A tranzakciót nem lehet elküldeni</translation> + </message> +</context> <context> <name>WalletView</name> <message> @@ -2871,33 +2887,10 @@ Kérem a kulcsmondatban használjon <b> tíz vagy több véletlenszerű ka <source>The wallet data was successfully saved to %1.</source> <translation>A tárca adatai sikeresen elmentve %1.</translation> </message> -</context> + </context> <context> <name>bitcoin-core</name> <message> - <source>Options:</source> - <translation>Opciók -</translation> - </message> - <message> - <source>Specify data directory</source> - <translation>Adatkönyvtár -</translation> - </message> - <message> - <source>Connect to a node to retrieve peer addresses, and disconnect</source> - <translation>Kapcsolódás egy csomóponthoz a peerek címeinek megszerzése miatt, majd szétkapcsolás</translation> - </message> - <message> - <source>Specify your own public address</source> - <translation>Adja meg az Ön saját nyilvános címét</translation> - </message> - <message> - <source>Accept command line and JSON-RPC commands</source> - <translation>Parancssoros és JSON-RPC parancsok elfogadása -</translation> - </message> - <message> <source>Distributed under the MIT software license, see the accompanying file %s or %s</source> <translation>MIT szoftver licenc alapján terjesztve, tekintse meg a hozzátartozó fájlt %s or %s</translation> </message> @@ -2906,9 +2899,8 @@ Kérem a kulcsmondatban használjon <b> tíz vagy több véletlenszerű ka <translation>Hiba: Fatális belső hiba történt, nézze meg a debug.log -ot a részletekért</translation> </message> <message> - <source>Run in the background as a daemon and accept commands</source> - <translation>Háttérben futtatás daemonként és parancsok elfogadása -</translation> + <source>Unable to start HTTP server. See debug log for details.</source> + <translation>HTTP szerver indítása sikertelen. A részleteket lásd: debug log.</translation> </message> <message> <source>Bitcoin Core</source> @@ -2919,20 +2911,20 @@ Kérem a kulcsmondatban használjon <b> tíz vagy több véletlenszerű ka <translation>A %s fejlesztők</translation> </message> <message> - <source>Execute command when a wallet transaction changes (%s in cmd is replaced by TxID)</source> - <translation>Parancs, amit akkor hajt végre, amikor egy tárca-tranzakció megváltozik (%s a parancsban lecserélődik a blokk TxID-re)</translation> + <source>This is a pre-release test build - use at your own risk - do not use for mining or merchant applications</source> + <translation>Ez egy kiadás előtt álló, teszt verzió - csak saját felelősségre - ne használja bányászatra vagy kereskedéshez.</translation> </message> <message> - <source>Use UPnP to map the listening port (default: 1 when listening and no -proxy)</source> - <translation>UPnP használata porttovábbításra (alapértelmezett: 1, amikor kiszolgál és nem használt a -proxy)</translation> + <source>Warning: The network does not appear to fully agree! Some miners appear to be experiencing issues.</source> + <translation>Figyelem: A hálózat úgy tűnik nem teljesen egyezik! Néhány bányász problémákat tapasztalhat.</translation> </message> <message> - <source><category> can be:</source> - <translation><category> lehet:</translation> + <source>-maxmempool must be at least %d MB</source> + <translation>-maxmempool legalább %d MB kell legyen.</translation> </message> <message> - <source>Accept connections from outside (default: 1 if no -proxy or -connect)</source> - <translation>Kívülről érkező kapcsolatok elfogadása (alapértelmezett: 1, ha nem használt a -proxy vagy a -connect)</translation> + <source>Copyright (C) %i-%i</source> + <translation>Szerzői jog (C) fenntartva %i-%i</translation> </message> <message> <source>Corrupted block database detected</source> @@ -2951,6 +2943,18 @@ Kérem a kulcsmondatban használjon <b> tíz vagy több véletlenszerű ka <translation>A tárca-adatbázis inicializálása nem sikerült: %s!</translation> </message> <message> + <source>Error loading %s</source> + <translation>Hiba a(z) %s betöltése közben</translation> + </message> + <message> + <source>Error loading %s: Wallet corrupted</source> + <translation>Hiba a(z) %s betöltése közben: A tárca hibás.</translation> + </message> + <message> + <source>Error loading %s: Wallet requires newer version of %s</source> + <translation>Hiba a(z) %s betöltése közben: A tárcához %s újabb verziója szükséges.</translation> + </message> + <message> <source>Error loading block database</source> <translation>Hiba a blokk adatbázis betöltése közben.</translation> </message> @@ -2967,6 +2971,10 @@ Kérem a kulcsmondatban használjon <b> tíz vagy több véletlenszerű ka <translation>Egyik hálózati porton sem sikerül hallgatni. Használja a -listen=0 kapcsolót, ha ezt szeretné.</translation> </message> <message> + <source>Failed to rescan the wallet during initialization</source> + <translation>A tárca átvizsgálása közben hiba történt.</translation> + </message> + <message> <source>Importing...</source> <translation>Importálás</translation> </message> @@ -2975,6 +2983,10 @@ Kérem a kulcsmondatban használjon <b> tíz vagy több véletlenszerű ka <translation>Helytelen vagy nemlétező genézis blokk. Helytelen hálózati adatkönyvtár?</translation> </message> <message> + <source>Loading P2P addresses...</source> + <translation>P2P címek betöltése...</translation> + </message> + <message> <source>Loading banlist...</source> <translation>Tiltólista betöltése...</translation> </message> @@ -2983,44 +2995,44 @@ Kérem a kulcsmondatban használjon <b> tíz vagy több véletlenszerű ka <translation>Nincs elég fájlleíró. </translation> </message> <message> - <source>Transaction fee and change calculation failed</source> - <translation>A tranzakciós díj és a visszajáró kiszámítása nem sikerült</translation> + <source>Replaying blocks...</source> + <translation>Blokkok újrajátszása...</translation> </message> <message> - <source>Verifying blocks...</source> - <translation>Blokkok ellenőrzése...</translation> + <source>Rewinding blocks...</source> + <translation>Blokkok visszapörgetése...</translation> </message> <message> - <source>Wallet options:</source> - <translation>Tárca beállítások:</translation> + <source>The source code is available from %s.</source> + <translation>A forráskód elérhető: %s.</translation> </message> <message> - <source>Discover own IP addresses (default: 1 when listening and no -externalip or -proxy)</source> - <translation>Saját IP-cím felfedezése (alapértelmezett: 1, amikor kiszolgál és nem használt a -externalip)</translation> + <source>Transaction fee and change calculation failed</source> + <translation>A tranzakciós díj és a visszajáró kiszámítása nem sikerült</translation> </message> <message> - <source>Whitelisted peers cannot be DoS banned and their transactions are always relayed, even if they are already in the mempool, useful e.g. for a gateway</source> - <translation>A fehérlistán szereplő felek nem lesznek automatikusan kitiltva és a tranzakcióik is mindig továbbítva lesznek, akkor is ha már a megerősítésre váró listán (mempool) vannak. Hasznos például összekötő csomópontokon (gateway).</translation> + <source>Upgrading UTXO database</source> + <translation>Blokk adatbázis frissítése</translation> </message> <message> - <source>(default: %u)</source> - <translation>(alapértelmezett: %u)</translation> + <source>Verifying blocks...</source> + <translation>Blokkok ellenőrzése...</translation> </message> <message> - <source>Error reading from database, shutting down.</source> - <translation>Hiba az adatbázis olvasásakor, leállítás</translation> + <source>Wallet needed to be rewritten: restart %s to complete</source> + <translation>A Tárca újraírása szükséges: Indítsa újra a %s-t.</translation> </message> <message> - <source>Information</source> - <translation>Információ</translation> + <source>Error reading from database, shutting down.</source> + <translation>Hiba az adatbázis olvasásakor, leállítás</translation> </message> <message> - <source>RPC server options:</source> - <translation>RPC szerver opciók:</translation> + <source>Error upgrading chainstate database</source> + <translation>Hiba a blokk adatbázis betöltése közben</translation> </message> <message> - <source>Send trace/debug info to console instead of debug.log file</source> - <translation>trace/debug információ küldése a konzolra a debog.log fájl helyett</translation> + <source>Information</source> + <translation>Információ</translation> </message> <message> <source>Signing transaction failed</source> @@ -3039,32 +3051,14 @@ Kérem a kulcsmondatban használjon <b> tíz vagy több véletlenszerű ka <translation>Túl nagy tranzakció</translation> </message> <message> - <source>Username for JSON-RPC connections</source> - <translation>Felhasználói név JSON-RPC csatlakozásokhoz -</translation> + <source>Verifying wallet(s)...</source> + <translation>Tárcák ellenőrzése...</translation> </message> <message> <source>Warning</source> <translation>Figyelem</translation> </message> <message> - <source>You need to rebuild the database using -reindex to change -txindex</source> - <translation>Az adatbázist újra kell építeni -reindex használatával, hogy a -tindex-et módosítsd.</translation> - </message> - <message> - <source>Password for JSON-RPC connections</source> - <translation>Jelszó JSON-RPC csatlakozásokhoz -</translation> - </message> - <message> - <source>Execute command when the best block changes (%s in cmd is replaced by block hash)</source> - <translation>Parancs, amit akkor hajt végre, amikor a legjobb blokk megváltozik (%s a cmd-ban lecserélődik a blokk hash-re)</translation> - </message> - <message> - <source>Allow DNS lookups for -addnode, -seednode and -connect</source> - <translation>DNS-kikeresés engedélyezése az addnode-nál és a connect-nél</translation> - </message> - <message> <source>Warning: Unknown block versions being mined! It's possible unknown rules are in effect</source> <translation>Figyelem: Ismeretlen blokkokat bányásznak! Lehetséges, hogy ismeretlen szabályok érvényesek.</translation> </message> @@ -3073,50 +3067,6 @@ Kérem a kulcsmondatban használjon <b> tíz vagy több véletlenszerű ka <translation>%s étéke nagyon magas!</translation> </message> <message> - <source>(default: %s)</source> - <translation>(alapértelmezett: %s)</translation> - </message> - <message> - <source>Error loading wallet %s. Invalid characters in -wallet filename.</source> - <translation>Hiba a tárca betöltése közben %s. Érvénytelen karakterek a -tárca fájlnevében.</translation> - </message> - <message> - <source>How many blocks to check at startup (default: %u, 0 = all)</source> - <translation>Hány blokkot ellenőrizzen induláskor (alapértelmezett: %u, 0 = mindet)</translation> - </message> - <message> - <source>Include IP addresses in debug output (default: %u)</source> - <translation>IP-címek megjelenítése a naplóban (alapértelmezett: %u)</translation> - </message> - <message> - <source>Maximum per-connection receive buffer, <n>*1000 bytes (default: %u)</source> - <translation>Kapcsolatonkénti maximum fogadó buffer, <n>*1000 byte (alapértelmezett: %u)</translation> - </message> - <message> - <source>Maximum per-connection send buffer, <n>*1000 bytes (default: %u)</source> - <translation>Kapcsolatonkénti maximum küldő buffer, <n>*1000 byte (alapértelmezett: %u)</translation> - </message> - <message> - <source>Set key pool size to <n> (default: %u)</source> - <translation>Kulcshalmaz méretének a beállítása <n>(alapértelmezett: %u) </translation> - </message> - <message> - <source>Specify configuration file (default: %s)</source> - <translation>Konfigurációs fájl megadása (alapértelmezett: %s)</translation> - </message> - <message> - <source>Specify connection timeout in milliseconds (minimum: 1, default: %d)</source> - <translation>Csatlakozás időtúllépése milliszekundumban (minimum: 1, alapértelmezett: %d)</translation> - </message> - <message> - <source>Specify pid file (default: %s)</source> - <translation>Pid-fájl megadása (alapértelmezett: %s)</translation> - </message> - <message> - <source>Spend unconfirmed change when sending transactions (default: %u)</source> - <translation>Tranzakciók küldésekor a jóváhagyatlan visszajáró elköltése (alapértelmezés: %u)</translation> - </message> - <message> <source>Starting network threads...</source> <translation>Hálózati szálak indítása...</translation> </message> diff --git a/src/qt/locale/bitcoin_id_ID.ts b/src/qt/locale/bitcoin_id_ID.ts index 0918b58285..3c79d54e94 100644 --- a/src/qt/locale/bitcoin_id_ID.ts +++ b/src/qt/locale/bitcoin_id_ID.ts @@ -30,6 +30,10 @@ <translation>Hapus alamat yang sementara dipilih dari daftar</translation> </message> <message> + <source>Enter address or label to search</source> + <translation>Masukkan alamat atau label untuk mencari</translation> + </message> + <message> <source>Export the data in the current tab to a file</source> <translation>Ekspor data dalam tab sekarang ke sebuah berkas</translation> </message> @@ -63,11 +67,11 @@ </message> <message> <source>These are your Bitcoin addresses for sending payments. Always check the amount and the receiving address before sending coins.</source> - <translation>Ini adalah alamat- alamat Bitcoin Anda untuk mengirimkan pembayaran. Selalu periksa jumlah dan alamat penerima sebelum mengirimkan koin.</translation> + <translation>Berikut ialah alamat-alamat Bitcoin Anda yang digunakan untuk mengirimkan pembayaran. Selalu periksa jumlah dan alamat penerima sebelum mengirimkan koin.</translation> </message> <message> <source>These are your Bitcoin addresses for receiving payments. It is recommended to use a new receiving address for each transaction.</source> - <translation>Ini adalah alamat- alamat Bitcoin Anda untuk menerima pembayaran. Dianjurkan untuk menggunakan alamat penerima yang baru setiap melakukan transaksi.</translation> + <translation>Berikut ialah alamat-alamat Bitcoin Anda yang digunakan untuk menerima pembayaran. Dianjurkan untuk menggunakan alamat penerimaan baru untuk setiap transaksi.</translation> </message> <message> <source>&Copy Address</source> @@ -87,13 +91,17 @@ </message> <message> <source>Comma separated file (*.csv)</source> - <translation>File yang berformat(*.csv)</translation> + <translation>Berkas CSV (*.csv)</translation> </message> <message> <source>Exporting Failed</source> - <translation>Mengekspor Gagal</translation> + <translation>Gagal Mengekspor</translation> </message> - </context> + <message> + <source>There was an error trying to save the address list to %1. Please try again.</source> + <translation>Terjadi kesalahan saat mencoba menyimpan daftar alamat ke %1. Silakan coba lagi.</translation> + </message> +</context> <context> <name>AddressTableModel</name> <message> @@ -113,19 +121,23 @@ <name>AskPassphraseDialog</name> <message> <source>Passphrase Dialog</source> - <translation>Dialog Kata kunci</translation> + <translation>Dialog Kata Sandi</translation> </message> <message> <source>Enter passphrase</source> - <translation>Masukkan kata kunci</translation> + <translation>Masukkan kata sandi</translation> </message> <message> <source>New passphrase</source> - <translation>Kata kunci baru</translation> + <translation>Kata sandi baru</translation> </message> <message> <source>Repeat new passphrase</source> - <translation>Ulangi kata kunci baru</translation> + <translation>Ulangi kata sandi baru</translation> + </message> + <message> + <source>Show password</source> + <translation>Tampilkan kata sandi</translation> </message> <message> <source>Enter the new passphrase to the wallet.<br/>Please use a passphrase of <b>ten or more random characters</b>, or <b>eight or more words</b>.</source> @@ -165,7 +177,7 @@ </message> <message> <source>Warning: If you encrypt your wallet and lose your passphrase, you will <b>LOSE ALL OF YOUR BITCOINS</b>!</source> - <translation>Peringatan: Jika Anda enkripsi dompet Anda dan lupa kata sandi anda, Anda akan <b>KEHILANGAN SEMUA BITCOIN ANDA</b>!</translation> + <translation>Peringatan: Jika Anda mengenkripsi dompet Anda dan lupa kata sandi Anda, Anda akan <b>KEHILANGAN SEMUA BITCOIN ANDA</b>!</translation> </message> <message> <source>Are you sure you wish to encrypt your wallet?</source> @@ -679,6 +691,10 @@ <translation>Tidak</translation> </message> <message> + <source>Can vary +/- %1 satoshi(s) per input.</source> + <translation>Dapat bervariasi +/- %1 satoshi per input.</translation> + </message> + <message> <source>(no label)</source> <translation>(tidak ada label)</translation> </message> @@ -706,10 +722,6 @@ <translation>&Alamat</translation> </message> <message> - <source>New receiving address</source> - <translation>Alamat penerima baru</translation> - </message> - <message> <source>New sending address</source> <translation>Alamat pengirim baru</translation> </message> @@ -726,10 +738,6 @@ <translation>Alamat yang dimasukkan "%1" bukanlah alamat Bitcoin yang valid.</translation> </message> <message> - <source>The entered address "%1" is already in the address book.</source> - <translation>Alamat yang dimasukkan "%1" sudah ada di dalam buku alamat.</translation> - </message> - <message> <source>Could not unlock wallet.</source> <translation>Tidak dapat membuka dompet.</translation> </message> @@ -779,42 +787,6 @@ <source>Command-line options</source> <translation>Pilihan Command-line</translation> </message> - <message> - <source>Usage:</source> - <translation>Penggunaan:</translation> - </message> - <message> - <source>command-line options</source> - <translation>pilihan command-line</translation> - </message> - <message> - <source>UI Options:</source> - <translation>Pilihan UI:</translation> - </message> - <message> - <source>Choose data directory on startup (default: %u)</source> - <translation>Pilih direktori data saat memulai (default: %u)</translation> - </message> - <message> - <source>Set language, for example "de_DE" (default: system locale)</source> - <translation>Pilih bahasa, contoh "id_ID" (default: system locale)</translation> - </message> - <message> - <source>Start minimized</source> - <translation>Start minimized</translation> - </message> - <message> - <source>Set SSL root certificates for payment request (default: -system-)</source> - <translation>Pilih sertifikat root SSL untuk permintaan pembayaran {default: -system-)</translation> - </message> - <message> - <source>Show splash screen on startup (default: %u)</source> - <translation>Tampilkan layar kilat saat memulai (default: %u)</translation> - </message> - <message> - <source>Reset all settings changed in the GUI</source> - <translation>Hapus semua pengaturan pada GUI.</translation> - </message> </context> <context> <name>Intro</name> @@ -831,6 +803,18 @@ <translation>Karena ini adalah pertama kalinya program dijalankan, Anda dapat memilih lokasi %1 akan menyimpan data.</translation> </message> <message> + <source>When you click OK, %1 will begin to download and process the full %4 block chain (%2GB) starting with the earliest transactions in %3 when %4 initially launched.</source> + <translation>Ketika Anda mengklik OK, %1 akan mulai mengunduh dan memproses %4 block chain penuh (%2GB), dimulai dari transaksi-transaksi awal di %3 saat %4 diluncurkan pertama kali.</translation> + </message> + <message> + <source>This initial synchronisation is very demanding, and may expose hardware problems with your computer that had previously gone unnoticed. Each time you run %1, it will continue downloading where it left off.</source> + <translation>Sinkronisasi awal sangat berat dan mungkin akan menunjukkan permasalahan pada perangkat keras komputer Anda yang sebelumnya tidak tampak. Setiap kali Anda menjalankan %1, aplikasi ini akan melanjutkan pengunduhan dari posisi terakhir.</translation> + </message> + <message> + <source>If you have chosen to limit block chain storage (pruning), the historical data must still be downloaded and processed, but will be deleted afterward to keep your disk usage low.</source> + <translation>Apabila Anda memilih untuk membatasi penyimpanan block chain (pruning), data historis tetap akan diunduh dan diproses. Namun, data akan dihapus setelahnya untuk menjaga pemakaian disk agar tetap sedikit.</translation> + </message> + <message> <source>Use the default data directory</source> <translation>Gunakan direktori data default.</translation> </message> @@ -843,6 +827,22 @@ <translation>Bitcoin</translation> </message> <message> + <source>At least %1 GB of data will be stored in this directory, and it will grow over time.</source> + <translation>Setidaknya %1 GB data akan disimpan di direktori ini dan akan berkembang seiring berjalannya waktu.</translation> + </message> + <message> + <source>Approximately %1 GB of data will be stored in this directory.</source> + <translation>%1 GB data akan disimpan di direktori ini.</translation> + </message> + <message> + <source>%1 will download and store a copy of the Bitcoin block chain.</source> + <translation>%1 akan mengunduh dan menyimpan salinan Bitcoin block chain.</translation> + </message> + <message> + <source>The wallet will also be stored in this directory.</source> + <translation>Dompet juga akan disimpan di direktori ini.</translation> + </message> + <message> <source>Error: Specified data directory "%1" cannot be created.</source> <translation>Kesalahan: Direktori data "%1" tidak dapat dibuat.</translation> </message> @@ -866,10 +866,38 @@ <translation>Formulir</translation> </message> <message> + <source>Recent transactions may not yet be visible, and therefore your wallet's balance might be incorrect. This information will be correct once your wallet has finished synchronizing with the bitcoin network, as detailed below.</source> + <translation>Transaksi-transaksi terkini mungkin belum terlihat dan oleh karenanya, saldo dompet Anda mungkin tidak tepat. Informasi ini akan akurat ketika dompet Anda tersinkronisasi dengan jaringan Bitcoin, seperti rincian berikut.</translation> + </message> + <message> + <source>Number of blocks left</source> + <translation>Jumlah blok tersisa</translation> + </message> + <message> + <source>Unknown...</source> + <translation>Tidak diketahui...</translation> + </message> + <message> <source>Last block time</source> <translation>Waktu blok terakhir</translation> </message> - </context> + <message> + <source>calculating...</source> + <translation>menghitung...</translation> + </message> + <message> + <source>Estimated time left until synced</source> + <translation>Estimasi waktu tersisa sampai tersinkronisasi</translation> + </message> + <message> + <source>Hide</source> + <translation>Sembunyikan</translation> + </message> + <message> + <source>Unknown. Syncing Headers (%1)...</source> + <translation>Tidak diketahui. Menyinkronisasikan Headers (%1)...</translation> + </message> +</context> <context> <name>OpenURIDialog</name> <message> @@ -900,6 +928,14 @@ <translation>&Utama</translation> </message> <message> + <source>Automatically start %1 after logging in to the system.</source> + <translation>Mulai %1 secara otomatis setelah masuk ke dalam sistem.</translation> + </message> + <message> + <source>&Start %1 on system login</source> + <translation>Mulai %1 ketika masuk ke &sistem</translation> + </message> + <message> <source>Size of &database cache</source> <translation>Ukuran cache &database</translation> </message> @@ -916,6 +952,10 @@ <translation>Alamat IP proxy (cth. IPv4: 127.0.0.1 / IPv6: ::1)</translation> </message> <message> + <source>Hide the icon from the system tray.</source> + <translation>Sembunyikan ikon dari system tray.</translation> + </message> + <message> <source>Minimize instead of exit the application when the window is closed. When this option is enabled, the application will be closed only after selecting Exit in the menu.</source> <translation>Minimalisasi aplikasi ketika jendela ditutup. Ketika pilihan ini dipilih, aplikasi akan menutup seluruhnya jika anda memilih Keluar di menu yang tersedia.</translation> </message> @@ -928,6 +968,10 @@ <translation>Pilihan command-line yang aktif menimpa diatas opsi: </translation> </message> <message> + <source>Open Configuration File</source> + <translation>Buka Berkas Konfigurasi</translation> + </message> + <message> <source>Reset all client options to default.</source> <translation>Kembalikan semua pengaturan ke awal.</translation> </message> @@ -972,6 +1016,14 @@ <translation>Petakan port dengan &UPnP</translation> </message> <message> + <source>Accept connections from outside.</source> + <translation>Terima koneksi-koneksi dari luar.</translation> + </message> + <message> + <source>Allow incomin&g connections</source> + <translation>Terima koneksi-koneksi masuk</translation> + </message> + <message> <source>Connect to the Bitcoin network through a SOCKS5 proxy.</source> <translation>Hubungkan ke jaringan Bitcoin melalui SOCKS5 proxy.</translation> </message> @@ -1024,6 +1076,10 @@ <translation>&Bahasa Antarmuka Pengguna:</translation> </message> <message> + <source>The user interface language can be set here. This setting will take effect after restarting %1.</source> + <translation>Bahasa tampilan dapat diatur di sini. Pengaturan ini akan berpengaruh setelah memulai ulang %1.</translation> + </message> + <message> <source>&Unit to show amounts in:</source> <translation>&Unit untuk menunjukkan nilai:</translation> </message> @@ -1068,6 +1124,10 @@ <translation>Terjadi sebuah kesalahan</translation> </message> <message> + <source>The configuration file could not be opened.</source> + <translation>Berkas konfigurasi tidak dapat dibuka.</translation> + </message> + <message> <source>This change would require a client restart.</source> <translation>Perubahan ini akan memerlukan restart klien</translation> </message> @@ -1122,9 +1182,17 @@ <source>Your current total balance</source> <translation>Jumlah saldo Anda sekarang</translation> </message> + <message> + <source>Recent transactions</source> + <translation>Transaksi-transaksi terkini</translation> + </message> </context> <context> <name>PaymentServer</name> + <message> + <source>Payment request error</source> + <translation>Terjadi kesalahan pada permintaan pembayaran</translation> + </message> </context> <context> <name>PeerTableModel</name> @@ -1416,6 +1484,10 @@ <source>Label</source> <translation>Label</translation> </message> + <message> + <source>Wallet</source> + <translation>Dompet</translation> + </message> </context> <context> <name>RecentRequestsTableModel</name> @@ -1487,6 +1559,10 @@ <translation>Biaya Transaksi:</translation> </message> <message> + <source>Hide</source> + <translation>Sembunyikan</translation> + </message> + <message> <source>Recommended:</source> <translation>Disarankan</translation> </message> @@ -1551,6 +1627,10 @@ <translation>Salin Perubahan</translation> </message> <message> + <source>Transaction fee</source> + <translation>Biaya Transaksi</translation> + </message> + <message> <source>(no label)</source> <translation>(tidak ada label)</translation> </message> @@ -1776,58 +1856,14 @@ <context> <name>bitcoin-core</name> <message> - <source>Options:</source> - <translation>Pilihan:</translation> - </message> - <message> - <source>Specify data directory</source> - <translation>Tentukan direktori data</translation> - </message> - <message> - <source>Connect to a node to retrieve peer addresses, and disconnect</source> - <translation>Hubungkan ke node untuk menerima alamat peer, dan putuskan</translation> - </message> - <message> - <source>Specify your own public address</source> - <translation>Tentukan alamat publik Anda sendiri</translation> - </message> - <message> - <source>Accept command line and JSON-RPC commands</source> - <translation>Menerima perintah baris perintah dan JSON-RPC</translation> - </message> - <message> - <source>Run in the background as a daemon and accept commands</source> - <translation>Berjalan dibelakang sebagai daemin dan menerima perintah</translation> - </message> - <message> <source>Bitcoin Core</source> <translation>Bitcoin Core</translation> </message> <message> - <source>Execute command when a wallet transaction changes (%s in cmd is replaced by TxID)</source> - <translation>Jalankan perintah ketika perubahan transaksi dompet (%s di cmd digantikan oleh TxID)</translation> - </message> - <message> - <source>Accept connections from outside (default: 1 if no -proxy or -connect)</source> - <translation>Terima hubungan dari luar (standar: 1 kalau -proxy atau -connect tidak dipilih)</translation> - </message> - <message> - <source>Block creation options:</source> - <translation>Pilihan pembuatan blok:</translation> - </message> - <message> - <source>Connection options:</source> - <translation>Pilih koneksi:</translation> - </message> - <message> <source>Corrupted block database detected</source> <translation>Menemukan database blok yang rusak </translation> </message> <message> - <source>Do not load the wallet and disable wallet RPC calls</source> - <translation>Jangan memuat dompet dan menonaktifkan panggilan dompet RPC</translation> - </message> - <message> <source>Do you want to rebuild the block database now?</source> <translation>Apakah Anda ingin coba membangun kembali database blok sekarang?</translation> </message> @@ -1864,38 +1900,14 @@ <translation>Deskripsi berkas tidak tersedia dengan cukup.</translation> </message> <message> - <source>Specify wallet file (within data directory)</source> - <translation>Tentukan arsip dompet (dalam direktori data)</translation> - </message> - <message> <source>Verifying blocks...</source> <translation>Blok-blok sedang diverifikasi...</translation> </message> <message> - <source>Wallet options:</source> - <translation>Opsi dompet:</translation> - </message> - <message> - <source>Connect through SOCKS5 proxy</source> - <translation>Hubungkan melalui proxy SOCKS5</translation> - </message> - <message> <source>Information</source> <translation>Informasi</translation> </message> <message> - <source>RPC server options:</source> - <translation>Opsi server RPC:</translation> - </message> - <message> - <source>Send trace/debug info to console instead of debug.log file</source> - <translation>Kirim info jejak/debug ke konsol bukan berkas debug.log</translation> - </message> - <message> - <source>Shrink debug.log file on client startup (default: 1 when no -debug)</source> - <translation>Mengecilkan berkas debug.log saat klien berjalan (Standar: 1 jika tidak -debug)</translation> - </message> - <message> <source>Signing transaction failed</source> <translation>Tandatangani transaksi tergagal</translation> </message> @@ -1908,10 +1920,6 @@ <translation>Transaksi terlalu besar</translation> </message> <message> - <source>Username for JSON-RPC connections</source> - <translation>Nama pengguna untuk hubungan JSON-RPC</translation> - </message> - <message> <source>Warning</source> <translation>Peringatan</translation> </message> @@ -1920,18 +1928,6 @@ <translation>Setiap transaksi dalam dompet sedang di-'Zap'...</translation> </message> <message> - <source>Password for JSON-RPC connections</source> - <translation>Kata sandi untuk hubungan JSON-RPC</translation> - </message> - <message> - <source>Execute command when the best block changes (%s in cmd is replaced by block hash)</source> - <translation>Menjalankan perintah ketika perubahan blok terbaik (%s dalam cmd digantikan oleh hash blok)</translation> - </message> - <message> - <source>Allow DNS lookups for -addnode, -seednode and -connect</source> - <translation>Izinkan peninjauan DNS untuk -addnote, -seednode dan -connect</translation> - </message> - <message> <source>Unknown network specified in -onlynet: '%s'</source> <translation>Jaringan tidak diketahui yang ditentukan dalam -onlynet: '%s'</translation> </message> diff --git a/src/qt/locale/bitcoin_it.ts b/src/qt/locale/bitcoin_it.ts index eabd3d8ae9..5b24fcdf46 100644 --- a/src/qt/locale/bitcoin_it.ts +++ b/src/qt/locale/bitcoin_it.ts @@ -30,6 +30,10 @@ <translation>Rimuovi dalla lista l'indirizzo attualmente selezionato</translation> </message> <message> + <source>Enter address or label to search</source> + <translation>Inserisci un indirizzo o un'etichetta da cercare</translation> + </message> + <message> <source>Export the data in the current tab to a file</source> <translation>Esporta su file i dati contenuti nella tabella corrente</translation> </message> @@ -322,6 +326,14 @@ <translation>Apri &URI...</translation> </message> <message> + <source>Wallet:</source> + <translation>Portafoglio:</translation> + </message> + <message> + <source>default wallet</source> + <translation>Portafoglio predefinito:</translation> + </message> + <message> <source>Click to disable network activity.</source> <translation>Clicca per disattivare la rete.</translation> </message> @@ -342,6 +354,10 @@ <translation>Re-indicizzazione blocchi su disco...</translation> </message> <message> + <source>Proxy is <b>enabled</b>: %1</source> + <translation>Il Proxy è <b>enabled</b>:%1</translation> + </message> + <message> <source>Send coins to a Bitcoin address</source> <translation>Invia fondi ad un indirizzo Bitcoin</translation> </message> @@ -510,6 +526,12 @@ </translation> </message> <message> + <source>Wallet: %1 +</source> + <translation>Portafoglio: %1 +</translation> + </message> + <message> <source>Type: %1 </source> <translation>Tipo: %1 @@ -730,10 +752,6 @@ <translation>&Indirizzo</translation> </message> <message> - <source>New receiving address</source> - <translation>Nuovo indirizzo di ricezione</translation> - </message> - <message> <source>New sending address</source> <translation>Nuovo indirizzo d'invio</translation> </message> @@ -750,10 +768,6 @@ <translation>L'indirizzo inserito "%1" non è un indirizzo bitcoin valido.</translation> </message> <message> - <source>The entered address "%1" is already in the address book.</source> - <translation>L'indirizzo inserito "%1" è già in rubrica.</translation> - </message> - <message> <source>Could not unlock wallet.</source> <translation>Impossibile sbloccare il portamonete.</translation> </message> @@ -803,42 +817,6 @@ <source>Command-line options</source> <translation>Opzioni della riga di comando</translation> </message> - <message> - <source>Usage:</source> - <translation>Utilizzo:</translation> - </message> - <message> - <source>command-line options</source> - <translation>opzioni della riga di comando</translation> - </message> - <message> - <source>UI Options:</source> - <translation>Opzioni interfaccia:</translation> - </message> - <message> - <source>Choose data directory on startup (default: %u)</source> - <translation>Seleziona la directory dei dati all'avvio (default: %u)</translation> - </message> - <message> - <source>Set language, for example "de_DE" (default: system locale)</source> - <translation>Imposta la lingua, ad esempio "it_IT" (default: locale di sistema)</translation> - </message> - <message> - <source>Start minimized</source> - <translation>Avvia ridotto a icona</translation> - </message> - <message> - <source>Set SSL root certificates for payment request (default: -system-)</source> - <translation>Imposta un certificato SSL root per le richieste di pagamento (default: -system-)</translation> - </message> - <message> - <source>Show splash screen on startup (default: %u)</source> - <translation>Mostra schermata iniziale all'avvio (default: %u)</translation> - </message> - <message> - <source>Reset all settings changed in the GUI</source> - <translation>Reimposta tutti i campi dell'interfaccia grafica</translation> - </message> </context> <context> <name>Intro</name> @@ -1024,6 +1002,18 @@ <translation>Mostra se il proxy SOCK5 di default che p stato fornito è usato per raggiungere i contatti attraverso questo tipo di rete.</translation> </message> <message> + <source>Use separate SOCKS&5 proxy to reach peers via Tor hidden services:</source> + <translation>Usa una SOCKS&5 proxy differente per raggiungere peers usando servizi Tor hidden</translation> + </message> + <message> + <source>Hide the icon from the system tray.</source> + <translation>Nascondi l'icona nella barra delle applicazioni.</translation> + </message> + <message> + <source>&Hide tray icon</source> + <translation>&Nascondi l'icona della barra delle applicazioni</translation> + </message> + <message> <source>Minimize instead of exit the application when the window is closed. When this option is enabled, the application will be closed only after selecting Exit in the menu.</source> <translation>Riduci ad icona invece di uscire dall'applicazione quando la finestra viene chiusa. Attivando questa opzione l'applicazione terminerà solo dopo aver selezionato Esci dal menu File.</translation> </message> @@ -1057,6 +1047,22 @@ Per specificare più URL separarli con una barra verticale "|".</translation> <translation>Rete</translation> </message> <message> + <source>Disables some advanced features but all blocks will still be fully validated. Reverting this setting requires re-downloading the entire blockchain. Actual disk usage may be somewhat higher.</source> + <translation>Disattiva alcune funzionalità avanzate, ma tutti i blocchi saranno ancora completamente validati. Per ripristinare questa impostazione è necessario rieseguire il download dell'intera blockchain. L'utilizzo effettivo del disco potrebbe essere leggermente superiore.</translation> + </message> + <message> + <source>Prune &block storage to</source> + <translation>Eliminare e bloccare l'archiviazione su</translation> + </message> + <message> + <source>GB</source> + <translation>GB</translation> + </message> + <message> + <source>Reverting this setting requires re-downloading the entire blockchain.</source> + <translation>Per ripristinare questa impostazione è necessario rieseguire il download dell'intera blockchain.</translation> + </message> + <message> <source>(0 = auto, <0 = leave that many cores free)</source> <translation>(0 = automatico, <0 = lascia questo numero di core liberi)</translation> </message> @@ -1089,6 +1095,14 @@ Per specificare più URL separarli con una barra verticale "|".</translation> <translation>Mappa le porte tramite &UPnP</translation> </message> <message> + <source>Accept connections from outside.</source> + <translation>Accetta connessione esterne.</translation> + </message> + <message> + <source>Allow incomin&g connections</source> + <translation>Accetta connessioni in entrata</translation> + </message> + <message> <source>Connect to the Bitcoin network through a SOCKS5 proxy.</source> <translation>Connessione alla rete Bitcoin attraverso un proxy SOCKS5.</translation> </message> @@ -1169,6 +1183,10 @@ Per specificare più URL separarli con una barra verticale "|".</translation> <translation>Specifica se le funzionalita di coin control saranno visualizzate.</translation> </message> <message> + <source>&Third party transaction URLs</source> + <translation>&URLs per transazioni terzi </translation> + </message> + <message> <source>&OK</source> <translation>&OK</translation> </message> @@ -1311,6 +1329,10 @@ Per specificare più URL separarli con una barra verticale "|".</translation> <translation>Gestione URI</translation> </message> <message> + <source>'bitcoin://' is not a valid URI. Use 'bitcoin:' instead.</source> + <translation>'bitcoin: //' non è un URI valido. Usa invece "bitcoin:".</translation> + </message> + <message> <source>Payment request fetch URL is invalid: %1</source> <translation>URL di recupero della Richiesta di pagamento non valido: %1</translation> </message> @@ -1512,10 +1534,6 @@ Per specificare più URL separarli con una barra verticale "|".</translation> <translation>Errore: La cartella dati "%1" specificata non esiste.</translation> </message> <message> - <source>Error: Cannot parse configuration file: %1. Only use key=value syntax.</source> - <translation>Errore: impossibile interpretare il file di configurazione: %1. Usare esclusivamente la sintassi chiave=valore.</translation> - </message> - <message> <source>Error: %1</source> <translation>Errore: %1</translation> </message> @@ -1606,6 +1624,14 @@ Per specificare più URL separarli con una barra verticale "|".</translation> <translation>Utilizzo memoria</translation> </message> <message> + <source>Wallet: </source> + <translation>Portafoglio:</translation> + </message> + <message> + <source>(none)</source> + <translation>(nessuno)</translation> + </message> + <message> <source>&Reset</source> <translation>&Ripristina</translation> </message> @@ -1774,6 +1800,10 @@ Per specificare più URL separarli con una barra verticale "|".</translation> <translation>&Elimina Ban</translation> </message> <message> + <source>default wallet</source> + <translation>Portafoglio predefinito:</translation> + </message> + <message> <source>Welcome to the %1 RPC console.</source> <translation>Benvenuto nella console RPC di %1.</translation> </message> @@ -1782,6 +1812,14 @@ Per specificare più URL separarli con una barra verticale "|".</translation> <translation>Usa le flecce su e giú per navigare nella storia, e %1 per pulire lo schermo</translation> </message> <message> + <source>Type %1 for an overview of available commands.</source> + <translation>Digita %1 per una descrizione di comandi disponibili</translation> + </message> + <message> + <source>For more information on using this console type %1.</source> + <translation>Per maggiori informazioni su come usare questa console digita %1</translation> + </message> + <message> <source>WARNING: Scammers have been active, telling users to type commands here, stealing their wallet contents. Do not use this console without fully understanding the ramifications of a command.</source> <translation>ATTENZIONE: I truffatori sono stati attivi in quest'area, cercando di convincere gli utenti a digitare linee di comando e rubando i contenuti dei loro portafogli. Non usare questa console senza la piena consapevolezza delle ramificazioni di un comando.</translation> </message> @@ -1790,6 +1828,10 @@ Per specificare più URL separarli con una barra verticale "|".</translation> <translation>Attività di rete disabilitata</translation> </message> <message> + <source>Executing command without any wallet</source> + <translation>Esecuzione del comando senza alcun portafoglio</translation> + </message> + <message> <source>(node id: %1)</source> <translation>(id nodo: %1)</translation> </message> @@ -1861,6 +1903,14 @@ Per specificare più URL separarli con una barra verticale "|".</translation> <translation>Cancella</translation> </message> <message> + <source>Native segwit addresses (aka Bech32 or BIP-173) reduce your transaction fees later on and offer better protection against typos, but old wallets don't support them. When unchecked, an address compatible with older wallets will be created instead.</source> + <translation>Gli indirizzi nativi segwit (noti anche come Bech32 o BIP-173) riducono le spese di transazione e offrono una migliore protezione dagli errori di battitura, ma i vecchi portafogli non li supportano. Se deselezionata, verrà creato un indirizzo compatibile con i portafogli meno recenti.</translation> + </message> + <message> + <source>Generate native segwit (Bech32) address</source> + <translation>Genera indirizzo nativo segwit (Bech32)</translation> + </message> + <message> <source>Requested payments history</source> <translation>Cronologia pagamenti richiesti</translation> </message> @@ -1948,6 +1998,10 @@ Per specificare più URL separarli con una barra verticale "|".</translation> <translation>Messaggio</translation> </message> <message> + <source>Wallet</source> + <translation>Portafoglio</translation> + </message> + <message> <source>Resulting URI too long, try to reduce the text for label / message.</source> <translation> L'URI risultante è troppo lungo, prova a ridurre il testo nell'etichetta / messaggio.</translation> </message> @@ -2062,12 +2116,16 @@ Per specificare più URL separarli con una barra verticale "|".</translation> <translation>minimizza le impostazioni di commissione</translation> </message> <message> - <source>per kilobyte</source> - <translation>per kilobyte</translation> + <source>Specify a custom fee per kB (1,000 bytes) of the transaction's virtual size. + +Note: Since the fee is calculated on a per-byte basis, a fee of "100 satoshis per kB" for a transaction size of 500 bytes (half of 1 kB) would ultimately yield a fee of only 50 satoshis.</source> + <translation>Specifica una tariffa personalizzata per kB (1.000 byte) della dimensione virtuale della transazione + +Nota: poiché la commissione è calcolata su base per byte, una commissione di "100 satoshi per kB" per una dimensione di transazione di 500 byte (metà di 1 kB) alla fine produrrà una commissione di soli 50 satoshi.</translation> </message> <message> - <source>If the custom fee is set to 1000 satoshis and the transaction is only 250 bytes, then "per kilobyte" only pays 250 satoshis in fee, while "total at least" pays 1000 satoshis. For transactions bigger than a kilobyte both pay by kilobyte.</source> - <translation>Se la commissione personalizzata è impostata su 1000 satoshi e la transazione è di soli 250 byte, allora "per kilobyte" paga solo 250 satoshi di commissione, mentre "somma almeno" paga 1000 satoshi. Per transazioni più grandi di un kilobyte, entrambe le opzioni pagano al kilobyte.</translation> + <source>per kilobyte</source> + <translation>per kilobyte</translation> </message> <message> <source>Hide</source> @@ -2114,6 +2172,14 @@ Per specificare più URL separarli con una barra verticale "|".</translation> <translation>Obiettivo del tempo di conferma:</translation> </message> <message> + <source>Enable Replace-By-Fee</source> + <translation>Attiva Replace-By-Fee</translation> + </message> + <message> + <source>With Replace-By-Fee (BIP-125) you can increase a transaction's fee after it is sent. Without this, a higher fee may be recommended to compensate for increased transaction delay risk.</source> + <translation>Con Replace-By-Fee (BIP-125) si puo' aumentare la commissione sulla transazione dopo averla inviata. Senza questa, una commissione piu' alta e' consigliabile per compensare l'aumento del rischio dovuto al ritardo della transazione.</translation> + </message> + <message> <source>Clear &All</source> <translation>Cancella &tutto</translation> </message> @@ -2170,16 +2236,28 @@ Per specificare più URL separarli con una barra verticale "|".</translation> <translation> Sei sicuro di voler inviare?</translation> </message> <message> - <source>added as transaction fee</source> - <translation> Includi il costo della transazione</translation> + <source>or</source> + <translation>o</translation> </message> <message> - <source>Total Amount %1</source> - <translation>Importo Totale %1</translation> + <source>You can increase the fee later (signals Replace-By-Fee, BIP-125).</source> + <translation>Si puo' aumentare la commissione successivamente (segnalando Replace-By-Fee, BIP-125).</translation> </message> <message> - <source>or</source> - <translation>o</translation> + <source>Please, review your transaction.</source> + <translation>Per favore, rivedi la tua transazione.</translation> + </message> + <message> + <source>Transaction fee</source> + <translation>Commissione transazione</translation> + </message> + <message> + <source>Not signalling Replace-By-Fee, BIP-125.</source> + <translation>Senza segnalare Replace-By-Fee, BIP-125.</translation> + </message> + <message> + <source>Total Amount</source> + <translation>Importo totale</translation> </message> <message> <source>Confirm send coins</source> @@ -2519,10 +2597,6 @@ Per specificare più URL separarli con una barra verticale "|".</translation> <translation>in conflitto con una transazione con %1 conferme</translation> </message> <message> - <source>%1/offline</source> - <translation>%1/offline</translation> - </message> - <message> <source>0/unconfirmed, %1</source> <translation>0/non confermati, %1</translation> </message> @@ -2551,14 +2625,6 @@ Per specificare più URL separarli con una barra verticale "|".</translation> <translation>Stato</translation> </message> <message> - <source>, has not been successfully broadcast yet</source> - <translation>, non è ancora stata trasmessa con successo</translation> - </message> - <message numerus="yes"> - <source>, broadcast through %n node(s)</source> - <translation><numerusform>, trasmessa attraverso %n nodi</numerusform><numerusform>, trasmessa attraverso %n nodi</numerusform></translation> - </message> - <message> <source>Date</source> <translation>Data</translation> </message> @@ -2643,6 +2709,10 @@ Per specificare più URL separarli con una barra verticale "|".</translation> <translation>Dimensione totale della transazione</translation> </message> <message> + <source>Transaction virtual size</source> + <translation>Dimensione virtuale della transazione</translation> + </message> + <message> <source>Output index</source> <translation>Indice di output</translation> </message> @@ -2709,10 +2779,6 @@ Per specificare più URL separarli con una barra verticale "|".</translation> <translation><numerusform>Aperto per altri %n blocchi</numerusform><numerusform>Aperto per altri %n blocchi</numerusform></translation> </message> <message> - <source>Offline</source> - <translation>Offline</translation> - </message> - <message> <source>Unconfirmed</source> <translation>Non confermata</translation> </message> @@ -2737,10 +2803,6 @@ Per specificare più URL separarli con una barra verticale "|".</translation> <translation>Immaturo (%1 conferme, sarà disponibile fra %2)</translation> </message> <message> - <source>This block was not received by any other nodes and will probably not be accepted!</source> - <translation>Questo blocco non è stato ricevuto da alcun altro nodo e probabilmente non sarà accettato!</translation> - </message> - <message> <source>Generated but not accepted</source> <translation>Generati, ma non accettati</translation> </message> @@ -3051,38 +3113,18 @@ Per specificare più URL separarli con una barra verticale "|".</translation> <source>The wallet data was successfully saved to %1.</source> <translation>Il portamonete è stato correttamente salvato in %1.</translation> </message> + <message> + <source>Cancel</source> + <translation>Annulla</translation> + </message> </context> <context> <name>bitcoin-core</name> <message> - <source>Options:</source> - <translation>Opzioni:</translation> - </message> - <message> - <source>Specify data directory</source> - <translation>Specifica la cartella dati</translation> - </message> - <message> - <source>Connect to a node to retrieve peer addresses, and disconnect</source> - <translation>Connessione ad un nodo e successiva disconnessione per recuperare gli indirizzi dei peer</translation> - </message> - <message> - <source>Specify your own public address</source> - <translation>Specifica il tuo indirizzo pubblico</translation> - </message> - <message> - <source>Accept command line and JSON-RPC commands</source> - <translation>Accetta comandi da riga di comando e JSON-RPC</translation> - </message> - <message> <source>Distributed under the MIT software license, see the accompanying file %s or %s</source> <translation>Distribuito sotto la licenza software del MIT, si veda il file %s o %s incluso</translation> </message> <message> - <source>If <category> is not supplied or if <category> = 1, output all debugging information.</source> - <translation>Se <category> non è specificato oppure se <category> = 1, mostra tutte le informazioni di debug.</translation> - </message> - <message> <source>Prune configured below the minimum of %d MiB. Please use a higher number.</source> <translation>La modalità prune è configurata al di sotto del minimo di %d MB. Si prega di utilizzare un valore più elevato.</translation> </message> @@ -3099,18 +3141,10 @@ Per specificare più URL separarli con una barra verticale "|".</translation> <translation>Errore: si è presentato un errore interno fatale, consulta il file debug.log per maggiori dettagli</translation> </message> <message> - <source>Fee (in %s/kB) to add to transactions you send (default: %s)</source> - <translation>Commissione (in %s/kB) da aggiungere alle transazioni inviate (default: %s)</translation> - </message> - <message> <source>Pruning blockstore...</source> <translation>Pruning del blockstore...</translation> </message> <message> - <source>Run in the background as a daemon and accept commands</source> - <translation>Esegui in background come demone ed accetta i comandi</translation> - </message> - <message> <source>Unable to start HTTP server. See debug log for details.</source> <translation>Impossibile avviare il server HTTP. Dettagli nel log di debug.</translation> </message> @@ -3123,54 +3157,18 @@ Per specificare più URL separarli con una barra verticale "|".</translation> <translation>Sviluppatori di %s</translation> </message> <message> - <source>A fee rate (in %s/kB) that will be used when fee estimation has insufficient data (default: %s)</source> - <translation>Un importo (in %s/kB) che sarà utilizzato quando la stima delle commissioni non ha abbastanza dati (default: %s)</translation> - </message> - <message> - <source>Accept relayed transactions received from whitelisted peers even when not relaying transactions (default: %d)</source> - <translation>Accetta le transazioni trasmesse ricevute da peers in whitelist anche se non si stanno trasmettendo transazioni (default: %d)</translation> - </message> - <message> - <source>Bind to given address and always listen on it. Use [host]:port notation for IPv6</source> - <translation>Associa all'indirizzo indicato e resta permanentemente in ascolto su di esso. Usa la notazione [host]:porta per l'IPv6</translation> - </message> - <message> <source>Cannot obtain a lock on data directory %s. %s is probably already running.</source> <translation>Non è possibile ottenere i dati sulla cartella %s. Probabilmente %s è già in esecuzione.</translation> </message> <message> - <source>Delete all wallet transactions and only recover those parts of the blockchain through -rescan on startup</source> - <translation>Elimina tutte le transazioni dal portamonete e recupera solo quelle che fanno parte della blockchain attraverso il comando -rescan all'avvio.</translation> + <source>Cannot provide specific connections and have addrman find outgoing connections at the same.</source> + <translation>Non e' possibile fornire connessioni specifiche e contemporaneamente usare addrman per trovare connessioni uscenti. </translation> </message> <message> <source>Error reading %s! All keys read correctly, but transaction data or address book entries might be missing or incorrect.</source> <translation>Errore lettura %s! Tutte le chiavi sono state lette correttamente, ma i dati delle transazioni o della rubrica potrebbero essere mancanti o non corretti.</translation> </message> <message> - <source>Exclude debugging information for a category. Can be used in conjunction with -debug=1 to output debug logs for all categories except one or more specified categories.</source> - <translation>Esclude l'informazione di debug per una categoria. Può essere usata in congiunzione con -debug=1 per generare i log di debug per tutte le categorie eccetto una o più categorie specificate.</translation> - </message> - <message> - <source>Execute command when a wallet transaction changes (%s in cmd is replaced by TxID)</source> - <translation>Esegue un comando quando lo stato di una transazione del portamonete cambia (%s in cmd è sostituito da TxID)</translation> - </message> - <message> - <source>Extra transactions to keep in memory for compact block reconstructions (default: %u)</source> - <translation>Transazioni extra da mantenere in memoria per ricostruzioni compatte del blocco (predefinito: %u)</translation> - </message> - <message> - <source>If this block is in the chain assume that it and its ancestors are valid and potentially skip their script verification (0 to verify all, default: %s, testnet: %s)</source> - <translation>Se questo blocco è nella catena, assume che esso e i suoi predecessori siano validi e potenzialmente salta la verifica dei loro script (0 per verificarli tutti, predefinito: %s, testnet: %s)</translation> - </message> - <message> - <source>Maximum allowed median peer time offset adjustment. Local perspective of time may be influenced by peers forward or backward by this amount. (default: %u seconds)</source> - <translation>Regolazione della massima differenza media di tempo dei peer consentita. L'impostazione dell'orario locale può essere impostata in avanti o indietro di questa quantità. (default %u secondi)</translation> - </message> - <message> - <source>Maximum total fees (in %s) to use in a single wallet transaction or raw transaction; setting this too low may abort large transactions (default: %s)</source> - <translation>Totale massimo di commissioni (in %s) da usare in una transazione singola o di gruppo del wallet; valori troppo bassi possono abortire grandi transazioni (default: %s)</translation> - </message> - <message> <source>Please check that your computer's date and time are correct! If your clock is wrong, %s will not work properly.</source> <translation>Per favore controllate che la data del computer e l'ora siano corrette! Se il vostro orologio è sbagliato %s non funzionerà correttamente.</translation> </message> @@ -3179,22 +3177,6 @@ Per specificare più URL separarli con una barra verticale "|".</translation> <translation>Per favore contribuite se ritenete %s utile. Visitate %s per maggiori informazioni riguardo il software.</translation> </message> <message> - <source>Query for peer addresses via DNS lookup, if low on addresses (default: 1 unless -connect used)</source> - <translation>Ottiene gli indirizzi dei peer attraverso interrogazioni DNS, in caso di scarsa disponibilità (predefinito: 1 a meno che -connect non sia specificato)</translation> - </message> - <message> - <source>Reduce storage requirements by enabling pruning (deleting) of old blocks. This allows the pruneblockchain RPC to be called to delete specific blocks, and enables automatic pruning of old blocks if a target size in MiB is provided. This mode is incompatible with -txindex and -rescan. Warning: Reverting this setting requires re-downloading the entire blockchain. (default: 0 = disable pruning blocks, 1 = allow manual pruning via RPC, >%u = automatically prune block files to stay under the specified target size in MiB)</source> - <translation>Riduce i requisiti di spazio di archiviazione abilitando la cancellazione dei vecchi blocchi ("pruning" o potatura). Questo consente di richiedere alla pruneblockchain RPC di cancellare specifici blocchi e abilita il pruning automatico dei vecchi blocchi se viene fornita una dimensione specifica in MiB. Questa modalità è incompatibile con -txindex e -rescan. Attenzione: Per ripristinare questa impostazione è necessario riscaricare l'intera blockchain. (predefinito: 0 = disabilita il pruning dei blocchi, 1 = permetti il pruning manuale tramite RPC, >%u = pota automaticamente i file di blocco per stare sotto una dimensione specifica in MiB)</translation> - </message> - <message> - <source>Set lowest fee rate (in %s/kB) for transactions to be included in block creation. (default: %s)</source> - <translation>Imposta la tariffa di commissione più bassa (in %s/kB) per transazioni da includere nella creazione del blocco. (predefinito: %s)</translation> - </message> - <message> - <source>Set the number of script verification threads (%u to %d, 0 = auto, <0 = leave that many cores free, default: %d)</source> - <translation>Imposta il numero di thread per la verifica degli script (da %u a %d, 0 = automatico, <0 = lascia questo numero di core liberi, predefinito: %d)</translation> - </message> - <message> <source>The block database contains a block which appears to be from the future. This may be due to your computer's date and time being set incorrectly. Only rebuild the block database if you are sure that your computer's date and time are correct</source> <translation>Il database dei blocchi contiene un blocco che sembra provenire dal futuro. Questo può essere dovuto alla data e ora del tuo computer impostate in modo scorretto. Ricostruisci il database dei blocchi se sei certo che la data e l'ora sul tuo computer siano corrette</translation> </message> @@ -3215,18 +3197,6 @@ Per specificare più URL separarli con una barra verticale "|".</translation> <translation>Impossibile riportare il database ad un livello pre-fork. Dovrai riscaricare tutta la blockchain</translation> </message> <message> - <source>Use UPnP to map the listening port (default: 1 when listening and no -proxy)</source> - <translation>Utilizza UPnP per mappare la porta in ascolto (default: 1 quando in ascolto e -proxy non è specificato)</translation> - </message> - <message> - <source>Username and hashed password for JSON-RPC connections. The field <userpw> comes in the format: <USERNAME>:<SALT>$<HASH>. A canonical python script is included in share/rpcuser. The client then connects normally using the rpcuser=<USERNAME>/rpcpassword=<PASSWORD> pair of arguments. This option can be specified multiple times</source> - <translation>Username e hash password per connessioni JSON-RPC. Il campo <userpw> utilizza il formato: <USERNAME>:<SALT>$<HASH>. Uno script python standard è incluso in share/rpcuser. Il cliente quindi si connette normalmente utilizzando la coppia di argomenti rpcuser=<USERNAME>/rpcpassword=<PASSWORD>. Questa opzione può essere specificata più volte</translation> - </message> - <message> - <source>Wallet will not create transactions that violate mempool chain limits (default: %u)</source> - <translation>Il portafoglio non creerà transazioni che violino i limiti della mempool chain (predefinito: %u)</translation> - </message> - <message> <source>Warning: The network does not appear to fully agree! Some miners appear to be experiencing issues.</source> <translation>Attenzione: La rete non sembra essere pienamente d'accordo! Alcuni minatori sembrano riscontrare problemi.</translation> </message> @@ -3235,10 +3205,6 @@ Per specificare più URL separarli con una barra verticale "|".</translation> <translation>Attenzione: Sembra che non vi sia pieno consenso con i nostri peer! Un aggiornamento da parte tua o degli altri nodi potrebbe essere necessario.</translation> </message> <message> - <source>Whether to save the mempool on shutdown and load on restart (default: %u)</source> - <translation>Imposta se salvare la mempool allo spegnimento e caricarla alla riaccensione (predefinito: %u)</translation> - </message> - <message> <source>%d of last 100 blocks have unexpected version</source> <translation>%d degli ultimi 100 blocchi hanno una versione inaspettata</translation> </message> @@ -3251,42 +3217,14 @@ Per specificare più URL separarli con una barra verticale "|".</translation> <translation>-maxmempool deve essere almeno %d MB</translation> </message> <message> - <source><category> can be:</source> - <translation>Valori possibili per <category>:</translation> - </message> - <message> - <source>Accept connections from outside (default: 1 if no -proxy or -connect)</source> - <translation>Accetta connessioni dall'esterno (predefinito: 1 se -proxy o -connect non sono utilizzati)</translation> - </message> - <message> - <source>Append comment to the user agent string</source> - <translation>Aggiungi commento alla stringa dell'applicazione utente</translation> - </message> - <message> - <source>Attempt to recover private keys from a corrupt wallet on startup</source> - <translation>Prova a recuperare le chiavi private da un portafoglio corrotto all'avvio</translation> - </message> - <message> - <source>Block creation options:</source> - <translation>Opzioni creazione blocco:</translation> - </message> - <message> <source>Cannot resolve -%s address: '%s'</source> <translation>Impossobile risolvere l'indirizzo -%s: '%s'</translation> </message> <message> - <source>Chain selection options:</source> - <translation>Opzioni di selezione della catena:</translation> - </message> - <message> <source>Change index out of range</source> <translation>Cambio indice fuori paramentro</translation> </message> <message> - <source>Connection options:</source> - <translation>Opzioni di connessione:</translation> - </message> - <message> <source>Copyright (C) %i-%i</source> <translation>Copyright (C) %i-%i</translation> </message> @@ -3295,36 +3233,12 @@ Per specificare più URL separarli con una barra verticale "|".</translation> <translation>Rilevato database blocchi corrotto</translation> </message> <message> - <source>Debugging/Testing options:</source> - <translation>Opzioni di Debug/Test:</translation> - </message> - <message> - <source>Do not load the wallet and disable wallet RPC calls</source> - <translation>Disabilita il portamonete e le relative chiamate RPC</translation> - </message> - <message> <source>Do you want to rebuild the block database now?</source> <translation>Vuoi ricostruire ora il database dei blocchi?</translation> </message> <message> - <source>Enable publish hash block in <address></source> - <translation>Abilita pubblicazione hash blocco in <address></translation> - </message> - <message> - <source>Enable publish hash transaction in <address></source> - <translation>Abilità pubblicazione hash transazione in <address></translation> - </message> - <message> - <source>Enable publish raw block in <address></source> - <translation>Abilita pubblicazione blocchi raw in <address></translation> - </message> - <message> - <source>Enable publish raw transaction in <address></source> - <translation>Abilita pubblicazione transazione raw in <address></translation> - </message> - <message> - <source>Enable transaction replacement in the memory pool (default: %u)</source> - <translation>Abilita la sostituzione della transazione nel pool della memoria (default: %u)</translation> + <source>Error creating %s: You can't create non-HD wallets with this version.</source> + <translation>Errore durante la creazione %s: non e' possibile creare portafogli non-HD con questa versione.</translation> </message> <message> <source>Error initializing block database</source> @@ -3363,6 +3277,10 @@ Per specificare più URL separarli con una barra verticale "|".</translation> <translation>Nessuna porta disponibile per l'ascolto. Usa -listen=0 se vuoi procedere comunque.</translation> </message> <message> + <source>Failed to rescan the wallet during initialization</source> + <translation>Impossibile ripetere la scansione del portafoglio durante l'inizializzazione</translation> + </message> + <message> <source>Importing...</source> <translation>Importazione...</translation> </message> @@ -3387,8 +3305,8 @@ Per specificare più URL separarli con una barra verticale "|".</translation> <translation>Importo non valido per -fallbackfee=<amount>: '%s'</translation> </message> <message> - <source>Keep the transaction memory pool below <n> megabytes (default: %u)</source> - <translation>Mantieni la memory pool delle transazioni al di sotto di <n> megabytes (default: %u)</translation> + <source>Upgrading txindex database</source> + <translation>Aggiornamento del database txindex</translation> </message> <message> <source>Loading P2P addresses...</source> @@ -3399,26 +3317,10 @@ Per specificare più URL separarli con una barra verticale "|".</translation> <translation>Caricamento bloccati...</translation> </message> <message> - <source>Location of the auth cookie (default: data dir)</source> - <translation>Posizione del cookie di aiutorizzazione (default: data dir)</translation> - </message> - <message> <source>Not enough file descriptors available.</source> <translation>Non ci sono abbastanza descrittori di file disponibili.</translation> </message> <message> - <source>Only connect to nodes in network <net> (ipv4, ipv6 or onion)</source> - <translation>Connessione ai soli nodi appartenenti alla rete <net> (ipv4, ipv6 o Tor)</translation> - </message> - <message> - <source>Print this help message and exit</source> - <translation>Mostra questo messaggio di aiuto ed esci</translation> - </message> - <message> - <source>Print version and exit</source> - <translation>Mostra la versione ed esci</translation> - </message> - <message> <source>Prune cannot be configured with a negative value.</source> <translation>La modalità prune non può essere configurata con un valore negativo.</translation> </message> @@ -3427,14 +3329,6 @@ Per specificare più URL separarli con una barra verticale "|".</translation> <translation>La modalità prune è incompatibile con l'opzione -txindex.</translation> </message> <message> - <source>Rebuild chain state and block index from the blk*.dat files on disk</source> - <translation>Ricostruisci lo stato della catena e l'indice dei blocchi partendo dai file blk*.dat presenti sul disco</translation> - </message> - <message> - <source>Rebuild chain state from the currently indexed blocks</source> - <translation>Ricrea l'indice della catena dei blocchi partendo da quelli già indicizzati</translation> - </message> - <message> <source>Replaying blocks...</source> <translation>Ripetizione dei blocchi...</translation> </message> @@ -3443,14 +3337,6 @@ Per specificare più URL separarli con una barra verticale "|".</translation> <translation>Verifica blocchi...</translation> </message> <message> - <source>Set database cache size in megabytes (%d to %d, default: %d)</source> - <translation>Imposta la dimensione della cache del database in megabyte (%d a %d, predefinito: %d)</translation> - </message> - <message> - <source>Specify wallet file (within data directory)</source> - <translation>Specifica il file del portamonete (all'interno della cartella dati)</translation> - </message> - <message> <source>The source code is available from %s.</source> <translation>Il codice sorgente è disponibile in %s</translation> </message> @@ -3463,6 +3349,10 @@ Per specificare più URL separarli con una barra verticale "|".</translation> <translation>Impossibile collegarsi a %s su questo computer. Probabilmente %s è già in esecuzione.</translation> </message> <message> + <source>Unable to generate keys</source> + <translation>Impossibile generare le chiavi</translation> + </message> + <message> <source>Unsupported argument -benchmark ignored, use -debug=bench.</source> <translation>Ignorata opzione -benchmark non supportata, utilizzare -debug=bench.</translation> </message> @@ -3483,14 +3373,6 @@ Per specificare più URL separarli con una barra verticale "|".</translation> <translation>Aggiornamento del database UTXO</translation> </message> <message> - <source>Use UPnP to map the listening port (default: %u)</source> - <translation>Usa UPnP per mappare la porta di ascolto (predefinito: %u)</translation> - </message> - <message> - <source>Use the test chain</source> - <translation>Utilizza la catena di prova</translation> - </message> - <message> <source>User Agent comment (%s) contains unsafe characters.</source> <translation>Il commento del User Agent (%s) contiene caratteri non sicuri.</translation> </message> @@ -3499,90 +3381,26 @@ Per specificare più URL separarli con una barra verticale "|".</translation> <translation>Verifica blocchi...</translation> </message> <message> - <source>Wallet debugging/testing options:</source> - <translation>Opzioni di Debug/Test del portafoglio:</translation> - </message> - <message> <source>Wallet needed to be rewritten: restart %s to complete</source> <translation>Il portamonete necessita di essere riscritto: riavviare %s per completare</translation> </message> <message> - <source>Wallet options:</source> - <translation>Opzioni portamonete:</translation> - </message> - <message> - <source>Allow JSON-RPC connections from specified source. Valid for <ip> are a single IP (e.g. 1.2.3.4), a network/netmask (e.g. 1.2.3.4/255.255.255.0) or a network/CIDR (e.g. 1.2.3.4/24). This option can be specified multiple times</source> - <translation>Permette connessioni JSON-RPC dall'origine specificata. I valori validi per <ip> sono un singolo IP (ad es. 1.2.3.4), una network/netmask (ad es. 1.2.3.4/255.255.255.0) oppure una network/CIDR (ad es. 1.2.3.4/24). Questa opzione può essere specificata più volte.</translation> - </message> - <message> - <source>Bind to given address and whitelist peers connecting to it. Use [host]:port notation for IPv6</source> - <translation>Resta in ascolto sull'indirizzo indicato ed inserisce in whitelist i peer che vi si collegano. Usa la notazione [host]:porta per l'IPv6</translation> - </message> - <message> - <source>Create new files with system default permissions, instead of umask 077 (only effective with disabled wallet functionality)</source> - <translation>Crea nuovi file con i permessi di default del sistema, invece che con umask 077 (ha effetto solo con funzionalità di portamonete disabilitate)</translation> - </message> - <message> - <source>Discover own IP addresses (default: 1 when listening and no -externalip or -proxy)</source> - <translation>Scopre i propri indirizzi IP (predefinito: 1 se in ascolto ed -externalip o -proxy non sono specificati)</translation> - </message> - <message> <source>Error: Listening for incoming connections failed (listen returned error %s)</source> <translation>Errore: attesa per connessioni in arrivo fallita (errore riportato %s)</translation> </message> <message> - <source>Execute command when a relevant alert is received or we see a really long fork (%s in cmd is replaced by message)</source> - <translation>Esegue un comando in caso di ricezione di un allarme pertinente o se si rileva un fork molto lungo (%s in cmd è sostituito dal messaggio)</translation> - </message> - <message> - <source>Fees (in %s/kB) smaller than this are considered zero fee for relaying, mining and transaction creation (default: %s)</source> - <translation>Le commissioni (in %s/kB) inferiori a questo valore sono considerate pari a zero per trasmissione, mining e creazione della transazione (default: %s)</translation> - </message> - <message> - <source>If paytxfee is not set, include enough fee so transactions begin confirmation on average within n blocks (default: %u)</source> - <translation>Nel caso in cui paytxfee non sia impostato, include una commissione tale da ottenere un avvio delle conferme entro una media di n blocchi (predefinito: %u)</translation> - </message> - <message> <source>Invalid amount for -maxtxfee=<amount>: '%s' (must be at least the minrelay fee of %s to prevent stuck transactions)</source> <translation>Importo non valido per -maxtxfee=<amount>: '%s' (deve essere almeno pari alla commissione 'minrelay fee' di %s per prevenire transazioni bloccate)</translation> </message> <message> - <source>Maximum size of data in data carrier transactions we relay and mine (default: %u)</source> - <translation>Dimensione massima dei dati in transazioni di trasporto dati che saranno trasmesse ed incluse nei blocchi (predefinito: %u)</translation> - </message> - <message> - <source>Randomize credentials for every proxy connection. This enables Tor stream isolation (default: %u)</source> - <translation>Randomizza le credenziali per ogni connessione proxy. Permette la Tor stream isolation (predefinito: %u)</translation> - </message> - <message> <source>The transaction amount is too small to send after the fee has been deducted</source> <translation>L'importo della transazione risulta troppo basso per l'invio una volta dedotte le commissioni.</translation> </message> <message> - <source>Whitelisted peers cannot be DoS banned and their transactions are always relayed, even if they are already in the mempool, useful e.g. for a gateway</source> - <translation>I peer inclusi in whitelist non possono subire ban per DoS e le loro transazioni saranno sempre trasmesse, anche nel caso in cui si trovino già nel mempool. Ciò è utile ad es. per i gateway</translation> - </message> - <message> <source>You need to rebuild the database using -reindex to go back to unpruned mode. This will redownload the entire blockchain</source> <translation>Per ritornare alla modalità unpruned sarà necessario ricostruire il database utilizzando l'opzione -reindex. L'intera blockchain sarà riscaricata.</translation> </message> <message> - <source>(default: %u)</source> - <translation>(default: %u)</translation> - </message> - <message> - <source>Accept public REST requests (default: %u)</source> - <translation>Accetta richieste REST pubbliche (predefinito: %u)</translation> - </message> - <message> - <source>Automatically create Tor hidden service (default: %d)</source> - <translation>Crea automaticamente il servizio Tor (default: %d)</translation> - </message> - <message> - <source>Connect through SOCKS5 proxy</source> - <translation>Connessione attraverso un proxy SOCKS5</translation> - </message> - <message> <source>Error loading %s: You can't disable HD on an already existing HD wallet</source> <translation>Errore caricamento %s: Non puoi disabilitare HD in un portafoglio HD già esistente</translation> </message> @@ -3595,10 +3413,6 @@ Per specificare più URL separarli con una barra verticale "|".</translation> <translation>Errore durante l'aggiornamento del database chainstate</translation> </message> <message> - <source>Imports blocks from external blk000??.dat file on startup</source> - <translation>Importa blocchi da un file blk000??.dat esterno all'avvio</translation> - </message> - <message> <source>Information</source> <translation>Informazioni</translation> </message> @@ -3619,44 +3433,28 @@ Per specificare più URL separarli con una barra verticale "|".</translation> <translation>Netmask non valida specificata in -whitelist: '%s'</translation> </message> <message> - <source>Keep at most <n> unconnectable transactions in memory (default: %u)</source> - <translation>Mantiene in memoria al massimo <n> transazioni non collegabili (predefinito: %u)</translation> - </message> - <message> <source>Need to specify a port with -whitebind: '%s'</source> <translation>È necessario specificare una porta con -whitebind: '%s'</translation> </message> <message> - <source>Node relay options:</source> - <translation>Opzioni trasmissione nodo:</translation> - </message> - <message> - <source>RPC server options:</source> - <translation>Opzioni server RPC:</translation> - </message> - <message> <source>Reducing -maxconnections from %d to %d, because of system limitations.</source> <translation>Riduzione -maxconnections da %d a %d a causa di limitazioni di sistema.</translation> </message> <message> - <source>Rescan the block chain for missing wallet transactions on startup</source> - <translation>Ripete la scansione della block chain per individuare le transazioni che mancano dal wallet all'avvio</translation> + <source>Signing transaction failed</source> + <translation>Firma transazione fallita</translation> </message> <message> - <source>Send trace/debug info to console instead of debug.log file</source> - <translation>Invia le informazioni di trace/debug alla console invece che al file debug.log</translation> + <source>Specified -walletdir "%s" does not exist</source> + <translation>-walletdir "%s" specificata non esiste</translation> </message> <message> - <source>Show all debugging options (usage: --help -help-debug)</source> - <translation>Mostra tutte le opzioni di debug (utilizzo: --help -help-debug)</translation> + <source>Specified -walletdir "%s" is a relative path</source> + <translation>-walletdir "%s" specificata e' un path relativo</translation> </message> <message> - <source>Shrink debug.log file on client startup (default: 1 when no -debug)</source> - <translation>Riduce il file debug.log all'avvio del client (predefinito: 1 se -debug non è impostato)</translation> - </message> - <message> - <source>Signing transaction failed</source> - <translation>Firma transazione fallita</translation> + <source>Specified -walletdir "%s" is not a directory</source> + <translation>-walletdir "%s" specificata non e' una directory</translation> </message> <message> <source>The transaction amount is too small to pay the fee</source> @@ -3667,14 +3465,6 @@ Per specificare più URL separarli con una barra verticale "|".</translation> <translation>Questo è un software sperimentale.</translation> </message> <message> - <source>Tor control port password (default: empty)</source> - <translation>Password porta controllo Tor (default: empty)</translation> - </message> - <message> - <source>Tor control port to use if onion listening enabled (default: %s)</source> - <translation>Porta di controllo Tor da usare se in ascolto su onion (default: %s)</translation> - </message> - <message> <source>Transaction amount too small</source> <translation>Importo transazione troppo piccolo</translation> </message> @@ -3691,18 +3481,18 @@ Per specificare più URL separarli con una barra verticale "|".</translation> <translation>Impossibile associarsi a %s su questo computer (l'associazione ha restituito l'errore %s)</translation> </message> <message> - <source>Upgrade wallet to latest format on startup</source> - <translation>Aggiorna il wallet all'ultimo formato all'avvio</translation> - </message> - <message> - <source>Username for JSON-RPC connections</source> - <translation>Nome utente per connessioni JSON-RPC</translation> + <source>Unable to generate initial keys</source> + <translation>Impossibile generare chiave iniziale</translation> </message> <message> <source>Verifying wallet(s)...</source> <translation>Verifica portafoglio/i...</translation> </message> <message> + <source>Wallet %s resides outside wallet directory %s</source> + <translation>Il portafoglio %s e' situato fuori dalla directory del portafoglio %s </translation> + </message> + <message> <source>Warning</source> <translation>Attenzione</translation> </message> @@ -3711,98 +3501,18 @@ Per specificare più URL separarli con una barra verticale "|".</translation> <translation>Attenzione: nuove regole non conosciute attivate (versionbit %i)</translation> </message> <message> - <source>Whether to operate in a blocks only mode (default: %u)</source> - <translation>Imposta se operare in modalità solo blocchi (default: %u)</translation> - </message> - <message> - <source>You need to rebuild the database using -reindex to change -txindex</source> - <translation>È necessario ricostruire il database usando -reindex per cambiare -txindex</translation> - </message> - <message> <source>Zapping all transactions from wallet...</source> <translation>Eliminazione dal portamonete di tutte le transazioni...</translation> </message> <message> - <source>ZeroMQ notification options:</source> - <translation>Opzioni di notifica ZeroMQ</translation> - </message> - <message> - <source>Password for JSON-RPC connections</source> - <translation>Password per connessioni JSON-RPC</translation> - </message> - <message> - <source>Execute command when the best block changes (%s in cmd is replaced by block hash)</source> - <translation>Esegue un comando quando il miglior blocco cambia (%s nel cmd è sostituito dall'hash del blocco)</translation> - </message> - <message> - <source>Allow DNS lookups for -addnode, -seednode and -connect</source> - <translation>Consente interrogazioni DNS per -addnode, -seednode e -connect</translation> - </message> - <message> - <source>(1 = keep tx meta data e.g. account owner and payment request information, 2 = drop tx meta data)</source> - <translation>(1 = mantiene metadati tx, ad es. proprietario account ed informazioni di richiesta di pagamento, 2 = scarta metadati tx)</translation> - </message> - <message> <source>-maxtxfee is set very high! Fees this large could be paid on a single transaction.</source> <translation>-maxtxfee è impostato molto alto! Commissioni così alte possono venir pagate anche su una singola transazione.</translation> </message> <message> - <source>Bind to given address to listen for JSON-RPC connections. This option is ignored unless -rpcallowip is also passed. Port is optional and overrides -rpcport. Use [host]:port notation for IPv6. This option can be specified multiple times (default: 127.0.0.1 and ::1 i.e., localhost, or if -rpcallowip has been specified, 0.0.0.0 and :: i.e., all addresses)</source> - <translation>Resta in attesa di connessioni JSON-RPC sull'indirizzo indicato. Questa opzione viene ignorata a meno che anche -rpcallowip non sia trasmesso. Port è opzionale e prevale su -rpcport. Usa la notazione [host]:porta per IPv6. Questa opzione può essere specificata più volte (predefinito: 127.0.0.1 e ::1 ovvero localhost, o se -rpcallowip è stato specificato, 0.0.0.0 e :: ovvero tutti gli indirizzi)</translation> - </message> - <message> - <source>Do not keep transactions in the mempool longer than <n> hours (default: %u)</source> - <translation>Non mantenere le transazioni nella mempool più a lungo di <n> ore (default: %u)</translation> - </message> - <message> - <source>Equivalent bytes per sigop in transactions for relay and mining (default: %u)</source> - <translation>Byte equivalenti per ottimizzazione segnale dedicati a ritrasmissione ed estrazione (default: %u)</translation> - </message> - <message> <source>Error loading %s: You can't enable HD on an already existing non-HD wallet</source> <translation>Errore caricamento %s: Non puoi abilitare HD in un portafoglio non-HD già esistente</translation> </message> <message> - <source>Error loading wallet %s. -wallet parameter must only specify a filename (not a path).</source> - <translation>Errore caricamento portafoglio %s. Il parametro -wallet deve solo specificare un nome file (non un percorso).</translation> - </message> - <message> - <source>Fees (in %s/kB) smaller than this are considered zero fee for transaction creation (default: %s)</source> - <translation>Le commissioni (in %s/kB) inferiori a questo valore sono considerate pari a zero per la creazione della transazione (default: %s)</translation> - </message> - <message> - <source>Force relay of transactions from whitelisted peers even if they violate local relay policy (default: %d)</source> - <translation>Forza la trasmissione della transazione da peer in whitelist anche se violano le regole di trasmissione locali (predefinito: %d)</translation> - </message> - <message> - <source>How thorough the block verification of -checkblocks is (0-4, default: %u)</source> - <translation>Determina quanto sarà approfondita la verifica da parte di -checkblocks (0-4, predefinito: %u)</translation> - </message> - <message> - <source>Maintain a full transaction index, used by the getrawtransaction rpc call (default: %u)</source> - <translation>Mantiene l'indice completo delle transazioni usato dalla chiamata rpc getrawtransaction (predefinito: %u)</translation> - </message> - <message> - <source>Number of seconds to keep misbehaving peers from reconnecting (default: %u)</source> - <translation>Numero di secondi di sospensione prima della riconnessione per i peer che mostrano un comportamento anomalo (predefinito: %u)</translation> - </message> - <message> - <source>Output debugging information (default: %u, supplying <category> is optional)</source> - <translation>Emette informazioni di debug (predefinito: %u, fornire <category> è opzionale)</translation> - </message> - <message> - <source>Sets the serialization of raw transaction or block hex returned in non-verbose mode, non-segwit(0) or segwit(1) (default: %d)</source> - <translation>Imposta che la serializzazione degli hex di transazioni o blocchi grezzi sia riportata in maniere non-verbose, non-segwit(0) o segwit(1) (predefinito: %d)</translation> - </message> - <message> - <source>Support filtering of blocks and transaction with bloom filters (default: %u)</source> - <translation>Supporta filtraggio di blocchi e transazioni con filtri bloom (default: %u)</translation> - </message> - <message> - <source>The fee rate (in %s/kB) that indicates your tolerance for discarding change by adding it to the fee (default: %s). Note: An output is discarded if it is dust at this rate, but we will always discard up to the dust relay fee and a discard fee above that is limited by the fee estimate for the longest target</source> - <translation>La tariffa di commissione (in %s/kB) che indica la tua tolleranza a scartare il cambio aggiungendolo alla commissione (predefinito: %s).</translation> - </message> - <message> <source>This is the transaction fee you may pay when fee estimates are not available.</source> <translation>Questo è il costo di transazione che potresti pagare quando le stime della tariffa non sono disponibili.</translation> </message> @@ -3815,10 +3525,6 @@ Per specificare più URL separarli con una barra verticale "|".</translation> <translation>La lunghezza totale della stringa di network version (%i) eccede la lunghezza massima (%i). Ridurre il numero o la dimensione di uacomments.</translation> </message> <message> - <source>Tries to keep outbound traffic under the given target (in MiB per 24h), 0 = no limit (default: %d)</source> - <translation>Cerca di mantenere il traffico in uscita al di sotto della soglia scelta (in MiB ogni 24h), 0 = nessun limite (default: %d)</translation> - </message> - <message> <source>Unsupported argument -socks found. Setting SOCKS version isn't possible anymore, only SOCKS5 proxies are supported.</source> <translation>Argomento -socks non supportato. Non è più possibile impostare la versione SOCKS, solamente i proxy SOCKS5 sono supportati.</translation> </message> @@ -3827,10 +3533,6 @@ Per specificare più URL separarli con una barra verticale "|".</translation> <translation>Argomento non supportato -whitelistalwaysrelay è stato ignorato, utilizzare -whitelistrelay e/o -whitelistforcerelay.</translation> </message> <message> - <source>Use separate SOCKS5 proxy to reach peers via Tor hidden services (default: %s)</source> - <translation>Usa un proxy SOCKS5 a parte per raggiungere i peer attraverso gli hidden services di Tor (predefinito: %s)</translation> - </message> - <message> <source>Warning: Unknown block versions being mined! It's possible unknown rules are in effect</source> <translation>Attenzione: si stanno minando versioni sconocsiute di blocchi! E' possibile che siano attive regole sconosciute</translation> </message> @@ -3839,110 +3541,18 @@ Per specificare più URL separarli con una barra verticale "|".</translation> <translation>Attenzione: file del Portafoglio corrotto, dati recuperati! %s originale salvato come %s in %s; se il saldo o le transazioni non sono corrette effettua un ripristino da un backup.</translation> </message> <message> - <source>Whitelist peers connecting from the given IP address (e.g. 1.2.3.4) or CIDR notated network (e.g. 1.2.3.0/24). Can be specified multiple times.</source> - <translation>I peer in whitelist che si connettono dal dato indirizzo IP (es. 1.2.3.4) o dalla rete annotata CIDR (es. 1.2.3.0/24). Può essere specificato più volte.</translation> - </message> - <message> <source>%s is set very high!</source> <translation>%s ha un'impostazione molto alta!</translation> </message> <message> - <source>(default: %s)</source> - <translation>(predefinito: %s)</translation> - </message> - <message> - <source>Always query for peer addresses via DNS lookup (default: %u)</source> - <translation>Interroga sempre i DNS per ottenere gli indirizzi dei peer (predefinito: %u)</translation> - </message> - <message> - <source>Error loading wallet %s. -wallet filename must be a regular file.</source> - <translation>Errore caricamento portafoglio %s. Il nome file -wallet deve essere un file regolare.</translation> - </message> - <message> <source>Error loading wallet %s. Duplicate -wallet filename specified.</source> <translation>Errore caricamento portafoglio %s. Il nome file -wallet specificato è duplicato.</translation> </message> <message> - <source>Error loading wallet %s. Invalid characters in -wallet filename.</source> - <translation>Errore caricamento portafoglio %s. Caratteri invalidi nel nome file -wallet.</translation> - </message> - <message> - <source>How many blocks to check at startup (default: %u, 0 = all)</source> - <translation>Numero di blocchi da controllare all'avvio (predefinito: %u, 0 = tutti)</translation> - </message> - <message> - <source>Include IP addresses in debug output (default: %u)</source> - <translation>Include gli indirizzi IP nell'output del debug (predefinito: %u)</translation> - </message> - <message> <source>Keypool ran out, please call keypoolrefill first</source> <translation>Keypool esaurito, prima invocare keypoolrefill</translation> </message> <message> - <source>Listen for JSON-RPC connections on <port> (default: %u or testnet: %u)</source> - <translation>Resta in attesa di connessioni JSON-RPC su <port> (predefinito: %u o testnet: %u)</translation> - </message> - <message> - <source>Listen for connections on <port> (default: %u or testnet: %u)</source> - <translation>Resta in attesa di connessioni su <port> (predefinito: %u o testnet: %u)</translation> - </message> - <message> - <source>Maintain at most <n> connections to peers (default: %u)</source> - <translation>Mantiene al massimo <n> connessioni verso i peer (predefinito: %u)</translation> - </message> - <message> - <source>Make the wallet broadcast transactions</source> - <translation>Configura il portamonete per la trasmissione di transazioni</translation> - </message> - <message> - <source>Maximum per-connection receive buffer, <n>*1000 bytes (default: %u)</source> - <translation>Buffer di ricezione massimo per connessione, <n>*1000 byte (predefinito: %u)</translation> - </message> - <message> - <source>Maximum per-connection send buffer, <n>*1000 bytes (default: %u)</source> - <translation>Buffer di invio massimo per connessione, <n>*1000 byte (predefinito: %u)</translation> - </message> - <message> - <source>Prepend debug output with timestamp (default: %u)</source> - <translation>Antepone un timestamp all'output del debug (predefinito: %u)</translation> - </message> - <message> - <source>Relay and mine data carrier transactions (default: %u)</source> - <translation>Trasmette ed include nei blocchi transazioni di trasporto dati (predefinito: %u)</translation> - </message> - <message> - <source>Relay non-P2SH multisig (default: %u)</source> - <translation>Trasmette transazioni non-P2SH multisig (predefinito: %u)</translation> - </message> - <message> - <source>Set key pool size to <n> (default: %u)</source> - <translation>Imposta la dimensione del pool di chiavi a <n> (predefinito: %u)</translation> - </message> - <message> - <source>Set maximum BIP141 block weight (default: %d)</source> - <translation>Imposta la dimensione massima del blocco BIP141 (default: %d)</translation> - </message> - <message> - <source>Set the number of threads to service RPC calls (default: %d)</source> - <translation>Imposta il numero di thread destinati a rispondere alle chiamate RPC (predefinito %d)</translation> - </message> - <message> - <source>Specify configuration file (default: %s)</source> - <translation>Specifica il file di configurazione (predefinito: %s)</translation> - </message> - <message> - <source>Specify connection timeout in milliseconds (minimum: 1, default: %d)</source> - <translation>Specifica il timeout di connessione in millisecondi (minimo:1, predefinito: %d)</translation> - </message> - <message> - <source>Specify pid file (default: %s)</source> - <translation>Specifica il file pid (predefinito: %s)</translation> - </message> - <message> - <source>Spend unconfirmed change when sending transactions (default: %u)</source> - <translation>Abilita la spesa di resto non confermato quando si inviano transazioni (predefinito: %u)</translation> - </message> - <message> <source>Starting network threads...</source> <translation>Inizializzazione dei thread di rete...</translation> </message> @@ -3959,10 +3569,6 @@ Per specificare più URL separarli con una barra verticale "|".</translation> <translation>Questo è il costo di transazione che pagherai se invii una transazione.</translation> </message> <message> - <source>Threshold for disconnecting misbehaving peers (default: %u)</source> - <translation>Soglia di disconnessione per i peer che si comportano in maniera anomala (predefinito: %u)</translation> - </message> - <message> <source>Transaction amounts must not be negative</source> <translation>Gli importi di transazione non devono essere negativi</translation> </message> @@ -3983,6 +3589,18 @@ Per specificare più URL separarli con una barra verticale "|".</translation> <translation>Fondi insufficienti</translation> </message> <message> + <source>Can't generate a change-address key. Private keys are disabled for this wallet.</source> + <translation>Impossibile generare una chiave di indirizzo di modifica. Le chiavi private sono disabilitate per questo portafoglio.</translation> + </message> + <message> + <source>Cannot upgrade a non HD split wallet without upgrading to support pre split keypool. Please use -upgradewallet=169900 or -upgradewallet with no version specified.</source> + <translation>Impossibile aggiornare un portafoglio diviso non HD senza aggiornamento per supportare il keypool pre-split. Si prega di utilizzare -upgradewallet = 169900 o -upgradewallet senza specificare la versione.</translation> + </message> + <message> + <source>Fee estimation failed. Fallbackfee is disabled. Wait a few blocks or enable -fallbackfee.</source> + <translation>Stima della commissione non riuscita. Fallbackfee è disabilitato. Attendi qualche blocco o abilita -fallbackfee.</translation> + </message> + <message> <source>Loading block index...</source> <translation>Caricamento dell'indice dei blocchi...</translation> </message> diff --git a/src/qt/locale/bitcoin_it_IT.ts b/src/qt/locale/bitcoin_it_IT.ts index 4f74d0f437..eccf015bf5 100644 --- a/src/qt/locale/bitcoin_it_IT.ts +++ b/src/qt/locale/bitcoin_it_IT.ts @@ -15,7 +15,7 @@ </message> <message> <source>Copy the currently selected address to the system clipboard</source> - <translation>copia l'indirizzo selezionato correntemente nella clipboard di sistema</translation> + <translation>Copia l'indirizzo selezionato nella clipboard di sistema</translation> </message> <message> <source>&Copy</source> @@ -30,6 +30,10 @@ <translation>Cancella l'indirizzo attualmente selezionato dalla lista.</translation> </message> <message> + <source>Enter address or label to search</source> + <translation>Inserire indirizzo o etichetta da cercare</translation> + </message> + <message> <source>Export the data in the current tab to a file</source> <translation>Esportare i dati nella scheda corrente in un file</translation> </message> @@ -318,6 +322,14 @@ <translation>Apri &URI...</translation> </message> <message> + <source>Wallet:</source> + <translation>Portafoglio</translation> + </message> + <message> + <source>default wallet</source> + <translation>Portafoglio predefinito</translation> + </message> + <message> <source>Click to disable network activity.</source> <translation>Clicca per disabilitare attività di rete.</translation> </message> @@ -674,10 +686,6 @@ <translation>&Indirizzo</translation> </message> <message> - <source>New receiving address</source> - <translation>Nuovo indirizzo di ricezione</translation> - </message> - <message> <source>New sending address</source> <translation>Nuovo indirizzo di invio</translation> </message> @@ -694,10 +702,6 @@ <translation>L'indirizzo inserito "%1" non è un indirizzo Bitcoin valido.</translation> </message> <message> - <source>The entered address "%1" is already in the address book.</source> - <translation>L'indirizzo inserito "%1" è già nella rubrica.</translation> - </message> - <message> <source>Could not unlock wallet.</source> <translation>Non posso sbloccare il portafoglio.</translation> </message> @@ -743,19 +747,7 @@ <source>Command-line options</source> <translation>Opzioni linea di comando</translation> </message> - <message> - <source>Usage:</source> - <translation>Utilizzo:</translation> - </message> - <message> - <source>command-line options</source> - <translation>opzioni linea di comando</translation> - </message> - <message> - <source>UI Options:</source> - <translation>Opzioni UI</translation> - </message> - </context> +</context> <context> <name>Intro</name> <message> @@ -767,6 +759,10 @@ <translation>Bitcoin</translation> </message> <message> + <source>The wallet will also be stored in this directory.</source> + <translation>Il portafoglio sara' </translation> + </message> + <message> <source>Error</source> <translation>Errore</translation> </message> @@ -788,18 +784,50 @@ <translation>Opzioni</translation> </message> <message> + <source>Configuration options</source> + <translation>Opzioni di configurazione</translation> + </message> + <message> <source>Error</source> <translation>Errore</translation> </message> + <message> + <source>This change would require a client restart.</source> + <translation>Questa modifica richiede un riavvio del client</translation> + </message> </context> <context> <name>OverviewPage</name> + <message> + <source>Available:</source> + <translation>Disponibile:</translation> + </message> + <message> + <source>Your current spendable balance</source> + <translation>Saldo disponibile</translation> + </message> + <message> + <source>Recent transactions</source> + <translation>Transazioni recenti</translation> + </message> </context> <context> <name>PaymentServer</name> + <message> + <source>Payment request rejected</source> + <translation>Richiesta di pagamento rifiutata</translation> + </message> + <message> + <source>Refund from %1</source> + <translation>Rimborso da %1</translation> + </message> </context> <context> <name>PeerTableModel</name> + <message> + <source>Sent</source> + <translation>Inviato</translation> + </message> </context> <context> <name>QObject</name> @@ -816,6 +844,14 @@ </context> <context> <name>RPCConsole</name> + <message> + <source>Sent</source> + <translation>Inviato</translation> + </message> + <message> + <source>default wallet</source> + <translation>Portafoglio predefinito</translation> + </message> </context> <context> <name>ReceiveCoinsDialog</name> @@ -842,6 +878,10 @@ <source>Label</source> <translation>Etichetta</translation> </message> + <message> + <source>Wallet</source> + <translation>Portafoglio</translation> + </message> </context> <context> <name>RecentRequestsTableModel</name> diff --git a/src/qt/locale/bitcoin_ja.ts b/src/qt/locale/bitcoin_ja.ts index 2e8791d7ab..7650694e15 100644 --- a/src/qt/locale/bitcoin_ja.ts +++ b/src/qt/locale/bitcoin_ja.ts @@ -3,7 +3,7 @@ <name>AddressBookPage</name> <message> <source>Right-click to edit address or label</source> - <translation>アドレスまたはラベルを編集するにはダブルクリック</translation> + <translation>右クリックでアドレスまたはラベルを編集します</translation> </message> <message> <source>Create a new address</source> @@ -30,6 +30,10 @@ <translation>選択されたアドレスを一覧から削除する</translation> </message> <message> + <source>Enter address or label to search</source> + <translation>検索するアドレスまたはラベルを入力</translation> + </message> + <message> <source>Export the data in the current tab to a file</source> <translation>ファイルに現在のタブのデータをエクスポート</translation> </message> @@ -43,7 +47,7 @@ </message> <message> <source>Choose the address to send coins to</source> - <translation>先のアドレスを選択</translation> + <translation>送信先のアドレスを選択</translation> </message> <message> <source>Choose the address to receive coins with</source> @@ -322,6 +326,14 @@ <translation>URI を開く (&U)...</translation> </message> <message> + <source>Wallet:</source> + <translation>ウォレット:</translation> + </message> + <message> + <source>default wallet</source> + <translation>デフォルトウォレット</translation> + </message> + <message> <source>Click to disable network activity.</source> <translation>クリックするとネットワーク活動を無効化します。</translation> </message> @@ -342,6 +354,10 @@ <translation>ディスク上のブロックのインデックスを再作成中...</translation> </message> <message> + <source>Proxy is <b>enabled</b>: %1</source> + <translation>プロキシは <b>有効</b>です: %1</translation> + </message> + <message> <source>Send coins to a Bitcoin address</source> <translation>Bitcoin アドレスにコインを送る</translation> </message> @@ -510,6 +526,12 @@ </translation> </message> <message> + <source>Wallet: %1 +</source> + <translation>ウォレット: %1 +</translation> + </message> + <message> <source>Type: %1 </source> <translation>タイプ: %1 @@ -730,10 +752,6 @@ <translation>アドレス帳 (&A)</translation> </message> <message> - <source>New receiving address</source> - <translation>新しい受信アドレス</translation> - </message> - <message> <source>New sending address</source> <translation>新しい送信アドレス</translation> </message> @@ -750,8 +768,12 @@ <translation>入力されたアドレス "%1" は無効な Bitcoin アドレスです。</translation> </message> <message> - <source>The entered address "%1" is already in the address book.</source> - <translation>入力されたアドレス "%1" は既にアドレス帳にあります。</translation> + <source>Address "%1" already exists as a receiving address with label "%2" and so cannot be added as a sending address.</source> + <translation>アドレス "%1" は既に受取用アドレスにラベル "%2" として存在するので、送金用アドレスとしては追加できません。</translation> + </message> + <message> + <source>The entered address "%1" is already in the address book with label "%2".</source> + <translation>入力されたアドレス"%1"はすでにアドレス帳のラベル"%2"に存在します｡</translation> </message> <message> <source>Could not unlock wallet.</source> @@ -803,42 +825,6 @@ <source>Command-line options</source> <translation>コマンドライン オプション</translation> </message> - <message> - <source>Usage:</source> - <translation>使用法:</translation> - </message> - <message> - <source>command-line options</source> - <translation>コマンドライン オプション</translation> - </message> - <message> - <source>UI Options:</source> - <translation>UIオプション:</translation> - </message> - <message> - <source>Choose data directory on startup (default: %u)</source> - <translation>起動時にデータ ディレクトリを選ぶ (初期値: %u)</translation> - </message> - <message> - <source>Set language, for example "de_DE" (default: system locale)</source> - <translation>言語設定 例: "de_DE" (初期値: システムの言語)</translation> - </message> - <message> - <source>Start minimized</source> - <translation>最小化された状態で起動する</translation> - </message> - <message> - <source>Set SSL root certificates for payment request (default: -system-)</source> - <translation>支払いリクエスト用にSSLルート証明書を設定する (デフォルト：-system-)</translation> - </message> - <message> - <source>Show splash screen on startup (default: %u)</source> - <translation>起動時にスプラッシュ画面を表示する (初期値: %u)</translation> - </message> - <message> - <source>Reset all settings changed in the GUI</source> - <translation>GUI で行われた設定の変更を全てリセット</translation> - </message> </context> <context> <name>Intro</name> @@ -1024,6 +1010,10 @@ <translation>このネットワークタイプ経由で、与えられたデフォルトのSOCKS5プロキシを使用してピアに到達した場合に表示する。</translation> </message> <message> + <source>Use separate SOCKS&5 proxy to reach peers via Tor hidden services:</source> + <translation>Tor秘匿サービス経由でピアに接続するために専用のSOCKS5プロキシを利用する:</translation> + </message> + <message> <source>Hide the icon from the system tray.</source> <translation>システムトレイのアイコンを隠す</translation> </message> @@ -1064,6 +1054,22 @@ <translation>ネットワーク (&N)</translation> </message> <message> + <source>Disables some advanced features but all blocks will still be fully validated. Reverting this setting requires re-downloading the entire blockchain. Actual disk usage may be somewhat higher.</source> + <translation>いくつかの高度な機能は無効になりますが、すべてのブロックは完全に検証されます。この設定を元に戻すには、ブロック チェーン全体を再ダウンロードする必要があります。実際のディスク使用量は多少多くなる可能性があります。</translation> + </message> + <message> + <source>Prune &block storage to</source> + <translation>剪定 / ブロックの保存容量</translation> + </message> + <message> + <source>GB</source> + <translation>GB</translation> + </message> + <message> + <source>Reverting this setting requires re-downloading the entire blockchain.</source> + <translation>この設定を元に戻すには、ブロック チェーン全体を再ダウンロードする必要があります。</translation> + </message> + <message> <source>(0 = auto, <0 = leave that many cores free)</source> <translation>(0 = 自動、0以上 = 指定した数のコアをフリーにする)</translation> </message> @@ -1330,6 +1336,10 @@ <translation>URI の操作</translation> </message> <message> + <source>'bitcoin://' is not a valid URI. Use 'bitcoin:' instead.</source> + <translation>'bitcoin://' は正しいURIではありません｡ 'bitcoin:'を利用してください｡</translation> + </message> + <message> <source>Payment request fetch URL is invalid: %1</source> <translation>支払い要求の取得先URLが無効です: %1</translation> </message> @@ -1426,11 +1436,11 @@ </message> <message> <source>Sent</source> - <translation>送金</translation> + <translation>送信</translation> </message> <message> <source>Received</source> - <translation>受取</translation> + <translation>受信</translation> </message> </context> <context> @@ -1527,12 +1537,16 @@ <context> <name>QObject::QObject</name> <message> + <source>Error parsing command line arguments: %1.</source> + <translation>エラー: コマンドライン引数のパース: %1.</translation> + </message> + <message> <source>Error: Specified data directory "%1" does not exist.</source> <translation>エラー: 指定のデータ ディレクトリ "%1" は存在しません。</translation> </message> <message> - <source>Error: Cannot parse configuration file: %1. Only use key=value syntax.</source> - <translation>エラー: 設定ファイルをパースできません: %1。key=value という記法のみを利用してください。</translation> + <source>Error: Cannot parse configuration file: %1.</source> + <translation>エラー: 設定ファイルが読み込めません: %1</translation> </message> <message> <source>Error: %1</source> @@ -1625,16 +1639,24 @@ <translation>メモリ使用量</translation> </message> <message> + <source>Wallet: </source> + <translation>ウォレット:</translation> + </message> + <message> + <source>(none)</source> + <translation>(なし)</translation> + </message> + <message> <source>&Reset</source> <translation>リセット (&R)</translation> </message> <message> <source>Received</source> - <translation>受取</translation> + <translation>受信</translation> </message> <message> <source>Sent</source> - <translation>送金</translation> + <translation>送信</translation> </message> <message> <source>&Peers</source> @@ -1793,6 +1815,10 @@ <translation>Banを解除する (&U)</translation> </message> <message> + <source>default wallet</source> + <translation>デフォルトウォレット</translation> + </message> + <message> <source>Welcome to the %1 RPC console.</source> <translation>%1 のRPCコンソールへようこそ。</translation> </message> @@ -1817,6 +1843,14 @@ <translation>ネットワーク活動は無効化されました</translation> </message> <message> + <source>Executing command without any wallet</source> + <translation>ウォレットを含めずにコマンドを実行する</translation> + </message> + <message> + <source>Executing command using "%1" wallet</source> + <translation>"%1"のウォレットを使ってコマンドを実行する</translation> + </message> + <message> <source>(node id: %1)</source> <translation>(ノードID: %1)</translation> </message> @@ -1888,6 +1922,14 @@ <translation>クリア</translation> </message> <message> + <source>Native segwit addresses (aka Bech32 or BIP-173) reduce your transaction fees later on and offer better protection against typos, but old wallets don't support them. When unchecked, an address compatible with older wallets will be created instead.</source> + <translation>Segwitアドレス(Bech32もしくはBIP-173アドレス)を利用すると手数料が安くなり、また誤入力防止機能も強化されますが、Segwitアドレスをサポートしない古いウォレットとの互換性は失われます。チェックを外すと、古いウォレットとの互換性を保った古いアドレスが代わりに生成されます。</translation> + </message> + <message> + <source>Generate native segwit (Bech32) address</source> + <translation>Segwitアドレス(Bech32アドレス)を生成する</translation> + </message> + <message> <source>Requested payments history</source> <translation>支払リクエスト履歴</translation> </message> @@ -1896,10 +1938,6 @@ <translation>支払をリクエストする (&R)</translation> </message> <message> - <source>Generate Bech32 address</source> - <translation>Bech32形式のアドレスを生成</translation> - </message> - <message> <source>Show the selected request (does the same as double clicking an entry)</source> <translation>選択されたリクエストを表示する（項目をダブルクリックすることでも表示できます）</translation> </message> @@ -1979,6 +2017,10 @@ <translation>メッセージ</translation> </message> <message> + <source>Wallet</source> + <translation>ウォレット</translation> + </message> + <message> <source>Resulting URI too long, try to reduce the text for label / message.</source> <translation>URI が長くなり過ぎます。ラベルやメッセージのテキストを短くしてください。</translation> </message> @@ -2093,12 +2135,16 @@ <translation>手数料設定を折りたたむ</translation> </message> <message> - <source>per kilobyte</source> - <translation>1キロバイトあたり手数料</translation> + <source>Specify a custom fee per kB (1,000 bytes) of the transaction's virtual size. + +Note: Since the fee is calculated on a per-byte basis, a fee of "100 satoshis per kB" for a transaction size of 500 bytes (half of 1 kB) would ultimately yield a fee of only 50 satoshis.</source> + <translation>トランザクションの仮想サイズの kB (1,000 バイト) あたりのカスタム手数料を指定します。 + +注: 手数料はバイト単位で計算されるので、500 バイト (1 kBの半分) のトランザクションサイズに対する "kB あたり 100 satoshi" の手数料は、最終的にわずか 50 satoshiとなります。</translation> </message> <message> - <source>If the custom fee is set to 1000 satoshis and the transaction is only 250 bytes, then "per kilobyte" only pays 250 satoshis in fee, while "total at least" pays 1000 satoshis. For transactions bigger than a kilobyte both pay by kilobyte.</source> - <translation>カスタム手数料が1000satoshiに設定されている場合、トランザクションサイズが250バイトとすると、「1キロバイトあたり手数料」では250satoshiの手数料のみを支払いますが、「最小手数料」では1000satoshiを支払います。1キロバイトを超えるトランザクションの場合には、どちらの方法を選択したとしても1キロバイトあたりで支払われます。</translation> + <source>per kilobyte</source> + <translation>1キロバイトあたり手数料</translation> </message> <message> <source>Hide</source> @@ -2149,6 +2195,10 @@ <translation>Replace-By-Fee を有効</translation> </message> <message> + <source>With Replace-By-Fee (BIP-125) you can increase a transaction's fee after it is sent. Without this, a higher fee may be recommended to compensate for increased transaction delay risk.</source> + <translation>手数料の上乗せ(Replace-By-Fee: BIP-125を参照)によってトランザクションを送信した後でも手数料を上乗せすることができます。この機能を利用しない場合、予め手数料を多めに見積もっておかないと送金が遅れる可能性があります。</translation> + </message> + <message> <source>Clear &All</source> <translation>すべてクリア (&A)</translation> </message> @@ -2205,16 +2255,32 @@ <translation>送ってよろしいですか？</translation> </message> <message> - <source>added as transaction fee</source> - <translation>取引手数料として追加された</translation> + <source>or</source> + <translation>または</translation> </message> <message> - <source>Total Amount %1</source> - <translation>合計： %1</translation> + <source>You can increase the fee later (signals Replace-By-Fee, BIP-125).</source> + <translation>手数料は後から上乗せすることができます(Replace-By-Feeのシグナル: BIP-125を参照)。</translation> </message> <message> - <source>or</source> - <translation>または</translation> + <source>from wallet %1</source> + <translation>ウォレット %1 から</translation> + </message> + <message> + <source>Please, review your transaction.</source> + <translation>トランザクションを見直してください。</translation> + </message> + <message> + <source>Transaction fee</source> + <translation>取引手数料</translation> + </message> + <message> + <source>Not signalling Replace-By-Fee, BIP-125.</source> + <translation>BIP-125による手数料上乗せ機能を利用していません。</translation> + </message> + <message> + <source>Total Amount</source> + <translation>合計</translation> </message> <message> <source>Confirm send coins</source> @@ -2336,6 +2402,10 @@ <translation>送金額から手数料を差し引く (&U)</translation> </message> <message> + <source>Use available balance</source> + <translation>利用可能な残額を使用</translation> + </message> + <message> <source>Message:</source> <translation>メッセージ:</translation> </message> @@ -2398,7 +2468,7 @@ </message> <message> <source>You can sign messages/agreements with your addresses to prove you can receive bitcoins sent to them. Be careful not to sign anything vague or random, as phishing attacks may try to trick you into signing your identity over to them. Only sign fully-detailed statements you agree to.</source> - <translation>あなたの所有しているアドレスによりメッセージや合意書に署名をすることで、それらアドレスに対して送られたビットコインを受け取ることができることを証明できます。フィッシング攻撃により不正にあなたの識別情報を署名させられてしまうことを防ぐために、不明確なものやランダムなものに対して署名しないよう注意してください。合意することが可能な、よく詳細の記された文言にのみ署名するようにしてください。</translation> + <translation>あなたの所有しているアドレスによりメッセージや合意書に署名をすることで、それらアドレスに対して送られたビットコインを受け取ることができることを証明できます。フィッシング攻撃により不正にあなたの識別情報を署名させられてしまうことを防ぐために、不明確なものやランダムなものに対して署名しないよう注意してください。あなたが同意した、よく詳細の記された文言にのみ署名するようにしてください。</translation> </message> <message> <source>The Bitcoin address to sign the message with</source> @@ -2554,10 +2624,6 @@ <translation>%1 検証のトランザクションと衝突</translation> </message> <message> - <source>%1/offline</source> - <translation>%1/オフライン</translation> - </message> - <message> <source>0/unconfirmed, %1</source> <translation>0/未検証, %1</translation> </message> @@ -2586,14 +2652,6 @@ <translation>ステータス</translation> </message> <message> - <source>, has not been successfully broadcast yet</source> - <translation>まだブロードキャストが成功していません</translation> - </message> - <message numerus="yes"> - <source>, broadcast through %n node(s)</source> - <translation><numerusform>%n ノードにブロードキャスト</numerusform></translation> - </message> - <message> <source>Date</source> <translation>日付</translation> </message> @@ -2678,6 +2736,10 @@ <translation>トランザクションの全体サイズ</translation> </message> <message> + <source>Transaction virtual size</source> + <translation>トランザクションの仮想サイズ</translation> + </message> + <message> <source>Output index</source> <translation>出力インデックス</translation> </message> @@ -2748,10 +2810,6 @@ <translation>ユニット %1 を開く</translation> </message> <message> - <source>Offline</source> - <translation>オフライン</translation> - </message> - <message> <source>Unconfirmed</source> <translation>未検証</translation> </message> @@ -2776,10 +2834,6 @@ <translation>未成熟（%1検証。%2検証完了後に使用可能となります）</translation> </message> <message> - <source>This block was not received by any other nodes and will probably not be accepted!</source> - <translation>このブロックは他のどのノードによっても受け取られないで、多分受け入れられないでしょう！</translation> - </message> - <message> <source>Generated but not accepted</source> <translation>生成されましたが承認されませんでした</translation> </message> @@ -2891,6 +2945,10 @@ <translation>その他</translation> </message> <message> + <source>Enter address, transaction id, or label to search</source> + <translation>検索するアドレス、トランザクションID、またはラベルを入力してください</translation> + </message> + <message> <source>Min amount</source> <translation>最小の額</translation> </message> @@ -3086,38 +3144,18 @@ <source>The wallet data was successfully saved to %1.</source> <translation>ウォレット データは正常に%1に保存されました。</translation> </message> + <message> + <source>Cancel</source> + <translation>キャンセル</translation> + </message> </context> <context> <name>bitcoin-core</name> <message> - <source>Options:</source> - <translation>オプション:</translation> - </message> - <message> - <source>Specify data directory</source> - <translation>データ ディレクトリの指定</translation> - </message> - <message> - <source>Connect to a node to retrieve peer addresses, and disconnect</source> - <translation>ピア アドレスを取得するためにノードに接続し、そして切断します</translation> - </message> - <message> - <source>Specify your own public address</source> - <translation>あなた自身のパブリックなアドレスを指定</translation> - </message> - <message> - <source>Accept command line and JSON-RPC commands</source> - <translation>コマンドラインと JSON-RPC コマンドを許可</translation> - </message> - <message> <source>Distributed under the MIT software license, see the accompanying file %s or %s</source> <translation>MITソフトウェアライセンスのもとで配布されています。付属のファイル %s または %s を参照してください</translation> </message> <message> - <source>If <category> is not supplied or if <category> = 1, output all debugging information.</source> - <translation><category> が与えられなかった場合や <category> = 1 の場合には、すべてのデバッグ情報が出力されます。</translation> - </message> - <message> <source>Prune configured below the minimum of %d MiB. Please use a higher number.</source> <translation>剪定が最小値の %d MiB以下に設定されています。もっと大きな値を使用してください。</translation> </message> @@ -3134,18 +3172,10 @@ <translation>エラー：致命的な内部エラーが発生しました。詳細はdebug.logを参照してください</translation> </message> <message> - <source>Fee (in %s/kB) to add to transactions you send (default: %s)</source> - <translation>送信するトランザクションに付加する手数料 (%s/kB単位) (初期値: %s)</translation> - </message> - <message> <source>Pruning blockstore...</source> <translation>ブロックデータを剪定しています……</translation> </message> <message> - <source>Run in the background as a daemon and accept commands</source> - <translation>デーモンとしてバックグランドで実行しコマンドを許可</translation> - </message> - <message> <source>Unable to start HTTP server. See debug log for details.</source> <translation>HTTPサーバを開始できませんでした。詳細はデバッグログをご確認ください。</translation> </message> @@ -3158,54 +3188,18 @@ <translation>%s の開発者</translation> </message> <message> - <source>A fee rate (in %s/kB) that will be used when fee estimation has insufficient data (default: %s)</source> - <translation>十分なデータが蓄積されていない場合に手数料推定機能が利用する手数料レート (%s/kB) (デフォルト: %s)</translation> - </message> - <message> - <source>Accept relayed transactions received from whitelisted peers even when not relaying transactions (default: %d)</source> - <translation>トランザクションの中継を行っていない場合でも、ホワイトリストのピアから受け取った中継トランザクションは受け取るようにする (デフォルト: %d)</translation> - </message> - <message> - <source>Bind to given address and always listen on it. Use [host]:port notation for IPv6</source> - <translation>指定のアドレスへバインドし、その上で常にリッスンします。IPv6 は [ホスト名]:ポート番号 と表記します</translation> - </message> - <message> <source>Cannot obtain a lock on data directory %s. %s is probably already running.</source> <translation>データ ディレクトリ %s のロックを取得することができません。おそらく %s は実行中です。</translation> </message> <message> - <source>Delete all wallet transactions and only recover those parts of the blockchain through -rescan on startup</source> - <translation>ウォレットの全トランザクションを削除し、これらを-rescanオプションを用いることで起動時にブロックチェインのデータのみからリカバリします。</translation> + <source>Cannot provide specific connections and have addrman find outgoing connections at the same.</source> + <translation>特定の接続が利用できず、またaddrmanは外向き接続を見つけられませんでした。</translation> </message> <message> <source>Error reading %s! All keys read correctly, but transaction data or address book entries might be missing or incorrect.</source> <translation>%s の読み込みエラー! すべてのキーは正しく読み取れますが、取引データやアドレス帳のエントリが失われたか、正しくない可能性があります。</translation> </message> <message> - <source>Exclude debugging information for a category. Can be used in conjunction with -debug=1 to output debug logs for all categories except one or more specified categories.</source> - <translation>カテゴリに対してデバッグ情報を除外する。-debug=1 とともに用いることで、一つ以上の指定されたカテゴリを除くすべてのカテゴリのデバッグログを出力できる。</translation> - </message> - <message> - <source>Execute command when a wallet transaction changes (%s in cmd is replaced by TxID)</source> - <translation>ウォレットの取引を変更する際にコマンドを実行 (cmd の %s は TxID に置換される)</translation> - </message> - <message> - <source>Extra transactions to keep in memory for compact block reconstructions (default: %u)</source> - <translation>コンパクトブロック再構成のために追加のトランザクションをメモリ内に保管しておく (デフォルト: %u)</translation> - </message> - <message> - <source>If this block is in the chain assume that it and its ancestors are valid and potentially skip their script verification (0 to verify all, default: %s, testnet: %s)</source> - <translation>このブロックがブロックチェーン内に含まれていた場合には、このブロックおよびそれ以前のすべてのブロックを有効であるとみなし、スクリプトの検証を省略する (0ならすべてを検証、デフォルト: %s、テストネット: %s)</translation> - </message> - <message> - <source>Maximum allowed median peer time offset adjustment. Local perspective of time may be influenced by peers forward or backward by this amount. (default: %u seconds)</source> - <translation>時間オフセット調整値のピア中央値に対する最大の許容値。ローカル時間の見込み値は、接続するピアにより前方ないし後方へ影響されます。(初期値: %u 秒)</translation> - </message> - <message> - <source>Maximum total fees (in %s) to use in a single wallet transaction or raw transaction; setting this too low may abort large transactions (default: %s)</source> - <translation>ひとつのウォレットトランザクションまたは生トランザクションで使用する合計手数料の最大値 (%s 単位)。低すぎる値を指定すると巨大なトランザクションの作成ができなくなります (規定値: %s)</translation> - </message> - <message> <source>Please check that your computer's date and time are correct! If your clock is wrong, %s will not work properly.</source> <translation>あなたのPCの日付と時刻が正しいことを確認して下さい！ もしあなたの時計が正しくなければ %s が正確に動作しません。</translation> </message> @@ -3214,22 +3208,6 @@ <translation>%s が有用だと感じられた方はぜひプロジェクトへの貢献をお願いします。ソフトウェアのより詳細な情報については %s をご覧ください。</translation> </message> <message> - <source>Query for peer addresses via DNS lookup, if low on addresses (default: 1 unless -connect used)</source> - <translation>保有するピアアドレスが少ない場合、DNS ルックアップによりピアアドレスを問い合わせる (-connect を使っていない場合の初期値: 1)</translation> - </message> - <message> - <source>Reduce storage requirements by enabling pruning (deleting) of old blocks. This allows the pruneblockchain RPC to be called to delete specific blocks, and enables automatic pruning of old blocks if a target size in MiB is provided. This mode is incompatible with -txindex and -rescan. Warning: Reverting this setting requires re-downloading the entire blockchain. (default: 0 = disable pruning blocks, 1 = allow manual pruning via RPC, >%u = automatically prune block files to stay under the specified target size in MiB)</source> - <translation>古いブロックの剪定 (削除) を有効にすることでストレージの必要量を削減する。これにより pruneblockchain RPC を呼び出すことで指定されたブロックを削除することができます。またターゲットサイズが MiB 単位で指定された場合には古いブロックの自動剪定が有効となります。このモードは -txindex および -rescan オプションと互換性がありません。警告: この設定を最有効化するにはすべてのブロックチェーンの再ダウンロードが必要となります。(デフォルト: 0 = ブロックの剪定を無効化する, 1 = RPC 経由での手動剪定を許可する, >%u = MiB 単位で指定されたターゲットサイズを常に下回るようにブロックファイルを自動的に剪定する)</translation> - </message> - <message> - <source>Set lowest fee rate (in %s/kB) for transactions to be included in block creation. (default: %s)</source> - <translation>ブロック生成時に取り込まれるトランザクションの最低手数料率 (%s/kB 単位)。(デフォルト: %s)</translation> - </message> - <message> - <source>Set the number of script verification threads (%u to %d, 0 = auto, <0 = leave that many cores free, default: %d)</source> - <translation>スクリプト検証スレッドを設定 (%uから%dの間, 0 = 自動, <0 = たくさんのコアを自由にしておく, 初期値: %d)</translation> - </message> - <message> <source>The block database contains a block which appears to be from the future. This may be due to your computer's date and time being set incorrectly. Only rebuild the block database if you are sure that your computer's date and time are correct</source> <translation>ブロックのデータベースに未来の時刻のブロックが含まれています。これはおそらくお使いのコンピュータに設定されている日時が間違っていることを示しています。お使いのコンピュータの日時が本当に正しい場合にのみ、ブロックのデータベースの再構築を行ってください。</translation> </message> @@ -3250,18 +3228,6 @@ <translation>データベースをフォーク前の状態に巻き戻せませんでした。ブロックチェーンを再ダウンロードする必要があります</translation> </message> <message> - <source>Use UPnP to map the listening port (default: 1 when listening and no -proxy)</source> - <translation>リッスン ポートの割当に UPnP を使用 (初期値: リッスン中および-proxy が指定されていない場合は1)</translation> - </message> - <message> - <source>Username and hashed password for JSON-RPC connections. The field <userpw> comes in the format: <USERNAME>:<SALT>$<HASH>. A canonical python script is included in share/rpcuser. The client then connects normally using the rpcuser=<USERNAME>/rpcpassword=<PASSWORD> pair of arguments. This option can be specified multiple times</source> - <translation>JSON-RPC 接続時のユーザ名とハッシュ化されたパスワード。<userpw> フィールドのフォーマットは <USERNAME>:<SALT>$<HASH>。標準的な Python スクリプトが share/rpcuser 内に含まれています。クライアントは通常の場合には rpcuser=<USERNAME>/rpcpassword=<PASSWORD> を利用して接続を行います。このオプションは複数回指定できます。</translation> - </message> - <message> - <source>Wallet will not create transactions that violate mempool chain limits (default: %u)</source> - <translation>ウォレットがmempoolチェーン制限数を超えてトランザクションを作らないようにする (初期値: %u)</translation> - </message> - <message> <source>Warning: The network does not appear to fully agree! Some miners appear to be experiencing issues.</source> <translation>警告: ネットワークは完全に合意が取れていないようです。幾人かのマイナーに何らかの障害が発生しているようです。</translation> </message> @@ -3270,10 +3236,6 @@ <translation>警告: ピアと完全に合意が取れていないようです！このノードまたは他のノードのアップグレードが必要なようです。</translation> </message> <message> - <source>Whether to save the mempool on shutdown and load on restart (default: %u)</source> - <translation>シャットダウン時に mempool を保存し、再起動時にロードするかどうか (初期値: %u)</translation> - </message> - <message> <source>%d of last 100 blocks have unexpected version</source> <translation>直近の100ブロックの内%dが予期しないバージョンを含んでいます</translation> </message> @@ -3286,42 +3248,14 @@ <translation>-maxmempoolは最低でも %d MB必要です</translation> </message> <message> - <source><category> can be:</source> - <translation><category>は以下の値を指定できます：</translation> - </message> - <message> - <source>Accept connections from outside (default: 1 if no -proxy or -connect)</source> - <translation>外部からの接続を許可 (初期値: -proxy または -connect を使用していない場合は1)</translation> - </message> - <message> - <source>Append comment to the user agent string</source> - <translation>ユーザエージェント文字列にコメントを</translation> - </message> - <message> - <source>Attempt to recover private keys from a corrupt wallet on startup</source> - <translation>起動時に壊れたウォレットから秘密鍵を復旧することを試す</translation> - </message> - <message> - <source>Block creation options:</source> - <translation>ブロック作成オプション:</translation> - </message> - <message> <source>Cannot resolve -%s address: '%s'</source> <translation>-%s アドレス '%s' を解決できません</translation> </message> <message> - <source>Chain selection options:</source> - <translation>チェイン選択オプション:</translation> - </message> - <message> <source>Change index out of range</source> <translation>おつりのインデックスが範囲外です</translation> </message> <message> - <source>Connection options:</source> - <translation>接続オプション：</translation> - </message> - <message> <source>Copyright (C) %i-%i</source> <translation>Copyright (C) %i-%i</translation> </message> @@ -3331,36 +3265,12 @@ </translation> </message> <message> - <source>Debugging/Testing options:</source> - <translation>デバッグ／テスト用オプション:</translation> - </message> - <message> - <source>Do not load the wallet and disable wallet RPC calls</source> - <translation>ウォレットは読み込まず、ウォレットRPCコールを無効化する</translation> - </message> - <message> <source>Do you want to rebuild the block database now?</source> <translation>ブロック データベースを今すぐ再構築しますか?</translation> </message> <message> - <source>Enable publish hash block in <address></source> - <translation><address>に対し、ハッシュブロックの公開を有効にする</translation> - </message> - <message> - <source>Enable publish hash transaction in <address></source> - <translation><address> に対し、ハッシュトランザクションの公開を有効にする</translation> - </message> - <message> - <source>Enable publish raw block in <address></source> - <translation><address> に対し、生ブロックの公開を有効にする</translation> - </message> - <message> - <source>Enable publish raw transaction in <address></source> - <translation><address> に対し、生トランザクションの公開を有効にする</translation> - </message> - <message> - <source>Enable transaction replacement in the memory pool (default: %u)</source> - <translation>メモリプール内のトランザクションの置換を有効化する (デフォルト: %u)</translation> + <source>Error creating %s: You can't create non-HD wallets with this version.</source> + <translation>%sの作成に失敗しました。このバージョンではHDウォレット以外を作成することはできません。</translation> </message> <message> <source>Error initializing block database</source> @@ -3375,6 +3285,10 @@ <translation>%s 読み込みエラー</translation> </message> <message> + <source>Error loading %s: Private keys can only be disabled during creation</source> + <translation>%s の読み込みエラー: 秘密鍵の無効化はウォレットの生成時のみ可能です。</translation> + </message> + <message> <source>Error loading %s: Wallet corrupted</source> <translation>%s 読み込みエラー: ウォレットが壊れました</translation> </message> @@ -3399,6 +3313,10 @@ <translation>ポートのリッスンに失敗しました。必要であれば -listen=0 を使用してください。</translation> </message> <message> + <source>Failed to rescan the wallet during initialization</source> + <translation>初期化の途中でウォレットの再スキャンに失敗しました</translation> + </message> + <message> <source>Importing...</source> <translation>インポートしています……</translation> </message> @@ -3423,8 +3341,8 @@ <translation>不正な額 -fallbackfee=<amount>: '%s'</translation> </message> <message> - <source>Keep the transaction memory pool below <n> megabytes (default: %u)</source> - <translation>トランザクションのメモリ・プールの総量を <n> メガバイト以下に維持する (初期値: %u)</translation> + <source>Upgrading txindex database</source> + <translation>txindex データベースを更新しています</translation> </message> <message> <source>Loading P2P addresses...</source> @@ -3435,26 +3353,10 @@ <translation>banリストを読み込んでいます...</translation> </message> <message> - <source>Location of the auth cookie (default: data dir)</source> - <translation>認証クッキーの場所 (デフォルト: )</translation> - </message> - <message> <source>Not enough file descriptors available.</source> <translation>使用可能なファイルディスクリプタが不足しています。</translation> </message> <message> - <source>Only connect to nodes in network <net> (ipv4, ipv6 or onion)</source> - <translation><net> (ipv4, ipv6 または onion) ネットワーク内のノードだけに接続する</translation> - </message> - <message> - <source>Print this help message and exit</source> - <translation>このヘルプメッセージを表示し終了する</translation> - </message> - <message> - <source>Print version and exit</source> - <translation>バージョンを表示し終了</translation> - </message> - <message> <source>Prune cannot be configured with a negative value.</source> <translation>剪定値は負の値に設定できません。</translation> </message> @@ -3463,14 +3365,6 @@ <translation>剪定モードは-txindexと互換性がありません。</translation> </message> <message> - <source>Rebuild chain state and block index from the blk*.dat files on disk</source> - <translation>チェイン状態およびブロックインデックスをディスク上の blk*.dat ファイルから再構築する</translation> - </message> - <message> - <source>Rebuild chain state from the currently indexed blocks</source> - <translation>既にインデックスされたブロックからチェイン状態を再構築する</translation> - </message> - <message> <source>Replaying blocks...</source> <translation>ブロックをリプレイしています...</translation> </message> @@ -3479,14 +3373,6 @@ <translation>ブロックを巻き戻しています...</translation> </message> <message> - <source>Set database cache size in megabytes (%d to %d, default: %d)</source> - <translation>データベースのキャッシュサイズをメガバイトで設定 (%dから%d。初期値: %d)</translation> - </message> - <message> - <source>Specify wallet file (within data directory)</source> - <translation>ウォレットのファイルを指定 (データ・ディレクトリの中に)</translation> - </message> - <message> <source>The source code is available from %s.</source> <translation>ソースコードは %s より入手可能です。</translation> </message> @@ -3499,6 +3385,10 @@ <translation>このコンピュータの %s にバインドすることができません。おそらく %s は既に実行されています。</translation> </message> <message> + <source>Unable to generate keys</source> + <translation>鍵を生成できません</translation> + </message> + <message> <source>Unsupported argument -benchmark ignored, use -debug=bench.</source> <translation>サポートされていない引数 -benchmark は無視されました。-debug=bench を使用してください。</translation> </message> @@ -3519,14 +3409,6 @@ <translation>UTXOデータベースを更新しています</translation> </message> <message> - <source>Use UPnP to map the listening port (default: %u)</source> - <translation>リッスンポートの割当に UPnP を使用 (初期値: %u)</translation> - </message> - <message> - <source>Use the test chain</source> - <translation>テストチェインを利用する</translation> - </message> - <message> <source>User Agent comment (%s) contains unsafe characters.</source> <translation>ユーザエージェントのコメント (%s) には安全でない文字が含まれています。</translation> </message> @@ -3535,90 +3417,26 @@ <translation>ブロックの検証中...</translation> </message> <message> - <source>Wallet debugging/testing options:</source> - <translation>ウォレットのデバッグ・テスト用オプション:</translation> - </message> - <message> <source>Wallet needed to be rewritten: restart %s to complete</source> <translation>ウォレットが書き直される必要がありました: 完了するために %s を再起動します</translation> </message> <message> - <source>Wallet options:</source> - <translation>ウォレットオプション：</translation> - </message> - <message> - <source>Allow JSON-RPC connections from specified source. Valid for <ip> are a single IP (e.g. 1.2.3.4), a network/netmask (e.g. 1.2.3.4/255.255.255.0) or a network/CIDR (e.g. 1.2.3.4/24). This option can be specified multiple times</source> - <translation>指定したアクセス元からのJSON-RPC接続を許可する。有効な<ip>は、単一のIP (例 1.2.3.4)、ネットワーク/ネットマスク (1.2.3.4/255.255.255.0)、またはネットワーク/CIDR (1.2.3.4/24)です。このオプションは複数回指定できます。</translation> - </message> - <message> - <source>Bind to given address and whitelist peers connecting to it. Use [host]:port notation for IPv6</source> - <translation>指定されたアドレスおよび、そこに接続を行ってきたホワイトリストのピアに対してバインドを行います。IPv6の場合には [host]:port 表記を使用してください</translation> - </message> - <message> - <source>Create new files with system default permissions, instead of umask 077 (only effective with disabled wallet functionality)</source> - <translation>umask 077 ではなく、システムのデフォルトパーミッションで新規ファイルを作成する (ウォレット機能が無効化されていた場合にのみ有効)</translation> - </message> - <message> - <source>Discover own IP addresses (default: 1 when listening and no -externalip or -proxy)</source> - <translation>自分のIPアドレスを解決する (規定値: リッスンをしており、-externalipまたは-proxyオプションが指定されていない場合は1)</translation> - </message> - <message> <source>Error: Listening for incoming connections failed (listen returned error %s)</source> <translation>エラー: 内向きの接続をリッスンするのに失敗しました (エラー %s が返却されました)</translation> </message> <message> - <source>Execute command when a relevant alert is received or we see a really long fork (%s in cmd is replaced by message)</source> - <translation>関連のアラートをもらってもすごく長いのフォークを見てもコマンドを実行 (コマンドの中にあるの%sはメッセージから置き換えさせる)</translation> - </message> - <message> - <source>Fees (in %s/kB) smaller than this are considered zero fee for relaying, mining and transaction creation (default: %s)</source> - <translation>トランザクションの中継、採掘および作成の際には、この値未満の手数料 (%s/kB単位) はゼロであるとみなす (デフォルト: %s)</translation> - </message> - <message> - <source>If paytxfee is not set, include enough fee so transactions begin confirmation on average within n blocks (default: %u)</source> - <translation>paytxfee が設定されていなかった場合、平均して n ブロック以内にトランザクションが検証され始めるのに十分な手数料を含める (初期値: %u)</translation> - </message> - <message> <source>Invalid amount for -maxtxfee=<amount>: '%s' (must be at least the minrelay fee of %s to prevent stuck transactions)</source> <translation>-maxtxfee=<amount> の数量の指定が不正です: '%s' (トランザクションが詰まってしまうのを防ぐため、少なくとも %s の最小中継手数料を指定しなければいけません)</translation> </message> <message> - <source>Maximum size of data in data carrier transactions we relay and mine (default: %u)</source> - <translation>中継および採掘を行う際の、データ運送トランザクションの中のデータの最大サイズ (初期値: %u)</translation> - </message> - <message> - <source>Randomize credentials for every proxy connection. This enables Tor stream isolation (default: %u)</source> - <translation>認証情報をプロキシー接続ごとにランダム化する。これによりTorストリーム分離をすることができます (規定値: %u)</translation> - </message> - <message> <source>The transaction amount is too small to send after the fee has been deducted</source> <translation>手数料差引後のトランザクションの金額が小さすぎるため、送金できません。</translation> </message> <message> - <source>Whitelisted peers cannot be DoS banned and their transactions are always relayed, even if they are already in the mempool, useful e.g. for a gateway</source> - <translation>ホワイトリストのピアはDoSによるアクセス禁止処理が無効化され、トランザクションは例えmempool内に既に存在していたとしても常にリレーされます。これは例えばゲートウェイに対して有用です</translation> - </message> - <message> <source>You need to rebuild the database using -reindex to go back to unpruned mode. This will redownload the entire blockchain</source> <translation>非剪定モードに戻るためには-reindexオプションを使用してデータベースを再構築する必要があります。これによりブロックチェイン全体の再ダウンロードが行われます。</translation> </message> <message> - <source>(default: %u)</source> - <translation>(規定値: %u)</translation> - </message> - <message> - <source>Accept public REST requests (default: %u)</source> - <translation>公開 REST リクエストを許可する (初期値: %u)</translation> - </message> - <message> - <source>Automatically create Tor hidden service (default: %d)</source> - <translation>Tor秘匿サービスを自動的に作成する (初期値: %d)</translation> - </message> - <message> - <source>Connect through SOCKS5 proxy</source> - <translation>SOCKS5 プロキシ経由で接続する</translation> - </message> - <message> <source>Error loading %s: You can't disable HD on an already existing HD wallet</source> <translation>%s の読み込みエラー: HDウォレットが既に存在するため、HDウォレットを無効化できません</translation> </message> @@ -3631,10 +3449,6 @@ <translation>チェインステートデータベースの更新エラー</translation> </message> <message> - <source>Imports blocks from external blk000??.dat file on startup</source> - <translation>起動時に外部の blk000??.dat ファイルからブロックをインポート</translation> - </message> - <message> <source>Information</source> <translation>情報</translation> </message> @@ -3655,46 +3469,24 @@ <translation>-whitelist に対する無効なネットマスクです: '%s'</translation> </message> <message> - <source>Keep at most <n> unconnectable transactions in memory (default: %u)</source> - <translation>最大で <n> 個の孤立したトランザクションをメモリの中に保持する (初期値: %u)</translation> - </message> - <message> <source>Need to specify a port with -whitebind: '%s'</source> <translation>-whitebind を用いてポートを指定する必要があります: '%s'</translation> </message> <message> - <source>Node relay options:</source> - <translation>ノード中継オプション:</translation> - </message> - <message> - <source>RPC server options:</source> - <translation>RPCサーバのオプション:</translation> - </message> - <message> <source>Reducing -maxconnections from %d to %d, because of system limitations.</source> <translation>システム上の制約から、-maxconnections を %d から %d に削減しました。</translation> </message> <message> - <source>Rescan the block chain for missing wallet transactions on startup</source> - <translation>起動時に失ったウォレットの取引のブロック チェーンを再スキャン</translation> - </message> - <message> - <source>Send trace/debug info to console instead of debug.log file</source> - <translation>トレース/デバッグ情報を debug.log ファイルの代わりにコンソールへ送る</translation> - </message> - <message> - <source>Show all debugging options (usage: --help -help-debug)</source> - <translation>すべてのデバッグオプションを表示する (使い方: --help -help-debug)</translation> - </message> - <message> - <source>Shrink debug.log file on client startup (default: 1 when no -debug)</source> - <translation>クライアント起動時に debug.log ファイルを縮小 (初期値: -debug オプションを指定しない場合は1)</translation> - </message> - <message> <source>Signing transaction failed</source> <translation>取引の署名に失敗しました</translation> </message> <message> + <source>Specified blocks directory "%s" does not exist. +</source> + <translation>指定のブロックディレクトリ"%s"が存在しません｡ +</translation> + </message> + <message> <source>The transaction amount is too small to pay the fee</source> <translation>トランザクションの金額が小さすぎて手数料を支払えません</translation> </message> @@ -3703,14 +3495,6 @@ <translation>これは実験的なソフトウェアです。</translation> </message> <message> - <source>Tor control port password (default: empty)</source> - <translation>Tor管理ポートのパスワード (初期値: 空文字)</translation> - </message> - <message> - <source>Tor control port to use if onion listening enabled (default: %s)</source> - <translation>Onion のリッスンが有効になっている場合に使用するTor管理ポート (初期値: %s)</translation> - </message> - <message> <source>Transaction amount too small</source> <translation>取引の額が小さ過ぎます</translation> </message> @@ -3727,18 +3511,18 @@ <translation>このコンピュータの %s にバインドすることができません (バインドが返したエラーは %s)</translation> </message> <message> - <source>Upgrade wallet to latest format on startup</source> - <translation>起動時にウォレットを最新のフォーマットにアップグレード</translation> - </message> - <message> - <source>Username for JSON-RPC connections</source> - <translation>JSON-RPC 接続のユーザー名</translation> + <source>Unable to generate initial keys</source> + <translation>初期化キーを生成できません</translation> </message> <message> <source>Verifying wallet(s)...</source> <translation>ウォレットの確認中...</translation> </message> <message> + <source>Wallet %s resides outside wallet directory %s</source> + <translation>ウォレット「%s」がウォレットフォルダ「%s」の外に存在します</translation> + </message> + <message> <source>Warning</source> <translation>警告</translation> </message> @@ -3747,106 +3531,18 @@ <translation>警告: 未知の新しいルールが有効化されました (バージョンビット %i)</translation> </message> <message> - <source>Whether to operate in a blocks only mode (default: %u)</source> - <translation>ブロック限定モードにおいて動作を行うかどうか (初期値: %u)</translation> - </message> - <message> - <source>You need to rebuild the database using -reindex to change -txindex</source> - <translation>-txindex を変更するには -reindex を使用してデータベースを再構築する必要があります</translation> - </message> - <message> <source>Zapping all transactions from wallet...</source> <translation>ウォレットからすべてのトランザクションを消去しています...</translation> </message> <message> - <source>ZeroMQ notification options:</source> - <translation>ZeroMQ通知オプション:</translation> - </message> - <message> - <source>Password for JSON-RPC connections</source> - <translation>JSON-RPC 接続のパスワード</translation> - </message> - <message> - <source>Execute command when the best block changes (%s in cmd is replaced by block hash)</source> - <translation>最良のブロックに変更する際にコマンドを実行 (cmd の %s はブロック ハッシュに置換される)</translation> - </message> - <message> - <source>Allow DNS lookups for -addnode, -seednode and -connect</source> - <translation>-addnode, -seednode と -connect で DNS ルックアップを許可する</translation> - </message> - <message> - <source>(1 = keep tx meta data e.g. account owner and payment request information, 2 = drop tx meta data)</source> - <translation>(1 = トランザクションのメタデータ、例えばアカウントの所有者や支払リクエストの内容を保持する, 2 = トランザクションのメタデータを破棄する)</translation> - </message> - <message> <source>-maxtxfee is set very high! Fees this large could be paid on a single transaction.</source> <translation>-maxtxfee が非常に高く設定されています！ひとつのトランザクションでこの量の手数料が支払われてしまうことがあります。</translation> </message> <message> - <source>Bind to given address to listen for JSON-RPC connections. This option is ignored unless -rpcallowip is also passed. Port is optional and overrides -rpcport. Use [host]:port notation for IPv6. This option can be specified multiple times (default: 127.0.0.1 and ::1 i.e., localhost, or if -rpcallowip has been specified, 0.0.0.0 and :: i.e., all addresses)</source> - <translation>指定されたアドレスに対して JSON-RPC 接続をリッスンしするようバインドします。このオプションは -rpcallowip も指定されている場合以外には無視されます。ポートはオプションであり -rpcport をオーバーライドします。IPv6の場合には [host]:port 表記を使用してください。このオプションは複数回指定することが可能です (初期値: 127.0.0.1 および ::1、すなわち localhost または -rpcallowip が指定されている場合には 0.0.0.0 および ::、すなわちすべてのアドレス)</translation> - </message> - <message> - <source>Do not keep transactions in the mempool longer than <n> hours (default: %u)</source> - <translation>mempool内でトランザクションを <n> 時間以上保持しない (初期値: %u)</translation> - </message> - <message> - <source>Equivalent bytes per sigop in transactions for relay and mining (default: %u)</source> - <translation>中継や採掘を行う際のトランザクション内の、sigopあたりバイト数の相当量 (初期値: %u)</translation> - </message> - <message> <source>Error loading %s: You can't enable HD on an already existing non-HD wallet</source> <translation>%s の読み込みエラー: 非HDウォレットが既に存在するため、HDウォレットを有効化できません</translation> </message> <message> - <source>Error loading wallet %s. -wallet parameter must only specify a filename (not a path).</source> - <translation>ウォレット %s の読み込みエラー。-wallet パラメータはファイル名だけを指定してください (パス名ではありません)。</translation> - </message> - <message> - <source>Fees (in %s/kB) smaller than this are considered zero fee for transaction creation (default: %s)</source> - <translation>トランザクション作成の際、この値未満の手数料 (%s/kB単位) はゼロであるとみなす (デフォルト: %s)</translation> - </message> - <message> - <source>Force relay of transactions from whitelisted peers even if they violate local relay policy (default: %d)</source> - <translation>ホワイトリストのピアから受け取ったトランザクションに関しては、たとえローカルの中継ポリシーに違反しているとしても中継を行うようにする (デフォルト: %d)</translation> - </message> - <message> - <source>How thorough the block verification of -checkblocks is (0-4, default: %u)</source> - <translation>-checkblocks のブロックの検証レベル (0-4, 初期値: %u)</translation> - </message> - <message> - <source>Maintain a full transaction index, used by the getrawtransaction rpc call (default: %u)</source> - <translation>getrawtransaction rpc 呼び出し時に用いる、完全なトランザクションインデックスを保持する (初期値: %u)</translation> - </message> - <message> - <source>Number of seconds to keep misbehaving peers from reconnecting (default: %u)</source> - <translation>不正なピアを再接続するまでの秒数 (初期値: %u)</translation> - </message> - <message> - <source>Output debugging information (default: %u, supplying <category> is optional)</source> - <translation>デバッグ情報を出力する (初期値: %u, <category> の指定は任意です)</translation> - </message> - <message> - <source>Sets the serialization of raw transaction or block hex returned in non-verbose mode, non-segwit(0) or segwit(1) (default: %d)</source> - <translation>非冗長モードで返却する生トランザクションやブロックの16進数表現のシリアライゼーションフォーマットを非 segwit (0) または segwit (1) のものに設定する (デフォルト: %d)</translation> - </message> - <message> - <source>Specify directory to hold wallets (default: <datadir>/wallets if it exists, otherwise <datadir>)</source> - <translation>ウォレットを保持するディレクトリの指定 (初期値: <datadir>/wallets 存在する場合、その他の場合 <datadir>)</translation> - </message> - <message> - <source>Specify location of debug log file: this can be an absolute path or a path relative to the data directory (default: %s)</source> - <translation>デバッグログファイルの位置の指定: 絶対パスまたはデータディレクトリからの相対パス (初期値: %s)</translation> - </message> - <message> - <source>Support filtering of blocks and transaction with bloom filters (default: %u)</source> - <translation>Bloomフィルタによる、ブロックおよびトランザクションのフィルタリングを有効化する (初期値: %u)</translation> - </message> - <message> - <source>The fee rate (in %s/kB) that indicates your tolerance for discarding change by adding it to the fee (default: %s). Note: An output is discarded if it is dust at this rate, but we will always discard up to the dust relay fee and a discard fee above that is limited by the fee estimate for the longest target</source> - <translation>おつりを捨てて手数料 (初期値: %s) に追加する場合に許容される手数料レート (%s/kB 単位)。注記: このレートで出力がダストだった場合には出力は捨てられますが、最も長いターゲットの手数料見積額で制限される、ダスト中継手数料および上記の放棄手数料までは常に捨てられます。</translation> - </message> - <message> <source>This is the transaction fee you may pay when fee estimates are not available.</source> <translation>これは手数料の推定機能が利用できない場合に支払うトランザクション手数料です。</translation> </message> @@ -3859,10 +3555,6 @@ <translation>ネットワークバージョン文字 (%i) の長さが最大の長さ (%i) を超えています。UAコメントの数や長さを削減してください。</translation> </message> <message> - <source>Tries to keep outbound traffic under the given target (in MiB per 24h), 0 = no limit (default: %d)</source> - <translation>送信転送量を与えられた目標値以下に維持するようにする (24時間あたり何MiBかで指定)。0 の場合は無制限 (初期値: %d)</translation> - </message> - <message> <source>Unsupported argument -socks found. Setting SOCKS version isn't possible anymore, only SOCKS5 proxies are supported.</source> <translation>サポートされていない引数 -socks が見つかりました。SOCKSバージョンの設定はできないようになりました。SOCKS5プロキシのみがサポートされています。</translation> </message> @@ -3871,10 +3563,6 @@ <translation>サポートされていない引数 -whitelistalwaysrelay は無視されました。-whitelistrelay または -whitelistforcerelay を利用してください</translation> </message> <message> - <source>Use separate SOCKS5 proxy to reach peers via Tor hidden services (default: %s)</source> - <translation>Tor 秘匿サービスを通し、別々の SOCKS5 プロキシを用いることでピアに到達する (初期値: %s)</translation> - </message> - <message> <source>Warning: Unknown block versions being mined! It's possible unknown rules are in effect</source> <translation>警告: 未知のバージョンのブロックが採掘されました。未知のルールが導入された可能性があります</translation> </message> @@ -3883,110 +3571,18 @@ <translation>警告: ウォレットファイルが破損していましたのでデータを復旧しました！元の %s は %s として %s に保存されました; 残高やトランザクションが正しくない場合にはバックアップから復元してください。</translation> </message> <message> - <source>Whitelist peers connecting from the given IP address (e.g. 1.2.3.4) or CIDR notated network (e.g. 1.2.3.0/24). Can be specified multiple times.</source> - <translation>ホワイトリストとして登録するピアノ、接続元の IP アドレス (例: 1.2.3.4) または CIDR 表現のネットワーク (例: 1.2.3.0/24)。複数回指定することもできる</translation> - </message> - <message> <source>%s is set very high!</source> <translation>%s の設定値は高すぎます</translation> </message> <message> - <source>(default: %s)</source> - <translation>(デフォルト: %s)</translation> - </message> - <message> - <source>Always query for peer addresses via DNS lookup (default: %u)</source> - <translation>DNS ルックアップを通してピアアドレスを常に問い合わせる (初期値: %u)</translation> - </message> - <message> - <source>Error loading wallet %s. -wallet filename must be a regular file.</source> - <translation>ウォレット %s の読み込みエラー。-wallet のファイル名は通常のファイルでなければいけません。</translation> - </message> - <message> <source>Error loading wallet %s. Duplicate -wallet filename specified.</source> <translation>ウォレット %s の読み込みエラー。重複する -wallet ファイル名が指定されました。</translation> </message> <message> - <source>Error loading wallet %s. Invalid characters in -wallet filename.</source> - <translation>ウォレット %s の読み込みエラー。-walletファイル名内に無効な文字が含まれています。</translation> - </message> - <message> - <source>How many blocks to check at startup (default: %u, 0 = all)</source> - <translation>起動時に点検するブロック数 (初期値: %u, 0=すべて)</translation> - </message> - <message> - <source>Include IP addresses in debug output (default: %u)</source> - <translation>デバッグ出力にIPアドレスを含める (初期値: %u)</translation> - </message> - <message> <source>Keypool ran out, please call keypoolrefill first</source> <translation>鍵プールが枯渇しました。まずはじめに keypoolrefill を呼び出してください</translation> </message> <message> - <source>Listen for JSON-RPC connections on <port> (default: %u or testnet: %u)</source> - <translation><port> で JSON-RPC 接続をリッスン (初期値: %u、testnet は %u)</translation> - </message> - <message> - <source>Listen for connections on <port> (default: %u or testnet: %u)</source> - <translation>接続のリッスンを <port> で行う (初期値: %u、testnet: %u)</translation> - </message> - <message> - <source>Maintain at most <n> connections to peers (default: %u)</source> - <translation>ピアの接続数を最大でも <n> 個に維持する (初期値: %u)</translation> - </message> - <message> - <source>Make the wallet broadcast transactions</source> - <translation>ウォレットのトランザクションをブロードキャストする</translation> - </message> - <message> - <source>Maximum per-connection receive buffer, <n>*1000 bytes (default: %u)</source> - <translation>接続毎の最大受信バッファ <n>*1000 バイト (初期値: %u)</translation> - </message> - <message> - <source>Maximum per-connection send buffer, <n>*1000 bytes (default: %u)</source> - <translation>接続毎の最大送信バッファ <n>*1000 バイト (初期値: %u)</translation> - </message> - <message> - <source>Prepend debug output with timestamp (default: %u)</source> - <translation>デバッグ出力にタイムスタンプを付ける (初期値: %u)</translation> - </message> - <message> - <source>Relay and mine data carrier transactions (default: %u)</source> - <translation>データ運送トランザクションのリレーおよび採掘を行う (初期値: %u)</translation> - </message> - <message> - <source>Relay non-P2SH multisig (default: %u)</source> - <translation>P2SHでないマルチシグトランザクションをリレーする (初期値: %u)</translation> - </message> - <message> - <source>Set key pool size to <n> (default: %u)</source> - <translation>key pool のサイズを <n> (初期値: %u) にセット</translation> - </message> - <message> - <source>Set maximum BIP141 block weight (default: %d)</source> - <translation>BIP141ブロック重みの最大値を設定 (初期値: %d)</translation> - </message> - <message> - <source>Set the number of threads to service RPC calls (default: %d)</source> - <translation>RPC サービスのスレッド数を設定 (初期値: %d)</translation> - </message> - <message> - <source>Specify configuration file (default: %s)</source> - <translation>設定ファイルの指定 (初期値: %s)</translation> - </message> - <message> - <source>Specify connection timeout in milliseconds (minimum: 1, default: %d)</source> - <translation>接続のタイムアウトをミリセコンドで指定 (最小値: 1, 初期値: %d)</translation> - </message> - <message> - <source>Specify pid file (default: %s)</source> - <translation>pid ファイルの指定 (初期値: %s)</translation> - </message> - <message> - <source>Spend unconfirmed change when sending transactions (default: %u)</source> - <translation>トランザクション送信時に未検証のおつりを使用する (デフォルト: %u)</translation> - </message> - <message> <source>Starting network threads...</source> <translation>ネットワークのスレッドを起動しています...</translation> </message> @@ -4003,10 +3599,6 @@ <translation>これは取引を送信する場合に支払う取引手数料です。</translation> </message> <message> - <source>Threshold for disconnecting misbehaving peers (default: %u)</source> - <translation>不正なピアを切断するためのしきい値 (初期値: %u)</translation> - </message> - <message> <source>Transaction amounts must not be negative</source> <translation>取引の額は負であってはいけません</translation> </message> @@ -4027,6 +3619,26 @@ <translation>残高不足</translation> </message> <message> + <source>Can't generate a change-address key. Private keys are disabled for this wallet.</source> + <translation>おつりアドレスの鍵を生成することができません。このウォレットでは秘密鍵が無効です。</translation> + </message> + <message> + <source>Cannot upgrade a non HD split wallet without upgrading to support pre split keypool. Please use -upgradewallet=169900 or -upgradewallet with no version specified.</source> + <translation>事前分割キープールをサポートするようにアップグレードせずに、非HD分割ウォレットをアップグレードすることはできません。 -upgradewallet=169900 または、バージョンを指定しない -upgradewallet を使用してください。</translation> + </message> + <message> + <source>Fee estimation failed. Fallbackfee is disabled. Wait a few blocks or enable -fallbackfee.</source> + <translation>手数料の見積りに失敗しました。代替手数料は無効です。数ブロック待つか、-fallbackfee を有効にしてください。</translation> + </message> + <message> + <source>Warning: Private keys detected in wallet {%s} with disabled private keys</source> + <translation>警告: 秘密鍵が無効なウォレット {%s} で秘密鍵を検出しました。</translation> + </message> + <message> + <source>Cannot write to data directory '%s'; check permissions.</source> + <translation>データディレクトリ '%s' に書き込むことができません。アクセス権を確認してください。</translation> + </message> + <message> <source>Loading block index...</source> <translation>ブロック インデックスを読み込んでいます...</translation> </message> diff --git a/src/qt/locale/bitcoin_ka.ts b/src/qt/locale/bitcoin_ka.ts index 971ceeb3c0..3fd95eb6f5 100644 --- a/src/qt/locale/bitcoin_ka.ts +++ b/src/qt/locale/bitcoin_ka.ts @@ -30,6 +30,10 @@ <translation>მონიშნული მისამართის წაშლა სიიდან</translation> </message> <message> + <source>Enter address or label to search</source> + <translation>შეიყვანეთ საძებნი მისამართი ან ნიშნული</translation> + </message> + <message> <source>Export the data in the current tab to a file</source> <translation>ამ ბარათიდან მონაცემების ექსპორტი ფაილში</translation> </message> @@ -132,6 +136,10 @@ <translation>გაიმეორეთ ახალი ფრაზა-პაროლი</translation> </message> <message> + <source>Show password</source> + <translation>პაროლის ჩვენება</translation> + </message> + <message> <source>Enter the new passphrase to the wallet.<br/>Please use a passphrase of <b>ten or more random characters</b>, or <b>eight or more words</b>.</source> <translation>აკრიფეთ ახალი პასფრაზა საფულისათვის.<br/> გამოიყენეთ <b>ათი ან მეტი შემთხვევითი სიმბოლოსაგან </b>, ან <b>რვა ან მეტი სიტყვისაგან</b> შემდგარი პასფრაზა.</translation> </message> @@ -180,6 +188,14 @@ <translation>საფულე დაშიფრულია</translation> </message> <message> + <source>%1 will close now to finish the encryption process. Remember that encrypting your wallet cannot fully protect your bitcoins from being stolen by malware infecting your computer.</source> + <translation>%1 ახლა დაიხურება დაშიფრვის პროცესის დასასრულებლად. გახსოვდეთ, რომ თქვენი საფული დაშიფრვა სრულად არ იცავს თქვენს ბიტკოინებს მოპარვისგან მავნე პროგრამების მიერ თქვენი კომპიუტერის ინფიცირების საშუალებით.</translation> + </message> + <message> + <source>IMPORTANT: Any previous backups you have made of your wallet file should be replaced with the newly generated, encrypted wallet file. For security reasons, previous backups of the unencrypted wallet file will become useless as soon as you start using the new, encrypted wallet.</source> + <translation>მნიშვნელოვანი: ნებისმიერი საფულის წინა სარეზერვო კოპია, რომელიც თქვენ შექმენით, უნდა იყოს ჩანაცვლებული ახლად გენერირებული, დაშიფრული საფულის ფაილით. უსაფრთხოების მიზნებისთვის, დაუშიფრავი საფულის ფაილის წინა სარეზევო კოპიები გახდება გამოუყენებული იმ წამსვე, როდესაც დაიწყებთ ახალი, დაშიფრული საფულის გამოყენებას.</translation> + </message> + <message> <source>Wallet encryption failed</source> <translation>საფულის დაშიფვრა წარუმატებით დამთვრდა</translation> </message> @@ -194,6 +210,10 @@ </context> <context> <name>BanTableModel</name> + <message> + <source>IP/Netmask</source> + <translation>IP/ქსელის მასკა</translation> + </message> </context> <context> <name>BitcoinGUI</name> @@ -282,6 +302,22 @@ <translation>&URI-ის გახსნა...</translation> </message> <message> + <source>Wallet:</source> + <translation>საფულე:</translation> + </message> + <message> + <source>default wallet</source> + <translation>ნაგულისხმევი საფულე</translation> + </message> + <message> + <source>Click to disable network activity.</source> + <translation>დააწკაპეთ ქსელური აქტივობის გასათიშად.</translation> + </message> + <message> + <source>Network activity disabled.</source> + <translation>ქსელური აქტივობა გათიშულია.</translation> + </message> + <message> <source>Reindexing blocks on disk...</source> <translation>დისკზე ბლოკების რეინდექსაცია...</translation> </message> @@ -434,6 +470,12 @@ </translation> </message> <message> + <source>Wallet: %1 +</source> + <translation>საფულე: %1 +</translation> + </message> + <message> <source>Type: %1 </source> <translation>ტიპი: %1 @@ -623,19 +665,7 @@ <source>Command-line options</source> <translation>კომანდების ზოლის ოპციები</translation> </message> - <message> - <source>Usage:</source> - <translation>გამოყენება:</translation> - </message> - <message> - <source>command-line options</source> - <translation>კომანდების ზოლის ოპციები</translation> - </message> - <message> - <source>UI Options:</source> - <translation>მომხმარებლის ინტერფეისის ოპციები:</translation> - </message> - </context> +</context> <context> <name>Intro</name> <message> @@ -1048,6 +1078,10 @@ <source>Clear console</source> <translation>კონსოლის გასუფთავება</translation> </message> + <message> + <source>default wallet</source> + <translation>ნაგულისხმევი საფულე</translation> + </message> </context> <context> <name>ReceiveCoinsDialog</name> @@ -1146,6 +1180,10 @@ <source>Label</source> <translation>ნიშნული</translation> </message> + <message> + <source>Wallet</source> + <translation>საფულე</translation> + </message> </context> <context> <name>RecentRequestsTableModel</name> @@ -1257,6 +1295,10 @@ <translation>რაოდენობის კოპირება</translation> </message> <message> + <source>Transaction fee</source> + <translation>ტრანსაქციის საფასური - საკომისიო</translation> + </message> + <message> <source>(no label)</source> <translation>(ნიშნული არ არის)</translation> </message> @@ -1482,62 +1524,14 @@ <context> <name>bitcoin-core</name> <message> - <source>Options:</source> - <translation>ოპციები:</translation> - </message> - <message> - <source>Specify data directory</source> - <translation>მიუთითეთ მონაცემთა კატალოგი</translation> - </message> - <message> - <source>Connect to a node to retrieve peer addresses, and disconnect</source> - <translation>მიერთება კვანძთან, პირების მისამართების მიღება და გათიშვა</translation> - </message> - <message> - <source>Specify your own public address</source> - <translation>მიუთითეთ თქვენი საჯარო მისამართი</translation> - </message> - <message> - <source>Accept command line and JSON-RPC commands</source> - <translation>საკომანდო სტრიქონისა და JSON-RPC-კომამდების ნებართვა</translation> - </message> - <message> - <source>Run in the background as a daemon and accept commands</source> - <translation>რეზიდენტულად გაშვება და კომანდების მიღება</translation> - </message> - <message> <source>Bitcoin Core</source> <translation>Bitcoin Core</translation> </message> <message> - <source>Bind to given address and always listen on it. Use [host]:port notation for IPv6</source> - <translation>მოცემულ მისამართზე მიჯაჭვა მუდმივად მასზე მიყურადებით. გამოიყენეთ [host]:port ფორმა IPv6-სათვის</translation> - </message> - <message> - <source>Execute command when a wallet transaction changes (%s in cmd is replaced by TxID)</source> - <translation>კომანდის შესრულება საფულის ტრანსაქციის ცვლილებისას (%s კომანდაში ჩანაცვლდება TxID-ით)</translation> - </message> - <message> - <source><category> can be:</source> - <translation><category> შეიძლება იყოს:</translation> - </message> - <message> - <source>Accept connections from outside (default: 1 if no -proxy or -connect)</source> - <translation>გარედან შეერთებების დაშვება (ნაგულისხმევი: 1 თუ არ გამოიყენება -proxy ან -connect)</translation> - </message> - <message> - <source>Block creation options:</source> - <translation>ბლოკის შექმნის ოპციები:</translation> - </message> - <message> <source>Corrupted block database detected</source> <translation>შენიშნულია ბლოკთა ბაზის დაზიანება</translation> </message> <message> - <source>Do not load the wallet and disable wallet RPC calls</source> - <translation>არ ჩაიტვირთოს საფულე და აიკრძალოს საფულისადმი RPC-მიმართვები</translation> - </message> - <message> <source>Do you want to rebuild the block database now?</source> <translation>გავუშვათ ბლოკთა ბაზის ხელახლა აგება ეხლა?</translation> </message> @@ -1574,34 +1568,14 @@ <translation>არ არის საკმარისი ფაილ-დესკრიპტორები.</translation> </message> <message> - <source>Specify wallet file (within data directory)</source> - <translation>მიუთითეთ საფულის ფაილი (კატალოგში)</translation> - </message> - <message> <source>Verifying blocks...</source> <translation>ბლოკების ვერიფიკაცია...</translation> </message> <message> - <source>Wallet options:</source> - <translation>სფულის ოპციები:</translation> - </message> - <message> - <source>Execute command when a relevant alert is received or we see a really long fork (%s in cmd is replaced by message)</source> - <translation>ბრძანების შესრულება შესაბამისი უწყების მიღებისას ან როცა შეინიშნება საგრძნობი გახლეჩა (cmd-ში %s შეიცვლება მესიჯით)</translation> - </message> - <message> <source>Information</source> <translation>ინფორმაცია</translation> </message> <message> - <source>Send trace/debug info to console instead of debug.log file</source> - <translation>ტრასირების/დახვეწის ინფოს გაგზავნა კონსოლზე debug.log ფაილის ნაცვლად</translation> - </message> - <message> - <source>Shrink debug.log file on client startup (default: 1 when no -debug)</source> - <translation>debug.log ფაილის შეკუმშვა გაშვებისას (ნაგულისხმევია: 1 როცა არ აყენია -debug)</translation> - </message> - <message> <source>Signing transaction failed</source> <translation>ტრანსაქციების ხელმოწერა ვერ მოხერხდა</translation> </message> @@ -1614,34 +1588,14 @@ <translation>ტრანსაქცია ძალიან დიდია</translation> </message> <message> - <source>Username for JSON-RPC connections</source> - <translation>მომხმარებლის სახელი JSON-RPC-შეერთებისათვის</translation> - </message> - <message> <source>Warning</source> <translation>გაფრთხილება</translation> </message> <message> - <source>You need to rebuild the database using -reindex to change -txindex</source> - <translation>საჭიროა ბაზის ხელახალი აგება, გამოიყენეთ -reindex რათა შეცვალოთ -txindex</translation> - </message> - <message> <source>Zapping all transactions from wallet...</source> <translation>ტრანსაქციების ჩახსნა საფულიდან...</translation> </message> <message> - <source>Password for JSON-RPC connections</source> - <translation>პაროლი JSON-RPC-შეერთებისათვის</translation> - </message> - <message> - <source>Execute command when the best block changes (%s in cmd is replaced by block hash)</source> - <translation>კომანდის შესრულება უკეთესი ბლოკის გამოჩენისას (%s კომანდაში ჩანაცვლდება ბლოკის ჰეშით)</translation> - </message> - <message> - <source>Allow DNS lookups for -addnode, -seednode and -connect</source> - <translation>DNS-ძებნის დაშვება -addnode, -seednode და -connect-სათვის</translation> - </message> - <message> <source>Unknown network specified in -onlynet: '%s'</source> <translation>-onlynet-ში მითითებულია უცნობი ქსელი: '%s'</translation> </message> diff --git a/src/qt/locale/bitcoin_kk_KZ.ts b/src/qt/locale/bitcoin_kk_KZ.ts index e9cbf5f99c..95df921686 100644 --- a/src/qt/locale/bitcoin_kk_KZ.ts +++ b/src/qt/locale/bitcoin_kk_KZ.ts @@ -236,6 +236,10 @@ </context> <context> <name>ReceiveRequestDialog</name> + <message> + <source>Wallet</source> + <translation>Әмиян</translation> + </message> </context> <context> <name>RecentRequestsTableModel</name> diff --git a/src/qt/locale/bitcoin_ko_KR.ts b/src/qt/locale/bitcoin_ko_KR.ts index b0e1bbdf15..a7a0767464 100644 --- a/src/qt/locale/bitcoin_ko_KR.ts +++ b/src/qt/locale/bitcoin_ko_KR.ts @@ -30,6 +30,10 @@ <translation>현재 목록에 선택한 주소 삭제</translation> </message> <message> + <source>Enter address or label to search</source> + <translation>검색하기 위한 주소 또는 표 입력</translation> + </message> + <message> <source>Export the data in the current tab to a file</source> <translation>현재 탭에 있는 데이터를 파일로 내보내기</translation> </message> @@ -59,7 +63,7 @@ </message> <message> <source>Receiving addresses</source> - <translation>받은 주소들</translation> + <translation>받는 주소들</translation> </message> <message> <source>These are your Bitcoin addresses for sending payments. Always check the amount and the receiving address before sending coins.</source> @@ -322,6 +326,14 @@ <translation>&URI 열기...</translation> </message> <message> + <source>Wallet:</source> + <translation>지갑:<br></translation> + </message> + <message> + <source>default wallet</source> + <translation><br>기본 지갑</translation> + </message> + <message> <source>Click to disable network activity.</source> <translation>네트워크 활동을 중지하려면 클릭.</translation> </message> @@ -342,6 +354,10 @@ <translation>디스크에서 블록 다시 색인중...</translation> </message> <message> + <source>Proxy is <b>enabled</b>: %1</source> + <translation>프록시가 <b>활성화</b> 되었습니다: %1</translation> + </message> + <message> <source>Send coins to a Bitcoin address</source> <translation>비트코인 주소로 코인 전송</translation> </message> @@ -510,6 +526,12 @@ </translation> </message> <message> + <source>Wallet: %1 +</source> + <translation>지갑: %1 +</translation> + </message> + <message> <source>Type: %1 </source> <translation>종류: %1 @@ -730,10 +752,6 @@ <translation>주소(&A)</translation> </message> <message> - <source>New receiving address</source> - <translation>새 받는 주소</translation> - </message> - <message> <source>New sending address</source> <translation>새 보내는 주소</translation> </message> @@ -750,8 +768,12 @@ <translation>입력한 "%1" 주소는 올바른 비트코인 주소가 아닙니다.</translation> </message> <message> - <source>The entered address "%1" is already in the address book.</source> - <translation>입력된 주소는"%1" 이미 주소록에 있습니다.</translation> + <source>Address "%1" already exists as a receiving address with label "%2" and so cannot be added as a sending address.</source> + <translation>주소 "%1"은 이미 "%2"로 받는 주소로 존재하여 보내는 주소로 저장할 수 없습니다.</translation> + </message> + <message> + <source>The entered address "%1" is already in the address book with label "%2".</source> + <translation>입력된 주소 "%1"은 "%2"로 이미 주소록에 있습니다.</translation> </message> <message> <source>Could not unlock wallet.</source> @@ -803,42 +825,6 @@ <source>Command-line options</source> <translation>명령줄 옵션</translation> </message> - <message> - <source>Usage:</source> - <translation>사용법:</translation> - </message> - <message> - <source>command-line options</source> - <translation>명령줄 옵션</translation> - </message> - <message> - <source>UI Options:</source> - <translation>UI 옵션:</translation> - </message> - <message> - <source>Choose data directory on startup (default: %u)</source> - <translation>실행시 데이터 폴더 선택하기 (기본값: %u)</translation> - </message> - <message> - <source>Set language, for example "de_DE" (default: system locale)</source> - <translation>"ko_KR"와 같이 언어를 설정하십시오 (기본값: 시스템 로캘)</translation> - </message> - <message> - <source>Start minimized</source> - <translation>최소화된 상태에서 시작</translation> - </message> - <message> - <source>Set SSL root certificates for payment request (default: -system-)</source> - <translation>지불 요청을 위한 SSL 루트 인증서 설정 (기본값: -system-)</translation> - </message> - <message> - <source>Show splash screen on startup (default: %u)</source> - <translation>실행시 시작화면 보기 (기본값: %u)</translation> - </message> - <message> - <source>Reset all settings changed in the GUI</source> - <translation>GUI를 통해 수정된 모든 설정을 초기화</translation> - </message> </context> <context> <name>Intro</name> @@ -1068,6 +1054,22 @@ <translation>네트워크(&N)</translation> </message> <message> + <source>Disables some advanced features but all blocks will still be fully validated. Reverting this setting requires re-downloading the entire blockchain. Actual disk usage may be somewhat higher.</source> + <translation>일부분의 고급 기능을 취소 하지만 모든 블록들은 검증될 것입니다. 이 설정을 되돌리려면 처음부터 블록체인을 다시 다운로드 받아야 합니다. 실제 디스크 사용량은 더 많을수도 있습니다.</translation> + </message> + <message> + <source>Prune &block storage to</source> + <translation>블록 데이터 축소와 저장할 곳</translation> + </message> + <message> + <source>GB</source> + <translation>GB</translation> + </message> + <message> + <source>Reverting this setting requires re-downloading the entire blockchain.</source> + <translation>이 설정을 되돌리려면 처음주터 블록체인을 다시 다운로드 받아야 합니다.</translation> + </message> + <message> <source>(0 = auto, <0 = leave that many cores free)</source> <translation>(0 = 자동, <0 = 지정된 코어 개수만큼 사용 안함)</translation> </message> @@ -1334,6 +1336,10 @@ <translation>URI 핸들링</translation> </message> <message> + <source>'bitcoin://' is not a valid URI. Use 'bitcoin:' instead.</source> + <translation>'bitcoin://"은 잘못된 URI입니다. 'bitcoin:'을 사용하십시오.</translation> + </message> + <message> <source>Payment request fetch URL is invalid: %1</source> <translation>지불 요청의 URL이 올바르지 않습니다: %1</translation> </message> @@ -1531,12 +1537,16 @@ <context> <name>QObject::QObject</name> <message> + <source>Error parsing command line arguments: %1.</source> + <translation>%1 명령 파싱 실패 </translation> + </message> + <message> <source>Error: Specified data directory "%1" does not exist.</source> <translation>에러: 지정한 데이터 폴더 "%1"은 존재하지 않습니다.</translation> </message> <message> - <source>Error: Cannot parse configuration file: %1. Only use key=value syntax.</source> - <translation>에러: 설정파일을 파싱할수 없습니다: %1. key=value syntax만 사용가능합니다.</translation> + <source>Error: Cannot parse configuration file: %1.</source> + <translation>에러: 구성 파일 %1을 파싱할 수 없습니다</translation> </message> <message> <source>Error: %1</source> @@ -1629,6 +1639,14 @@ <translation>메모리 사용량</translation> </message> <message> + <source>Wallet: </source> + <translation>지갑:</translation> + </message> + <message> + <source>(none)</source> + <translation>(없음)</translation> + </message> + <message> <source>&Reset</source> <translation>리셋(&R)</translation> </message> @@ -1797,6 +1815,10 @@ <translation>노드 추방 취소(&U)</translation> </message> <message> + <source>default wallet</source> + <translation><br>기본 지갑</translation> + </message> + <message> <source>Welcome to the %1 RPC console.</source> <translation>%1 RPC 콘솔에 오신걸 환영합니다</translation> </message> @@ -1821,6 +1843,14 @@ <translation>네트워크 활동이 정지됨.</translation> </message> <message> + <source>Executing command without any wallet</source> + <translation>지갑 없이 명령 실행</translation> + </message> + <message> + <source>Executing command using "%1" wallet</source> + <translation>"%1" 지갑을 사용하여 명령 실행</translation> + </message> + <message> <source>(node id: %1)</source> <translation>(노드 ID: %1)</translation> </message> @@ -1892,20 +1922,20 @@ <translation>지우기</translation> </message> <message> - <source>Requested payments history</source> - <translation>지출기록 확인</translation> + <source>Native segwit addresses (aka Bech32 or BIP-173) reduce your transaction fees later on and offer better protection against typos, but old wallets don't support them. When unchecked, an address compatible with older wallets will be created instead.</source> + <translation>Bech32 주소 (BIP-173)는 더 적은 수수료와 오입금으로부터 방지해 줍니다. Bech32가 비활성화 되어있으면 P2SH 기반의 세그윗 주소가 대신 생성됩니다.</translation> </message> <message> - <source>&Request payment</source> - <translation>지불 요청(&R)</translation> + <source>Generate native segwit (Bech32) address</source> + <translation>Bech32 세그윗 주소 생성</translation> </message> <message> - <source>Bech32 addresses (BIP-173) are cheaper to spend from and offer better protection against typos. When unchecked a P2SH wrapped SegWit address will be created, compatible with older wallets.</source> - <translation>Bech32 주소 (BIP-173)는 더 적은 수수료와 오입금으로부터 방지해 줍니다. Bech32가 비활성화 되어있으면 P2SH 기반의 세그윗 주소가 대신 생성됩니다.</translation> + <source>Requested payments history</source> + <translation>지출기록 확인</translation> </message> <message> - <source>Generate Bech32 address</source> - <translation>Bech32 주소 생성</translation> + <source>&Request payment</source> + <translation>지불 요청(&R)</translation> </message> <message> <source>Show the selected request (does the same as double clicking an entry)</source> @@ -1987,6 +2017,10 @@ <translation>메시지</translation> </message> <message> + <source>Wallet</source> + <translation>지갑</translation> + </message> + <message> <source>Resulting URI too long, try to reduce the text for label / message.</source> <translation>URI 결과가 너무 길음, 라벨/메세지의 글을 줄이도록 하세요.</translation> </message> @@ -2101,12 +2135,16 @@ <translation>수수료 설정 접기</translation> </message> <message> - <source>per kilobyte</source> - <translation>킬로바이트 당</translation> + <source>Specify a custom fee per kB (1,000 bytes) of the transaction's virtual size. + +Note: Since the fee is calculated on a per-byte basis, a fee of "100 satoshis per kB" for a transaction size of 500 bytes (half of 1 kB) would ultimately yield a fee of only 50 satoshis.</source> + <translation>거래 가상 크기의 kB (1,000 바이트)당 수수료을 지정하십시오. + +참고 : 수수료는 바이트 단위로 계산되므로 거래 크기가 500 바이트 (1kB의 절반)일때에 수수료가 "100 satoshis / kB"이면 궁극적으로 50사토시의 수수료만 발생합니다.</translation> </message> <message> - <source>If the custom fee is set to 1000 satoshis and the transaction is only 250 bytes, then "per kilobyte" only pays 250 satoshis in fee, while "total at least" pays 1000 satoshis. For transactions bigger than a kilobyte both pay by kilobyte.</source> - <translation>사용자 정의 수수료가 1000사토시로 지정된 경우 거래의 크기가 250바이트 일 경우 1킬로바이트당 250사토시만 지불되지만 "최소 수수료"에선 1000사토시가 지불됩니다. 1킬로바이트가 넘는 거래인 경우 어떠한 경우에든 1킬로바이트 기준으로 지불됩니다.</translation> + <source>per kilobyte</source> + <translation>킬로바이트 당</translation> </message> <message> <source>Hide</source> @@ -2218,14 +2256,6 @@ <translation>정말로 보내시겠습니까?</translation> </message> <message> - <source>added as transaction fee</source> - <translation>거래 수수료로 추가됨</translation> - </message> - <message> - <source>Total Amount %1</source> - <translation>총 액수 %1</translation> - </message> - <message> <source>or</source> <translation>또는</translation> </message> @@ -2234,10 +2264,26 @@ <translation>추후에 거래 수수료를 올릴 수 있습니다 (Replace-By-Fee, BIP-125 지원)</translation> </message> <message> + <source>from wallet %1</source> + <translation>%1 지갑에서</translation> + </message> + <message> + <source>Please, review your transaction.</source> + <translation>거래를 재검토 하십시오</translation> + </message> + <message> + <source>Transaction fee</source> + <translation>거래 수수료</translation> + </message> + <message> <source>Not signalling Replace-By-Fee, BIP-125.</source> <translation>Replace-By-Fee, BIP-125 지원 안함</translation> </message> <message> + <source>Total Amount</source> + <translation>총액<br></translation> + </message> + <message> <source>Confirm send coins</source> <translation>코인 전송을 확인</translation> </message> @@ -2579,10 +2625,6 @@ <translation>%1 승인이 있는 거래와 충돌 함</translation> </message> <message> - <source>%1/offline</source> - <translation>%1/오프라인</translation> - </message> - <message> <source>0/unconfirmed, %1</source> <translation>0/미승인, %1</translation> </message> @@ -2611,14 +2653,6 @@ <translation>상태</translation> </message> <message> - <source>, has not been successfully broadcast yet</source> - <translation>. 아직 성공적으로 통보하지 않음</translation> - </message> - <message numerus="yes"> - <source>, broadcast through %n node(s)</source> - <translation><numerusform>, %n개 노드를 통해 전파</numerusform></translation> - </message> - <message> <source>Date</source> <translation>날짜</translation> </message> @@ -2703,6 +2737,10 @@ <translation>거래 총 크기</translation> </message> <message> + <source>Transaction virtual size</source> + <translation>가상 거래 사이즈</translation> + </message> + <message> <source>Output index</source> <translation>출력 인덱스</translation> </message> @@ -2773,10 +2811,6 @@ <translation>%1 까지 열림</translation> </message> <message> - <source>Offline</source> - <translation>오프라인</translation> - </message> - <message> <source>Unconfirmed</source> <translation>미확인</translation> </message> @@ -2801,10 +2835,6 @@ <translation>충분히 숙성되지 않은 상태 (%1 승인, %2 후에 사용 가능합니다)</translation> </message> <message> - <source>This block was not received by any other nodes and will probably not be accepted!</source> - <translation>이 블록은 다른 노드로부터 받지 않아 허용되지 않을 것임!</translation> - </message> - <message> <source>Generated but not accepted</source> <translation>생성되었으나 거절됨</translation> </message> @@ -3115,38 +3145,18 @@ <source>The wallet data was successfully saved to %1.</source> <translation>지갑 정보가 %1에 성공적으로 저장되었습니다.</translation> </message> + <message> + <source>Cancel</source> + <translation>취소</translation> + </message> </context> <context> <name>bitcoin-core</name> <message> - <source>Options:</source> - <translation>옵션:</translation> - </message> - <message> - <source>Specify data directory</source> - <translation>데이터 폴더 지정</translation> - </message> - <message> - <source>Connect to a node to retrieve peer addresses, and disconnect</source> - <translation>피어 주소를 받기 위해 노드에 연결하고, 받은 후에 연결을 끊습니다</translation> - </message> - <message> - <source>Specify your own public address</source> - <translation>공인 주소를 지정하십시오</translation> - </message> - <message> - <source>Accept command line and JSON-RPC commands</source> - <translation>명령줄과 JSON-RPC 명령 수락</translation> - </message> - <message> <source>Distributed under the MIT software license, see the accompanying file %s or %s</source> <translation>MIT 소프트웨어 라이센스에 따라 배포 됨, 첨부 파일 %s 또는 %s을 참조하십시오.</translation> </message> <message> - <source>If <category> is not supplied or if <category> = 1, output all debugging information.</source> - <translation><category>가 제공되지 않거나 <category> = 1 인 경우, 모든 디버깅 정보를 출력</translation> - </message> - <message> <source>Prune configured below the minimum of %d MiB. Please use a higher number.</source> <translation>블록 축소가 최소치의 %d MiB 밑으로 설정되어 있습니다. 더 높은 값을 사용해 보세요.</translation> </message> @@ -3163,18 +3173,10 @@ <translation>에러: 치명적인 내부 오류가 발생했습니다, 자세한 내용은 debug.log 를 확인해주세요.</translation> </message> <message> - <source>Fee (in %s/kB) to add to transactions you send (default: %s)</source> - <translation>송금 거래시 추가되는 수수료 (%s/kB) (기본값: %s)</translation> - </message> - <message> <source>Pruning blockstore...</source> <translation>블록 데이터를 축소 중입니다..</translation> </message> <message> - <source>Run in the background as a daemon and accept commands</source> - <translation>데몬으로 백그라운드에서 실행하고 명령을 허용</translation> - </message> - <message> <source>Unable to start HTTP server. See debug log for details.</source> <translation>HTTP 서버를 시작할 수 없습니다. 자세한 사항은 디버그 로그를 확인 하세요.</translation> </message> @@ -3187,50 +3189,18 @@ <translation>%s 개발자</translation> </message> <message> - <source>A fee rate (in %s/kB) that will be used when fee estimation has insufficient data (default: %s)</source> - <translation>충분한 데이터가 축적되지 않은 상태에서의 수수료 추정 기능이 사용하는 수수료 비율(%s/kB) (기본값: %s)</translation> - </message> - <message> - <source>Accept relayed transactions received from whitelisted peers even when not relaying transactions (default: %d)</source> - <translation>거래의 중계를 하지 않더라도 화이트 리스트에 포함된 피어에서 받은 트랜잭션은 중계하기 (기본값: %d)</translation> - </message> - <message> - <source>Add a node to connect to and attempt to keep the connection open (see the `addnode` RPC command help for more info)</source> - <translation>노드를 추가하여 연결을 지속합니다 ('addnode' RPC 명령어 도움말을 참고하세요)</translation> - </message> - <message> - <source>Bind to given address and always listen on it. Use [host]:port notation for IPv6</source> - <translation>선택된 주소로 고정하며 항상 리슨(Listen)합니다. IPv6 프로토콜인 경우 [host]:port 방식의 명령어 표기법을 사용합니다.</translation> - </message> - <message> <source>Cannot obtain a lock on data directory %s. %s is probably already running.</source> <translation>%s 데이터 디렉토리에 락을 걸 수 없었습니다. %s가 이미 실행 중인 것으로 보입니다.</translation> </message> <message> - <source>Delete all wallet transactions and only recover those parts of the blockchain through -rescan on startup</source> - <translation>시작시 모든 지갑 거래를 삭제하고 -rescan을 통하여 블록체인만 복구합니다.</translation> + <source>Cannot provide specific connections and have addrman find outgoing connections at the same.</source> + <translation>특정 연결을 제공 할 수없고 addrman이 나가는 연결을 찾을 수 없습니다.</translation> </message> <message> <source>Error reading %s! All keys read correctly, but transaction data or address book entries might be missing or incorrect.</source> <translation>%s 불러오기 오류: 주소 키는 모두 정확하게 로드되었으나 거래 데이터와 주소록 필드에서 누락이나 오류가 존재할 수 있습니다.</translation> </message> <message> - <source>Execute command when a wallet transaction changes (%s in cmd is replaced by TxID)</source> - <translation>지갑 거래가 바뀌면 명령을 실행합니다.(%s 안의 명령어가 TxID로 바뀝니다)</translation> - </message> - <message> - <source>Extra transactions to keep in memory for compact block reconstructions (default: %u)</source> - <translation>압축 블록 재구성을 위해 메모리에 보관해야하는 추가 거래 (기본값: %u)</translation> - </message> - <message> - <source>If this block is in the chain assume that it and its ancestors are valid and potentially skip their script verification (0 to verify all, default: %s, testnet: %s)</source> - <translation>이 블록이 체인에 있으면 해당 블록과 그 조상이 유효하며 잠재적으로 스크립트 확인을 건너 뜁니다 (0은 모두 확인, 기본값: %s, testnet: %s)</translation> - </message> - <message> - <source>Maximum allowed median peer time offset adjustment. Local perspective of time may be influenced by peers forward or backward by this amount. (default: %u seconds)</source> - <translation>허용 된 최대 중간 피어 시간 오프셋 조정. 시간에 대한 지역적 전망치는 전방 또는 후방의 피어에 의해 영향을 받을 수 있습니다. (기본값: %u 초)</translation> - </message> - <message> <source>Please check that your computer's date and time are correct! If your clock is wrong, %s will not work properly.</source> <translation>컴퓨터의 날짜와 시간이 올바른지 확인하십시오! 시간이 잘못되면 %s은 제대로 동작하지 않습니다.</translation> </message> @@ -3239,14 +3209,6 @@ <translation>%s가 유용하다고 생각한다면 프로젝트에 공헌해주세요. 이 소프트웨어에 대한 보다 자세한 정보는 %s를 방문해주십시오.</translation> </message> <message> - <source>Set lowest fee rate (in %s/kB) for transactions to be included in block creation. (default: %s)</source> - <translation>블록 생성시 거래가 포함되도록 최저 수수료율을 설정하십시오 (%s/kB 단위). (기본값: %s)</translation> - </message> - <message> - <source>Set the number of script verification threads (%u to %d, 0 = auto, <0 = leave that many cores free, default: %d)</source> - <translation>스크립트 인증 스레드의 갯수 설정 (%u-%d, 0 = 자동, <0 = 지정된 코어 개수만큼 사용 안함, 기본값: %d)</translation> - </message> - <message> <source>The block database contains a block which appears to be from the future. This may be due to your computer's date and time being set incorrectly. Only rebuild the block database if you are sure that your computer's date and time are correct</source> <translation>블록 데이터베이스에 미래의 블록이 포함되어 있습니다. 이것은 사용자의 컴퓨터의 날짜와 시간이 올바르게 설정되어 있지 않을때 나타날 수 있습니다. 만약 사용자의 컴퓨터의 날짜와 시간이 올바르다고 확신할 때에만 블록 데이터 베이스의 재구성을 하십시오</translation> </message> @@ -3255,6 +3217,10 @@ <translation>출시 전의 테스트 빌드 입니다. - 스스로의 책임하에 사용하십시오 - 채굴이나 상업적 용도로 프로그램으로 사용하지 마십시오</translation> </message> <message> + <source>This is the transaction fee you may discard if change is smaller than dust at this level</source> + <translation>이것은 수수료 견적을 이용할 수 없을 때 지불 할 수 있는 거래 수수료입니다.</translation> + </message> + <message> <source>Unable to replay blocks. You will need to rebuild the database using -reindex-chainstate.</source> <translation>블록을 재생할 수 없습니다. -reindex-chainstate를 사용하여 데이터베이스를 다시 빌드 해야 합니다.</translation> </message> @@ -3263,18 +3229,6 @@ <translation>데이터베이스를 포크 전 상태로 돌리지 못했습니다. 블록체인을 다시 다운로드 해주십시오.</translation> </message> <message> - <source>Use UPnP to map the listening port (default: 1 when listening and no -proxy)</source> - <translation>리슨(Listen) 포트를 할당하기 위해 UPnP 사용 (기본값: 열려있거나 -proxy 옵션을 사용하지 않을 시 1)</translation> - </message> - <message> - <source>Username and hashed password for JSON-RPC connections. The field <userpw> comes in the format: <USERNAME>:<SALT>$<HASH>. A canonical python script is included in share/rpcuser. The client then connects normally using the rpcuser=<USERNAME>/rpcpassword=<PASSWORD> pair of arguments. This option can be specified multiple times</source> - <translation>클라이언트JSON-RPC 연결시 사용자 이름과 해시화된 암호문. <userpw> 필드는 <USERNAME>:<SALT>$<HASH> 포멧으로 구성되어 있습니다. 전형적 파이썬 스크립트에선 share/rpcuser가 포함되어 있습니다. 그런 다음 클라이언트는 rpcuser=<USERNAME>/ rpcpassword=<PASSWORD> 쌍의 인수를 사용하여 정상적으로 연결합니다. 이 옵션은 여러번 지정할 수 있습니다.</translation> - </message> - <message> - <source>Wallet will not create transactions that violate mempool chain limits (default: %u)</source> - <translation>지갑은 mempool chain limit (기본값: %u) 을 위반하는 거래를 생성하지 않습니다.</translation> - </message> - <message> <source>Warning: The network does not appear to fully agree! Some miners appear to be experiencing issues.</source> <translation>경고 : 모든 네트워크가 동의해야 하나, 일부 채굴자들에게 문제가 있는 것으로 보입니다. </translation> </message> @@ -3283,10 +3237,6 @@ <translation>경고: 현재 비트코인 버전이 다른 네트워크 참여자들과 동일하지 않은 것 같습니다. 당신 또는 다른 참여자들이 동일한 비트코인 버전으로 업그레이드 할 필요가 있습니다.</translation> </message> <message> - <source>Whether to save the mempool on shutdown and load on restart (default: %u)</source> - <translation>종료시 mempool 저장과 재시작시 로드 여부 (기본 : %u)</translation> - </message> - <message> <source>%d of last 100 blocks have unexpected version</source> <translation>지난 100개의 블록 중 %d개에 예상치 못한 버전이 있습니다.</translation> </message> @@ -3299,42 +3249,14 @@ <translation>-maxmempool은 최소한 %d MB가 필요합니다</translation> </message> <message> - <source><category> can be:</source> - <translation><category> 지정 가능:</translation> - </message> - <message> - <source>Accept connections from outside (default: 1 if no -proxy or -connect)</source> - <translation>외부 접속을 승인합니다</translation> - </message> - <message> - <source>Append comment to the user agent string</source> - <translation>사용자 에이전트 문자열에 코멘트 첨부</translation> - </message> - <message> - <source>Attempt to recover private keys from a corrupt wallet on startup</source> - <translation>시작시 망가진 wallet.dat에서 개인키 복원을 시도합니다</translation> - </message> - <message> - <source>Block creation options:</source> - <translation>블록 생성 옵션:</translation> - </message> - <message> <source>Cannot resolve -%s address: '%s'</source> <translation>%s 주소를 확인할 수 없습니다: '%s'</translation> </message> <message> - <source>Chain selection options:</source> - <translation>체인 선택 옵션:</translation> - </message> - <message> <source>Change index out of range</source> <translation>범위 밖의 인덱스 변경</translation> </message> <message> - <source>Connection options:</source> - <translation>연결 설정 : </translation> - </message> - <message> <source>Copyright (C) %i-%i</source> <translation>Copyright (C) %i-%i</translation> </message> @@ -3343,38 +3265,10 @@ <translation>손상된 블록 데이터베이스가 감지되었습니다</translation> </message> <message> - <source>Debugging/Testing options:</source> - <translation>디버그 및 테스트 설정</translation> - </message> - <message> - <source>Do not load the wallet and disable wallet RPC calls</source> - <translation>지갑 불러오기를 하지마시오 또한 지갑 RPC 연결을 차단하십시오</translation> - </message> - <message> <source>Do you want to rebuild the block database now?</source> <translation>블록 데이터베이스를 다시 생성하시겠습니까?</translation> </message> <message> - <source>Enable publish hash block in <address></source> - <translation><address>에 대한 해시 블록 공개 활성화</translation> - </message> - <message> - <source>Enable publish hash transaction in <address></source> - <translation><address>에 대한 해시 거래 공개 활성화</translation> - </message> - <message> - <source>Enable publish raw block in <address></source> - <translation><address>에 대한 원시 블록 공개 활성화</translation> - </message> - <message> - <source>Enable publish raw transaction in <address></source> - <translation><address>에 대한 원시 거래 공개 활성화</translation> - </message> - <message> - <source>Enable transaction replacement in the memory pool (default: %u)</source> - <translation>메모리 풀(pool) 내의 거래 치환(replacement) 활성화 (기본값: %u)</translation> - </message> - <message> <source>Error initializing block database</source> <translation>블록 데이터베이스를 초기화하는데 오류</translation> </message> @@ -3387,6 +3281,10 @@ <translation>%s 불러오기 오류</translation> </message> <message> + <source>Error loading %s: Private keys can only be disabled during creation</source> + <translation>%s 로딩 실패: 개인키는 생성할때만 불능하게 만들 수 있습니다</translation> + </message> + <message> <source>Error loading %s: Wallet corrupted</source> <translation>%s 불러오기 오류: 지갑 오류</translation> </message> @@ -3411,6 +3309,10 @@ <translation>어떤 포트도 반응하지 않습니다. 사용자 반응=0 만약 원한다면</translation> </message> <message> + <source>Failed to rescan the wallet during initialization</source> + <translation>지갑 스캔 오류</translation> + </message> + <message> <source>Importing...</source> <translation>들여오기 중...</translation> </message> @@ -3435,8 +3337,8 @@ <translation>유효하지 않은 금액 -fallbackfee=<amount>: '%s'</translation> </message> <message> - <source>Keep the transaction memory pool below <n> megabytes (default: %u)</source> - <translation>거래 메모리 풀의 용량을 <n>메가바이트 아래로 유지하기 (기본값: %u)</translation> + <source>Upgrading txindex database</source> + <translation>txindex 데이터베이스 업테이트중</translation> </message> <message> <source>Loading P2P addresses...</source> @@ -3447,26 +3349,10 @@ <translation>추방리스트를 불러오는 중...</translation> </message> <message> - <source>Location of the auth cookie (default: data dir)</source> - <translation>인증 쿠키의 위치 (기본값: data dir)</translation> - </message> - <message> <source>Not enough file descriptors available.</source> <translation>사용 가능한 파일 디스크립터-File Descriptor-가 부족합니다. </translation> </message> <message> - <source>Only connect to nodes in network <net> (ipv4, ipv6 or onion)</source> - <translation>오직 <net> 네트워크로 로만 접속 (IPv4, IPv6 혹은 onion)</translation> - </message> - <message> - <source>Print this help message and exit</source> - <translation>도움말 메시지 출력 후 종료</translation> - </message> - <message> - <source>Print version and exit</source> - <translation>버전 출력후 종료</translation> - </message> - <message> <source>Prune cannot be configured with a negative value.</source> <translation>블록 축소는 음수로 설정할 수 없습니다.</translation> </message> @@ -3475,14 +3361,6 @@ <translation>블록 축소 모드는 -txindex와 호환되지 않습니다.</translation> </message> <message> - <source>Rebuild chain state and block index from the blk*.dat files on disk</source> - <translation>현재의 blk*.dat 파일들로부터 블록체인 색인을 재구성합니다.</translation> - </message> - <message> - <source>Rebuild chain state from the currently indexed blocks</source> - <translation>현재 색인 된 블록들로부터 블록체인을 재구성합니다.</translation> - </message> - <message> <source>Replaying blocks...</source> <translation>블록 재생중...</translation> </message> @@ -3491,14 +3369,6 @@ <translation>블록 되감는중...</translation> </message> <message> - <source>Set database cache size in megabytes (%d to %d, default: %d)</source> - <translation>데이터베이스 케시 크기를 메가바이트로 설정(%d 부터 %d, 기본값: %d)</translation> - </message> - <message> - <source>Specify wallet file (within data directory)</source> - <translation>데이터 폴더 안에 지갑 파일을 선택하세요.</translation> - </message> - <message> <source>The source code is available from %s.</source> <translation>소스코드는 %s 에서 확인하실 수 있습니다.</translation> </message> @@ -3511,6 +3381,10 @@ <translation>이 컴퓨터의 %s에 바인딩 할 수 없습니다. 아마도 %s이 실행중인 것 같습니다.</translation> </message> <message> + <source>Unable to generate keys</source> + <translation>키값 생성 불가</translation> + </message> + <message> <source>Unsupported argument -benchmark ignored, use -debug=bench.</source> <translation>지원하지 않는 인수 -benchmark 은 무시됩니다, -debug=bench 형태로 사용하세요.</translation> </message> @@ -3531,14 +3405,6 @@ <translation>UTXO 데이터베이스 업그레이드</translation> </message> <message> - <source>Use UPnP to map the listening port (default: %u)</source> - <translation>리슨(Listen) 포트를 할당하기 위해 UPnP 사용 (기본값: %u)</translation> - </message> - <message> - <source>Use the test chain</source> - <translation>테스트 체인 사용</translation> - </message> - <message> <source>User Agent comment (%s) contains unsafe characters.</source> <translation>사용자 정의 코멘트 (%s)에 안전하지 못한 글자가 포함되어 있습니다.</translation> </message> @@ -3547,90 +3413,26 @@ <translation>블록 검증중...</translation> </message> <message> - <source>Wallet debugging/testing options:</source> - <translation>지갑 디버깅/테스트 옵션:</translation> - </message> - <message> <source>Wallet needed to be rewritten: restart %s to complete</source> <translation>지갑을 새로 써야 합니다: 완성하기 위하여 %s을 다시 시작하십시오.</translation> </message> <message> - <source>Wallet options:</source> - <translation>지갑 옵션:</translation> - </message> - <message> - <source>Allow JSON-RPC connections from specified source. Valid for <ip> are a single IP (e.g. 1.2.3.4), a network/netmask (e.g. 1.2.3.4/255.255.255.0) or a network/CIDR (e.g. 1.2.3.4/24). This option can be specified multiple times</source> - <translation>특정 소스에서의 JSON-RPC 연결 허가. 유효한 <ip> 같은 하나의 IP주소 (예 1.2.3.4), 네트워크/넷마스크 (예 1.2.3.4/255.255.255.0) 혹은 네트워크/CIDR (예 1.2.3.4/24). 이 옵션은 복수로 설정 할 수 있습니다.</translation> - </message> - <message> - <source>Bind to given address and whitelist peers connecting to it. Use [host]:port notation for IPv6</source> - <translation>선택된 주소로 고정하여 화이트리스트에 포함된 피어에 접속합니다. IPv6 프로토콜인 경우 [host]:port 방식의 명령어 표기법을 사용합니다.</translation> - </message> - <message> - <source>Create new files with system default permissions, instead of umask 077 (only effective with disabled wallet functionality)</source> - <translation>umask 077 대신 시스템 기본 퍼미션으로 새 파일을 만듭니다 (지갑 기능이 비활성화 상태에서만 유효합니다)</translation> - </message> - <message> - <source>Discover own IP addresses (default: 1 when listening and no -externalip or -proxy)</source> - <translation>자신의 주소를 탐색 (기본값: 열려있거나 -externalip 나 -proxy 옵션이 없으면 1)</translation> - </message> - <message> <source>Error: Listening for incoming connections failed (listen returned error %s)</source> <translation>오류: 들어오는 연결을 리슨(Listen)하는데 실패했습니다 (오류 리턴 %s)</translation> </message> <message> - <source>Execute command when a relevant alert is received or we see a really long fork (%s in cmd is replaced by message)</source> - <translation>이 사항과 관련있는 경고가 발생하거나 아주 긴 포크가 발생했을 때 명령어를 실행해 주세요. (cmd 명령어 목록에서 %s는 메시지로 대체됩니다) </translation> - </message> - <message> - <source>Fees (in %s/kB) smaller than this are considered zero fee for relaying, mining and transaction creation (default: %s)</source> - <translation>해당 금액(%s/kB) 보다 적은 수수료는 중계, 채굴, 거래 생성에서 수수료 면제로 간주됩니다 (기본값: %s)</translation> - </message> - <message> - <source>If paytxfee is not set, include enough fee so transactions begin confirmation on average within n blocks (default: %u)</source> - <translation>paytxfee가 설정되어 있지 않다면 평균 n 블록안에 승인이 이루어지도록 충분한 수수료가 포함됩니다 (기본값: %u)</translation> - </message> - <message> <source>Invalid amount for -maxtxfee=<amount>: '%s' (must be at least the minrelay fee of %s to prevent stuck transactions)</source> <translation>유효하지 않은 금액 -maxtxfee=<amount>: '%s' (거래가 막히는 상황을 방지하게 위해 적어도 %s 의 중계 수수료를 지정해야 합니다)</translation> </message> <message> - <source>Maximum size of data in data carrier transactions we relay and mine (default: %u)</source> - <translation>중계 및 채굴을 할 때 데이터 운송 거래에서 데이터의 최대 크기 (기본값: %u)</translation> - </message> - <message> - <source>Randomize credentials for every proxy connection. This enables Tor stream isolation (default: %u)</source> - <translation>인증정보를 프록시 연결마다 무작위로 합니다. 이는 Tor 스트림을 격리시킬 수 있습니다 (기본값: %u)</translation> - </message> - <message> <source>The transaction amount is too small to send after the fee has been deducted</source> <translation>거래액이 수수료를 지불하기엔 너무 작습니다</translation> </message> <message> - <source>Whitelisted peers cannot be DoS banned and their transactions are always relayed, even if they are already in the mempool, useful e.g. for a gateway</source> - <translation>화이트리스트에 포함된 피어는 이미 메모리풀에 포함되어 있어도 DoS 추방이 되지 않으며 그들의 거래가 항상 중계됩니다, 이는 예를 들면 게이트웨이에서 유용합니다.</translation> - </message> - <message> <source>You need to rebuild the database using -reindex to go back to unpruned mode. This will redownload the entire blockchain</source> <translation>축소 모드를 해제하고 데이터베이스를 재구성 하기 위해 -reindex를 사용해야 합니다. 이 명령은 모든 블록체인을 다시 다운로드 할 것 입니다.</translation> </message> <message> - <source>(default: %u)</source> - <translation>(기본값: %u)</translation> - </message> - <message> - <source>Accept public REST requests (default: %u)</source> - <translation>공개 REST 요청을 허가 (기본값: %u)</translation> - </message> - <message> - <source>Automatically create Tor hidden service (default: %d)</source> - <translation>Tor서비스를 자동적으로 생성 (기본값: %d)</translation> - </message> - <message> - <source>Connect through SOCKS5 proxy</source> - <translation>SOCK5 프록시를 통해 연결</translation> - </message> - <message> <source>Error loading %s: You can't disable HD on an already existing HD wallet</source> <translation>%s 불러오기 오류: 이미 HD 지갑이 존재하는 상태에서 HD 지갑을 비활성화 할 수 없습니다</translation> </message> @@ -3643,10 +3445,6 @@ <translation>체인 상태 데이터베이스 업그레이드 중 오류가 발생했습니다.</translation> </message> <message> - <source>Imports blocks from external blk000??.dat file on startup</source> - <translation>외부 blk000??.dat 파일에서 블록을 가져오기</translation> - </message> - <message> <source>Information</source> <translation>정보</translation> </message> @@ -3667,44 +3465,33 @@ <translation>유효하지 않은 넷마스크가 -whitelist: '%s" 를 통해 지정됨</translation> </message> <message> - <source>Keep at most <n> unconnectable transactions in memory (default: %u)</source> - <translation>최대 <n>개의 연결할 수 없는 거래를 메모리에 저장 (기본값: %u)</translation> - </message> - <message> <source>Need to specify a port with -whitebind: '%s'</source> <translation>-whitebind를 이용하여 포트를 지정해야 합니다: '%s"</translation> </message> <message> - <source>Node relay options:</source> - <translation>Node 중계 옵션:</translation> - </message> - <message> - <source>RPC server options:</source> - <translation>RPC 서버 설정</translation> - </message> - <message> <source>Reducing -maxconnections from %d to %d, because of system limitations.</source> <translation>시스템 한계로 인하여 -maxconnections를 %d 에서 %d로 줄였습니다.</translation> </message> <message> - <source>Rescan the block chain for missing wallet transactions on startup</source> - <translation>시작시 누락된 지갑 거래에 대해 블록 체인을 다시 검색 합니다</translation> + <source>Signing transaction failed</source> + <translation>거래를 서명하는것을 실패하였습니다.</translation> </message> <message> - <source>Send trace/debug info to console instead of debug.log file</source> - <translation>추적오류 정보를 degug.log 자료로 보내는 대신 콘솔로 보내기</translation> + <source>Specified -walletdir "%s" does not exist</source> + <translation>애러: 지정한 지갑 폴더 "%s"은 존재하지 않습니다.</translation> </message> <message> - <source>Show all debugging options (usage: --help -help-debug)</source> - <translation>모든 디버그 설정 보기(설정: --help -help-debug)</translation> + <source>Specified -walletdir "%s" is a relative path</source> + <translation>애러: 지정한 지갑 폴더 "%s"은 상대 경로입니다.</translation> </message> <message> - <source>Shrink debug.log file on client startup (default: 1 when no -debug)</source> - <translation>클라이언트 시작시 debug.log 파일 비우기(기본값: 디버그 안할때 1)</translation> + <source>Specified -walletdir "%s" is not a directory</source> + <translation>애러: 지정한 지갑 폴더 "%s"은 디렉토리가 아닙니다.</translation> </message> <message> - <source>Signing transaction failed</source> - <translation>거래를 서명하는것을 실패하였습니다.</translation> + <source>Specified blocks directory "%s" does not exist. +</source> + <translation>지정한 블록 폴더 "%s"는 존재하지 않습니다.</translation> </message> <message> <source>The transaction amount is too small to pay the fee</source> @@ -3715,14 +3502,6 @@ <translation>이 소프트웨어는 시험적입니다.</translation> </message> <message> - <source>Tor control port password (default: empty)</source> - <translation>Tor 관리 포트 암호 (기본값: 공란)</translation> - </message> - <message> - <source>Tor control port to use if onion listening enabled (default: %s)</source> - <translation>onion 열림이 활성화시 Tor 관리 포트 사용 (기본값: %s)</translation> - </message> - <message> <source>Transaction amount too small</source> <translation>거래액이 너무 적습니다</translation> </message> @@ -3739,14 +3518,6 @@ <translation>초기 키값 생성 불가</translation> </message> <message> - <source>Upgrade wallet to latest format on startup</source> - <translation>시작시 지갑 포멧을 최신으로 업그레이드 합니다</translation> - </message> - <message> - <source>Username for JSON-RPC connections</source> - <translation>JSON-RPC 연결에 사용할 사용자 이름</translation> - </message> - <message> <source>Verifying wallet(s)...</source> <translation>지갑(들) 검증중...</translation> </message> @@ -3763,106 +3534,18 @@ <translation>경고: 알려지지 않은 새로운 규칙이 활성화되었습니다. (버전비트 %i)</translation> </message> <message> - <source>Whether to operate in a blocks only mode (default: %u)</source> - <translation>블록 전용 모드로 동작할지 여부 (기본값: %u)</translation> - </message> - <message> - <source>You need to rebuild the database using -reindex to change -txindex</source> - <translation>-txindex를 바꾸기 위해서는 -reindex를 사용해서 데이터베이스를 재구성해야 합니다. </translation> - </message> - <message> <source>Zapping all transactions from wallet...</source> <translation>지갑의 모든거래내역 건너뛰기...</translation> </message> <message> - <source>ZeroMQ notification options:</source> - <translation>ZeroMQ 알림 옵션:</translation> - </message> - <message> - <source>Password for JSON-RPC connections</source> - <translation>JSON-RPC 연결에 사용할 암호</translation> - </message> - <message> - <source>Execute command when the best block changes (%s in cmd is replaced by block hash)</source> - <translation>최고의 블록이 변하면 명령을 실행 (cmd 에 있는 %s 는 블록 해시에 의해 대체되어 짐)</translation> - </message> - <message> - <source>Allow DNS lookups for -addnode, -seednode and -connect</source> - <translation>-addnode, -seednode, -connect 옵션에 대해 DNS 탐색 허용</translation> - </message> - <message> - <source>(1 = keep tx meta data e.g. account owner and payment request information, 2 = drop tx meta data)</source> - <translation>(1 = 거래의 메타 데이터를 유지함 예. 계좌정보 와 지불 요구 정보, 2 = 거래 메타 데이터 파기)</translation> - </message> - <message> <source>-maxtxfee is set very high! Fees this large could be paid on a single transaction.</source> <translation>-maxtxfee값이 너무 큽니다! 하나의 거래에 너무 큰 수수료가 지불 됩니다.</translation> </message> <message> - <source>Bind to given address to listen for JSON-RPC connections. This option is ignored unless -rpcallowip is also passed. Port is optional and overrides -rpcport. Use [host]:port notation for IPv6. This option can be specified multiple times (default: 127.0.0.1 and ::1 i.e., localhost, or if -rpcallowip has been specified, 0.0.0.0 and :: i.e., all addresses)</source> - <translation>주어진 주소에 바인드하여 JSON-RPC 연결을 기다립니다. 이 옵션은 -rpcallowip도 전달되지 않으면 무시됩니다. 포트는 옵션이며 -rpcport를 대체합니다. IPv6의 경우 [host]:port 표기법을 사용하십시오. 이 옵션은 여러 번 지정 할 수 있습니다 (기본값 : 127.0.0.1 및 ::1 즉, localhost 또는 -rpcallowip이 지정되면 0.0.0.0 및 모든 주소).</translation> - </message> - <message> - <source>Do not keep transactions in the mempool longer than <n> hours (default: %u)</source> - <translation>메모리 풀에 있는 거래 기록을 <n>시간 후 부터는 유지하지 않기 (기본값: %u)</translation> - </message> - <message> - <source>Equivalent bytes per sigop in transactions for relay and mining (default: %u)</source> - <translation>릴레이 및 마이닝 거래의 sigop 당 동등한 바이트 (기본값: %u)</translation> - </message> - <message> <source>Error loading %s: You can't enable HD on an already existing non-HD wallet</source> <translation>%s 불러오기 오류: 비-HD 지갑이 존재하는 상태에서 HD 지갑을 활성화 할 수 없습니다</translation> </message> <message> - <source>Error loading wallet %s. -wallet parameter must only specify a filename (not a path).</source> - <translation>지갑 %s 로딩 에러, -wallet 매개변수는 파일 이름만 지정 해야 합니다 (경로가 아님).</translation> - </message> - <message> - <source>Fees (in %s/kB) smaller than this are considered zero fee for transaction creation (default: %s)</source> - <translation>해당 금액(%s/kB) 보다 적은 수수료는 수수료 면제로 간주됩니다.(기본값: %s)</translation> - </message> - <message> - <source>Force relay of transactions from whitelisted peers even if they violate local relay policy (default: %d)</source> - <translation>피어들이 로컬 중계 정책을 위반하더라도 화이트 리스트에 포함된 피어인경우 강제로 중계하기 (기본값: %d)</translation> - </message> - <message> - <source>How thorough the block verification of -checkblocks is (0-4, default: %u)</source> - <translation>-checkblocks을 통한 블록 점검 (0-4, 기본값: %u)</translation> - </message> - <message> - <source>Maintain a full transaction index, used by the getrawtransaction rpc call (default: %u)</source> - <translation>getrawtransaction를 RPC CALL를 통해 완전한 거래 인덱스 유지 (기본값: %u)</translation> - </message> - <message> - <source>Number of seconds to keep misbehaving peers from reconnecting (default: %u)</source> - <translation>이상행동을 하는 네트워크 참여자들을 다시 연결시키는데 걸리는 시간 (기본값: %u)</translation> - </message> - <message> - <source>Output debugging information (default: %u, supplying <category> is optional)</source> - <translation>디버그 정보 출력 (기본값: %u, <category> 제공은 선택입니다)</translation> - </message> - <message> - <source>Set maximum BIP141 block weight to this * 4. Deprecated, use blockmaxweight</source> - <translation>최대 BIP141 블록 무게: 설정값 *4. 현재 미 지원 옵션입니다. -blockmaxweight 를 대신 쓰세요.</translation> - </message> - <message> - <source>Sets the serialization of raw transaction or block hex returned in non-verbose mode, non-segwit(0) or segwit(1) (default: %d)</source> - <translation>non-segwit(0) 또는 segwit(1) (기본값: %d) 가 아닌 자세한 정보 표시 모드로 반환 된 원시 거래 또는 블록 hex의 직렬화를 설정합니다.</translation> - </message> - <message> - <source>Specify directory to hold wallets (default: <datadir>/wallets if it exists, otherwise <datadir>)</source> - <translation>지갑 파일을 저장하기 위한 폴더를 설정하세요 (기본값: <datadir>/wallets 또는 <datadir>)</translation> - </message> - <message> - <source>Specify location of debug log file: this can be an absolute path or a path relative to the data directory (default: %s)</source> - <translation>디버그 로그 파일의 저장 위치를 지정하세요: 이것은 별도의 위치나 블록체인 저장위치와 동일할 수 있습니다 (기본값: %s)</translation> - </message> - <message> - <source>Support filtering of blocks and transaction with bloom filters (default: %u)</source> - <translation>블룸필터를 통해 블록과 거래 필터링 지원 (기본값: %u)</translation> - </message> - <message> <source>This is the transaction fee you may pay when fee estimates are not available.</source> <translation>이것은 수수료 견적을 이용할 수 없을 때 지불 할 수 있는 거래 수수료입니다.</translation> </message> @@ -3875,10 +3558,6 @@ <translation>네트워크 버전 문자 (%i)의 길이가 최대길이 (%i)를 초과합니다. UA코멘트의 갯수나 길이를 줄이세요.</translation> </message> <message> - <source>Tries to keep outbound traffic under the given target (in MiB per 24h), 0 = no limit (default: %d)</source> - <translation>아웃바운드 트래픽을 설정된 목표치 이하로 유지하기 (24시간당 MiB기준), 0 = 무제한 (기본값: %d)</translation> - </message> - <message> <source>Unsupported argument -socks found. Setting SOCKS version isn't possible anymore, only SOCKS5 proxies are supported.</source> <translation>지원하지 않는 인수 -socks를 찾았습니다. 설정된 SOCKS의 버전은 더이상 사용할 수 없으며, SOCK5 프록시만을 지원합니다.</translation> </message> @@ -3887,10 +3566,6 @@ <translation>지원하지 않는 인수 -whitelistalwaysrelay 는 무시됩니다, -whitelistrelay 나 -whitelistforcerelay 를 사용해 주세요.</translation> </message> <message> - <source>Use separate SOCKS5 proxy to reach peers via Tor hidden services (default: %s)</source> - <translation>Tor 서비스를 이용하여 피어에게 연결하기 위해 분리된 SOCKS5 프록시를 사용 (기본값: %s)</translation> - </message> - <message> <source>Warning: Unknown block versions being mined! It's possible unknown rules are in effect</source> <translation>경고: 알려지지 않은 버전의 블록이 채굴되었습니다. 알려지지 않은 규칙이 적용되었을 가능성이 있습니다.</translation> </message> @@ -3899,110 +3574,18 @@ <translation>경고 : 지갑파일이 손상되어 데이터가 복구되었습니다. 원래의 %s 파일은 %s 후에 %s 이름으로 저장됩니다. 잔액과 거래 내역이 정확하지 않다면 백업 파일로 부터 복원해야 합니다. </translation> </message> <message> - <source>Whitelist peers connecting from the given IP address (e.g. 1.2.3.4) or CIDR notated network (e.g. 1.2.3.0/24). Can be specified multiple times.</source> - <translation>설정된 IP주소 (보기 1.2.3.4) 혹은 CIDR로 작성된 네트워크 (보기 1.2.3.0/24)로 화이트리스트에 포함된 피어에 접속합니다. 이 설정은 복수로 지정 할 수 있습니다.</translation> - </message> - <message> <source>%s is set very high!</source> <translation>%s가 매우 높게 설정되었습니다!</translation> </message> <message> - <source>(default: %s)</source> - <translation>(기본값: %s)</translation> - </message> - <message> - <source>Always query for peer addresses via DNS lookup (default: %u)</source> - <translation>DNS lookup을 통해 항상 피어주소에 대한 쿼리 보내기 (기본값: %u)</translation> - </message> - <message> - <source>Error loading wallet %s. -wallet filename must be a regular file.</source> - <translation>지갑 %s 로딩 에러, -wallet 파일 이름은 일반 파일이어야합니다.</translation> - </message> - <message> <source>Error loading wallet %s. Duplicate -wallet filename specified.</source> <translation>지갑 %s 로딩 에러, 중복된 -wallet 파일이름을 입력했습니다.</translation> </message> <message> - <source>Error loading wallet %s. Invalid characters in -wallet filename.</source> - <translation>지갑 %s 로딩 에러, -wallet 파일이름에 잘못된 문자가 있습니다.</translation> - </message> - <message> - <source>How many blocks to check at startup (default: %u, 0 = all)</source> - <translation>시작시 점검할 블록 갯수 (기본값: %u, 0 = 모두)</translation> - </message> - <message> - <source>Include IP addresses in debug output (default: %u)</source> - <translation>디버그 출력에 IP주소 포함하기 (기본값: %u)</translation> - </message> - <message> <source>Keypool ran out, please call keypoolrefill first</source> <translation>Keypool이 종료되었습니다. 먼저 keypoolrefill을 호출하십시오.</translation> </message> <message> - <source>Listen for JSON-RPC connections on <port> (default: %u or testnet: %u)</source> - <translation>JSON-RPC 연결을 <port>포트로 받기 (기본값: %u 혹은 테스트넷: %u)</translation> - </message> - <message> - <source>Listen for connections on <port> (default: %u or testnet: %u)</source> - <translation><port>포트로 연결 받기 (기본값: %u 혹은 테스트넷: %u)</translation> - </message> - <message> - <source>Maintain at most <n> connections to peers (default: %u)</source> - <translation>피어 연결수를 <n>개로 유지 (기본값: %u)</translation> - </message> - <message> - <source>Make the wallet broadcast transactions</source> - <translation>지갑 브로드캐스트 거래를 만들기</translation> - </message> - <message> - <source>Maximum per-connection receive buffer, <n>*1000 bytes (default: %u)</source> - <translation>접속별 최대 수신 버퍼. <n> × 1000바이트 (기본값: %u)</translation> - </message> - <message> - <source>Maximum per-connection send buffer, <n>*1000 bytes (default: %u)</source> - <translation>접속별 최대 전송 버퍼. <n> × 1000바이트 (기본값: %u)</translation> - </message> - <message> - <source>Prepend debug output with timestamp (default: %u)</source> - <translation>디버그 출력에 타임 스탬프 포함하기 (기본값: %u)</translation> - </message> - <message> - <source>Relay and mine data carrier transactions (default: %u)</source> - <translation>데이터 운송 거래를 중계 및 채굴 (기본값: %u)</translation> - </message> - <message> - <source>Relay non-P2SH multisig (default: %u)</source> - <translation>비 P2SH 다중서명을 중계 (기본값: %u)</translation> - </message> - <message> - <source>Set key pool size to <n> (default: %u)</source> - <translation>키 풀 사이즈를 <n> 로 설정 (기본값: %u)</translation> - </message> - <message> - <source>Set maximum BIP141 block weight (default: %d)</source> - <translation>최대 BIP141 블록 무게 설정 (기본값: %d)</translation> - </message> - <message> - <source>Set the number of threads to service RPC calls (default: %d)</source> - <translation>원격 프로시져 호출 서비스를 위한 쓰레드 개수를 설정 (기본값 : %d)</translation> - </message> - <message> - <source>Specify configuration file (default: %s)</source> - <translation>설정파일 지정 (기본값: %s)</translation> - </message> - <message> - <source>Specify connection timeout in milliseconds (minimum: 1, default: %d)</source> - <translation>밀리초 단위로 연결 제한시간을 설정 (최소값: 1, 기본값: %d)</translation> - </message> - <message> - <source>Specify pid file (default: %s)</source> - <translation>pid 파일 지정 (기본값: %s)</translation> - </message> - <message> - <source>Spend unconfirmed change when sending transactions (default: %u)</source> - <translation>거래를 보낼 때 검증되지 않은 잔돈 쓰기 (기본값: %u)</translation> - </message> - <message> <source>Starting network threads...</source> <translation>네트워크 스레드 시작중...</translation> </message> @@ -4019,10 +3602,6 @@ <translation>이것은 거래를 보낼 경우 지불 할 거래 수수료입니다.</translation> </message> <message> - <source>Threshold for disconnecting misbehaving peers (default: %u)</source> - <translation>비정상적인 피어의 연결을 차단시키기 위한 임계값 (기본값: %u)</translation> - </message> - <message> <source>Transaction amounts must not be negative</source> <translation>거래액은 반드시 정수여야합니다.</translation> </message> @@ -4043,6 +3622,26 @@ <translation>자금이 부족합니다!</translation> </message> <message> + <source>Can't generate a change-address key. Private keys are disabled for this wallet.</source> + <translation>거스름돈 주소 생성불가. 이 지갑에서는 개인키가 비활성화 되어 있습니다.</translation> + </message> + <message> + <source>Cannot upgrade a non HD split wallet without upgrading to support pre split keypool. Please use -upgradewallet=169900 or -upgradewallet with no version specified.</source> + <translation>HD split을 하지 않은 지갑은 pre split keypool로 업그레이드 하지 않은 이상 업그레이드가 불가능합니다. -upgradewallet=169900 이나 -upgradewallet (버전을 정하지 않고) 명령을 사용하십시오.</translation> + </message> + <message> + <source>Fee estimation failed. Fallbackfee is disabled. Wait a few blocks or enable -fallbackfee.</source> + <translation>수수료 견적 실패. Fallbackfee 비활성화 상태. 몇 블록을 기다리거나 -fallbackfee를 활성화 시키십시오.</translation> + </message> + <message> + <source>Warning: Private keys detected in wallet {%s} with disabled private keys</source> + <translation>주의: {%s}지갑에서 비활성화된 개인키 발견</translation> + </message> + <message> + <source>Cannot write to data directory '%s'; check permissions.</source> + <translation>"%s" 데이터 폴더에 쓰기 불가능. 권한을 확인하십시오.</translation> + </message> + <message> <source>Loading block index...</source> <translation>블록 인덱스를 불러오는 중...</translation> </message> diff --git a/src/qt/locale/bitcoin_ku_IQ.ts b/src/qt/locale/bitcoin_ku_IQ.ts index 0d94e8271f..8041f5bcc1 100644 --- a/src/qt/locale/bitcoin_ku_IQ.ts +++ b/src/qt/locale/bitcoin_ku_IQ.ts @@ -376,10 +376,6 @@ <context> <name>bitcoin-core</name> <message> - <source>Options:</source> - <translation>هەڵبژاردنەکان:</translation> - </message> - <message> <source>Information</source> <translation>زانیاری</translation> </message> diff --git a/src/qt/locale/bitcoin_ky.ts b/src/qt/locale/bitcoin_ky.ts index 83cb76b453..c49160609d 100644 --- a/src/qt/locale/bitcoin_ky.ts +++ b/src/qt/locale/bitcoin_ky.ts @@ -224,6 +224,10 @@ <source>Message</source> <translation>Билдирүү</translation> </message> + <message> + <source>Wallet</source> + <translation>Капчык</translation> + </message> </context> <context> <name>RecentRequestsTableModel</name> @@ -292,10 +296,6 @@ <context> <name>TransactionDesc</name> <message> - <source>%1/offline</source> - <translation>%1/тармакта эмес</translation> - </message> - <message> <source>Date</source> <translation>Дата</translation> </message> diff --git a/src/qt/locale/bitcoin_la.ts b/src/qt/locale/bitcoin_la.ts index 6715eaab2e..c0ff1030f1 100644 --- a/src/qt/locale/bitcoin_la.ts +++ b/src/qt/locale/bitcoin_la.ts @@ -14,6 +14,10 @@ <translation>Dele active selectam inscriptionem ex enumeratione</translation> </message> <message> + <source>Enter address or label to search</source> + <translation>Insere inscriptionem vel titulum ut quaeras</translation> + </message> + <message> <source>Export the data in the current tab to a file</source> <translation>Exporta data in hac tabella in plicam</translation> </message> @@ -289,15 +293,7 @@ <source>Command-line options</source> <translation>Optiones mandati initiantis</translation> </message> - <message> - <source>Usage:</source> - <translation>Usus:</translation> - </message> - <message> - <source>command-line options</source> - <translation>Optiones mandati intiantis</translation> - </message> - </context> +</context> <context> <name>Intro</name> <message> @@ -552,6 +548,10 @@ <source>Copy &Address</source> <translation>&Copia Inscriptionem</translation> </message> + <message> + <source>Wallet</source> + <translation>Cassidile</translation> + </message> </context> <context> <name>RecentRequestsTableModel</name> @@ -598,6 +598,10 @@ <source>S&end</source> <translation>&Mitte</translation> </message> + <message> + <source>Transaction fee</source> + <translation>Transactionis merces</translation> + </message> </context> <context> <name>SendCoinsEntry</name> @@ -748,50 +752,10 @@ <context> <name>bitcoin-core</name> <message> - <source>Options:</source> - <translation>Optiones:</translation> - </message> - <message> - <source>Specify data directory</source> - <translation>Specifica indicem datorum</translation> - </message> - <message> - <source>Connect to a node to retrieve peer addresses, and disconnect</source> - <translation>Conecta ad nodum acceptare inscriptiones parium, et disconecte</translation> - </message> - <message> - <source>Specify your own public address</source> - <translation>Specifica tuam propriam publicam inscriptionem</translation> - </message> - <message> - <source>Accept command line and JSON-RPC commands</source> - <translation>Accipe terminalis et JSON-RPC mandata.</translation> - </message> - <message> - <source>Run in the background as a daemon and accept commands</source> - <translation>Operare infere sicut daemon et mandata accipe</translation> - </message> - <message> <source>Bitcoin Core</source> <translation>Bitcoin Nucleus</translation> </message> <message> - <source>Bind to given address and always listen on it. Use [host]:port notation for IPv6</source> - <translation>Conglutina ad inscriptionem datam et semper in eam ausculta. Utere [moderatrum]:porta notationem pro IPv6</translation> - </message> - <message> - <source>Execute command when a wallet transaction changes (%s in cmd is replaced by TxID)</source> - <translation>Facere mandatum quotiescumque cassidilis transactio mutet (%s in mandato sbstituitur ab TxID)</translation> - </message> - <message> - <source>Accept connections from outside (default: 1 if no -proxy or -connect)</source> - <translation>Accipe conexiones externas (praedefinitum: 1 nisi -proxy neque -connect)</translation> - </message> - <message> - <source>Block creation options:</source> - <translation>Optiones creandi frustorum:</translation> - </message> - <message> <source>Corrupted block database detected</source> <translation>Corruptum databasum frustorum invenitur</translation> </message> @@ -836,14 +800,6 @@ <translation>Informatio</translation> </message> <message> - <source>Send trace/debug info to console instead of debug.log file</source> - <translation>Mitte informationem vestigii/debug ad terminale potius quam plicam debug.log</translation> - </message> - <message> - <source>Shrink debug.log file on client startup (default: 1 when no -debug)</source> - <translation>Diminue plicam debug.log ad initium clientis (praedefinitum: 1 nisi -debug)</translation> - </message> - <message> <source>Signing transaction failed</source> <translation>Signandum transactionis abortum est</translation> </message> @@ -856,26 +812,10 @@ <translation>Transactio nimis magna</translation> </message> <message> - <source>Username for JSON-RPC connections</source> - <translation>Nomen utentis pro conexionibus JSON-RPC</translation> - </message> - <message> <source>Warning</source> <translation>Monitio</translation> </message> <message> - <source>Password for JSON-RPC connections</source> - <translation>Tessera pro conexionibus JSON-RPC</translation> - </message> - <message> - <source>Execute command when the best block changes (%s in cmd is replaced by block hash)</source> - <translation>Pelle mandatum quando optissimum frustum mutat (%s in mandato substituitur ab hash frusti)</translation> - </message> - <message> - <source>Allow DNS lookups for -addnode, -seednode and -connect</source> - <translation>Permitte quaerenda DNS pro -addnode, -seednode, et -connect</translation> - </message> - <message> <source>Unknown network specified in -onlynet: '%s'</source> <translation>Ignotum rete specificatum in -onlynet: '%s'</translation> </message> diff --git a/src/qt/locale/bitcoin_lt.ts b/src/qt/locale/bitcoin_lt.ts index 73c37d2daf..b4207524c9 100644 --- a/src/qt/locale/bitcoin_lt.ts +++ b/src/qt/locale/bitcoin_lt.ts @@ -30,6 +30,10 @@ <translation>Ištrinti pasirinktą adresą iš sąrašo</translation> </message> <message> + <source>Enter address or label to search</source> + <translation>Įveskite adresą ar žymę į paiešką</translation> + </message> + <message> <source>Export the data in the current tab to a file</source> <translation>Eksportuoti informaciją iš dabartinės lentelės į failą</translation> </message> @@ -41,6 +45,10 @@ <source>&Delete</source> <translation>&Trinti</translation> </message> + <message> + <source>Choose the address to send coins to</source> + <translation>Pasirinkite adresą, kuriam siūsite monetas</translation> + </message> </context> <context> <name>AddressTableModel</name> @@ -367,15 +375,7 @@ <source>Command-line options</source> <translation>Komandinės eilutės parametrai</translation> </message> - <message> - <source>Usage:</source> - <translation>Naudojimas:</translation> - </message> - <message> - <source>command-line options</source> - <translation>komandinės eilutės parametrai</translation> - </message> - </context> +</context> <context> <name>Intro</name> <message> @@ -746,6 +746,10 @@ <source>Address</source> <translation>Adresas</translation> </message> + <message> + <source>Wallet</source> + <translation>Piniginė</translation> + </message> </context> <context> <name>RecentRequestsTableModel</name> @@ -812,6 +816,10 @@ <source>S&end</source> <translation>&Siųsti</translation> </message> + <message> + <source>Transaction fee</source> + <translation>Sandorio mokestis</translation> + </message> </context> <context> <name>SendCoinsEntry</name> @@ -950,26 +958,6 @@ <context> <name>bitcoin-core</name> <message> - <source>Options:</source> - <translation>Parinktys:</translation> - </message> - <message> - <source>Specify data directory</source> - <translation>Nustatyti duomenų aplanką</translation> - </message> - <message> - <source>Specify your own public address</source> - <translation>Nurodykite savo nuosavą viešą adresą</translation> - </message> - <message> - <source>Accept command line and JSON-RPC commands</source> - <translation>Priimti komandinę eilutę ir JSON-RPC komandas</translation> - </message> - <message> - <source>Run in the background as a daemon and accept commands</source> - <translation>Dirbti fone kaip šešėlyje ir priimti komandas</translation> - </message> - <message> <source>Bitcoin Core</source> <translation>Bitcoin branduolys</translation> </message> @@ -986,26 +974,10 @@ <translation>Informacija</translation> </message> <message> - <source>Send trace/debug info to console instead of debug.log file</source> - <translation>Siųsti atsekimo/derinimo info į konsolę vietoj debug.log failo</translation> - </message> - <message> - <source>Username for JSON-RPC connections</source> - <translation>Vartotojo vardas JSON-RPC jungimuisi</translation> - </message> - <message> <source>Warning</source> <translation>Įspėjimas</translation> </message> <message> - <source>Password for JSON-RPC connections</source> - <translation>Slaptažodis JSON-RPC sujungimams</translation> - </message> - <message> - <source>Allow DNS lookups for -addnode, -seednode and -connect</source> - <translation>Leisti DNS paiešką sujungimui ir mazgo pridėjimui</translation> - </message> - <message> <source>Insufficient funds</source> <translation>Nepakanka lėšų</translation> </message> diff --git a/src/qt/locale/bitcoin_lv_LV.ts b/src/qt/locale/bitcoin_lv_LV.ts index f4aef3a5a8..fc74e787ed 100644 --- a/src/qt/locale/bitcoin_lv_LV.ts +++ b/src/qt/locale/bitcoin_lv_LV.ts @@ -26,6 +26,10 @@ <translation>Izdzēst iezīmētās adreses no saraksta</translation> </message> <message> + <source>Enter address or label to search</source> + <translation>Ierakstiet meklējamo nosaukumu vai adresi</translation> + </message> + <message> <source>Export the data in the current tab to a file</source> <translation>Datus no tekošā ieliktņa eksportēt uz failu</translation> </message> @@ -50,6 +54,10 @@ <translation>&Kopēt adresi</translation> </message> <message> + <source>Copy &Label</source> + <translation>Kopēt &Marķējumu</translation> + </message> + <message> <source>&Edit</source> <translation>&Rediģēt</translation> </message> @@ -96,6 +104,10 @@ <translation>Jaunā parole vēlreiz</translation> </message> <message> + <source>Show password</source> + <translation>Rādīt paroli</translation> + </message> + <message> <source>Encrypt wallet</source> <translation>Šifrēt maciņu</translation> </message> @@ -441,15 +453,7 @@ <source>Command-line options</source> <translation>Komandrindas iespējas</translation> </message> - <message> - <source>Usage:</source> - <translation>Lietojums:</translation> - </message> - <message> - <source>command-line options</source> - <translation>komandrindas izvēles</translation> - </message> - </context> +</context> <context> <name>Intro</name> <message> @@ -900,6 +904,10 @@ <source>Label</source> <translation>Nosaukums</translation> </message> + <message> + <source>Wallet</source> + <translation>Maciņš</translation> + </message> </context> <context> <name>RecentRequestsTableModel</name> @@ -995,6 +1003,10 @@ <translation>&Sūtīt</translation> </message> <message> + <source>Transaction fee</source> + <translation>Transakcijas maksa</translation> + </message> + <message> <source>(no label)</source> <translation>(bez nosaukuma)</translation> </message> @@ -1192,50 +1204,10 @@ <context> <name>bitcoin-core</name> <message> - <source>Options:</source> - <translation>Iespējas:</translation> - </message> - <message> - <source>Specify data directory</source> - <translation>Norādiet datu direktoriju</translation> - </message> - <message> - <source>Connect to a node to retrieve peer addresses, and disconnect</source> - <translation>Pievienoties mezglam, lai iegūtu citu mezglu adreses, un atvienoties</translation> - </message> - <message> - <source>Specify your own public address</source> - <translation>Norādiet savu publisko adresi</translation> - </message> - <message> - <source>Accept command line and JSON-RPC commands</source> - <translation>Pieņemt komandrindas un JSON-RPC komandas</translation> - </message> - <message> - <source>Run in the background as a daemon and accept commands</source> - <translation>Darbināt fonā kā servisu un pieņemt komandas</translation> - </message> - <message> <source>Bitcoin Core</source> <translation>Bitcoin Core</translation> </message> <message> - <source><category> can be:</source> - <translation><category> var būt:</translation> - </message> - <message> - <source>Block creation options:</source> - <translation>Bloka izveidošanas iestatījumi:</translation> - </message> - <message> - <source>Connection options:</source> - <translation>Savienojuma iestatījumi:</translation> - </message> - <message> - <source>Debugging/Testing options:</source> - <translation>Atkļūdošanas/Testēšanas iestatījumi:</translation> - </message> - <message> <source>Error loading block database</source> <translation>Kļūda ielādējot bloku datubāzi</translation> </message> @@ -1252,22 +1224,10 @@ <translation>Pārbauda blokus...</translation> </message> <message> - <source>Wallet options:</source> - <translation>Maciņa iespējas:</translation> - </message> - <message> <source>Information</source> <translation>Informācija</translation> </message> <message> - <source>RPC server options:</source> - <translation>RPC servera iestatījumi:</translation> - </message> - <message> - <source>Send trace/debug info to console instead of debug.log file</source> - <translation>Debug/trace informāciju izvadīt konsolē, nevis debug.log failā</translation> - </message> - <message> <source>Signing transaction failed</source> <translation>Transakcijas parakstīšana neizdevās</translation> </message> @@ -1280,26 +1240,10 @@ <translation>Transakcija ir pārāk liela</translation> </message> <message> - <source>Username for JSON-RPC connections</source> - <translation>JSON-RPC savienojumu lietotājvārds</translation> - </message> - <message> <source>Warning</source> <translation>Brīdinājums</translation> </message> <message> - <source>Password for JSON-RPC connections</source> - <translation>JSON-RPC savienojumu parole</translation> - </message> - <message> - <source>Execute command when the best block changes (%s in cmd is replaced by block hash)</source> - <translation>Izpildīt komandu, kad labāk atbilstošais bloks izmainās (%s cmd aizvieto ar bloka hešu)</translation> - </message> - <message> - <source>Allow DNS lookups for -addnode, -seednode and -connect</source> - <translation>Atļaut DNS uzmeklēšanu priekš -addnode, -seednode un -connect</translation> - </message> - <message> <source>Unknown network specified in -onlynet: '%s'</source> <translation>-onlynet komandā norādīts nepazīstams tīkls: '%s'</translation> </message> diff --git a/src/qt/locale/bitcoin_mk_MK.ts b/src/qt/locale/bitcoin_mk_MK.ts index 4db72972e0..8bbf985d30 100644 --- a/src/qt/locale/bitcoin_mk_MK.ts +++ b/src/qt/locale/bitcoin_mk_MK.ts @@ -498,6 +498,10 @@ <source>&Save Image...</source> <translation>&Сними Слика...</translation> </message> + <message> + <source>Wallet</source> + <translation>Паричник</translation> + </message> </context> <context> <name>RecentRequestsTableModel</name> @@ -586,10 +590,6 @@ <context> <name>bitcoin-core</name> <message> - <source>Options:</source> - <translation>Опции:</translation> - </message> - <message> <source>Bitcoin Core</source> <translation>Биткоин Core</translation> </message> diff --git a/src/qt/locale/bitcoin_mn.ts b/src/qt/locale/bitcoin_mn.ts index 478dfb4d37..b5224bce2b 100644 --- a/src/qt/locale/bitcoin_mn.ts +++ b/src/qt/locale/bitcoin_mn.ts @@ -26,6 +26,10 @@ <translation>Одоо сонгогдсон байгаа хаягуудыг жагсаалтаас устгах</translation> </message> <message> + <source>Enter address or label to search</source> + <translation>Хайлт хийхийн тулд хаяг эсвэл шошгыг оруул</translation> + </message> + <message> <source>Export the data in the current tab to a file</source> <translation>Сонгогдсон таб дээрхи дата-г экспортлох</translation> </message> @@ -225,10 +229,6 @@ <source>version</source> <translation>хувилбар</translation> </message> - <message> - <source>Usage:</source> - <translation>Хэрэглээ:</translation> - </message> </context> <context> <name>Intro</name> @@ -408,6 +408,10 @@ <source>Copy &Address</source> <translation>Хаягийг &Хуулбарлах</translation> </message> + <message> + <source>Wallet</source> + <translation>Түрүйвч</translation> + </message> </context> <context> <name>RecentRequestsTableModel</name> @@ -560,14 +564,6 @@ <context> <name>bitcoin-core</name> <message> - <source>Options:</source> - <translation>Сонголтууд:</translation> - </message> - <message> - <source>Wallet options:</source> - <translation>Түрүйвчийн сонголтууд:</translation> - </message> - <message> <source>Information</source> <translation>Мэдээллэл</translation> </message> diff --git a/src/qt/locale/bitcoin_ms_MY.ts b/src/qt/locale/bitcoin_ms_MY.ts index 4798ab724a..075c44c75f 100644 --- a/src/qt/locale/bitcoin_ms_MY.ts +++ b/src/qt/locale/bitcoin_ms_MY.ts @@ -30,6 +30,11 @@ <translation>Padam alamat semasa yang dipilih dari senaraiyang dipilih dari senarai</translation> </message> <message> + <source>Enter address or label to search</source> + <translation>Masukkan alamat atau label untuk carian +</translation> + </message> + <message> <source>Export the data in the current tab to a file</source> <translation> Alihkan fail data ke dalam tab semasa</translation> @@ -133,6 +138,11 @@ Alihkan fail data ke dalam tab semasa</translation> <translation>Ulangi frasa laluan baru</translation> </message> <message> + <source>Show password</source> + <translation>Tunjukkan kata laluan +</translation> + </message> + <message> <source>Enter the new passphrase to the wallet.<br/>Please use a passphrase of <b>ten or more random characters</b>, or <b>eight or more words</b>.</source> <translation>Memasukkan frasa laluan baru kepada dompet.<br/>Sila mengunakkan frasa laluan yang<b>mengandungi 10 atau lebih aksara rawak</b>,ataupun<b>lapan atau lebih perkataan.</b></translation> </message> @@ -319,6 +329,15 @@ Alihkan fail data ke dalam tab semasa</translation> <translation>Buka &URI...</translation> </message> <message> + <source>Wallet:</source> + <translation>dompet</translation> + </message> + <message> + <source>default wallet</source> + <translation>dompet lalai +</translation> + </message> + <message> <source>Click to disable network activity.</source> <translation>Tekan untuk lumpuhkan rangkaian</translation> </message> @@ -410,6 +429,21 @@ Alihkan fail data ke dalam tab semasa</translation> <source>&Help</source> <translation>tolong</translation> </message> + <message> + <source>Tabs toolbar</source> + <translation>Bar alat tab +</translation> + </message> + <message> + <source>Request payments (generates QR codes and bitcoin: URIs)</source> + <translation>Request payments (generates QR codes and bitcoin: URIs) +</translation> + </message> + <message> + <source>Show the list of used sending addresses and labels</source> + <translation>Tunjukkan senarai alamat dan label yang digunakan +</translation> + </message> </context> <context> <name>CoinControlDialog</name> @@ -471,6 +505,11 @@ Alihkan fail data ke dalam tab semasa</translation> </context> <context> <name>RPCConsole</name> + <message> + <source>default wallet</source> + <translation>dompet lalai +</translation> + </message> </context> <context> <name>ReceiveCoinsDialog</name> @@ -489,6 +528,10 @@ Alihkan fail data ke dalam tab semasa</translation> <source>Label</source> <translation>Label</translation> </message> + <message> + <source>Wallet</source> + <translation>dompet</translation> + </message> </context> <context> <name>RecentRequestsTableModel</name> diff --git a/src/qt/locale/bitcoin_nb.ts b/src/qt/locale/bitcoin_nb.ts index c791e1a877..89c8e4174b 100644 --- a/src/qt/locale/bitcoin_nb.ts +++ b/src/qt/locale/bitcoin_nb.ts @@ -30,6 +30,10 @@ <translation>Slett den valgte adressen fra listen.</translation> </message> <message> + <source>Enter address or label to search</source> + <translation>Skriv inn adresse eller merkelapp for å søke</translation> + </message> + <message> <source>Export the data in the current tab to a file</source> <translation>Eksporter data fra nåværende fane til fil</translation> </message> @@ -730,10 +734,6 @@ <translation>&Adresse</translation> </message> <message> - <source>New receiving address</source> - <translation>Ny mottaksadresse</translation> - </message> - <message> <source>New sending address</source> <translation>Ny utsendingsadresse</translation> </message> @@ -750,10 +750,6 @@ <translation>Den angitte adressen "%1" er ikke en gyldig Bitcoin-adresse.</translation> </message> <message> - <source>The entered address "%1" is already in the address book.</source> - <translation>Den angitte adressen "%1" er allerede i adresseboken.</translation> - </message> - <message> <source>Could not unlock wallet.</source> <translation>Kunne ikke låse opp lommebok.</translation> </message> @@ -803,42 +799,6 @@ <source>Command-line options</source> <translation>Kommandolinjevalg</translation> </message> - <message> - <source>Usage:</source> - <translation>Bruk:</translation> - </message> - <message> - <source>command-line options</source> - <translation>kommandolinjevalg</translation> - </message> - <message> - <source>UI Options:</source> - <translation>Grensesnittvalg:</translation> - </message> - <message> - <source>Choose data directory on startup (default: %u)</source> - <translation>Velg datakatalog for oppstart (default: %u)</translation> - </message> - <message> - <source>Set language, for example "de_DE" (default: system locale)</source> - <translation>Sett språk, for eksempel "nb_NO" (default: system-«locale»)</translation> - </message> - <message> - <source>Start minimized</source> - <translation>Begynn minimert</translation> - </message> - <message> - <source>Set SSL root certificates for payment request (default: -system-)</source> - <translation>Sett SSL-rootsertifikat for betalingshenvendelser (default: -system-)</translation> - </message> - <message> - <source>Show splash screen on startup (default: %u)</source> - <translation>Vis velkomstbilde ved oppstart (default: %u)</translation> - </message> - <message> - <source>Reset all settings changed in the GUI</source> - <translation>Nullstill alle innstillinger endret i det grafiske brukergrensesnittet</translation> - </message> </context> <context> <name>Intro</name> @@ -1028,6 +988,14 @@ <translation>Bruk egen SOCKS&5-proxy for å nå noder via Tor hidden services:</translation> </message> <message> + <source>Hide the icon from the system tray.</source> + <translation>Skjul ikonet fra systemkurven.</translation> + </message> + <message> + <source>&Hide tray icon</source> + <translation>&Skjul systemkurvsikon</translation> + </message> + <message> <source>Minimize instead of exit the application when the window is closed. When this option is enabled, the application will be closed only after selecting Exit in the menu.</source> <translation>Minimer i stedet for å avslutte applikasjonen når vinduet lukkes. Når dette er valgt, vil applikasjonen avsluttes kun etter at Avslutte er valgt i menyen.</translation> </message> @@ -1092,6 +1060,14 @@ <translation>Sett opp port ved hjelp av &UPnP</translation> </message> <message> + <source>Accept connections from outside.</source> + <translation>Tillat tilkoblinger fra utsiden</translation> + </message> + <message> + <source>Allow incomin&g connections</source> + <translation>Tillatt innkommend&e tilkoblinger</translation> + </message> + <message> <source>Connect to the Bitcoin network through a SOCKS5 proxy.</source> <translation>Koble til Bitcoin-nettverket gjennom en SOCKS5 proxy.</translation> </message> @@ -1172,6 +1148,10 @@ <translation>Skal myntkontroll funksjoner vises eller ikke.</translation> </message> <message> + <source>&Third party transaction URLs</source> + <translation>Tredjepart transaksjon URLer</translation> + </message> + <message> <source>&OK</source> <translation>&OK</translation> </message> @@ -1515,10 +1495,6 @@ <translation>Feil: Den spesifiserte datamappen "%1" finnes ikke.</translation> </message> <message> - <source>Error: Cannot parse configuration file: %1. Only use key=value syntax.</source> - <translation>Feil: Kan ikke lese oppsettsfil: %1. Bruk kun syntaksen nøkkel=verdi.</translation> - </message> - <message> <source>Error: %1</source> <translation>Feil: %1</translation> </message> @@ -1785,6 +1761,14 @@ <translation>Bruk ↑ og ↓ til å navigere historikk, og %1 for å tømme skjermen.</translation> </message> <message> + <source>Type %1 for an overview of available commands.</source> + <translation>Skriv %1 for en oversikt over tilgjengelige kommandoer.</translation> + </message> + <message> + <source>For more information on using this console type %1.</source> + <translation>For mer informasjon om hvordan konsollet brukes skriv %1.</translation> + </message> + <message> <source>WARNING: Scammers have been active, telling users to type commands here, stealing their wallet contents. Do not use this console without fully understanding the ramifications of a command.</source> <translation>Advarsel: Svindlere har vært på ferde, i oppfordringen om å skrive kommandoer her, for å stjele lommebokinnhold. Ikke bruk konsollen uten at du forstår alle ringvirkningene av en kommando.</translation> </message> @@ -1951,6 +1935,10 @@ <translation>Melding</translation> </message> <message> + <source>Wallet</source> + <translation>Lommebok</translation> + </message> + <message> <source>Resulting URI too long, try to reduce the text for label / message.</source> <translation>Resulterende URI er for lang, prøv å redusere teksten for merkelapp / melding.</translation> </message> @@ -2069,10 +2057,6 @@ <translation>per kilobyte</translation> </message> <message> - <source>If the custom fee is set to 1000 satoshis and the transaction is only 250 bytes, then "per kilobyte" only pays 250 satoshis in fee, while "total at least" pays 1000 satoshis. For transactions bigger than a kilobyte both pay by kilobyte.</source> - <translation>Hvis den egendefinerte avgiften er satt til 1000 satoshis og transaksjonen bare er 250 bytes, da vil "per kilobyte" bare betale 250 satoshis i gebyr, mens "minstebeløp" betaler 1000 satoshis. For transaksjoner større enn en kilobyte vil begge betale for antall kilobyte.</translation> - </message> - <message> <source>Hide</source> <translation>Skjul</translation> </message> @@ -2117,6 +2101,14 @@ <translation>Bekreftelsestidsmål:</translation> </message> <message> + <source>Enable Replace-By-Fee</source> + <translation>Aktiver Replace-By-Fee</translation> + </message> + <message> + <source>With Replace-By-Fee (BIP-125) you can increase a transaction's fee after it is sent. Without this, a higher fee may be recommended to compensate for increased transaction delay risk.</source> + <translation>Med Replace-By-Fee (BIP-125) kan du øke transaksjonens gebyr etter at den er sendt. Uten dette aktivert anbefales et høyere gebyr for å kompensere for risikoen for at transaksjonen blir forsinket. </translation> + </message> + <message> <source>Clear &All</source> <translation>Fjern &Alt</translation> </message> @@ -2173,16 +2165,20 @@ <translation>Er du sikker på at du vil sende?</translation> </message> <message> - <source>added as transaction fee</source> - <translation>lagt til som transaksjonsgebyr</translation> + <source>or</source> + <translation>eller</translation> </message> <message> - <source>Total Amount %1</source> - <translation>Totalt beløp %1</translation> + <source>You can increase the fee later (signals Replace-By-Fee, BIP-125).</source> + <translation>Du kan øke gebyret senere (signaliserer Replace-By-Fee, BIP-125).</translation> </message> <message> - <source>or</source> - <translation>eller</translation> + <source>Transaction fee</source> + <translation>Transaksjonsgebyr</translation> + </message> + <message> + <source>Not signalling Replace-By-Fee, BIP-125.</source> + <translation>Signaliserer ikke Replace-By-Fee, BIP-125</translation> </message> <message> <source>Confirm send coins</source> @@ -2526,10 +2522,6 @@ <translation>gikk ikke overens med en transaksjon med %1 bekreftelser</translation> </message> <message> - <source>%1/offline</source> - <translation>%1/frakoblet</translation> - </message> - <message> <source>0/unconfirmed, %1</source> <translation>0/ubekreftet, %1</translation> </message> @@ -2558,14 +2550,6 @@ <translation>Status</translation> </message> <message> - <source>, has not been successfully broadcast yet</source> - <translation>, har ikke blitt kringkastet enda</translation> - </message> - <message numerus="yes"> - <source>, broadcast through %n node(s)</source> - <translation><numerusform>, kringkast gjennom %n node</numerusform><numerusform>, kringkast gjennom %n noder</numerusform></translation> - </message> - <message> <source>Date</source> <translation>Dato</translation> </message> @@ -2720,10 +2704,6 @@ <translation>Åpen til %1</translation> </message> <message> - <source>Offline</source> - <translation>Frakoblet</translation> - </message> - <message> <source>Unconfirmed</source> <translation>Ubekreftet</translation> </message> @@ -2748,10 +2728,6 @@ <translation>Umoden (%1 bekreftelser, vil være tilgjengelig etter %2)</translation> </message> <message> - <source>This block was not received by any other nodes and will probably not be accepted!</source> - <translation>Denne blokken har ikke blitt mottatt av noen andre noder og vil sannsynligvis ikke bli akseptert!</translation> - </message> - <message> <source>Generated but not accepted</source> <translation>Generert, men ikke akseptert</translation> </message> @@ -3062,38 +3038,14 @@ <source>The wallet data was successfully saved to %1.</source> <translation>Lommebokdata lagret til %1.</translation> </message> -</context> + </context> <context> <name>bitcoin-core</name> <message> - <source>Options:</source> - <translation>Innstillinger:</translation> - </message> - <message> - <source>Specify data directory</source> - <translation>Angi mappe for datafiler</translation> - </message> - <message> - <source>Connect to a node to retrieve peer addresses, and disconnect</source> - <translation>Koble til node for å hente adresser til andre noder, koble så fra igjen</translation> - </message> - <message> - <source>Specify your own public address</source> - <translation>Angi din egen offentlige adresse</translation> - </message> - <message> - <source>Accept command line and JSON-RPC commands</source> - <translation>Ta imot kommandolinje- og JSON-RPC-kommandoer</translation> - </message> - <message> <source>Distributed under the MIT software license, see the accompanying file %s or %s</source> <translation>Lisensiert MIT. Se tilhørende fil %s eller %s</translation> </message> <message> - <source>If <category> is not supplied or if <category> = 1, output all debugging information.</source> - <translation>Hvis <category> ikke er oppgitt eller hvis <category> = 1, ta ut all informasjon for feilsøking.</translation> - </message> - <message> <source>Prune configured below the minimum of %d MiB. Please use a higher number.</source> <translation>Beskjæringsmodus er konfigurert under minimum på %d MiB. Vennligst bruk et høyere nummer.</translation> </message> @@ -3110,18 +3062,10 @@ <translation>Feil: En fatal intern feil oppstod, se debug.log for detaljer</translation> </message> <message> - <source>Fee (in %s/kB) to add to transactions you send (default: %s)</source> - <translation>Gebyr (i %s/kB) for å legge til i transaksjoner du sender (standardverdi: %s)</translation> - </message> - <message> <source>Pruning blockstore...</source> <translation>Beskjærer blokklageret...</translation> </message> <message> - <source>Run in the background as a daemon and accept commands</source> - <translation>Kjør i bakgrunnen som daemon og ta imot kommandoer</translation> - </message> - <message> <source>Unable to start HTTP server. See debug log for details.</source> <translation>Kunne ikke starte HTTP-tjener. Se feilrettingslogg for detaljer.</translation> </message> @@ -3134,54 +3078,18 @@ <translation>%s-utviklerne</translation> </message> <message> - <source>A fee rate (in %s/kB) that will be used when fee estimation has insufficient data (default: %s)</source> - <translation>En gebyrsats (i %s(kB) som bil bli brukt når gebyrvurdering har utilstrekkelig data (forvalg: %s)</translation> - </message> - <message> - <source>Accept relayed transactions received from whitelisted peers even when not relaying transactions (default: %d)</source> - <translation>Godta stafettransaksjoner mottatt fra hvitlistede likemenn, selv når transaksjoner ikke stafettsendes (forvalg: %d)</translation> - </message> - <message> - <source>Bind to given address and always listen on it. Use [host]:port notation for IPv6</source> - <translation>Bind til angitt adresse. Bruk [vertsmaskin]:port notasjon for IPv6</translation> - </message> - <message> <source>Cannot obtain a lock on data directory %s. %s is probably already running.</source> <translation>Kan ikke låse datamappen %s. %s kjører antagelig allerede.</translation> </message> <message> - <source>Delete all wallet transactions and only recover those parts of the blockchain through -rescan on startup</source> - <translation>Slett alle transaksjoner i lommeboken og gjenopprett kun de delene av blokkjeden gjennom -rescan ved oppstart</translation> + <source>Cannot provide specific connections and have addrman find outgoing connections at the same.</source> + <translation>Kan ikke angi spesifikke tilkoblinger og ha addrman til å finne utgående tilkoblinger samtidig. </translation> </message> <message> <source>Error reading %s! All keys read correctly, but transaction data or address book entries might be missing or incorrect.</source> <translation>Feil under lesing av %s! Alle nøkler har blitt lest rett, men transaksjonsdata eller adressebokoppføringer kan mangle eller være uriktige.</translation> </message> <message> - <source>Exclude debugging information for a category. Can be used in conjunction with -debug=1 to output debug logs for all categories except one or more specified categories.</source> - <translation>Ekskluder feilrettingsinformasjon for en kategori. Kan brukes i sammenheng med -debug=1 til utdatafeilrettingslogger for alle kategorier, unntatt én eller flere angitte kategorier.</translation> - </message> - <message> - <source>Execute command when a wallet transaction changes (%s in cmd is replaced by TxID)</source> - <translation>Kjør kommando når en lommeboktransaksjon endres (%s i kommando er erstattet med TxID)</translation> - </message> - <message> - <source>Extra transactions to keep in memory for compact block reconstructions (default: %u)</source> - <translation>Ekstra transaksjoner å beholde i minne for rekonstruksjoner av kompakte blokker (forvalg: %u)</translation> - </message> - <message> - <source>If this block is in the chain assume that it and its ancestors are valid and potentially skip their script verification (0 to verify all, default: %s, testnet: %s)</source> - <translation>Hvis denne blokken er i kjeden, anta at den og dens opphav er gyldig, og alternativt hopp over deres skriptbekreftelse (0 for å bekrefte alle, forvalg: %s, testnett: %s)</translation> - </message> - <message> - <source>Maximum allowed median peer time offset adjustment. Local perspective of time may be influenced by peers forward or backward by this amount. (default: %u seconds)</source> - <translation>Maksimalt tillatt justering av mediantid av likemenn. Lokalt tidsperspektiv kan påvirkes av likemenn fremover og bakover med denne mengden. (forvalg: %u sekunder)</translation> - </message> - <message> - <source>Maximum total fees (in %s) to use in a single wallet transaction or raw transaction; setting this too low may abort large transactions (default: %s)</source> - <translation>Maksimalt totalgebyr (i %s) å bruke i én lommebokstransaksjon eller råtransaksjon; en for lav verdi kan avbryte store transaksjoner (forvalg: %s)</translation> - </message> - <message> <source>Please check that your computer's date and time are correct! If your clock is wrong, %s will not work properly.</source> <translation>Sjekk at din datamaskins dato og klokke er stilt rett! Hvis klokka er feil, vil ikke %s fungere ordentlig.</translation> </message> @@ -3190,22 +3098,6 @@ <translation>Bidra hvis du finner %s nyttig. Besøk %s for mer informasjon om programvaren.</translation> </message> <message> - <source>Query for peer addresses via DNS lookup, if low on addresses (default: 1 unless -connect used)</source> - <translation>Spørring om likemannsadresser via DNS-oppslag, hvis adressemengden er lav (forvalg: 1 om ikke -connect brukes)</translation> - </message> - <message> - <source>Reduce storage requirements by enabling pruning (deleting) of old blocks. This allows the pruneblockchain RPC to be called to delete specific blocks, and enables automatic pruning of old blocks if a target size in MiB is provided. This mode is incompatible with -txindex and -rescan. Warning: Reverting this setting requires re-downloading the entire blockchain. (default: 0 = disable pruning blocks, 1 = allow manual pruning via RPC, >%u = automatically prune block files to stay under the specified target size in MiB)</source> - <translation>Reduser lagringskrav ved å skru på beskjæring (sletting) av gamle blokker. Dette tillater pruneblockchain RPC å bli påkalt for sletting av spesifikke blokker, og skrur på automatisk beskjæring av gamle blokker hvis målstørrelsen i MiB oppgis. Dette moduset er inkompatibelt med -txindex og -rescan. Advarsel: Tilbakestilling av dette krever ny nedlasting av hele blokkjeden. (forvalg: 0 = skru av beskjæring av blokker, 1 = tillat manuell beskjæring via RPC, >%u = automatisk beskjæring av blokkfiler for å ikke overstige angitt målstørrelse, i MiB)</translation> - </message> - <message> - <source>Set lowest fee rate (in %s/kB) for transactions to be included in block creation. (default: %s)</source> - <translation>Sett laveste gebyrtakst (i %s/kB) for transaksjoner som skal inkluderes i blokkopprettelse. (forvalg: %s)</translation> - </message> - <message> - <source>Set the number of script verification threads (%u to %d, 0 = auto, <0 = leave that many cores free, default: %d)</source> - <translation>Angi antall tråder for skriptverifisering (%u til %d, 0 = auto, <0 = la det antallet kjerner være ledig, standard: %d)</translation> - </message> - <message> <source>The block database contains a block which appears to be from the future. This may be due to your computer's date and time being set incorrectly. Only rebuild the block database if you are sure that your computer's date and time are correct</source> <translation>Blokkdatabasen inneholder en blokk som ser ut til å være fra fremtiden. Dette kan være fordi dato og tid på din datamaskin er satt feil. Gjenopprett kun blokkdatabasen når du er sikker på at dato og tid er satt riktig.</translation> </message> @@ -3226,18 +3118,6 @@ <translation>Kan ikke spole tilbake databasen til en tilstand før forgreiningen. Du må laste ned blokkjeden igjen</translation> </message> <message> - <source>Use UPnP to map the listening port (default: 1 when listening and no -proxy)</source> - <translation>Bruk UPnP for lytteport (standardverdi: 1 ved lytting og uten -proxy)</translation> - </message> - <message> - <source>Username and hashed password for JSON-RPC connections. The field <userpw> comes in the format: <USERNAME>:<SALT>$<HASH>. A canonical python script is included in share/rpcuser. The client then connects normally using the rpcuser=<USERNAME>/rpcpassword=<PASSWORD> pair of arguments. This option can be specified multiple times</source> - <translation>Brukernavn og sjekksummert JSON-RPC-tilkoblinger. Dette feltet <userpw> kommer i formatet: <USERNAME>:<SALT>$<HASH>. Et kanonisk Python-skript er inkludert i share/rpcuser. Klienten kobler så til bed bruk av rpcuser=<USERNAME>/rpcpassword=<PASSWORD> argumentpar. Dette valget kan angis flere ganger</translation> - </message> - <message> - <source>Wallet will not create transactions that violate mempool chain limits (default: %u)</source> - <translation>Lommeboka vil ikke opprette transaksjoner som forgriper seg på grenser for hukommelsespuljekjeder (forvalg: %u)</translation> - </message> - <message> <source>Warning: The network does not appear to fully agree! Some miners appear to be experiencing issues.</source> <translation>Advarsel: Nettverket ser ikke ut til å være i overenstemmelse! Noen utvinnere ser ut til å ha problemer.</translation> </message> @@ -3246,10 +3126,6 @@ <translation>Advarsel: Vi ser ikke ut til å være i full overenstemmelse med våre likemenn! Du kan trenge å oppgradere, eller andre noder kan trenge å oppgradere.</translation> </message> <message> - <source>Whether to save the mempool on shutdown and load on restart (default: %u)</source> - <translation>Hvorvidt hukommelsespuljen skal lagres ved avstengning og lastes inn ved omstart (forvalg: %u)</translation> - </message> - <message> <source>%d of last 100 blocks have unexpected version</source> <translation>%d av minst 100 blokker har uventet versjon</translation> </message> @@ -3262,42 +3138,14 @@ <translation>-maxmempool må være minst %d MB</translation> </message> <message> - <source><category> can be:</source> - <translation><category> kan være:</translation> - </message> - <message> - <source>Accept connections from outside (default: 1 if no -proxy or -connect)</source> - <translation>Ta imot tilkoblinger fra utsiden (standardverdi: 1 hvis uten -proxy eller -connect)</translation> - </message> - <message> - <source>Append comment to the user agent string</source> - <translation>Legg til kommentarer i brukeragent-strengen</translation> - </message> - <message> - <source>Attempt to recover private keys from a corrupt wallet on startup</source> - <translation>Forsøk å gjenopprette private nøkler fra ei skadet lommebok ved oppstart</translation> - </message> - <message> - <source>Block creation options:</source> - <translation>Valg for opprettelse av blokker:</translation> - </message> - <message> <source>Cannot resolve -%s address: '%s'</source> <translation>Kunne ikke slå opp -%s-adresse: "%s"</translation> </message> <message> - <source>Chain selection options:</source> - <translation>Kjedeutvelgelsesinnstillinger:</translation> - </message> - <message> <source>Change index out of range</source> <translation>Kjedeindeks utenfor rekkevidde</translation> </message> <message> - <source>Connection options:</source> - <translation>Innstillinger for tilkobling:</translation> - </message> - <message> <source>Copyright (C) %i-%i</source> <translation>Kopirett © %i-%i</translation> </message> @@ -3306,36 +3154,12 @@ <translation>Oppdaget korrupt blokkdatabase</translation> </message> <message> - <source>Debugging/Testing options:</source> - <translation>Valg for feilsøking/testing:</translation> - </message> - <message> - <source>Do not load the wallet and disable wallet RPC calls</source> - <translation>Ikke last inn lommeboken og deaktiver RPC-kall</translation> - </message> - <message> <source>Do you want to rebuild the block database now?</source> <translation>Ønsker du å gjenopprette blokkdatabasen nå?</translation> </message> <message> - <source>Enable publish hash block in <address></source> - <translation>Slå på publish hash block i <address></translation> - </message> - <message> - <source>Enable publish hash transaction in <address></source> - <translation>Slå på publish hash transaction i <address></translation> - </message> - <message> - <source>Enable publish raw block in <address></source> - <translation>Slå på publisering av råblokk i <address></translation> - </message> - <message> - <source>Enable publish raw transaction in <address></source> - <translation>Slå på publisering av råtransaksjon i <address></translation> - </message> - <message> - <source>Enable transaction replacement in the memory pool (default: %u)</source> - <translation>Aktiver transaksjonserstatning i hukommelsespuljen (forvalg: %u)</translation> + <source>Error creating %s: You can't create non-HD wallets with this version.</source> + <translation>Feil under oppretting av %s: Du kan ikke lage en lommebok uten HD med denne versjonen.</translation> </message> <message> <source>Error initializing block database</source> @@ -3374,6 +3198,10 @@ <translation>Kunne ikke lytte på noen port. Bruk -listen=0 hvis det er dette du vil.</translation> </message> <message> + <source>Failed to rescan the wallet during initialization</source> + <translation>Klarte ikke gå igjennom lommeboken under oppstart</translation> + </message> + <message> <source>Importing...</source> <translation>Importerer...</translation> </message> @@ -3398,10 +3226,6 @@ <translation>Ugyldig beløp for -fallbackfee=<amount>: "%s"</translation> </message> <message> - <source>Keep the transaction memory pool below <n> megabytes (default: %u)</source> - <translation>Hold transaksjonspuljen under <n> megabyte (forvalg: %u)</translation> - </message> - <message> <source>Loading P2P addresses...</source> <translation>Laster maskin-til-maskin -adresser…</translation> </message> @@ -3410,26 +3234,10 @@ <translation>Laster inn bannlysningsliste…</translation> </message> <message> - <source>Location of the auth cookie (default: data dir)</source> - <translation>Plassering for autentiseringskake (forvalg: datamappe)</translation> - </message> - <message> <source>Not enough file descriptors available.</source> <translation>For få fildeskriptorer tilgjengelig.</translation> </message> <message> - <source>Only connect to nodes in network <net> (ipv4, ipv6 or onion)</source> - <translation>Bare koble til noder i nettverket <net> (IPv4, IPv6 eller onion)</translation> - </message> - <message> - <source>Print this help message and exit</source> - <translation>Skriv ut denne hjelpemeldingen og avslutt</translation> - </message> - <message> - <source>Print version and exit</source> - <translation>Skriv ut denne versjonen og avslutt</translation> - </message> - <message> <source>Prune cannot be configured with a negative value.</source> <translation>Beskjæringsmodus kan ikke konfigureres med en negativ verdi.</translation> </message> @@ -3438,14 +3246,6 @@ <translation>Beskjæringsmodus er ikke kompatibel med -txindex.</translation> </message> <message> - <source>Rebuild chain state and block index from the blk*.dat files on disk</source> - <translation>Bygg opp igjen kjedetilstand og blokkindeks fra blk*.dat-filer på disk</translation> - </message> - <message> - <source>Rebuild chain state from the currently indexed blocks</source> - <translation>Bygg opp igjen kjedetilstand fra blokker som er indeksert nå</translation> - </message> - <message> <source>Replaying blocks...</source> <translation>Spiller av blokker igjen…</translation> </message> @@ -3454,14 +3254,6 @@ <translation>Spoler tilbake blokker…</translation> </message> <message> - <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> - <source>Specify wallet file (within data directory)</source> - <translation>Angi lommebokfil (inne i datamappe)</translation> - </message> - <message> <source>The source code is available from %s.</source> <translation>Kildekoden er tilgjengelig fra %s.</translation> </message> @@ -3494,14 +3286,6 @@ <translation>Oppgraderer UTXO-database</translation> </message> <message> - <source>Use UPnP to map the listening port (default: %u)</source> - <translation>Bruk UPnP for å sette opp lytteport (standardverdi: %u)</translation> - </message> - <message> - <source>Use the test chain</source> - <translation>Bruk testkjede</translation> - </message> - <message> <source>User Agent comment (%s) contains unsafe characters.</source> <translation>User Agent kommentar (%s) inneholder utrygge tegn.</translation> </message> @@ -3510,90 +3294,26 @@ <translation>Verifiserer blokker...</translation> </message> <message> - <source>Wallet debugging/testing options:</source> - <translation>Lommebok-feilretting/-testinnstillinger</translation> - </message> - <message> <source>Wallet needed to be rewritten: restart %s to complete</source> <translation>Lommeboka må skrives om: Start %s på nytt for å fullføre</translation> </message> <message> - <source>Wallet options:</source> - <translation>Valg for lommebok:</translation> - </message> - <message> - <source>Allow JSON-RPC connections from specified source. Valid for <ip> are a single IP (e.g. 1.2.3.4), a network/netmask (e.g. 1.2.3.4/255.255.255.0) or a network/CIDR (e.g. 1.2.3.4/24). This option can be specified multiple times</source> - <translation>Tillat JSON-RPC-tilkoblinger fra angitt kilde. Gyldig for <ip> er en enkelt IP (f. eks. 1.2.3.4), et nettverk/nettmaske (f. eks. 1.2.3.4/255.255.255.0) eller et nettverk/CIDR (f. eks. 1.2.3.4/24). Dette alternativet kan angis flere ganger</translation> - </message> - <message> - <source>Bind to given address and whitelist peers connecting to it. Use [host]:port notation for IPv6</source> - <translation>Bind til gitt adresse og hvitlist peers som kobler seg til den. Bruk [host]:port notasjon for IPv6</translation> - </message> - <message> - <source>Create new files with system default permissions, instead of umask 077 (only effective with disabled wallet functionality)</source> - <translation>Opprett nye filer med standardtillatelser i systemet, i stedet for umask 077 (kun virksom med lommebokfunksjonalitet slått av)</translation> - </message> - <message> - <source>Discover own IP addresses (default: 1 when listening and no -externalip or -proxy)</source> - <translation>Oppdag egne IP-adresser (standardverdi: 1 ved lytting og ingen -externalip eller -proxy)</translation> - </message> - <message> <source>Error: Listening for incoming connections failed (listen returned error %s)</source> <translation>Feil: Lytting etter innkommende tilkoblinger feilet (lytting returnerte feil %s)</translation> </message> <message> - <source>Execute command when a relevant alert is received or we see a really long fork (%s in cmd is replaced by message)</source> - <translation>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> - <source>Fees (in %s/kB) smaller than this are considered zero fee for relaying, mining and transaction creation (default: %s)</source> - <translation>Gebyrer (i %s/kB) mindre enn dette anses som null gebyr for videresending, graving og laging av transaksjoner (standardverdi: %s)</translation> - </message> - <message> - <source>If paytxfee is not set, include enough fee so transactions begin confirmation on average within n blocks (default: %u)</source> - <translation>Hvis paytxfee ikke er angitt, inkluderer da nok i gebyr til at transaksjoner gjennomsnittligt bekreftes innen n blokker (standardverdi: %u)</translation> - </message> - <message> <source>Invalid amount for -maxtxfee=<amount>: '%s' (must be at least the minrelay fee of %s to prevent stuck transactions)</source> <translation>Ugyldig beløp for -maxtxfee=<amount>: '%s' (må være minst minimum relé gebyr på %s for å hindre fastlåste transaksjoner)</translation> </message> <message> - <source>Maximum size of data in data carrier transactions we relay and mine (default: %u)</source> - <translation>Maksimal størrelse på data i databærende transaksjoner vi videresender og ufører graving på (standardverdi: %u)</translation> - </message> - <message> - <source>Randomize credentials for every proxy connection. This enables Tor stream isolation (default: %u)</source> - <translation>Bruk tilfeldig identitet for hver proxytilkobling. Dette muliggjør TOR stream isolasjon (standardverdi: %u)</translation> - </message> - <message> <source>The transaction amount is too small to send after the fee has been deducted</source> <translation>Transaksjonsbeløpet er for lite til å sendes etter at gebyret er fratrukket</translation> </message> <message> - <source>Whitelisted peers cannot be DoS banned and their transactions are always relayed, even if they are already in the mempool, useful e.g. for a gateway</source> - <translation>Hvitlistede noder kan ikke DoS-blokkeres, og deres transaksjoner videresendes alltid, selv om de allerede er i hukommelsespuljen. Nyttig f.eks. for en portner.</translation> - </message> - <message> <source>You need to rebuild the database using -reindex to go back to unpruned mode. This will redownload the entire blockchain</source> <translation>Du må gjenoppbygge databasen ved hjelp av -reindex for å gå tilbake til ubeskåret modus. Dette vil laste ned hele blokkjeden på nytt.</translation> </message> <message> - <source>(default: %u)</source> - <translation>(standardverdi: %u)</translation> - </message> - <message> - <source>Accept public REST requests (default: %u)</source> - <translation>Godta offentlige REST forespørsler (standardverdi: %u)</translation> - </message> - <message> - <source>Automatically create Tor hidden service (default: %d)</source> - <translation>Automatisk opprette Tor skjult tjeneste (standardverdi: %d)</translation> - </message> - <message> - <source>Connect through SOCKS5 proxy</source> - <translation>Koble til via SOCKS5-proxy</translation> - </message> - <message> <source>Error loading %s: You can't disable HD on an already existing HD wallet</source> <translation>Feil ved innlasting av %s: Du kan ikke skru av HD på ei HD-lommebok som allerede finnes</translation> </message> @@ -3606,10 +3326,6 @@ <translation>Feil ved oppgradering av kjedetilstandsdatabase</translation> </message> <message> - <source>Imports blocks from external blk000??.dat file on startup</source> - <translation>Importerer blokker fra ekstern fil blk000??.dat ved oppstart</translation> - </message> - <message> <source>Information</source> <translation>Informasjon</translation> </message> @@ -3630,44 +3346,28 @@ <translation>Ugyldig nettmaske spesifisert i -whitelist: '%s'</translation> </message> <message> - <source>Keep at most <n> unconnectable transactions in memory (default: %u)</source> - <translation>Hold på det meste <n> transaksjoner som ikke kobles i minnet (standardverdi: %u)</translation> - </message> - <message> <source>Need to specify a port with -whitebind: '%s'</source> <translation>Må oppgi en port med -whitebind: '%s'</translation> </message> <message> - <source>Node relay options:</source> - <translation>Node alternativer for videresending:</translation> - </message> - <message> - <source>RPC server options:</source> - <translation>Innstillinger for RPC-tjener:</translation> - </message> - <message> <source>Reducing -maxconnections from %d to %d, because of system limitations.</source> <translation>Reduserer -maxconnections fra %d til %d, pga. systembegrensninger.</translation> </message> <message> - <source>Rescan the block chain for missing wallet transactions on startup</source> - <translation>Se gjennom blokkjeden etter manglende lommeboktransaksjoner ved oppstart</translation> - </message> - <message> - <source>Send trace/debug info to console instead of debug.log file</source> - <translation>Send spor-/feilsøkingsinformasjon til konsollen istedenfor filen debug.log</translation> + <source>Signing transaction failed</source> + <translation>Signering av transaksjon feilet</translation> </message> <message> - <source>Show all debugging options (usage: --help -help-debug)</source> - <translation>Vis alle feilsøkingsvalg (bruk: --help -help-debug)</translation> + <source>Specified -walletdir "%s" does not exist</source> + <translation>Oppgitt -walletdir "%s" eksisterer ikke</translation> </message> <message> - <source>Shrink debug.log file on client startup (default: 1 when no -debug)</source> - <translation>Krymp filen debug.log når klienten starter (standardverdi: 1 hvis uten -debug)</translation> + <source>Specified -walletdir "%s" is a relative path</source> + <translation>Oppgitt -walletdir "%s" er en relativ sti</translation> </message> <message> - <source>Signing transaction failed</source> - <translation>Signering av transaksjon feilet</translation> + <source>Specified -walletdir "%s" is not a directory</source> + <translation>Oppgitt -walletdir "%s" er ikke en katalog</translation> </message> <message> <source>The transaction amount is too small to pay the fee</source> @@ -3678,14 +3378,6 @@ <translation>Dette er eksperimentell programvare.</translation> </message> <message> - <source>Tor control port password (default: empty)</source> - <translation>Passord for Tor-kontrollport (standardverdi: tom)</translation> - </message> - <message> - <source>Tor control port to use if onion listening enabled (default: %s)</source> - <translation>Tor-kontrollport å bruke hvis onion-lytting er aktivert (standardverdi: %s)</translation> - </message> - <message> <source>Transaction amount too small</source> <translation>Transaksjonen er for liten</translation> </message> @@ -3702,18 +3394,18 @@ <translation>Kan ikke binde til %s på denne datamaskinen (binding returnerte feilen %s)</translation> </message> <message> - <source>Upgrade wallet to latest format on startup</source> - <translation>Oppgrader lommebok til nyeste format ved oppstart</translation> - </message> - <message> - <source>Username for JSON-RPC connections</source> - <translation>Brukernavn for JSON-RPC forbindelser</translation> + <source>Unable to generate initial keys</source> + <translation>Klarte ikke lage første nøkkel</translation> </message> <message> <source>Verifying wallet(s)...</source> <translation>Lommebokbekreftelse pågår…</translation> </message> <message> + <source>Wallet %s resides outside wallet directory %s</source> + <translation>Lommebok %s befinner seg utenfor lommebokkatalog %s</translation> + </message> + <message> <source>Warning</source> <translation>Advarsel</translation> </message> @@ -3722,98 +3414,18 @@ <translation>Advarsel: Ukjente nye regler aktivert (versionbit %i)</translation> </message> <message> - <source>Whether to operate in a blocks only mode (default: %u)</source> - <translation>Hvorvidt å operere i modus med kun blokker (standardverdi: %u)</translation> - </message> - <message> - <source>You need to rebuild the database using -reindex to change -txindex</source> - <translation>Du må bygge opp igjen databasen ved bruk av -reindex for å endre -txindex</translation> - </message> - <message> <source>Zapping all transactions from wallet...</source> <translation>Zapper alle transaksjoner fra lommeboken...</translation> </message> <message> - <source>ZeroMQ notification options:</source> - <translation>Valg for ZeroMQ-meldinger:</translation> - </message> - <message> - <source>Password for JSON-RPC connections</source> - <translation>Passord for JSON-RPC forbindelser</translation> - </message> - <message> - <source>Execute command when the best block changes (%s in cmd is replaced by block hash)</source> - <translation>Utfør kommando når beste blokk endrer seg (%s i kommandoen erstattes med blokkens hash)</translation> - </message> - <message> - <source>Allow DNS lookups for -addnode, -seednode and -connect</source> - <translation>Tillat oppslag i DNS for -addnode, -seednode og -connect</translation> - </message> - <message> - <source>(1 = keep tx meta data e.g. account owner and payment request information, 2 = drop tx meta data)</source> - <translation>(1 = behold metadata for transaksjon som f. eks. kontoeier og informasjon om betalingsanmodning, 2 = dropp metadata for transaksjon)</translation> - </message> - <message> <source>-maxtxfee is set very high! Fees this large could be paid on a single transaction.</source> <translation>-maxtxfee er satt veldig høyt! Så stort gebyr kan bli betalt ved en enkelt transaksjon.</translation> </message> <message> - <source>Bind to given address to listen for JSON-RPC connections. This option is ignored unless -rpcallowip is also passed. Port is optional and overrides -rpcport. Use [host]:port notation for IPv6. This option can be specified multiple times (default: 127.0.0.1 and ::1 i.e., localhost, or if -rpcallowip has been specified, 0.0.0.0 and :: i.e., all addresses)</source> - <translation>Bind til angitt adresse for lytting til JSON-RPC-tilkoblinger. Dette valget ses bort fra om ikke -rcpallowip også sendes. Port er valgfritt og overstyrer -rpcport. Bruk notasjon i formatet [host]:port for IPv6. Dette valget kan angis flere ganger (forvalg: 127.0.0.1 og ::1 ,altså, lokalvert, eller hvis -rpcallowip har blitt angitt, 0.0.0.0 og :: ,altså, alle adresser)</translation> - </message> - <message> - <source>Do not keep transactions in the mempool longer than <n> hours (default: %u)</source> - <translation>Ikke hold transaksjoner i minnet lenger enn <n> timer (standard: %u)</translation> - </message> - <message> - <source>Equivalent bytes per sigop in transactions for relay and mining (default: %u)</source> - <translation>Overenstemmende byte per sigop i transaksjoner for stafett og utvinning (forvalg: %u)</translation> - </message> - <message> <source>Error loading %s: You can't enable HD on an already existing non-HD wallet</source> <translation>Feil ved innlasting av %s: Du kan ikke skru på HD på ei ikke-HD-lommebok som allerede finnes</translation> </message> <message> - <source>Error loading wallet %s. -wallet parameter must only specify a filename (not a path).</source> - <translation>Feil under innlasting av lommeboka %s. -wallet parameter må kun angi et filnavn (ikke en sti).</translation> - </message> - <message> - <source>Fees (in %s/kB) smaller than this are considered zero fee for transaction creation (default: %s)</source> - <translation>Gebyrer (i %s/Kb) mindre enn dette anses som null gebyr for laging av transaksjoner (standardverdi: %s)</translation> - </message> - <message> - <source>Force relay of transactions from whitelisted peers even if they violate local relay policy (default: %d)</source> - <translation>Tving igjennom stafettransaksjoner av hvitlistede likemenn, selv når de ikke overholder lokal stafettpraksis (forvalg: %d)</translation> - </message> - <message> - <source>How thorough the block verification of -checkblocks is (0-4, default: %u)</source> - <translation>Hvor grundig blokkverifiseringen til -checkblocks er (0-4, standardverdi: %u)</translation> - </message> - <message> - <source>Maintain a full transaction index, used by the getrawtransaction rpc call (default: %u)</source> - <translation>Oppretthold en full transaksjonsindeks, brukt av getrawtransaction RPC-kall (standardverdi: %u)</translation> - </message> - <message> - <source>Number of seconds to keep misbehaving peers from reconnecting (default: %u)</source> - <translation>Antall sekunder noder med dårlig oppførsel hindres fra å koble til på nytt (standardverdi: %u)</translation> - </message> - <message> - <source>Output debugging information (default: %u, supplying <category> is optional)</source> - <translation>Ta ut feilsøkingsinformasjon (standardverdi: %u, bruk av <category> er valgfritt)</translation> - </message> - <message> - <source>Sets the serialization of raw transaction or block hex returned in non-verbose mode, non-segwit(0) or segwit(1) (default: %d)</source> - <translation>Setter serialisering av råtransaksjon eller heksadesimal verdi for blokk returnert i ikke-ordrikt modus, non-segwit(0) eller segwit(1) (forvalg: %d)</translation> - </message> - <message> - <source>Support filtering of blocks and transaction with bloom filters (default: %u)</source> - <translation>Støtte filtrering av blokker og transaksjoner med bloomfiltre (standardverdi: %u)</translation> - </message> - <message> - <source>The fee rate (in %s/kB) that indicates your tolerance for discarding change by adding it to the fee (default: %s). Note: An output is discarded if it is dust at this rate, but we will always discard up to the dust relay fee and a discard fee above that is limited by the fee estimate for the longest target</source> - <translation>Gebyrtakst (i %s(kB) som indikerer din toleranse for å avslå veksel ved å legge det til gebyret (forvalg: %s). Merk: Otdata avslås hvis det er støv på dette nivået, men det vil alltid bli avslått opptil hva støv-nivået er for stafettoppsettet, og gebyravslag uver det begrenses av gebyroverslaget for det lengste målet</translation> - </message> - <message> <source>This is the transaction fee you may pay when fee estimates are not available.</source> <translation>Dette er transaksjonsgebyret du kan betale når gebyranslag ikke er tilgjengelige.</translation> </message> @@ -3826,10 +3438,6 @@ <translation>Total lengde av nettverks-versionstreng (%i) er over maks lengde (%i). Reduser tallet eller størrelsen av uacomments.</translation> </message> <message> - <source>Tries to keep outbound traffic under the given target (in MiB per 24h), 0 = no limit (default: %d)</source> - <translation>Prøv å holde utgående trafikk under angitt mål (i MB per 24t), 0 = ingen grense (standard: %d)</translation> - </message> - <message> <source>Unsupported argument -socks found. Setting SOCKS version isn't possible anymore, only SOCKS5 proxies are supported.</source> <translation>Argumentet -socks er ikke støttet. Det er ikke lenger mulig å sette SOCKS-versjon; bare SOCKS5-proxyer er støttet.</translation> </message> @@ -3838,10 +3446,6 @@ <translation>Argumentet -whitelistalwaysrelay støttes ikke, og blir ignorert, bruk -whitelistrelay og/eller -whitelistforcerelay.</translation> </message> <message> - <source>Use separate SOCKS5 proxy to reach peers via Tor hidden services (default: %s)</source> - <translation>Bruk separate SOCKS5 proxyer for å nå noder via Tor skjulte tjenester (standardverdi: %s)</translation> - </message> - <message> <source>Warning: Unknown block versions being mined! It's possible unknown rules are in effect</source> <translation>Advarsel: Ukjente blokkversjoner blir utvunnet! Det er mulig ukjente regler er i spill</translation> </message> @@ -3850,110 +3454,18 @@ <translation>Advarsel: Lommeboksfil skadet, data berget! Original %s lagret som %s i %s; hvis din saldo eller transaksjoner er uriktige, bør du gjenopprette fra sikkerhetskopi.</translation> </message> <message> - <source>Whitelist peers connecting from the given IP address (e.g. 1.2.3.4) or CIDR notated network (e.g. 1.2.3.0/24). Can be specified multiple times.</source> - <translation>Hvitlist brukere som kobler til fra en gitt IP-adresse (e.g. 1.2.3.4) eller nettverk med CIDR-notasjon (f.eks. 1.2.3.0/24). Kan angis mange ganger.</translation> - </message> - <message> <source>%s is set very high!</source> <translation>%s er satt veldig høyt!</translation> </message> <message> - <source>(default: %s)</source> - <translation>(standardverdi: %s)</translation> - </message> - <message> - <source>Always query for peer addresses via DNS lookup (default: %u)</source> - <translation>Alltid søk etter nodeadresser via DNS-oppslag (standardverdi: %u)</translation> - </message> - <message> - <source>Error loading wallet %s. -wallet filename must be a regular file.</source> - <translation>Feil under innlasting av lommeboka %s. -lommebokfilnavn må være ei vanlig fil.</translation> - </message> - <message> <source>Error loading wallet %s. Duplicate -wallet filename specified.</source> <translation>Feil ved innlasting av lommeboka %s. Duplisert -wallet -filnavn angitt.</translation> </message> <message> - <source>Error loading wallet %s. Invalid characters in -wallet filename.</source> - <translation>Feil ved innlasting av lommeboka %s. Ugyldige tegn i -wallet filename.</translation> - </message> - <message> - <source>How many blocks to check at startup (default: %u, 0 = all)</source> - <translation>Hvor mange blokker skal sjekkes ved oppstart (standardverdi: %u, 0 = alle)</translation> - </message> - <message> - <source>Include IP addresses in debug output (default: %u)</source> - <translation>Inkludere IP-adresser i feilsøkingslogg (standardverdi: %u)</translation> - </message> - <message> <source>Keypool ran out, please call keypoolrefill first</source> <translation>Nøkkelpuljen gikk tom, kall keypoolrefill først</translation> </message> <message> - <source>Listen for JSON-RPC connections on <port> (default: %u or testnet: %u)</source> - <translation>Lytt etter JSON-RPC tilkoblinger på <port> (standardverdi: %u eller testnett: %u)</translation> - </message> - <message> - <source>Listen for connections on <port> (default: %u or testnet: %u)</source> - <translation>Lytt etter tilkoblinger på <port> (standardverdi: %u eller testnett: %u)</translation> - </message> - <message> - <source>Maintain at most <n> connections to peers (default: %u)</source> - <translation>Hold maks <n> koblinger åpne til andre noder (standardverdi: %u)</translation> - </message> - <message> - <source>Make the wallet broadcast transactions</source> - <translation>Få lommeboken til å kringkaste transaksjoner</translation> - </message> - <message> - <source>Maximum per-connection receive buffer, <n>*1000 bytes (default: %u)</source> - <translation>Maks mottaksbuffer per forbindelse, <n>*1000 bytes (standardverdi: %u)</translation> - </message> - <message> - <source>Maximum per-connection send buffer, <n>*1000 bytes (default: %u)</source> - <translation>Maks sendebuffer per forbindelse, <n>*1000 bytes (standardverdi: %u)</translation> - </message> - <message> - <source>Prepend debug output with timestamp (default: %u)</source> - <translation>Sett inn tidsstempel i front av feilsøkingsdata (standardverdi: %u)</translation> - </message> - <message> - <source>Relay and mine data carrier transactions (default: %u)</source> - <translation>Videresend og ufør graving av databærende transaksjoner (standardverdi: %u)</translation> - </message> - <message> - <source>Relay non-P2SH multisig (default: %u)</source> - <translation>Videresend ikke-P2SH multisig (standardverdi: %u)</translation> - </message> - <message> - <source>Set key pool size to <n> (default: %u)</source> - <translation>Angi størrelse på nøkkel-lager til <n> (forvalg: %u)</translation> - </message> - <message> - <source>Set maximum BIP141 block weight (default: %d)</source> - <translation>Sett maksimal BIP141-blokkvekt (forvalg: %d)</translation> - </message> - <message> - <source>Set the number of threads to service RPC calls (default: %d)</source> - <translation>Sett antall tråder til betjening av RPC-kall (standardverdi: %d)</translation> - </message> - <message> - <source>Specify configuration file (default: %s)</source> - <translation>Angi konfigurasjonsfil (standardverdi: %s)</translation> - </message> - <message> - <source>Specify connection timeout in milliseconds (minimum: 1, default: %d)</source> - <translation>Angi tidsavbrudd for forbindelse i millisekunder (minimum: 1, standardverdi: %d)</translation> - </message> - <message> - <source>Specify pid file (default: %s)</source> - <translation>Angi pid-fil (standardverdi: %s)</translation> - </message> - <message> - <source>Spend unconfirmed change when sending transactions (default: %u)</source> - <translation>Bruk ubekreftet veksel ved sending av transaksjoner (standardverdi: %u)</translation> - </message> - <message> <source>Starting network threads...</source> <translation>Starter nettverkstråder…</translation> </message> @@ -3970,10 +3482,6 @@ <translation>Dette er transaksjonsgebyret du betaler som forsender av transaksjon.</translation> </message> <message> - <source>Threshold for disconnecting misbehaving peers (default: %u)</source> - <translation>Grenseverdi for å koble fra noder med dårlig oppførsel (standardverdi: %u)</translation> - </message> - <message> <source>Transaction amounts must not be negative</source> <translation>Transaksjonsbeløpet kan ikke være negativt</translation> </message> diff --git a/src/qt/locale/bitcoin_ne.ts b/src/qt/locale/bitcoin_ne.ts index 903a834f8c..4da7d64cee 100644 --- a/src/qt/locale/bitcoin_ne.ts +++ b/src/qt/locale/bitcoin_ne.ts @@ -436,10 +436,6 @@ <context> <name>bitcoin-core</name> <message> - <source>Delete all wallet transactions and only recover those parts of the blockchain through -rescan on startup</source> - <translation>वालेटको सबै कारोबार मेटाउनुहोस् र -स्टार्टअपको पुनः स्क्यान मार्फत ब्लकचेनका ती भागहरूलाई मात्र पुनः प्राप्त गर्नुहोस्</translation> - </message> - <message> <source>The block database contains a block which appears to be from the future. This may be due to your computer's date and time being set incorrectly. Only rebuild the block database if you are sure that your computer's date and time are correct</source> <translation>ब्लक डाटाबेसमा भविष्यबाट आए जस्तो देखिने एउटा ब्लक हुन्छ । तपाईंको कम्प्युटरको मिति र समय गलत तरिकाले सेट गरिएकाले यस्तो हुन सक्छ । तपाईं आफ्नो कम्प्युटरको मिति र समय सही छ भनेर पक्का हुनुहुन्छ भने मात्र ब्लक डाटाबेस पुनर्निर्माण गर्नुहोस् ।</translation> </message> @@ -448,10 +444,6 @@ <translation>प्रि-फर्क अवस्थामा डाटाबेस रिवाइन्ड गर्न सकिएन । तपाईंले फेरि ब्लकचेन डाउनलोड गर्नु पर्ने हुन्छ</translation> </message> <message> - <source>Use UPnP to map the listening port (default: 1 when listening and no -proxy)</source> - <translation>UPnP प्रयोग गरेर सुन्ने पोर्टलाई म्याप गर्नुहोस् (सुन्दा र -प्रोक्सी नहुँदा डिफल्ट: 1)</translation> - </message> - <message> <source>%s corrupt, salvage failed</source> <translation>%s मा क्षति, बचाव विफल भयो</translation> </message> @@ -460,22 +452,6 @@ <translation>-maxmempool कम्तिमा %d MB को हुनुपर्छ ।</translation> </message> <message> - <source><category> can be:</source> - <translation>&lt;वर्ग&gt; निम्न आकारको हुनसक्छ:</translation> - </message> - <message> - <source>Append comment to the user agent string</source> - <translation>प्रयोगकर्ता एजेन्ट स्ट्रिङमा टिप्पणी जोड्नुहोस्</translation> - </message> - <message> - <source>Attempt to recover private keys from a corrupt wallet on startup</source> - <translation>स्टार्टअपमा क्षति पूगेको वालेटबाट निजी की प्राप्त गर्न प्रयास गर्नुहोस्</translation> - </message> - <message> - <source>Block creation options:</source> - <translation>ब्लक सिर्जनाको बिकल्प:</translation> - </message> - <message> <source>Cannot resolve -%s address: '%s'</source> <translation>-%s ठेगाना: &apos;%s&apos; निश्चय गर्न सकिँदैन</translation> </message> @@ -484,10 +460,6 @@ <translation>सूचकांक परिवर्तन सीमा भन्दा बाहर</translation> </message> <message> - <source>Connection options:</source> - <translation>कनेक्सनको विकल्प:</translation> - </message> - <message> <source>Copyright (C) %i-%i</source> <translation>सर्वाधिकार (C) %i-%i</translation> </message> @@ -496,14 +468,6 @@ <translation>क्षति पुगेको ब्लक डाटाबेस फेला पर</translation> </message> <message> - <source>Debugging/Testing options:</source> - <translation>डिबगिङ/परीक्षणका विकल्पहरू:</translation> - </message> - <message> - <source>Do not load the wallet and disable wallet RPC calls</source> - <translation>वालेट लोड नगर्नुहोस् र वालेट RPC कलहरू अक्षम गर्नुहोस्</translation> - </message> - <message> <source>Do you want to rebuild the block database now?</source> <translation>तपाईं अहिले ब्लक डेटाबेस पुनर्निर्माण गर्न चाहनुहुन्छ ?</translation> </message> @@ -524,78 +488,26 @@ <translation>असमर्थित तर्क -टोर फेला पर्यो, -ओनियन प्रयोग गर्नुहोस् । </translation> </message> <message> - <source>Use UPnP to map the listening port (default: %u)</source> - <translation>UPnP प्रयोग गरेर सुन्ने पोर्ट म्याप गर्नुहोस् (डिफल्ट: %u) </translation> - </message> - <message> <source>Verifying blocks...</source> <translation>ब्लक प्रमाणित गरिँदै...</translation> </message> <message> - <source>Wallet debugging/testing options:</source> - <translation>वालेट डिबगिङ/परीक्षणका विकल्पहरू:</translation> - </message> - <message> <source>Wallet needed to be rewritten: restart %s to complete</source> <translation>वालेट फेरि लेख्नु आवश्यक छ: पूरा गर्न %s लाई पुन: सुरु गर्नुहोस्</translation> </message> <message> - <source>Wallet options:</source> - <translation>वालेटका विकल्पहरू:</translation> - </message> - <message> - <source>Allow JSON-RPC connections from specified source. Valid for <ip> are a single IP (e.g. 1.2.3.4), a network/netmask (e.g. 1.2.3.4/255.255.255.0) or a network/CIDR (e.g. 1.2.3.4/24). This option can be specified multiple times</source> - <translation>निर्दिष्ट गरिएको स्रोतबाट आएको JSON-RPC कनेक्सनलाई अनुमति दिनुहोस् । एकल IP (e.g. 1.2.3.4), नेटवर्क/नेटमास्क (उदाहरण 1.2.3.4/255.255.255.0) वा नेटवर्क/CIDR (उदाहरण 1.2.3.4/24) &lt;ip&gt; का लागि मान्य छन् । यो विकल्पलाई धेरै पटक निर्दिष्ट गर्न सकिन्छ</translation> - </message> - <message> - <source>Bind to given address and whitelist peers connecting to it. Use [host]:port notation for IPv6</source> - <translation>दिइएको ठेगानामा बाँध्नुहोस् र यसमा कनेक्ट गर्ने सहकर्मीलाई श्वेतसूचीमा राख्नुहोस् । IPv6 लागि [होस्ट]:पोर्ट संकेतन प्रयोग गर्नुहोस्</translation> - </message> - <message> - <source>Create new files with system default permissions, instead of umask 077 (only effective with disabled wallet functionality)</source> - <translation>umask 077 को सट्टामा प्रणालीको डिफल्ट अनुमतिको साथमा नयाँ फाइलहरू सिर्जना गर्नुहोस् । (असक्षम गरिएको वालेट कार्यक्षमतामा मात्र प्रभावकारी हुने)</translation> - </message> - <message> - <source>Discover own IP addresses (default: 1 when listening and no -externalip or -proxy)</source> - <translation>आफ्नै IP ठेगाना पत्ता लगाउनुहोस् (सुन्दा र -बाहिरीआइपी वा -प्रोक्सी नहुँदा डिफल्ट: 1 )</translation> - </message> - <message> <source>Error: Listening for incoming connections failed (listen returned error %s)</source> <translation>त्रुटि: आगमन कनेक्सनमा सुन्ने कार्य असफल भयो (सुन्ने कार्यले त्रुटि %s फर्कायो)</translation> </message> <message> - <source>Execute command when a relevant alert is received or we see a really long fork (%s in cmd is replaced by message)</source> - <translation>सान्दर्भिक चेतावनी प्राप्त गर्दा आदेश कार्यान्वयन गर्नुहोस् नभए धेरै लामो फोर्क देखा पर्न सक्छ । (cmd को %s लाई सन्देशले प्रतिस्थापन गर्छ)</translation> - </message> - <message> - <source>Fees (in %s/kB) smaller than this are considered zero fee for relaying, mining and transaction creation (default: %s)</source> - <translation>रिले, खनन वा कारोबारको सिर्जनाको लागि यो भन्दा कम शुल्क (%s/kB मा) लाई शून्य शुल्कको रूपमा लिइन्छ । (डिफल्ट: %s)</translation> - </message> - <message> - <source>If paytxfee is not set, include enough fee so transactions begin confirmation on average within n blocks (default: %u)</source> - <translation>paytxfee सेट गरिएको छैन भने, औसतमा n ब्लक भित्र कारोबार पुष्टिकरण सुरु होस् भन्नका लागि पर्याप्त शुल्क समावेश गर्नुहोस् (डिफल्ट: %u)</translation> - </message> - <message> <source>Invalid amount for -maxtxfee=<amount>: '%s' (must be at least the minrelay fee of %s to prevent stuck transactions)</source> <translation>maxtxfee=&lt;रकम&gt;: का लागि अमान्य रकम &apos;%s&apos; (कारोबारलाई अड्कन नदिन अनिवार्य रूपमा कम्तिमा %s को न्यूनतम रिले शुल्क हुनु पर्छ)</translation> </message> <message> - <source>Maximum size of data in data carrier transactions we relay and mine (default: %u)</source> - <translation>हामीले रिले र खनन गर्ने डाटा वाहक कारोबारको डाटाको अधिकतम आकार (डिफल्ट: %u)</translation> - </message> - <message> - <source>Randomize credentials for every proxy connection. This enables Tor stream isolation (default: %u)</source> - <translation>हरेक प्रोक्सी कनेक्सनका लागि क्रेडिन्सियल अनियमित बनाउनुहोस् । यसले टोर स्ट्रिमको अलगावलाई सक्षम पार्छ (डिफल्ट: %u)</translation> - </message> - <message> <source>The transaction amount is too small to send after the fee has been deducted</source> <translation>कारोबार रकम शुल्क कटौती गरेपछि पठाउँदा धेरै नै सानो हुन्छ</translation> </message> <message> - <source>Whitelisted peers cannot be DoS banned and their transactions are always relayed, even if they are already in the mempool, useful e.g. for a gateway</source> - <translation>श्वेतसूचीका सहकर्मी पहिलैबाट मेमपूल, उपयोगीमा भए पनि उनीहरूलाई DoS banned गर्न सकिँदैन र उनीहरूको कारोबार सधैं रिले हुन्छ, उदाहरण, गेटवेको लाग</translation> - </message> - <message> <source>You need to rebuild the database using -reindex to go back to unpruned mode. This will redownload the entire blockchain</source> <translation>तपाईंले काटछाँट नगरेको मोडमा जान पुनः सूचकांक प्रयोग गरेर डाटाबेस पुनर्निर्माण गर्नु पर्ने हुन्छ । यसले सम्पूर्ण ब्लकचेनलाई फेरि डाउनलोड गर्नेछ</translation> </message> diff --git a/src/qt/locale/bitcoin_nl.ts b/src/qt/locale/bitcoin_nl.ts index 685b1583b8..b495eeaf51 100644 --- a/src/qt/locale/bitcoin_nl.ts +++ b/src/qt/locale/bitcoin_nl.ts @@ -30,6 +30,10 @@ <translation>Verwijder het geselecteerde adres van de lijst</translation> </message> <message> + <source>Enter address or label to search</source> + <translation>Vul adres of label in om te zoeken</translation> + </message> + <message> <source>Export the data in the current tab to a file</source> <translation>Exporteer de data in de huidige tab naar een bestand</translation> </message> @@ -71,11 +75,11 @@ </message> <message> <source>&Copy Address</source> - <translation>&Kopiëer Adres</translation> + <translation>&Kopiëer adres</translation> </message> <message> <source>Copy &Label</source> - <translation>Kopieer &Label</translation> + <translation>Kopieer &label</translation> </message> <message> <source>&Edit</source> @@ -299,11 +303,11 @@ </message> <message> <source>&Encrypt Wallet...</source> - <translation>&Versleutel Portemonnee...</translation> + <translation>&Versleutel portemonnee...</translation> </message> <message> <source>&Backup Wallet...</source> - <translation>&Backup Portemonnee...</translation> + <translation>&Backup portemonnee...</translation> </message> <message> <source>&Change Passphrase...</source> @@ -322,6 +326,14 @@ <translation>Open &URI...</translation> </message> <message> + <source>Wallet:</source> + <translation>Portemonnee:</translation> + </message> + <message> + <source>default wallet</source> + <translation>standaard portemonnee</translation> + </message> + <message> <source>Click to disable network activity.</source> <translation>Klik om de netwerkactiviteit te stoppen.</translation> </message> @@ -335,13 +347,17 @@ </message> <message> <source>Syncing Headers (%1%)...</source> - <translation>Kopteksten synchroniseren (%1%)...</translation> + <translation>Blokhoofden synchroniseren (%1%)...</translation> </message> <message> <source>Reindexing blocks on disk...</source> <translation>Bezig met herindexeren van blokken op harde schijf...</translation> </message> <message> + <source>Proxy is <b>enabled</b>: %1</source> + <translation>Proxy is <b>ingeschakeld</b>: %1</translation> + </message> + <message> <source>Send coins to a Bitcoin address</source> <translation>Verstuur munten naar een Bitcoinadres</translation> </message> @@ -383,7 +399,7 @@ </message> <message> <source>&Show / Hide</source> - <translation>&Toon / Verberg</translation> + <translation>&Toon / verberg</translation> </message> <message> <source>Show or hide the main Window</source> @@ -491,7 +507,7 @@ </message> <message> <source>Connecting to peers...</source> - <translation>Gelijke worden verbonden...</translation> + <translation>Verbinden met peers...</translation> </message> <message> <source>Catching up...</source> @@ -510,6 +526,12 @@ </translation> </message> <message> + <source>Wallet: %1 +</source> + <translation>Portemonnee: %1 +</translation> + </message> + <message> <source>Type: %1 </source> <translation>Type: %1 @@ -576,7 +598,7 @@ </message> <message> <source>Fee:</source> - <translation>Transactiekosten:</translation> + <translation>Vergoeding:</translation> </message> <message> <source>Dust:</source> @@ -711,7 +733,7 @@ <name>EditAddressDialog</name> <message> <source>Edit Address</source> - <translation>Bewerk Adres</translation> + <translation>Bewerk adres</translation> </message> <message> <source>&Label</source> @@ -730,10 +752,6 @@ <translation>&Adres</translation> </message> <message> - <source>New receiving address</source> - <translation>Nieuw ontvangstadres</translation> - </message> - <message> <source>New sending address</source> <translation>Nieuw verzendadres</translation> </message> @@ -750,8 +768,12 @@ <translation>Het opgegeven adres "%1" is een ongeldig Bitcoinadres.</translation> </message> <message> - <source>The entered address "%1" is already in the address book.</source> - <translation>Het opgegeven adres "%1" bestaat al in uw adresboek.</translation> + <source>Address "%1" already exists as a receiving address with label "%2" and so cannot be added as a sending address.</source> + <translation>Adres "%1" bestaat al als ontvang adres met label "%2" en kan dus niet toegevoegd worden als verzend adres.</translation> + </message> + <message> + <source>The entered address "%1" is already in the address book with label "%2".</source> + <translation>Het opgegeven adres "%1" bestaat al in uw adresboek onder label "%2".</translation> </message> <message> <source>Could not unlock wallet.</source> @@ -803,42 +825,6 @@ <source>Command-line options</source> <translation>Opdrachtregelopties</translation> </message> - <message> - <source>Usage:</source> - <translation>Gebruik:</translation> - </message> - <message> - <source>command-line options</source> - <translation>opdrachtregelopties</translation> - </message> - <message> - <source>UI Options:</source> - <translation>UI-opties:</translation> - </message> - <message> - <source>Choose data directory on startup (default: %u)</source> - <translation>Kies gegevensmap bij opstarten (standaard: %u)</translation> - </message> - <message> - <source>Set language, for example "de_DE" (default: system locale)</source> - <translation>Stel taal in, bijvoorbeeld "nl_NL" (standaard: systeemlocale)</translation> - </message> - <message> - <source>Start minimized</source> - <translation>Geminimaliseerd starten</translation> - </message> - <message> - <source>Set SSL root certificates for payment request (default: -system-)</source> - <translation>Zet SSL-rootcertificaat voor betalingsverzoeken (standaard: -systeem-)</translation> - </message> - <message> - <source>Show splash screen on startup (default: %u)</source> - <translation>Toon opstartscherm bij opstarten (standaard: %u)</translation> - </message> - <message> - <source>Reset all settings changed in the GUI</source> - <translation>Reset alle wijzigingen aan instellingen gedaan in de GUI</translation> - </message> </context> <context> <name>Intro</name> @@ -864,7 +850,7 @@ </message> <message> <source>If you have chosen to limit block chain storage (pruning), the historical data must still be downloaded and processed, but will be deleted afterward to keep your disk usage low.</source> - <translation>Als u gekozen heeft om de block chain opslag te beperken (pruning), dan moet de historische data nog steeds gedownload en verwerkt worden, maar zal verwijderd worden naderhand om schijf gebruik zo laag mogelijk te houden.</translation> + <translation>Als u gekozen heeft om de blokketenopslag te beperken (pruning), dan moet de historische data nog steeds gedownload en verwerkt worden, maar zal verwijderd worden naderhand om schijf gebruik zo laag mogelijk te houden.</translation> </message> <message> <source>Use the default data directory</source> @@ -919,7 +905,7 @@ </message> <message> <source>Recent transactions may not yet be visible, and therefore your wallet's balance might be incorrect. This information will be correct once your wallet has finished synchronizing with the bitcoin network, as detailed below.</source> - <translation>Recente transacties zijn mogelijk nog niet zichtbaar. De balans van de geldbeugel is daarom mogelijk niet correct. Deze informatie is correct van zodra de synchronisatie met het Bitcoin-netwerk werd voltooid, zoals onderaan beschreven.</translation> + <translation>Recente transacties zijn mogelijk nog niet zichtbaar. De balans van de portemonnee is daarom mogelijk niet correct. Deze informatie is correct van zodra de synchronisatie met het Bitcoin-netwerk werd voltooid, zoals onderaan beschreven.</translation> </message> <message> <source>Attempting to spend bitcoins that are affected by not-yet-displayed transactions will not be accepted by the network.</source> @@ -959,7 +945,7 @@ </message> <message> <source>Unknown. Syncing Headers (%1)...</source> - <translation>Onbekend. Kopteksten synchroniseren (%1%)...</translation> + <translation>Onbekend. Blokhoofden synchroniseren (%1%)...</translation> </message> </context> <context> @@ -1024,6 +1010,10 @@ <translation>Toont aan of de aangeleverde standaard SOCKS5 proxy gebruikt word om peers te bereiken via dit netwerktype.</translation> </message> <message> + <source>Use separate SOCKS&5 proxy to reach peers via Tor hidden services:</source> + <translation>Gebruik aparte SOCKS&5-proxy om peers te bereiken via verborgen Tor-diensten:</translation> + </message> + <message> <source>Hide the icon from the system tray.</source> <translation>Verberg het icoon van de systeembalk.</translation> </message> @@ -1037,7 +1027,7 @@ </message> <message> <source>Third party URLs (e.g. a block explorer) that appear in the transactions tab as context menu items. %s in the URL is replaced by transaction hash. Multiple URLs are separated by vertical bar |.</source> - <translation>URL's van derden (bijvoorbeeld block explorer) die in de transacties tab verschijnen als contextmenuelementen. %s in de URL is vervangen door transactiehash. Verscheidene URL's zijn gescheiden door een verticale streep |. </translation> + <translation>URL's van derden (bijvoorbeeld blokexplorer) die in de transacties tab verschijnen als contextmenuelementen. %s in de URL is vervangen door transactiehash. Verscheidene URL's zijn gescheiden door een verticale streep |. </translation> </message> <message> <source>Active command-line options that override above options:</source> @@ -1057,13 +1047,29 @@ </message> <message> <source>&Reset Options</source> - <translation>&Reset Opties</translation> + <translation>&Reset opties</translation> </message> <message> <source>&Network</source> <translation>&Netwerk</translation> </message> <message> + <source>Disables some advanced features but all blocks will still be fully validated. Reverting this setting requires re-downloading the entire blockchain. Actual disk usage may be somewhat higher.</source> + <translation>Geavanceerde functionaliteit wordt uitgeschakeld maar alle blokken worden nog steed volledig gevalideerd. Om deze instelling weer ongedaan te maken, moet de volledige blockchain opnieuw gedownload worden. Schijfgebruik kan iets toenemen.</translation> + </message> + <message> + <source>Prune &block storage to</source> + <translation>Prune & block opslag op</translation> + </message> + <message> + <source>GB</source> + <translation>GB</translation> + </message> + <message> + <source>Reverting this setting requires re-downloading the entire blockchain.</source> + <translation>Deze instelling terugzetten vereist het opnieuw downloaden van de gehele blockchain.</translation> + </message> + <message> <source>(0 = auto, <0 = leave that many cores free)</source> <translation>(0 = auto, <0 = laat dit aantal kernen vrij)</translation> </message> @@ -1077,7 +1083,7 @@ </message> <message> <source>Enable coin &control features</source> - <translation>Coin &Control activeren</translation> + <translation>Coin &control activeren</translation> </message> <message> <source>If you disable the spending of unconfirmed change, the change from a transaction cannot be used until that transaction has at least one confirmation. This also affects how your balance is computed.</source> @@ -1165,7 +1171,7 @@ </message> <message> <source>User Interface &language:</source> - <translation>Taal &Gebruikersinterface:</translation> + <translation>Taal &gebruikersinterface:</translation> </message> <message> <source>The user interface language can be set here. This setting will take effect after restarting %1.</source> @@ -1189,7 +1195,7 @@ </message> <message> <source>&OK</source> - <translation>&OK</translation> + <translation>&Oké</translation> </message> <message> <source>&Cancel</source> @@ -1221,7 +1227,7 @@ </message> <message> <source>The configuration file is used to specify advanced user options which override GUI settings. Additionally, any command-line options will override this configuration file.</source> - <translation>Het bevestigingsbestand wordt gebruikt om geavanceerde gebruikersopties te specificeren welke de GUI instellingen overschrijd. Daarnaast, zullen alle command-line opties dit configuratiebestand overschrijven.</translation> + <translation>Het configuratiebestand wordt gebruikt om geavanceerde gebruikersopties te specificeren welke de GUI instellingen overschrijd. Daarnaast, zullen alle command-line opties dit configuratiebestand overschrijven.</translation> </message> <message> <source>Error</source> @@ -1330,6 +1336,10 @@ <translation>URI-behandeling</translation> </message> <message> + <source>'bitcoin://' is not a valid URI. Use 'bitcoin:' instead.</source> + <translation>'bitcoin://' is niet een geldige URI. Gebruik 'bitcoin:' in plaats daarvan.</translation> + </message> + <message> <source>Payment request fetch URL is invalid: %1</source> <translation>URL om betalingsverzoek te verkrijgen is ongeldig: %1</translation> </message> @@ -1527,12 +1537,16 @@ <context> <name>QObject::QObject</name> <message> + <source>Error parsing command line arguments: %1.</source> + <translation>Fout bij het parsen van command line arguments: %1.</translation> + </message> + <message> <source>Error: Specified data directory "%1" does not exist.</source> <translation>Fout: Opgegeven gegevensmap "%1" bestaat niet.</translation> </message> <message> - <source>Error: Cannot parse configuration file: %1. Only use key=value syntax.</source> - <translation>Fout: Kan configuratiebestand niet verwerken: %1. Gebruik enkel de key=value syntax.</translation> + <source>Error: Cannot parse configuration file: %1.</source> + <translation>Fout: Kan niet het configuratie bestand parsen: %1.</translation> </message> <message> <source>Error: %1</source> @@ -1625,6 +1639,14 @@ <translation>Geheugengebruik</translation> </message> <message> + <source>Wallet: </source> + <translation>Portemonnee:</translation> + </message> + <message> + <source>(none)</source> + <translation>(geen)</translation> + </message> + <message> <source>&Reset</source> <translation>&Reset</translation> </message> @@ -1790,7 +1812,11 @@ </message> <message> <source>&Unban</source> - <translation>&Maak ban voor Node ongedaan</translation> + <translation>&Maak ban voor node ongedaan</translation> + </message> + <message> + <source>default wallet</source> + <translation>standaard portemonnee</translation> </message> <message> <source>Welcome to the %1 RPC console.</source> @@ -1801,6 +1827,14 @@ <translation>Gebruik pijltjes omhoog en omlaag om door de geschiedenis te navigeren en %1 om het scherm te wissen.</translation> </message> <message> + <source>Type %1 for an overview of available commands.</source> + <translation>Typ %1 voor een overzicht van de beschikbare commando's.</translation> + </message> + <message> + <source>For more information on using this console type %1.</source> + <translation>Typ %1 voor meer informatie over het gebruik van deze console.</translation> + </message> + <message> <source>WARNING: Scammers have been active, telling users to type commands here, stealing their wallet contents. Do not use this console without fully understanding the ramifications of a command.</source> <translation>WAARSCHUWING: Er zijn Scammers actief geweest, die gebruikers vragen om hier commando's te typen, waardoor de inhoud van hun portemonnee werd gestolen. Gebruik deze console niet zonder de gevolgen van een commando volledig te begrijpen.</translation> </message> @@ -1809,6 +1843,14 @@ <translation>Netwerkactiviteit uitgeschakeld</translation> </message> <message> + <source>Executing command without any wallet</source> + <translation>Uitvoeren van commando zonder gebruik van een portemonnee</translation> + </message> + <message> + <source>Executing command using "%1" wallet</source> + <translation>Uitvoeren van commando met portemonnee "%1"</translation> + </message> + <message> <source>(node id: %1)</source> <translation>(node id: %1)</translation> </message> @@ -1880,6 +1922,14 @@ <translation>Wissen</translation> </message> <message> + <source>Native segwit addresses (aka Bech32 or BIP-173) reduce your transaction fees later on and offer better protection against typos, but old wallets don't support them. When unchecked, an address compatible with older wallets will be created instead.</source> + <translation>Native segwit-adressen (Bech32 of BIP-173) reduceren later je transactiekosten en bieden een betere bescherming tegen typefouten, maar oude portemonnees ondersteunen deze niet. Een adres dat is compatibel met oudere portemonnees zal worden gecreëerd indien dit niet is aangevinkt.</translation> + </message> + <message> + <source>Generate native segwit (Bech32) address</source> + <translation>Genereer native segwit-adres (Bech32)</translation> + </message> + <message> <source>Requested payments history</source> <translation>Geschiedenis van de betalingsverzoeken</translation> </message> @@ -1888,10 +1938,6 @@ <translation>&Betalingsverzoek</translation> </message> <message> - <source>Generate Bech32 address</source> - <translation>Genereer Bech32-adres</translation> - </message> - <message> <source>Show the selected request (does the same as double clicking an entry)</source> <translation>Toon het geselecteerde verzoek (doet hetzelfde als dubbelklikken)</translation> </message> @@ -1971,6 +2017,10 @@ <translation>Bericht</translation> </message> <message> + <source>Wallet</source> + <translation>Portemonnee</translation> + </message> + <message> <source>Resulting URI too long, try to reduce the text for label / message.</source> <translation>Resulterende URI te lang, probeer de tekst korter te maken voor het label/bericht.</translation> </message> @@ -2046,7 +2096,7 @@ </message> <message> <source>Fee:</source> - <translation>Kosten:</translation> + <translation>Vergoeding:</translation> </message> <message> <source>After Fee:</source> @@ -2066,7 +2116,7 @@ </message> <message> <source>Transaction Fee:</source> - <translation>Transactiekosten:</translation> + <translation>Transactievergoeding:</translation> </message> <message> <source>Choose...</source> @@ -2074,23 +2124,27 @@ </message> <message> <source>Using the fallbackfee can result in sending a transaction that will take several hours or days (or never) to confirm. Consider choosing your fee manually or wait until you have validated the complete chain.</source> - <translation>Gebruik van de terugvalkosten kan resulteren in het verzenden van een transactie die meerdere uren of dagen (of nooit) zal duren om bevestigd te worden. Overweeg om handmatig de kosten in te geven of wacht totdat je de volledige keten hebt gevalideerd.</translation> + <translation>Gebruik van de terugvalkosten kan resulteren in het verzenden van een transactie die meerdere uren of dagen (of nooit) zal duren om bevestigd te worden. Overweeg om handmatig de vergoeding in te geven of wacht totdat je de volledige keten hebt gevalideerd.</translation> </message> <message> <source>Warning: Fee estimation is currently not possible.</source> - <translation>Waarschuwing: Schatting van de kosten is momenteel niet mogelijk.</translation> + <translation>Waarschuwing: Schatting van de vergoeding is momenteel niet mogelijk.</translation> </message> <message> <source>collapse fee-settings</source> - <translation>verberg kosteninstellingen</translation> + <translation>verberg vergoeding-instellingen</translation> </message> <message> - <source>per kilobyte</source> - <translation>per kilobyte</translation> + <source>Specify a custom fee per kB (1,000 bytes) of the transaction's virtual size. + +Note: Since the fee is calculated on a per-byte basis, a fee of "100 satoshis per kB" for a transaction size of 500 bytes (half of 1 kB) would ultimately yield a fee of only 50 satoshis.</source> + <translation>Specificeer handmatig een vergoeding per kB (1,000 bytes) voor de virtuele grootte van de transactie. + +Notitie: Omdat de vergoeding per byte wordt gerekend, zal een vergoeding van "100 satoshis per kB" voor een transactie ten grootte van 500 bytes (de helft van 1 kB) uiteindelijk een vergoeding van maar liefst 50 satoshis betekenen.</translation> </message> <message> - <source>If the custom fee is set to 1000 satoshis and the transaction is only 250 bytes, then "per kilobyte" only pays 250 satoshis in fee, while "total at least" pays 1000 satoshis. For transactions bigger than a kilobyte both pay by kilobyte.</source> - <translation>Als de aangepaste toeslag is ingesteld op 1000 satoshis en de transactie is maar 250 bytes, dan wordt bij "per kilobyte" 250 satoshis aan toeslag berekend, terwijl er bij "totaal tenminste" 1000 satoshis worden berekend. Voor transacties die groter zijn dan een kilobyte, wordt in beide gevallen per kilobyte de toeslag berekend.</translation> + <source>per kilobyte</source> + <translation>per kilobyte</translation> </message> <message> <source>Hide</source> @@ -2122,7 +2176,7 @@ </message> <message> <source>Add &Recipient</source> - <translation>Voeg &Ontvanger Toe</translation> + <translation>Voeg &ontvanger toe</translation> </message> <message> <source>Clear all fields of the form.</source> @@ -2137,8 +2191,16 @@ <translation>Bevestigingstijddoel:</translation> </message> <message> + <source>Enable Replace-By-Fee</source> + <translation>Activeer Replace-By-Fee</translation> + </message> + <message> + <source>With Replace-By-Fee (BIP-125) you can increase a transaction's fee after it is sent. Without this, a higher fee may be recommended to compensate for increased transaction delay risk.</source> + <translation>Met Replace-By-Fee (BIP-125) kun je de vergoeding voor een transactie verhogen na dat deze verstuurd is. Zonder dit kan een hogere vergoeding aangeraden worden om te compenseren voor de hogere kans op transactie vertragingen.</translation> + </message> + <message> <source>Clear &All</source> - <translation>Verwijder &Alles</translation> + <translation>Verwijder &alles</translation> </message> <message> <source>Balance:</source> @@ -2193,16 +2255,32 @@ <translation>Weet u zeker dat u wilt verzenden?</translation> </message> <message> - <source>added as transaction fee</source> - <translation>toegevoegd als transactiekosten</translation> + <source>or</source> + <translation>of</translation> </message> <message> - <source>Total Amount %1</source> - <translation>Totaalbedrag %1</translation> + <source>You can increase the fee later (signals Replace-By-Fee, BIP-125).</source> + <translation>Je kunt de vergoeding later verhogen (signaleert Replace-By-Fee, BIP-125).</translation> </message> <message> - <source>or</source> - <translation>of</translation> + <source>from wallet %1</source> + <translation>van portemonnee %1</translation> + </message> + <message> + <source>Please, review your transaction.</source> + <translation>Controleer uw transactie aub.</translation> + </message> + <message> + <source>Transaction fee</source> + <translation>Transactiekosten</translation> + </message> + <message> + <source>Not signalling Replace-By-Fee, BIP-125.</source> + <translation>Signaleert geen Replace-By-Fee, BIP-125.</translation> + </message> + <message> + <source>Total Amount</source> + <translation>Totaalbedrag</translation> </message> <message> <source>Confirm send coins</source> @@ -2222,7 +2300,7 @@ </message> <message> <source>The total exceeds your balance when the %1 transaction fee is included.</source> - <translation>Het totaal overschrijdt uw huidige saldo wanneer de %1 transactiekosten worden meegerekend.</translation> + <translation>Het totaal overschrijdt uw huidige saldo wanneer de %1 transactie vergoeding wordt meegerekend.</translation> </message> <message> <source>Duplicate address found: addresses should only be used once each.</source> @@ -2246,7 +2324,7 @@ </message> <message> <source>Pay only the required fee of %1</source> - <translation>Betaal alleen de verplichte transactiekosten van %1</translation> + <translation>Betaal alleen de verplichte transactie vergoeding van %1</translation> </message> <message numerus="yes"> <source>Estimated to begin confirmation within %n block(s).</source> @@ -2281,7 +2359,7 @@ </message> <message> <source>Pay &To:</source> - <translation>Betaal &Aan:</translation> + <translation>Betaal &aan:</translation> </message> <message> <source>&Label:</source> @@ -2324,6 +2402,10 @@ <translation>Trek de transactiekosten a&f van het bedrag.</translation> </message> <message> + <source>Use available balance</source> + <translation>Gebruik beschikbaar saldo</translation> + </message> + <message> <source>Message:</source> <translation>Bericht:</translation> </message> @@ -2382,7 +2464,7 @@ </message> <message> <source>&Sign Message</source> - <translation>&Onderteken Bericht</translation> + <translation>&Onderteken bericht</translation> </message> <message> <source>You can sign messages/agreements with your addresses to prove you can receive bitcoins sent to them. Be careful not to sign anything vague or random, as phishing attacks may try to trick you into signing your identity over to them. Only sign fully-detailed statements you agree to.</source> @@ -2426,7 +2508,7 @@ </message> <message> <source>Sign &Message</source> - <translation>Onderteken &Bericht</translation> + <translation>Onderteken &bericht</translation> </message> <message> <source>Reset all sign message fields</source> @@ -2434,11 +2516,11 @@ </message> <message> <source>Clear &All</source> - <translation>Verwijder &Alles</translation> + <translation>Verwijder &alles</translation> </message> <message> <source>&Verify Message</source> - <translation>&Verifiëer Bericht</translation> + <translation>&Verifiëer bericht</translation> </message> <message> <source>Enter the receiver's address, message (ensure you copy line breaks, spaces, tabs, etc. exactly) and signature below to verify the message. Be careful not to read more into the signature than what is in the signed message itself, to avoid being tricked by a man-in-the-middle attack. Note that this only proves the signing party receives with the address, it cannot prove sendership of any transaction!</source> @@ -2454,7 +2536,7 @@ </message> <message> <source>Verify &Message</source> - <translation>Verifiëer &Bericht</translation> + <translation>Verifiëer &bericht</translation> </message> <message> <source>Reset all verify message fields</source> @@ -2542,10 +2624,6 @@ <translation>geconflicteerd met een transactie met %1 confirmaties</translation> </message> <message> - <source>%1/offline</source> - <translation>%1/offline</translation> - </message> - <message> <source>0/unconfirmed, %1</source> <translation>0/onbevestigd, %1</translation> </message> @@ -2574,10 +2652,6 @@ <translation>Status</translation> </message> <message> - <source>, has not been successfully broadcast yet</source> - <translation>, is nog niet met succes uitgezonden</translation> - </message> - <message> <source>Date</source> <translation>Datum</translation> </message> @@ -2662,6 +2736,10 @@ <translation>Transactie totale grootte</translation> </message> <message> + <source>Transaction virtual size</source> + <translation>Transactie virtuele grootte</translation> + </message> + <message> <source>Output index</source> <translation>Output index</translation> </message> @@ -2671,7 +2749,7 @@ </message> <message> <source>Generated coins must mature %1 blocks before they can be spent. When you generated this block, it was broadcast to the network to be added to the block chain. If it fails to get into the chain, its state will change to "not accepted" and it won't be spendable. This may occasionally happen if another node generates a block within a few seconds of yours.</source> - <translation>Gegenereerde munten moeten %1 blokken rijpen voordat ze kunnen worden besteed. Toen dit blok gegenereerd werd, werd het uitgezonden naar het netwerk om aan de blokketen toegevoegd te worden. Als het niet lukt om in de keten toegevoegd te worden, zal de status te veranderen naar "niet geaccepteerd" en zal het niet besteedbaar zijn. Dit kan soms gebeuren als een ander knooppunt een blok genereert binnen een paar seconden na die van u.</translation> + <translation>Gegenereerde munten moeten %1 blokken rijpen voordat ze kunnen worden besteed. Toen dit blok gegenereerd werd, werd het uitgezonden naar het netwerk om aan de blokketen toegevoegd te worden. Als het niet lukt om in de keten toegevoegd te worden, zal de status te veranderen naar "niet geaccepteerd" en zal het niet besteedbaar zijn. Dit kan soms gebeuren als een ander node een blok genereert binnen een paar seconden na die van u.</translation> </message> <message> <source>Debug information</source> @@ -2732,10 +2810,6 @@ <translation>Open tot %1</translation> </message> <message> - <source>Offline</source> - <translation>Offline</translation> - </message> - <message> <source>Unconfirmed</source> <translation>Onbevestigd</translation> </message> @@ -2760,10 +2834,6 @@ <translation>Niet beschikbaar (%1 bevestigingen, zal beschikbaar zijn na %2)</translation> </message> <message> - <source>This block was not received by any other nodes and will probably not be accepted!</source> - <translation>Dit blok is niet ontvangen bij andere nodes en zal waarschijnlijk niet worden geaccepteerd!</translation> - </message> - <message> <source>Generated but not accepted</source> <translation>Gegenereerd maar niet geaccepteerd</translation> </message> @@ -3005,19 +3075,19 @@ </message> <message> <source>Fee bump error</source> - <translation>Kosten stoot fout</translation> + <translation>Vergoedingsverhoging fout</translation> </message> <message> <source>Increasing transaction fee failed</source> - <translation>Verhogen transactiekosten is mislukt</translation> + <translation>Verhogen transactie vergoeding is mislukt</translation> </message> <message> <source>Do you want to increase the fee?</source> - <translation>Wil je de kosten verhogen?</translation> + <translation>Wil je de vergoeding verhogen?</translation> </message> <message> <source>Current fee:</source> - <translation>Huidige kosten:</translation> + <translation>Huidige vergoeding:</translation> </message> <message> <source>Increase:</source> @@ -3025,11 +3095,11 @@ </message> <message> <source>New fee:</source> - <translation>Nieuwe kosten:</translation> + <translation>Nieuwe vergoeding:</translation> </message> <message> <source>Confirm fee bump</source> - <translation>Bevestig kostenaanpassing</translation> + <translation>Bevestig vergoedingsaanpassing</translation> </message> <message> <source>Can't sign transaction.</source> @@ -3074,64 +3144,36 @@ <source>The wallet data was successfully saved to %1.</source> <translation>De portemonneedata is succesvol opgeslagen in %1.</translation> </message> + <message> + <source>Cancel</source> + <translation>Annuleren</translation> + </message> </context> <context> <name>bitcoin-core</name> <message> - <source>Options:</source> - <translation>Opties:</translation> - </message> - <message> - <source>Specify data directory</source> - <translation>Stel gegevensmap in</translation> - </message> - <message> - <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> - <source>Specify your own public address</source> - <translation>Specificeer uw eigen publieke adres</translation> - </message> - <message> - <source>Accept command line and JSON-RPC commands</source> - <translation>Aanvaard opdrachtregel- en JSON-RPC-opdrachten</translation> - </message> - <message> <source>Distributed under the MIT software license, see the accompanying file %s or %s</source> <translation>Uitgegeven onder de MIT software licentie, zie het bijgevoegde bestand %s of %s</translation> </message> <message> - <source>If <category> is not supplied or if <category> = 1, output all debugging information.</source> - <translation>Als er geen <categorie> is opgegeven of als de <categorie> 1 is, laat dan alle debugginginformatie zien.</translation> - </message> - <message> <source>Prune configured below the minimum of %d MiB. Please use a higher number.</source> <translation>Prune is ingesteld op minder dan het minimum van %d MiB. Gebruik a.u.b. een hoger aantal.</translation> </message> <message> <source>Prune: last wallet synchronisation goes beyond pruned data. You need to -reindex (download the whole blockchain again in case of pruned node)</source> - <translation>Prune: laatste wallet synchronisatie gaat verder terug dan de middels -prune beperkte data. U moet -reindex gebruiken (downloadt opnieuw de gehele blockchain voor een pruned node)</translation> + <translation>Prune: laatste wallet synchronisatie gaat verder terug dan de middels -prune beperkte data. U moet -reindex gebruiken (downloadt opnieuw de gehele blokketen voor een pruned node)</translation> </message> <message> <source>Rescans are not possible in pruned mode. You will need to use -reindex which will download the whole blockchain again.</source> - <translation>Herscannen is niet mogelijk i.c.m. -prune. U moet -reindex gebruiken dat de hele blockchain opnieuw zal downloaden.</translation> + <translation>Herscannen is niet mogelijk i.c.m. -prune. U moet -reindex gebruiken dat de hele blokketen opnieuw zal downloaden.</translation> </message> <message> <source>Error: A fatal internal error occurred, see debug.log for details</source> <translation>Fout: er is een fout opgetreden, zie debug.log voor details</translation> </message> <message> - <source>Fee (in %s/kB) to add to transactions you send (default: %s)</source> - <translation>Transactiekosten (in %s/kB) toevoegen aan transacties die u doet (standaard: %s)</translation> - </message> - <message> <source>Pruning blockstore...</source> - <translation>Block opslag prunen...</translation> - </message> - <message> - <source>Run in the background as a daemon and accept commands</source> - <translation>Draai in de achtergrond als daemon en aanvaard opdrachten</translation> + <translation>Blokopslag prunen...</translation> </message> <message> <source>Unable to start HTTP server. See debug log for details.</source> @@ -3146,54 +3188,18 @@ <translation>De %s ontwikkelaars</translation> </message> <message> - <source>A fee rate (in %s/kB) that will be used when fee estimation has insufficient data (default: %s)</source> - <translation>Een transactietarief (in %s/kB) dat gebruikt wordt als de transactiekosten schatting niet genoeg data heeft. (normaal: %s)</translation> - </message> - <message> - <source>Accept relayed transactions received from whitelisted peers even when not relaying transactions (default: %d)</source> - <translation>Accepteer doorgestuurde transacties ontvangen van goedgekeurde peers, ook wanneer je zelf geen transacties doorstuurt (standaard: %d)</translation> - </message> - <message> - <source>Bind to given address and always listen on it. Use [host]:port notation for IPv6</source> - <translation>Bind aan opgegeven adres en luister er altijd op. Gebruik [host]:port notatie voor IPv6</translation> - </message> - <message> <source>Cannot obtain a lock on data directory %s. %s is probably already running.</source> <translation>Kan geen lock verkrijgen op gegevensmap %s. %s draait waarschijnlijk al.</translation> </message> <message> - <source>Delete all wallet transactions and only recover those parts of the blockchain through -rescan on startup</source> - <translation>Verwijder alle transacties van de portemonnee en herstel alleen de delen van de blokketen door -rescan tijdens het opstarten</translation> + <source>Cannot provide specific connections and have addrman find outgoing connections at the same.</source> + <translation>Kan niet specifieke verbindingen voorzien en tegelijk addrman uitgaande verbindingen laten vinden.</translation> </message> <message> <source>Error reading %s! All keys read correctly, but transaction data or address book entries might be missing or incorrect.</source> <translation>Waarschuwing: Fout bij het lezen van %s! Alle sleutels zijn in goede orde uitgelezen, maar transactiedata of adresboeklemma's zouden kunnen ontbreken of fouten bevatten.</translation> </message> <message> - <source>Exclude debugging information for a category. Can be used in conjunction with -debug=1 to output debug logs for all categories except one or more specified categories.</source> - <translation>Sluit debugging informatie uit van een categorie. Dit kan samen gebruikt worden met -debug=1 om uitvoer debug logboeken te creëren voor alle categorieën, behalve één of meerdere categorieën.</translation> - </message> - <message> - <source>Execute command when a wallet transaction changes (%s in cmd is replaced by TxID)</source> - <translation>Voer opdracht uit zodra een portemonneetransactie verandert (%s in cmd wordt vervangen door TxID)</translation> - </message> - <message> - <source>Extra transactions to keep in memory for compact block reconstructions (default: %u)</source> - <translation>Extra transacties wordt bijgehouden voor compacte blokreconstructie (standaard: %u)</translation> - </message> - <message> - <source>If this block is in the chain assume that it and its ancestors are valid and potentially skip their script verification (0 to verify all, default: %s, testnet: %s)</source> - <translation>Als dit blok in de keten staat, gaat het ervan uit dat dit blok en zijn voorouders geldig zijn en mogelijk hun script verificatie overslaan (0 om alles te verifiëren, standaard:%s, testnet:%s)</translation> - </message> - <message> - <source>Maximum allowed median peer time offset adjustment. Local perspective of time may be influenced by peers forward or backward by this amount. (default: %u seconds)</source> - <translation>Maximum toegestane peer tijd compensatie. Lokaal perspectief van tijd mag worden beinvloed door peers die met deze hoeveelheid voor of achter lopen. (standaard: %u seconden)</translation> - </message> - <message> - <source>Maximum total fees (in %s) to use in a single wallet transaction or raw transaction; setting this too low may abort large transactions (default: %s)</source> - <translation>Maximum totale transactiekosten (in %s) om te gebruiken in een enkele portemoneetransactie; als dit te laag is ingesteld kunnen grote transacties worden verhinderd (standaard: %s)</translation> - </message> - <message> <source>Please check that your computer's date and time are correct! If your clock is wrong, %s will not work properly.</source> <translation>Waarschuwing: Controleer dat de datum en tijd van uw computer correct zijn ingesteld! Bij een onjuist ingestelde klok zal %s niet goed werken.</translation> </message> @@ -3202,22 +3208,6 @@ <translation>Gelieve bij te dragen als je %s nuttig vindt. Bezoek %s voor meer informatie over de software.</translation> </message> <message> - <source>Query for peer addresses via DNS lookup, if low on addresses (default: 1 unless -connect used)</source> - <translation>Query voor peer adressen via DNS-lookup, als er weinig adressen zijn (standaard: 1 tenzij -connect gebruikt word)</translation> - </message> - <message> - <source>Reduce storage requirements by enabling pruning (deleting) of old blocks. This allows the pruneblockchain RPC to be called to delete specific blocks, and enables automatic pruning of old blocks if a target size in MiB is provided. This mode is incompatible with -txindex and -rescan. Warning: Reverting this setting requires re-downloading the entire blockchain. (default: 0 = disable pruning blocks, 1 = allow manual pruning via RPC, >%u = automatically prune block files to stay under the specified target size in MiB)</source> - <translation>Beperk benodigde opslag door het prunen (verwijderen) van oude blocks in te schakelen. Dit maakt het mogelijk om het pruneblockchain RPC commando aan te roepen om specifieke blocks te verwijderen, en maakt het automatische prunen van oude blocks mogelijk wanneer een doelgrootte in MiB is ingesteld. Deze modus is niet compatible met -txindex en -rescan. Waarschuwing: ongedaan maken van deze instellingen vereist het opnieuw downloaden van gehele de blockchain. (standaard:0 = uitschakelen prunen, 1 = handmatig prunen via RPC toestaan, >%u = automatisch blockchain bestanden prunen om beneden de gespecificeerde doelgrootte in MiB te blijven)</translation> - </message> - <message> - <source>Set lowest fee rate (in %s/kB) for transactions to be included in block creation. (default: %s)</source> - <translation>Specificeer het laagste tarief (in %s/kB) voor transacties die bij het maken van een blok moeten worden in rekening worden gebracht (standaard: %s)</translation> - </message> - <message> - <source>Set the number of script verification threads (%u to %d, 0 = auto, <0 = leave that many cores free, default: %d)</source> - <translation>Kies het aantal scriptverificatie processen (%u tot %d, 0 = auto, <0 = laat dit aantal kernen vrij, standaard: %d)</translation> - </message> - <message> <source>The block database contains a block which appears to be from the future. This may be due to your computer's date and time being set incorrectly. Only rebuild the block database if you are sure that your computer's date and time are correct</source> <translation>De blokdatabase bevat een blok dat lijkt uit de toekomst te komen. Dit kan gebeuren omdat de datum en tijd van uw computer niet goed staat. Herbouw de blokdatabase pas nadat u de datum en tijd van uw computer correct heeft ingesteld.</translation> </message> @@ -3227,7 +3217,7 @@ </message> <message> <source>This is the transaction fee you may discard if change is smaller than dust at this level</source> - <translation>Dit zijn de transactiekost die u mag afleggen als het wisselgeld kleiner is dan het stof op dit niveau</translation> + <translation>Dit is de transactievergoeding die u mag afleggen als het wisselgeld kleiner is dan stof op dit niveau</translation> </message> <message> <source>Unable to replay blocks. You will need to rebuild the database using -reindex-chainstate.</source> @@ -3238,18 +3228,6 @@ <translation>Niet mogelijk om de databank terug te draaien naar een staat voor de vork. Je zal je blokketen opnieuw moeten downloaden</translation> </message> <message> - <source>Use UPnP to map the listening port (default: 1 when listening and no -proxy)</source> - <translation>Gebruik UPnP om de luisterende poort te mappen (standaard: 1 als er geluisterd worden en geen -proxy is meegegeven)</translation> - </message> - <message> - <source>Username and hashed password for JSON-RPC connections. The field <userpw> comes in the format: <USERNAME>:<SALT>$<HASH>. A canonical python script is included in share/rpcuser. The client then connects normally using the rpcuser=<USERNAME>/rpcpassword=<PASSWORD> pair of arguments. This option can be specified multiple times</source> - <translation>Gebruikersnaam en gehasht wachtwoord voor JSON-RPC-verbindingen. De velden <userpw> is in het formaat: <GEBRUIKERSNAAM>:<SALT>$<HASH>. Een kanoniek Pythonscript is inbegrepen in de share/rpcuser. De klant connecteert dan normaal via de rpcuser=<GEBRUIKERSNAAM>/rpcpassword=<PASWOORD> argumenten. Deze optie kan meerdere keren worden meegegeven</translation> - </message> - <message> - <source>Wallet will not create transactions that violate mempool chain limits (default: %u)</source> - <translation>Portemonnee creëert geen transacties die mempool-ketenlimieten schenden (standaard: %u)</translation> - </message> - <message> <source>Warning: The network does not appear to fully agree! Some miners appear to be experiencing issues.</source> <translation>Waarschuwing: Het lijkt erop dat het netwerk geen consensus kan vinden! Sommige delvers lijken problemen te ondervinden.</translation> </message> @@ -3258,10 +3236,6 @@ <translation>Waarschuwing: Het lijkt erop dat we geen consensus kunnen vinden met onze peers! Mogelijk dient u te upgraden, of andere nodes moeten wellicht upgraden.</translation> </message> <message> - <source>Whether to save the mempool on shutdown and load on restart (default: %u)</source> - <translation>Of de mempool opgeslagen moet worden bij afsluiten en ingeladen moet worden tijdens herstarten (standaard: %u)</translation> - </message> - <message> <source>%d of last 100 blocks have unexpected version</source> <translation>%d van de laatste 100 blokken hebben een onverwachte versie</translation> </message> @@ -3271,45 +3245,17 @@ </message> <message> <source>-maxmempool must be at least %d MB</source> - <translation>-maxmempool moet tenminste %d MB zijn</translation> - </message> - <message> - <source><category> can be:</source> - <translation><categorie> kan zijn:</translation> - </message> - <message> - <source>Accept connections from outside (default: 1 if no -proxy or -connect)</source> - <translation>Accepteer verbindingen van buitenaf (standaard: 1 als geen -proxy of -connect is opgegeven)</translation> - </message> - <message> - <source>Append comment to the user agent string</source> - <translation>Voeg commentaar toe aan de user agent string</translation> - </message> - <message> - <source>Attempt to recover private keys from a corrupt wallet on startup</source> - <translation>Probeer privésleutels te herstellen van een corrupte wallet bij opstarten</translation> - </message> - <message> - <source>Block creation options:</source> - <translation>Blokcreatie-opties:</translation> + <translation>-maxmempool moet minstens %d MB zijn</translation> </message> <message> <source>Cannot resolve -%s address: '%s'</source> <translation>Kan -%s adres niet herleiden: '%s'</translation> </message> <message> - <source>Chain selection options:</source> - <translation>Keten selectie opties:</translation> - </message> - <message> <source>Change index out of range</source> <translation>Wijzigingsindex buiten bereik</translation> </message> <message> - <source>Connection options:</source> - <translation>Verbindingsopties:</translation> - </message> - <message> <source>Copyright (C) %i-%i</source> <translation>Auteursrecht (C) %i-%i</translation> </message> @@ -3318,36 +3264,12 @@ <translation>Corrupte blokkendatabase gedetecteerd</translation> </message> <message> - <source>Debugging/Testing options:</source> - <translation>Foutopsporing/Testopties:</translation> - </message> - <message> - <source>Do not load the wallet and disable wallet RPC calls</source> - <translation>Laad de wallet niet en schakel wallet RPC oproepen uit</translation> - </message> - <message> <source>Do you want to rebuild the block database now?</source> <translation>Wilt u de blokkendatabase nu herbouwen?</translation> </message> <message> - <source>Enable publish hash block in <address></source> - <translation>Sta toe om hashblok te publiceren in <adres></translation> - </message> - <message> - <source>Enable publish hash transaction in <address></source> - <translation>Stat toe om hashtransactie te publiceren in <adres></translation> - </message> - <message> - <source>Enable publish raw block in <address></source> - <translation>Sta toe rauw blok te publiceren in <adres></translation> - </message> - <message> - <source>Enable publish raw transaction in <address></source> - <translation>Sta toe ruwe transacties te publiceren in <adres></translation> - </message> - <message> - <source>Enable transaction replacement in the memory pool (default: %u)</source> - <translation>Transactie vervanging inschakelen in het geheugen (standaard: %u)</translation> + <source>Error creating %s: You can't create non-HD wallets with this version.</source> + <translation>Fout bij het maken van %s: Je kunt geen niet-HD portemonnees maken met deze versie.</translation> </message> <message> <source>Error initializing block database</source> @@ -3362,6 +3284,10 @@ <translation>Fout bij het laden van %s</translation> </message> <message> + <source>Error loading %s: Private keys can only be disabled during creation</source> + <translation>Fout bij het laden van %s: Geheime sleutels kunnen alleen worden uitgeschakeld tijdens het aanmaken</translation> + </message> + <message> <source>Error loading %s: Wallet corrupted</source> <translation>Fout bij het laden van %s: Portomonnee corrupt</translation> </message> @@ -3386,6 +3312,10 @@ <translation>Mislukt om op welke poort dan ook te luisteren. Gebruik -listen=0 as u dit wilt.</translation> </message> <message> + <source>Failed to rescan the wallet during initialization</source> + <translation>Portemonnee herscannen tijdens initialisatie mislukt</translation> + </message> + <message> <source>Importing...</source> <translation>Importeren...</translation> </message> @@ -3410,8 +3340,8 @@ <translation>Ongeldig bedrag voor -fallbackfee=<bedrag>: '%s'</translation> </message> <message> - <source>Keep the transaction memory pool below <n> megabytes (default: %u)</source> - <translation>De transactiegeheugenpool moet onder de <n> megabytes blijven (standaard: %u)</translation> + <source>Upgrading txindex database</source> + <translation>Upgraden txindex database</translation> </message> <message> <source>Loading P2P addresses...</source> @@ -3422,26 +3352,10 @@ <translation>Verbanningslijst aan het laden...</translation> </message> <message> - <source>Location of the auth cookie (default: data dir)</source> - <translation>Locatie van de auth cookie (standaard: data dir)</translation> - </message> - <message> <source>Not enough file descriptors available.</source> <translation>Niet genoeg file descriptors beschikbaar.</translation> </message> <message> - <source>Only connect to nodes in network <net> (ipv4, ipv6 or onion)</source> - <translation>Verbind alleen met nodes in netwerk <net> (ipv4, ipv6 of onion)</translation> - </message> - <message> - <source>Print this help message and exit</source> - <translation>Print dit helpbericht en sluit af</translation> - </message> - <message> - <source>Print version and exit</source> - <translation>Laat versie zien en sluit af</translation> - </message> - <message> <source>Prune cannot be configured with a negative value.</source> <translation>Prune kan niet worden geconfigureerd met een negatieve waarde.</translation> </message> @@ -3450,14 +3364,6 @@ <translation>Prune-modus is niet compatible met -txindex</translation> </message> <message> - <source>Rebuild chain state and block index from the blk*.dat files on disk</source> - <translation>Herbouw ketenstaat en block index met behulp van de blk*.dat bestanden op de hardeschijf</translation> - </message> - <message> - <source>Rebuild chain state from the currently indexed blocks</source> - <translation>Herbouw ketenstaat vanuit de huidige geindexeerde blokken</translation> - </message> - <message> <source>Replaying blocks...</source> <translation>Blokken opnieuw aan het afspelen...</translation> </message> @@ -3466,14 +3372,6 @@ <translation>Blokken aan het terugdraaien...</translation> </message> <message> - <source>Set database cache size in megabytes (%d to %d, default: %d)</source> - <translation>Zet database cache grootte in megabytes (%d tot %d, standaard: %d)</translation> - </message> - <message> - <source>Specify wallet file (within data directory)</source> - <translation>Specificeer het portemonnee bestand (vanuit de gegevensmap)</translation> - </message> - <message> <source>The source code is available from %s.</source> <translation>De broncode is beschikbaar van %s.</translation> </message> @@ -3486,6 +3384,10 @@ <translation>Niet in staat om %s te verbinden op deze computer. %s draait waarschijnlijk al.</translation> </message> <message> + <source>Unable to generate keys</source> + <translation>Niet mogelijk sleutels te genereren</translation> + </message> + <message> <source>Unsupported argument -benchmark ignored, use -debug=bench.</source> <translation>Niet-ondersteund argument -benchmark genegeerd, gebruik -debug=bench.</translation> </message> @@ -3506,14 +3408,6 @@ <translation>Upgraden UTXO-database</translation> </message> <message> - <source>Use UPnP to map the listening port (default: %u)</source> - <translation>Gebruik UPnP om de luisterende poort te mappen (standaard: %u)</translation> - </message> - <message> - <source>Use the test chain</source> - <translation>Gebruik de test keten</translation> - </message> - <message> <source>User Agent comment (%s) contains unsafe characters.</source> <translation>User Agentcommentaar (%s) bevat onveilige karakters.</translation> </message> @@ -3522,88 +3416,24 @@ <translation>Blokken aan het controleren...</translation> </message> <message> - <source>Wallet debugging/testing options:</source> - <translation>Portomonee debugging/testing opties:</translation> - </message> - <message> <source>Wallet needed to be rewritten: restart %s to complete</source> <translation>Portemonnee moest herschreven worden: Herstart %s om te voltooien</translation> </message> <message> - <source>Wallet options:</source> - <translation>Portemonnee instellingen:</translation> - </message> - <message> - <source>Allow JSON-RPC connections from specified source. Valid for <ip> are a single IP (e.g. 1.2.3.4), a network/netmask (e.g. 1.2.3.4/255.255.255.0) or a network/CIDR (e.g. 1.2.3.4/24). This option can be specified multiple times</source> - <translation>Sta JSON-RPC verbindingen toe vanuit een gespecificeerde bron. Geldig voor <ip> zijn een enkel IP (bijv. 1.2.3.4), een netwerk/netmask (bijv. 1.2.3.4/255.255.255.0) of een netwerk/CIDR (bijv. 1.2.3.4/24). Deze optie kan meerdere keren gespecificeerd worden.</translation> - </message> - <message> - <source>Bind to given address and whitelist peers connecting to it. Use [host]:port notation for IPv6</source> - <translation>Bind aan opgegeven adres en keur peers die ermee verbinden goed. Gebruik [host]:poort notatie voor IPv6</translation> - </message> - <message> - <source>Create new files with system default permissions, instead of umask 077 (only effective with disabled wallet functionality)</source> - <translation>Creër nieuwe bestanden met standaard systeem bestandsrechten in plaats van umask 077 (alleen effectief met uitgeschakelde portemonnee functionaliteit)</translation> - </message> - <message> - <source>Discover own IP addresses (default: 1 when listening and no -externalip or -proxy)</source> - <translation>Ontdek eigen IP-adressen (standaard: 1 voor luisteren en geen -externalip of -proxy)</translation> - </message> - <message> <source>Error: Listening for incoming connections failed (listen returned error %s)</source> <translation>Fout: luisteren naar binnenkomende verbindingen mislukt (luisteren gaf foutmelding %s)</translation> </message> <message> - <source>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 opdracht uit zodra een waarschuwing is ontvangen of wanneer we een erg lange fork detecteren (%s in opdracht wordt vervangen door bericht)</translation> - </message> - <message> - <source>Fees (in %s/kB) smaller than this are considered zero fee for relaying, mining and transaction creation (default: %s)</source> - <translation>Transactiekosten (in %s/kB) kleiner dan dit worden beschouw dat geen transactiekosten in rekening worden gebracht voor doorgeven, mijnen en transactiecreatie (standaard: %s)</translation> - </message> - <message> - <source>If paytxfee is not set, include enough fee so transactions begin confirmation on average within n blocks (default: %u)</source> - <translation>Als paytxfee niet is ingesteld, voeg voldoende transactiekosten toe zodat transacties starten met bevestigingen binnen in n blokken (standaard: %u)</translation> - </message> - <message> <source>Invalid amount for -maxtxfee=<amount>: '%s' (must be at least the minrelay fee of %s to prevent stuck transactions)</source> - <translation>ongeldig bedrag voor -maxtxfee=<bedrag>: '%s' (moet ten minste de minimale doorgeeftransactiekosten van %s het voorkomen geplakt transacties voorkomen)</translation> - </message> - <message> - <source>Maximum size of data in data carrier transactions we relay and mine (default: %u)</source> - <translation>Maximale grootte va n de gegevens in gegevensdragertransacties die we doorgeven en mijnen (standaard: %u)</translation> - </message> - <message> - <source>Randomize credentials for every proxy connection. This enables Tor stream isolation (default: %u)</source> - <translation>Gebruik willekeurige inloggegevens voor elke proxyverbinding. Dit maakt streamislatie voor Tor mogelijk (standaard: %u)</translation> + <translation>ongeldig bedrag voor -maxtxfee=<bedrag>: '%s' (moet ten minste de minimale doorgeefvergoeding van %s zijn om vastgelopen transacties te voorkomen)</translation> </message> <message> <source>The transaction amount is too small to send after the fee has been deducted</source> - <translation>Het transactiebedrag is te klein om te versturen nadat de transactiekosten in mindering zijn gebracht</translation> - </message> - <message> - <source>Whitelisted peers cannot be DoS banned and their transactions are always relayed, even if they are already in the mempool, useful e.g. for a gateway</source> - <translation>Goedgekeurde peers kunnen niet ge-DoS-banned worden en hun transacties worden altijd doorgegeven, zelfs als ze reeds in de mempool aanwezig zijn, nuttig voor bijv. een gateway</translation> + <translation>Het transactiebedrag is te klein om te versturen nadat de transactievergoeding in mindering is gebracht</translation> </message> <message> <source>You need to rebuild the database using -reindex to go back to unpruned mode. This will redownload the entire blockchain</source> - <translation>U moet de database herbouwen met -reindex om terug te gaan naar de niet-prune modus. Dit zal de gehele blockchain opnieuw downloaden.</translation> - </message> - <message> - <source>(default: %u)</source> - <translation>(standaard: %u)</translation> - </message> - <message> - <source>Accept public REST requests (default: %u)</source> - <translation>Accepteer publieke REST-verzoeken (standaard: %u)</translation> - </message> - <message> - <source>Automatically create Tor hidden service (default: %d)</source> - <translation>Creëer automatisch verborgen dienst van Tor (standaard:%d)</translation> - </message> - <message> - <source>Connect through SOCKS5 proxy</source> - <translation>Verbind door SOCKS5 proxy</translation> + <translation>U moet de database herbouwen met -reindex om terug te gaan naar de niet-prune modus. Dit zal de gehele blokketen opnieuw downloaden.</translation> </message> <message> <source>Error loading %s: You can't disable HD on an already existing HD wallet</source> @@ -3618,10 +3448,6 @@ <translation>Fout bij het upgraden van de ketenstaat database</translation> </message> <message> - <source>Imports blocks from external blk000??.dat file on startup</source> - <translation>Importeer blokken van externe blk000??.dat-bestand bij opstarten</translation> - </message> - <message> <source>Information</source> <translation>Informatie</translation> </message> @@ -3642,44 +3468,34 @@ <translation>Ongeldig netmask gespecificeerd in -whitelist: '%s'</translation> </message> <message> - <source>Keep at most <n> unconnectable transactions in memory (default: %u)</source> - <translation>Houd maximaal <n> onverbonden transacties in geheugen (standaard: %u)</translation> - </message> - <message> <source>Need to specify a port with -whitebind: '%s'</source> <translation>Verplicht een poort met -whitebind op te geven: '%s'</translation> </message> <message> - <source>Node relay options:</source> - <translation>Nodedoorgeefopties:</translation> - </message> - <message> - <source>RPC server options:</source> - <translation>RPC server opties:</translation> - </message> - <message> <source>Reducing -maxconnections from %d to %d, because of system limitations.</source> <translation>Verminder -maxconnections van %d naar %d, vanwege systeembeperkingen.</translation> </message> <message> - <source>Rescan the block chain for missing wallet transactions on startup</source> - <translation>Herscan de blokketen voor missende portemonneetransacties bij opstarten</translation> + <source>Signing transaction failed</source> + <translation>Ondertekenen van transactie mislukt</translation> </message> <message> - <source>Send trace/debug info to console instead of debug.log file</source> - <translation>Verzend trace/debug-info naar de console in plaats van het debug.log-bestand</translation> + <source>Specified -walletdir "%s" does not exist</source> + <translation>Opgegeven -walletdir "%s" bestaat niet</translation> </message> <message> - <source>Show all debugging options (usage: --help -help-debug)</source> - <translation>Toon alle foutopsporingsopties (gebruik: --help -help-debug)</translation> + <source>Specified -walletdir "%s" is a relative path</source> + <translation>Opgegeven -walletdir "%s" is een relatief pad</translation> </message> <message> - <source>Shrink debug.log file on client startup (default: 1 when no -debug)</source> - <translation>Verklein debug.log-bestand bij het opstarten van de client (standaard: 1 als geen -debug)</translation> + <source>Specified -walletdir "%s" is not a directory</source> + <translation>Opgegeven -walletdir "%s" is geen map</translation> </message> <message> - <source>Signing transaction failed</source> - <translation>Ondertekenen van transactie mislukt</translation> + <source>Specified blocks directory "%s" does not exist. +</source> + <translation>Opgegeven blocks map "%s" bestaat niet. +</translation> </message> <message> <source>The transaction amount is too small to pay the fee</source> @@ -3690,14 +3506,6 @@ <translation>Dit is experimentele software.</translation> </message> <message> - <source>Tor control port password (default: empty)</source> - <translation>Tor bepaalt poortwachtwoord (standaard: empty)</translation> - </message> - <message> - <source>Tor control port to use if onion listening enabled (default: %s)</source> - <translation>Tor bepaalt welke poort te gebruiken als luisteren naar onion wordt gebruikt (standaard: %s)</translation> - </message> - <message> <source>Transaction amount too small</source> <translation>Transactiebedrag te klein</translation> </message> @@ -3718,14 +3526,6 @@ <translation>Niet mogelijk initiële sleutels te genereren</translation> </message> <message> - <source>Upgrade wallet to latest format on startup</source> - <translation>Upgrade portemonee naar laatste formaat bij opstarten</translation> - </message> - <message> - <source>Username for JSON-RPC connections</source> - <translation>Gebruikersnaam voor JSON-RPC-verbindingen</translation> - </message> - <message> <source>Verifying wallet(s)...</source> <translation>Portomenee(n) aan het verifiëren...</translation> </message> @@ -3742,96 +3542,20 @@ <translation>Waarschuwing: onbekende nieuwe regels geactiveerd (versionbit %i)</translation> </message> <message> - <source>Whether to operate in a blocks only mode (default: %u)</source> - <translation>Om in alleen een blokmodus te opereren (standaard: %u)</translation> - </message> - <message> - <source>You need to rebuild the database using -reindex to change -txindex</source> - <translation>De database moet opnieuw opgebouwd worden met behulp van -reindex om -txindex te veranderen</translation> - </message> - <message> <source>Zapping all transactions from wallet...</source> <translation>Bezig met het zappen van alle transacties van de portemonnee...</translation> </message> <message> - <source>ZeroMQ notification options:</source> - <translation>ZeroMQ notificatieopties:</translation> - </message> - <message> - <source>Password for JSON-RPC connections</source> - <translation>Wachtwoord voor JSON-RPC-verbindingen</translation> - </message> - <message> - <source>Execute command when the best block changes (%s in cmd is replaced by block hash)</source> - <translation>Voer opdracht uit zodra het beste blok verandert (%s in cmd wordt vervangen door blokhash)</translation> - </message> - <message> - <source>Allow DNS lookups for -addnode, -seednode and -connect</source> - <translation>Sta DNS-naslag toe voor -addnode, -seednode en -connect</translation> - </message> - <message> - <source>(1 = keep tx meta data e.g. account owner and payment request information, 2 = drop tx meta data)</source> - <translation>(1 = behoudt tx meta data bijv. account eigenaar en betalingsverzoek informatie, 2. sla tx meta data niet op)</translation> - </message> - <message> <source>-maxtxfee is set very high! Fees this large could be paid on a single transaction.</source> - <translation>-maxtxfee staat zeer hoog! Transactiekosten van de grootte kunnen worden gebruikt in een enkele transactie.</translation> - </message> - <message> - <source>Bind to given address to listen for JSON-RPC connections. This option is ignored unless -rpcallowip is also passed. Port is optional and overrides -rpcport. Use [host]:port notation for IPv6. This option can be specified multiple times (default: 127.0.0.1 and ::1 i.e., localhost, or if -rpcallowip has been specified, 0.0.0.0 and :: i.e., all addresses)</source> - <translation>Bind aan gegeven adres om te luisteren voorJSON-RPC verbindingen. Deze optie zal genegeerd worden tenzij -rpcallowip ook aangegeven word. Port is optioneel en overschrijft -rpcport. Gebruik [host]:poort notatie voor IPv6. Deze optie van meerdere keren gebruikt worden (standaard: 127.0.0.1 en ::1 i.e., localhost, of als -rpcallowip gespecificeerd is, 0.0.0.0 en :: i.e., alle adressen)</translation> - </message> - <message> - <source>Do not keep transactions in the mempool longer than <n> hours (default: %u)</source> - <translation>Bewaar transactie niet langer dan <n> uren in de geheugenpool (standaard: %u)</translation> - </message> - <message> - <source>Equivalent bytes per sigop in transactions for relay and mining (default: %u)</source> - <translation>Equivalent byter per sigop in transactions voor doorsturen en mijnen (standaard: %u)</translation> + <translation>-maxtxfee staat zeer hoog! Transactiekosten van deze grootte kunnen worden gebruikt in een enkele transactie.</translation> </message> <message> <source>Error loading %s: You can't enable HD on an already existing non-HD wallet</source> <translation>Fout bij het laden van %s: Je kan HD niet activeren voor een reeds bestaande niet-HD-portemonnee</translation> </message> <message> - <source>Error loading wallet %s. -wallet parameter must only specify a filename (not a path).</source> - <translation>Fout laden portemonnee %s. -wallet parameter mag alleen een bestandsnaam zijn (geen pad).</translation> - </message> - <message> - <source>Fees (in %s/kB) smaller than this are considered zero fee for transaction creation (default: %s)</source> - <translation>Transactiekosten (in %s/kB) kleiner dan dit worden beschouwd dat geen transactiekosten in rekening worden gebracht voor transactiecreatie (standaard: %s)</translation> - </message> - <message> - <source>Force relay of transactions from whitelisted peers even if they violate local relay policy (default: %d)</source> - <translation>Forceer het doorsturen van transacties van goedgekeurde peers, zelfs wanneer deze niet voldoen aan de lokale doorstuurregels (standaard: %d)</translation> - </message> - <message> - <source>How thorough the block verification of -checkblocks is (0-4, default: %u)</source> - <translation>Hoe grondig de blokverificatie van -checkblocks is (0-4, standaard: %u)</translation> - </message> - <message> - <source>Maintain a full transaction index, used by the getrawtransaction rpc call (default: %u)</source> - <translation>Onderhoud een volledige transactieindex, gebruikt door de getrawtransaction rpc call (standaard: %u)</translation> - </message> - <message> - <source>Number of seconds to keep misbehaving peers from reconnecting (default: %u)</source> - <translation>Aantal seconden dat zich misdragende peers niet opnieuw kunnen verbinden (standaard: %u)</translation> - </message> - <message> - <source>Output debugging information (default: %u, supplying <category> is optional)</source> - <translation>Output extra debugginginformatie (standaard: %u, het leveren van <categorie> is optioneel)</translation> - </message> - <message> - <source>Support filtering of blocks and transaction with bloom filters (default: %u)</source> - <translation>Ondersteun filtering van blokken en transacties met bloomfilters (standaard: %u)</translation> - </message> - <message> - <source>The fee rate (in %s/kB) that indicates your tolerance for discarding change by adding it to the fee (default: %s). Note: An output is discarded if it is dust at this rate, but we will always discard up to the dust relay fee and a discard fee above that is limited by the fee estimate for the longest target</source> - <translation>Het kosten tarief (in %s/kB) dat de toelating van afdanken van wisselgeld aangeeft door het toevoegen aan de kosten (standaard: %s). Notitie: Een output zal afgedankt worden als het dust is in dit tarief, maar we zullen altijd afdanken tot aan de stof doorstuur kosten en een afdank tarief boven wat is gelimiteerd door de kosten inschatting voor het langste doel</translation> - </message> - <message> <source>This is the transaction fee you may pay when fee estimates are not available.</source> - <translation>Dit is de transactiekost die je mogelijk betaald indien geschatte tarief niet beschikbaar is</translation> + <translation>Dit is de transactievergoeding die je mogelijk betaalt indien geschatte tarief niet beschikbaar is</translation> </message> <message> <source>This product includes software developed by the OpenSSL Project for use in the OpenSSL Toolkit %s and cryptographic software written by Eric Young and UPnP software written by Thomas Bernard.</source> @@ -3842,10 +3566,6 @@ <translation>Totale lengte van netwerkversiestring (%i) overschrijdt maximale lengte (%i). Verminder het aantal of grootte van uacomments.</translation> </message> <message> - <source>Tries to keep outbound traffic under the given target (in MiB per 24h), 0 = no limit (default: %d)</source> - <translation>Pogingen om uitgaand verkeer onder een bepaald doel te houden (in MiB per 24u), 0 = geen limiet (standaard: %d)</translation> - </message> - <message> <source>Unsupported argument -socks found. Setting SOCKS version isn't possible anymore, only SOCKS5 proxies are supported.</source> <translation>Niet-ondersteund argument -socks gevonden. Instellen van SOCKS-versie is niet meer mogelijk, alleen SOCKS5-proxies worden ondersteund.</translation> </message> @@ -3854,140 +3574,40 @@ <translation>Niet ondersteund argument -whitelistalwaysrelay genegeerd, gebruik -whitelistrelay en/of -whitelistforcerelay.</translation> </message> <message> - <source>Use separate SOCKS5 proxy to reach peers via Tor hidden services (default: %s)</source> - <translation>Gebruik een aparte SOCKS5 proxy om verborgen diensten van Tor te bereiken (standaard: %s)</translation> - </message> - <message> <source>Warning: Unknown block versions being mined! It's possible unknown rules are in effect</source> <translation>Waarschuwing: Onbekende blok versies worden gemined! Er zijn mogelijk onbekende regels in werking getreden</translation> </message> <message> <source>Warning: Wallet file corrupt, data salvaged! Original %s saved as %s in %s; if your balance or transactions are incorrect you should restore from a backup.</source> - <translation>Waarschuwing: portomonee bestand is corrupt, data is veiliggesteld! Originele %s is opgeslagen als %s in %s; als uw balans of transacties incorrect zijn dient u een backup terug te zetten.</translation> - </message> - <message> - <source>Whitelist peers connecting from the given IP address (e.g. 1.2.3.4) or CIDR notated network (e.g. 1.2.3.0/24). Can be specified multiple times.</source> - <translation>Goedgekeurde peers die verbinden vanaf een bepaald IP adres (vb. 1.2.3.4) of CIDR genoteerd netwerk (vb. 1.2.3.0/24). Kan meerdere keren worden gespecificeerd.</translation> + <translation>Waarschuwing: portemonnee bestand is corrupt, data is veiliggesteld! Originele %s is opgeslagen als %s in %s; als uw balans of transacties incorrect zijn dient u een backup terug te zetten.</translation> </message> <message> <source>%s is set very high!</source> <translation>%s is zeer hoog ingesteld!</translation> </message> <message> - <source>(default: %s)</source> - <translation>(standaard: %s)</translation> - </message> - <message> - <source>Always query for peer addresses via DNS lookup (default: %u)</source> - <translation>Vind anderen door middel van een DNS-naslag (standaard: %u)</translation> - </message> - <message> - <source>Error loading wallet %s. -wallet filename must be a regular file.</source> - <translation>Fout bij laden van portemonnee %s. -wallet bestandsnaam met een regulier bestand zijn.</translation> - </message> - <message> <source>Error loading wallet %s. Duplicate -wallet filename specified.</source> <translation>Fout bij laden van portemonnee %s. Duplicaat -wallet bestandsnaam opgegeven.</translation> </message> <message> - <source>Error loading wallet %s. Invalid characters in -wallet filename.</source> - <translation>Fout bij laden van portemonnee %s. Ongeldige tekens in -wallet bestandsnaam.</translation> - </message> - <message> - <source>How many blocks to check at startup (default: %u, 0 = all)</source> - <translation>Aantal te checken blokken bij het opstarten (standaard: %u, 0 = allemaal)</translation> - </message> - <message> - <source>Include IP addresses in debug output (default: %u)</source> - <translation>IP-adressen toevoegen in de debuguitvoer (standaard: %u)</translation> - </message> - <message> <source>Keypool ran out, please call keypoolrefill first</source> <translation>Keypool op geraakt, roep alsjeblieft eerst keypoolrefill functie aan</translation> </message> <message> - <source>Listen for JSON-RPC connections on <port> (default: %u or testnet: %u)</source> - <translation>Luister naar JSON-RPC-verbindingen op <poort> (standaard: %u of testnet: %u)</translation> - </message> - <message> - <source>Listen for connections on <port> (default: %u or testnet: %u)</source> - <translation>Luister naar verbindingen op <poort> (standaard: %u of testnet: %u)</translation> - </message> - <message> - <source>Maintain at most <n> connections to peers (default: %u)</source> - <translation>Onderhoud maximaal <n> verbindingen naar peers (standaard: %u)</translation> - </message> - <message> - <source>Make the wallet broadcast transactions</source> - <translation>Laat de portemonnee transacties uitsturen</translation> - </message> - <message> - <source>Maximum per-connection receive buffer, <n>*1000 bytes (default: %u)</source> - <translation>Maximum per-connectie ontvangstbuffer, <n>*1000 bytes (standaard: %u)</translation> - </message> - <message> - <source>Maximum per-connection send buffer, <n>*1000 bytes (default: %u)</source> - <translation>Maximum per-connectie verstuurbuffer, <n>*1000 bytes (standaard: %u)</translation> - </message> - <message> - <source>Prepend debug output with timestamp (default: %u)</source> - <translation>Prepend debug output met tijdstempel (standaard: %u)</translation> - </message> - <message> - <source>Relay and mine data carrier transactions (default: %u)</source> - <translation>Geef gegevensdragertransacties door en mijn ze ook (standaard: %u)</translation> - </message> - <message> - <source>Relay non-P2SH multisig (default: %u)</source> - <translation>Geef non-P2SH multisig door (standaard: %u)</translation> - </message> - <message> - <source>Set key pool size to <n> (default: %u)</source> - <translation>Stel sleutelpoelgrootte in op <n> (standaard: %u)</translation> - </message> - <message> - <source>Set maximum BIP141 block weight (default: %d)</source> - <translation>Zet het BIP141 maximum gewicht van een blok (standaard: %d)</translation> - </message> - <message> - <source>Set the number of threads to service RPC calls (default: %d)</source> - <translation>Stel het aantal threads in om RPC-aanvragen mee te bedienen (standaard: %d)</translation> - </message> - <message> - <source>Specify configuration file (default: %s)</source> - <translation>Specificeer configuratiebestand (standaard: %s)</translation> - </message> - <message> - <source>Specify connection timeout in milliseconds (minimum: 1, default: %d)</source> - <translation>Specificeer de time-out tijd in milliseconden (minimum: 1, standaard: %d)</translation> - </message> - <message> - <source>Specify pid file (default: %s)</source> - <translation>Specificeer pid-bestand (standaard: %s)</translation> - </message> - <message> - <source>Spend unconfirmed change when sending transactions (default: %u)</source> - <translation>Besteed onbevestigd wisselgeld bij het doen van transacties (standaard: %u)</translation> - </message> - <message> <source>Starting network threads...</source> <translation>Netwerkthread starten...</translation> </message> <message> <source>The wallet will avoid paying less than the minimum relay fee.</source> - <translation>De portemonnee vermijdt minder te betalen dan het minimale relay vergoeding.</translation> + <translation>De portemonnee vermijdt minder te betalen dan de minimale doorgeef vergoeding.</translation> </message> <message> <source>This is the minimum transaction fee you pay on every transaction.</source> - <translation>Dit is het minimum transactietarief dat je betaald op elke transactie.</translation> + <translation>Dit is de minimum transactievergoeding dat je betaalt op elke transactie.</translation> </message> <message> <source>This is the transaction fee you will pay if you send a transaction.</source> - <translation>Dit is het transactietarief dat je betaald wanneer je een transactie verstuurt.</translation> - </message> - <message> - <source>Threshold for disconnecting misbehaving peers (default: %u)</source> - <translation>Drempel om verbinding te verbreken naar zich misdragende peers (standaard: %u)</translation> + <translation>Dit is de transactievergoeding dat je betaalt wanneer je een transactie verstuurt.</translation> </message> <message> <source>Transaction amounts must not be negative</source> @@ -4010,6 +3630,26 @@ <translation>Ontoereikend saldo</translation> </message> <message> + <source>Can't generate a change-address key. Private keys are disabled for this wallet.</source> + <translation>Kan geen sleutel genereren voor een wisselgeldadres. Geheime sleutels zijn uitgeschakeld voor deze portemonnee.</translation> + </message> + <message> + <source>Cannot upgrade a non HD split wallet without upgrading to support pre split keypool. Please use -upgradewallet=169900 or -upgradewallet with no version specified.</source> + <translation>Het is niet mogelijk een non HD split portemonnee te upgraden zonder pre split keypool te ondersteunen. Gebruik -upgradewallet=169900 of -upgradewallet zonder een specifiek versie nummer.</translation> + </message> + <message> + <source>Fee estimation failed. Fallbackfee is disabled. Wait a few blocks or enable -fallbackfee.</source> + <translation>Het inschatten van de vergoeding is gefaald. Fallbackfee is uitgeschakeld. Wacht een aantal blocks of schakel -fallbackfee in.</translation> + </message> + <message> + <source>Warning: Private keys detected in wallet {%s} with disabled private keys</source> + <translation>Waarschuwing: Geheime sleutels gedetecteerd in portemonnee {%s} met uitgeschakelde geheime sleutels</translation> + </message> + <message> + <source>Cannot write to data directory '%s'; check permissions.</source> + <translation>Mag niet schrijven naar gegevensmap '%s'; controleer bestandsrechten.</translation> + </message> + <message> <source>Loading block index...</source> <translation>Blokindex aan het laden...</translation> </message> diff --git a/src/qt/locale/bitcoin_pam.ts b/src/qt/locale/bitcoin_pam.ts index b1edaff68d..16c48dad93 100644 --- a/src/qt/locale/bitcoin_pam.ts +++ b/src/qt/locale/bitcoin_pam.ts @@ -30,6 +30,10 @@ <translation>Ilako ya ing kasalungsungan makapiling address keng listahan</translation> </message> <message> + <source>Enter address or label to search</source> + <translation>Magpalub kang address o label para pantunan</translation> + </message> + <message> <source>&Delete</source> <translation>&Ilako</translation> </message> @@ -273,15 +277,7 @@ <source>Command-line options</source> <translation>Pipamilian command-line</translation> </message> - <message> - <source>Usage:</source> - <translation>Pamanggamit:</translation> - </message> - <message> - <source>command-line options</source> - <translation>pipamilian command-line</translation> - </message> - </context> +</context> <context> <name>Intro</name> <message> @@ -536,6 +532,10 @@ <source>Copy &Address</source> <translation>&Kopyan ing address</translation> </message> + <message> + <source>Wallet</source> + <translation>Wallet</translation> + </message> </context> <context> <name>RecentRequestsTableModel</name> @@ -582,6 +582,10 @@ <source>S&end</source> <translation>Ipadala</translation> </message> + <message> + <source>Transaction fee</source> + <translation>Bayad king Transaksion</translation> + </message> </context> <context> <name>SendCoinsEntry</name> @@ -732,42 +736,10 @@ <context> <name>bitcoin-core</name> <message> - <source>Options:</source> - <translation>Pipamilian:</translation> - </message> - <message> - <source>Specify data directory</source> - <translation>Pilinan ing data directory</translation> - </message> - <message> - <source>Connect to a node to retrieve peer addresses, and disconnect</source> - <translation>Kumunekta king note ban ayakua mula reng peer address, at mako king panga konekta</translation> - </message> - <message> - <source>Specify your own public address</source> - <translation>Sabyan me ing kekang pampublikong address</translation> - </message> - <message> - <source>Accept command line and JSON-RPC commands</source> - <translation>Tumanggap command line at JSON-RPC commands</translation> - </message> - <message> - <source>Run in the background as a daemon and accept commands</source> - <translation>Gumana king gulut bilang daemon at tumanggap commands</translation> - </message> - <message> <source>Bitcoin Core</source> <translation>Kapilubluban ning Bitcoin</translation> </message> <message> - <source>Accept connections from outside (default: 1 if no -proxy or -connect)</source> - <translation>Tumanggap koneksion menibat king kilwal (default: 1 if no -proxy or -connect)</translation> - </message> - <message> - <source>Block creation options:</source> - <translation>Pipamilian king pamag-gawang block:</translation> - </message> - <message> <source>Corrupted block database detected</source> <translation>Mekapansin lang me-corrupt a block database</translation> </message> @@ -796,34 +768,14 @@ <translation>&Impormasion</translation> </message> <message> - <source>Send trace/debug info to console instead of debug.log file</source> - <translation>Magpadalang trace/debug info okeng console kesa keng debug.log file</translation> - </message> - <message> <source>Transaction too large</source> <translation>Maragul yang masiadu ing transaksion</translation> </message> <message> - <source>Username for JSON-RPC connections</source> - <translation>Username para king JSON-RPC koneksion</translation> - </message> - <message> <source>Warning</source> <translation>Kapabaluan</translation> </message> <message> - <source>Password for JSON-RPC connections</source> - <translation>Password para king JSON-RPC koneksion</translation> - </message> - <message> - <source>Execute command when the best block changes (%s in cmd is replaced by block hash)</source> - <translation>I-execute ing command istung mialilan ya ing best block (%s in cmd is replaced by block hash)</translation> - </message> - <message> - <source>Allow DNS lookups for -addnode, -seednode and -connect</source> - <translation>Payagan ing pamaglawe DNS para king -addnode, -seednode and -connect</translation> - </message> - <message> <source>Unknown network specified in -onlynet: '%s'</source> <translation>E kilalang network ing mepili king -onlynet: '%s'</translation> </message> diff --git a/src/qt/locale/bitcoin_pl.ts b/src/qt/locale/bitcoin_pl.ts index 90de9167c8..0026841975 100644 --- a/src/qt/locale/bitcoin_pl.ts +++ b/src/qt/locale/bitcoin_pl.ts @@ -30,6 +30,10 @@ <translation>Usuń zaznaczony adres z listy</translation> </message> <message> + <source>Enter address or label to search</source> + <translation>Wprowadź adres albo etykietę aby wyszukać</translation> + </message> + <message> <source>Export the data in the current tab to a file</source> <translation>Eksportuj dane z aktywnej karty do pliku</translation> </message> @@ -132,6 +136,10 @@ <translation>Powtórz nowe hasło</translation> </message> <message> + <source>Show password</source> + <translation>Pokaż hasło</translation> + </message> + <message> <source>Enter the new passphrase to the wallet.<br/>Please use a passphrase of <b>ten or more random characters</b>, or <b>eight or more words</b>.</source> <translation>Wprowadź nowe hasło do portfela.<br/>Proszę używać hasła złożonego z <b>10 lub więcej losowych znaków</b> albo <b>8 lub więcej słów.</b></translation> </message> @@ -318,6 +326,14 @@ <translation>Otwórz URI...</translation> </message> <message> + <source>Wallet:</source> + <translation>Portfel:</translation> + </message> + <message> + <source>default wallet</source> + <translation>domyślny portfel</translation> + </message> + <message> <source>Click to disable network activity.</source> <translation>Kliknij aby wyłączyć aktywność sieciową.</translation> </message> @@ -338,6 +354,10 @@ <translation>Ponowne indeksowanie bloków na dysku...</translation> </message> <message> + <source>Proxy is <b>enabled</b>: %1</source> + <translation>Proxy jest <b>włączone</b>: %1</translation> + </message> + <message> <source>Send coins to a Bitcoin address</source> <translation>Wyślij monety na adres bitcoinowy</translation> </message> @@ -506,6 +526,12 @@ </translation> </message> <message> + <source>Wallet: %1 +</source> + <translation>Portfel: %1 +</translation> + </message> + <message> <source>Type: %1 </source> <translation>Typ: %1 @@ -726,10 +752,6 @@ <translation>&Adres</translation> </message> <message> - <source>New receiving address</source> - <translation>Nowy adres odbiorczy</translation> - </message> - <message> <source>New sending address</source> <translation>Nowy adres wysyłania</translation> </message> @@ -746,8 +768,12 @@ <translation>Wprowadzony adres "%1" nie jest prawidłowym adresem Bitcoin.</translation> </message> <message> - <source>The entered address "%1" is already in the address book.</source> - <translation>Wprowadzony adres "%1" znajduje się już w książce adresowej.</translation> + <source>Address "%1" already exists as a receiving address with label "%2" and so cannot be added as a sending address.</source> + <translation>Adres "%1" już istnieje jako adres odbiorczy z etykietą "%2" i dlatego nie można go dodać jako adresu nadawcy.</translation> + </message> + <message> + <source>The entered address "%1" is already in the address book with label "%2".</source> + <translation>Wprowadzony adres "%1" już istnieje w książce adresowej z opisem "%2".</translation> </message> <message> <source>Could not unlock wallet.</source> @@ -799,42 +825,6 @@ <source>Command-line options</source> <translation>Opcje konsoli</translation> </message> - <message> - <source>Usage:</source> - <translation>Użycie:</translation> - </message> - <message> - <source>command-line options</source> - <translation>opcje konsoli</translation> - </message> - <message> - <source>UI Options:</source> - <translation>Opcje interfejsu</translation> - </message> - <message> - <source>Choose data directory on startup (default: %u)</source> - <translation>Katalog danych używany podczas uruchamiania programu (domyślny: %u)</translation> - </message> - <message> - <source>Set language, for example "de_DE" (default: system locale)</source> - <translation>Wybierz język, na przykład «de_DE» (domyślnie: język systemowy)</translation> - </message> - <message> - <source>Start minimized</source> - <translation>Uruchom zminimalizowany</translation> - </message> - <message> - <source>Set SSL root certificates for payment request (default: -system-)</source> - <translation>Ustaw certyfikaty główne SSL dla żądań płatności (domyślnie: -system-)</translation> - </message> - <message> - <source>Show splash screen on startup (default: %u)</source> - <translation>Wyświetl okno powitalne podczas uruchamiania (domyślnie: %u)</translation> - </message> - <message> - <source>Reset all settings changed in the GUI</source> - <translation>Zresetuj wszystkie ustawienia zmienione w GUI</translation> - </message> </context> <context> <name>Intro</name> @@ -1020,6 +1010,18 @@ <translation>Pakazuje czy dostarczone domyślne SOCKS5 proxy jest użyte do połączenia z węzłami przez sieć tego typu.</translation> </message> <message> + <source>Use separate SOCKS&5 proxy to reach peers via Tor hidden services:</source> + <translation>Użyj oddzielnego proxy SOCKS&5 aby osiągnąć węzły w ukrytych usługach Tor:</translation> + </message> + <message> + <source>Hide the icon from the system tray.</source> + <translation>Ukryj ikonę z zasobnika systemowego.</translation> + </message> + <message> + <source>&Hide tray icon</source> + <translation>&Ukryj ikonę z zasobnika</translation> + </message> + <message> <source>Minimize instead of exit the application when the window is closed. When this option is enabled, the application will be closed only after selecting Exit in the menu.</source> <translation>Minimalizuje zamiast zakończyć działanie programu przy zamykaniu okna. Kiedy ta opcja jest włączona, program zakończy działanie po wybieraniu Zamknij w menu.</translation> </message> @@ -1052,6 +1054,22 @@ <translation>&Sieć</translation> </message> <message> + <source>Disables some advanced features but all blocks will still be fully validated. Reverting this setting requires re-downloading the entire blockchain. Actual disk usage may be somewhat higher.</source> + <translation>Wyłącza niektóre zaawansowane funkcje, ale wszystkie bloki nadal będą w pełni sprawdzane. Przywrócenie tego ustawienia wymaga ponownego pobrania całego łańcucha bloków. Rzeczywiste wykorzystanie dysku może być nieco wyższe.</translation> + </message> + <message> + <source>Prune &block storage to</source> + <translation>Przytnij magazyn &bloków do</translation> + </message> + <message> + <source>GB</source> + <translation>GB</translation> + </message> + <message> + <source>Reverting this setting requires re-downloading the entire blockchain.</source> + <translation>Cofnięcie tego ustawienia wymaga ponownego załadowania całego łańcucha bloków.</translation> + </message> + <message> <source>(0 = auto, <0 = leave that many cores free)</source> <translation>(0 = automatycznie, <0 = zostaw tyle wolnych rdzeni)</translation> </message> @@ -1084,6 +1102,14 @@ <translation>Mapuj port używając &UPnP</translation> </message> <message> + <source>Accept connections from outside.</source> + <translation>Akceptuj połączenia z zewnątrz.</translation> + </message> + <message> + <source>Allow incomin&g connections</source> + <translation>Zezwól na &połączenia przychodzące</translation> + </message> + <message> <source>Connect to the Bitcoin network through a SOCKS5 proxy.</source> <translation>Połącz się z siecią Bitcoin poprzez proxy SOCKS5.</translation> </message> @@ -1164,6 +1190,10 @@ <translation>Wybierz pokazywanie lub nie funkcji kontroli monet.</translation> </message> <message> + <source>&Third party transaction URLs</source> + <translation>&Zewnętrzny URL podglądu transakcji</translation> + </message> + <message> <source>&OK</source> <translation>&OK</translation> </message> @@ -1306,6 +1336,10 @@ <translation>Obsługa URI</translation> </message> <message> + <source>'bitcoin://' is not a valid URI. Use 'bitcoin:' instead.</source> + <translation>'bitcoin://' nie jest poprawnym URI. Użyj 'bitcoin:'.</translation> + </message> + <message> <source>Payment request fetch URL is invalid: %1</source> <translation>URL pobrania żądania zapłaty jest nieprawidłowy: %1</translation> </message> @@ -1503,12 +1537,16 @@ <context> <name>QObject::QObject</name> <message> + <source>Error parsing command line arguments: %1.</source> + <translation>Błąd podczas analizowania argumentów wiersza poleceń: %1.</translation> + </message> + <message> <source>Error: Specified data directory "%1" does not exist.</source> <translation>Błąd: Określony folder danych "%1" nie istnieje.</translation> </message> <message> - <source>Error: Cannot parse configuration file: %1. Only use key=value syntax.</source> - <translation>Błąd: Nie można przetworzyć pliku konfiguracyjnego: %1. Używaj tylko składni klucz=wartość.</translation> + <source>Error: Cannot parse configuration file: %1.</source> + <translation>Błąd: nie można przeanalizować pliku konfiguracyjnego: %1.</translation> </message> <message> <source>Error: %1</source> @@ -1601,6 +1639,14 @@ <translation>Zużycie pamięci</translation> </message> <message> + <source>Wallet: </source> + <translation>Portfel:</translation> + </message> + <message> + <source>(none)</source> + <translation>(brak)</translation> + </message> + <message> <source>&Reset</source> <translation>&Reset</translation> </message> @@ -1769,6 +1815,10 @@ <translation>&Odblokuj</translation> </message> <message> + <source>default wallet</source> + <translation>domyślny portfel</translation> + </message> + <message> <source>Welcome to the %1 RPC console.</source> <translation>Witaj w konsoli %1 RPC.</translation> </message> @@ -1777,6 +1827,14 @@ <translation>Użyj strzałek do przewijania historii i %1 aby wyczyścić ekran</translation> </message> <message> + <source>Type %1 for an overview of available commands.</source> + <translation>Wpisz %1 aby uzyskać listę dostępnych komend.</translation> + </message> + <message> + <source>For more information on using this console type %1.</source> + <translation>Aby uzyskać więcej informacji jak używać tej konsoli wpisz %1.</translation> + </message> + <message> <source>WARNING: Scammers have been active, telling users to type commands here, stealing their wallet contents. Do not use this console without fully understanding the ramifications of a command.</source> <translation>UWAGA: Oszuści nakłaniają do wpisywania tutaj różnych poleceń aby ukraść portfel. Nie używaj tej konsoli bez pełnego zrozumienia wpisywanych poleceń.</translation> </message> @@ -1785,6 +1843,14 @@ <translation>Aktywność sieciowa wyłączona</translation> </message> <message> + <source>Executing command without any wallet</source> + <translation>Wykonuję komendę bez portfela</translation> + </message> + <message> + <source>Executing command using "%1" wallet</source> + <translation>Wykonuję komendę używając portfela "%1"</translation> + </message> + <message> <source>(node id: %1)</source> <translation>(id węzła: %1)</translation> </message> @@ -1856,6 +1922,14 @@ <translation>Wyczyść</translation> </message> <message> + <source>Native segwit addresses (aka Bech32 or BIP-173) reduce your transaction fees later on and offer better protection against typos, but old wallets don't support them. When unchecked, an address compatible with older wallets will be created instead.</source> + <translation>Natywne adresy segwit (aka Bech32 lub BIP-173) zmniejszają później twoje opłaty transakcyjne i dają lepsze zabezpieczenie przed literówkami, ale stare portfele ich nie obsługują. Jeżeli odznaczone, stworzony zostanie adres kompatybilny ze starszymi portfelami.</translation> + </message> + <message> + <source>Generate native segwit (Bech32) address</source> + <translation>Wygeneruj natywny adres segwit (Bech32)</translation> + </message> + <message> <source>Requested payments history</source> <translation>Żądanie historii płatności</translation> </message> @@ -1943,6 +2017,10 @@ <translation>Wiadomość</translation> </message> <message> + <source>Wallet</source> + <translation>Portfel</translation> + </message> + <message> <source>Resulting URI too long, try to reduce the text for label / message.</source> <translation>Wynikowy URI jest zbyt długi, spróbuj zmniejszyć tekst etykiety / wiadomości</translation> </message> @@ -2045,6 +2123,11 @@ <translation>Wybierz...</translation> </message> <message> + <source>Using the fallbackfee can result in sending a transaction that will take several hours or days (or never) to confirm. Consider choosing your fee manually or wait until you have validated the complete chain.</source> + <translation>206/5000 +Korzystanie z opłaty domyślnej może skutkować wysłaniem transakcji, która potwierdzi się w kilka godzin lub dni (lub nigdy). Rozważ wybranie opłaty ręcznie lub poczekaj, aż sprawdzisz poprawność całego łańcucha.</translation> + </message> + <message> <source>Warning: Fee estimation is currently not possible.</source> <translation>Uwaga: Oszacowanie opłaty za transakcje jest aktualnie niemożliwe.</translation> </message> @@ -2053,12 +2136,16 @@ <translation>zwiń opcje opłaty</translation> </message> <message> - <source>per kilobyte</source> - <translation>za kilobajt</translation> + <source>Specify a custom fee per kB (1,000 bytes) of the transaction's virtual size. + +Note: Since the fee is calculated on a per-byte basis, a fee of "100 satoshis per kB" for a transaction size of 500 bytes (half of 1 kB) would ultimately yield a fee of only 50 satoshis.</source> + <translation>Określ niestandardową opłatę za kB (1000 bajtów) wirtualnego rozmiaru transakcji. + +Uwaga: Ponieważ opłata jest naliczana za każdy bajt, opłata "100 satoshi za kB" w przypadku transakcji o wielkości 500 bajtów (połowa 1 kB) ostatecznie da opłatę w wysokości tylko 50 satoshi.</translation> </message> <message> - <source>If the custom fee is set to 1000 satoshis and the transaction is only 250 bytes, then "per kilobyte" only pays 250 satoshis in fee, while "total at least" pays 1000 satoshis. For transactions bigger than a kilobyte both pay by kilobyte.</source> - <translation>Jeżeli własna opłata zostanie ustawiona na 1000 satoshi, a transakcja będzie miała tylko 250 bajtów, to "za kilobajt" płaci tylko 250 satoshi, podczas gdy, "razem przynajmniej" płaci 1000 satoshi. Przy transakcjach większych niż kilobajt, w obu przypadkach płaci za każdy kilobajt.</translation> + <source>per kilobyte</source> + <translation>za kilobajt</translation> </message> <message> <source>Hide</source> @@ -2105,6 +2192,14 @@ <translation>Docelowy czas potwierdzenia:</translation> </message> <message> + <source>Enable Replace-By-Fee</source> + <translation>Włącz RBF (podmiana transakcji przez podniesienie opłaty)</translation> + </message> + <message> + <source>With Replace-By-Fee (BIP-125) you can increase a transaction's fee after it is sent. Without this, a higher fee may be recommended to compensate for increased transaction delay risk.</source> + <translation>Dzięki podmień-przez-opłatę (RBF, BIP-125) możesz podnieść opłatę transakcyjną już wysłanej transakcji. Bez tego, może być rekomendowana większa opłata aby zmniejszyć ryzyko opóźnienia zatwierdzenia transakcji.</translation> + </message> + <message> <source>Clear &All</source> <translation>Wyczyść &wszystko</translation> </message> @@ -2161,16 +2256,32 @@ <translation>Czy na pewno chcesz wysłać?</translation> </message> <message> - <source>added as transaction fee</source> - <translation>dodano jako opłata transakcyjna</translation> + <source>or</source> + <translation>lub</translation> </message> <message> - <source>Total Amount %1</source> - <translation>Łączna kwota %1</translation> + <source>You can increase the fee later (signals Replace-By-Fee, BIP-125).</source> + <translation>Możesz później zwiększyć opłatę (sygnalizuje podmień-przez-opłatę (RBF), BIP 125).</translation> </message> <message> - <source>or</source> - <translation>lub</translation> + <source>from wallet %1</source> + <translation>z portfela %1</translation> + </message> + <message> + <source>Please, review your transaction.</source> + <translation>Proszę, zweryfikuj swoją transakcję.</translation> + </message> + <message> + <source>Transaction fee</source> + <translation>Opłata transakcyjna</translation> + </message> + <message> + <source>Not signalling Replace-By-Fee, BIP-125.</source> + <translation>Nie sygnalizuje podmień-przez-opłatę (RBF), BIP-125</translation> + </message> + <message> + <source>Total Amount</source> + <translation>Łączna wartość</translation> </message> <message> <source>Confirm send coins</source> @@ -2216,6 +2327,10 @@ <source>Pay only the required fee of %1</source> <translation>Zapłać tylko wymaganą opłatę w wysokości %1</translation> </message> + <message numerus="yes"> + <source>Estimated to begin confirmation within %n block(s).</source> + <translation><numerusform>Przybliżony czas rozpoczęcia zatwierdzenia: %n blok.</numerusform><numerusform>Przybliżony czas rozpoczęcia zatwierdzenia: %n bloki.</numerusform><numerusform>Przybliżony czas rozpoczęcia zatwierdzenia: %n bloków.</numerusform><numerusform>Przybliżony czas rozpoczęcia zatwierdzenia: %n bloków.</numerusform></translation> + </message> <message> <source>Warning: Invalid Bitcoin address</source> <translation>Ostrzeżenie: nieprawidłowy adres Bitcoin</translation> @@ -2229,6 +2344,10 @@ <translation>Potwierdź zmianę adresu własnego</translation> </message> <message> + <source>The address you selected for change is not part of this wallet. Any or all funds in your wallet may be sent to this address. Are you sure?</source> + <translation>Wybrany adres reszty nie jest częścią tego portfela. Dowolne lub wszystkie środki w twoim portfelu mogą być wysyłane na ten adres. Jesteś pewny?</translation> + </message> + <message> <source>(no label)</source> <translation>(brak etykiety)</translation> </message> @@ -2284,6 +2403,10 @@ <translation>Odejmij od wysokości opłaty</translation> </message> <message> + <source>Use available balance</source> + <translation>Użyj dostępnego salda</translation> + </message> + <message> <source>Message:</source> <translation>Wiadomość:</translation> </message> @@ -2503,10 +2626,6 @@ Zwróć uwagę, że poprawnie zweryfikowana wiadomość potwierdza to, że nadaw <translation>sprzeczny z transakcją posiadającą %1 potwierdzeń</translation> </message> <message> - <source>%1/offline</source> - <translation>%1/offline</translation> - </message> - <message> <source>0/unconfirmed, %1</source> <translation>0/niezatwierdzone, %1</translation> </message> @@ -2535,14 +2654,6 @@ Zwróć uwagę, że poprawnie zweryfikowana wiadomość potwierdza to, że nadaw <translation>Status</translation> </message> <message> - <source>, has not been successfully broadcast yet</source> - <translation>, nie został jeszcze pomyślnie rozesłany</translation> - </message> - <message numerus="yes"> - <source>, broadcast through %n node(s)</source> - <translation><numerusform>, przekazywany przez %n węzeł</numerusform><numerusform>, przekazywany przez %n węzły</numerusform><numerusform>, przekazywany przez %n węzłów</numerusform><numerusform>, przekazywany przez %n węzłów</numerusform></translation> - </message> - <message> <source>Date</source> <translation>Data</translation> </message> @@ -2582,6 +2693,10 @@ Zwróć uwagę, że poprawnie zweryfikowana wiadomość potwierdza to, że nadaw <source>Credit</source> <translation>Uznanie</translation> </message> + <message numerus="yes"> + <source>matures in %n more block(s)</source> + <translation><numerusform>dojrzeje po %n kolejnym bloku</numerusform><numerusform>dojrzeje po %n kolejnych blokach</numerusform><numerusform>dojrzeje po %n kolejnych blokach</numerusform><numerusform>dojrzeje po %n kolejnych blokach</numerusform></translation> + </message> <message> <source>not accepted</source> <translation>niezaakceptowane</translation> @@ -2591,6 +2706,14 @@ Zwróć uwagę, że poprawnie zweryfikowana wiadomość potwierdza to, że nadaw <translation>Debet</translation> </message> <message> + <source>Total debit</source> + <translation>Łączne obciążenie</translation> + </message> + <message> + <source>Total credit</source> + <translation>Łączne uznanie</translation> + </message> + <message> <source>Transaction fee</source> <translation>Opłata transakcyjna</translation> </message> @@ -2615,6 +2738,10 @@ Zwróć uwagę, że poprawnie zweryfikowana wiadomość potwierdza to, że nadaw <translation>Rozmiar transakcji</translation> </message> <message> + <source>Transaction virtual size</source> + <translation>Wirtualny rozmiar transakcji</translation> + </message> + <message> <source>Output index</source> <translation>Indeks wyjściowy</translation> </message> @@ -2623,6 +2750,10 @@ Zwróć uwagę, że poprawnie zweryfikowana wiadomość potwierdza to, że nadaw <translation>Kupiec</translation> </message> <message> + <source>Generated coins must mature %1 blocks before they can be spent. When you generated this block, it was broadcast to the network to be added to the block chain. If it fails to get into the chain, its state will change to "not accepted" and it won't be spendable. This may occasionally happen if another node generates a block within a few seconds of yours.</source> + <translation>Wygenerowane monety muszą dojrzeć przez %1 bloków zanim będzie można je wydać. Gdy wygenerowałeś blok, został on rozgłoszony w sieci w celu dodania do łańcucha bloków. Jeżeli nie uda mu się wejść do łańcucha jego status zostanie zmieniony na "nie zaakceptowano" i nie będzie można go wydać. To czasem zdarza się gdy inny węzeł wygeneruje blok w kilka sekund od twojego.</translation> + </message> + <message> <source>Debug information</source> <translation>Informacje debugowania</translation> </message> @@ -2681,10 +2812,6 @@ Zwróć uwagę, że poprawnie zweryfikowana wiadomość potwierdza to, że nadaw <translation>Otwórz do %1</translation> </message> <message> - <source>Offline</source> - <translation>Offline</translation> - </message> - <message> <source>Unconfirmed</source> <translation>Niepotwierdzone</translation> </message> @@ -2709,10 +2836,6 @@ Zwróć uwagę, że poprawnie zweryfikowana wiadomość potwierdza to, że nadaw <translation>Niedojrzała (%1 potwierdzeń, będzie dostępna po %2)</translation> </message> <message> - <source>This block was not received by any other nodes and will probably not be accepted!</source> - <translation>Ten blok nie został odebrany przez jakikolwiek inny węzeł i prawdopodobnie nie zostanie zaakceptowany!</translation> - </message> - <message> <source>Generated but not accepted</source> <translation>Wygenerowane ale nie zaakceptowane</translation> </message> @@ -2760,7 +2883,19 @@ Zwróć uwagę, że poprawnie zweryfikowana wiadomość potwierdza to, że nadaw <source>Type of transaction.</source> <translation>Rodzaj transakcji.</translation> </message> - </context> + <message> + <source>Whether or not a watch-only address is involved in this transaction.</source> + <translation>Czy adres tylko-obserwowany jest lub nie użyty w tej transakcji.</translation> + </message> + <message> + <source>User-defined intent/purpose of the transaction.</source> + <translation>Zdefiniowana przez użytkownika intencja/cel transakcji.</translation> + </message> + <message> + <source>Amount removed from or added to balance.</source> + <translation>Kwota odjęta z lub dodana do konta.</translation> + </message> +</context> <context> <name>TransactionView</name> <message> @@ -2812,6 +2947,10 @@ Zwróć uwagę, że poprawnie zweryfikowana wiadomość potwierdza to, że nadaw <translation>Inne</translation> </message> <message> + <source>Enter address, transaction id, or label to search</source> + <translation>Wprowadź adres, identyfikator transakcji lub etykietę żeby wyszukać</translation> + </message> + <message> <source>Min amount</source> <translation>Minimalna kwota</translation> </message> @@ -2868,6 +3007,10 @@ Zwróć uwagę, że poprawnie zweryfikowana wiadomość potwierdza to, że nadaw <translation>Potwierdzony</translation> </message> <message> + <source>Watch-only</source> + <translation>Tylko-obserwowany</translation> + </message> + <message> <source>Date</source> <translation>Data</translation> </message> @@ -2957,6 +3100,10 @@ Zwróć uwagę, że poprawnie zweryfikowana wiadomość potwierdza to, że nadaw <translation>Nowa opłata:</translation> </message> <message> + <source>Confirm fee bump</source> + <translation>Potwierdź zwiększenie opłaty</translation> + </message> + <message> <source>Can't sign transaction.</source> <translation>Nie można podpisać transakcji.</translation> </message> @@ -2999,38 +3146,18 @@ Zwróć uwagę, że poprawnie zweryfikowana wiadomość potwierdza to, że nadaw <source>The wallet data was successfully saved to %1.</source> <translation>Dane portfela zostały poprawnie zapisane w %1.</translation> </message> + <message> + <source>Cancel</source> + <translation>Anuluj</translation> + </message> </context> <context> <name>bitcoin-core</name> <message> - <source>Options:</source> - <translation>Opcje:</translation> - </message> - <message> - <source>Specify data directory</source> - <translation>Wskaż folder danych</translation> - </message> - <message> - <source>Connect to a node to retrieve peer addresses, and disconnect</source> - <translation>Podłącz się do węzła aby otrzymać adresy peerów i rozłącz</translation> - </message> - <message> - <source>Specify your own public address</source> - <translation>Podaj swój publiczny adres</translation> - </message> - <message> - <source>Accept command line and JSON-RPC commands</source> - <translation>Akceptuj linię poleceń oraz polecenia JSON-RPC</translation> - </message> - <message> <source>Distributed under the MIT software license, see the accompanying file %s or %s</source> <translation>Rozprowadzane na licencji MIT, zobacz dołączony plik %s lub %s</translation> </message> <message> - <source>If <category> is not supplied or if <category> = 1, output all debugging information.</source> - <translation>Jeżeli <category> nie zostanie określona lub <category> = 1, wyświetl wszystkie informacje debugowania.</translation> - </message> - <message> <source>Prune configured below the minimum of %d MiB. Please use a higher number.</source> <translation>Przycinanie skonfigurowano poniżej minimalnych %d MiB. Proszę użyć wyższej liczby.</translation> </message> @@ -3047,18 +3174,10 @@ Zwróć uwagę, że poprawnie zweryfikowana wiadomość potwierdza to, że nadaw <translation>Błąd: Wystąpił fatalny błąd wewnętrzny, sprawdź szczegóły w debug.log</translation> </message> <message> - <source>Fee (in %s/kB) to add to transactions you send (default: %s)</source> - <translation>Prowizja (w %s/kB) dodawana do wysyłanych transakcji (domyślnie: %s)</translation> - </message> - <message> <source>Pruning blockstore...</source> <translation>Przycinanie zapisu bloków...</translation> </message> <message> - <source>Run in the background as a daemon and accept commands</source> - <translation>Uruchom w tle jako daemon i przyjmuj polecenia</translation> - </message> - <message> <source>Unable to start HTTP server. See debug log for details.</source> <translation>Uruchomienie serwera HTTP nie powiodło się. Zobacz dziennik debugowania, aby uzyskać więcej szczegółów.</translation> </message> @@ -3071,94 +3190,74 @@ Zwróć uwagę, że poprawnie zweryfikowana wiadomość potwierdza to, że nadaw <translation>Deweloperzy %s</translation> </message> <message> - <source>A fee rate (in %s/kB) that will be used when fee estimation has insufficient data (default: %s)</source> - <translation>Stawka prowizji (w %s/kB), która będzie użyta, gdy oszacowane dane o prowizjach nie będą wystarczające (domyślnie: %s)</translation> - </message> - <message> - <source>Accept relayed transactions received from whitelisted peers even when not relaying transactions (default: %d)</source> - <translation>Accept relayed transactions received from whitelisted peers even when not relaying transactions (default: %d)</translation> - </message> - <message> - <source>Bind to given address and always listen on it. Use [host]:port notation for IPv6</source> - <translation>Skojarz z podanym adresem i nasłuchuj na nim. Użyj formatu [host]:port dla IPv6</translation> - </message> - <message> <source>Cannot obtain a lock on data directory %s. %s is probably already running.</source> <translation>Nie można uzyskać blokady na katalogu z danymi %s. %s najprawdopodobniej jest już uruchomiony.</translation> </message> <message> - <source>Delete all wallet transactions and only recover those parts of the blockchain through -rescan on startup</source> - <translation>Usuwa wszystkie transakcje w portfelu i tylko odtwarza te części z łańcucha bloków poprzez -rescan przy starcie</translation> + <source>Cannot provide specific connections and have addrman find outgoing connections at the same.</source> + <translation>Nie można podać określonych połączeń i jednocześnie mieć addrman szukającego połączeń wychodzących.</translation> </message> <message> <source>Error reading %s! All keys read correctly, but transaction data or address book entries might be missing or incorrect.</source> <translation>Błąd odczytu %s! Wszystkie klucze zostały odczytane poprawnie, ale może brakować danych transakcji lub wpisów w książce adresowej, lub mogą one być nieprawidłowe.</translation> </message> <message> - <source>Execute command when a wallet transaction changes (%s in cmd is replaced by TxID)</source> - <translation>Wykonaj polecenie, kiedy transakcja portfela ulegnie zmianie (%s w poleceniu zostanie zastąpione przez TxID)</translation> - </message> - <message> <source>Please check that your computer's date and time are correct! If your clock is wrong, %s will not work properly.</source> <translation>Proszę sprawdzić czy data i czas na Twoim komputerze są poprawne! Jeżeli ustawienia zegara będą złe, %s nie będzie działał prawidłowo.</translation> </message> <message> - <source>Set the number of script verification threads (%u to %d, 0 = auto, <0 = leave that many cores free, default: %d)</source> - <translation>Ustaw liczbę wątków skryptu weryfikacyjnego (%u do %d, 0 = auto, <0 = zostaw tyle rdzeni wolnych, domyślnie: %d)</translation> + <source>Please contribute if you find %s useful. Visit %s for further information about the software.</source> + <translation>Wspomóż proszę, jeśli uznasz %s za użyteczne. Odwiedź %s, aby uzyskać więcej informacji o tym oprogramowaniu.</translation> </message> <message> - <source>Use UPnP to map the listening port (default: 1 when listening and no -proxy)</source> - <translation>Użyj UPnP do mapowania portu nasłuchu (domyślnie: 1 gdy nasłuchuje i brak -proxy)</translation> + <source>The block database contains a block which appears to be from the future. This may be due to your computer's date and time being set incorrectly. Only rebuild the block database if you are sure that your computer's date and time are correct</source> + <translation>Baza bloków zawiera blok, który wydaje się pochodzić z przyszłości. Może to wynikać z nieprawidłowego ustawienia daty i godziny Twojego komputera. Bazę danych bloków dobuduj tylko, jeśli masz pewność, że data i godzina twojego komputera są poprawne</translation> </message> <message> - <source>Warning: The network does not appear to fully agree! Some miners appear to be experiencing issues.</source> - <translation>Ostrzeżenie: Sieć nie wydaje się w pełni zgodna! Niektórzy górnicy wydają się doświadczać problemów.</translation> + <source>This is a pre-release test build - use at your own risk - do not use for mining or merchant applications</source> + <translation>To jest wersja testowa - używać na własne ryzyko - nie używać do kopania albo zastosowań komercyjnych.</translation> </message> <message> - <source>%s corrupt, salvage failed</source> - <translation>%s uszkodzony, odtworzenie się nie powiodło</translation> + <source>This is the transaction fee you may discard if change is smaller than dust at this level</source> + <translation>To jest opłata transakcyjna jaką odrzucisz, jeżeli reszta jest mniejsza niż "dust" na tym poziomie</translation> </message> <message> - <source>-maxmempool must be at least %d MB</source> - <translation>-maxmempool musi być przynajmniej %d MB</translation> + <source>Unable to replay blocks. You will need to rebuild the database using -reindex-chainstate.</source> + <translation>Nie można przetworzyć bloków. Konieczne będzie przebudowanie bazy danych za pomocą -reindex-chainstate.</translation> </message> <message> - <source><category> can be:</source> - <translation><category> mogą być:</translation> + <source>Unable to rewind the database to a pre-fork state. You will need to redownload the blockchain</source> + <translation>Nie można cofnąć bazy danych do stanu z przed forka. Konieczne jest ponowne pobranie łańcucha bloków</translation> </message> <message> - <source>Accept connections from outside (default: 1 if no -proxy or -connect)</source> - <translation>Akceptuj połączenia z zewnątrz (domyślnie: 1 jeśli nie ustawiono -proxy lub -connect)</translation> + <source>Warning: The network does not appear to fully agree! Some miners appear to be experiencing issues.</source> + <translation>Ostrzeżenie: Sieć nie wydaje się w pełni zgodna! Niektórzy górnicy wydają się doświadczać problemów.</translation> </message> <message> - <source>Append comment to the user agent string</source> - <translation>Dodaj komentarz do pola user agent</translation> + <source>Warning: We do not appear to fully agree with our peers! You may need to upgrade, or other nodes may need to upgrade.</source> + <translation>Uwaga: Wygląda na to, że nie ma pełnej zgodności z naszymi węzłami! Możliwe, że potrzebujesz aktualizacji bądź inne węzły jej potrzebują</translation> </message> <message> - <source>Attempt to recover private keys from a corrupt wallet on startup</source> - <translation>Próbuj odzyskać klucze prywatne z uszkodzonego portfela podczas uruchamiania.</translation> + <source>%d of last 100 blocks have unexpected version</source> + <translation>%d z ostatnich 100 bloków ma nieoczekiwaną wersję</translation> </message> <message> - <source>Block creation options:</source> - <translation>Opcje tworzenia bloku:</translation> + <source>%s corrupt, salvage failed</source> + <translation>%s uszkodzony, odtworzenie się nie powiodło</translation> </message> <message> - <source>Cannot resolve -%s address: '%s'</source> - <translation>Nie można rozpoznać -%s adresu: '%s'</translation> + <source>-maxmempool must be at least %d MB</source> + <translation>-maxmempool musi być przynajmniej %d MB</translation> </message> <message> - <source>Chain selection options:</source> - <translation>Opcje zmiany łańcucha.</translation> + <source>Cannot resolve -%s address: '%s'</source> + <translation>Nie można rozpoznać -%s adresu: '%s'</translation> </message> <message> <source>Change index out of range</source> <translation>Index zmian poza zasięgiem.</translation> </message> <message> - <source>Connection options:</source> - <translation>Opcje połączenia:</translation> - </message> - <message> <source>Copyright (C) %i-%i</source> <translation>Prawa autorskie (C) %i-%i</translation> </message> @@ -3167,32 +3266,12 @@ Zwróć uwagę, że poprawnie zweryfikowana wiadomość potwierdza to, że nadaw <translation>Wykryto uszkodzoną bazę bloków</translation> </message> <message> - <source>Debugging/Testing options:</source> - <translation>Opcje debugowania/testowania:</translation> - </message> - <message> - <source>Do not load the wallet and disable wallet RPC calls</source> - <translation>Nie ładuj portfela i wyłącz wywołania RPC portfela</translation> - </message> - <message> <source>Do you want to rebuild the block database now?</source> <translation>Czy chcesz teraz przebudować bazę bloków?</translation> </message> <message> - <source>Enable publish hash block in <address></source> - <translation>Włącz wyświetlanie hasha bloku w <address></translation> - </message> - <message> - <source>Enable publish hash transaction in <address></source> - <translation>Umożliw publikacje tranzakcji haszowej w <address></translation> - </message> - <message> - <source>Enable publish raw block in <address></source> - <translation>Włącz wyświetlanie hasha bloku w <address></translation> - </message> - <message> - <source>Enable publish raw transaction in <address></source> - <translation>Umożliw publikację transakcji haszowej w <address></translation> + <source>Error creating %s: You can't create non-HD wallets with this version.</source> + <translation>Błąd podczas tworzenia %s: nie można założyć portfela nie-HD tą wersją.</translation> </message> <message> <source>Error initializing block database</source> @@ -3207,6 +3286,10 @@ Zwróć uwagę, że poprawnie zweryfikowana wiadomość potwierdza to, że nadaw <translation>Błąd ładowania %s</translation> </message> <message> + <source>Error loading %s: Private keys can only be disabled during creation</source> + <translation>Błąd ładowania %s: Klucze prywatne mogą być wyłączone tylko podczas tworzenia</translation> + </message> + <message> <source>Error loading %s: Wallet corrupted</source> <translation>Błąd ładowania %s: Uszkodzony portfel</translation> </message> @@ -3231,6 +3314,10 @@ Zwróć uwagę, że poprawnie zweryfikowana wiadomość potwierdza to, że nadaw <translation>Próba nasłuchiwania na jakimkolwiek porcie nie powiodła się. Użyj -listen=0 jeśli tego chcesz.</translation> </message> <message> + <source>Failed to rescan the wallet during initialization</source> + <translation>Nie udało się ponownie przeskanować portfela podczas inicjalizacji.</translation> + </message> + <message> <source>Importing...</source> <translation>Importowanie…</translation> </message> @@ -3255,8 +3342,8 @@ Zwróć uwagę, że poprawnie zweryfikowana wiadomość potwierdza to, że nadaw <translation>Nieprawidłowa kwota dla -fallbackfee=<amount>: '%s'</translation> </message> <message> - <source>Keep the transaction memory pool below <n> megabytes (default: %u)</source> - <translation>Utrzymuj obszar pamięci dla transakcji poniżej <n> MB (default: %u)</translation> + <source>Upgrading txindex database</source> + <translation>Aktualizowanie bazy txindex</translation> </message> <message> <source>Loading P2P addresses...</source> @@ -3267,26 +3354,10 @@ Zwróć uwagę, że poprawnie zweryfikowana wiadomość potwierdza to, że nadaw <translation>Ładowanie listy zablokowanych...</translation> </message> <message> - <source>Location of the auth cookie (default: data dir)</source> - <translation>Lokalizacja autoryzacyjnego pliku cookie (domyślnie: ścieżka danych)</translation> - </message> - <message> <source>Not enough file descriptors available.</source> <translation>Brak wystarczającej liczby deskryptorów plików. </translation> </message> <message> - <source>Only connect to nodes in network <net> (ipv4, ipv6 or onion)</source> - <translation>Łącz z węzłami tylko w sieci <net> (ipv4, piv6 lub onion)</translation> - </message> - <message> - <source>Print this help message and exit</source> - <translation>Wyświetl ten tekst pomocy i wyjdź</translation> - </message> - <message> - <source>Print version and exit</source> - <translation>Wyświetl wersję i wyjdź</translation> - </message> - <message> <source>Prune cannot be configured with a negative value.</source> <translation>Przycinanie nie może być skonfigurowane z negatywną wartością.</translation> </message> @@ -3295,14 +3366,6 @@ Zwróć uwagę, że poprawnie zweryfikowana wiadomość potwierdza to, że nadaw <translation>Tryb ograniczony jest niekompatybilny z -txindex.</translation> </message> <message> - <source>Rebuild chain state and block index from the blk*.dat files on disk</source> - <translation>Odbuduj stan lańcucha i indeks bloków z obecnych na dysku plików blk*.dat</translation> - </message> - <message> - <source>Rebuild chain state from the currently indexed blocks</source> - <translation>Odbuduj stan łańcucha z aktualnie zindeksowanych bloków</translation> - </message> - <message> <source>Replaying blocks...</source> <translation>Weryfikacja bloków...</translation> </message> @@ -3311,14 +3374,6 @@ Zwróć uwagę, że poprawnie zweryfikowana wiadomość potwierdza to, że nadaw <translation>Przewijanie bloków...</translation> </message> <message> - <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> - <source>Specify wallet file (within data directory)</source> - <translation>Określ plik portfela (w obrębie folderu danych)</translation> - </message> - <message> <source>The source code is available from %s.</source> <translation>Kod źródłowy dostępny jest z %s.</translation> </message> @@ -3331,6 +3386,10 @@ Zwróć uwagę, że poprawnie zweryfikowana wiadomość potwierdza to, że nadaw <translation>Nie można przywiązać do %s na tym komputerze. %s prawdopodobnie jest już uruchomiony.</translation> </message> <message> + <source>Unable to generate keys</source> + <translation>Nie można wygenerować kluczy</translation> + </message> + <message> <source>Unsupported argument -benchmark ignored, use -debug=bench.</source> <translation>Niewspierany argument -benchmark zignorowany, użyj -debug=bench.</translation> </message> @@ -3347,12 +3406,8 @@ Zwróć uwagę, że poprawnie zweryfikowana wiadomość potwierdza to, że nadaw <translation>Nieobsługiwana kategoria rejestrowania %s=%s.</translation> </message> <message> - <source>Use UPnP to map the listening port (default: %u)</source> - <translation>Użyj UPnP do przekazania portu nasłuchu (domyślnie : %u)</translation> - </message> - <message> - <source>Use the test chain</source> - <translation>Użyj łańcucha testowego</translation> + <source>Upgrading UTXO database</source> + <translation>Aktualizowanie bazy danych UTXO</translation> </message> <message> <source>User Agent comment (%s) contains unsafe characters.</source> @@ -3363,80 +3418,28 @@ Zwróć uwagę, że poprawnie zweryfikowana wiadomość potwierdza to, że nadaw <translation>Weryfikacja bloków...</translation> </message> <message> - <source>Wallet debugging/testing options:</source> - <translation>Opcje debugowania/testowania portfela:</translation> - </message> - <message> <source>Wallet needed to be rewritten: restart %s to complete</source> <translation>Portfel wymaga przepisania: zrestartuj %s aby ukończyć</translation> </message> <message> - <source>Wallet options:</source> - <translation>Opcje portfela:</translation> - </message> - <message> - <source>Allow JSON-RPC connections from specified source. Valid for <ip> are a single IP (e.g. 1.2.3.4), a network/netmask (e.g. 1.2.3.4/255.255.255.0) or a network/CIDR (e.g. 1.2.3.4/24). This option can be specified multiple times</source> - <translation>Pozwól na połączenia JSON-RPC z podanego źródła. Jako <ip> prawidłowe jest pojedyncze IP (np. 1.2.3.4), podsieć/maska (np. 1.2.3.4/255.255.255.0) lub sieć/CIDR (np. 1.2.3.4/24). Opcja ta może być użyta wiele razy.</translation> - </message> - <message> - <source>Bind to given address and whitelist peers connecting to it. Use [host]:port notation for IPv6</source> - <translation>Podepnij się do podanego adresu i dodawaj do białej listy węzły łączące się z nim. Użyj notacji [host]:port dla IPv6</translation> - </message> - <message> - <source>Create new files with system default permissions, instead of umask 077 (only effective with disabled wallet functionality)</source> - <translation>Twórz nowe pliki z domyślnymi dla systemu uprawnieniami, zamiast umask 077 (skuteczne tylko przy wyłączonej funkcjonalności portfela)</translation> - </message> - <message> - <source>Discover own IP addresses (default: 1 when listening and no -externalip or -proxy)</source> - <translation>Odkryj własny adres IP (domyślnie: 1 kiedy w trybie nasłuchu i brak -externalip lub -proxy)</translation> - </message> - <message> <source>Error: Listening for incoming connections failed (listen returned error %s)</source> <translation>Błąd: Nasłuchiwanie połączeń przychodzących nie powiodło się (nasłuch zwrócił błąd %s)</translation> </message> <message> - <source>Execute command when a relevant alert is received or we see a really long fork (%s in cmd is replaced by message)</source> - <translation>Uruchom polecenie przy otrzymaniu odpowiedniego powiadomienia lub gdy zobaczymy naprawdę długie rozgałęzienie (%s w poleceniu jest podstawiane za komunikat)</translation> - </message> - <message> - <source>Fees (in %s/kB) smaller than this are considered zero fee for relaying, mining and transaction creation (default: %s)</source> - <translation>Opłaty (w %s/Kb) mniejsze niż ta, będą traktowane jako zerowe przy tworzeniu, przesyłaniu i zatwierdzaniu transakcji (domyślnie: %s)</translation> - </message> - <message> - <source>If paytxfee is not set, include enough fee so transactions begin confirmation on average within n blocks (default: %u)</source> - <translation>Jeżeli nie ustawiono paytxfee, dołącz wystarczająca opłatę, aby transakcja mogła zostać zatwierdzona w ciągu średniej ilości n bloków (domyślnie: %u)</translation> - </message> - <message> <source>Invalid amount for -maxtxfee=<amount>: '%s' (must be at least the minrelay fee of %s to prevent stuck transactions)</source> <translation>Niewłaściwa ilość dla -maxtxfee=<ilość>: '%s' (musi wynosić przynajmniej minimalną wielkość %s aby zapobiec utknięciu transakcji)</translation> </message> <message> - <source>Maximum size of data in data carrier transactions we relay and mine (default: %u)</source> - <translation>Maksymalny rozmiar danych w transakcji przekazującej dane które przekazujemy i wydobywamy (domyślnie: %u)</translation> - </message> - <message> <source>The transaction amount is too small to send after the fee has been deducted</source> <translation>Zbyt niska kwota transakcji do wysłania po odjęciu opłaty</translation> </message> <message> - <source>Whitelisted peers cannot be DoS banned and their transactions are always relayed, even if they are already in the mempool, useful e.g. for a gateway</source> - <translation>Węzły z białej listy nie mogą zostać zbanowane za ataki DoS, a ich transakcje będą zawsze przekazywane, nawet jeżeli będą znajdywać się już w pamięci, przydatne np. dla bramek płatniczych</translation> + <source>You need to rebuild the database using -reindex to go back to unpruned mode. This will redownload the entire blockchain</source> + <translation>Musisz przebudować bazę używając parametru -reindex aby wrócić do trybu pełnego. To spowoduje ponowne pobranie całego łańcucha bloków</translation> </message> <message> - <source>(default: %u)</source> - <translation>(domyślnie: %u)</translation> - </message> - <message> - <source>Accept public REST requests (default: %u)</source> - <translation>Akceptuj publiczne żądania REST (domyślnie: %u)</translation> - </message> - <message> - <source>Automatically create Tor hidden service (default: %d)</source> - <translation>Stwórz automatycznie ukrytą usługę Tora (domyślnie: %d)</translation> - </message> - <message> - <source>Connect through SOCKS5 proxy</source> - <translation>Połącz przez SOCKS5 proxy</translation> + <source>Error loading %s: You can't disable HD on an already existing HD wallet</source> + <translation>Błąd podczas ładowania %s: Nie można wyłączyć HD w już istniejącym portfelu HD</translation> </message> <message> <source>Error reading from database, shutting down.</source> @@ -3447,14 +3450,18 @@ Zwróć uwagę, że poprawnie zweryfikowana wiadomość potwierdza to, że nadaw <translation>Błąd ładowania bazy bloków</translation> </message> <message> - <source>Imports blocks from external blk000??.dat file on startup</source> - <translation>Importuj bloki z zewnętrznego pliku blk000??.dat podczas uruchamiania programu</translation> - </message> - <message> <source>Information</source> <translation>Informacja</translation> </message> <message> + <source>Invalid -onion address or hostname: '%s'</source> + <translation>Niewłaściwy adres -onion lub nazwa hosta: '%s'</translation> + </message> + <message> + <source>Invalid -proxy address or hostname: '%s'</source> + <translation>Nieprawidłowy adres -proxy lub nazwa hosta: '%s'</translation> + </message> + <message> <source>Invalid amount for -paytxfee=<amount>: '%s' (must be at least %s)</source> <translation>Nieprawidłowa kwota dla -paytxfee=<amount>: '%s' (musi być co najmniej %s)</translation> </message> @@ -3463,44 +3470,34 @@ Zwróć uwagę, że poprawnie zweryfikowana wiadomość potwierdza to, że nadaw <translation>Nieprawidłowa maska sieci określona w -whitelist: '%s'</translation> </message> <message> - <source>Keep at most <n> unconnectable transactions in memory (default: %u)</source> - <translation>Przechowuj w pamięci maksymalnie <n> transakcji nie możliwych do połączenia (domyślnie: %u)</translation> - </message> - <message> <source>Need to specify a port with -whitebind: '%s'</source> <translation>Musisz określić port z -whitebind: '%s'</translation> </message> <message> - <source>Node relay options:</source> - <translation>Opcje przekaźnikowe węzła:</translation> - </message> - <message> - <source>RPC server options:</source> - <translation>Opcje serwera RPC:</translation> - </message> - <message> <source>Reducing -maxconnections from %d to %d, because of system limitations.</source> <translation>Zmniejszanie -maxconnections z %d do %d z powodu ograniczeń systemu.</translation> </message> <message> - <source>Rescan the block chain for missing wallet transactions on startup</source> - <translation>Przeskanuj podczas ładowania programu łańcuch bloków w poszukiwaniu zaginionych transakcji portfela</translation> + <source>Signing transaction failed</source> + <translation>Podpisywanie transakcji nie powiodło się</translation> </message> <message> - <source>Send trace/debug info to console instead of debug.log file</source> - <translation>Wyślij informację/raport do konsoli zamiast do pliku debug.log.</translation> + <source>Specified -walletdir "%s" does not exist</source> + <translation>Podany -walletdir "%s" nie istnieje</translation> </message> <message> - <source>Show all debugging options (usage: --help -help-debug)</source> - <translation>Pokaż wszystkie opcje odpluskwiania (użycie: --help -help-debug)</translation> + <source>Specified -walletdir "%s" is a relative path</source> + <translation>Podany -walletdir "%s" jest ścieżką względną</translation> </message> <message> - <source>Shrink debug.log file on client startup (default: 1 when no -debug)</source> - <translation>Zmniejsz plik debug.log przy starcie programu (domyślnie: 1 jeśli nie użyto -debug)</translation> + <source>Specified -walletdir "%s" is not a directory</source> + <translation>Podany -walletdir "%s" nie jest katalogiem</translation> </message> <message> - <source>Signing transaction failed</source> - <translation>Podpisywanie transakcji nie powiodło się</translation> + <source>Specified blocks directory "%s" does not exist. +</source> + <translation>Podany folder bloków "%s" nie istnieje. +</translation> </message> <message> <source>The transaction amount is too small to pay the fee</source> @@ -3511,14 +3508,6 @@ Zwróć uwagę, że poprawnie zweryfikowana wiadomość potwierdza to, że nadaw <translation>To oprogramowanie eksperymentalne.</translation> </message> <message> - <source>Tor control port password (default: empty)</source> - <translation>Hasło zabezpieczające portu kontrolnego Tora (domyślnie: puste)</translation> - </message> - <message> - <source>Tor control port to use if onion listening enabled (default: %s)</source> - <translation>Port kontrolny sieci Tor jeśli onion listening jest włączone (domyślnie: %s)</translation> - </message> - <message> <source>Transaction amount too small</source> <translation>Zbyt niska kwota transakcji </translation> </message> @@ -3535,76 +3524,40 @@ Zwróć uwagę, że poprawnie zweryfikowana wiadomość potwierdza to, że nadaw <translation>Nie można przywiązać do %s na tym komputerze (bind zwrócił błąd %s)</translation> </message> <message> - <source>Upgrade wallet to latest format on startup</source> - <translation>Zaktualizuj portfel do najnowszego formatu podczas ładowania programu</translation> - </message> - <message> - <source>Username for JSON-RPC connections</source> - <translation>Nazwa użytkownika dla połączeń JSON-RPC</translation> + <source>Unable to generate initial keys</source> + <translation>Nie można wygenerować kluczy początkowych</translation> </message> <message> <source>Verifying wallet(s)...</source> <translation>Weryfikacja portfela...</translation> </message> <message> - <source>Warning</source> - <translation>Ostrzeżenie</translation> - </message> - <message> - <source>Zapping all transactions from wallet...</source> - <translation>Usuwam wszystkie transakcje z portfela...</translation> + <source>Wallet %s resides outside wallet directory %s</source> + <translation>Portfel %s znajduje się poza folderem portfeli %s</translation> </message> <message> - <source>ZeroMQ notification options:</source> - <translation>Opcje powiadomień ZeroMQ:</translation> - </message> - <message> - <source>Password for JSON-RPC connections</source> - <translation>Hasło do połączeń JSON-RPC</translation> - </message> - <message> - <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> + <source>Warning</source> + <translation>Ostrzeżenie</translation> </message> <message> - <source>Allow DNS lookups for -addnode, -seednode and -connect</source> - <translation>Zezwól -addnode, -seednode i -connect na łączenie się z serwerem DNS</translation> + <source>Warning: unknown new rules activated (versionbit %i)</source> + <translation>Ostrzeżenie: aktywowano nieznane nowe reguły (versionbit %i)</translation> </message> <message> - <source>(1 = keep tx meta data e.g. account owner and payment request information, 2 = drop tx meta data)</source> - <translation>(1 = zachowaj wysłane metadane np. właściciel konta i informacje o żądaniach płatności, 2 = porzuć wysłane metadane)</translation> + <source>Zapping all transactions from wallet...</source> + <translation>Usuwam wszystkie transakcje z portfela...</translation> </message> <message> <source>-maxtxfee is set very high! Fees this large could be paid on a single transaction.</source> <translation>-maxtxfee ma ustawioną badzo dużą wartość! Tak wysokie opłaty mogą być zapłacone w jednej transakcji.</translation> </message> <message> - <source>Do not keep transactions in the mempool longer than <n> hours (default: %u)</source> - <translation>Nie trzymaj w pamięci transakcji starszych niż <n> godz. (domyślnie: %u)</translation> - </message> - <message> - <source>Fees (in %s/kB) smaller than this are considered zero fee for transaction creation (default: %s)</source> - <translation>Opłaty (w %s/Kb) mniejsze niż ta będą traktowane jako bez opłaty przy tworzeniu transakcji (domyślnie: %s)</translation> - </message> - <message> - <source>How thorough the block verification of -checkblocks is (0-4, default: %u)</source> - <translation>Jak dokładna jest weryfikacja bloków przy -checkblocks (0-4, domyślnie: %u)</translation> - </message> - <message> - <source>Maintain a full transaction index, used by the getrawtransaction rpc call (default: %u)</source> - <translation>Utrzymuj pełny indeks transakcji, używany przy wywołaniu RPC getrawtransaction (domyślnie: %u)</translation> - </message> - <message> - <source>Number of seconds to keep misbehaving peers from reconnecting (default: %u)</source> - <translation>Czas w sekundach, przez jaki nietrzymające się zasad węzły nie będą mogły ponownie się podłączyć (domyślnie: %u)</translation> + <source>Error loading %s: You can't enable HD on an already existing non-HD wallet</source> + <translation>Błąd podczas ładowania %s: Nie można włączyć HD w już istniejącym portfelu nie-HD</translation> </message> <message> - <source>Output debugging information (default: %u, supplying <category> is optional)</source> - <translation>Wypuść informacje debugowania (domyślnie: %u, podanie <category> jest opcjonalne)</translation> - </message> - <message> - <source>Support filtering of blocks and transaction with bloom filters (default: %u)</source> - <translation>Wspieraj filtrowanie bloków i transakcji używając Filtrów Blooma (domyślnie: %u)</translation> + <source>This is the transaction fee you may pay when fee estimates are not available.</source> + <translation>To jest opłata transakcyjna którą zapłacisz, gdy mechanizmy estymacji opłaty nie są dostępne.</translation> </message> <message> <source>This product includes software developed by the OpenSSL Project for use in the OpenSSL Toolkit %s and cryptographic software written by Eric Young and UPnP software written by Thomas Bernard.</source> @@ -3615,10 +3568,6 @@ Zwróć uwagę, że poprawnie zweryfikowana wiadomość potwierdza to, że nadaw <translation>Całkowita długość łańcucha wersji (%i) przekracza maksymalną dopuszczalną długość (%i). Zmniejsz ilość lub rozmiar parametru uacomment.</translation> </message> <message> - <source>Tries to keep outbound traffic under the given target (in MiB per 24h), 0 = no limit (default: %d)</source> - <translation>Próbuje utrzymać ruch wychodzący poniżej zadanego (w MiB na 24h), 0 = bez limitu (domyślnie: %d)</translation> - </message> - <message> <source>Unsupported argument -socks found. Setting SOCKS version isn't possible anymore, only SOCKS5 proxies are supported.</source> <translation>Znaleziono niewspierany argument -socks. Wybieranie wersji SOCKS nie jest już możliwe, wsparcie programu obejmuje tylko proxy SOCKS5</translation> </message> @@ -3627,8 +3576,8 @@ Zwróć uwagę, że poprawnie zweryfikowana wiadomość potwierdza to, że nadaw <translation>Niewspierany argument -whitelistalwaysrelay zignorowany, użyj -whitelistrelay i/lub -whitelistforcerelay.</translation> </message> <message> - <source>Use separate SOCKS5 proxy to reach peers via Tor hidden services (default: %s)</source> - <translation>Użyj oddzielnego prozy SOCKS5 aby osiągnąć węzły w ukrytych usługach Tor (domyślnie: %s)</translation> + <source>Warning: Unknown block versions being mined! It's possible unknown rules are in effect</source> + <translation>Ostrzeżenie: wydobywane są nieznane wersje bloków! Możliwe, że obowiązują nieznane reguły.</translation> </message> <message> <source>Warning: Wallet file corrupt, data salvaged! Original %s saved as %s in %s; if your balance or transactions are incorrect you should restore from a backup.</source> @@ -3639,88 +3588,12 @@ Zwróć uwagę, że poprawnie zweryfikowana wiadomość potwierdza to, że nadaw <translation>%s jest ustawione bardzo wysoko!</translation> </message> <message> - <source>(default: %s)</source> - <translation>(domyślnie: %s)</translation> - </message> - <message> - <source>Always query for peer addresses via DNS lookup (default: %u)</source> - <translation>Zawsze wypytuj o adresy węzłów poprzez podejrzenie DNS (domyślnie: %u)</translation> + <source>Error loading wallet %s. Duplicate -wallet filename specified.</source> + <translation>Błąd wczytywania portfela %s. Podana powtórnie ta sama nazwa pliku w -wallet</translation> </message> <message> - <source>Error loading wallet %s. Invalid characters in -wallet filename.</source> - <translation>Błąd wczytywania portfela %s. Nieprawidłowe znaki w pliku -wallet</translation> - </message> - <message> - <source>How many blocks to check at startup (default: %u, 0 = all)</source> - <translation>Ile bloków sprawdzić przy starcie (domyślnie: %u, 0 = wszystkie)</translation> - </message> - <message> - <source>Include IP addresses in debug output (default: %u)</source> - <translation>Dołącz adresy IP do logowania (domyślnie: %u)</translation> - </message> - <message> - <source>Listen for JSON-RPC connections on <port> (default: %u or testnet: %u)</source> - <translation>Nasłuchuj połączeń JSON-RPC na <port> (domyślnie: %u lub testnet: %u)</translation> - </message> - <message> - <source>Listen for connections on <port> (default: %u or testnet: %u)</source> - <translation>Nasłuchuj połączeń na <port> (domyślnie: %u lub testnet: %u)</translation> - </message> - <message> - <source>Maintain at most <n> connections to peers (default: %u)</source> - <translation>Utrzymuj maksymalnie <n> połączeń z węzłami (domyślnie: %u)</translation> - </message> - <message> - <source>Make the wallet broadcast transactions</source> - <translation>Spraw by portfel dokonał transmisji transakcji</translation> - </message> - <message> - <source>Maximum per-connection receive buffer, <n>*1000 bytes (default: %u)</source> - <translation>Maksymalny bufor odbioru na połączenie, <n>*1000 bajtów (domyślnie: %u)</translation> - </message> - <message> - <source>Maximum per-connection send buffer, <n>*1000 bytes (default: %u)</source> - <translation>Maksymalny bufor wysyłania na połączenie, <n>*1000 bajtów (domyślnie: %u)</translation> - </message> - <message> - <source>Prepend debug output with timestamp (default: %u)</source> - <translation>Dołączaj znacznik czasu do logowania (domyślnie: %u)</translation> - </message> - <message> - <source>Relay and mine data carrier transactions (default: %u)</source> - <translation>Przekazuj i wydobywaj transakcje zawierające dane (domyślnie: %u)</translation> - </message> - <message> - <source>Relay non-P2SH multisig (default: %u)</source> - <translation>Przekazuj transakcje multisig inne niż P2SH (domyślnie: %u)</translation> - </message> - <message> - <source>Set key pool size to <n> (default: %u)</source> - <translation>Ustaw rozmiar puli kluczy na <n> (domyślnie: %u)</translation> - </message> - <message> - <source>Set maximum BIP141 block weight (default: %d)</source> - <translation>ustawienie maksymalnego rozmiaru bloku BIP141 (domyślnie: %d)</translation> - </message> - <message> - <source>Set the number of threads to service RPC calls (default: %d)</source> - <translation>Ustaw liczbę wątków do obsługi RPC (domyślnie: %d)</translation> - </message> - <message> - <source>Specify configuration file (default: %s)</source> - <translation>Wskaż plik konfiguracyjny (domyślnie: %s)</translation> - </message> - <message> - <source>Specify connection timeout in milliseconds (minimum: 1, default: %d)</source> - <translation>Wskaż czas oczekiwania na połączenie w milisekundach (minimum: 1, domyślnie: %d)</translation> - </message> - <message> - <source>Specify pid file (default: %s)</source> - <translation>Wskaż plik pid (domyślnie: %s)</translation> - </message> - <message> - <source>Spend unconfirmed change when sending transactions (default: %u)</source> - <translation>Wydawaj niepotwierdzoną resztę podczas wysyłania transakcji (domyślnie: %u)</translation> + <source>Keypool ran out, please call keypoolrefill first</source> + <translation>Pula kluczy jest pusta, odwołaj się do puli kluczy.</translation> </message> <message> <source>Starting network threads...</source> @@ -3739,10 +3612,6 @@ Zwróć uwagę, że poprawnie zweryfikowana wiadomość potwierdza to, że nadaw <translation>To jest opłata transakcyjna którą zapłacisz jeśli wyślesz transakcję. </translation> </message> <message> - <source>Threshold for disconnecting misbehaving peers (default: %u)</source> - <translation>Próg, po którym nastąpi rozłączenie węzłów nietrzymających się zasad (domyślnie: %u)</translation> - </message> - <message> <source>Transaction amounts must not be negative</source> <translation>Kwota transakcji musi być dodatnia</translation> </message> @@ -3763,6 +3632,26 @@ Zwróć uwagę, że poprawnie zweryfikowana wiadomość potwierdza to, że nadaw <translation>Niewystarczające środki</translation> </message> <message> + <source>Can't generate a change-address key. Private keys are disabled for this wallet.</source> + <translation>Nie można wygenerować adresu reszty. Klucze prywatne są wyłączone w tym portfelu.</translation> + </message> + <message> + <source>Cannot upgrade a non HD split wallet without upgrading to support pre split keypool. Please use -upgradewallet=169900 or -upgradewallet with no version specified.</source> + <translation>Nie można zaktualizować portfela rozdzielnego bez HD, bez aktualizacji obsługi podzielonej bazy kluczy. Użyj -upgradewallet = 169900 lub -upgradewallet bez określonej wersji.</translation> + </message> + <message> + <source>Fee estimation failed. Fallbackfee is disabled. Wait a few blocks or enable -fallbackfee.</source> + <translation>Estymacja opłat nieudana. Domyślna opłata jest wyłączona. Poczekaj kilka bloków lub włącz -fallbackfee.</translation> + </message> + <message> + <source>Warning: Private keys detected in wallet {%s} with disabled private keys</source> + <translation>Uwaga: Wykryto klucze prywatne w portfelu [%s] który ma wyłączone klucze prywatne</translation> + </message> + <message> + <source>Cannot write to data directory '%s'; check permissions.</source> + <translation>Nie mogę zapisać do katalogu danych '%s'; sprawdź uprawnienia.</translation> + </message> + <message> <source>Loading block index...</source> <translation>Ładowanie indeksu bloku...</translation> </message> diff --git a/src/qt/locale/bitcoin_pt_BR.ts b/src/qt/locale/bitcoin_pt_BR.ts index 2291b5df7f..3877fee25d 100644 --- a/src/qt/locale/bitcoin_pt_BR.ts +++ b/src/qt/locale/bitcoin_pt_BR.ts @@ -23,13 +23,17 @@ </message> <message> <source>C&lose</source> - <translation>F&char</translation> + <translation>Fe&char</translation> </message> <message> <source>Delete the currently selected address from the list</source> <translation>Excluir os endereços selecionados da lista</translation> </message> <message> + <source>Enter address or label to search</source> + <translation>Procure um endereço ou rótulo</translation> + </message> + <message> <source>Export the data in the current tab to a file</source> <translation>Exportar os dados na aba atual para um arquivo</translation> </message> @@ -47,7 +51,7 @@ </message> <message> <source>Choose the address to receive coins with</source> - <translation>Escolha o enereço para receber moedas</translation> + <translation>Escolha o endereço para receber moedas</translation> </message> <message> <source>C&hoose</source> @@ -193,7 +197,7 @@ </message> <message> <source>Wallet encryption failed due to an internal error. Your wallet was not encrypted.</source> - <translation>Falha na criptografia devido a um erro inerno. Sua carteira não foi criptografada.</translation> + <translation>Falha na criptografia devido a um erro interno. Sua carteira não foi criptografada.</translation> </message> <message> <source>The supplied passphrases do not match.</source> @@ -271,7 +275,7 @@ </message> <message> <source>&About %1</source> - <translation>&About %1</translation> + <translation>&Sobre %1</translation> </message> <message> <source>Show information about %1</source> @@ -318,6 +322,14 @@ <translation>Abrir &URI...</translation> </message> <message> + <source>Wallet:</source> + <translation>Carteira:</translation> + </message> + <message> + <source>default wallet</source> + <translation>carteira padrão</translation> + </message> + <message> <source>Click to disable network activity.</source> <translation>Clique para desativar a atividade de rede.</translation> </message> @@ -331,13 +343,17 @@ </message> <message> <source>Syncing Headers (%1%)...</source> - <translation>Sincronizando cabeçahos (%1%)...</translation> + <translation>Sincronizando cabeçalhos (%1%)...</translation> </message> <message> <source>Reindexing blocks on disk...</source> <translation>Reindexando blocos no disco...</translation> </message> <message> + <source>Proxy is <b>enabled</b>: %1</source> + <translation>Proxy <b>ativado</b>: %1</translation> + </message> + <message> <source>Send coins to a Bitcoin address</source> <translation>Enviar moedas para um endereço bitcoin</translation> </message> @@ -491,7 +507,7 @@ </message> <message> <source>Catching up...</source> - <translation>Recuperando o atraso ...</translation> + <translation>Recuperando o atraso...</translation> </message> <message> <source>Date: %1 @@ -506,6 +522,12 @@ </translation> </message> <message> + <source>Wallet: %1 +</source> + <translation>Carteira: %1 +</translation> + </message> + <message> <source>Type: %1 </source> <translation>Tipo: %1 @@ -584,7 +606,7 @@ </message> <message> <source>Change:</source> - <translation>trocar</translation> + <translation>Troco:</translation> </message> <message> <source>(un)select all</source> @@ -640,11 +662,11 @@ </message> <message> <source>Lock unspent</source> - <translation>Boquear saída</translation> + <translation>Bloquear não-gasto</translation> </message> <message> <source>Unlock unspent</source> - <translation>Desboquear saída</translation> + <translation>Desbloquear não-gasto</translation> </message> <message> <source>Copy quantity</source> @@ -684,7 +706,7 @@ </message> <message> <source>This label turns red if any recipient receives an amount smaller than the current dust threshold.</source> - <translation>Este texto fica vermelho se qualquer destinatário receber uma quantidade menor que que o dust.</translation> + <translation>Este texto fica vermelho se qualquer destinatário receber uma quantidade menor que o limite atual para poeira.</translation> </message> <message> <source>Can vary +/- %1 satoshi(s) per input.</source> @@ -719,17 +741,13 @@ </message> <message> <source>The address associated with this address list entry. This can only be modified for sending addresses.</source> - <translation>O endereço associado a esta lista de endereços de entrada. Isso só pode ser modificado para o envio de endereços.</translation> + <translation>O endereço associado a esta entrada na lista de endereços. Isso só pode ser modificado para endereços de envio.</translation> </message> <message> <source>&Address</source> <translation>&Endereço</translation> </message> <message> - <source>New receiving address</source> - <translation>Novo endereço de recebimento</translation> - </message> - <message> <source>New sending address</source> <translation>Novo endereço de envio</translation> </message> @@ -746,16 +764,20 @@ <translation>O endereço digitado "%1" não é um endereço válido.</translation> </message> <message> - <source>The entered address "%1" is already in the address book.</source> - <translation>O endereço digitado "%1" já se encontra no catálogo de endereços.</translation> + <source>Address "%1" already exists as a receiving address with label "%2" and so cannot be added as a sending address.</source> + <translation>O endereço "%1" já existe como endereço de recebimento com o rótulo "%2" e não pode ser adicionado como endereço de envio.</translation> + </message> + <message> + <source>The entered address "%1" is already in the address book with label "%2".</source> + <translation>O endereço inserido "%1" já está no catálogo de endereços com o rótulo "%2".</translation> </message> <message> <source>Could not unlock wallet.</source> - <translation>Não foi possível desbloquear a carteira</translation> + <translation>Não foi possível desbloquear a carteira.</translation> </message> <message> <source>New key generation failed.</source> - <translation>Falha ao gerar chave</translation> + <translation>Falha ao gerar nova chave.</translation> </message> </context> <context> @@ -799,42 +821,6 @@ <source>Command-line options</source> <translation>Opções da linha de comando</translation> </message> - <message> - <source>Usage:</source> - <translation>Uso:</translation> - </message> - <message> - <source>command-line options</source> - <translation>opções da linha de comando</translation> - </message> - <message> - <source>UI Options:</source> - <translation>Opções de Interface:</translation> - </message> - <message> - <source>Choose data directory on startup (default: %u)</source> - <translation>Escolher diretório de dados na inicialização (padrão: %u)</translation> - </message> - <message> - <source>Set language, for example "de_DE" (default: system locale)</source> - <translation>Definir idioma, por exemplo "de_DE" (padrão: idioma do sistema)</translation> - </message> - <message> - <source>Start minimized</source> - <translation>Iniciar minimizado</translation> - </message> - <message> - <source>Set SSL root certificates for payment request (default: -system-)</source> - <translation>Definir certificados de root SSL para requisições de pagamento (padrão: -sistema-)</translation> - </message> - <message> - <source>Show splash screen on startup (default: %u)</source> - <translation>Exibir tela de abertura na inicialização (padrão: %u)</translation> - </message> - <message> - <source>Reset all settings changed in the GUI</source> - <translation>Resetar todas as configuraçãoes do GUI</translation> - </message> </context> <context> <name>Intro</name> @@ -851,13 +837,16 @@ <translation>Como essa é a primeira vez que o programa é executado, você pode escolher onde %1 armazenará seus dados.</translation> </message> <message> + <source>When you click OK, %1 will begin to download and process the full %4 block chain (%2GB) starting with the earliest transactions in %3 when %4 initially launched.</source> + <translation>Quando você clica OK, %1 vai começar a baixar e processar todos os %4 da block chain (%2GB) começando com a mais recente transação em %3 quando %4 inicialmente foi lançado.</translation> + </message> + <message> <source>This initial synchronisation is very demanding, and may expose hardware problems with your computer that had previously gone unnoticed. Each time you run %1, it will continue downloading where it left off.</source> - <translation> -Esta sincronização inicial é muito exigente e pode expor problemas de hardware com o computador que passaram despercebidos anteriormente. Cada vez que você executar %1, continuará baixando onde ele saiu</translation> + <translation>Esta sincronização inicial é muito exigente e pode expor problemas de hardware com o computador que passaram despercebidos anteriormente. Cada vez que você executar o %1, irá continuar baixando de onde parou.</translation> </message> <message> <source>If you have chosen to limit block chain storage (pruning), the historical data must still be downloaded and processed, but will be deleted afterward to keep your disk usage low.</source> - <translation>Se você escolheu limitar o armazenamento da corrente de blocos (prunando), os dados históricos ainda devem ser baixados e processados, mas serão apagados no final para manter o uso de disco baixo.</translation> + <translation>Se você escolheu limitar o armazenamento da block chain (prunando), os dados históricos ainda devem ser baixados e processados, mas serão apagados no final para manter o uso de disco baixo.</translation> </message> <message> <source>Use the default data directory</source> @@ -881,7 +870,7 @@ Esta sincronização inicial é muito exigente e pode expor problemas de hardwar </message> <message> <source>%1 will download and store a copy of the Bitcoin block chain.</source> - <translation>%1 irá baixar e armazenar uma cópia da blockchain do Bitcoin</translation> + <translation>%1 irá baixar e armazenar uma cópia da block chain do Bitcoin.</translation> </message> <message> <source>The wallet will also be stored in this directory.</source> @@ -916,7 +905,7 @@ Esta sincronização inicial é muito exigente e pode expor problemas de hardwar </message> <message> <source>Attempting to spend bitcoins that are affected by not-yet-displayed transactions will not be accepted by the network.</source> - <translation>Gastar moedas de transações desconhecidas podem não ser aceitas pela rede.</translation> + <translation>Tentar gastar bitcoins que estão em transações ainda não exibidas, não vão ser aceitos pela rede.</translation> </message> <message> <source>Number of blocks left</source> @@ -963,7 +952,7 @@ Esta sincronização inicial é muito exigente e pode expor problemas de hardwar </message> <message> <source>Open payment request from URI or file</source> - <translation>Cobrança aberta de URI ou arquivo</translation> + <translation>Abrir requisição de cobrança por URI ou arquivo</translation> </message> <message> <source>URI:</source> @@ -1017,6 +1006,10 @@ Esta sincronização inicial é muito exigente e pode expor problemas de hardwar <translation>Mostra se o proxy padrão fornecido SOCKS5 é utilizado para encontrar participantes por este tipo de rede.</translation> </message> <message> + <source>Use separate SOCKS&5 proxy to reach peers via Tor hidden services:</source> + <translation>Use um proxy SOCKS&5 separado para alcançar participantes via serviços ocultos Tor: </translation> + </message> + <message> <source>Hide the icon from the system tray.</source> <translation>Esconder ícone da bandeja do sistema.</translation> </message> @@ -1034,15 +1027,15 @@ Esta sincronização inicial é muito exigente e pode expor problemas de hardwar </message> <message> <source>Active command-line options that override above options:</source> - <translation>Opções de linha de comando ativas que sobrescreve as opções acima:</translation> + <translation>Opções de linha de comando ativas que sobrescrevem as opções acima:</translation> </message> <message> <source>Open the %1 configuration file from the working directory.</source> - <translation>Abrir o arquivo de configuração %1 do diretório corrente</translation> + <translation>Abrir o arquivo de configuração %1 apartir do diretório trabalho.</translation> </message> <message> <source>Open Configuration File</source> - <translation>Abrir arquivo de configuração</translation> + <translation>Abrir Arquivo de Configuração</translation> </message> <message> <source>Reset all client options to default.</source> @@ -1057,8 +1050,24 @@ Esta sincronização inicial é muito exigente e pode expor problemas de hardwar <translation>Rede</translation> </message> <message> + <source>Disables some advanced features but all blocks will still be fully validated. Reverting this setting requires re-downloading the entire blockchain. Actual disk usage may be somewhat higher.</source> + <translation>Desativa alguns recursos avançados mas todos os blocos ainda serão totalmente validados. Reverter esta configuração requer baixar de novo a blockchain inteira. O uso de memória pode ser um pouco mais alto.</translation> + </message> + <message> + <source>Prune &block storage to</source> + <translation>Fazer Prune &da memória de blocos para</translation> + </message> + <message> + <source>GB</source> + <translation>GB</translation> + </message> + <message> + <source>Reverting this setting requires re-downloading the entire blockchain.</source> + <translation>Reverter esta configuração requer baixar de novo a blockchain inteira.</translation> + </message> + <message> <source>(0 = auto, <0 = leave that many cores free)</source> - <translation>(0 = automático, <0 = número de cores deixados livres)</translation> + <translation>(0 = automático, <0 = número de núcleos deixados livres)</translation> </message> <message> <source>W&allet</source> @@ -1078,7 +1087,7 @@ Esta sincronização inicial é muito exigente e pode expor problemas de hardwar </message> <message> <source>&Spend unconfirmed change</source> - <translation>Ga&star mudança não confirmada</translation> + <translation>Ga&star troco não confirmado</translation> </message> <message> <source>Automatically open the Bitcoin client port on the router. This only works when your router supports UPnP and it is enabled.</source> @@ -1090,11 +1099,11 @@ Esta sincronização inicial é muito exigente e pode expor problemas de hardwar </message> <message> <source>Accept connections from outside.</source> - <translation>Aceite conexões exteriores.</translation> + <translation>Aceitar conexões externas.</translation> </message> <message> <source>Allow incomin&g connections</source> - <translation>Permitir receber conexões</translation> + <translation>Permitir conexões de entrada</translation> </message> <message> <source>Connect to the Bitcoin network through a SOCKS5 proxy.</source> @@ -1118,7 +1127,7 @@ Esta sincronização inicial é muito exigente e pode expor problemas de hardwar </message> <message> <source>Used for reaching peers via:</source> - <translation>Usado para alcançar participantes via:</translation> + <translation>Usado para alcançar pares via:</translation> </message> <message> <source>IPv4</source> @@ -1158,11 +1167,11 @@ Esta sincronização inicial é muito exigente e pode expor problemas de hardwar </message> <message> <source>User Interface &language:</source> - <translation>&Linguagem da interface:</translation> + <translation>&Idioma da interface:</translation> </message> <message> <source>The user interface language can be set here. This setting will take effect after restarting %1.</source> - <translation>O idioma de interface do usuário pode ser definido aqui. Essa configuração terá efeito após reiniciar o %1</translation> + <translation>O idioma da interface pode ser definido aqui. Essa configuração terá efeito após reiniciar o %1.</translation> </message> <message> <source>&Unit to show amounts in:</source> @@ -1170,13 +1179,17 @@ Esta sincronização inicial é muito exigente e pode expor problemas de hardwar </message> <message> <source>Choose the default subdivision unit to show in the interface and when sending coins.</source> - <translation>Escolha a unidade padrão de subdivisão para interface mostrar quando enviar bitcoins.</translation> + <translation>Escolha a unidade de subdivisão padrão para exibição na interface ou quando enviando moedas.</translation> </message> <message> <source>Whether to show coin control features or not.</source> <translation>Mostrar ou não opções de controle da moeda.</translation> </message> <message> + <source>&Third party transaction URLs</source> + <translation>&URLs de transação de terceiros</translation> + </message> + <message> <source>&OK</source> <translation>&OK</translation> </message> @@ -1190,7 +1203,7 @@ Esta sincronização inicial é muito exigente e pode expor problemas de hardwar </message> <message> <source>none</source> - <translation>Nenhum</translation> + <translation>nenhum</translation> </message> <message> <source>Confirm options reset</source> @@ -1237,7 +1250,7 @@ Esta sincronização inicial é muito exigente e pode expor problemas de hardwar </message> <message> <source>The displayed information may be out of date. Your wallet automatically synchronizes with the Bitcoin network after a connection is established, but this process has not completed yet.</source> - <translation>A informação mostrada pode estar desatualizada. Sua carteira sincroniza automaticamente com a rede Bitcoin depois que a conexão é estabelecida, mas este processo pode não estar completo ainda.</translation> + <translation>A informação mostrada pode estar desatualizada. Sua carteira sincroniza automaticamente com a rede Bitcoin depois que a conexão é estabelecida, mas este processo ainda não está completo.</translation> </message> <message> <source>Watch-only:</source> @@ -1249,7 +1262,7 @@ Esta sincronização inicial é muito exigente e pode expor problemas de hardwar </message> <message> <source>Your current spendable balance</source> - <translation>Seu saldo atual spendable</translation> + <translation>Seu saldo atual disponível para gasto</translation> </message> <message> <source>Pending:</source> @@ -1257,7 +1270,7 @@ Esta sincronização inicial é muito exigente e pode expor problemas de hardwar </message> <message> <source>Total of transactions that have yet to be confirmed, and do not yet count toward the spendable balance</source> - <translation>Total de transações que ainda têm de ser confirmados, e ainda não contam para o equilíbrio spendable</translation> + <translation>Total de transações que ainda têm de ser confirmados, e ainda não estão disponíveis para gasto</translation> </message> <message> <source>Immature:</source> @@ -1265,7 +1278,7 @@ Esta sincronização inicial é muito exigente e pode expor problemas de hardwar </message> <message> <source>Mined balance that has not yet matured</source> - <translation>Saldo minerado que ainda não maturou</translation> + <translation>Saldo minerado que ainda não está maduro</translation> </message> <message> <source>Balances</source> @@ -1281,7 +1294,7 @@ Esta sincronização inicial é muito exigente e pode expor problemas de hardwar </message> <message> <source>Your current balance in watch-only addresses</source> - <translation>Sua balança atual em endereços apenas visualizados</translation> + <translation>Seu saldo atual em endereços monitorados</translation> </message> <message> <source>Spendable:</source> @@ -1297,7 +1310,7 @@ Esta sincronização inicial é muito exigente e pode expor problemas de hardwar </message> <message> <source>Mined balance in watch-only addresses that has not yet matured</source> - <translation>Saldo minerado de endereço monitorado ainda não foi implementado</translation> + <translation>Saldo minerado de endereço monitorado que ainda não está maduro</translation> </message> <message> <source>Current total balance in watch-only addresses</source> @@ -1319,6 +1332,10 @@ Esta sincronização inicial é muito exigente e pode expor problemas de hardwar <translation>Manipulação de URI</translation> </message> <message> + <source>'bitcoin://' is not a valid URI. Use 'bitcoin:' instead.</source> + <translation>'bitcoin://' não é um URI válido. Use 'bitcoin:'.</translation> + </message> + <message> <source>Payment request fetch URL is invalid: %1</source> <translation>URL de cobrança é inválida: %1</translation> </message> @@ -1328,7 +1345,7 @@ Esta sincronização inicial é muito exigente e pode expor problemas de hardwar </message> <message> <source>URI cannot be parsed! This can be caused by an invalid Bitcoin address or malformed URI parameters.</source> - <translation>URI não pode ser analisado! Isto pode ser causado por um endereço inválido ou parâmetros URI informados incorretamente.</translation> + <translation>A URI não pode ser analisada! Isto pode ser causado por um endereço inválido ou um parâmetro URI malformado.</translation> </message> <message> <source>Payment request file handling</source> @@ -1348,11 +1365,11 @@ Esta sincronização inicial é muito exigente e pode expor problemas de hardwar </message> <message> <source>Payment request expired.</source> - <translation>Pedido de pagamento expirado</translation> + <translation>Pedido de pagamento expirado.</translation> </message> <message> <source>Payment request is not initialized.</source> - <translation>Pedido de pagamento não inicializado</translation> + <translation>Pedido de pagamento não inicializado.</translation> </message> <message> <source>Unverified payment requests to custom payment scripts are unsupported.</source> @@ -1364,7 +1381,7 @@ Esta sincronização inicial é muito exigente e pode expor problemas de hardwar </message> <message> <source>Requested payment amount of %1 is too small (considered dust).</source> - <translation>Valor do pagamento solicitado de %1 é muito pequeno (Considerado poeira).</translation> + <translation>Valor do pagamento solicitado de %1 é muito pequeno (considerado poeira).</translation> </message> <message> <source>Refund from %1</source> @@ -1516,12 +1533,16 @@ Esta sincronização inicial é muito exigente e pode expor problemas de hardwar <context> <name>QObject::QObject</name> <message> + <source>Error parsing command line arguments: %1.</source> + <translation>Erro ao analisar argumentos da linha de comando: %1.</translation> + </message> + <message> <source>Error: Specified data directory "%1" does not exist.</source> - <translation>Erro: diretório de dados especificado "%1" não existe.</translation> + <translation>Erro: Diretório de dados especificado "%1" não existe.</translation> </message> <message> - <source>Error: Cannot parse configuration file: %1. Only use key=value syntax.</source> - <translation>Erro: Não foi possível interpretar arquivo de configuração: %1. Utilize apenas a sintaxe chave=valor.</translation> + <source>Error: Cannot parse configuration file: %1.</source> + <translation>Erro: Não é possível analisar o arquivo de configuração: %1.</translation> </message> <message> <source>Error: %1</source> @@ -1532,7 +1553,7 @@ Esta sincronização inicial é muito exigente e pode expor problemas de hardwar <name>QRImageWidget</name> <message> <source>&Save Image...</source> - <translation>&Savar imagem</translation> + <translation>&Salvar imagem...</translation> </message> <message> <source>&Copy Image</source> @@ -1614,8 +1635,16 @@ Esta sincronização inicial é muito exigente e pode expor problemas de hardwar <translation>Uso de memória</translation> </message> <message> + <source>Wallet: </source> + <translation>Carteira:</translation> + </message> + <message> + <source>(none)</source> + <translation>(nada)</translation> + </message> + <message> <source>&Reset</source> - <translation>&Reset</translation> + <translation>&Limpar</translation> </message> <message> <source>Received</source> @@ -1635,7 +1664,7 @@ Esta sincronização inicial é muito exigente e pode expor problemas de hardwar </message> <message> <source>Select a peer to view detailed information.</source> - <translation>Selecione um cliente para ver informações detalhadas.</translation> + <translation>Selecione um nó para ver informações detalhadas.</translation> </message> <message> <source>Whitelisted</source> @@ -1683,7 +1712,7 @@ Esta sincronização inicial é muito exigente e pode expor problemas de hardwar </message> <message> <source>Ban Score</source> - <translation>Banir pontuação</translation> + <translation>Pontuação de Banimento</translation> </message> <message> <source>Connection Time</source> @@ -1703,7 +1732,7 @@ Esta sincronização inicial é muito exigente e pode expor problemas de hardwar </message> <message> <source>The duration of a currently outstanding ping.</source> - <translation>A duração de um ping excepcional no momento.</translation> + <translation>A duração atual de um ping excepcional.</translation> </message> <message> <source>Ping Wait</source> @@ -1711,7 +1740,7 @@ Esta sincronização inicial é muito exigente e pode expor problemas de hardwar </message> <message> <source>Min Ping</source> - <translation>Ping min</translation> + <translation>Ping minímo</translation> </message> <message> <source>Time Offset</source> @@ -1731,7 +1760,7 @@ Esta sincronização inicial é muito exigente e pode expor problemas de hardwar </message> <message> <source>&Network Traffic</source> - <translation>Tráfico de Rede</translation> + <translation>&Tráfico de Rede</translation> </message> <message> <source>Totals</source> @@ -1782,8 +1811,12 @@ Esta sincronização inicial é muito exigente e pode expor problemas de hardwar <translation>&Desbanir</translation> </message> <message> + <source>default wallet</source> + <translation>carteira padrão</translation> + </message> + <message> <source>Welcome to the %1 RPC console.</source> - <translation>Bem-vindo ao console RPC do %1</translation> + <translation>Bem-vindo ao console RPC do %1.</translation> </message> <message> <source>Use up and down arrows to navigate history, and %1 to clear screen.</source> @@ -1794,6 +1827,10 @@ Esta sincronização inicial é muito exigente e pode expor problemas de hardwar <translation>Digite %1 para obter uma visão geral dos comandos disponíveis.</translation> </message> <message> + <source>For more information on using this console type %1.</source> + <translation>Para maiores informações sobre como utilizar este console, digite %1.</translation> + </message> + <message> <source>WARNING: Scammers have been active, telling users to type commands here, stealing their wallet contents. Do not use this console without fully understanding the ramifications of a command.</source> <translation>ATENÇÃO: Fraudadores tem solicitado a usuários que digitem comandos aqui, e assim roubando o conteúdo de suas carteiras. Não utilize este console sem antes conhecer os comandos e seus efeitos.</translation> </message> @@ -1802,6 +1839,14 @@ Esta sincronização inicial é muito exigente e pode expor problemas de hardwar <translation>Atividade da rede disativada</translation> </message> <message> + <source>Executing command without any wallet</source> + <translation>Executando comando sem nenhuma carteira</translation> + </message> + <message> + <source>Executing command using "%1" wallet</source> + <translation>Executando comando usando a carteira "%1"</translation> + </message> + <message> <source>(node id: %1)</source> <translation>(id do nó: %1)</translation> </message> @@ -1846,7 +1891,7 @@ Esta sincronização inicial é muito exigente e pode expor problemas de hardwar </message> <message> <source>&Message:</source> - <translation>&Mensagem</translation> + <translation>&Mensagem:</translation> </message> <message> <source>An optional message to attach to the payment request, which will be displayed when the request is opened. Note: The message will not be sent with the payment over the Bitcoin network.</source> @@ -1854,7 +1899,7 @@ Esta sincronização inicial é muito exigente e pode expor problemas de hardwar </message> <message> <source>An optional label to associate with the new receiving address.</source> - <translation>Um marcador opcional para associar ao novo endereço de recebimento.</translation> + <translation>Um rótulo opcional para associar ao novo endereço de recebimento.</translation> </message> <message> <source>Use this form to request payments. All fields are <b>optional</b>.</source> @@ -1862,7 +1907,7 @@ Esta sincronização inicial é muito exigente e pode expor problemas de hardwar </message> <message> <source>An optional amount to request. Leave this empty or zero to not request a specific amount.</source> - <translation>Uma quantia opcional para cobrar. Deixe vazio ou em branco se o pagador puder especificar a quantia.</translation> + <translation>Uma quantia opcional para cobrar. Deixe vazio ou zero para não cobrar uma quantia específica.</translation> </message> <message> <source>Clear all fields of the form.</source> @@ -1873,20 +1918,20 @@ Esta sincronização inicial é muito exigente e pode expor problemas de hardwar <translation>Limpar</translation> </message> <message> - <source>Requested payments history</source> - <translation>Histórico de cobranças</translation> + <source>Native segwit addresses (aka Bech32 or BIP-173) reduce your transaction fees later on and offer better protection against typos, but old wallets don't support them. When unchecked, an address compatible with older wallets will be created instead.</source> + <translation>Endereços segwit nativos (também conhecidos como Bench32 ou BIP-173) reduzem suas taxas de transação mais adiante e oferecem melhor proteção contra erros de digitação, porém carteiras antigas não têm suporte a eles. Quando não estiver rubricado, um endereço compatível com cateiras antigas será criado como alternativa.</translation> </message> <message> - <source>&Request payment</source> - <translation>&Requisitar Pagamento</translation> + <source>Generate native segwit (Bech32) address</source> + <translation>Gere um endereço segwit (Bench32) nativo</translation> </message> <message> - <source>Bech32 addresses (BIP-173) are cheaper to spend from and offer better protection against typos. When unchecked a P2SH wrapped SegWit address will be created, compatible with older wallets.</source> - <translation>Os endereços Bech32 (BIP-173) são mais baratos de gastar e oferecem uma proteção melhor contra erros de digitação. Quando desmarcado, será criado um endereço SegWit envolvido em P2SH, compatível com carteiras antigas.</translation> + <source>Requested payments history</source> + <translation>Histórico de cobranças</translation> </message> <message> - <source>Generate Bech32 address</source> - <translation>Gerar endereço Bech32</translation> + <source>&Request payment</source> + <translation>&Requisitar Pagamento</translation> </message> <message> <source>Show the selected request (does the same as double clicking an entry)</source> @@ -1968,12 +2013,16 @@ Esta sincronização inicial é muito exigente e pode expor problemas de hardwar <translation>Mensagem</translation> </message> <message> + <source>Wallet</source> + <translation>Carteira</translation> + </message> + <message> <source>Resulting URI too long, try to reduce the text for label / message.</source> <translation>URI resultante muito longa. Tente reduzir o texto do rótulo ou da mensagem.</translation> </message> <message> <source>Error encoding URI into QR Code.</source> - <translation>Erro ao codigicar o URI em código QR</translation> + <translation>Erro ao codificar o URI em código QR</translation> </message> </context> <context> @@ -2051,7 +2100,7 @@ Esta sincronização inicial é muito exigente e pode expor problemas de hardwar </message> <message> <source>Change:</source> - <translation>troco</translation> + <translation>Troco:</translation> </message> <message> <source>If this is activated, but the change address is empty or invalid, change will be sent to a newly generated address.</source> @@ -2067,7 +2116,7 @@ Esta sincronização inicial é muito exigente e pode expor problemas de hardwar </message> <message> <source>Choose...</source> - <translation>Escolher</translation> + <translation>Escolher...</translation> </message> <message> <source>Using the fallbackfee can result in sending a transaction that will take several hours or days (or never) to confirm. Consider choosing your fee manually or wait until you have validated the complete chain.</source> @@ -2082,12 +2131,16 @@ Esta sincronização inicial é muito exigente e pode expor problemas de hardwar <translation>Ocultar painel</translation> </message> <message> - <source>per kilobyte</source> - <translation>por kilobyte</translation> + <source>Specify a custom fee per kB (1,000 bytes) of the transaction's virtual size. + +Note: Since the fee is calculated on a per-byte basis, a fee of "100 satoshis per kB" for a transaction size of 500 bytes (half of 1 kB) would ultimately yield a fee of only 50 satoshis.</source> + <translation>Especifique uma taxa personalizada por kB (1.000 bytes) do tamanho virtual da transação. + +Nota: Como a taxa é calculada por byte, uma taxa de "100 satoshis por kB" por uma transação de 500 bytes (metade de 1 kB) teria uma taxa final de apenas 50 satoshis.</translation> </message> <message> - <source>If the custom fee is set to 1000 satoshis and the transaction is only 250 bytes, then "per kilobyte" only pays 250 satoshis in fee, while "total at least" pays 1000 satoshis. For transactions bigger than a kilobyte both pay by kilobyte.</source> - <translation>Se a taxa personalizada for definida em 1000 satoshis e a transação tiver somente 250 bytes, então "por kilobyte" somente paga 250 satoshis de taxa, enquanto "pelo menos" paga 1000 satoshis. Se a transação for maior que 1 kilobyte, ambos pagam por kilobyte.</translation> + <source>per kilobyte</source> + <translation>por kilobyte</translation> </message> <message> <source>Hide</source> @@ -2111,7 +2164,7 @@ Esta sincronização inicial é muito exigente e pode expor problemas de hardwar </message> <message> <source>(Smart fee not initialized yet. This usually takes a few blocks...)</source> - <translation>(Smart fee não iniciado. Isso requer alguns blocos...)</translation> + <translation>(SmartFee não iniciado. Isso requer alguns blocos...)</translation> </message> <message> <source>Send to multiple recipients at once</source> @@ -2119,7 +2172,7 @@ Esta sincronização inicial é muito exigente e pode expor problemas de hardwar </message> <message> <source>Add &Recipient</source> - <translation>Adicionar destinatário</translation> + <translation>Adicionar &Destinatário</translation> </message> <message> <source>Clear all fields of the form.</source> @@ -2131,7 +2184,7 @@ Esta sincronização inicial é muito exigente e pode expor problemas de hardwar </message> <message> <source>Confirmation time target:</source> - <translation>Confirmando tempo alvo:</translation> + <translation>Tempo alvo de confirmação:</translation> </message> <message> <source>Enable Replace-By-Fee</source> @@ -2143,7 +2196,7 @@ Esta sincronização inicial é muito exigente e pode expor problemas de hardwar </message> <message> <source>Clear &All</source> - <translation>Limpar Tudo</translation> + <translation>Limpar &Tudo</translation> </message> <message> <source>Balance:</source> @@ -2155,7 +2208,7 @@ Esta sincronização inicial é muito exigente e pode expor problemas de hardwar </message> <message> <source>S&end</source> - <translation>Enviar</translation> + <translation>&Enviar</translation> </message> <message> <source>Copy quantity</source> @@ -2171,7 +2224,7 @@ Esta sincronização inicial é muito exigente e pode expor problemas de hardwar </message> <message> <source>Copy after fee</source> - <translation>Copiar pós taxa</translation> + <translation>Copiar após taxa</translation> </message> <message> <source>Copy bytes</source> @@ -2198,14 +2251,6 @@ Esta sincronização inicial é muito exigente e pode expor problemas de hardwar <translation>Tem certeza que deseja enviar?</translation> </message> <message> - <source>added as transaction fee</source> - <translation>adicionado como taxa da transação </translation> - </message> - <message> - <source>Total Amount %1</source> - <translation>Quantia tota %1</translation> - </message> - <message> <source>or</source> <translation>ou</translation> </message> @@ -2214,10 +2259,26 @@ Esta sincronização inicial é muito exigente e pode expor problemas de hardwar <translation>Você pode aumentar a taxa depois (sinaliza Replace-By-Fee, BIP-125).</translation> </message> <message> + <source>from wallet %1</source> + <translation>da carteira %1</translation> + </message> + <message> + <source>Please, review your transaction.</source> + <translation>Revise a sua transação.</translation> + </message> + <message> + <source>Transaction fee</source> + <translation>Taxa da transação</translation> + </message> + <message> <source>Not signalling Replace-By-Fee, BIP-125.</source> <translation>Não sinalizar Replace-By-Fee, BIP-125.</translation> </message> <message> + <source>Total Amount</source> + <translation>Valor total</translation> + </message> + <message> <source>Confirm send coins</source> <translation>Confirme o envio de moedas</translation> </message> @@ -2231,11 +2292,11 @@ Esta sincronização inicial é muito exigente e pode expor problemas de hardwar </message> <message> <source>The amount exceeds your balance.</source> - <translation>A quantia excede o seu saldo</translation> + <translation>A quantia excede o seu saldo.</translation> </message> <message> <source>The total exceeds your balance when the %1 transaction fee is included.</source> - <translation>O total excede o seu saldo quando a taxa da transação %1 é incluída</translation> + <translation>O total excede o seu saldo quando a taxa da transação %1 é incluída.</translation> </message> <message> <source>Duplicate address found: addresses should only be used once each.</source> @@ -2243,11 +2304,11 @@ Esta sincronização inicial é muito exigente e pode expor problemas de hardwar </message> <message> <source>Transaction creation failed!</source> - <translation>Falha na criação da transação</translation> + <translation>Falha na criação da transação!</translation> </message> <message> <source>The transaction was rejected with the following reason: %1</source> - <translation>A transação foi negada pela seguinte razão: %1</translation> + <translation>A transação foi rejeitada com a seguinte razão: %1</translation> </message> <message> <source>A fee higher than %1 is considered an absurdly high fee.</source> @@ -2255,7 +2316,7 @@ Esta sincronização inicial é muito exigente e pode expor problemas de hardwar </message> <message> <source>Payment request expired.</source> - <translation>Pedido de pagamento expirado</translation> + <translation>Pedido de pagamento expirado.</translation> </message> <message> <source>Pay only the required fee of %1</source> @@ -2263,15 +2324,15 @@ Esta sincronização inicial é muito exigente e pode expor problemas de hardwar </message> <message numerus="yes"> <source>Estimated to begin confirmation within %n block(s).</source> - <translation><numerusform>Confirmação em %n bloco.</numerusform><numerusform>Confirmação em %n blocos.</numerusform></translation> + <translation><numerusform>Confirmação em %n bloco.</numerusform><numerusform>Início estimado para confirmação em %n blocos.</numerusform></translation> </message> <message> <source>Warning: Invalid Bitcoin address</source> - <translation>Aviso: Endereço inválido</translation> + <translation>Aviso: Endereço Bitcoin inválido</translation> </message> <message> <source>Warning: Unknown change address</source> - <translation>Aviso: Endereço de troco inválido</translation> + <translation>Aviso: Endereço de troco desconhecido</translation> </message> <message> <source>Confirm custom change address</source> @@ -2310,7 +2371,7 @@ Esta sincronização inicial é muito exigente e pode expor problemas de hardwar </message> <message> <source>The Bitcoin address to send the payment to</source> - <translation>Endereço que enviará o pagamento</translation> + <translation>O endereço Bitcoin para enviar o pagamento</translation> </message> <message> <source>Alt+A</source> @@ -2407,7 +2468,7 @@ Esta sincronização inicial é muito exigente e pode expor problemas de hardwar </message> <message> <source>The Bitcoin address to sign the message with</source> - <translation>O enderesso Bitcoin que assinará a mensagem</translation> + <translation>O endereço Bitcoin que assinará a mensagem</translation> </message> <message> <source>Choose previously used address</source> @@ -2427,7 +2488,7 @@ Esta sincronização inicial é muito exigente e pode expor problemas de hardwar </message> <message> <source>Enter the message you want to sign here</source> - <translation>Entre a mensagem que você quer assinar aqui</translation> + <translation>Digite a mensagem que você quer assinar aqui</translation> </message> <message> <source>Signature</source> @@ -2443,7 +2504,7 @@ Esta sincronização inicial é muito exigente e pode expor problemas de hardwar </message> <message> <source>Sign &Message</source> - <translation>Assinar &mensagem</translation> + <translation>Assinar &Mensagem</translation> </message> <message> <source>Reset all sign message fields</source> @@ -2451,31 +2512,31 @@ Esta sincronização inicial é muito exigente e pode expor problemas de hardwar </message> <message> <source>Clear &All</source> - <translation>Limpar Tudo</translation> + <translation>Limpar &Tudo</translation> </message> <message> <source>&Verify Message</source> - <translation>&Verificar mensagem</translation> + <translation>&Verificar Mensagem</translation> </message> <message> <source>Enter the receiver's address, message (ensure you copy line breaks, spaces, tabs, etc. exactly) and signature below to verify the message. Be careful not to read more into the signature than what is in the signed message itself, to avoid being tricked by a man-in-the-middle attack. Note that this only proves the signing party receives with the address, it cannot prove sendership of any transaction!</source> - <translation>Coloque o endereço do autor, a mensagem (certifique-se de copiar toda a mensagem, incluindo quebras de linha, espaços, tabulações, etc.) e a assinatura embaixo para verificar a mensagem. Cuidado para não ler mais da assinatura do que está assinado na mensagem, para evitar ser enganado pelo ataque man-in-the-middle. Note que isso somente prova a propriedade de um endereço, e não o remetende de qualquer transação.</translation> + <translation>Coloque o endereço do autor, a mensagem (certifique-se de copiar toda a mensagem, incluindo quebras de linha, espaços, tabulações, etc.) e a assinatura abaixo para verificar a mensagem. Cuidado para não compreender mais da assinatura do que está na mensagem assinada de fato, para evitar ser enganado por um ataque man-in-the-middle. Note que isso somente prova que o signatário recebe com este endereço, não pode provar que é o remetente de nenhuma transação!</translation> </message> <message> <source>The Bitcoin address the message was signed with</source> - <translation>O enderesso Bitcoin que assionou a mesnagem</translation> + <translation>O endereço Bitcoin que foi usado para assinar a mensagem</translation> </message> <message> <source>Verify the message to ensure it was signed with the specified Bitcoin address</source> - <translation>Verificar mensagem para se assegurar que ela foi assinada pelo dono de um endereço Bitcoin específico.</translation> + <translation>Verificar mensagem para se assegurar que ela foi assinada pelo dono de um endereço Bitcoin específico</translation> </message> <message> <source>Verify &Message</source> - <translation>Verificar &mensagem</translation> + <translation>Verificar &Mensagem</translation> </message> <message> <source>Reset all verify message fields</source> - <translation>Limpar todos os campos de assinatura da mensagem</translation> + <translation>Limpar todos os campos da verificação de mensagem</translation> </message> <message> <source>Click "Sign Message" to generate signature</source> @@ -2483,11 +2544,11 @@ Esta sincronização inicial é muito exigente e pode expor problemas de hardwar </message> <message> <source>The entered address is invalid.</source> - <translation>O endereço digitado é inválido</translation> + <translation>O endereço digitado é inválido.</translation> </message> <message> <source>Please check the address and try again.</source> - <translation>Favor checar o endereço e tente novamente</translation> + <translation>Por gentileza, cheque o endereço e tente novamente.</translation> </message> <message> <source>The entered address does not refer to a key.</source> @@ -2495,39 +2556,39 @@ Esta sincronização inicial é muito exigente e pode expor problemas de hardwar </message> <message> <source>Wallet unlock was cancelled.</source> - <translation>O desbloqueio da carteira foi cancelado</translation> + <translation>O desbloqueio da carteira foi cancelado.</translation> </message> <message> <source>Private key for the entered address is not available.</source> - <translation>A chave privada do endereço inserido não está disponível</translation> + <translation>A chave privada do endereço inserido não está disponível.</translation> </message> <message> <source>Message signing failed.</source> - <translation>Falha ao assinar mensagem</translation> + <translation>A assinatura da mensagem falhou.</translation> </message> <message> <source>Message signed.</source> - <translation>Mensagem assinada</translation> + <translation>Mensagem assinada.</translation> </message> <message> <source>The signature could not be decoded.</source> - <translation>A assinatura não pode ser descodificada</translation> + <translation>A assinatura não pode ser decodificada.</translation> </message> <message> <source>Please check the signature and try again.</source> - <translation>Favor checar a assinatura e tente novamente</translation> + <translation>Por gentileza, cheque a assinatura e tente novamente.</translation> </message> <message> <source>The signature did not match the message digest.</source> - <translation>A assinatura não corresponde a mensagem</translation> + <translation>A assinatura não corresponde a mensagem.</translation> </message> <message> <source>Message verification failed.</source> - <translation>Falha na verificação da mensagem</translation> + <translation>Falha na verificação da mensagem.</translation> </message> <message> <source>Message verified.</source> - <translation>Mensagem verificada</translation> + <translation>Mensagem verificada.</translation> </message> </context> <context> @@ -2559,20 +2620,16 @@ Esta sincronização inicial é muito exigente e pode expor problemas de hardwar <translation>conflitado com uma transação com %1 confirmações</translation> </message> <message> - <source>%1/offline</source> - <translation>%1/offline</translation> - </message> - <message> <source>0/unconfirmed, %1</source> <translation>0/não confirmado, %1</translation> </message> <message> <source>in memory pool</source> - <translation>na memória</translation> + <translation>no pool de memória</translation> </message> <message> <source>not in memory pool</source> - <translation>não na memóra</translation> + <translation>não está no pool de memóra</translation> </message> <message> <source>abandoned</source> @@ -2591,14 +2648,6 @@ Esta sincronização inicial é muito exigente e pode expor problemas de hardwar <translation>Status</translation> </message> <message> - <source>, has not been successfully broadcast yet</source> - <translation>, ainda não foi propagada na rede com êxito.</translation> - </message> - <message numerus="yes"> - <source>, broadcast through %n node(s)</source> - <translation><numerusform>, transmitido aravés de %n nó</numerusform><numerusform>, transmitido aravés de %n nós</numerusform></translation> - </message> - <message> <source>Date</source> <translation>Data</translation> </message> @@ -2624,7 +2673,7 @@ Esta sincronização inicial é muito exigente e pode expor problemas de hardwar </message> <message> <source>own address</source> - <translation>próprio endereço</translation> + <translation>endereço próprio</translation> </message> <message> <source>watch-only</source> @@ -2640,7 +2689,7 @@ Esta sincronização inicial é muito exigente e pode expor problemas de hardwar </message> <message numerus="yes"> <source>matures in %n more block(s)</source> - <translation><numerusform>maduro em mais %n bloco</numerusform><numerusform>maduro em mais %n blocos</numerusform></translation> + <translation><numerusform>maduro em mais %n bloco</numerusform><numerusform>maduro em mais %n blocos</numerusform></translation> </message> <message> <source>not accepted</source> @@ -2683,6 +2732,10 @@ Esta sincronização inicial é muito exigente e pode expor problemas de hardwar <translation>Tamanho tota da transação</translation> </message> <message> + <source>Transaction virtual size</source> + <translation>Tamanho virtual da transação</translation> + </message> + <message> <source>Output index</source> <translation>Index da saída</translation> </message> @@ -2696,7 +2749,7 @@ Esta sincronização inicial é muito exigente e pode expor problemas de hardwar </message> <message> <source>Debug information</source> - <translation>Depurar informação</translation> + <translation>Informações de depuração</translation> </message> <message> <source>Transaction</source> @@ -2753,10 +2806,6 @@ Esta sincronização inicial é muito exigente e pode expor problemas de hardwar <translation>Aberto até %1</translation> </message> <message> - <source>Offline</source> - <translation>Offline</translation> - </message> - <message> <source>Unconfirmed</source> <translation>Não confirmado</translation> </message> @@ -2781,20 +2830,16 @@ Esta sincronização inicial é muito exigente e pode expor problemas de hardwar <translation>Recém-criado (%1 confirmações, disponível somente após %2)</translation> </message> <message> - <source>This block was not received by any other nodes and will probably not be accepted!</source> - <translation>Este bloco não foi recebido por nenhum outro participante da rede e provavelmente não será aceito!</translation> - </message> - <message> <source>Generated but not accepted</source> <translation>Gerado mas não aceito</translation> </message> <message> <source>Received with</source> - <translation>Recebido</translation> + <translation>Recebido com</translation> </message> <message> <source>Received from</source> - <translation>Recebido</translation> + <translation>Recebido de</translation> </message> <message> <source>Sent to</source> @@ -2830,7 +2875,7 @@ Esta sincronização inicial é muito exigente e pode expor problemas de hardwar </message> <message> <source>Type of transaction.</source> - <translation>Tipo de transação</translation> + <translation>Tipo de transação.</translation> </message> <message> <source>Whether or not a watch-only address is involved in this transaction.</source> @@ -2838,7 +2883,7 @@ Esta sincronização inicial é muito exigente e pode expor problemas de hardwar </message> <message> <source>User-defined intent/purpose of the transaction.</source> - <translation>Intenção/Propósito definido pelo usuário para a transação</translation> + <translation>Intenção/Propósito definido pelo usuário para a transação.</translation> </message> <message> <source>Amount removed from or added to balance.</source> @@ -2877,7 +2922,7 @@ Esta sincronização inicial é muito exigente e pode expor problemas de hardwar </message> <message> <source>Received with</source> - <translation>Recebido</translation> + <translation>Recebido com</translation> </message> <message> <source>Sent to</source> @@ -3008,14 +3053,14 @@ Esta sincronização inicial é muito exigente e pode expor problemas de hardwar <name>UnitDisplayStatusBarControl</name> <message> <source>Unit to show amounts in. Click to select another unit.</source> - <translation>Unidade para mostrar. Clique para selecionar outra unidade.</translation> + <translation>Unidade para mostrar quantidades. Clique para selecionar outra unidade.</translation> </message> </context> <context> <name>WalletFrame</name> <message> <source>No wallet has been loaded.</source> - <translation>Nenhuma carteira carregada</translation> + <translation>Nenhuma carteira carregada.</translation> </message> </context> <context> @@ -3026,7 +3071,7 @@ Esta sincronização inicial é muito exigente e pode expor problemas de hardwar </message> <message> <source>Fee bump error</source> - <translation>Taxa de erro</translation> + <translation>Erro no aumento de taxa</translation> </message> <message> <source>Increasing transaction fee failed</source> @@ -3050,7 +3095,7 @@ Esta sincronização inicial é muito exigente e pode expor problemas de hardwar </message> <message> <source>Confirm fee bump</source> - <translation>Taxa de confirmação</translation> + <translation>Confirmação no aumento de taxa</translation> </message> <message> <source>Can't sign transaction.</source> @@ -3058,7 +3103,7 @@ Esta sincronização inicial é muito exigente e pode expor problemas de hardwar </message> <message> <source>Could not commit transaction</source> - <translation>Não foi possível confirmar a transação</translation> + <translation>Não foi possível mandar a transação</translation> </message> </context> <context> @@ -3077,7 +3122,7 @@ Esta sincronização inicial é muito exigente e pode expor problemas de hardwar </message> <message> <source>Wallet Data (*.dat)</source> - <translation>Dados da carteira (*.dat)</translation> + <translation>Carteira (*.dat)</translation> </message> <message> <source>Backup Failed</source> @@ -3095,44 +3140,24 @@ Esta sincronização inicial é muito exigente e pode expor problemas de hardwar <source>The wallet data was successfully saved to %1.</source> <translation>Os dados da carteira foram salvos com êxito em %1.</translation> </message> + <message> + <source>Cancel</source> + <translation>Cancelar</translation> + </message> </context> <context> <name>bitcoin-core</name> <message> - <source>Options:</source> - <translation>Opções:</translation> - </message> - <message> - <source>Specify data directory</source> - <translation>Especificar o diretório de dados</translation> - </message> - <message> - <source>Connect to a node to retrieve peer addresses, and disconnect</source> - <translation>Conectar a um nó para receber endereços de participantes, e desconectar.</translation> - </message> - <message> - <source>Specify your own public address</source> - <translation>Especificar seu próprio endereço público</translation> - </message> - <message> - <source>Accept command line and JSON-RPC commands</source> - <translation>Aceitar linha de comando e comandos JSON-RPC</translation> - </message> - <message> <source>Distributed under the MIT software license, see the accompanying file %s or %s</source> - <translation>Distribuído sob a MIT software license, veja o arquivo %s ou %s</translation> - </message> - <message> - <source>If <category> is not supplied or if <category> = 1, output all debugging information.</source> - <translation>Se <category> não for suprida ou se <category> = 1, mostrar toda informação de depuração.</translation> + <translation>Distribuído sob a licença de software MIT, veja o arquivo %s ou %s</translation> </message> <message> <source>Prune configured below the minimum of %d MiB. Please use a higher number.</source> - <translation>Prune configurado abaixo do mínimo de %d MiB. Por favor use um número mais alto.</translation> + <translation>Configuração de prune abaixo do mínimo de %d MiB.Por gentileza use um número mais alto.</translation> </message> <message> <source>Prune: last wallet synchronisation goes beyond pruned data. You need to -reindex (download the whole blockchain again in case of pruned node)</source> - <translation>Prune: A ultima sincronização da carteira foi além do dado comprimido. Você precisa reindexar (fazer o download de toda a blockchain novamente)</translation> + <translation>Prune: A ultima sincronização da carteira foi além dos dados podados. Você precisa usar -reindex (fazer o download de toda a blockchain novamente no caso de nós com prune)</translation> </message> <message> <source>Rescans are not possible in pruned mode. You will need to use -reindex which will download the whole blockchain again.</source> @@ -3143,20 +3168,12 @@ Esta sincronização inicial é muito exigente e pode expor problemas de hardwar <translation>Erro: Um erro interno fatal ocorreu, veja debug.log para detalhes</translation> </message> <message> - <source>Fee (in %s/kB) to add to transactions you send (default: %s)</source> - <translation>Taxa (em %s/kB) a ser adicionada às transações que você mandar (padrão: %s)</translation> - </message> - <message> <source>Pruning blockstore...</source> - <translation>Prunando os blocos existentes...</translation> - </message> - <message> - <source>Run in the background as a daemon and accept commands</source> - <translation>Rodar em segundo plano como serviço e aceitar comandos</translation> + <translation>Podando os blocos existentes...</translation> </message> <message> <source>Unable to start HTTP server. See debug log for details.</source> - <translation>Não foi possível iniciar o servidor HTTP. Veja o log para detaihes.</translation> + <translation>Não foi possível iniciar o servidor HTTP. Veja o log de depuração para detaihes.</translation> </message> <message> <source>Bitcoin Core</source> @@ -3167,112 +3184,44 @@ Esta sincronização inicial é muito exigente e pode expor problemas de hardwar <translation>Desenvolvedores do %s</translation> </message> <message> - <source>A fee rate (in %s/kB) that will be used when fee estimation has insufficient data (default: %s)</source> - <translation>A variação da taxa (em %s/kB) que será usada quando não houver dados suficientes para se estimar a taxa (default: %s)</translation> - </message> - <message> - <source>Accept relayed transactions received from whitelisted peers even when not relaying transactions (default: %d)</source> - <translation>Aceita transações retransmitidas advindas de pares em lista branca, mesmo quando não estiver retransmitindo transações (padrão: %d)</translation> - </message> - <message> - <source>Add a node to connect to and attempt to keep the connection open (see the `addnode` RPC command help for more info)</source> - <translation>Adicione um node para se conectar e tentar manter a conexão aberta (consulte a ajuda do comando `addnode` RPC para obter mais informações)</translation> - </message> - <message> - <source>Bind to given address and always listen on it. Use [host]:port notation for IPv6</source> - <translation>Vincular ao endereço fornecido e sempre escutar nele. Use a notação [host]:port para IPv6</translation> - </message> - <message> <source>Cannot obtain a lock on data directory %s. %s is probably already running.</source> <translation>Não foi possível obter exclusividade de escrita no endereço %s. O %s provavelmente já está sendo executado.</translation> </message> <message> - <source>Delete all wallet transactions and only recover those parts of the blockchain through -rescan on startup</source> - <translation>Apaga todas as transações da carteira e somente recupera essas partes da blockchain usando o comando -rescan na inicialização</translation> + <source>Cannot provide specific connections and have addrman find outgoing connections at the same.</source> + <translation>Não é possível fornecer conexões específicas e ter addrman procurando conexões ao mesmo tempo. </translation> </message> <message> <source>Error reading %s! All keys read correctly, but transaction data or address book entries might be missing or incorrect.</source> - <translation>Erro ao ler arquivo %s! Todas as chaves foram lidas corretamente, mas os dados de transação ou o livro de endereos podem estar faltando ou incorretos.</translation> - </message> - <message> - <source>Exclude debugging information for a category. Can be used in conjunction with -debug=1 to output debug logs for all categories except one or more specified categories.</source> - <translation>Excluir informações de depuração para uma categoria. Pode ser usado em conjunto com -debug=1 para exibir logs de depuração para todas as categorias, exceto uma ou mais categorias especificadas.</translation> - </message> - <message> - <source>Execute command when a wallet transaction changes (%s in cmd is replaced by TxID)</source> - <translation>Executa um comando quando uma transação da carteira mudar (%s no comando será substituído por TxID)</translation> - </message> - <message> - <source>Extra transactions to keep in memory for compact block reconstructions (default: %u)</source> - <translation>Transações extras para manter na memória para reconstruções de blocos compactos (padrão: %u)</translation> - </message> - <message> - <source>If this block is in the chain assume that it and its ancestors are valid and potentially skip their script verification (0 to verify all, default: %s, testnet: %s)</source> - <translation>Se este bloco está no blockchain, assume-se que ele e seus ancestrais são válidos e podem ignorar a verificação de scripts (0 para verificar todos, padrão: %s, testnet: %s)</translation> - </message> - <message> - <source>Maximum allowed median peer time offset adjustment. Local perspective of time may be influenced by peers forward or backward by this amount. (default: %u seconds)</source> - <translation>A media máxima permitida de peer time compensa o ajuste. Perspectiva local de horário pode ser influenciada por pares à frente ou atrás neste montante. (padrão: %u segundos)</translation> - </message> - <message> - <source>Maximum total fees (in %s) to use in a single wallet transaction or raw transaction; setting this too low may abort large transactions (default: %s)</source> - <translation>Preço máximo total (in %s) aplicado a uma única transação de carteira ou transação crua; aplicar isto tão baixo pode abortar grandes transações (padrão: %s)</translation> + <translation>Erro ao ler arquivo %s! Todas as chaves privadas foram lidas corretamente, mas os dados de transação ou o livro de endereços podem estar faltando ou incorretos.</translation> </message> <message> <source>Please check that your computer's date and time are correct! If your clock is wrong, %s will not work properly.</source> - <translation>Por favor verifique que a data e o horário de seu computador estão corretos. Se o relógio de seu computador estiver incorreto, %s não funcionarão corretamente.</translation> + <translation>Por favor verifique se a data e o horário de seu computador estão corretos. Se o relógio de seu computador estiver incorreto, %s não funcionará corretamente.</translation> </message> <message> <source>Please contribute if you find %s useful. Visit %s for further information about the software.</source> <translation>Por favor contribua se você entender que %s é útil. Visite %s para mais informações sobre o software.</translation> </message> <message> - <source>Query for peer addresses via DNS lookup, if low on addresses (default: 1 unless -connect used)</source> - <translation>Buscar por endereços de peers via busca DNS, se estiver baixo em endereços (padrão: 1 a não ser que -connect)</translation> - </message> - <message> - <source>Reduce storage requirements by enabling pruning (deleting) of old blocks. This allows the pruneblockchain RPC to be called to delete specific blocks, and enables automatic pruning of old blocks if a target size in MiB is provided. This mode is incompatible with -txindex and -rescan. Warning: Reverting this setting requires re-downloading the entire blockchain. (default: 0 = disable pruning blocks, 1 = allow manual pruning via RPC, >%u = automatically prune block files to stay under the specified target size in MiB)</source> - <translation>Reduz o requerimente de espaço habiitando o pruning (apagando) blocos antigos. Isso permite o chamar o comando pruneblockchain via RPC para apagar blocos específicos, e habiita o pruning automático de blocos antigos se o tamanho em MiB for atingido. Esse modo é incompatíve com -txindex e -rescan. Aviso: Reverter essa configuração requer re-baixar o blockchain inteiro. (padrão: 0 = disabilitado, 1 = permite o pruning manua via RPC, >%u = pruna os blocos para ficar abaixo do expecificado, em MiB)</translation> - </message> - <message> - <source>Set lowest fee rate (in %s/kB) for transactions to be included in block creation. (default: %s)</source> - <translation>Taxa (em %s/KiB) a ser adicionada às transações que você mandar (padrão: %s)</translation> - </message> - <message> - <source>Set the number of script verification threads (%u to %d, 0 = auto, <0 = leave that many cores free, default: %d)</source> - <translation>Define o número de threads de verificação de script (%u a %d, 0 = automático, <0 = número de cores deixados livres, padrão: %d)</translation> - </message> - <message> <source>The block database contains a block which appears to be from the future. This may be due to your computer's date and time being set incorrectly. Only rebuild the block database if you are sure that your computer's date and time are correct</source> <translation>O banco de dados de blocos contém um bloco que parece ser do futuro. Isso pode ser devido à data e hora do seu computador estarem configuradas incorretamente. Apenas reconstrua o banco de dados de blocos se você estiver certo de que a data e hora de seu computador estão corretas.</translation> </message> <message> <source>This is a pre-release test build - use at your own risk - do not use for mining or merchant applications</source> - <translation>Este é um build de teste pré-lançamento - use por sua conta e risco - não use para mineração ou comércio.</translation> + <translation>Este é um build de teste pré-lançamento - use por sua conta e risco - não use para mineração ou comércio</translation> </message> <message> <source>This is the transaction fee you may discard if change is smaller than dust at this level</source> - <translation>Essa é a taxa de transação que você pode descartar se a alteração for menor que um cisco a esse nível</translation> + <translation>Essa é a taxa de transação que você pode descartar se o troco a esse ponto for menor que poeira</translation> </message> <message> <source>Unable to replay blocks. You will need to rebuild the database using -reindex-chainstate.</source> - <translation>Não é possível reproduzir blocos. Você precisará reconstruir o banco de dados usando -reindex-chainstate</translation> + <translation>Não é possível reproduzir blocos. Você precisará reconstruir o banco de dados usando -reindex-chainstate.</translation> </message> <message> <source>Unable to rewind the database to a pre-fork state. You will need to redownload the blockchain</source> - <translation>Não foi possível reanalisar o banco de dados para o estado pre-fork. Você precisa rebaixar o blockchain</translation> - </message> - <message> - <source>Use UPnP to map the listening port (default: 1 when listening and no -proxy)</source> - <translation>Use UPnP para mapear a porta escutada (padrão: 1 quando escutando e sem -proxy)</translation> - </message> - <message> - <source>Username and hashed password for JSON-RPC connections. The field <userpw> comes in the format: <USERNAME>:<SALT>$<HASH>. A canonical python script is included in share/rpcuser. The client then connects normally using the rpcuser=<USERNAME>/rpcpassword=<PASSWORD> pair of arguments. This option can be specified multiple times</source> - <translation>Nome de usuário e hash da senha para conexões JSON-RPC. O campo <userpw> vem com o formato: <USERNAME>:<SALT>$<HASH>. Um script python canônico é incluído em share/rpcuser. O cliente pode conectar normalmente usando o rpcuser=<USERNAME>/rpcpassword=<PASSWORD>. Esta opção pode ser especificado multiplas vezes</translation> - </message> - <message> - <source>Wallet will not create transactions that violate mempool chain limits (default: %u)</source> - <translation>A carteira não irá criar transações que vioem o imite de memória (padrão: %u)</translation> + <translation>Não foi possível rebobinar o banco de dados para um estado pre-fork. Você precisa fazer o re-download da blockchain</translation> </message> <message> <source>Warning: The network does not appear to fully agree! Some miners appear to be experiencing issues.</source> @@ -3280,7 +3229,7 @@ Esta sincronização inicial é muito exigente e pode expor problemas de hardwar </message> <message> <source>Warning: We do not appear to fully agree with our peers! You may need to upgrade, or other nodes may need to upgrade.</source> - <translation>Atenção: Nós não parecemos concordar plenamente com nossos nós! Você pode precisar atualizar ou outros nós podem precisar atualizar.</translation> + <translation>Atenção: Nós não parecemos concordar plenamente com nossos pares! Você pode precisar atualizar ou outros pares podem precisar atualizar.</translation> </message> <message> <source>%d of last 100 blocks have unexpected version</source> @@ -3295,40 +3244,12 @@ Esta sincronização inicial é muito exigente e pode expor problemas de hardwar <translation>-maxmempool deve ser pelo menos %d MB</translation> </message> <message> - <source><category> can be:</source> - <translation><category> pode ser:</translation> - </message> - <message> - <source>Accept connections from outside (default: 1 if no -proxy or -connect)</source> - <translation>Aceitar conexões externas (padrão: 1 se opções -proxy ou -connect não estiverem presentes)</translation> - </message> - <message> - <source>Append comment to the user agent string</source> - <translation>Adiciona comentário ao user-agent do navegador</translation> - </message> - <message> - <source>Attempt to recover private keys from a corrupt wallet on startup</source> - <translation>Tentando recuperar a chape privada da carteira corrompida ao inicializar</translation> - </message> - <message> - <source>Block creation options:</source> - <translation>Opções de criação de blocos:</translation> - </message> - <message> <source>Cannot resolve -%s address: '%s'</source> - <translation>Impossível resolver -%s endereço: '%s'</translation> - </message> - <message> - <source>Chain selection options:</source> - <translation>Opções da rede:</translation> + <translation>Não foi possível encontrar o endereço de -%s: '%s'</translation> </message> <message> <source>Change index out of range</source> - <translation>Índice de mudança fora da faixa.</translation> - </message> - <message> - <source>Connection options:</source> - <translation>Opções de conexão:</translation> + <translation>Índice de mudança fora do intervalo</translation> </message> <message> <source>Copyright (C) %i-%i</source> @@ -3339,38 +3260,10 @@ Esta sincronização inicial é muito exigente e pode expor problemas de hardwar <translation>Detectado Banco de dados de blocos corrompido</translation> </message> <message> - <source>Debugging/Testing options:</source> - <translation>Opções de depuração/teste:</translation> - </message> - <message> - <source>Do not load the wallet and disable wallet RPC calls</source> - <translation>Não carrega a carteira e desabilita as chamadas RPC para a carteira</translation> - </message> - <message> <source>Do you want to rebuild the block database now?</source> <translation>Você quer reconstruir o banco de dados de blocos agora?</translation> </message> <message> - <source>Enable publish hash block in <address></source> - <translation>Abilitar a publicação da hash do block em <endereço></translation> - </message> - <message> - <source>Enable publish hash transaction in <address></source> - <translation>Abilitar a publicação da hash da transação em <endereço></translation> - </message> - <message> - <source>Enable publish raw block in <address></source> - <translation>Abilitar a publicação dos dados brutos do block em <endereço></translation> - </message> - <message> - <source>Enable publish raw transaction in <address></source> - <translation>Abilitar a publicação dos dados brutos da transação em <endereço></translation> - </message> - <message> - <source>Enable transaction replacement in the memory pool (default: %u)</source> - <translation>Habilita substituição de transação em memória (padrão: %u)</translation> - </message> - <message> <source>Error creating %s: You can't create non-HD wallets with this version.</source> <translation>Erro ao criar %s: Você não pode criar carteiras não-HD com esta versão.</translation> </message> @@ -3387,6 +3280,10 @@ Esta sincronização inicial é muito exigente e pode expor problemas de hardwar <translation>Erro ao carregar %s</translation> </message> <message> + <source>Error loading %s: Private keys can only be disabled during creation</source> + <translation>Erro ao carregar %s: Chaves privadas só podem ser desativadas durante a criação</translation> + </message> + <message> <source>Error loading %s: Wallet corrupted</source> <translation>Erro ao carregar %s Carteira corrompida</translation> </message> @@ -3411,6 +3308,10 @@ Esta sincronização inicial é muito exigente e pode expor problemas de hardwar <translation>Falha ao escutar em qualquer porta. Use -listen=0 se você quiser isso.</translation> </message> <message> + <source>Failed to rescan the wallet during initialization</source> + <translation>Falha ao escanear novamente a carteira durante a inicialização</translation> + </message> + <message> <source>Importing...</source> <translation>Importando...</translation> </message> @@ -3424,7 +3325,7 @@ Esta sincronização inicial é muito exigente e pode expor problemas de hardwar </message> <message> <source>Invalid amount for -%s=<amount>: '%s'</source> - <translation>Valor inválido para -%s=<amount>: '%s'</translation> + <translation>Quantidade inválida para -%s=<amount>: '%s'</translation> </message> <message> <source>Invalid amount for -discardfee=<amount>: '%s'</source> @@ -3432,11 +3333,11 @@ Esta sincronização inicial é muito exigente e pode expor problemas de hardwar </message> <message> <source>Invalid amount for -fallbackfee=<amount>: '%s'</source> - <translation>Valor inválido para -fallbackfee=<amount>: '%s'</translation> + <translation>Quantidade inválida para -fallbackfee=<amount>: '%s'</translation> </message> <message> - <source>Keep the transaction memory pool below <n> megabytes (default: %u)</source> - <translation>Mantenha a mempool de transações abaixo de <n> megabytes (padrão: %u)</translation> + <source>Upgrading txindex database</source> + <translation>Atualizando banco de dados txindex</translation> </message> <message> <source>Loading P2P addresses...</source> @@ -3447,24 +3348,8 @@ Esta sincronização inicial é muito exigente e pode expor problemas de hardwar <translation>Carregando lista de banidos...</translation> </message> <message> - <source>Location of the auth cookie (default: data dir)</source> - <translation>Localização do cookie de autenticação (padrão: diretório de dados)</translation> - </message> - <message> <source>Not enough file descriptors available.</source> - <translation>Decriptadores de arquivos disponíveis insuficientes.</translation> - </message> - <message> - <source>Only connect to nodes in network <net> (ipv4, ipv6 or onion)</source> - <translation>Somente conectar a clientes na rede <net> (ipv4, ipv6 ou onion)</translation> - </message> - <message> - <source>Print this help message and exit</source> - <translation>Mostra essa mensagem de ajuda e sai</translation> - </message> - <message> - <source>Print version and exit</source> - <translation>Mostra a versão e fecha</translation> + <translation>Não há file descriptors suficientes disponíveis.</translation> </message> <message> <source>Prune cannot be configured with a negative value.</source> @@ -3475,14 +3360,6 @@ Esta sincronização inicial é muito exigente e pode expor problemas de hardwar <translation>O modo prune é incompatível com -txindex.</translation> </message> <message> - <source>Rebuild chain state and block index from the blk*.dat files on disk</source> - <translation>Reconstruir índice de cadeia de bloco a partir dos arquivos blk*.dat no disco</translation> - </message> - <message> - <source>Rebuild chain state from the currently indexed blocks</source> - <translation>Reconstruir estado a partir dos blocos indexados</translation> - </message> - <message> <source>Replaying blocks...</source> <translation>Reverificando blocos...</translation> </message> @@ -3491,20 +3368,20 @@ Esta sincronização inicial é muito exigente e pode expor problemas de hardwar <translation>Reanalizando blocos...</translation> </message> <message> - <source>Set database cache size in megabytes (%d to %d, default: %d)</source> - <translation>Define o tamanho do cache do banco de dados em megabytes (%d para %d, padrão: %d)</translation> + <source>The source code is available from %s.</source> + <translation>O código fonte está disponível pelo %s.</translation> </message> <message> - <source>Specify wallet file (within data directory)</source> - <translation>Especifique o arquivo da carteira (dentro do diretório de dados)</translation> + <source>Transaction fee and change calculation failed</source> + <translation>Taxa de transação e cálculo de troco falharam</translation> </message> <message> - <source>The source code is available from %s.</source> - <translation>O código fonte está disponível pelo %s</translation> + <source>Unable to bind to %s on this computer. %s is probably already running.</source> + <translation>Impossível vincular a %s neste computador. O %s provavelmente já está rodando.</translation> </message> <message> - <source>Transaction fee and change calculation failed</source> - <translation>Taxa de transação e cálculo de troco falharam.</translation> + <source>Unable to generate keys</source> + <translation>Não foi possível gerar chaves</translation> </message> <message> <source>Unsupported argument -benchmark ignored, use -debug=bench.</source> @@ -3516,7 +3393,7 @@ Esta sincronização inicial é muito exigente e pode expor problemas de hardwar </message> <message> <source>Unsupported argument -tor found, use -onion.</source> - <translation>Argumento não suportador encontrado: -tor. Use -onion.</translation> + <translation>Argumento não suportado encontrado: -tor. Use -onion.</translation> </message> <message> <source>Unsupported logging category %s=%s.</source> @@ -3527,14 +3404,6 @@ Esta sincronização inicial é muito exigente e pode expor problemas de hardwar <translation>Atualizando banco de dados UTXO</translation> </message> <message> - <source>Use UPnP to map the listening port (default: %u)</source> - <translation>Use UPnP para mapear a porta de entrada (padrão: %u)</translation> - </message> - <message> - <source>Use the test chain</source> - <translation>Usar a rede de testes</translation> - </message> - <message> <source>User Agent comment (%s) contains unsafe characters.</source> <translation>Comentário do Agente de Usuário (%s) contém caracteres inseguros.</translation> </message> @@ -3543,88 +3412,24 @@ Esta sincronização inicial é muito exigente e pode expor problemas de hardwar <translation>Verificando blocos...</translation> </message> <message> - <source>Wallet debugging/testing options:</source> - <translation>Opções de depuração/teste da Carteira</translation> - </message> - <message> <source>Wallet needed to be rewritten: restart %s to complete</source> - <translation>A Carteira precisou ser reescrita: reinicie o %s para completar</translation> - </message> - <message> - <source>Wallet options:</source> - <translation>Opções da carteira:</translation> - </message> - <message> - <source>Allow JSON-RPC connections from specified source. Valid for <ip> are a single IP (e.g. 1.2.3.4), a network/netmask (e.g. 1.2.3.4/255.255.255.0) or a network/CIDR (e.g. 1.2.3.4/24). This option can be specified multiple times</source> - <translation>Permitir conexões JSON-RPC de uma fonte específica. Válido para um único ip (ex. 1.2.3.4), até uma rede/máscara (ex. 1.2.3.4/255.255.255.0) ou uma rede/CIDR (ex. 1.2.3.4/24). Esta opção pode ser usada múltiplas vezes</translation> - </message> - <message> - <source>Bind to given address and whitelist peers connecting to it. Use [host]:port notation for IPv6</source> - <translation>Vincular ao endereço fornecido e sempre escutar nele. Use a notação [host]:port para IPv6</translation> - </message> - <message> - <source>Create new files with system default permissions, instead of umask 077 (only effective with disabled wallet functionality)</source> - <translation>Criar novos arquivos com permissões padrão do sistema, em vez de umask 077 (apenas efetivo com funcionalidade de carteira desabilitada)</translation> - </message> - <message> - <source>Discover own IP addresses (default: 1 when listening and no -externalip or -proxy)</source> - <translation>Descobrir o próprio IP (padrão: 1 enquanto aguardando conexões e sem -externalip ou -proxy)</translation> + <translation>A Carteira precisa ser reescrita: reinicie o %s para completar</translation> </message> <message> <source>Error: Listening for incoming connections failed (listen returned error %s)</source> - <translation>Erro: Aceitar conexões de entrada falhou (retornou erro %s)</translation> - </message> - <message> - <source>Execute command when a relevant alert is received or we see a really long fork (%s in cmd is replaced by message)</source> - <translation>Executa um comando quando um alerta relevante é recebido ou vemos uma longa segregação (%s é substituída pela mensagem)</translation> - </message> - <message> - <source>Fees (in %s/kB) smaller than this are considered zero fee for relaying, mining and transaction creation (default: %s)</source> - <translation>Comissões (em %s/kB) menores serão consideradas como zero para relaying, mineração e criação de transação (padrão %s)</translation> - </message> - <message> - <source>If paytxfee is not set, include enough fee so transactions begin confirmation on average within n blocks (default: %u)</source> - <translation>Se paytxfee não estiver definida, incluir comissão suficiente para que as transações comecem a ter confirmações em média dentro de N blocos (padrão %u)</translation> + <translation>Erro: Escutar conexões de entrada falhou (vincular retornou erro %s)</translation> </message> <message> <source>Invalid amount for -maxtxfee=<amount>: '%s' (must be at least the minrelay fee of %s to prevent stuck transactions)</source> - <translation>Valor inválido para -maxtxfee=<valor>: '%s' (precisa ser pelo menos a taxa mínima de %s para prevenir que a transação nunca seja confirmada)</translation> - </message> - <message> - <source>Maximum size of data in data carrier transactions we relay and mine (default: %u)</source> - <translation>Tamanho máximo de dados em transações de dados de operadora (padrão %u)</translation> - </message> - <message> - <source>Randomize credentials for every proxy connection. This enables Tor stream isolation (default: %u)</source> - <translation>Gerar credenciais aleatórias para cada conexão por proxy. Isto habilita o isolamento de stream do Tor (padrão: %u)</translation> + <translation>Valor inválido para -maxtxfee=<valor>: '%s' (precisa ser pelo menos a taxa de minrelay de %s para prevenir que a transação nunca seja confirmada)</translation> </message> <message> <source>The transaction amount is too small to send after the fee has been deducted</source> - <translation>A quantia da transação é muito pequena para mandar </translation> - </message> - <message> - <source>Whitelisted peers cannot be DoS banned and their transactions are always relayed, even if they are already in the mempool, useful e.g. for a gateway</source> - <translation>Peers permitidos não podem ser banidos do DoS e suas transações sempre são transmitidas, até mesmo se eles já estão no pool de memória, útil, por exemplo, para um gateway</translation> + <translation>A quantia da transação é muito pequena para mandar depois de deduzida a taxa</translation> </message> <message> <source>You need to rebuild the database using -reindex to go back to unpruned mode. This will redownload the entire blockchain</source> - <translation>Você precisa reconstruir o banco de dados usando -reindex para sair do modo prune. Isso irá rebaixar todo o blockchain.</translation> - </message> - <message> - <source>(default: %u)</source> - <translation>(padrão: %u)</translation> - </message> - <message> - <source>Accept public REST requests (default: %u)</source> - <translation>Aceitar pedidos restantes públicas (padrão: %u)</translation> - </message> - <message> - <source>Automatically create Tor hidden service (default: %d)</source> - <translation>Criar automaticamente serviços ocultos do Tor (padrão: %d)</translation> - </message> - <message> - <source>Connect through SOCKS5 proxy</source> - <translation>Connecte-se através de um proxy SOCKS5</translation> + <translation>Você precisa reconstruir o banco de dados usando -reindex para sair do modo prune. Isso irá causar o download de todo o blockchain novamente.</translation> </message> <message> <source>Error loading %s: You can't disable HD on an already existing HD wallet</source> @@ -3632,15 +3437,11 @@ Esta sincronização inicial é muito exigente e pode expor problemas de hardwar </message> <message> <source>Error reading from database, shutting down.</source> - <translation>Erro ao ler o banco de dados. Finalizando.</translation> + <translation>Erro ao ler o banco de dados. Encerrando.</translation> </message> <message> <source>Error upgrading chainstate database</source> - <translation>Erro ao atualizar banco de dados de cadeias</translation> - </message> - <message> - <source>Imports blocks from external blk000??.dat file on startup</source> - <translation>Importar blocos a partir de arquivo externo blk000??.dat durante a inicialização</translation> + <translation>Erro ao atualizar banco de dados do chainstate</translation> </message> <message> <source>Information</source> @@ -3663,44 +3464,34 @@ Esta sincronização inicial é muito exigente e pode expor problemas de hardwar <translation>Máscara de rede especificada em -whitelist: '%s' é inválida</translation> </message> <message> - <source>Keep at most <n> unconnectable transactions in memory (default: %u)</source> - <translation>Manter ao máximo <n> transações inconectáveis na memória (padrão: %u)</translation> - </message> - <message> <source>Need to specify a port with -whitebind: '%s'</source> <translation>Necessário informar uma porta com -whitebind: '%s'</translation> </message> <message> - <source>Node relay options:</source> - <translation>Opções de relé nó :</translation> - </message> - <message> - <source>RPC server options:</source> - <translation>Opções do servidor RPC:</translation> - </message> - <message> <source>Reducing -maxconnections from %d to %d, because of system limitations.</source> - <translation>Reduzindo -maxconnections de %d para %d, devido a limitações do sistema</translation> + <translation>Reduzindo -maxconnections de %d para %d, devido a limitações do sistema.</translation> </message> <message> - <source>Rescan the block chain for missing wallet transactions on startup</source> - <translation>Re-escanear a block-chain por transações faltantes na carteira durante a inicialização</translation> + <source>Signing transaction failed</source> + <translation>Assinatura de transação falhou</translation> </message> <message> - <source>Send trace/debug info to console instead of debug.log file</source> - <translation>Mandar informação de trace/debug para o console em vez de para o arquivo debug.log</translation> + <source>Specified -walletdir "%s" does not exist</source> + <translation>O -walletdir "%s" especificado não existe</translation> </message> <message> - <source>Show all debugging options (usage: --help -help-debug)</source> - <translation>Exibir todas opções de depuração (uso: --help -help-debug)</translation> + <source>Specified -walletdir "%s" is a relative path</source> + <translation>O -walletdir "%s" especificado é um caminho relativo</translation> </message> <message> - <source>Shrink debug.log file on client startup (default: 1 when no -debug)</source> - <translation>Encolher arquivo debug.log ao iniciar o cliente (padrão 1 se opção -debug não estiver presente)</translation> + <source>Specified -walletdir "%s" is not a directory</source> + <translation>O -walletdir "%s" especificado não é um diretório</translation> </message> <message> - <source>Signing transaction failed</source> - <translation>Assinatura de transação falhou</translation> + <source>Specified blocks directory "%s" does not exist. +</source> + <translation>O diretório de blocos especificado "%s" não existe. +</translation> </message> <message> <source>The transaction amount is too small to pay the fee</source> @@ -3711,146 +3502,54 @@ Esta sincronização inicial é muito exigente e pode expor problemas de hardwar <translation>Este é um software experimental.</translation> </message> <message> - <source>Tor control port password (default: empty)</source> - <translation>Senha da porta de controle do Tor (padrão: vazio)</translation> - </message> - <message> - <source>Tor control port to use if onion listening enabled (default: %s)</source> - <translation>Porta de controle a ser usada se o monitoramento onion estiver habilitado (padrão: %s)</translation> - </message> - <message> <source>Transaction amount too small</source> - <translation>Quantidade da transação muito pequena.</translation> + <translation>Quantidade da transação muito pequena</translation> </message> <message> <source>Transaction too large for fee policy</source> - <translation>Transação muito grande para enviar sem taxa</translation> + <translation>Transação muito grande para política de taxa</translation> </message> <message> <source>Transaction too large</source> - <translation>Transação muito larga</translation> + <translation>Transação muito grande</translation> </message> <message> <source>Unable to bind to %s on this computer (bind returned error %s)</source> - <translation>Impossível se ligar a %s neste computador (bind retornou erro %s)</translation> - </message> - <message> - <source>Upgrade wallet to latest format on startup</source> - <translation>Atualizar a carteira para o último formato na inicialização</translation> + <translation>Erro ao vincular em %s neste computador (bind retornou erro %s)</translation> </message> <message> - <source>Username for JSON-RPC connections</source> - <translation>Nome de usuário para conexões JSON-RPC</translation> + <source>Unable to generate initial keys</source> + <translation>Não foi possível gerar as chaves iniciais</translation> </message> <message> <source>Verifying wallet(s)...</source> <translation>Verificando carteira(s)...</translation> </message> <message> + <source>Wallet %s resides outside wallet directory %s</source> + <translation>Carteira %s reside fora do diretório da carteira %s</translation> + </message> + <message> <source>Warning</source> <translation>Atenção</translation> </message> <message> <source>Warning: unknown new rules activated (versionbit %i)</source> - <translation>Aviso: Novas regras estranhas foram ativadas (versionbit %i)</translation> - </message> - <message> - <source>Whether to operate in a blocks only mode (default: %u)</source> - <translation>Quando operar em modo de blocos somente (padrãp: %u)</translation> - </message> - <message> - <source>You need to rebuild the database using -reindex to change -txindex</source> - <translation>Você precisa reconstruir o banco de dados usando -reindex para alterar -txindex</translation> + <translation>Aviso: Novas regras desconhecidas foram ativadas (versionbit %i)</translation> </message> <message> <source>Zapping all transactions from wallet...</source> <translation>Aniquilando todas as transações da carteira...</translation> </message> <message> - <source>ZeroMQ notification options:</source> - <translation>Opções de notificação ZeroMQ:</translation> - </message> - <message> - <source>Password for JSON-RPC connections</source> - <translation>Senha para conexões JSON-RPC</translation> - </message> - <message> - <source>Execute command when the best block changes (%s in cmd is replaced by block hash)</source> - <translation>Executa um comando quando o melhor bloco mudar (%s no comando será substituído pelo hash do bloco)</translation> - </message> - <message> - <source>Allow DNS lookups for -addnode, -seednode and -connect</source> - <translation>Permitir consultas DNS para -addnode, -seednode e -connect</translation> - </message> - <message> - <source>(1 = keep tx meta data e.g. account owner and payment request information, 2 = drop tx meta data)</source> - <translation>(1 = manter metadados tx e.g. informação do dono da conta e requisição de pagamente, 2 = descartar metadados tx)</translation> - </message> - <message> <source>-maxtxfee is set very high! Fees this large could be paid on a single transaction.</source> - <translation>-maxtxfee é muito alto! Essa quantia poderia ser paga em uma única transação.</translation> - </message> - <message> - <source>Bind to given address to listen for JSON-RPC connections. This option is ignored unless -rpcallowip is also passed. Port is optional and overrides -rpcport. Use [host]:port notation for IPv6. This option can be specified multiple times (default: 127.0.0.1 and ::1 i.e., localhost, or if -rpcallowip has been specified, 0.0.0.0 and :: i.e., all addresses)</source> - <translation>Vincular o endereço especificado para escutar conexões JSON-RPC. Esta opção é ignorada a menos que -rpcallowip também seja especificada. A porta é opcional e sobrepõe -rpcport. Use a notação [host]:port para IPv6. Essa opção pode ser especificada múltiplas vezes (Padrão: 127.0.0.1 e ::1 apenas localhost, ou se -rpcallowip for especificado, 0.0.0.0 e :: todos os endereços)</translation> - </message> - <message> - <source>Do not keep transactions in the mempool longer than <n> hours (default: %u)</source> - <translation>Não manter transações na mempool por mais que <n> horas (padrão: %u)</translation> - </message> - <message> - <source>Equivalent bytes per sigop in transactions for relay and mining (default: %u)</source> - <translation>Número mínimo de bytes por assinatura em transações que transmitimos e mineramos (default: %u)</translation> + <translation>A valor especificado de -maxtxfee está muito alto! Taxas grandes assim podem ser atribuidas numa transação única.</translation> </message> <message> <source>Error loading %s: You can't enable HD on an already existing non-HD wallet</source> <translation>Erro carregando %s: Não é permitido habilitar HD em uma carteira não-HD já existente</translation> </message> <message> - <source>Error loading wallet %s. -wallet parameter must only specify a filename (not a path).</source> - <translation>Erro ao carregar carteira %s. O parâmetro -wallet deve somente especificar um nome de arquivo (não um caminho).</translation> - </message> - <message> - <source>Fees (in %s/kB) smaller than this are considered zero fee for transaction creation (default: %s)</source> - <translation>Comissões (em %s/kB) menores serão consideradas como zero para criação de transação (padrão %s)</translation> - </message> - <message> - <source>Force relay of transactions from whitelisted peers even if they violate local relay policy (default: %d)</source> - <translation>Força a retransmissão de transações de pares da lista branca, mesmo quando violam a política local de retransmissão (default: %d)</translation> - </message> - <message> - <source>How thorough the block verification of -checkblocks is (0-4, default: %u)</source> - <translation>Quão completa a verificação de blocos do -checkblocks é (0-4, padrão: %u)</translation> - </message> - <message> - <source>Maintain a full transaction index, used by the getrawtransaction rpc call (default: %u)</source> - <translation>Mantém um índice completo de transações, usado pela chamada rpc getrawtransaction (padrão: %u)</translation> - </message> - <message> - <source>Number of seconds to keep misbehaving peers from reconnecting (default: %u)</source> - <translation>Número de segundos para impedir que peers mal comportados reconectem (padrão %u)</translation> - </message> - <message> - <source>Output debugging information (default: %u, supplying <category> is optional)</source> - <translation>Informação de saída de debug (padrão: %u, definir <category> é opcional)</translation> - </message> - <message> - <source>Sets the serialization of raw transaction or block hex returned in non-verbose mode, non-segwit(0) or segwit(1) (default: %d)</source> - <translation>Define a criação do raw da transação ou bloco em modo não verbal, não segwit (0) ou segwit (1) (padrão: %d)</translation> - </message> - <message> - <source>Specify location of debug log file: this can be an absolute path or a path relative to the data directory (default: %s)</source> - <translation>Especificar local do arquivo do log de debug: pode ser um caminho absoluto ou um caminho relativo ao diretório de dados (padrão: "%s")</translation> - </message> - <message> - <source>Support filtering of blocks and transaction with bloom filters (default: %u)</source> - <translation>Suportar filtragem de blocos e transações com filtros bloom (padrão: %u)</translation> - </message> - <message> - <source>The fee rate (in %s/kB) that indicates your tolerance for discarding change by adding it to the fee (default: %s). Note: An output is discarded if it is dust at this rate, but we will always discard up to the dust relay fee and a discard fee above that is limited by the fee estimate for the longest target</source> - <translation>A taxa de imposto (em %s/kB) indica sua tolerância para descartar alterações, adicionando-a na comissão (padrão: %s). Nota: Uma saída é descartada, se for considerada sobra nesta taxa, mas sempre descartaremos no máximo a taxa de retransmissão. Uma comissão acima disso, será limitada pela comissão estimada para o destino mais longo. </translation> - </message> - <message> <source>This is the transaction fee you may pay when fee estimates are not available.</source> <translation>Esta é a taxa que você deve pagar quando a taxa estimada não está disponível.</translation> </message> @@ -3860,11 +3559,7 @@ Esta sincronização inicial é muito exigente e pode expor problemas de hardwar </message> <message> <source>Total length of network version string (%i) exceeds maximum length (%i). Reduce the number or size of uacomments.</source> - <translation>O tamanho total da string de versão da rede (%i) excede o tamanho máximo (%i). Reduza o numero ou tamanho de uacomments.</translation> - </message> - <message> - <source>Tries to keep outbound traffic under the given target (in MiB per 24h), 0 = no limit (default: %d)</source> - <translation>Tenta manter tráfego fora dos limites dentro do alvo especificado (em MiB por 24h), 0 = sem limite (padrão: %d)</translation> + <translation>O tamanho total da string de versão da rede (%i) excede o tamanho máximo (%i). Reduza o número ou tamanho de uacomments.</translation> </message> <message> <source>Unsupported argument -socks found. Setting SOCKS version isn't possible anymore, only SOCKS5 proxies are supported.</source> @@ -3875,144 +3570,44 @@ Esta sincronização inicial é muito exigente e pode expor problemas de hardwar <translation>Argumento não suportado -whitelistalwaysrelay foi ignorado, utilize -whitelistrelay e/ou -whitelistforcerelay.</translation> </message> <message> - <source>Use separate SOCKS5 proxy to reach peers via Tor hidden services (default: %s)</source> - <translation>Use um proxy SOCKS5 separado para alcançar participantes da rede via serviços ocultos Tor (padrão: %s)</translation> - </message> - <message> <source>Warning: Unknown block versions being mined! It's possible unknown rules are in effect</source> - <translation>Aviso: Versões de bloco desconhecidas sendo mineradas! É possível que regras estranhas estejam ativas</translation> + <translation>Aviso: Versões de bloco desconhecidas sendo mineradas! É possível que regras desconhecidas estejam ativas</translation> </message> <message> <source>Warning: Wallet file corrupt, data salvaged! Original %s saved as %s in %s; if your balance or transactions are incorrect you should restore from a backup.</source> <translation>Atenção: Arquivo da carteira corrompido, dados recuperados! Original %s salvo como %s em %s; se seu saldo ou transações estiverem incorretos, você deve restaurar o backup.</translation> </message> <message> - <source>Whitelist peers connecting from the given IP address (e.g. 1.2.3.4) or CIDR notated network (e.g. 1.2.3.0/24). Can be specified multiple times.</source> - <translation>Lista Branca de conecções do endereço IP informado (ex: 1.2.3.4) ou com máscara de rede (ex: 1.2.3.0/24). Pode ser especificado várias vezes.</translation> - </message> - <message> <source>%s is set very high!</source> - <translation>%s está muito alto!</translation> - </message> - <message> - <source>(default: %s)</source> - <translation>(padrão: %s)</translation> - </message> - <message> - <source>Always query for peer addresses via DNS lookup (default: %u)</source> - <translation>Sempre pergunte pelo endereço de peer via pesquisa DNS (padrão: %u)</translation> - </message> - <message> - <source>Error loading wallet %s. -wallet filename must be a regular file.</source> - <translation>Erro ao carregar carteira %s. Nome do arquivo de -wallet deve ser um arquivo regular.</translation> + <translation>%s está muito alto!</translation> </message> <message> <source>Error loading wallet %s. Duplicate -wallet filename specified.</source> <translation>Erro ao carregar carteira %s. Duplicado o nome do arquivo de -wallet.</translation> </message> <message> - <source>Error loading wallet %s. Invalid characters in -wallet filename.</source> - <translation>Erro ao carregar carteira %s. Caracteres inválidos no nome do arquivo de -wallet.</translation> - </message> - <message> - <source>How many blocks to check at startup (default: %u, 0 = all)</source> - <translation>Quantos blocos devem ser checados ao iniciar (padrão: %u, 0 = todos)</translation> - </message> - <message> - <source>Include IP addresses in debug output (default: %u)</source> - <translation>Incluir endereço IP na saída de depuração (padrão: %u)</translation> - </message> - <message> <source>Keypool ran out, please call keypoolrefill first</source> - <translation>Erro na Keypool, favor executar keypoolrefill primeiro</translation> - </message> - <message> - <source>Listen for JSON-RPC connections on <port> (default: %u or testnet: %u)</source> - <translation>Escutar por conexões JSON-RPC na porta <port> (padrão: %u ou testnet: %u)</translation> - </message> - <message> - <source>Listen for connections on <port> (default: %u or testnet: %u)</source> - <translation>Aguardar por conexões na porta <port> (padrão: %u ou testnet: %u)</translation> - </message> - <message> - <source>Maintain at most <n> connections to peers (default: %u)</source> - <translation>Manter, no máximo, <n> conexões com peers (padrão: %u)</translation> - </message> - <message> - <source>Make the wallet broadcast transactions</source> - <translation>Fazer a carteira transmitir transações</translation> - </message> - <message> - <source>Maximum per-connection receive buffer, <n>*1000 bytes (default: %u)</source> - <translation>Buffer máximo de recebimento por conexão, <n>*1000 bytes (padrão: %u)</translation> - </message> - <message> - <source>Maximum per-connection send buffer, <n>*1000 bytes (default: %u)</source> - <translation>Buffer máximo de envio por conexão, <n>*1000 bytes (padrão: %u)</translation> - </message> - <message> - <source>Prepend debug output with timestamp (default: %u)</source> - <translation>Adiciona timestamp como prefixo no debug (padrão: %u)</translation> - </message> - <message> - <source>Relay and mine data carrier transactions (default: %u)</source> - <translation>Transações de dados de operadora (padrão: %u)</translation> - </message> - <message> - <source>Relay non-P2SH multisig (default: %u)</source> - <translation>Retransmitir P2SH não multisig (padrão: %u)</translation> - </message> - <message> - <source>Set key pool size to <n> (default: %u)</source> - <translation>Defina o tamanho da chave para piscina<n> (padrão: %u)</translation> - </message> - <message> - <source>Set maximum BIP141 block weight (default: %d)</source> - <translation>Define a altura máxima BIP141 do bloco (padrão: %d)</translation> - </message> - <message> - <source>Set the number of threads to service RPC calls (default: %d)</source> - <translation>Defina o número de threads para chamadas do serviço RPC (padrão: %d)</translation> - </message> - <message> - <source>Specify configuration file (default: %s)</source> - <translation>Especificar arquivo de configuração (padrão: %s)</translation> - </message> - <message> - <source>Specify connection timeout in milliseconds (minimum: 1, default: %d)</source> - <translation>Especificar tempo para desistência de conexões, em mili segundos (mínimo: 1, padrão: %d)</translation> - </message> - <message> - <source>Specify pid file (default: %s)</source> - <translation>Especificar arquivo pid (padrão: %s)</translation> - </message> - <message> - <source>Spend unconfirmed change when sending transactions (default: %u)</source> - <translation>Gastar troco não confirmado quando enviar transações (padrão: %u)</translation> + <translation>Keypool exaurida, por gentileza execute keypoolrefill primeiro</translation> </message> <message> <source>Starting network threads...</source> - <translation>Iniciando análise da rede...</translation> + <translation>Iniciando threads de rede...</translation> </message> <message> <source>The wallet will avoid paying less than the minimum relay fee.</source> - <translation>A carteira irá evitar pagar menos que a taxa mínima.</translation> + <translation>A carteira irá evitar pagar menos que a taxa mínima de retransmissão.</translation> </message> <message> <source>This is the minimum transaction fee you pay on every transaction.</source> - <translation>Esta é a taxa mínima que você deve pagar em cada transação.</translation> + <translation>Esta é a taxa mínima que você paga em todas as transação.</translation> </message> <message> <source>This is the transaction fee you will pay if you send a transaction.</source> - <translation>Esta é a taxa que você irá pagar se enviar a transação.</translation> - </message> - <message> - <source>Threshold for disconnecting misbehaving peers (default: %u)</source> - <translation>Limite para desconectar peers mal comportados (padrão: %u)</translation> + <translation>Esta é a taxa que você irá pagar se enviar uma transação.</translation> </message> <message> <source>Transaction amounts must not be negative</source> - <translation>As quantidades das transações devem ser positivas.</translation> + <translation>As quantidades nas transações não podem ser negativas.</translation> </message> <message> <source>Transaction has too long of a mempool chain</source> @@ -4020,7 +3615,7 @@ Esta sincronização inicial é muito exigente e pode expor problemas de hardwar </message> <message> <source>Transaction must have at least one recipient</source> - <translation>A transação deve ter ao menos um destinatário</translation> + <translation>A transação deve ter ao menos um destinatário</translation> </message> <message> <source>Unknown network specified in -onlynet: '%s'</source> @@ -4031,6 +3626,26 @@ Esta sincronização inicial é muito exigente e pode expor problemas de hardwar <translation>Saldo insuficiente</translation> </message> <message> + <source>Can't generate a change-address key. Private keys are disabled for this wallet.</source> + <translation>Não é possível gerar um endereço de troco. Chaves privadas estão desabilitadas para essa carteira.</translation> + </message> + <message> + <source>Cannot upgrade a non HD split wallet without upgrading to support pre split keypool. Please use -upgradewallet=169900 or -upgradewallet with no version specified.</source> + <translation>Não é possível fazer upgrade de uma carteira dividida não HD sem fazer upgrade para ser compatível com a keypool antes da divisão. Use -upgradewallet=169900 ou -upgradewallet sem especificar nenhuma versão.</translation> + </message> + <message> + <source>Fee estimation failed. Fallbackfee is disabled. Wait a few blocks or enable -fallbackfee.</source> + <translation>Falha na estimativa de taxa. Fallbackfee desativada. Espere alguns blocos ou ative -fallbackfee.</translation> + </message> + <message> + <source>Warning: Private keys detected in wallet {%s} with disabled private keys</source> + <translation>Aviso: Chaves privadas detectadas na carteira {%s} com chaves privadas desativadas</translation> + </message> + <message> + <source>Cannot write to data directory '%s'; check permissions.</source> + <translation>Não foi possível escrever no diretório de dados '%s': verifique as permissões.</translation> + </message> + <message> <source>Loading block index...</source> <translation>Carregando índice de blocos...</translation> </message> diff --git a/src/qt/locale/bitcoin_pt_PT.ts b/src/qt/locale/bitcoin_pt_PT.ts index ab01aa23f4..48068409be 100644 --- a/src/qt/locale/bitcoin_pt_PT.ts +++ b/src/qt/locale/bitcoin_pt_PT.ts @@ -30,6 +30,10 @@ <translation>Eliminar o endereço selecionado da lista</translation> </message> <message> + <source>Enter address or label to search</source> + <translation>Digite o endereço ou o rótulo para pesquisar</translation> + </message> + <message> <source>Export the data in the current tab to a file</source> <translation>Exportar os dados no separador atual para um ficheiro</translation> </message> @@ -322,6 +326,14 @@ <translation>Abrir &URI...</translation> </message> <message> + <source>Wallet:</source> + <translation>Carteira:</translation> + </message> + <message> + <source>default wallet</source> + <translation>carteira predefinida</translation> + </message> + <message> <source>Click to disable network activity.</source> <translation>Clique para desativar a atividade de rede.</translation> </message> @@ -342,6 +354,10 @@ <translation>A reindexar os blocos no disco...</translation> </message> <message> + <source>Proxy is <b>enabled</b>: %1</source> + <translation>Proxy está <b>ativado</b>: %1</translation> + </message> + <message> <source>Send coins to a Bitcoin address</source> <translation>Enviar moedas para um endereço Bitcoin</translation> </message> @@ -510,6 +526,12 @@ </translation> </message> <message> + <source>Wallet: %1 +</source> + <translation>Carteira: %1 +</translation> + </message> + <message> <source>Type: %1 </source> <translation>Tipo: %1 @@ -730,10 +752,6 @@ <translation>E&ndereço</translation> </message> <message> - <source>New receiving address</source> - <translation>Novo endereço de depósito</translation> - </message> - <message> <source>New sending address</source> <translation>Novo endereço de envio</translation> </message> @@ -750,10 +768,6 @@ <translation>O endereço introduzido "%1" não é um endereço bitcoin válido.</translation> </message> <message> - <source>The entered address "%1" is already in the address book.</source> - <translation>O endereço introduzido "%1" já se encontra no livro de endereços.</translation> - </message> - <message> <source>Could not unlock wallet.</source> <translation>Não foi possível desbloquear a carteira.</translation> </message> @@ -803,42 +817,6 @@ <source>Command-line options</source> <translation>Opções da linha de comando</translation> </message> - <message> - <source>Usage:</source> - <translation>Utilização:</translation> - </message> - <message> - <source>command-line options</source> - <translation>opções da linha de comando</translation> - </message> - <message> - <source>UI Options:</source> - <translation>Opções da IU:</translation> - </message> - <message> - <source>Choose data directory on startup (default: %u)</source> - <translation>Escolher a pasta de dados no arranque (predefinição: %u)</translation> - </message> - <message> - <source>Set language, for example "de_DE" (default: system locale)</source> - <translation>Definir idioma, por exemplo "pt_PT" (predefinição: idioma do sistema)</translation> - </message> - <message> - <source>Start minimized</source> - <translation>Iniciar minimizado</translation> - </message> - <message> - <source>Set SSL root certificates for payment request (default: -system-)</source> - <translation>Definir certificados de raiz SSL para pedidos de pagamento (predefinição: -system-)</translation> - </message> - <message> - <source>Show splash screen on startup (default: %u)</source> - <translation>Mostrar o ecrã de abertura no arranque (predefinição: %u)</translation> - </message> - <message> - <source>Reset all settings changed in the GUI</source> - <translation>Redefinir todas as definições alteradas na GUI</translation> - </message> </context> <context> <name>Intro</name> @@ -851,6 +829,18 @@ <translation>Bem-vindo ao %1.</translation> </message> <message> + <source>When you click OK, %1 will begin to download and process the full %4 block chain (%2GB) starting with the earliest transactions in %3 when %4 initially launched.</source> + <translation>Quando clicar OK, %1 vai começar a descarregar e processar a cadeia de blocos %4 completa (%2GB) começando com as transações mais antigas em %3 quando a %4 foi inicialmente lançada.</translation> + </message> + <message> + <source>This initial synchronisation is very demanding, and may expose hardware problems with your computer that had previously gone unnoticed. Each time you run %1, it will continue downloading where it left off.</source> + <translation>Esta sincronização inicial é muito exigente, e pode expor problemas com o seu computador que previamente podem ter passado despercebidos. Cada vez que corre %1, este vai continuar a descarregar de onde deixou. </translation> + </message> + <message> + <source>If you have chosen to limit block chain storage (pruning), the historical data must still be downloaded and processed, but will be deleted afterward to keep your disk usage low.</source> + <translation>Se escolheu limitar o armazenamento da cadeia de blocos (poda), a data histórica ainda tem de ser descarregada e processada, mas irá ser apagada no final para manter uma utilização baixa do espaço de disco.</translation> + </message> + <message> <source>Use the default data directory</source> <translation>Utilizar a pasta de dados predefinida</translation> </message> @@ -863,10 +853,18 @@ <translation>Bitcoin</translation> </message> <message> + <source>At least %1 GB of data will be stored in this directory, and it will grow over time.</source> + <translation>No mínimo %1 GB de dados irão ser armazenados neste diretório. </translation> + </message> + <message> <source>Approximately %1 GB of data will be stored in this directory.</source> <translation>Aproximadamente %1 GB de dados irão ser guardados nesta directoria. </translation> </message> <message> + <source>%1 will download and store a copy of the Bitcoin block chain.</source> + <translation>%1 irá descarregar e armazenar uma cópia da cadeia de blocos da Bitcoin.</translation> + </message> + <message> <source>The wallet will also be stored in this directory.</source> <translation>A carteira também será guardada nesta directoria.</translation> </message> @@ -996,6 +994,18 @@ <translation>Endereço de IP do proxy (exemplo, IPv4: 127.0.0.1 / IPv6: ::1)</translation> </message> <message> + <source>Shows if the supplied default SOCKS5 proxy is used to reach peers via this network type.</source> + <translation>Mostra se o padrão fornecido SOCKS5 proxy, está a ser utilizado para alcançar utilizadores participantes através deste tipo de rede. </translation> + </message> + <message> + <source>Use separate SOCKS&5 proxy to reach peers via Tor hidden services:</source> + <translation>Utilize um proxy SOCKS&5 separado para alcançar utilizadores participantes através dos serviços ocultos do Tor.</translation> + </message> + <message> + <source>Hide the icon from the system tray.</source> + <translation>Esconder o ícone da barra de ferramentas.</translation> + </message> + <message> <source>&Hide tray icon</source> <translation>&Ocultar ícone da bandeja</translation> </message> @@ -1013,6 +1023,10 @@ <translation>Ativar as opções da linha de comando que se sobrepõem às opções acima:</translation> </message> <message> + <source>Open the %1 configuration file from the working directory.</source> + <translation>Abrir o ficheiro de configuração %1 da directoria aberta.</translation> + </message> + <message> <source>Open Configuration File</source> <translation>Abrir Ficheiro de Configuração</translation> </message> @@ -1029,6 +1043,10 @@ <translation>&Rede</translation> </message> <message> + <source>GB</source> + <translation>PT</translation> + </message> + <message> <source>(0 = auto, <0 = leave that many cores free)</source> <translation>(0 = automático, <0 = deixar essa quantidade de núcleos livre)</translation> </message> @@ -1185,6 +1203,10 @@ <translation>Opções da configuração</translation> </message> <message> + <source>The configuration file is used to specify advanced user options which override GUI settings. Additionally, any command-line options will override this configuration file.</source> + <translation>O ficheiro de configuração é usado para especificar opções de utilizador avançado, que sobrescrevem as configurações do interface gráfico. Adicionalmente, qualquer opção da linha de comandos vai sobrescrever este ficheiro de configuração. </translation> + </message> + <message> <source>Error</source> <translation>Erro</translation> </message> @@ -1291,6 +1313,10 @@ <translation>Manuseamento de URI</translation> </message> <message> + <source>'bitcoin://' is not a valid URI. Use 'bitcoin:' instead.</source> + <translation>'bitcoin://' não é um URI válido. Utilize 'bitcoin:'.</translation> + </message> + <message> <source>Payment request fetch URL is invalid: %1</source> <translation>O URL do pedido de pagamento é inválido: %1</translation> </message> @@ -1488,12 +1514,16 @@ <context> <name>QObject::QObject</name> <message> + <source>Error parsing command line arguments: %1.</source> + <translation>Erro ao analisar os argumentos da linha de comando: %1.</translation> + </message> + <message> <source>Error: Specified data directory "%1" does not exist.</source> <translation>Erro: Pasta de dados especificada "%1" não existe.</translation> </message> <message> - <source>Error: Cannot parse configuration file: %1. Only use key=value syntax.</source> - <translation>Erro: não é possível analisar o ficheiro de configuração: %1. Utilize apenas a sintaxe key=value.</translation> + <source>Error: Cannot parse configuration file: %1.</source> + <translation>Erro: não é possível analisar o ficheiro de configuração: %1.</translation> </message> <message> <source>Error: %1</source> @@ -1586,6 +1616,14 @@ <translation>Utilização de memória</translation> </message> <message> + <source>Wallet: </source> + <translation>Carteira:</translation> + </message> + <message> + <source>(none)</source> + <translation>(nenhuma)</translation> + </message> + <message> <source>&Reset</source> <translation>&Reiniciar</translation> </message> @@ -1750,18 +1788,42 @@ <translation>&Desbanir</translation> </message> <message> + <source>default wallet</source> + <translation>carteira predefinida</translation> + </message> + <message> <source>Welcome to the %1 RPC console.</source> <translation>Bem-vindo à consola RPC da %1.</translation> </message> <message> + <source>Use up and down arrows to navigate history, and %1 to clear screen.</source> + <translation>Use as setas para cima e para baixo para navegar a história e %1 para limpar o ecrã.</translation> + </message> + <message> + <source>Type %1 for an overview of available commands.</source> + <translation>Digite %1 para uma visão geral dos comandos disponíveis.</translation> + </message> + <message> <source>For more information on using this console type %1.</source> <translation>Para mais informação em como utilizar esta consola, digite %1.</translation> </message> <message> + <source>WARNING: Scammers have been active, telling users to type commands here, stealing their wallet contents. Do not use this console without fully understanding the ramifications of a command.</source> + <translation>AVISO: Burlões têm estado activos, dizendo a utilizadores para digitar comandos aqui, roubando assim os conteúdos das suas carteiras. Não utilize esta consola sem perceber perfeitamente as ramificações de um comando.</translation> + </message> + <message> <source>Network activity disabled</source> <translation>Atividade de rede desativada</translation> </message> <message> + <source>Executing command without any wallet</source> + <translation>A executar o comando sem qualquer carteira</translation> + </message> + <message> + <source>Executing command using "%1" wallet</source> + <translation>A executar o comando utilizando a carteira "%1"</translation> + </message> + <message> <source>(node id: %1)</source> <translation>(id nó: %1)</translation> </message> @@ -1833,6 +1895,14 @@ <translation>Limpar</translation> </message> <message> + <source>Native segwit addresses (aka Bech32 or BIP-173) reduce your transaction fees later on and offer better protection against typos, but old wallets don't support them. When unchecked, an address compatible with older wallets will be created instead.</source> + <translation>Endereços nativos SegWit (também conhecidos como Bech32 ou BIP-173) reduzem as taxas da sua transação mais tarde e oferecem melhor protecção contra erros, mas carteiras antigas não os suportam. Quando não selecionado, um endereço compatível com carteiras antigas irá ser criado em vez.</translation> + </message> + <message> + <source>Generate native segwit (Bech32) address</source> + <translation>Gerar endereço nativo SegWit (Bech32)</translation> + </message> + <message> <source>Requested payments history</source> <translation>Histórico de pagamentos solicitados</translation> </message> @@ -1920,6 +1990,10 @@ <translation>Mensagem</translation> </message> <message> + <source>Wallet</source> + <translation>Carteira</translation> + </message> + <message> <source>Resulting URI too long, try to reduce the text for label / message.</source> <translation>URI resultante muito longo. Tente reduzir o texto do rótulo / mensagem.</translation> </message> @@ -2034,10 +2108,6 @@ <translation>por kilobyte</translation> </message> <message> - <source>If the custom fee is set to 1000 satoshis and the transaction is only 250 bytes, then "per kilobyte" only pays 250 satoshis in fee, while "total at least" pays 1000 satoshis. For transactions bigger than a kilobyte both pay by kilobyte.</source> - <translation>Se a taxa personalizada estiver definida para 1.000 satoshis e a transação é de apenas 250 bytes, então paga apenas 250 satoshis "por kilobyte" na taxa, enquanto em "total pelo menos" paga 1.000 satoshis. Para transações superiores a um kilobyte ambos pagam por kilobyte.</translation> - </message> - <message> <source>Hide</source> <translation>Esconder</translation> </message> @@ -2126,6 +2196,10 @@ <translation>Copiar troco</translation> </message> <message> + <source>%1 (%2 blocks)</source> + <translation>%1 (%2 blocos)</translation> + </message> + <message> <source>%1 to %2</source> <translation>%1 para %2</translation> </message> @@ -2134,16 +2208,24 @@ <translation>Tem a certeza que deseja enviar?</translation> </message> <message> - <source>added as transaction fee</source> - <translation>adicionado como taxa de transação</translation> + <source>or</source> + <translation>ou</translation> </message> <message> - <source>Total Amount %1</source> - <translation>Quantia Total %1</translation> + <source>from wallet %1</source> + <translation>da carteira %1</translation> </message> <message> - <source>or</source> - <translation>ou</translation> + <source>Please, review your transaction.</source> + <translation>Por favor, reveja a sua transação.</translation> + </message> + <message> + <source>Transaction fee</source> + <translation>Taxa de transação</translation> + </message> + <message> + <source>Total Amount</source> + <translation>Valor Total</translation> </message> <message> <source>Confirm send coins</source> @@ -2476,10 +2558,6 @@ <translation>Aberto até %1</translation> </message> <message> - <source>%1/offline</source> - <translation>%1/off-line</translation> - </message> - <message> <source>0/unconfirmed, %1</source> <translation>0/não confirmada, %1</translation> </message> @@ -2508,10 +2586,6 @@ <translation>Estado</translation> </message> <message> - <source>, has not been successfully broadcast yet</source> - <translation>, ainda não foi transmitido com sucesso</translation> - </message> - <message> <source>Date</source> <translation>Data</translation> </message> @@ -2551,6 +2625,10 @@ <source>Credit</source> <translation>Crédito</translation> </message> + <message numerus="yes"> + <source>matures in %n more block(s)</source> + <translation><numerusform>matura em %n bloco</numerusform><numerusform>matura em %n blocos</numerusform></translation> + </message> <message> <source>not accepted</source> <translation>não aceite</translation> @@ -2592,6 +2670,10 @@ <translation>Tamanho total da transição</translation> </message> <message> + <source>Transaction virtual size</source> + <translation>Tamanho da transação virtual</translation> + </message> + <message> <source>Output index</source> <translation>Índex de saída</translation> </message> @@ -2600,6 +2682,10 @@ <translation>Comerciante</translation> </message> <message> + <source>Generated coins must mature %1 blocks before they can be spent. When you generated this block, it was broadcast to the network to be added to the block chain. If it fails to get into the chain, its state will change to "not accepted" and it won't be spendable. This may occasionally happen if another node generates a block within a few seconds of yours.</source> + <translation>As moedas geradas precisam amadurecer %1 blocos antes que possam ser gastas. Quando gerou este bloco, ele foi transmitido para a rede para ser adicionado à cadeia de blocos. Se este não conseguir entrar na cadeia, seu estado mudará para "não aceite" e não poderá ser gasto. Isto pode acontecer ocasionalmente se outro nó gerar um bloco dentro de alguns segundos do seu.</translation> + </message> + <message> <source>Debug information</source> <translation>Informação de depuração</translation> </message> @@ -2658,10 +2744,6 @@ <translation>Aberto até %1</translation> </message> <message> - <source>Offline</source> - <translation>Off-line</translation> - </message> - <message> <source>Unconfirmed</source> <translation>Não confirmado</translation> </message> @@ -2670,6 +2752,10 @@ <translation>Abandonada</translation> </message> <message> + <source>Confirming (%1 of %2 recommended confirmations)</source> + <translation>Confirmando (%1 de %2 confirmações recomendadas)</translation> + </message> + <message> <source>Confirmed (%1 confirmations)</source> <translation>Confirmada (%1 confirmações)</translation> </message> @@ -2678,8 +2764,8 @@ <translation>Incompatível</translation> </message> <message> - <source>This block was not received by any other nodes and will probably not be accepted!</source> - <translation>Este bloco não foi recepcionado por outro nó e provavelente não será aceite!</translation> + <source>Immature (%1 confirmations, will be available after %2)</source> + <translation>Imaturo (%1 confirmações, estarão disponível após %2)</translation> </message> <message> <source>Generated but not accepted</source> @@ -2730,6 +2816,14 @@ <translation>Tipo de transação.</translation> </message> <message> + <source>Whether or not a watch-only address is involved in this transaction.</source> + <translation>Se um endereço de monitoração está ou não envolvido nesta transação.</translation> + </message> + <message> + <source>User-defined intent/purpose of the transaction.</source> + <translation>Intenção do utilizador/motivo da transação</translation> + </message> + <message> <source>Amount removed from or added to balance.</source> <translation>Montante retirado ou adicionado ao saldo</translation> </message> @@ -2785,6 +2879,10 @@ <translation>Outras</translation> </message> <message> + <source>Enter address, transaction id, or label to search</source> + <translation>Escreva endereço, identificação de transação ou rótulo para procurar</translation> + </message> + <message> <source>Min amount</source> <translation>Valor mín.</translation> </message> @@ -2869,6 +2967,10 @@ <translation>Exportação Falhou</translation> </message> <message> + <source>There was an error trying to save the transaction history to %1.</source> + <translation>Ocorreu um erro ao tentar guardar o histórico de transações em %1.</translation> + </message> + <message> <source>Exporting Successful</source> <translation>Exportação Bem Sucedida</translation> </message> @@ -2902,6 +3004,18 @@ <translation>Enviar Moedas</translation> </message> <message> + <source>Fee bump error</source> + <translation>Erro no aumento de taxa</translation> + </message> + <message> + <source>Increasing transaction fee failed</source> + <translation>Aumento da taxa de transação falhou</translation> + </message> + <message> + <source>Do you want to increase the fee?</source> + <translation>Quer aumentar a taxa?</translation> + </message> + <message> <source>Current fee:</source> <translation>Taxa atual:</translation> </message> @@ -2914,10 +3028,18 @@ <translation>Nova taxa:</translation> </message> <message> + <source>Confirm fee bump</source> + <translation>Confirme aumento de taxa</translation> + </message> + <message> <source>Can't sign transaction.</source> <translation>Não é possível assinar a transação.</translation> </message> - </context> + <message> + <source>Could not commit transaction</source> + <translation>Não foi possível cometer a transação</translation> + </message> +</context> <context> <name>WalletView</name> <message> @@ -2948,32 +3070,20 @@ <source>Backup Successful</source> <translation>Cópia de Segurança Bem Sucedida</translation> </message> - </context> -<context> - <name>bitcoin-core</name> <message> - <source>Options:</source> - <translation>Opções:</translation> + <source>The wallet data was successfully saved to %1.</source> + <translation>Os dados da carteira foram guardados com sucesso em %1.</translation> </message> <message> - <source>Specify data directory</source> - <translation>Especificar pasta de dados</translation> - </message> - <message> - <source>Connect to a node to retrieve peer addresses, and disconnect</source> - <translation>Ligar a um nó para recuperar endereços de pontos, e desligar</translation> - </message> - <message> - <source>Specify your own public address</source> - <translation>Especifique o seu endereço público</translation> - </message> - <message> - <source>Accept command line and JSON-RPC commands</source> - <translation>Aceitar comandos de linha de comandos e JSON-RPC</translation> + <source>Cancel</source> + <translation>Cancelar</translation> </message> +</context> +<context> + <name>bitcoin-core</name> <message> - <source>If <category> is not supplied or if <category> = 1, output all debugging information.</source> - <translation>Se <category> não é fornecida ou <category> = 1, imprimir toda a informação de depuração.</translation> + <source>Distributed under the MIT software license, see the accompanying file %s or %s</source> + <translation>Distribuído sob licença de software MIT, veja o ficheiro %s ou %s</translation> </message> <message> <source>Prune configured below the minimum of %d MiB. Please use a higher number.</source> @@ -2981,29 +3091,21 @@ </message> <message> <source>Prune: last wallet synchronisation goes beyond pruned data. You need to -reindex (download the whole blockchain again in case of pruned node)</source> - <translation>Suprimir: a última sincronização da carteira vai além dos dados suprimidos. O que precisa para -reindex (transferir novamente toda a cadeia de blocos, no caso de nó suprimido)</translation> + <translation>Poda: a última sincronização da carteira vai além dos dados podados. Precisa de -reindex (descarregar novamente a cadeia de blocos completa em caso de nó podado)</translation> </message> <message> <source>Rescans are not possible in pruned mode. You will need to use -reindex which will download the whole blockchain again.</source> - <translation>Reanálises não são possíveis no modo de suprimir. Para isso terá de utilizar -reindex que irá transferir novamente toda a cadeia de blocos.</translation> + <translation>Reanálises não são possíveis em modo poda. Terá de utilizar -reindex que irá descarregar novamente a cadeia de blocos completa</translation> </message> <message> <source>Error: A fatal internal error occurred, see debug.log for details</source> <translation>Erro: Um erro fatal interno ocorreu, verificar debug.log para mais informação</translation> </message> <message> - <source>Fee (in %s/kB) to add to transactions you send (default: %s)</source> - <translation>Taxa (em %s/kB) para adicionar às transações que envia (predefinição: %s)</translation> - </message> - <message> <source>Pruning blockstore...</source> <translation>A podar a blockstore...</translation> </message> <message> - <source>Run in the background as a daemon and accept commands</source> - <translation>Correr o processo em segundo plano e aceitar comandos</translation> - </message> - <message> <source>Unable to start HTTP server. See debug log for details.</source> <translation>Não é possível iniciar o servidor HTTP. Verifique o debug.log para detalhes.</translation> </message> @@ -3016,44 +3118,28 @@ <translation>Os programadores de %s</translation> </message> <message> - <source>A fee rate (in %s/kB) that will be used when fee estimation has insufficient data (default: %s)</source> - <translation>Uma percentagem da taxa (em %s/kB) que será utilizada quando a estimativa da taxa tiver dados insuficientes (predefinição: %s)</translation> - </message> - <message> - <source>Accept relayed transactions received from whitelisted peers even when not relaying transactions (default: %d)</source> - <translation>Aceitar as transações retransmitidas recebidas dos pontos na lista branca, mesmo quando não retransmitir as transações (predefinição: %d)</translation> - </message> - <message> - <source>Bind to given address and always listen on it. Use [host]:port notation for IPv6</source> - <translation>Associar a endereço específico e escutar sempre nele. Use a notação [anfitrião]:porta para IPv6</translation> - </message> - <message> - <source>Delete all wallet transactions and only recover those parts of the blockchain through -rescan on startup</source> - <translation>Apague todas as transações da carteira e somente restore aquelas que façam parte do blockchain através de re-scan ao reiniciar o programa</translation> - </message> - <message> - <source>Execute command when a wallet transaction changes (%s in cmd is replaced by TxID)</source> - <translation>Executar o comando quando uma transação da carteira muda (no comando, %s é substituído pela Id. da Transação)</translation> + <source>Cannot provide specific connections and have addrman find outgoing connections at the same.</source> + <translation>Não é possível fornecer conexões específicas e ter o addrman a procurar conexões de saída ao mesmo tempo.</translation> </message> <message> <source>Please check that your computer's date and time are correct! If your clock is wrong, %s will not work properly.</source> <translation>Por favor verifique que a data e hora do seu computador estão certos! Se o relógio não estiver certo, o %s não funcionará corretamente.</translation> </message> <message> - <source>Query for peer addresses via DNS lookup, if low on addresses (default: 1 unless -connect used)</source> - <translation>Consultar por endereços de ponto via procura de DNS, se tiver poucos endereços (predefinição: 1, a menos que use -connect)</translation> - </message> - <message> - <source>Set the number of script verification threads (%u to %d, 0 = auto, <0 = leave that many cores free, default: %d)</source> - <translation>Defina o número de processos de verificação (%u até %d, 0 = automático, <0 = ldisponibiliza esse número de núcleos livres, por defeito: %d)</translation> + <source>Please contribute if you find %s useful. Visit %s for further information about the software.</source> + <translation>Por favor, contribua se achar que %s é útil. Visite %s para mais informação sobre o software.</translation> </message> <message> <source>The block database contains a block which appears to be from the future. This may be due to your computer's date and time being set incorrectly. Only rebuild the block database if you are sure that your computer's date and time are correct</source> <translation>A base de dados de blocos contém um bloco que aparenta ser do futuro. Isto pode ser causado por uma data incorrecta definida no seu computador. Reconstrua apenas a base de dados de blocos caso tenha a certeza de que a data e hora do seu computador estão correctos.</translation> </message> <message> - <source>Use UPnP to map the listening port (default: 1 when listening and no -proxy)</source> - <translation>Utilizar UPnP para mapear a porta de escuta (predefinição: 1 quando escutar e sem -proxy)</translation> + <source>This is the transaction fee you may discard if change is smaller than dust at this level</source> + <translation>Esta é a taxa de transação que poderá descartar, se o troco for menor que o pó a este nível</translation> + </message> + <message> + <source>Unable to rewind the database to a pre-fork state. You will need to redownload the blockchain</source> + <translation>Não é possível rebobinar a base de dados para um estado antes da divisão da cadeia de blocos. Necessita descarregar novamente a cadeia de blocos </translation> </message> <message> <source>Warning: The network does not appear to fully agree! Some miners appear to be experiencing issues.</source> @@ -3072,38 +3158,10 @@ <translation>- máximo do banco de memória deverá ser pelo menos %d MB</translation> </message> <message> - <source><category> can be:</source> - <translation><categoria> pode ser:</translation> - </message> - <message> - <source>Accept connections from outside (default: 1 if no -proxy or -connect)</source> - <translation>Aceitar ligações externas (padrão: 1 sem -proxy ou -connect)</translation> - </message> - <message> - <source>Append comment to the user agent string</source> - <translation>Anexar um comentário para a entrada de agente do utilizador</translation> - </message> - <message> - <source>Attempt to recover private keys from a corrupt wallet on startup</source> - <translation>Tentar reuperar as chaves privadas de um "wallet" ao iniciar</translation> - </message> - <message> - <source>Block creation options:</source> - <translation>Opções da criação de bloco:</translation> - </message> - <message> <source>Cannot resolve -%s address: '%s'</source> <translation>Não é possível resolver -%s endereço '%s'</translation> </message> <message> - <source>Chain selection options:</source> - <translation>Opções de seleção da cadeia:</translation> - </message> - <message> - <source>Connection options:</source> - <translation>Opções de ligação:</translation> - </message> - <message> <source>Copyright (C) %i-%i</source> <translation>Direitos de Autor (C) %i-%i</translation> </message> @@ -3112,38 +3170,10 @@ <translation>Cadeia de blocos corrompida detectada</translation> </message> <message> - <source>Debugging/Testing options:</source> - <translation>Opções de Depuração/Teste:</translation> - </message> - <message> - <source>Do not load the wallet and disable wallet RPC calls</source> - <translation>Não carregar a carteira e desativar as chamadas de RPC da carteira.</translation> - </message> - <message> <source>Do you want to rebuild the block database now?</source> <translation>Deseja reconstruir agora a base de dados de blocos.</translation> </message> <message> - <source>Enable publish hash block in <address></source> - <translation>Activar publicação do hash do bloco em <address></translation> - </message> - <message> - <source>Enable publish hash transaction in <address></source> - <translation>Activar publicação do hash da transacção em <address></translation> - </message> - <message> - <source>Enable publish raw block in <address></source> - <translation>Activar publicação de dados brutos do bloco em <address></translation> - </message> - <message> - <source>Enable publish raw transaction in <address></source> - <translation>Activar publicação de dados brutos da transacção em <address></translation> - </message> - <message> - <source>Enable transaction replacement in the memory pool (default: %u)</source> - <translation>Ativar substituição da transação no banco de memória (predefinição: %u)</translation> - </message> - <message> <source>Error initializing block database</source> <translation>Erro ao inicializar a cadeia de blocos</translation> </message> @@ -3180,6 +3210,10 @@ <translation>Falhou a escutar em qualquer porta. Use -listen=0 se quiser isto.</translation> </message> <message> + <source>Failed to rescan the wallet during initialization</source> + <translation>Reexaminação da carteira falhou durante a inicialização</translation> + </message> + <message> <source>Importing...</source> <translation>A importar...</translation> </message> @@ -3188,6 +3222,10 @@ <translation>Bloco génese incorreto ou nenhum bloco génese encontrado. Pasta de dados errada para a rede?</translation> </message> <message> + <source>Initialization sanity check failed. %s is shutting down.</source> + <translation>Verificação de integridade inicial falhou. O %s está a desligar-se.</translation> + </message> + <message> <source>Invalid amount for -%s=<amount>: '%s'</source> <translation>Valor inválido para -%s=<amount>: '%s'</translation> </message> @@ -3196,10 +3234,6 @@ <translation>Valor inválido para -fallbackfee=<amount>: '%s'</translation> </message> <message> - <source>Keep the transaction memory pool below <n> megabytes (default: %u)</source> - <translation>Manter o banco de memória da transação abaixo de <n> megabytes (predefinição: %u)</translation> - </message> - <message> <source>Loading P2P addresses...</source> <translation>A carregar endereços de P2P...</translation> </message> @@ -3208,26 +3242,10 @@ <translation>A carregar a lista de banir...</translation> </message> <message> - <source>Location of the auth cookie (default: data dir)</source> - <translation>Localização de cookie de autorização (predefinição: diretoria de dados)</translation> - </message> - <message> <source>Not enough file descriptors available.</source> <translation>Os descritores de ficheiros disponíveis são insuficientes.</translation> </message> <message> - <source>Only connect to nodes in network <net> (ipv4, ipv6 or onion)</source> - <translation>Somente conectar aos nodes na rede <net> (ipv4, ipv6 ou onion)</translation> - </message> - <message> - <source>Print this help message and exit</source> - <translation>Imprimir esta mensagem de ajuda e sair</translation> - </message> - <message> - <source>Print version and exit</source> - <translation>Imprimir versão e sair</translation> - </message> - <message> <source>Prune cannot be configured with a negative value.</source> <translation>Poda não pode ser configurada com um valor negativo.</translation> </message> @@ -3236,12 +3254,20 @@ <translation>Modo poda é incompatível com -txindex.</translation> </message> <message> - <source>Set database cache size in megabytes (%d to %d, default: %d)</source> - <translation>Definir o tamanho da cache de base de dados em megabytes (%d a %d, padrão: %d)</translation> + <source>Replaying blocks...</source> + <translation>Repetindo blocos...</translation> </message> <message> - <source>Specify wallet file (within data directory)</source> - <translation>Especifique ficheiro de carteira (dentro da pasta de dados)</translation> + <source>Rewinding blocks...</source> + <translation>A rebobinar blocos...</translation> + </message> + <message> + <source>The source code is available from %s.</source> + <translation>O código fonte está disponível pelo %s.</translation> + </message> + <message> + <source>Transaction fee and change calculation failed</source> + <translation>Cálculo da taxa de transação e de troco falhou</translation> </message> <message> <source>Unsupported argument -benchmark ignored, use -debug=bench.</source> @@ -3260,14 +3286,6 @@ <translation>A atualizar a base de dados UTXO</translation> </message> <message> - <source>Use UPnP to map the listening port (default: %u)</source> - <translation>Utilizar UPnP para mapear a porta de escuta (predefinição: %u)</translation> - </message> - <message> - <source>Use the test chain</source> - <translation>Utilize a cadeia de testes</translation> - </message> - <message> <source>User Agent comment (%s) contains unsafe characters.</source> <translation>Comentário no User Agent (%s) contém caracteres inseguros.</translation> </message> @@ -3276,94 +3294,30 @@ <translation>A verificar blocos...</translation> </message> <message> - <source>Wallet debugging/testing options:</source> - <translation>Opções de depuração/testes da carteira:</translation> - </message> - <message> - <source>Wallet options:</source> - <translation>Opções da carteira:</translation> - </message> - <message> - <source>Allow JSON-RPC connections from specified source. Valid for <ip> are a single IP (e.g. 1.2.3.4), a network/netmask (e.g. 1.2.3.4/255.255.255.0) or a network/CIDR (e.g. 1.2.3.4/24). This option can be specified multiple times</source> - <translation>Permitir conexções JSON-RPC de fontes especificas. Valido para <ip> um unico IP (ex. 1.2.3.4), uma rede/netmask (ex. 1.2.3.4/255.255.255.0) ou uma rede/CIDR (ex. 1.2.3.4/24). Esta opção pode ser especificada varias vezes</translation> - </message> - <message> - <source>Bind to given address and whitelist peers connecting to it. Use [host]:port notation for IPv6</source> - <translation>Associar ao endereço indicado e pontos da lista branca ligando-se a ele. Utilize a notação [anfitrião]:porta para IPv6</translation> - </message> - <message> - <source>Create new files with system default permissions, instead of umask 077 (only effective with disabled wallet functionality)</source> - <translation>Crie ficheiros novos com as permisões predefinidas do sistema, em vez de umask 077 (apenas eficaz caso a funcionalidade carteira esteja desactivada)</translation> - </message> - <message> - <source>Discover own IP addresses (default: 1 when listening and no -externalip or -proxy)</source> - <translation>Descobrir o próprio endereço IP (padrão: 1 ao escutar e sem -externalip ou -proxy)</translation> + <source>Wallet needed to be rewritten: restart %s to complete</source> + <translation>A carteira precisou de ser reescrita: reinicie %s para completar</translation> </message> <message> <source>Error: Listening for incoming connections failed (listen returned error %s)</source> <translation>Erro: A escuta de ligações de entrada falhou (escuta devolveu erro %s)</translation> </message> <message> - <source>Execute command when a relevant alert is received or we see a really long fork (%s in cmd is replaced by message)</source> - <translation>Executar comando quando um alerta relevante for recebido ou em caso de uma divisão longa da cadeia de blocos (no comando, %s é substituído pela mensagem)</translation> - </message> - <message> - <source>Fees (in %s/kB) smaller than this are considered zero fee for relaying, mining and transaction creation (default: %s)</source> - <translation>Taxas (em %s/kB) inferiores a este valor são consideradas nulas para propagação, mineração e criação de transações (predefinição: %s)</translation> - </message> - <message> - <source>If paytxfee is not set, include enough fee so transactions begin confirmation on average within n blocks (default: %u)</source> - <translation>Caso o paytxfee não seja definido, inclua uma taxa suficiente para que as transacções comecem a ser confirmadas, em média, dentro de n blocos (padrão: %u)</translation> - </message> - <message> <source>Invalid amount for -maxtxfee=<amount>: '%s' (must be at least the minrelay fee of %s to prevent stuck transactions)</source> <translation>Montante inválido para -maxtxfee=<amount>: '%s' (deverá ser, no mínimo , a taxa mínima de propagação de %s, de modo a evitar transações bloqueadas)</translation> </message> <message> - <source>Maximum size of data in data carrier transactions we relay and mine (default: %u)</source> - <translation>Tamanho máximo dos dados em transacções que incluem dados que propagamos e mineramos (padrão: %u)</translation> - </message> - <message> - <source>Randomize credentials for every proxy connection. This enables Tor stream isolation (default: %u)</source> - <translation>Usar credenciais aleatórias por cada ligação proxy. Permite que o Tor use stream isolation (padrão: %u)</translation> - </message> - <message> <source>The transaction amount is too small to send after the fee has been deducted</source> <translation>O montante da transacção é demasiado baixo após a dedução da taxa</translation> </message> <message> - <source>Whitelisted peers cannot be DoS banned and their transactions are always relayed, even if they are already in the mempool, useful e.g. for a gateway</source> - <translation>Os pontos enviados para a lista branca não podem ser DoS banidos e as suas transações são sempre retransmitidas, mesmo que já estejam no banco de memória, útil, por exemplo, para um acesso</translation> - </message> - <message> <source>You need to rebuild the database using -reindex to go back to unpruned mode. This will redownload the entire blockchain</source> - <translation>É necessário reconstruir a base de dados, utilizando -reindex para voltar ao modo de suprimir. Isto irá transferir novamente a cadeia de blocos completa</translation> - </message> - <message> - <source>(default: %u)</source> - <translation>(predefinição: %u)</translation> - </message> - <message> - <source>Accept public REST requests (default: %u)</source> - <translation>Aceitar pedidos REST públicos (predefinição: %u)</translation> - </message> - <message> - <source>Automatically create Tor hidden service (default: %d)</source> - <translation>Criar automaticamente o serviço Tor oculto (predefinição: %d)</translation> - </message> - <message> - <source>Connect through SOCKS5 proxy</source> - <translation>Ligar através de um proxy SOCKS5</translation> + <translation>Necessita reconstruir a base de dados, utilizando -reindex para voltar ao modo sem poda. Isto irá descarregar novamente a cadeia de blocos completa</translation> </message> <message> <source>Error reading from database, shutting down.</source> <translation>Erro ao ler da base de dados, encerrando.</translation> </message> <message> - <source>Imports blocks from external blk000??.dat file on startup</source> - <translation>Importar blocos de um ficheiro blk000??.dat externo ao iniciar</translation> - </message> - <message> <source>Information</source> <translation>Informação</translation> </message> @@ -3380,42 +3334,14 @@ <translation>Máscara de rede inválida especificada em -whitelist: '%s'</translation> </message> <message> - <source>Keep at most <n> unconnectable transactions in memory (default: %u)</source> - <translation>Manter no máximo <n> transacções órfãs em memória (padrão: %u)</translation> - </message> - <message> <source>Need to specify a port with -whitebind: '%s'</source> <translation>Necessário especificar uma porta com -whitebind: '%s'</translation> </message> <message> - <source>Node relay options:</source> - <translation>Opções da transmissão de nós:</translation> - </message> - <message> - <source>RPC server options:</source> - <translation>Opções do servidor RPC:</translation> - </message> - <message> <source>Reducing -maxconnections from %d to %d, because of system limitations.</source> <translation>Reduzindo -maxconnections de %d para %d, devido a limitações no sistema.</translation> </message> <message> - <source>Rescan the block chain for missing wallet transactions on startup</source> - <translation>Procurar transacções em falta na cadeia de blocos ao iniciar</translation> - </message> - <message> - <source>Send trace/debug info to console instead of debug.log file</source> - <translation>Enviar informação de rastreio/depuração para a consola e não para o ficheiro debug.log</translation> - </message> - <message> - <source>Show all debugging options (usage: --help -help-debug)</source> - <translation>Mostrar todas as opções de depuração (utilização: --help -help-debug)</translation> - </message> - <message> - <source>Shrink debug.log file on client startup (default: 1 when no -debug)</source> - <translation>Encolher ficheiro debug.log ao iniciar o cliente (por defeito: 1 sem -debug definido)</translation> - </message> - <message> <source>Signing transaction failed</source> <translation>Falhou assinatura da transação</translation> </message> @@ -3428,14 +3354,6 @@ <translation>Isto é software experimental.</translation> </message> <message> - <source>Tor control port password (default: empty)</source> - <translation>Palavra-passe da porta de controlo Tor (predefinição: vazio)</translation> - </message> - <message> - <source>Tor control port to use if onion listening enabled (default: %s)</source> - <translation>Porta de controlo Tor a utilizar se a escuta cebola estiver ativada (predefinição: %s)</translation> - </message> - <message> <source>Transaction amount too small</source> <translation>Quantia da transação é muito baixa</translation> </message> @@ -3452,12 +3370,8 @@ <translation>Incapaz de vincular à porta %s neste computador (vínculo retornou erro %s)</translation> </message> <message> - <source>Upgrade wallet to latest format on startup</source> - <translation>Actualizar carteira para o formato mais recente ao iniciar</translation> - </message> - <message> - <source>Username for JSON-RPC connections</source> - <translation>Nome de utilizador para ligações JSON-RPC</translation> + <source>Unable to generate initial keys</source> + <translation>Incapaz de gerar as chaves iniciais</translation> </message> <message> <source>Verifying wallet(s)...</source> @@ -3472,66 +3386,14 @@ <translation>Aviso: ativadas novas regras desconhecidas (versionbit %i)</translation> </message> <message> - <source>Whether to operate in a blocks only mode (default: %u)</source> - <translation>Se operar apenas num modo de blocos (predefinição: %u)</translation> - </message> - <message> <source>Zapping all transactions from wallet...</source> <translation>A limpar todas as transações da carteira...</translation> </message> <message> - <source>ZeroMQ notification options:</source> - <translation>Opções de notificação ZeroMQ:</translation> - </message> - <message> - <source>Password for JSON-RPC connections</source> - <translation>Palavra-passe para ligações JSON-RPC</translation> - </message> - <message> - <source>Execute command when the best block changes (%s in cmd is replaced by block hash)</source> - <translation>Executar o comando quando o melhor bloco muda (no comando, %s é substituído pela hash do bloco)</translation> - </message> - <message> - <source>Allow DNS lookups for -addnode, -seednode and -connect</source> - <translation>Permitir procuras DNS para -addnode, -seednode e -connect</translation> - </message> - <message> - <source>(1 = keep tx meta data e.g. account owner and payment request information, 2 = drop tx meta data)</source> - <translation>(1 = guardar metadados da transacção ex: proprietário da conta e informação do pedido de pagamento, 2 = descartar metadados da transacção)</translation> - </message> - <message> <source>-maxtxfee is set very high! Fees this large could be paid on a single transaction.</source> <translation>-maxtxfee está definido com um valor muito alto! Taxas desta magnitude podem ser pagas numa única transacção.</translation> </message> <message> - <source>Do not keep transactions in the mempool longer than <n> hours (default: %u)</source> - <translation>Não guardar transações no banco de memória por mais de <n> horas (predefinição: %u)</translation> - </message> - <message> - <source>Fees (in %s/kB) smaller than this are considered zero fee for transaction creation (default: %s)</source> - <translation>Taxas (em %s/kB) abaixo deste valor são consideradas nulas para a criação de transacções (padrão: %s)</translation> - </message> - <message> - <source>How thorough the block verification of -checkblocks is (0-4, default: %u)</source> - <translation>Minuciosidade da verificação de blocos para -checkblocks é (0-4, padrão: %u)</translation> - </message> - <message> - <source>Maintain a full transaction index, used by the getrawtransaction rpc call (default: %u)</source> - <translation>Manter um índice de transacções completo, usado pela chamada RPC getrawtransaction (padrão: %u)</translation> - </message> - <message> - <source>Number of seconds to keep misbehaving peers from reconnecting (default: %u)</source> - <translation>Número de segundos a impedir que os pontos com mau comportamento se religuem (predefinição: %u)</translation> - </message> - <message> - <source>Output debugging information (default: %u, supplying <category> is optional)</source> - <translation>Informação de depuração (padrão: %u, fornecer uma <category> é opcional)</translation> - </message> - <message> - <source>Support filtering of blocks and transaction with bloom filters (default: %u)</source> - <translation>Suportar filtragem de blocos e transacções com fitros bloom (padrão: %u)</translation> - </message> - <message> <source>This is the transaction fee you may pay when fee estimates are not available.</source> <translation>Esta é a taxa de transação que poderá pagar quando as estimativas da taxa não estão disponíveis.</translation> </message> @@ -3544,10 +3406,6 @@ <translation>Comprimento total da entrada da versão de rede (%i) excede o comprimento máximo (%i). Reduzir o número ou o tamanho de uacomments.</translation> </message> <message> - <source>Tries to keep outbound traffic under the given target (in MiB per 24h), 0 = no limit (default: %d)</source> - <translation>Tenta manter o tráfego externo abaixo do limite especificado (em MiB por 24h), 0 = sem limite (padrão: %d)</translation> - </message> - <message> <source>Unsupported argument -socks found. Setting SOCKS version isn't possible anymore, only SOCKS5 proxies are supported.</source> <translation>Encontrado um argumento não suportado -socks. Definir a versão do SOCKS já não é possível, apenas proxies SOCKS5 são suportados.</translation> </message> @@ -3556,10 +3414,6 @@ <translation>Argumento não suportado -whitelistalwaysrelay ignorado, utilize -whitelistrelay e/ou -whitelistforcerelay.</translation> </message> <message> - <source>Use separate SOCKS5 proxy to reach peers via Tor hidden services (default: %s)</source> - <translation>Utilize um proxy SOCKS5 separado para alcançar os pontos via serviços ocultos do Tor (predefinição: %s)</translation> - </message> - <message> <source>Warning: Unknown block versions being mined! It's possible unknown rules are in effect</source> <translation>Atenção: Versões desconhecidas de blocos estão a ser mineradas! É possível que regras desconhecias estão a ser efetuadas</translation> </message> @@ -3568,94 +3422,18 @@ <translation>%s está demasiado elevado!</translation> </message> <message> - <source>(default: %s)</source> - <translation>(predefinição: %s)</translation> - </message> - <message> - <source>Always query for peer addresses via DNS lookup (default: %u)</source> - <translation>Consultar sempre os endereços de ponto via procura de DNS (predefinição: %u)</translation> - </message> - <message> - <source>How many blocks to check at startup (default: %u, 0 = all)</source> - <translation>Quantos blocos para verificar no arranque (predefinição: %u, 0 = todos)</translation> - </message> - <message> - <source>Include IP addresses in debug output (default: %u)</source> - <translation>Incluir endereços de IP na informação de depuração (predefinição: %u)</translation> - </message> - <message> - <source>Listen for JSON-RPC connections on <port> (default: %u or testnet: %u)</source> - <translation>Escutar por ligações JSON-RPC na porta <port> (predefinição: %u ou rede de testes: %u)</translation> - </message> - <message> - <source>Listen for connections on <port> (default: %u or testnet: %u)</source> - <translation>Escute ligações na porta <port> (por defeito: %u ou testnet: %u)</translation> - </message> - <message> - <source>Maintain at most <n> connections to peers (default: %u)</source> - <translation>Manter no máximo <n> ligações para os pontos (predefinição: %u)</translation> - </message> - <message> - <source>Make the wallet broadcast transactions</source> - <translation>Colocar a carteira a transmitir transacções</translation> - </message> - <message> - <source>Maximum per-connection receive buffer, <n>*1000 bytes (default: %u)</source> - <translation>Maximo armazenamento intermédio de recepção por ligação, <n>*1000 bytes (por defeito: %u)</translation> - </message> - <message> - <source>Maximum per-connection send buffer, <n>*1000 bytes (default: %u)</source> - <translation>Maximo armazenamento intermédio de envio por ligação, <n>*1000 bytes (por defeito: %u)</translation> - </message> - <message> - <source>Prepend debug output with timestamp (default: %u)</source> - <translation>Adicionar data e hora à informação de depuração (por defeito: %u)</translation> - </message> - <message> - <source>Relay and mine data carrier transactions (default: %u)</source> - <translation>Propagar e minerar transacções que incluem dados (padrão: %u)</translation> - </message> - <message> - <source>Relay non-P2SH multisig (default: %u)</source> - <translation>Propagar não P2SH multisig (predefinição: %u)</translation> - </message> - <message> - <source>Set key pool size to <n> (default: %u)</source> - <translation>Definir tamanho do banco de memória da chave para <n> (predefinição: %u)</translation> - </message> - <message> - <source>Set the number of threads to service RPC calls (default: %d)</source> - <translation>Defina o número de processos para servir as chamadas RPC (por defeito: %d)</translation> - </message> - <message> - <source>Specify configuration file (default: %s)</source> - <translation>Especificar ficheiro de configuração (por defeito: %s)</translation> - </message> - <message> - <source>Specify connection timeout in milliseconds (minimum: 1, default: %d)</source> - <translation>Especificar tempo de espera da ligação em milissegundos (mínimo 1, por defeito: %d)</translation> - </message> - <message> - <source>Specify pid file (default: %s)</source> - <translation>Especificar ficheiro pid (padrão: %s)</translation> - </message> - <message> - <source>Spend unconfirmed change when sending transactions (default: %u)</source> - <translation>Gastar o troco não confirmado quando enviar transações (predefinição: %u)</translation> + <source>The wallet will avoid paying less than the minimum relay fee.</source> + <translation>A carteira evitará pagar menos que a taxa minima de propagação.</translation> </message> <message> <source>This is the minimum transaction fee you pay on every transaction.</source> - <translation>É a taxa de transação mínima que paga em cada transação.</translation> + <translation>Esta é a taxa minima de transação que paga em cada transação.</translation> </message> <message> <source>This is the transaction fee you will pay if you send a transaction.</source> <translation>Esta é a taxa de transação que irá pagar se enviar uma transação.</translation> </message> <message> - <source>Threshold for disconnecting misbehaving peers (default: %u)</source> - <translation>Tolerância para desligar pontos com mau comportamento (predefinição: %u)</translation> - </message> - <message> <source>Transaction amounts must not be negative</source> <translation>Os valores da transação não devem ser negativos</translation> </message> diff --git a/src/qt/locale/bitcoin_ro.ts b/src/qt/locale/bitcoin_ro.ts index 5308e0e191..b5a478c611 100644 --- a/src/qt/locale/bitcoin_ro.ts +++ b/src/qt/locale/bitcoin_ro.ts @@ -133,7 +133,7 @@ </message> <message> <source>Encrypt wallet</source> - <translation>Incripteaza portofelul</translation> + <translation>Criptează portofelul</translation> </message> <message> <source>This operation needs your wallet passphrase to unlock the wallet.</source> @@ -176,10 +176,22 @@ <translation>Portofel criptat</translation> </message> <message> + <source>%1 will close now to finish the encryption process. Remember that encrypting your wallet cannot fully protect your bitcoins from being stolen by malware infecting your computer.</source> + <translation>%1 se va inchide pentru a termina procesul de criptare. Aduți aminte că prin criptarea portofelului tău virtual, nu îți poți proteja complet monedele virtuale de a fi furate când te-ai infectat cu un virus de tip malware pe calculatorul tau.</translation> + </message> + <message> + <source>IMPORTANT: Any previous backups you have made of your wallet file should be replaced with the newly generated, encrypted wallet file. For security reasons, previous backups of the unencrypted wallet file will become useless as soon as you start using the new, encrypted wallet.</source> + <translation>IMPORTANT: Fiecare backup anterior pe care l-ai facut portofelului tău virtual trebuie înlocuit cu cel nou. Din motive de securitate, backup-urile anteroiare făcute portofelului tău, care nu sunt criptate vor deveni inutilizabile și inutile când vei începe să utilizezi portofelul criptat.</translation> + </message> + <message> <source>Wallet encryption failed</source> <translation>Criptarea portofelului a eșuat</translation> </message> <message> + <source>Wallet encryption failed due to an internal error. Your wallet was not encrypted.</source> + <translation>Criptarea portofelului a eșuat din cauza unei erori interne. Portofelul tău nu a fost criptat.</translation> + </message> + <message> <source>The supplied passphrases do not match.</source> <translation>Parola furnizată nu se potrivește.</translation> </message> @@ -188,6 +200,10 @@ <translation>Deblocarea portofelului a eșuat</translation> </message> <message> + <source>The passphrase entered for the wallet decryption was incorrect.</source> + <translation>Parola pe care ai introdus-o pentru decripatrea portofelului nu este corectă.</translation> + </message> + <message> <source>Wallet decryption failed</source> <translation>Decriptarea portofelului a eșuat</translation> </message> @@ -215,7 +231,7 @@ <name>BitcoinGUI</name> <message> <source>Sign &message...</source> - <translation>Semnează &mesajul...</translation> + <translation>Semnează și trimite...</translation> </message> <message> <source>Synchronizing with network...</source> @@ -242,10 +258,22 @@ <translation>Navighează în istoricul tranzacțiilor</translation> </message> <message> + <source>E&xit</source> + <translation>Ieși din...</translation> + </message> + <message> <source>Quit application</source> <translation>Părăsește aplicația</translation> </message> <message> + <source>&About %1</source> + <translation>&Despre %1</translation> + </message> + <message> + <source>Show information about %1</source> + <translation>Arată informații despre %1</translation> + </message> + <message> <source>About &Qt</source> <translation>Despre &Qt</translation> </message> @@ -544,10 +572,6 @@ <translation>&Adresa</translation> </message> <message> - <source>New receiving address</source> - <translation>Adresă de primire nouă</translation> - </message> - <message> <source>New sending address</source> <translation>Adresă nouă de livrare</translation> </message> @@ -585,19 +609,7 @@ <source>(%1-bit)</source> <translation>(%1-bit)</translation> </message> - <message> - <source>Usage:</source> - <translation>Utilizare:</translation> - </message> - <message> - <source>Start minimized</source> - <translation>Pornește minimalizat</translation> - </message> - <message> - <source>Reset all settings changed in the GUI</source> - <translation>Resetează toate setările modificate în Interfața Grafică.</translation> - </message> -</context> + </context> <context> <name>Intro</name> <message> @@ -655,6 +667,10 @@ <source>calculating...</source> <translation>Se calculează...</translation> </message> + <message> + <source>Hide</source> + <translation>Ascunde</translation> + </message> </context> <context> <name>OpenURIDialog</name> @@ -754,6 +770,10 @@ <translation>Clientul va fi oprit. Dorești sa continui?</translation> </message> <message> + <source>Configuration options</source> + <translation>Optiuni de configuratie</translation> + </message> + <message> <source>Error</source> <translation>Eroare</translation> </message> @@ -988,6 +1008,14 @@ <source>Label</source> <translation>Etichetă</translation> </message> + <message> + <source>Message</source> + <translation>Mesaj</translation> + </message> + <message> + <source>Wallet</source> + <translation>Portofel</translation> + </message> </context> <context> <name>RecentRequestsTableModel</name> @@ -996,6 +1024,10 @@ <translation>Etichetă</translation> </message> <message> + <source>Message</source> + <translation>Mesaj</translation> + </message> + <message> <source>(no label)</source> <translation>(fără etichetă)</translation> </message> @@ -1027,6 +1059,10 @@ <translation>Schimbă:</translation> </message> <message> + <source>Hide</source> + <translation>Ascunde</translation> + </message> + <message> <source>Copy amount</source> <translation>Copiază cantitatea</translation> </message> @@ -1054,30 +1090,94 @@ </context> <context> <name>SignVerifyMessageDialog</name> - </context> + <message> + <source>Message verified.</source> + <translation>Mesaj verificat.</translation> + </message> +</context> <context> <name>SplashScreen</name> </context> <context> <name>TrafficGraphWidget</name> - </context> + <message> + <source>KB/s</source> + <translation>KB/s</translation> + </message> +</context> <context> <name>TransactionDesc</name> <message> + <source>Generated</source> + <translation>Generat</translation> + </message> + <message> + <source>From</source> + <translation>De la</translation> + </message> + <message> + <source>To</source> + <translation>La</translation> + </message> + <message> + <source>Credit</source> + <translation>Credit</translation> + </message> + <message> + <source>Total credit</source> + <translation>Credit total</translation> + </message> + <message> + <source>Message</source> + <translation>Mesaj</translation> + </message> + <message> + <source>Comment</source> + <translation>Comentariu</translation> + </message> + <message> + <source>Transaction ID</source> + <translation>Transactiune ID</translation> + </message> + <message> + <source>Transaction</source> + <translation>Transactiune</translation> + </message> + <message> <source>Amount</source> <translation>Cantitate</translation> </message> - </context> + <message> + <source>true</source> + <translation>Adevarat</translation> + </message> + <message> + <source>false</source> + <translation>Fals</translation> + </message> +</context> <context> <name>TransactionDescDialog</name> </context> <context> <name>TransactionTableModel</name> <message> + <source>Type</source> + <translation>tip</translation> + </message> + <message> <source>Label</source> <translation>Etichetă</translation> </message> <message> + <source>Received with</source> + <translation>Obtinut cu</translation> + </message> + <message> + <source>(n/a)</source> + <translation>(n/a)</translation> + </message> + <message> <source>(no label)</source> <translation>(fără etichetă)</translation> </message> @@ -1085,6 +1185,42 @@ <context> <name>TransactionView</name> <message> + <source>All</source> + <translation>Tot</translation> + </message> + <message> + <source>Today</source> + <translation>Astazi</translation> + </message> + <message> + <source>This week</source> + <translation>Saptamana aceasta</translation> + </message> + <message> + <source>This month</source> + <translation>Luna aceasta</translation> + </message> + <message> + <source>Last month</source> + <translation>Luna trecuta</translation> + </message> + <message> + <source>This year</source> + <translation>Anul acesta</translation> + </message> + <message> + <source>Received with</source> + <translation>Obtinut cu</translation> + </message> + <message> + <source>To yourself</source> + <translation>Pentru tine</translation> + </message> + <message> + <source>Other</source> + <translation>Altru</translation> + </message> + <message> <source>Copy address</source> <translation>Copiază adresa</translation> </message> @@ -1105,6 +1241,14 @@ <translation>Fisier text separat prin virgule (*.csv)</translation> </message> <message> + <source>Confirmed</source> + <translation>Confirmat</translation> + </message> + <message> + <source>Type</source> + <translation>tip</translation> + </message> + <message> <source>Label</source> <translation>Etichetă</translation> </message> @@ -1113,6 +1257,10 @@ <translation>Adresă</translation> </message> <message> + <source>ID</source> + <translation>ID</translation> + </message> + <message> <source>Exporting Failed</source> <translation>Exportul a eșuat</translation> </message> diff --git a/src/qt/locale/bitcoin_ro_RO.ts b/src/qt/locale/bitcoin_ro_RO.ts index e0cfff119b..3ca1878067 100644 --- a/src/qt/locale/bitcoin_ro_RO.ts +++ b/src/qt/locale/bitcoin_ro_RO.ts @@ -30,6 +30,10 @@ <translation>Şterge adresa selectată din listă</translation> </message> <message> + <source>Enter address or label to search</source> + <translation>Introduceţi adresa sau eticheta pentru căutare</translation> + </message> + <message> <source>Export the data in the current tab to a file</source> <translation>Exportă datele din tab-ul curent într-un fişier</translation> </message> @@ -132,6 +136,10 @@ <translation>Repetaţi noua frază de acces</translation> </message> <message> + <source>Show password</source> + <translation>Arata parola</translation> + </message> + <message> <source>Enter the new passphrase to the wallet.<br/>Please use a passphrase of <b>ten or more random characters</b>, or <b>eight or more words</b>.</source> <translation>Introduceţi noua parolă a portofelului electronic.<br/>Vă rugăm să folosiţi o parolă de<b>minimum 10 caractere aleatoare</b>, sau <b>minimum 8 cuvinte</b>.</translation> </message> @@ -722,10 +730,6 @@ <translation>&Adresă</translation> </message> <message> - <source>New receiving address</source> - <translation>Noua adresă de primire</translation> - </message> - <message> <source>New sending address</source> <translation>Noua adresă de trimitere</translation> </message> @@ -742,10 +746,6 @@ <translation>Adresa introdusă "%1" nu este o adresă Bitcoin validă.</translation> </message> <message> - <source>The entered address "%1" is already in the address book.</source> - <translation>Adresa introdusă "%1" se află deja în lista de adrese.</translation> - </message> - <message> <source>Could not unlock wallet.</source> <translation>Portofelul nu a putut fi deblocat.</translation> </message> @@ -795,42 +795,6 @@ <source>Command-line options</source> <translation>Opţiuni linie de comandă</translation> </message> - <message> - <source>Usage:</source> - <translation>Uz:</translation> - </message> - <message> - <source>command-line options</source> - <translation>Opţiuni linie de comandă</translation> - </message> - <message> - <source>UI Options:</source> - <translation>Opţiuni UI:</translation> - </message> - <message> - <source>Choose data directory on startup (default: %u)</source> - <translation>Alege dosarul de date la pornire (implicit: %u)</translation> - </message> - <message> - <source>Set language, for example "de_DE" (default: system locale)</source> - <translation>Setează limba, de exemplu: "ro_RO" (implicit: sistem local)</translation> - </message> - <message> - <source>Start minimized</source> - <translation>Porniţi minimizat</translation> - </message> - <message> - <source>Set SSL root certificates for payment request (default: -system-)</source> - <translation>Setare rădăcină certificat SSL pentru cerere de plată (implicit: -sistem- )</translation> - </message> - <message> - <source>Show splash screen on startup (default: %u)</source> - <translation>Afişează ecran splash la pornire (implicit: %u)</translation> - </message> - <message> - <source>Reset all settings changed in the GUI</source> - <translation>Resetează toate schimbările făcute în GUI</translation> - </message> </context> <context> <name>Intro</name> @@ -1016,6 +980,18 @@ <translation>Arata daca proxy-ul SOCKS5 furnizat implicit este folosit pentru a gasi parteneri via acest tip de retea.</translation> </message> <message> + <source>Use separate SOCKS&5 proxy to reach peers via Tor hidden services:</source> + <translation>Foloseste un proxy SOCKS&5 separat pentru a gasi parteneri via servicii TOR ascunse</translation> + </message> + <message> + <source>Hide the icon from the system tray.</source> + <translation>Ascunde icon-ul din system tray.</translation> + </message> + <message> + <source>&Hide tray icon</source> + <translation>&Ascunde icon-ul din system tray.</translation> + </message> + <message> <source>Minimize instead of exit the application when the window is closed. When this option is enabled, the application will be closed only after selecting Exit in the menu.</source> <translation>Minimizează fereastra în locul părăsirii programului în momentul închiderii ferestrei. Cînd acestă opţiune e activă, aplicaţia se va opri doar în momentul selectării comenzii 'Închide aplicaţia' din menu.</translation> </message> @@ -1080,6 +1056,14 @@ <translation>Mapare port folosind &UPnP</translation> </message> <message> + <source>Accept connections from outside.</source> + <translation>Acceptă conexiuni din exterior</translation> + </message> + <message> + <source>Allow incomin&g connections</source> + <translation>Permite conexiuni de intrar&e</translation> + </message> + <message> <source>Connect to the Bitcoin network through a SOCKS5 proxy.</source> <translation>Conectare la reţeaua Bitcoin printr-un proxy SOCKS.</translation> </message> @@ -1160,6 +1144,10 @@ <translation>Arată controlul caracteristicilor monedei sau nu.</translation> </message> <message> + <source>&Third party transaction URLs</source> + <translation>URL-uri tranzacţii &terţe părţi</translation> + </message> + <message> <source>&OK</source> <translation>&OK</translation> </message> @@ -1503,10 +1491,6 @@ <translation>Eroare: Directorul de date specificat "%1" nu există.</translation> </message> <message> - <source>Error: Cannot parse configuration file: %1. Only use key=value syntax.</source> - <translation>Eroare: Nu se poate procesa fişierul de configuraţie: %1. Folosiţi doar sintaxa cheie=valoare.</translation> - </message> - <message> <source>Error: %1</source> <translation>Eroare: %1</translation> </message> @@ -1773,6 +1757,14 @@ <translation>Folosiţi săgetile sus şi jos pentru a naviga în istoric şi %1 pentru a curăţa ecranul.</translation> </message> <message> + <source>Type %1 for an overview of available commands.</source> + <translation>Tastati %1 pentru o recapitulare a comenzilor disponibile.</translation> + </message> + <message> + <source>For more information on using this console type %1.</source> + <translation>Pentru mai multe informatii despre folosirea acestei console tastati %1.</translation> + </message> + <message> <source>WARNING: Scammers have been active, telling users to type commands here, stealing their wallet contents. Do not use this console without fully understanding the ramifications of a command.</source> <translation>ATENTIONARE: Sunt excroci care instruiesc userii sa introduca aici comenzi, pentru a le fura continutul portofelelor. Nu folositi aceasta consolă fara a intelege pe deplin ramificatiile unei comenzi.</translation> </message> @@ -1852,6 +1844,14 @@ <translation>Curăţă</translation> </message> <message> + <source>Native segwit addresses (aka Bech32 or BIP-173) reduce your transaction fees later on and offer better protection against typos, but old wallets don't support them. When unchecked, an address compatible with older wallets will be created instead.</source> + <translation>Adresele native segwit (aka Bech32 sau BIP-173) vor reduce mai tarziu comisioanele de tranzactionare si vor oferi o mai buna protectie impotriva introducerii gresite, dar portofelele vechi nu sunt compatibile. Daca optiunea nu e bifata, se va crea o adresa compatibila cu portofelele vechi.</translation> + </message> + <message> + <source>Generate native segwit (Bech32) address</source> + <translation>Genereaza adresa nativa segwit (Bech32)</translation> + </message> + <message> <source>Requested payments history</source> <translation>Istoricul plăţilor cerute</translation> </message> @@ -1939,6 +1939,10 @@ <translation>Mesaj</translation> </message> <message> + <source>Wallet</source> + <translation>Portofel</translation> + </message> + <message> <source>Resulting URI too long, try to reduce the text for label / message.</source> <translation>URI rezultat este prea lung, încearcă să reduci textul pentru etichetă / mesaj.</translation> </message> @@ -2057,10 +2061,6 @@ <translation>per kilooctet</translation> </message> <message> - <source>If the custom fee is set to 1000 satoshis and the transaction is only 250 bytes, then "per kilobyte" only pays 250 satoshis in fee, while "total at least" pays 1000 satoshis. For transactions bigger than a kilobyte both pay by kilobyte.</source> - <translation>Daca taxa personalizata este setata la 1000 satoshi si tranzactia este doar de 250 bytes, atunci "per kilobyte" plateste o taxa de doar 250 satoshi, in timp ce "total minim" plateste 1000 satoshi. Pentru tranzactii mai mari de un kilobyte ambele platesc per kilobyte. </translation> - </message> - <message> <source>Hide</source> <translation>Ascunde</translation> </message> @@ -2105,6 +2105,14 @@ <translation>Timp confirmare tinta:</translation> </message> <message> + <source>Enable Replace-By-Fee</source> + <translation>Autorizeaza Replace-By-Fee</translation> + </message> + <message> + <source>With Replace-By-Fee (BIP-125) you can increase a transaction's fee after it is sent. Without this, a higher fee may be recommended to compensate for increased transaction delay risk.</source> + <translation>Cu Replace-By-Fee (BIP-125) se poate creste taxa unei tranzactii dupa ce a fost trimisa. Fara aceasta optiune, o taxa mai mare e posibil sa fie recomandata pentru a compensa riscul crescut de intarziere a tranzactiei.</translation> + </message> + <message> <source>Clear &All</source> <translation>Curăţă to&ate</translation> </message> @@ -2161,16 +2169,20 @@ <translation>Sigur doriţi să trimiteţi?</translation> </message> <message> - <source>added as transaction fee</source> - <translation>adăugat ca taxă de tranzacţie</translation> + <source>or</source> + <translation>sau</translation> </message> <message> - <source>Total Amount %1</source> - <translation>Suma totală %1</translation> + <source>You can increase the fee later (signals Replace-By-Fee, BIP-125).</source> + <translation>Puteti creste taxa mai tarziu (semnaleaza Replace-By-Fee, BIP-125).</translation> </message> <message> - <source>or</source> - <translation>sau</translation> + <source>Transaction fee</source> + <translation>Taxă tranzacţie</translation> + </message> + <message> + <source>Not signalling Replace-By-Fee, BIP-125.</source> + <translation>Nu se semnalizeaza Replace-By-Fee, BIP-125</translation> </message> <message> <source>Confirm send coins</source> @@ -2292,6 +2304,10 @@ <translation>S&cade taxa din suma</translation> </message> <message> + <source>Use available balance</source> + <translation>Folosește balanța disponibilă</translation> + </message> + <message> <source>Message:</source> <translation>Mesaj:</translation> </message> @@ -2510,10 +2526,6 @@ <translation>in conflict cu o tranzactie cu %1 confirmari</translation> </message> <message> - <source>%1/offline</source> - <translation>%1/offline</translation> - </message> - <message> <source>0/unconfirmed, %1</source> <translation>0/neconfirmat, %1</translation> </message> @@ -2542,14 +2554,6 @@ <translation>Stare</translation> </message> <message> - <source>, has not been successfully broadcast yet</source> - <translation>, nu a fost încă publicată</translation> - </message> - <message numerus="yes"> - <source>, broadcast through %n node(s)</source> - <translation><numerusform>, difuzare printr-un nod</numerusform><numerusform>, difuzare prin %n noduri</numerusform><numerusform>, difuzare prin %n noduri</numerusform></translation> - </message> - <message> <source>Date</source> <translation>Data</translation> </message> @@ -2700,10 +2704,6 @@ <translation>Deschis pînă la %1</translation> </message> <message> - <source>Offline</source> - <translation>Deconectat</translation> - </message> - <message> <source>Unconfirmed</source> <translation>Neconfirmat</translation> </message> @@ -2728,10 +2728,6 @@ <translation>Imatur (%1 confirmari, va fi disponibil după %2)</translation> </message> <message> - <source>This block was not received by any other nodes and will probably not be accepted!</source> - <translation>Acest bloc nu a fost recepţionat de nici un alt nod şi probabil nu va fi acceptat!</translation> - </message> - <message> <source>Generated but not accepted</source> <translation>Generat dar neacceptat</translation> </message> @@ -2843,6 +2839,10 @@ <translation>Altele</translation> </message> <message> + <source>Enter address, transaction id, or label to search</source> + <translation>Introduceți adresa, ID-ul tranzacției, sau eticheta pentru a căuta</translation> + </message> + <message> <source>Min amount</source> <translation>Suma minimă</translation> </message> @@ -3038,38 +3038,14 @@ <source>The wallet data was successfully saved to %1.</source> <translation>Datele portofelului s-au salvat cu succes la %1.</translation> </message> -</context> + </context> <context> <name>bitcoin-core</name> <message> - <source>Options:</source> - <translation>Opţiuni:</translation> - </message> - <message> - <source>Specify data directory</source> - <translation>Specificaţi dosarul de date</translation> - </message> - <message> - <source>Connect to a node to retrieve peer addresses, and disconnect</source> - <translation>Se conectează la un nod pentru a obţine adresele partenerilor, şi apoi se deconectează</translation> - </message> - <message> - <source>Specify your own public address</source> - <translation>Specificaţi adresa dvs. publică</translation> - </message> - <message> - <source>Accept command line and JSON-RPC commands</source> - <translation>Acceptă comenzi din linia de comandă şi comenzi JSON-RPC</translation> - </message> - <message> <source>Distributed under the MIT software license, see the accompanying file %s or %s</source> <translation>Distribuit sub licenţa de programe MIT, vezi fişierul însoţitor %s sau %s</translation> </message> <message> - <source>If <category> is not supplied or if <category> = 1, output all debugging information.</source> - <translation>Dacă <category> nu este furnizat sau <category>=1, produce toate informaţiile de depanare.</translation> - </message> - <message> <source>Prune configured below the minimum of %d MiB. Please use a higher number.</source> <translation>Reductia e configurata sub minimul de %d MiB. Rugam folositi un numar mai mare.</translation> </message> @@ -3086,18 +3062,10 @@ <translation>Eroare: S-a produs o eroare interna fatala, vedeti debug.log pentru detalii</translation> </message> <message> - <source>Fee (in %s/kB) to add to transactions you send (default: %s)</source> - <translation>Taxa (în %s/kB) de adăugat la tranzacţiile pe care le trimiteţi(implicit: %s)</translation> - </message> - <message> <source>Pruning blockstore...</source> <translation>Reductie blockstore...</translation> </message> <message> - <source>Run in the background as a daemon and accept commands</source> - <translation>Rulează în fundal ca un demon şi acceptă comenzi</translation> - </message> - <message> <source>Unable to start HTTP server. See debug log for details.</source> <translation>Imposibil de pornit serverul HTTP. Pentru detalii vezi logul de depanare.</translation> </message> @@ -3110,54 +3078,18 @@ <translation>Dezvoltatorii %s</translation> </message> <message> - <source>A fee rate (in %s/kB) that will be used when fee estimation has insufficient data (default: %s)</source> - <translation>O rata de taxare (in %s/kB) ce va fi folosita atunci cand estimarea taxei are date insuficiente (implicit: %s)</translation> - </message> - <message> - <source>Accept relayed transactions received from whitelisted peers even when not relaying transactions (default: %d)</source> - <translation>Accepta retransmiterea tranzactiilor primite de la parteneri din whitelist chiar si atunci cand nu se retransmit tranzactii (implicit: %d)</translation> - </message> - <message> - <source>Bind to given address and always listen on it. Use [host]:port notation for IPv6</source> - <translation>Ataşaţi adresei date şi ascultaţi totdeauna pe ea. Folosiţi notaţia [host]:port pentru IPv6</translation> - </message> - <message> <source>Cannot obtain a lock on data directory %s. %s is probably already running.</source> <translation>Nu se poate obține o blocare a directorului de date %s. %s probabil rulează deja.</translation> </message> <message> - <source>Delete all wallet transactions and only recover those parts of the blockchain through -rescan on startup</source> - <translation>Sterge toate tranzactiile din portofel si recupereaza doar acele parti din blockchain prin -rescan la startup</translation> + <source>Cannot provide specific connections and have addrman find outgoing connections at the same.</source> + <translation>Nu se pot furniza conexiuni specifice in acelasi timp in care addrman este folosit pentru a gasi conexiuni de iesire.</translation> </message> <message> <source>Error reading %s! All keys read correctly, but transaction data or address book entries might be missing or incorrect.</source> <translation>Eroare la citirea %s! Toate cheile sînt citite corect, dar datele tranzactiei sau anumite intrări din agenda sînt incorecte sau lipsesc.</translation> </message> <message> - <source>Exclude debugging information for a category. Can be used in conjunction with -debug=1 to output debug logs for all categories except one or more specified categories.</source> - <translation>Exclude informatia de depanare pentru o categorie. Poate fi folosit impreuna cu -debug=1 pentru a produce loguri de depanare pentru toate categoriile mai ptin una sau mai multe categorii specificate.</translation> - </message> - <message> - <source>Execute command when a wallet transaction changes (%s in cmd is replaced by TxID)</source> - <translation>Execută comanda cînd o tranzacţie a portofelului se schimbă (%s în cmd este înlocuit de TxID)</translation> - </message> - <message> - <source>Extra transactions to keep in memory for compact block reconstructions (default: %u)</source> - <translation>Extra tranzactii de tinut in memorie pentru reconstructia compacta a blocurilor (implicit: %u)</translation> - </message> - <message> - <source>If this block is in the chain assume that it and its ancestors are valid and potentially skip their script verification (0 to verify all, default: %s, testnet: %s)</source> - <translation>Daca acest bloc este in lant se asuma ca el si predecesorii sai sunt valizi si potential se sare peste verificarea scriptului (0 pentru a verifica tot, implicit %s, testnet: %s)</translation> - </message> - <message> - <source>Maximum allowed median peer time offset adjustment. Local perspective of time may be influenced by peers forward or backward by this amount. (default: %u seconds)</source> - <translation>Timpul mediu maxim permis pentru ajustarea intarzierii partenerilor din retea. Perspectiva temporala locala poate fi influentata de parteneri aflati inainte sau inapoi cu aceasta valoare. (implicit: %u secunde)</translation> - </message> - <message> - <source>Maximum total fees (in %s) to use in a single wallet transaction or raw transaction; setting this too low may abort large transactions (default: %s)</source> - <translation>Valoarea maxima totala a taxelor (in %s) care va fi folosita intr-o singura tranzactie din portofel sau tranzactie bruta; daca valoarea este prea mica poate conduce la esuarea tranzactiilor mari (implicit: %s)</translation> - </message> - <message> <source>Please check that your computer's date and time are correct! If your clock is wrong, %s will not work properly.</source> <translation>Vă rugăm verificaţi dacă data/timpul calculatorului dvs. sînt corecte! Dacă ceasul calcultorului este gresit, %s nu va funcţiona corect.</translation> </message> @@ -3166,22 +3098,6 @@ <translation>Va rugam sa contribuiti daca apreciati ca %s va este util. Vizitati %s pentru mai multe informatii despre software.</translation> </message> <message> - <source>Query for peer addresses via DNS lookup, if low on addresses (default: 1 unless -connect used)</source> - <translation>Găseşte parteneri folosind căutarea DNS, daca adresele sunt reduse (implicit: 1 doar dacă nu s-a folosit -connect)</translation> - </message> - <message> - <source>Reduce storage requirements by enabling pruning (deleting) of old blocks. This allows the pruneblockchain RPC to be called to delete specific blocks, and enables automatic pruning of old blocks if a target size in MiB is provided. This mode is incompatible with -txindex and -rescan. Warning: Reverting this setting requires re-downloading the entire blockchain. (default: 0 = disable pruning blocks, 1 = allow manual pruning via RPC, >%u = automatically prune block files to stay under the specified target size in MiB)</source> - <translation>Micsorarea cerintelor de stocare prin activarea reductiei (stergerii) blocurilor vechi. Aceasta permite RPC pruneblockchain sa fie solicitata pentru a sterge anumite blocuri, si permite reductia automata a blocurilor vechi daca este furnizata o valoare anume in MiB. Acest mod este incompatibil cu -txindex si -rescan. Atentie: Inversarea acestei setari necesita re-descarcarea intregului blockchain. (implicit: 0 = dezactiveaza reductia blocurilor, 1 = permite reductia manuala via RPC, >%u = reductie automata a fisierelor blocurilor pentru a ramane sub valoarea specificata in MiB)</translation> - </message> - <message> - <source>Set lowest fee rate (in %s/kB) for transactions to be included in block creation. (default: %s)</source> - <translation>Seteaza cea mai mica taxa (în %s/kB) pentru tranzactiile de adăugat la crearea blocului (implicit: %s)</translation> - </message> - <message> - <source>Set the number of script verification threads (%u to %d, 0 = auto, <0 = leave that many cores free, default: %d)</source> - <translation>Setează numărul de thread-uri de verificare a script-urilor (%u la %d, 0 = auto, <0 = lasă atîtea nuclee libere, implicit: %d)</translation> - </message> - <message> <source>The block database contains a block which appears to be from the future. This may be due to your computer's date and time being set incorrectly. Only rebuild the block database if you are sure that your computer's date and time are correct</source> <translation>Baza de date a blocurilor contine un bloc ce pare a fi din viitor. Acest lucru poate fi cauzat de setarea incorecta a datei si orei in computerul dvs. Reconstruiti baza de date a blocurilor doar daca sunteti sigur ca data si ora calculatorului dvs sunt corecte.</translation> </message> @@ -3202,18 +3118,6 @@ <translation>Imposibil de a readuce baza de date la statusul pre-fork. Va trebui redescarcat blockchainul.</translation> </message> <message> - <source>Use UPnP to map the listening port (default: 1 when listening and no -proxy)</source> - <translation>Foloseşte UPnP pentru a vedea porturile (implicit: 1 cînd ascultă si fara -proxy)</translation> - </message> - <message> - <source>Username and hashed password for JSON-RPC connections. The field <userpw> comes in the format: <USERNAME>:<SALT>$<HASH>. A canonical python script is included in share/rpcuser. The client then connects normally using the rpcuser=<USERNAME>/rpcpassword=<PASSWORD> pair of arguments. This option can be specified multiple times</source> - <translation>Nume utilizator si hash al parolei pentru conexiuni JSON-RPC. Campul <userpw>vine in formatul: <USERNAME>:<SALT>$<HASH>. Un script python canonic este inclus in share/rpcuser. Clientul se conecteaza normal folosind perechea de argumente rpcuser=<USERNAME>/rpcpassword=<PASSWORD>. Aceasta optiune poate fi specificata de mai multe ori</translation> - </message> - <message> - <source>Wallet will not create transactions that violate mempool chain limits (default: %u)</source> - <translation>Portofelul nu va crea tranzactii care violeaza limitele mempool chain (implicit: %u)</translation> - </message> - <message> <source>Warning: The network does not appear to fully agree! Some miners appear to be experiencing issues.</source> <translation>Atenţie: Reţeaua nu pare să fie de acord în totalitate! Aparent nişte mineri au probleme.</translation> </message> @@ -3222,10 +3126,6 @@ <translation>Atenţie: Aparent, nu sîntem de acord cu toţi partenerii noştri! Va trebui să faceţi o actualizare, sau alte noduri necesită actualizare.</translation> </message> <message> - <source>Whether to save the mempool on shutdown and load on restart (default: %u)</source> - <translation>Daca se salveaza mempool la shutdown si se incarca la restart (implicit: %u)</translation> - </message> - <message> <source>%d of last 100 blocks have unexpected version</source> <translation>%d din ultimele 100 blocuri a o versiune neasteptata</translation> </message> @@ -3238,42 +3138,14 @@ <translation>-maxmempool trebuie sa fie macar %d MB</translation> </message> <message> - <source><category> can be:</source> - <translation><category> poate fi:</translation> - </message> - <message> - <source>Accept connections from outside (default: 1 if no -proxy or -connect)</source> - <translation>Acceptă conexiuni din afară (implicit: 1 dacă nu se foloseşte -proxy sau -connect)</translation> - </message> - <message> - <source>Append comment to the user agent string</source> - <translation>Ataseaza comentariul la string-ul agentului utilizator</translation> - </message> - <message> - <source>Attempt to recover private keys from a corrupt wallet on startup</source> - <translation>Încercare de recuperare a cheilor private dintr-un portofel corupt la initiere</translation> - </message> - <message> - <source>Block creation options:</source> - <translation>Opţiuni creare bloc:</translation> - </message> - <message> <source>Cannot resolve -%s address: '%s'</source> <translation>Nu se poate rezolva adresa -%s: '%s'</translation> </message> <message> - <source>Chain selection options:</source> - <translation>Optiuni de selectie a chain-ului:</translation> - </message> - <message> <source>Change index out of range</source> <translation>Indexul de schimbare este iesit din parametrii</translation> </message> <message> - <source>Connection options:</source> - <translation>Opţiuni conexiune:</translation> - </message> - <message> <source>Copyright (C) %i-%i</source> <translation>Copyright (C) %i-%i</translation> </message> @@ -3282,36 +3154,12 @@ <translation>Bloc defect din baza de date detectat</translation> </message> <message> - <source>Debugging/Testing options:</source> - <translation>Opţiuni Depanare/Test:</translation> - </message> - <message> - <source>Do not load the wallet and disable wallet RPC calls</source> - <translation>Nu încarcă portofelul şi dezactivează solicitările portofel RPC</translation> - </message> - <message> <source>Do you want to rebuild the block database now?</source> <translation>Doriţi să reconstruiţi baza de date blocuri acum?</translation> </message> <message> - <source>Enable publish hash block in <address></source> - <translation>Activeaza publicarea hashului blocului in <address></translation> - </message> - <message> - <source>Enable publish hash transaction in <address></source> - <translation>Activeaza publicarea hashului tranzactiei in <address></translation> - </message> - <message> - <source>Enable publish raw block in <address></source> - <translation>Activeaza publicarea blocului brut in <address></translation> - </message> - <message> - <source>Enable publish raw transaction in <address></source> - <translation>Activeaza publicarea tranzactiei brute in <address></translation> - </message> - <message> - <source>Enable transaction replacement in the memory pool (default: %u)</source> - <translation>Activeaza inlocuirea tranzactiei in mempool (implicit: %u)</translation> + <source>Error creating %s: You can't create non-HD wallets with this version.</source> + <translation>Eroare la crearea %s: Nu se pot crea portofele non-HD cu aceasta versiune.</translation> </message> <message> <source>Error initializing block database</source> @@ -3350,6 +3198,10 @@ <translation>Nu s-a reuşit ascultarea pe orice port. Folosiţi -listen=0 dacă vreţi asta.</translation> </message> <message> + <source>Failed to rescan the wallet during initialization</source> + <translation>Rescanarea portofelului in timpul initializarii a esuat.</translation> + </message> + <message> <source>Importing...</source> <translation>Import...</translation> </message> @@ -3374,10 +3226,6 @@ <translation>Suma nevalidă pentru -fallbackfee=<amount>: '%s'</translation> </message> <message> - <source>Keep the transaction memory pool below <n> megabytes (default: %u)</source> - <translation>Pastreaza tranzactia in mempool sub <n> megaocteti (implicit: %u)</translation> - </message> - <message> <source>Loading P2P addresses...</source> <translation>Încărcare adrese P2P...</translation> </message> @@ -3386,26 +3234,10 @@ <translation>Încărcare banlist...</translation> </message> <message> - <source>Location of the auth cookie (default: data dir)</source> - <translation>Locatia cookie-ului auth (implicit: data dir)</translation> - </message> - <message> <source>Not enough file descriptors available.</source> <translation>Nu sînt destule descriptoare disponibile.</translation> </message> <message> - <source>Only connect to nodes in network <net> (ipv4, ipv6 or onion)</source> - <translation>Se conectează doar la noduri în reţeaua <net> (ipv4, ipv6 sau onion)</translation> - </message> - <message> - <source>Print this help message and exit</source> - <translation>Tipareste acest mesaj de ajutor si iesi</translation> - </message> - <message> - <source>Print version and exit</source> - <translation>Tipareste versiunea si iesi</translation> - </message> - <message> <source>Prune cannot be configured with a negative value.</source> <translation>Reductia nu poate fi configurata cu o valoare negativa.</translation> </message> @@ -3414,14 +3246,6 @@ <translation>Modul redus este incompatibil cu -txindex.</translation> </message> <message> - <source>Rebuild chain state and block index from the blk*.dat files on disk</source> - <translation>Reconstruieste statusul chainului si indexul blocurilor din fisierele blk*.dat de pe disc.</translation> - </message> - <message> - <source>Rebuild chain state from the currently indexed blocks</source> - <translation>Reconstruieste statusul chainului din blocurile indexate in acest moment.</translation> - </message> - <message> <source>Replaying blocks...</source> <translation>Se reiau blocurile...</translation> </message> @@ -3430,14 +3254,6 @@ <translation>Se deruleaza blocurile...</translation> </message> <message> - <source>Set database cache size in megabytes (%d to %d, default: %d)</source> - <translation>Setează mărimea bazei de date cache în megaocteţi (%d la %d, implicit: %d)</translation> - </message> - <message> - <source>Specify wallet file (within data directory)</source> - <translation>Specifică fişierul portofel (în dosarul de date)</translation> - </message> - <message> <source>The source code is available from %s.</source> <translation>Codul sursa este disponibil la %s.</translation> </message> @@ -3470,14 +3286,6 @@ <translation>Actualizarea bazei de date UTXO</translation> </message> <message> - <source>Use UPnP to map the listening port (default: %u)</source> - <translation>Foloseşte mapare UPnP pentru asculatere port (implicit: %u)</translation> - </message> - <message> - <source>Use the test chain</source> - <translation>Utilizează reţeaua de test</translation> - </message> - <message> <source>User Agent comment (%s) contains unsafe characters.</source> <translation>Comentariul (%s) al Agentului Utilizator contine caractere nesigure.</translation> </message> @@ -3486,86 +3294,22 @@ <translation>Se verifică blocurile...</translation> </message> <message> - <source>Wallet debugging/testing options:</source> - <translation>Opţiuni depanare/testare portofel:</translation> - </message> - <message> - <source>Wallet options:</source> - <translation>Opţiuni portofel:</translation> - </message> - <message> - <source>Allow JSON-RPC connections from specified source. Valid for <ip> are a single IP (e.g. 1.2.3.4), a network/netmask (e.g. 1.2.3.4/255.255.255.0) or a network/CIDR (e.g. 1.2.3.4/24). This option can be specified multiple times</source> - <translation>Permite conexiunile JSON-RPC din sursa specificată. Valid pentru <ip> sînt IP singulare (ex. 1.2.3.4), o reţea/mască-reţea (ex. 1.2.3.4/255.255.255.0) sau o reţea/CIDR (ex. 1.2.3.4/24). Această opţiune poate fi specificată de mai multe ori</translation> - </message> - <message> - <source>Bind to given address and whitelist peers connecting to it. Use [host]:port notation for IPv6</source> - <translation>Legare la o adresa anume si whitelisting pentru toti partenerii conectati la ea. Folositi notatia [host]:port pentru IPv6</translation> - </message> - <message> - <source>Create new files with system default permissions, instead of umask 077 (only effective with disabled wallet functionality)</source> - <translation>Creare de fisiere noi cu permisiunile implicite de sistem, in loc de umask 077 (in efect doar cu dezactivarea functionalitatii portofelului)</translation> - </message> - <message> - <source>Discover own IP addresses (default: 1 when listening and no -externalip or -proxy)</source> - <translation>Descoperă propriile adrese IP (inţial: 1 cand asculta si fara -proxy sau -externalip)</translation> - </message> - <message> <source>Error: Listening for incoming connections failed (listen returned error %s)</source> <translation>Eroare: Ascultarea conexiunilor de intrare nu a reuşit (ascultarea a reurnat eroarea %s)</translation> </message> <message> - <source>Execute command when a relevant alert is received or we see a really long fork (%s in cmd is replaced by message)</source> - <translation>Execută comanda cînd o alertă relevantă este primită sau vedem o bifurcaţie foarte lungă (%s în cmd este înlocuit de mesaj)</translation> - </message> - <message> - <source>Fees (in %s/kB) smaller than this are considered zero fee for relaying, mining and transaction creation (default: %s)</source> - <translation>Taxe (in %s/kB) mai mici decît aceasta sumă sînt considerate taxe nule pentru transmiterea, minarea si crearea tranzacţiilor (implicit: %s)</translation> - </message> - <message> - <source>If paytxfee is not set, include enough fee so transactions begin confirmation on average within n blocks (default: %u)</source> - <translation>Daca nu este stabilita paytxfee, includeti o taxa suficienta pentru ca tranzactiile sa inceapa sa fie confirmate in medie in n blocuri (implicit: %u)</translation> - </message> - <message> <source>Invalid amount for -maxtxfee=<amount>: '%s' (must be at least the minrelay fee of %s to prevent stuck transactions)</source> <translation>Sumă nevalidă pentru -maxtxfee=<amount>: '%s' (trebuie să fie cel puţin taxa minrelay de %s pentru a preveni blocarea tranzactiilor)</translation> </message> <message> - <source>Maximum size of data in data carrier transactions we relay and mine (default: %u)</source> - <translation>Marimea maxima a datelor in operațiunile de transport de date de tranzactii pe care le retransmitem si le minam (implicit: %u)</translation> - </message> - <message> - <source>Randomize credentials for every proxy connection. This enables Tor stream isolation (default: %u)</source> - <translation>Randomizati acreditarile pentru fiecare conexiune proxy. Aceasta permite izolarea fluxului Tor (implicit: %u)</translation> - </message> - <message> <source>The transaction amount is too small to send after the fee has been deducted</source> <translation>Suma tranzactiei este prea mica pentru a fi trimisa dupa ce se scade taxa.</translation> </message> <message> - <source>Whitelisted peers cannot be DoS banned and their transactions are always relayed, even if they are already in the mempool, useful e.g. for a gateway</source> - <translation>Partenerii din whitelist nu pot fi interzisi DoS si tranzactiile lor sunt intotdeauna retransmise, chiar daca sunt deja in mempool, folositor spre exemplu pentru un gateway</translation> - </message> - <message> <source>You need to rebuild the database using -reindex to go back to unpruned mode. This will redownload the entire blockchain</source> <translation>Trebuie reconstruita intreaga baza de date folosind -reindex pentru a va intoarce la modul non-redus. Aceasta va determina descarcarea din nou a intregului blockchain</translation> </message> <message> - <source>(default: %u)</source> - <translation>(implicit: %u)</translation> - </message> - <message> - <source>Accept public REST requests (default: %u)</source> - <translation>Acceptă cererile publice REST (implicit: %u)</translation> - </message> - <message> - <source>Automatically create Tor hidden service (default: %d)</source> - <translation>Crează automat un serviciu Tor ascuns (implicit: %d)</translation> - </message> - <message> - <source>Connect through SOCKS5 proxy</source> - <translation>Conectare prin proxy SOCKS5</translation> - </message> - <message> <source>Error loading %s: You can't disable HD on an already existing HD wallet</source> <translation>Eroare la incarcarea %s: Nu se poate dezactiva HD la un portofel care este deja HD.</translation> </message> @@ -3578,10 +3322,6 @@ <translation>Eroare la actualizarea bazei de date chainstate</translation> </message> <message> - <source>Imports blocks from external blk000??.dat file on startup</source> - <translation>Importa blocuri de la un fisier extern blk000??.dat la pornire</translation> - </message> - <message> <source>Information</source> <translation>Informaţie</translation> </message> @@ -3602,44 +3342,24 @@ <translation>Mască reţea nevalidă specificată în -whitelist: '%s'</translation> </message> <message> - <source>Keep at most <n> unconnectable transactions in memory (default: %u)</source> - <translation>Menţine cel mult <n> tranzactii neconectabile in memorie (implicit: %u)</translation> - </message> - <message> <source>Need to specify a port with -whitebind: '%s'</source> <translation>Trebuie să specificaţi un port cu -whitebind: '%s'</translation> </message> <message> - <source>Node relay options:</source> - <translation>Optiuni de releu pentru nod</translation> - </message> - <message> - <source>RPC server options:</source> - <translation>Opţiuni server RPC:</translation> - </message> - <message> <source>Reducing -maxconnections from %d to %d, because of system limitations.</source> <translation>Se micsoreaza -maxconnections de la %d la %d, datorita limitarilor de sistem.</translation> </message> <message> - <source>Rescan the block chain for missing wallet transactions on startup</source> - <translation>Rescanează lanţul de blocuri pentru tranzacţiile lipsa la pornire</translation> - </message> - <message> - <source>Send trace/debug info to console instead of debug.log file</source> - <translation>Trimite informaţiile trace/debug la consolă în locul fişierului debug.log</translation> + <source>Signing transaction failed</source> + <translation>Nu s-a reuşit semnarea tranzacţiei</translation> </message> <message> - <source>Show all debugging options (usage: --help -help-debug)</source> - <translation>Arată toate opţiunile de depanare (uz: --help -help-debug)</translation> + <source>Specified -walletdir "%s" does not exist</source> + <translation>Nu exista -walletdir "%s" specificat</translation> </message> <message> - <source>Shrink debug.log file on client startup (default: 1 when no -debug)</source> - <translation>Micşorează fişierul debug.log la pornirea clientului (implicit: 1 cînd nu se foloseşte -debug)</translation> - </message> - <message> - <source>Signing transaction failed</source> - <translation>Nu s-a reuşit semnarea tranzacţiei</translation> + <source>Specified -walletdir "%s" is a relative path</source> + <translation>-walletdir "%s" specificat este o cale relativa</translation> </message> <message> <source>The transaction amount is too small to pay the fee</source> @@ -3650,14 +3370,6 @@ <translation>Acesta este un program experimental.</translation> </message> <message> - <source>Tor control port password (default: empty)</source> - <translation>Parola portului de control Tor (implicit: fara parola)</translation> - </message> - <message> - <source>Tor control port to use if onion listening enabled (default: %s)</source> - <translation>Portul de control Tor de folosit daca se activeaza ascultarea onion (implicit: %s)</translation> - </message> - <message> <source>Transaction amount too small</source> <translation>Suma tranzacţionată este prea mică</translation> </message> @@ -3674,18 +3386,18 @@ <translation>Nu se poate lega la %s pe acest calculator. (Legarea a întors eroarea %s)</translation> </message> <message> - <source>Upgrade wallet to latest format on startup</source> - <translation>Actualizează portofelul la ultimul format la pornire</translation> - </message> - <message> - <source>Username for JSON-RPC connections</source> - <translation>Utilizator pentru conexiunile JSON-RPC</translation> + <source>Unable to generate initial keys</source> + <translation>Nu s-au putut genera cheile initiale</translation> </message> <message> <source>Verifying wallet(s)...</source> <translation>Se verifică portofelul(ele)...</translation> </message> <message> + <source>Wallet %s resides outside wallet directory %s</source> + <translation>Portofelul %s se află în afara directorului portofelului %s</translation> + </message> + <message> <source>Warning</source> <translation>Avertisment</translation> </message> @@ -3694,98 +3406,18 @@ <translation>Atentie: se activeaza reguli noi necunoscute (versionbit %i)</translation> </message> <message> - <source>Whether to operate in a blocks only mode (default: %u)</source> - <translation>Setare daca se opereaza in modul exclusiv blocuri (implicit: %u)</translation> - </message> - <message> - <source>You need to rebuild the database using -reindex to change -txindex</source> - <translation>Trebuie să reconstruiţi baza de date folosind -reindex pentru a schimba -txindex</translation> - </message> - <message> <source>Zapping all transactions from wallet...</source> <translation>Şterge toate tranzacţiile din portofel...</translation> </message> <message> - <source>ZeroMQ notification options:</source> - <translation>Optiuni de notificare ZeroMQ:</translation> - </message> - <message> - <source>Password for JSON-RPC connections</source> - <translation>Parola pentru conexiunile JSON-RPC</translation> - </message> - <message> - <source>Execute command when the best block changes (%s in cmd is replaced by block hash)</source> - <translation>Execută comanda cînd cel mai bun bloc se modifică (%s în cmd este înlocuit cu hash-ul blocului)</translation> - </message> - <message> - <source>Allow DNS lookups for -addnode, -seednode and -connect</source> - <translation>Permite căutări DNS pentru -addnode, -seednode şi -connect</translation> - </message> - <message> - <source>(1 = keep tx meta data e.g. account owner and payment request information, 2 = drop tx meta data)</source> - <translation>(1 = pastreaza tx meta data ex. detinator cont si informatie cerere plata, 2 = elimina tx meta data)</translation> - </message> - <message> <source>-maxtxfee is set very high! Fees this large could be paid on a single transaction.</source> <translation>-maxtxfee este setata foarte sus! Se pot plati taxe de aceasta marime pe o singura tranzactie.</translation> </message> <message> - <source>Bind to given address to listen for JSON-RPC connections. This option is ignored unless -rpcallowip is also passed. Port is optional and overrides -rpcport. Use [host]:port notation for IPv6. This option can be specified multiple times (default: 127.0.0.1 and ::1 i.e., localhost, or if -rpcallowip has been specified, 0.0.0.0 and :: i.e., all addresses)</source> - <translation>Legarre la o anumita adresa pentru a asculta dupa conexiuni JSON-RPC. Aceasta actiune este ignorata, mai putin cand -rpcallowip e si el trecut. Portul este optional si nu tine cont de -rpcport. Foloseste notatia pentru IPv6 [host]:port. Aceasta optiune poate fi folosita de mai multe ori (implicit:127.0.0.1 si ::1 adica localhost, sau daca -rpcallowip a fost specificat, 0.0.0.0 si :: adica toate adresele)</translation> - </message> - <message> - <source>Do not keep transactions in the mempool longer than <n> hours (default: %u)</source> - <translation>Nu pastra in mempool tranzactii mai mult de <n>ore (implicit: %u)</translation> - </message> - <message> - <source>Equivalent bytes per sigop in transactions for relay and mining (default: %u)</source> - <translation>Echivalent octeti per sigop in tranzactii pentru retransmitere si minat (implicit: %u)</translation> - </message> - <message> <source>Error loading %s: You can't enable HD on an already existing non-HD wallet</source> <translation>Eroare la incarcarea %s: Nu se poate activa HD la un portofel care este deja non-HD.</translation> </message> <message> - <source>Error loading wallet %s. -wallet parameter must only specify a filename (not a path).</source> - <translation>Eroare la incarcarea portofelului %s. Parametrul -wallet trebuie sa specifice doar un nume de fisier (nu o cale)</translation> - </message> - <message> - <source>Fees (in %s/kB) smaller than this are considered zero fee for transaction creation (default: %s)</source> - <translation>Taxe (in %s/kB) mai mici decît aceasta sumă sînt considerate taxe nule pentru crearea tranzacţiilor (implicit: %s)</translation> - </message> - <message> - <source>Force relay of transactions from whitelisted peers even if they violate local relay policy (default: %d)</source> - <translation>Forteaza retransmiterea tranzactiilor primite de la parteneri din whitelist chiar si atunci cand violeaza politica locala de restransmitere (implicit: %d)</translation> - </message> - <message> - <source>How thorough the block verification of -checkblocks is (0-4, default: %u)</source> - <translation>Cît de minuţioasă este verificatea blocurilor prin -checkblocks (0-4, implicit: %u)</translation> - </message> - <message> - <source>Maintain a full transaction index, used by the getrawtransaction rpc call (default: %u)</source> - <translation>Păstrează un index complet al tranzacţiilor folosite de functia rpc getrawtransaction (implicit: %u)</translation> - </message> - <message> - <source>Number of seconds to keep misbehaving peers from reconnecting (default: %u)</source> - <translation>Numărul de secunde pentru a preveni reconectarea partenerilor care nu se comporta corect (implicit: %u)</translation> - </message> - <message> - <source>Output debugging information (default: %u, supplying <category> is optional)</source> - <translation>Produce toate informaţiile de depanare (implicit: %u <category> furnizată este opţională)</translation> - </message> - <message> - <source>Sets the serialization of raw transaction or block hex returned in non-verbose mode, non-segwit(0) or segwit(1) (default: %d)</source> - <translation>Stabileste serializarea tranzactiilor brute sau hexul blocurile returnate in mod non-verbose, non-segwit(0) sau segwit(1) (implicit: %d)</translation> - </message> - <message> - <source>Support filtering of blocks and transaction with bloom filters (default: %u)</source> - <translation>Suport pentru filtrarea blocurilor si tranzactiilor cu filtre bloom (implicit: %u)</translation> - </message> - <message> - <source>The fee rate (in %s/kB) that indicates your tolerance for discarding change by adding it to the fee (default: %s). Note: An output is discarded if it is dust at this rate, but we will always discard up to the dust relay fee and a discard fee above that is limited by the fee estimate for the longest target</source> - <translation>Nivelul taxei (in %s/kB) care indica toleranta personala pentru renuntarea la rest prin adaugarea restului la taxa (implicit: %s). Nota: o tranzactie este inlaturata daca este praf la acest nivel, dar vom inlatura intotdeauna suma pana la taxa de retransmitere a prafului si o taxa de inlaturare peste aceasta valoare este limitata de estimarea taxei pentru tinta cea mai indepartata.</translation> - </message> - <message> <source>This is the transaction fee you may pay when fee estimates are not available.</source> <translation>Aceasta este taxa de tranzactie pe care este posibil sa o platiti daca estimarile de taxe nu sunt disponibile.</translation> </message> @@ -3798,10 +3430,6 @@ <translation>Lungimea totala a sirului versiunii retelei (%i) depaseste lungimea maxima (%i). Reduceti numarul sa dimensiunea uacomments. </translation> </message> <message> - <source>Tries to keep outbound traffic under the given target (in MiB per 24h), 0 = no limit (default: %d)</source> - <translation>Incearca sa mentina traficul de iesire sub tinta stabilita (in MiB per 24h), 0 = no limit (implicit: %d)</translation> - </message> - <message> <source>Unsupported argument -socks found. Setting SOCKS version isn't possible anymore, only SOCKS5 proxies are supported.</source> <translation>S-a gasit un argument -socks nesuportat. Setarea versiunii SOCKS nu mai este posibila, sunt suportate doar proxiurile SOCKS5.</translation> </message> @@ -3810,10 +3438,6 @@ <translation>Se ignora argumentul nesuportat -whitelistalwaysrelay, folositi -whitelistrelay si/sau -whitelistforcerelay.</translation> </message> <message> - <source>Use separate SOCKS5 proxy to reach peers via Tor hidden services (default: %s)</source> - <translation>Foloseste un proxy SOCKS5 separat pentru a gasi parteneri via servicii TOR ascunse (implicit: %s)</translation> - </message> - <message> <source>Warning: Unknown block versions being mined! It's possible unknown rules are in effect</source> <translation>Atentie: se mineaza blocuri cu versiune necunoscuta! Este posibil sa fie in vigoare reguli necunoscute.</translation> </message> @@ -3822,110 +3446,18 @@ <translation>Atenţie: fişierul portofelului este corupt, date salvate! Fişierul %s a fost salvat ca %s in %s; dacă balanta sau tranzactiile sunt incorecte ar trebui să restauraţi dintr-o copie de siguranţă.</translation> </message> <message> - <source>Whitelist peers connecting from the given IP address (e.g. 1.2.3.4) or CIDR notated network (e.g. 1.2.3.0/24). Can be specified multiple times.</source> - <translation>Parteneri din whitelist ce se conecteaza de la adresa IP specificata (ex. 1.2.3.4) sau o retea cu notatia CIDR (ex. 1.2.3.0/24). Poate fi specificat de mai multe ori.</translation> - </message> - <message> <source>%s is set very high!</source> <translation>%s este setata foarte sus!</translation> </message> <message> - <source>(default: %s)</source> - <translation>(implicit: %s)</translation> - </message> - <message> - <source>Always query for peer addresses via DNS lookup (default: %u)</source> - <translation>Cauta intotdeauna adrese de parteneri via cautare DNS (implicit:%u)</translation> - </message> - <message> - <source>Error loading wallet %s. -wallet filename must be a regular file.</source> - <translation>Eroare la incarcarea portofelului %s. Fisierul cu numele -wallet trebuie sa fie un fisier normal. </translation> - </message> - <message> <source>Error loading wallet %s. Duplicate -wallet filename specified.</source> <translation>Eroare la incarcarea portofelului %s. Este specificat un fisier -wallet duplicat.</translation> </message> <message> - <source>Error loading wallet %s. Invalid characters in -wallet filename.</source> - <translation>Eroare la incarcarea portofelului %s. Sunt caractere invalide in numele fisierului -wallet.</translation> - </message> - <message> - <source>How many blocks to check at startup (default: %u, 0 = all)</source> - <translation>Cîte blocuri verifică la pornire (implicit: %u, 0 = toate)</translation> - </message> - <message> - <source>Include IP addresses in debug output (default: %u)</source> - <translation>Include adresele IP in rezultatul depanarii (default: %u)</translation> - </message> - <message> <source>Keypool ran out, please call keypoolrefill first</source> <translation>Keypool epuizat, folositi intai functia keypoolrefill</translation> </message> <message> - <source>Listen for JSON-RPC connections on <port> (default: %u or testnet: %u)</source> - <translation>Ascultă pentru conexiuni JSON-RPC pe <port> (implicit: %u sau testnet: %u)</translation> - </message> - <message> - <source>Listen for connections on <port> (default: %u or testnet: %u)</source> - <translation>Ascultă pentru conexiuni pe <port> (implicit: %u sau testnet: %u)</translation> - </message> - <message> - <source>Maintain at most <n> connections to peers (default: %u)</source> - <translation>Menţine cel mult <n> conexiuni cu partenerii (implicit: %u)</translation> - </message> - <message> - <source>Make the wallet broadcast transactions</source> - <translation>Seteaza portofelul sa difuzeze tranzactii</translation> - </message> - <message> - <source>Maximum per-connection receive buffer, <n>*1000 bytes (default: %u)</source> - <translation>Tampon maxim pentru recepţie per conexiune, <n>*1000 octeti (implicit: %u)</translation> - </message> - <message> - <source>Maximum per-connection send buffer, <n>*1000 bytes (default: %u)</source> - <translation>Tampon maxim pentru transmitere per conexiune, <n>*1000 octeti (implicit: %u)</translation> - </message> - <message> - <source>Prepend debug output with timestamp (default: %u)</source> - <translation>Prefixeaza rezultatul depanarii cu marcaj de timp (implicit: %u)</translation> - </message> - <message> - <source>Relay and mine data carrier transactions (default: %u)</source> - <translation>Retransmitere si minare a tranzactiilor de transport de date (implicit: %u)</translation> - </message> - <message> - <source>Relay non-P2SH multisig (default: %u)</source> - <translation>Retransmite multisig non-P2SH (implicit: %u)</translation> - </message> - <message> - <source>Set key pool size to <n> (default: %u)</source> - <translation>Setează mărimea keypool la <n> (implicit: %u)</translation> - </message> - <message> - <source>Set maximum BIP141 block weight (default: %d)</source> - <translation>Seteaza greutatea maxima a blocurilor BIP141 (implicit: %d)</translation> - </message> - <message> - <source>Set the number of threads to service RPC calls (default: %d)</source> - <translation>Seteaza numarul de thread-uri care deservesc functii RPC (implicit: %d)</translation> - </message> - <message> - <source>Specify configuration file (default: %s)</source> - <translation>Specificaţi fişierul configuraţie (implicit: %s)</translation> - </message> - <message> - <source>Specify connection timeout in milliseconds (minimum: 1, default: %d)</source> - <translation>Specificati expirarea timpului conexiunii in milisecunde (minim: 1, implicit %d)</translation> - </message> - <message> - <source>Specify pid file (default: %s)</source> - <translation>Specifică fişierul pid (implicit: %s)</translation> - </message> - <message> - <source>Spend unconfirmed change when sending transactions (default: %u)</source> - <translation>Cheltuie restul neconfirmat la trimiterea tranzacţiilor (implicit: %u)</translation> - </message> - <message> <source>Starting network threads...</source> <translation>Se pornesc threadurile retelei...</translation> </message> @@ -3942,10 +3474,6 @@ <translation>Aceasta este taxa de tranzactie pe care o platiti cand trimiteti o tranzactie.</translation> </message> <message> - <source>Threshold for disconnecting misbehaving peers (default: %u)</source> - <translation>Prag pentru deconectarea partenerilor care nu se comporta corect (implicit: %u)</translation> - </message> - <message> <source>Transaction amounts must not be negative</source> <translation>Sumele tranzactionate nu pot fi negative</translation> </message> diff --git a/src/qt/locale/bitcoin_ru.ts b/src/qt/locale/bitcoin_ru.ts index b2b4491f2c..0cbee61fc5 100644 --- a/src/qt/locale/bitcoin_ru.ts +++ b/src/qt/locale/bitcoin_ru.ts @@ -3,7 +3,7 @@ <name>AddressBookPage</name> <message> <source>Right-click to edit address or label</source> - <translation>Клик правой кнопкой для редактирования адреса или метки</translation> + <translation>Кликните правой кнопкой для редактирования адреса или метки</translation> </message> <message> <source>Create a new address</source> @@ -27,11 +27,15 @@ </message> <message> <source>Delete the currently selected address from the list</source> - <translation>Удалить выбранный адрес из списка</translation> + <translation>Удалить текущий выбранный адрес из списка</translation> + </message> + <message> + <source>Enter address or label to search</source> + <translation>Введите адрес или метку для поиска</translation> </message> <message> <source>Export the data in the current tab to a file</source> - <translation>Экспортировать данные из вкладки в файл</translation> + <translation>Экспортировать данные текущей вкладки в файл</translation> </message> <message> <source>&Export</source> @@ -63,7 +67,7 @@ </message> <message> <source>These are your Bitcoin addresses for sending payments. Always check the amount and the receiving address before sending coins.</source> - <translation>Это ваши адреса Bitcoin для отправки платежей. Всегда проверяйте сумму и адрес получателя перед отправкой перевода.</translation> + <translation>Это ваши адреса Bitcoin для отправки платежей. Всегда проверяйте количество и адрес получателя перед отправкой перевода.</translation> </message> <message> <source>These are your Bitcoin addresses for receiving payments. It is recommended to use a new receiving address for each transaction.</source> @@ -95,7 +99,7 @@ </message> <message> <source>There was an error trying to save the address list to %1. Please try again.</source> - <translation>Произошла ошибка при сохранении списка адресов в %1. Пожалуйста, попробуйте еще раз.</translation> + <translation>Произошла ошибка сохранения списка адресов в %1. Пожалуйста, повторите попытку.</translation> </message> </context> <context> @@ -117,7 +121,7 @@ <name>AskPassphraseDialog</name> <message> <source>Passphrase Dialog</source> - <translation>Диалог ввода пароля</translation> + <translation>Пароль</translation> </message> <message> <source>Enter passphrase</source> @@ -141,11 +145,11 @@ </message> <message> <source>Encrypt wallet</source> - <translation>Зашифровать бумажник</translation> + <translation>Зашифровать электронный кошелёк</translation> </message> <message> <source>This operation needs your wallet passphrase to unlock the wallet.</source> - <translation>Для выполнения операции требуется пароль вашего бумажника.</translation> + <translation>Для выполнения операции требуется пароль от вашего кошелька.</translation> </message> <message> <source>Unlock wallet</source> @@ -153,7 +157,7 @@ </message> <message> <source>This operation needs your wallet passphrase to decrypt the wallet.</source> - <translation>Для выполнения операции требуется пароль вашего бумажника.</translation> + <translation>Данная операция требует введения пароля для расшифровки вашего бумажника.</translation> </message> <message> <source>Decrypt wallet</source> @@ -161,15 +165,15 @@ </message> <message> <source>Change passphrase</source> - <translation>Сменить пароль</translation> + <translation>Изменить пароль</translation> </message> <message> <source>Enter the old passphrase and new passphrase to the wallet.</source> - <translation>Введите старый и новый пароль для бумажника.</translation> + <translation>Введите старый и новый пароль для кошелька.</translation> </message> <message> <source>Confirm wallet encryption</source> - <translation>Подтвердите шифрование бумажника</translation> + <translation>Подтвердить шифрование кошелька</translation> </message> <message> <source>Warning: If you encrypt your wallet and lose your passphrase, you will <b>LOSE ALL OF YOUR BITCOINS</b>!</source> @@ -177,58 +181,30 @@ </message> <message> <source>Are you sure you wish to encrypt your wallet?</source> - <translation>Вы уверены, что хотите зашифровать ваш бумажник?</translation> + <translation>Вы уверены, что хотите зашифровать ваш кошелёк?</translation> </message> <message> <source>Wallet encrypted</source> - <translation>Бумажник зашифрован</translation> - </message> - <message> - <source>%1 will close now to finish the encryption process. Remember that encrypting your wallet cannot fully protect your bitcoins from being stolen by malware infecting your computer.</source> - <translation>Сейчас %1 закроется для завершения процесса шифрования. Помните, что шифрование вашего бумажника не может полностью защитить ваши биткоины от кражи с помощью инфицирования вашего компьютера вредоносным ПО.</translation> - </message> - <message> - <source>IMPORTANT: Any previous backups you have made of your wallet file should be replaced with the newly generated, encrypted wallet file. For security reasons, previous backups of the unencrypted wallet file will become useless as soon as you start using the new, encrypted wallet.</source> - <translation>ВАЖНО: все предыдущие резервные копии вашего бумажника должны быть заменены новым зашифрованным файлом. В целях безопасности предыдущие резервные копии незашифрованного бумажника станут бесполезны, как только вы начнёте использовать новый зашифрованный бумажник.</translation> + <translation>Кошелёк зашифрован</translation> </message> <message> <source>Wallet encryption failed</source> <translation>Не удалось зашифровать бумажник</translation> </message> <message> - <source>Wallet encryption failed due to an internal error. Your wallet was not encrypted.</source> - <translation>Шифрование бумажника не удалось из-за внутренней ошибки. Ваш бумажник не был зашифрован.</translation> - </message> - <message> - <source>The supplied passphrases do not match.</source> - <translation>Введённые пароли не совпадают.</translation> - </message> - <message> <source>Wallet unlock failed</source> <translation>Разблокировка бумажника не удалась</translation> </message> <message> - <source>The passphrase entered for the wallet decryption was incorrect.</source> - <translation>Неверный пароль для расшифровки бумажника.</translation> - </message> - <message> <source>Wallet decryption failed</source> - <translation>Расшифровка бумажника не удалась</translation> - </message> - <message> - <source>Wallet passphrase was successfully changed.</source> - <translation>Пароль бумажника успешно изменён.</translation> + <translation>Расшифровка кошелька не удалась</translation> </message> - <message> - <source>Warning: The Caps Lock key is on!</source> - <translation>Внимание: Caps Lock включен!</translation> - </message> -</context> + </context> <context> <name>BanTableModel</name> <message> <source>IP/Netmask</source> - <translation>IP/префикс</translation> + <translation>IP/Маска подсети</translation> </message> <message> <source>Banned Until</source> @@ -239,7 +215,7 @@ <name>BitcoinGUI</name> <message> <source>Sign &message...</source> - <translation>&Подписать сообщение...</translation> + <translation>Подписать &сообщение...</translation> </message> <message> <source>Synchronizing with network...</source> @@ -254,16 +230,12 @@ <translation>Узел</translation> </message> <message> - <source>Show general overview of wallet</source> - <translation>Показать общий обзор действий с бумажником</translation> - </message> - <message> <source>&Transactions</source> <translation>&Транзакции</translation> </message> <message> <source>Browse transaction history</source> - <translation>Показать историю транзакций</translation> + <translation>Просмотр истории транзакций</translation> </message> <message> <source>E&xit</source> @@ -275,15 +247,11 @@ </message> <message> <source>&About %1</source> - <translation>&О %1</translation> - </message> - <message> - <source>Show information about %1</source> - <translation>Показать информацию о %1</translation> + <translation>&Около %1</translation> </message> <message> <source>About &Qt</source> - <translation>О &Qt</translation> + <translation>O &Qt</translation> </message> <message> <source>Show information about Qt</source> @@ -295,2694 +263,160 @@ </message> <message> <source>Modify configuration options for %1</source> - <translation>Изменить конфигурационные настройки для %1</translation> + <translation>Изменить параметры конфигурации для %1</translation> </message> <message> <source>&Encrypt Wallet...</source> - <translation>&Зашифровать бумажник...</translation> - </message> - <message> - <source>&Backup Wallet...</source> - <translation>&Сделать резервную копию бумажника...</translation> - </message> - <message> - <source>&Change Passphrase...</source> - <translation>&Изменить пароль...</translation> - </message> - <message> - <source>&Sending addresses...</source> - <translation>&Адреса отправки...</translation> - </message> - <message> - <source>&Receiving addresses...</source> - <translation>Адреса &получения...</translation> - </message> - <message> - <source>Open &URI...</source> - <translation>Открыть &URI...</translation> - </message> - <message> - <source>Click to disable network activity.</source> - <translation>Кликните, чтобы запретить сетевую активность.</translation> - </message> - <message> - <source>Network activity disabled.</source> - <translation>Сетевая активность запрещена.</translation> - </message> - <message> - <source>Click to enable network activity again.</source> - <translation>Кликните, чтобы снова разрешить сетевую активность.</translation> - </message> - <message> - <source>Syncing Headers (%1%)...</source> - <translation>Синхронизация заголовков (%1%)...</translation> - </message> - <message> - <source>Reindexing blocks on disk...</source> - <translation>Идёт переиндексация блоков на диске...</translation> - </message> - <message> - <source>Send coins to a Bitcoin address</source> - <translation>Отправить монеты на указанный адрес Bitcoin</translation> - </message> - <message> - <source>Backup wallet to another location</source> - <translation>Сделать резервную копию бумажника в другом месте</translation> - </message> - <message> - <source>Change the passphrase used for wallet encryption</source> - <translation>Изменить пароль шифрования бумажника</translation> - </message> - <message> - <source>&Debug window</source> - <translation>&Окно отладки</translation> - </message> - <message> - <source>Open debugging and diagnostic console</source> - <translation>Открыть консоль отладки и диагностики</translation> - </message> - <message> - <source>&Verify message...</source> - <translation>&Проверить сообщение...</translation> - </message> - <message> - <source>Bitcoin</source> - <translation>Bitcoin</translation> + <translation>&Зашифровать кошелёк...</translation> </message> <message> <source>Wallet</source> - <translation>Бумажник</translation> - </message> - <message> - <source>&Send</source> - <translation>&Отправить</translation> - </message> - <message> - <source>&Receive</source> - <translation>&Получить</translation> - </message> - <message> - <source>&Show / Hide</source> - <translation>&Показать / Скрыть</translation> - </message> - <message> - <source>Show or hide the main Window</source> - <translation>Показать или скрыть главное окно</translation> - </message> - <message> - <source>Encrypt the private keys that belong to your wallet</source> - <translation>Зашифровать приватные ключи, принадлежащие вашему бумажнику</translation> - </message> - <message> - <source>Sign messages with your Bitcoin addresses to prove you own them</source> - <translation>Подписать сообщения вашим адресом Bitcoin, чтобы доказать, что вы им владеете</translation> - </message> - <message> - <source>Verify messages to ensure they were signed with specified Bitcoin addresses</source> - <translation>Проверить сообщения, чтобы удостовериться, что они были подписаны определённым адресом Bitcoin</translation> - </message> - <message> - <source>&File</source> - <translation>&Файл</translation> - </message> - <message> - <source>&Settings</source> - <translation>&Настройки</translation> - </message> - <message> - <source>&Help</source> - <translation>&Помощь</translation> - </message> - <message> - <source>Tabs toolbar</source> - <translation>Панель вкладок</translation> - </message> - <message> - <source>Request payments (generates QR codes and bitcoin: URIs)</source> - <translation>Запросить платежи (создаёт QR-коды и bitcoin: ссылки)</translation> - </message> - <message> - <source>Show the list of used sending addresses and labels</source> - <translation>Показать список использованных адресов и меток отправки</translation> - </message> - <message> - <source>Show the list of used receiving addresses and labels</source> - <translation>Показать список использованных адресов и меток получения</translation> - </message> - <message> - <source>Open a bitcoin: URI or payment request</source> - <translation>Открыть bitcoin: URI или запрос платежа</translation> - </message> - <message> - <source>&Command-line options</source> - <translation>&Параметры командной строки</translation> - </message> - <message numerus="yes"> - <source>%n active connection(s) to Bitcoin network</source> - <translation><numerusform>%n активных соединений с сетью Bitcoin</numerusform><numerusform>%n активных соединений с сетью Bitcoin</numerusform><numerusform>%n активных соединений с сетью Bitcoin</numerusform><numerusform>%n активных соединений с сетью Bitcoin</numerusform></translation> - </message> - <message> - <source>Indexing blocks on disk...</source> - <translation>Индексация блоков на диске...</translation> - </message> - <message> - <source>Processing blocks on disk...</source> - <translation>Обработка блоков на диске...</translation> - </message> - <message numerus="yes"> - <source>Processed %n block(s) of transaction history.</source> - <translation><numerusform>Обработан %n блок истории транзакций.</numerusform><numerusform>Обработано %n блока истории транзакций.</numerusform><numerusform>Обработано %n блоков истории транзакций.</numerusform><numerusform>Обработано %n блоков истории транзакций.</numerusform></translation> - </message> - <message> - <source>%1 behind</source> - <translation>%1 позади</translation> - </message> - <message> - <source>Last received block was generated %1 ago.</source> - <translation>Последний полученный блок был сгенерирован %1 назад.</translation> - </message> - <message> - <source>Transactions after this will not yet be visible.</source> - <translation>Транзакции после него пока не будут видны.</translation> + <translation>Кошелёк</translation> </message> <message> <source>Error</source> <translation>Ошибка</translation> </message> - <message> - <source>Warning</source> - <translation>Внимание</translation> - </message> - <message> - <source>Information</source> - <translation>Информация</translation> - </message> - <message> - <source>Up to date</source> - <translation>Синхронизировано</translation> - </message> - <message> - <source>Show the %1 help message to get a list with possible Bitcoin command-line options</source> - <translation>Показать помощь по %1, чтобы получить список доступных параметров командной строки</translation> - </message> - <message> - <source>%1 client</source> - <translation>%1 клиент</translation> - </message> - <message> - <source>Connecting to peers...</source> - <translation>Подключение к пирам...</translation> - </message> - <message> - <source>Catching up...</source> - <translation>Синхронизируется...</translation> - </message> - <message> - <source>Date: %1 -</source> - <translation>Дата: %1 -</translation> - </message> - <message> - <source>Amount: %1 -</source> - <translation>Количество: %1 -</translation> - </message> - <message> - <source>Type: %1 -</source> - <translation>Тип: %1 -</translation> - </message> - <message> - <source>Label: %1 -</source> - <translation>Метка: %1 -</translation> - </message> - <message> - <source>Address: %1 -</source> - <translation>Адрес: %1 -</translation> - </message> - <message> - <source>Sent transaction</source> - <translation>Исходящая транзакция</translation> - </message> - <message> - <source>Incoming transaction</source> - <translation>Входящая транзакция</translation> - </message> - <message> - <source>HD key generation is <b>enabled</b></source> - <translation>Генерация HD-ключей <b>разрешена</b></translation> - </message> - <message> - <source>HD key generation is <b>disabled</b></source> - <translation>Генерация HD-ключей <b>запрещена</b></translation> - </message> - <message> - <source>Wallet is <b>encrypted</b> and currently <b>unlocked</b></source> - <translation>Бумажник <b>зашифрован</b> и в настоящее время <b>разблокирован</b></translation> - </message> - <message> - <source>Wallet is <b>encrypted</b> and currently <b>locked</b></source> - <translation>Бумажник <b>зашифрован</b> и в настоящее время <b>заблокирован</b></translation> - </message> - <message> - <source>A fatal error occurred. Bitcoin can no longer continue safely and will quit.</source> - <translation>Произошла неисправимая ошибка. Bitcoin не может безопасно продолжать работу и будет закрыт.</translation> - </message> -</context> + </context> <context> <name>CoinControlDialog</name> <message> - <source>Coin Selection</source> - <translation>Выбор монет</translation> - </message> - <message> - <source>Quantity:</source> - <translation>Количество:</translation> - </message> - <message> - <source>Bytes:</source> - <translation>Байт:</translation> - </message> - <message> - <source>Amount:</source> - <translation>Сумма:</translation> - </message> - <message> - <source>Fee:</source> - <translation>Комиссия:</translation> - </message> - <message> - <source>Dust:</source> - <translation>Пыль:</translation> - </message> - <message> - <source>After Fee:</source> - <translation>После комиссии:</translation> - </message> - <message> - <source>Change:</source> - <translation>Сдача:</translation> - </message> - <message> - <source>(un)select all</source> - <translation>Отменить выбор всего</translation> - </message> - <message> - <source>Tree mode</source> - <translation>Режим дерева</translation> - </message> - <message> - <source>List mode</source> - <translation>Режим списка</translation> - </message> - <message> - <source>Amount</source> - <translation>Сумма</translation> - </message> - <message> - <source>Received with label</source> - <translation>Получено с пометкой</translation> - </message> - <message> - <source>Received with address</source> - <translation>Получено с адреса</translation> - </message> - <message> - <source>Date</source> - <translation>Дата</translation> - </message> - <message> - <source>Confirmations</source> - <translation>Подтверждений</translation> - </message> - <message> - <source>Confirmed</source> - <translation>Подтверждено</translation> - </message> - <message> - <source>Copy address</source> - <translation>Копировать адрес</translation> - </message> - <message> - <source>Copy label</source> - <translation>Копировать метку</translation> - </message> - <message> - <source>Copy amount</source> - <translation>Копировать сумму</translation> - </message> - <message> - <source>Copy transaction ID</source> - <translation>Копировать ID транзакции</translation> - </message> - <message> - <source>Lock unspent</source> - <translation>Заблокировать непотраченное</translation> - </message> - <message> - <source>Unlock unspent</source> - <translation>Разблокировать непотраченное</translation> - </message> - <message> - <source>Copy quantity</source> - <translation>Копировать количество</translation> - </message> - <message> - <source>Copy fee</source> - <translation>Копировать комиссию</translation> - </message> - <message> - <source>Copy after fee</source> - <translation>Копировать после комиссии</translation> - </message> - <message> - <source>Copy bytes</source> - <translation>Копировать байты</translation> - </message> - <message> - <source>Copy dust</source> - <translation>Копировать пыль</translation> - </message> - <message> - <source>Copy change</source> - <translation>Копировать сдачу</translation> - </message> - <message> - <source>(%1 locked)</source> - <translation>(%1 заблокировано)</translation> - </message> - <message> - <source>yes</source> - <translation>да</translation> - </message> - <message> - <source>no</source> - <translation>нет</translation> - </message> - <message> - <source>This label turns red if any recipient receives an amount smaller than the current dust threshold.</source> - <translation>Эта метка станет красной, если любой получатель получит сумму меньше, чем текущий порог пыли.</translation> - </message> - <message> - <source>Can vary +/- %1 satoshi(s) per input.</source> - <translation>Может отличаться на +/- %1 сатоши на вход.</translation> - </message> - <message> <source>(no label)</source> <translation>(нет метки)</translation> </message> - <message> - <source>change from %1 (%2)</source> - <translation>сдача с %1 (%2)</translation> - </message> - <message> - <source>(change)</source> - <translation>(сдача)</translation> - </message> -</context> + </context> <context> <name>EditAddressDialog</name> - <message> - <source>Edit Address</source> - <translation>Изменить адрес</translation> - </message> - <message> - <source>&Label</source> - <translation>&Метка</translation> - </message> - <message> - <source>The label associated with this address list entry</source> - <translation>Метка, связанная с этой записью списка адресов</translation> - </message> - <message> - <source>The address associated with this address list entry. This can only be modified for sending addresses.</source> - <translation>Адрес, связанный с этой записью списка адресов. Он может быть изменён только для адресов отправки.</translation> - </message> - <message> - <source>&Address</source> - <translation>&Адрес</translation> - </message> - <message> - <source>New receiving address</source> - <translation>Новый адрес получения</translation> - </message> - <message> - <source>New sending address</source> - <translation>Новый адрес отправки</translation> - </message> - <message> - <source>Edit receiving address</source> - <translation>Изменить адрес получения</translation> - </message> - <message> - <source>Edit sending address</source> - <translation>Изменить адрес отправки</translation> - </message> - <message> - <source>The entered address "%1" is not a valid Bitcoin address.</source> - <translation>Введённый адрес "%1" не является правильным Bitcoin-адресом.</translation> - </message> - <message> - <source>The entered address "%1" is already in the address book.</source> - <translation>Введённый адрес "%1" уже находится в адресной книге.</translation> - </message> - <message> - <source>Could not unlock wallet.</source> - <translation>Не удается разблокировать бумажник.</translation> - </message> - <message> - <source>New key generation failed.</source> - <translation>Генерация нового ключа не удалась.</translation> - </message> -</context> + </context> <context> <name>FreespaceChecker</name> - <message> - <source>A new data directory will be created.</source> - <translation>Будет создан новый каталог данных.</translation> - </message> - <message> - <source>name</source> - <translation>имя</translation> - </message> - <message> - <source>Directory already exists. Add %1 if you intend to create a new directory here.</source> - <translation>Каталог уже существует. Добавьте %1, если вы хотите создать здесь новый каталог.</translation> - </message> - <message> - <source>Path already exists, and is not a directory.</source> - <translation>Путь уже существует и не является каталогом.</translation> - </message> - <message> - <source>Cannot create data directory here.</source> - <translation>Не удаётся создать здесь каталог данных.</translation> - </message> -</context> + </context> <context> <name>HelpMessageDialog</name> - <message> - <source>version</source> - <translation>версия</translation> - </message> - <message> - <source>(%1-bit)</source> - <translation>(%1-бит)</translation> - </message> - <message> - <source>About %1</source> - <translation>О %1</translation> - </message> - <message> - <source>Command-line options</source> - <translation>Параметры командной строки</translation> - </message> - <message> - <source>Usage:</source> - <translation>Использование:</translation> - </message> - <message> - <source>command-line options</source> - <translation>параметры командной строки</translation> - </message> - <message> - <source>UI Options:</source> - <translation>Настройки интерфейса:</translation> - </message> - <message> - <source>Choose data directory on startup (default: %u)</source> - <translation>Выбрать каталог данных при запуске (по умолчанию: %u)</translation> - </message> - <message> - <source>Set language, for example "de_DE" (default: system locale)</source> - <translation>Выберите язык, например "de_DE" (по умолчанию: как в системе)</translation> - </message> - <message> - <source>Start minimized</source> - <translation>Запускать свёрнутым</translation> - </message> - <message> - <source>Set SSL root certificates for payment request (default: -system-)</source> - <translation>Указать корневые SSL-сертификаты для запроса платежа (по умолчанию: -system-)</translation> - </message> - <message> - <source>Show splash screen on startup (default: %u)</source> - <translation>Показывать экран-заставку при запуске (по умолчанию: %u)</translation> - </message> - <message> - <source>Reset all settings changed in the GUI</source> - <translation>Сбросить все настройки, измененные в графическом интерфейсе</translation> - </message> -</context> + </context> <context> <name>Intro</name> <message> - <source>Welcome</source> - <translation>Добро пожаловать</translation> - </message> - <message> - <source>Welcome to %1.</source> - <translation>Добро пожаловать в %1</translation> - </message> - <message> - <source>As this is the first time the program is launched, you can choose where %1 will store its data.</source> - <translation>При первом запуске программы вы можете выбрать где %1 будет хранить свои данные.</translation> - </message> - <message> - <source>When you click OK, %1 will begin to download and process the full %4 block chain (%2GB) starting with the earliest transactions in %3 when %4 initially launched.</source> - <translation>Когда вы нажимаете ОК, %1 начнет загружать и обрабатывать полную цепочку блоков %4 (%2 ГБ), начиная с самых ранних транзакций в %3, когда первоначально запускался %4.</translation> - </message> - <message> - <source>If you have chosen to limit block chain storage (pruning), the historical data must still be downloaded and processed, but will be deleted afterward to keep your disk usage low.</source> - <translation>©Если вы решили ограничить хранение цепочки блоков (обрезка), исторические данные должны быть загружены и обработаны, но впоследствии будут удалены, чтобы поддерживать низкий уровень использования вашего диска.</translation> - </message> - <message> - <source>Use the default data directory</source> - <translation>Использовать каталог данных по умолчанию</translation> - </message> - <message> - <source>Use a custom data directory:</source> - <translation>Использовать другой каталог данных:</translation> - </message> - <message> - <source>Bitcoin</source> - <translation>Bitcoin</translation> - </message> - <message> - <source>At least %1 GB of data will be stored in this directory, and it will grow over time.</source> - <translation>Минимум %1 Гб данных будет храниться в этом каталоге, и со временем объем данных будет увеличиваться.</translation> - </message> - <message> - <source>Approximately %1 GB of data will be stored in this directory.</source> - <translation>Приблизительно %1 Гб данных будет храниться в этом каталоге.</translation> - </message> - <message> - <source>%1 will download and store a copy of the Bitcoin block chain.</source> - <translation>%1 будет загружать и хранить копию цепочки блоков Bitcoin.</translation> - </message> - <message> - <source>The wallet will also be stored in this directory.</source> - <translation>Кошелек будет также храниться в этом каталоге.</translation> - </message> - <message> - <source>Error: Specified data directory "%1" cannot be created.</source> - <translation>Ошибка: не удалось создать указанный каталог данных "%1".</translation> - </message> - <message> <source>Error</source> <translation>Ошибка</translation> </message> - <message numerus="yes"> - <source>%n GB of free space available</source> - <translation><numerusform>%n ГБ свободного места доступно</numerusform><numerusform>%n ГБ свободного места доступно</numerusform><numerusform>%n ГБ свободного места доступно</numerusform><numerusform>%n ГБ свободного места доступно</numerusform></translation> - </message> - <message numerus="yes"> - <source>(of %n GB needed)</source> - <translation><numerusform>(из необходимых %n ГБ)</numerusform><numerusform>(из необходимых %n ГБ)</numerusform><numerusform>(из необходимых %n ГБ)</numerusform><numerusform>(из необходимых %n ГБ)</numerusform></translation> - </message> -</context> + </context> <context> <name>ModalOverlay</name> - <message> - <source>Form</source> - <translation>Форма</translation> - </message> - <message> - <source>Recent transactions may not yet be visible, and therefore your wallet's balance might be incorrect. This information will be correct once your wallet has finished synchronizing with the bitcoin network, as detailed below.</source> - <translation>Недавние транзакции могут быть пока не видны, поэтому ваш баланс может отображаться некорректно. Эта информация станет корректной, как только ваш бумажник будет синхронизирован с сетью, см. подробности ниже.</translation> - </message> - <message> - <source>Attempting to spend bitcoins that are affected by not-yet-displayed transactions will not be accepted by the network.</source> - <translation>Попытка потратить биткоины из ещё не отображённых транзакций будет отвергнута сетью.</translation> - </message> - <message> - <source>Number of blocks left</source> - <translation>Число оставшихся блоков</translation> - </message> - <message> - <source>Unknown...</source> - <translation>Неизвестно...</translation> - </message> - <message> - <source>Last block time</source> - <translation>Время последнего блока</translation> - </message> - <message> - <source>Progress</source> - <translation>Прогресс</translation> - </message> - <message> - <source>Progress increase per hour</source> - <translation>Прогресс за час</translation> - </message> - <message> - <source>calculating...</source> - <translation>расчёт...</translation> - </message> - <message> - <source>Estimated time left until synced</source> - <translation>Примерное время до завершения синхронизации</translation> - </message> - <message> - <source>Hide</source> - <translation>Скрыть</translation> - </message> - <message> - <source>Unknown. Syncing Headers (%1)...</source> - <translation>Неизвестно. Синхронизация заголовков (%1)...</translation> - </message> -</context> + </context> <context> <name>OpenURIDialog</name> - <message> - <source>Open URI</source> - <translation>Открыть URI</translation> - </message> - <message> - <source>Open payment request from URI or file</source> - <translation>Открыть запрос платежа из URI или файла</translation> - </message> - <message> - <source>URI:</source> - <translation>URI:</translation> - </message> - <message> - <source>Select payment request file</source> - <translation>Выбрать файл запроса платежа</translation> - </message> - <message> - <source>Select payment request file to open</source> - <translation>Выберите файл запроса платежа</translation> - </message> -</context> + </context> <context> <name>OptionsDialog</name> <message> - <source>Options</source> - <translation>Параметры</translation> - </message> - <message> - <source>&Main</source> - <translation>&Главная</translation> - </message> - <message> - <source>Automatically start %1 after logging in to the system.</source> - <translation>Автоматически запускать %1 после входа в систему.</translation> - </message> - <message> - <source>&Start %1 on system login</source> - <translation>&Запускать %1 при входе в систему</translation> - </message> - <message> - <source>Size of &database cache</source> - <translation>Размер кэша &БД</translation> - </message> - <message> - <source>MB</source> - <translation>МБ</translation> - </message> - <message> - <source>Number of script &verification threads</source> - <translation>Число потоков проверки &сценария</translation> - </message> - <message> - <source>IP address of the proxy (e.g. IPv4: 127.0.0.1 / IPv6: ::1)</source> - <translation>IP-адрес прокси (например IPv4: 127.0.0.1 / IPv6: ::1)</translation> - </message> - <message> - <source>Shows if the supplied default SOCKS5 proxy is used to reach peers via this network type.</source> - <translation>Показывает, используется ли SOCKS5 прокси по умолчанию для подключения к другим участникам по этому типу сети.</translation> - </message> - <message> - <source>Use separate SOCKS&5 proxy to reach peers via Tor hidden services:</source> - <translation>Использовать отдельный прокси SOCKS&5 для соединения с участниками через скрытые сервисы Tor:</translation> - </message> - <message> - <source>Hide the icon from the system tray.</source> - <translation>Скрыть иконку из системного трея.</translation> - </message> - <message> - <source>&Hide tray icon</source> - <translation>Скрыть иконку из трея</translation> - </message> - <message> - <source>Minimize instead of exit the application when the window is closed. When this option is enabled, the application will be closed only after selecting Exit in the menu.</source> - <translation>Сворачивать вместо закрытия. Если данная опция будет выбрана — приложение закроется только после выбора соответствующего пункта в меню.</translation> - </message> - <message> - <source>Third party URLs (e.g. a block explorer) that appear in the transactions tab as context menu items. %s in the URL is replaced by transaction hash. Multiple URLs are separated by vertical bar |.</source> - <translation>Сторонние URL (например, block explorer), которые отображаются на вкладке транзакций как пункты контекстного меню. %s в URL заменяется хэшем транзакции. URL отделяются друг от друга вертикальной чертой |.</translation> - </message> - <message> - <source>Active command-line options that override above options:</source> - <translation>Активные опции командной строки, которые перекрывают вышеуказанные опции:</translation> - </message> - <message> - <source>Open the %1 configuration file from the working directory.</source> - <translation>Откройте файл конфигурации %1 из рабочего каталога.</translation> - </message> - <message> - <source>Open Configuration File</source> - <translation>Открыть конфигурационный файл</translation> - </message> - <message> - <source>Reset all client options to default.</source> - <translation>Сбросить все настройки клиента на значения по умолчанию.</translation> - </message> - <message> - <source>&Reset Options</source> - <translation>&Сбросить параметры</translation> - </message> - <message> - <source>&Network</source> - <translation>&Сеть</translation> - </message> - <message> - <source>(0 = auto, <0 = leave that many cores free)</source> - <translation>(0 = автоматически, <0 = оставить столько незагруженных ядер)</translation> - </message> - <message> - <source>W&allet</source> - <translation>Б&умажник</translation> - </message> - <message> - <source>Expert</source> - <translation>Эксперт</translation> - </message> - <message> - <source>Enable coin &control features</source> - <translation>Включить управление входами</translation> - </message> - <message> - <source>If you disable the spending of unconfirmed change, the change from a transaction cannot be used until that transaction has at least one confirmation. This also affects how your balance is computed.</source> - <translation>При отключении траты неподтверждённой сдачи, сдача от транзакции не может быть использована до тех пор пока у этой транзакции не будет хотя бы одно подтверждение. Это также влияет как ваш баланс рассчитывается.</translation> - </message> - <message> - <source>&Spend unconfirmed change</source> - <translation>&Тратить неподтверждённую сдачу</translation> - </message> - <message> - <source>Automatically open the Bitcoin client port on the router. This only works when your router supports UPnP and it is enabled.</source> - <translation>Автоматически открыть порт для Bitcoin-клиента на роутере. Работает только если Ваш роутер поддерживает UPnP, и данная функция включена.</translation> - </message> - <message> - <source>Map port using &UPnP</source> - <translation>Пробросить порт через &UPnP</translation> - </message> - <message> - <source>Accept connections from outside.</source> - <translation>Разрешать соединения извне</translation> - </message> - <message> - <source>Allow incomin&g connections</source> - <translation>Разрешить входящие подключения</translation> - </message> - <message> - <source>Connect to the Bitcoin network through a SOCKS5 proxy.</source> - <translation>Подключаться к сети Bitcoin через прокси SOCKS5</translation> - </message> - <message> - <source>&Connect through SOCKS5 proxy (default proxy):</source> - <translation>&Подключаться к сети Bitcoin через прокси SOCKS5 (прокси по умолчанию):</translation> - </message> - <message> - <source>Proxy &IP:</source> - <translation>&IP Прокси: </translation> - </message> - <message> - <source>&Port:</source> - <translation>По&рт: </translation> - </message> - <message> - <source>Port of the proxy (e.g. 9050)</source> - <translation>Порт прокси-сервера (например, 9050)</translation> - </message> - <message> - <source>Used for reaching peers via:</source> - <translation>Используется для достижения участников через:</translation> - </message> - <message> - <source>IPv4</source> - <translation>IPv4</translation> - </message> - <message> - <source>IPv6</source> - <translation>IPv6</translation> - </message> - <message> - <source>Tor</source> - <translation>Tor</translation> - </message> - <message> - <source>Connect to the Bitcoin network through a separate SOCKS5 proxy for Tor hidden services.</source> - <translation>Подключаться к сети Bitcoin через прокси SOCKS5 для скрытых сервисов Tor.</translation> - </message> - <message> - <source>&Window</source> - <translation>&Окно</translation> - </message> - <message> - <source>Show only a tray icon after minimizing the window.</source> - <translation>Показывать только иконку в системном лотке после сворачивания окна.</translation> - </message> - <message> - <source>&Minimize to the tray instead of the taskbar</source> - <translation>&Cворачивать в системный лоток вместо панели задач</translation> - </message> - <message> - <source>M&inimize on close</source> - <translation>С&ворачивать при закрытии</translation> - </message> - <message> - <source>&Display</source> - <translation>О&тображение</translation> - </message> - <message> - <source>User Interface &language:</source> - <translation>&Язык интерфейса:</translation> - </message> - <message> - <source>The user interface language can be set here. This setting will take effect after restarting %1.</source> - <translation>Здесь можно установить язык пользовательского интерфейса. Настройки вступят в силу после перезагрузки %1</translation> - </message> - <message> - <source>&Unit to show amounts in:</source> - <translation>&Отображать суммы в единицах: </translation> - </message> - <message> - <source>Choose the default subdivision unit to show in the interface and when sending coins.</source> - <translation>Выберите единицу измерения монет при отображении и отправке.</translation> - </message> - <message> - <source>Whether to show coin control features or not.</source> - <translation>Показывать ли функции контроля монет или нет.</translation> - </message> - <message> - <source>&Third party transaction URLs</source> - <translation>Сторонние URL адреса транзакций.</translation> - </message> - <message> - <source>&OK</source> - <translation>&OK</translation> - </message> - <message> - <source>&Cancel</source> - <translation>&Отмена</translation> - </message> - <message> - <source>default</source> - <translation>по умолчанию</translation> - </message> - <message> - <source>none</source> - <translation>ничего</translation> - </message> - <message> - <source>Confirm options reset</source> - <translation>Подтвердите сброс параметров</translation> - </message> - <message> - <source>Client restart required to activate changes.</source> - <translation>Для применения изменений требуется перезапуск клиента.</translation> - </message> - <message> - <source>Client will be shut down. Do you want to proceed?</source> - <translation>Клиент будет выключен. Желаете продолжить?</translation> - </message> - <message> - <source>Configuration options</source> - <translation>Параметры конфигурации</translation> - </message> - <message> - <source>The configuration file is used to specify advanced user options which override GUI settings. Additionally, any command-line options will override this configuration file.</source> - <translation>Файл конфигурации используется для задания расширенных опций, которые имеют приоритет над настройками в GUI. Аналогично, опции командной строки будут иметь приоритет над этим файлом конфигурации.</translation> - </message> - <message> <source>Error</source> <translation>Ошибка</translation> </message> - <message> - <source>The configuration file could not be opened.</source> - <translation>Не удалось открыть файл конфигурации.</translation> - </message> - <message> - <source>This change would require a client restart.</source> - <translation>Это изменение потребует перезапуска клиента.</translation> - </message> - <message> - <source>The supplied proxy address is invalid.</source> - <translation>Адрес прокси неверен.</translation> - </message> -</context> + </context> <context> <name>OverviewPage</name> - <message> - <source>Form</source> - <translation>Форма</translation> - </message> - <message> - <source>The displayed information may be out of date. Your wallet automatically synchronizes with the Bitcoin network after a connection is established, but this process has not completed yet.</source> - <translation>Отображаемая информация может быть устаревшей. Ваш бумажник автоматически синхронизируется с сетью Bitcoin после подключения, но этот процесс пока не завершён.</translation> - </message> - <message> - <source>Watch-only:</source> - <translation>Только наблюдение:</translation> - </message> - <message> - <source>Available:</source> - <translation>Доступно:</translation> - </message> - <message> - <source>Your current spendable balance</source> - <translation>Ваш текущий расходный баланс</translation> - </message> - <message> - <source>Pending:</source> - <translation>В ожидании:</translation> - </message> - <message> - <source>Total of transactions that have yet to be confirmed, and do not yet count toward the spendable balance</source> - <translation>Общая сумма всех транзакций, которые до сих пор не подтверждены, и до сих пор не учитываются в расходном балансе</translation> - </message> - <message> - <source>Immature:</source> - <translation>Незрелые:</translation> - </message> - <message> - <source>Mined balance that has not yet matured</source> - <translation>Баланс добытых монет, который ещё не созрел</translation> - </message> - <message> - <source>Balances</source> - <translation>Балансы</translation> - </message> - <message> - <source>Total:</source> - <translation>Итого:</translation> - </message> - <message> - <source>Your current total balance</source> - <translation>Ваш текущий общий баланс</translation> - </message> - <message> - <source>Your current balance in watch-only addresses</source> - <translation>Ваш текущий баланс в адресах наблюдения</translation> - </message> - <message> - <source>Spendable:</source> - <translation>Доступно:</translation> - </message> - <message> - <source>Recent transactions</source> - <translation>Последние транзакции</translation> - </message> - <message> - <source>Unconfirmed transactions to watch-only addresses</source> - <translation>Неподтверждённые транзакции на адреса наблюдения</translation> - </message> - <message> - <source>Mined balance in watch-only addresses that has not yet matured</source> - <translation>Баланс добытых монет на адресах наблюдения, который ещё не созрел</translation> - </message> - <message> - <source>Current total balance in watch-only addresses</source> - <translation>Текущий общий баланс на адресах наблюдения</translation> - </message> -</context> + </context> <context> <name>PaymentServer</name> - <message> - <source>Payment request error</source> - <translation>Ошибка запроса платежа</translation> - </message> - <message> - <source>Cannot start bitcoin: click-to-pay handler</source> - <translation>Не удаётся запустить bitcoin: обработчик click-to-pay</translation> - </message> - <message> - <source>URI handling</source> - <translation>Обработка URI</translation> - </message> - <message> - <source>Payment request fetch URL is invalid: %1</source> - <translation>Неверный URL запроса платежа: %1</translation> - </message> - <message> - <source>Invalid payment address %1</source> - <translation>Неверный адрес платежа %1</translation> - </message> - <message> - <source>URI cannot be parsed! This can be caused by an invalid Bitcoin address or malformed URI parameters.</source> - <translation>Не удалось обработать URI! Это может быть связано с неверным адресом Bitcoin или неправильными параметрами URI.</translation> - </message> - <message> - <source>Payment request file handling</source> - <translation>Обработка файла запроса платежа</translation> - </message> - <message> - <source>Payment request file cannot be read! This can be caused by an invalid payment request file.</source> - <translation>Файл запроса платежа не может быть прочитан! Обычно это происходит из-за неверного файла запроса платежа.</translation> - </message> - <message> - <source>Payment request rejected</source> - <translation>Запрос платежа отклонён</translation> - </message> - <message> - <source>Payment request network doesn't match client network.</source> - <translation>Сеть запроса платежа не совпадает с сетью клиента.</translation> - </message> - <message> - <source>Payment request expired.</source> - <translation>Запрос платежа просрочен.</translation> - </message> - <message> - <source>Payment request is not initialized.</source> - <translation>Запрос платежа не инициализирован.</translation> - </message> - <message> - <source>Unverified payment requests to custom payment scripts are unsupported.</source> - <translation>Непроверенные запросы платежей с нестандартными платёжными сценариями не поддерживаются.</translation> - </message> - <message> - <source>Invalid payment request.</source> - <translation>Неверный запрос платежа.</translation> - </message> - <message> - <source>Requested payment amount of %1 is too small (considered dust).</source> - <translation>Запрошенная сумма платежа %1 слишком мала (считается пылью).</translation> - </message> - <message> - <source>Refund from %1</source> - <translation>Возврат от %1</translation> - </message> - <message> - <source>Payment request %1 is too large (%2 bytes, allowed %3 bytes).</source> - <translation>Запрос платежа %1 слишком большой (%2 байтов, разрешено %3 байтов).</translation> - </message> - <message> - <source>Error communicating with %1: %2</source> - <translation>Ошибка связи с %1: %2</translation> - </message> - <message> - <source>Payment request cannot be parsed!</source> - <translation>Запрос платежа не может быть разобран!</translation> - </message> - <message> - <source>Bad response from server %1</source> - <translation>Плохой ответ сервера %1</translation> - </message> - <message> - <source>Network request error</source> - <translation>Ошибка сетевого запроса</translation> - </message> - <message> - <source>Payment acknowledged</source> - <translation>Платёж принят</translation> - </message> -</context> + </context> <context> <name>PeerTableModel</name> - <message> - <source>User Agent</source> - <translation>Юзер-агент</translation> - </message> - <message> - <source>Node/Service</source> - <translation>Узел/сервис</translation> - </message> - <message> - <source>NodeId</source> - <translation>Id узла</translation> - </message> - <message> - <source>Ping</source> - <translation>Пинг</translation> - </message> - <message> - <source>Sent</source> - <translation>Отправлено</translation> - </message> - <message> - <source>Received</source> - <translation>Получено</translation> - </message> -</context> + </context> <context> <name>QObject</name> - <message> - <source>Amount</source> - <translation>Сумма</translation> - </message> - <message> - <source>Enter a Bitcoin address (e.g. %1)</source> - <translation>Введите адрес Bitcoin (например, %1)</translation> - </message> - <message> - <source>%1 d</source> - <translation>%1 д</translation> - </message> - <message> - <source>%1 h</source> - <translation>%1 ч</translation> - </message> - <message> - <source>%1 m</source> - <translation>%1 мин</translation> - </message> - <message> - <source>%1 s</source> - <translation>%1 с</translation> - </message> - <message> - <source>None</source> - <translation>Ничего</translation> - </message> - <message> - <source>N/A</source> - <translation>Н/Д</translation> - </message> - <message> - <source>%1 ms</source> - <translation>%1 мс</translation> - </message> - <message numerus="yes"> - <source>%n second(s)</source> - <translation><numerusform>%n секунда</numerusform><numerusform>%n секунды</numerusform><numerusform>%n секунд</numerusform><numerusform>%n секунд</numerusform></translation> - </message> - <message numerus="yes"> - <source>%n minute(s)</source> - <translation><numerusform>%n минута</numerusform><numerusform>%n минут</numerusform><numerusform>%n минут</numerusform><numerusform>%n минут</numerusform></translation> - </message> - <message numerus="yes"> - <source>%n hour(s)</source> - <translation><numerusform>%n час</numerusform><numerusform>%n часа</numerusform><numerusform>%n часов</numerusform><numerusform>%n часов</numerusform></translation> - </message> - <message numerus="yes"> - <source>%n day(s)</source> - <translation><numerusform>%n день</numerusform><numerusform>%n дня</numerusform><numerusform>%n дней</numerusform><numerusform>%n дней</numerusform></translation> - </message> - <message numerus="yes"> - <source>%n week(s)</source> - <translation><numerusform>%n неделя</numerusform><numerusform>%n недели</numerusform><numerusform>%n недель</numerusform><numerusform>%n недель</numerusform></translation> - </message> - <message> - <source>%1 and %2</source> - <translation>%1 и %2</translation> - </message> - <message numerus="yes"> - <source>%n year(s)</source> - <translation><numerusform>%n год</numerusform><numerusform>%n года</numerusform><numerusform>%n лет</numerusform><numerusform>%n лет</numerusform></translation> - </message> - <message> - <source>%1 B</source> - <translation>%1 Б</translation> - </message> - <message> - <source>%1 KB</source> - <translation>%1 КБ</translation> - </message> - <message> - <source>%1 MB</source> - <translation>%1 МБ</translation> - </message> - <message> - <source>%1 GB</source> - <translation>%1 ГБ</translation> - </message> - <message> - <source>%1 didn't yet exit safely...</source> - <translation>%1 ещё не завершился безопасно...</translation> - </message> - <message> - <source>unknown</source> - <translation>неизвестно</translation> - </message> -</context> + </context> <context> <name>QObject::QObject</name> - <message> - <source>Error: Specified data directory "%1" does not exist.</source> - <translation>Ошибка: указанный каталог "%1" не существует.</translation> - </message> - <message> - <source>Error: Cannot parse configuration file: %1. Only use key=value syntax.</source> - <translation>Ошибка: не удалось разобрать конфигурационный файл: %1. Используйте синтаксис вида ключ=значение.</translation> - </message> - <message> - <source>Error: %1</source> - <translation>Ошибка: %1</translation> - </message> -</context> + </context> <context> <name>QRImageWidget</name> - <message> - <source>&Save Image...</source> - <translation>&Сохранить изображение...</translation> - </message> - <message> - <source>&Copy Image</source> - <translation>Копировать &изображение</translation> - </message> - <message> - <source>Save QR Code</source> - <translation>Сохранить QR-код</translation> - </message> - <message> - <source>PNG Image (*.png)</source> - <translation>Изображение PNG (*.png)</translation> - </message> -</context> + </context> <context> <name>RPCConsole</name> - <message> - <source>N/A</source> - <translation>Н/Д</translation> - </message> - <message> - <source>Client version</source> - <translation>Версия клиента</translation> - </message> - <message> - <source>&Information</source> - <translation>&Информация</translation> - </message> - <message> - <source>Debug window</source> - <translation>Окно отладки</translation> - </message> - <message> - <source>General</source> - <translation>Общие</translation> - </message> - <message> - <source>Using BerkeleyDB version</source> - <translation>Используется версия BerkeleyDB</translation> - </message> - <message> - <source>Datadir</source> - <translation>Каталог для данных</translation> - </message> - <message> - <source>Startup time</source> - <translation>Время запуска</translation> - </message> - <message> - <source>Network</source> - <translation>Сеть</translation> - </message> - <message> - <source>Name</source> - <translation>Имя</translation> - </message> - <message> - <source>Number of connections</source> - <translation>Число подключений</translation> - </message> - <message> - <source>Block chain</source> - <translation>Цепь блоков</translation> - </message> - <message> - <source>Current number of blocks</source> - <translation>Текущее число блоков</translation> - </message> - <message> - <source>Memory Pool</source> - <translation>Пул памяти</translation> - </message> - <message> - <source>Current number of transactions</source> - <translation>Текущее число транзакций</translation> - </message> - <message> - <source>Memory usage</source> - <translation>Использование памяти</translation> - </message> - <message> - <source>&Reset</source> - <translation>&Сброс</translation> - </message> - <message> - <source>Received</source> - <translation>Получено</translation> - </message> - <message> - <source>Sent</source> - <translation>Отправлено</translation> - </message> - <message> - <source>&Peers</source> - <translation>&Участники</translation> - </message> - <message> - <source>Banned peers</source> - <translation>Заблокированные участники</translation> - </message> - <message> - <source>Select a peer to view detailed information.</source> - <translation>Выберите участника для просмотра подробностей.</translation> - </message> - <message> - <source>Whitelisted</source> - <translation>Доверенный</translation> - </message> - <message> - <source>Direction</source> - <translation>Направление</translation> - </message> - <message> - <source>Version</source> - <translation>Версия</translation> - </message> - <message> - <source>Starting Block</source> - <translation>Начальный блок</translation> - </message> - <message> - <source>Synced Headers</source> - <translation>Синхронизировано заголовков</translation> - </message> - <message> - <source>Synced Blocks</source> - <translation>Синхронизировано блоков</translation> - </message> - <message> - <source>User Agent</source> - <translation>Юзер-агент</translation> - </message> - <message> - <source>Open the %1 debug log file from the current data directory. This can take a few seconds for large log files.</source> - <translation>Открыть отладочный лог-файл %1 из текущего каталога данных. Это может занять несколько секунд для больших лог-файлов.</translation> - </message> - <message> - <source>Decrease font size</source> - <translation>Уменьшить размер текста</translation> - </message> - <message> - <source>Increase font size</source> - <translation>Увеличить размер текста</translation> - </message> - <message> - <source>Services</source> - <translation>Сервисы</translation> - </message> - <message> - <source>Ban Score</source> - <translation>Очков бана</translation> - </message> - <message> - <source>Connection Time</source> - <translation>Время соединения</translation> - </message> - <message> - <source>Last Send</source> - <translation>Последняя отправка</translation> - </message> - <message> - <source>Last Receive</source> - <translation>Последний раз получено</translation> - </message> - <message> - <source>Ping Time</source> - <translation>Время задержки</translation> - </message> - <message> - <source>The duration of a currently outstanding ping.</source> - <translation>Длительность текущего пинга.</translation> - </message> - <message> - <source>Ping Wait</source> - <translation>Время задержки</translation> - </message> - <message> - <source>Min Ping</source> - <translation>Мин. пинг</translation> - </message> - <message> - <source>Time Offset</source> - <translation>Смещение времени</translation> - </message> - <message> - <source>Last block time</source> - <translation>Время последнего блока</translation> - </message> - <message> - <source>&Open</source> - <translation>&Открыть</translation> - </message> - <message> - <source>&Console</source> - <translation>Консоль</translation> - </message> - <message> - <source>&Network Traffic</source> - <translation>Сетевой &трафик</translation> - </message> - <message> - <source>Totals</source> - <translation>Всего</translation> - </message> - <message> - <source>In:</source> - <translation>Вход:</translation> - </message> - <message> - <source>Out:</source> - <translation>Выход:</translation> - </message> - <message> - <source>Debug log file</source> - <translation>Отладочный лог-файл</translation> - </message> - <message> - <source>Clear console</source> - <translation>Очистить консоль</translation> - </message> - <message> - <source>1 &hour</source> - <translation>1 &час</translation> - </message> - <message> - <source>1 &day</source> - <translation>1 &день</translation> - </message> - <message> - <source>1 &week</source> - <translation>1 &неделю</translation> - </message> - <message> - <source>1 &year</source> - <translation>1 &год</translation> - </message> - <message> - <source>&Disconnect</source> - <translation>&Отключиться</translation> - </message> - <message> - <source>Ban for</source> - <translation>Бан на</translation> - </message> - <message> - <source>&Unban</source> - <translation>&Разбанить</translation> - </message> - <message> - <source>Welcome to the %1 RPC console.</source> - <translation>Добро пожаловать в консоль RPC %1.</translation> - </message> - <message> - <source>Use up and down arrows to navigate history, and %1 to clear screen.</source> - <translation>Используйте стрелки вверх и вниз для просмотра истории и %1 для очистки экрана</translation> - </message> - <message> - <source>Type %1 for an overview of available commands.</source> - <translation>Напишите %1 help для просмотра доступных команд.</translation> - </message> - <message> - <source>For more information on using this console type %1.</source> - <translation>Для получения дополнительной информации по использованию этой консоли напишите %1.</translation> - </message> - <message> - <source>WARNING: Scammers have been active, telling users to type commands here, stealing their wallet contents. Do not use this console without fully understanding the ramifications of a command.</source> - <translation>ПРЕДУПРЕЖДЕНИЕ: Были замечены мошенники, предлагающие пользователям вводить здесь команды, крадя содержимое их кошелька. Не используйте эту консоль, не понимая полностью последствия команды.</translation> - </message> - <message> - <source>Network activity disabled</source> - <translation>Сетевая активность запрещена</translation> - </message> - <message> - <source>(node id: %1)</source> - <translation>(номер узла: %1)</translation> - </message> - <message> - <source>via %1</source> - <translation>через %1</translation> - </message> - <message> - <source>never</source> - <translation>никогда</translation> - </message> - <message> - <source>Inbound</source> - <translation>Входящие</translation> - </message> - <message> - <source>Outbound</source> - <translation>Исходящие</translation> - </message> - <message> - <source>Yes</source> - <translation>Да</translation> - </message> - <message> - <source>No</source> - <translation>Нет</translation> - </message> - <message> - <source>Unknown</source> - <translation>Неизвестно</translation> - </message> -</context> + </context> <context> <name>ReceiveCoinsDialog</name> - <message> - <source>&Amount:</source> - <translation>&Сумма:</translation> - </message> - <message> - <source>&Label:</source> - <translation>&Метка:</translation> - </message> - <message> - <source>&Message:</source> - <translation>&Сообщение</translation> - </message> - <message> - <source>An optional message to attach to the payment request, which will be displayed when the request is opened. Note: The message will not be sent with the payment over the Bitcoin network.</source> - <translation>Необязательное сообщение для запроса платежа, которое будет показано при открытии запроса. Заметьте: сообщение не будет отправлено вместе с платежом через сеть Bitcoin.</translation> - </message> - <message> - <source>An optional label to associate with the new receiving address.</source> - <translation>Необязательная метка для нового адреса получения.</translation> - </message> - <message> - <source>Use this form to request payments. All fields are <b>optional</b>.</source> - <translation>Заполните форму для запроса платежей. Все поля <b>необязательны</b>.</translation> - </message> - <message> - <source>An optional amount to request. Leave this empty or zero to not request a specific amount.</source> - <translation>Необязательная сумма для запроса. Оставьте пустым или укажите ноль, чтобы запросить неопределённую сумму.</translation> - </message> - <message> - <source>Clear all fields of the form.</source> - <translation>Очистить все поля формы.</translation> - </message> - <message> - <source>Clear</source> - <translation>Очистить</translation> - </message> - <message> - <source>Requested payments history</source> - <translation>История запрошенных платежей</translation> - </message> - <message> - <source>&Request payment</source> - <translation>&Запросить платёж</translation> - </message> - <message> - <source>Bech32 addresses (BIP-173) are cheaper to spend from and offer better protection against typos. When unchecked a P2SH wrapped SegWit address will be created, compatible with older wallets.</source> - <translation>Bech32 адреса (BIP-173) дешевле в коммисиях и предлагают лучшую защиту от опечаток. Когда пункт P2SH не отмечен, будет создан связанный SegWit адрес, совместимый со старыми кошельками.</translation> - </message> - <message> - <source>Generate Bech32 address</source> - <translation>Создать Bech32 адрес</translation> - </message> - <message> - <source>Show the selected request (does the same as double clicking an entry)</source> - <translation>Показать выбранный запрос (то же самое, что и двойной клик по записи)</translation> - </message> - <message> - <source>Show</source> - <translation>Показать</translation> - </message> - <message> - <source>Remove the selected entries from the list</source> - <translation>Удалить выбранные записи из списка</translation> - </message> - <message> - <source>Remove</source> - <translation>Удалить</translation> - </message> - <message> - <source>Copy URI</source> - <translation>Копировать URI</translation> - </message> - <message> - <source>Copy label</source> - <translation>Копировать метку</translation> - </message> - <message> - <source>Copy message</source> - <translation>Копировать сообщение</translation> - </message> - <message> - <source>Copy amount</source> - <translation>Копировать сумму</translation> - </message> -</context> + </context> <context> <name>ReceiveRequestDialog</name> <message> - <source>QR Code</source> - <translation>QR код</translation> - </message> - <message> - <source>Copy &URI</source> - <translation>Копировать &URI</translation> - </message> - <message> - <source>Copy &Address</source> - <translation>Копировать &адрес</translation> - </message> - <message> - <source>&Save Image...</source> - <translation>&Сохранить изображение...</translation> - </message> - <message> - <source>Request payment to %1</source> - <translation>Запросить платёж на %1</translation> - </message> - <message> - <source>Payment information</source> - <translation>Информация платежа</translation> - </message> - <message> - <source>URI</source> - <translation>URI</translation> - </message> - <message> <source>Address</source> <translation>Адрес</translation> </message> <message> - <source>Amount</source> - <translation>Сумма</translation> - </message> - <message> <source>Label</source> <translation>Метка</translation> </message> <message> - <source>Message</source> - <translation>Сообщение</translation> - </message> - <message> - <source>Resulting URI too long, try to reduce the text for label / message.</source> - <translation>Получившийся URI слишком длинный, попробуйте сократить текст метки / сообщения.</translation> - </message> - <message> - <source>Error encoding URI into QR Code.</source> - <translation>Ошибка кодирования URI в QR-код</translation> + <source>Wallet</source> + <translation>Кошелёк</translation> </message> -</context> + </context> <context> <name>RecentRequestsTableModel</name> <message> - <source>Date</source> - <translation>Дата</translation> - </message> - <message> <source>Label</source> <translation>Метка</translation> </message> <message> - <source>Message</source> - <translation>Сообщение</translation> - </message> - <message> <source>(no label)</source> <translation>(нет метки)</translation> </message> - <message> - <source>(no message)</source> - <translation>(нет сообщения)</translation> - </message> - <message> - <source>(no amount requested)</source> - <translation>(нет запрошенной суммы)</translation> - </message> - <message> - <source>Requested</source> - <translation>Запрошено</translation> - </message> -</context> + </context> <context> <name>SendCoinsDialog</name> <message> - <source>Send Coins</source> - <translation>Отправка</translation> - </message> - <message> - <source>Coin Control Features</source> - <translation>Функции Контроля Монет</translation> - </message> - <message> - <source>Inputs...</source> - <translation>Входы...</translation> - </message> - <message> - <source>automatically selected</source> - <translation>автоматически выбрано</translation> - </message> - <message> - <source>Insufficient funds!</source> - <translation>Недостаточно средств!</translation> - </message> - <message> - <source>Quantity:</source> - <translation>Количество:</translation> - </message> - <message> - <source>Bytes:</source> - <translation>Байт:</translation> - </message> - <message> - <source>Amount:</source> - <translation>Сумма:</translation> - </message> - <message> - <source>Fee:</source> - <translation>Комиссия:</translation> - </message> - <message> - <source>After Fee:</source> - <translation>После комиссии:</translation> - </message> - <message> - <source>Change:</source> - <translation>Размен:</translation> - </message> - <message> - <source>If this is activated, but the change address is empty or invalid, change will be sent to a newly generated address.</source> - <translation>Если это выбрано, но адрес сдачи пустой или неверный, сдача будет отправлена на новый сгенерированный адрес.</translation> - </message> - <message> - <source>Custom change address</source> - <translation>Свой адрес для сдачи</translation> - </message> - <message> - <source>Transaction Fee:</source> + <source>Transaction fee</source> <translation>Комиссия</translation> </message> <message> - <source>Choose...</source> - <translation>Выберите...</translation> - </message> - <message> - <source>Using the fallbackfee can result in sending a transaction that will take several hours or days (or never) to confirm. Consider choosing your fee manually or wait until you have validated the complete chain.</source> - <translation>Использование резервной комиссии может привести к подтверждению транзакции в течение нескольких часов или дней (или она никогда не будет подтверждена). Советуем выбрать комиссию вручную или дождаться полной валидации цепи.</translation> - </message> - <message> - <source>Warning: Fee estimation is currently not possible.</source> - <translation>Внимание: оценка размера комиссии в настоящее время невозможна.</translation> - </message> - <message> - <source>collapse fee-settings</source> - <translation>Свернуть настройки комиссии</translation> - </message> - <message> - <source>per kilobyte</source> - <translation>за килобайт</translation> - </message> - <message> - <source>If the custom fee is set to 1000 satoshis and the transaction is only 250 bytes, then "per kilobyte" only pays 250 satoshis in fee, while "total at least" pays 1000 satoshis. For transactions bigger than a kilobyte both pay by kilobyte.</source> - <translation>Если комиссия установлена в 1000 сатоши, а транзакция составляет лишь 250 байт, тогда комиссия "на килобайт" составит 250 сатоши, а "всего как минимум" — 1000 сатоши. Для транзакций крупнее килобайта в обоих случаях будет использоваться платёж "на килобайт".</translation> - </message> - <message> - <source>Hide</source> - <translation>Скрыть</translation> - </message> - <message> - <source>Paying only the minimum fee is just fine as long as there is less transaction volume than space in the blocks. But be aware that this can end up in a never confirming transaction once there is more demand for bitcoin transactions than the network can process.</source> - <translation>Уплата минимальной комиссии — не проблема, пока объём транзакций меньше, чем свободное место в блоках. Учтите, однако, что такая транзакция может никогда не подтвердиться, если спрос на транзакции превышает возможности сети по их обработке.</translation> - </message> - <message> - <source>(read the tooltip)</source> - <translation>(прочтите подсказку)</translation> - </message> - <message> - <source>Recommended:</source> - <translation>Рекомендовано:</translation> - </message> - <message> - <source>Custom:</source> - <translation>Выборочно:</translation> - </message> - <message> - <source>(Smart fee not initialized yet. This usually takes a few blocks...)</source> - <translation>(Умная комиссия пока не инициализирована. Обычно для этого требуется несколько блоков...)</translation> - </message> - <message> - <source>Send to multiple recipients at once</source> - <translation>Отправить нескольким получателям одновременно</translation> - </message> - <message> - <source>Add &Recipient</source> - <translation>&Добавить получателя</translation> - </message> - <message> - <source>Clear all fields of the form.</source> - <translation>Очистить все поля формы</translation> - </message> - <message> - <source>Dust:</source> - <translation>Пыль:</translation> - </message> - <message> - <source>Confirmation time target:</source> - <translation>Время подтверждения:</translation> - </message> - <message> - <source>Enable Replace-By-Fee</source> - <translation>Включить Replace-By-Fee (возможность замены комиссии)</translation> - </message> - <message> - <source>With Replace-By-Fee (BIP-125) you can increase a transaction's fee after it is sent. Without this, a higher fee may be recommended to compensate for increased transaction delay risk.</source> - <translation>С опцией Replace-By-Fee (BIP-125) вы можете увеличить комиссию за транзакцию уже после отправки. Без этого, рекомендуем вам отправлять заведомо с более высокой комиссией, чтобы компенсировать риск задержки подтверждения.</translation> - </message> - <message> - <source>Clear &All</source> - <translation>Очистить &всё</translation> - </message> - <message> - <source>Balance:</source> - <translation>Баланс:</translation> - </message> - <message> - <source>Confirm the send action</source> - <translation>Подтвердить отправку</translation> - </message> - <message> - <source>S&end</source> - <translation>&Отправить</translation> - </message> - <message> - <source>Copy quantity</source> - <translation>Копировать количество</translation> - </message> - <message> - <source>Copy amount</source> - <translation>Копировать сумму</translation> - </message> - <message> - <source>Copy fee</source> - <translation>Копировать комиссию</translation> - </message> - <message> - <source>Copy after fee</source> - <translation>Копировать после комиссии</translation> - </message> - <message> - <source>Copy bytes</source> - <translation>Копировать байты</translation> - </message> - <message> - <source>Copy dust</source> - <translation>Копировать пыль</translation> - </message> - <message> - <source>Copy change</source> - <translation>Копировать сдачу</translation> - </message> - <message> - <source>%1 (%2 blocks)</source> - <translation>%1 (%2 блоков)</translation> - </message> - <message> - <source>%1 to %2</source> - <translation>С %1 на %2</translation> - </message> - <message> - <source>Are you sure you want to send?</source> - <translation>Вы уверены, что хотите отправить?</translation> - </message> - <message> - <source>added as transaction fee</source> - <translation>добавлено как комиссия</translation> - </message> - <message> - <source>Total Amount %1</source> - <translation>Общая сумма %1</translation> - </message> - <message> - <source>or</source> - <translation>или</translation> - </message> - <message> - <source>You can increase the fee later (signals Replace-By-Fee, BIP-125).</source> - <translation>Вы можете увеличить комиссию позже (опция Replace-By-Fee, BIP-125).</translation> - </message> - <message> - <source>Not signalling Replace-By-Fee, BIP-125.</source> - <translation>Не используется Replace-By-Fee, BIP-125.</translation> - </message> - <message> - <source>Confirm send coins</source> - <translation>Подтвердите отправку монет</translation> - </message> - <message> - <source>The recipient address is not valid. Please recheck.</source> - <translation>Адрес получателя неверный. Пожалуйста, перепроверьте.</translation> - </message> - <message> - <source>The amount to pay must be larger than 0.</source> - <translation>Сумма для отправки должна быть больше 0.</translation> - </message> - <message> - <source>The amount exceeds your balance.</source> - <translation>Сумма превышает ваш баланс.</translation> - </message> - <message> - <source>The total exceeds your balance when the %1 transaction fee is included.</source> - <translation>Сумма с учётом комиссии %1 превысит ваш баланс.</translation> - </message> - <message> - <source>Duplicate address found: addresses should only be used once each.</source> - <translation>Обнаружен дублирующийся адрес: используйте каждый адрес только один раз.</translation> - </message> - <message> - <source>Transaction creation failed!</source> - <translation>Не удалось создать транзакцию!</translation> - </message> - <message> - <source>The transaction was rejected with the following reason: %1</source> - <translation>Транзакция была отвергнута по следующей причине: %1</translation> - </message> - <message> - <source>A fee higher than %1 is considered an absurdly high fee.</source> - <translation>Комиссия больше чем %1 считается невероятно большой.</translation> - </message> - <message> - <source>Payment request expired.</source> - <translation>Запрос платежа просрочен.</translation> - </message> - <message> - <source>Pay only the required fee of %1</source> - <translation>Заплатить только обязательную комиссию %1</translation> - </message> - <message numerus="yes"> - <source>Estimated to begin confirmation within %n block(s).</source> - <translation><numerusform>Начало подтверждения ожидается через %n блок.</numerusform><numerusform>Начало подтверждения ожидается через %n блока.</numerusform><numerusform>Начало подтверждения ожидается через %n блоков.</numerusform><numerusform>Начало подтверждения ожидается через %n блоков.</numerusform></translation> - </message> - <message> - <source>Warning: Invalid Bitcoin address</source> - <translation>Внимание: неверный адрес Bitcoin</translation> - </message> - <message> - <source>Warning: Unknown change address</source> - <translation>Внимание: неизвестный адрес для сдачи</translation> - </message> - <message> - <source>Confirm custom change address</source> - <translation>Подтвердите свой адрес для сдачи</translation> - </message> - <message> - <source>The address you selected for change is not part of this wallet. Any or all funds in your wallet may be sent to this address. Are you sure?</source> - <translation>Выбранный вами адрес для сдачи не принадлежит этому кошельку. Часть или все средства могут быть отправлены на этот адрес. Вы уверены?</translation> - </message> - <message> <source>(no label)</source> <translation>(нет метки)</translation> </message> </context> <context> <name>SendCoinsEntry</name> - <message> - <source>A&mount:</source> - <translation>Ко&личество:</translation> - </message> - <message> - <source>Pay &To:</source> - <translation>Полу&чатель:</translation> - </message> - <message> - <source>&Label:</source> - <translation>&Метка:</translation> - </message> - <message> - <source>Choose previously used address</source> - <translation>Выберите ранее использованный адрес</translation> - </message> - <message> - <source>This is a normal payment.</source> - <translation>Это нормальный платёж.</translation> - </message> - <message> - <source>The Bitcoin address to send the payment to</source> - <translation>Адрес Bitcoin, на который отправить платёж</translation> - </message> - <message> - <source>Alt+A</source> - <translation>Alt+A</translation> - </message> - <message> - <source>Paste address from clipboard</source> - <translation>Вставить адрес из буфера обмена</translation> - </message> - <message> - <source>Alt+P</source> - <translation>Alt+P</translation> - </message> - <message> - <source>Remove this entry</source> - <translation>Удалить эту запись</translation> - </message> - <message> - <source>The fee will be deducted from the amount being sent. The recipient will receive less bitcoins than you enter in the amount field. If multiple recipients are selected, the fee is split equally.</source> - <translation>С отправляемой суммы будет удержана комиссия. Получателю придёт меньше биткоинов, чем вы вводите в поле количества. Если выбрано несколько получателей, комиссия распределяется поровну.</translation> - </message> - <message> - <source>S&ubtract fee from amount</source> - <translation>Вычесть комиссию из суммы</translation> - </message> - <message> - <source>Use available balance</source> - <translation>Использовать весь баланс</translation> - </message> - <message> - <source>Message:</source> - <translation>Сообщение:</translation> - </message> - <message> - <source>This is an unauthenticated payment request.</source> - <translation>Это неавторизованный запрос платежа.</translation> - </message> - <message> - <source>This is an authenticated payment request.</source> - <translation>Это авторизованный запрос платежа.</translation> - </message> - <message> - <source>Enter a label for this address to add it to the list of used addresses</source> - <translation>Введите метку для этого адреса, чтобы добавить его в список использованных</translation> - </message> - <message> - <source>A message that was attached to the bitcoin: URI which will be stored with the transaction for your reference. Note: This message will not be sent over the Bitcoin network.</source> - <translation>К bitcoin: URI было прикреплено сообщение, которое будет сохранено вместе с транзакцией для вашего сведения. Заметьте: сообщение не будет отправлено через сеть Bitcoin.</translation> - </message> - <message> - <source>Pay To:</source> - <translation>Получатель:</translation> - </message> - <message> - <source>Memo:</source> - <translation>Примечание:</translation> - </message> - <message> - <source>Enter a label for this address to add it to your address book</source> - <translation>Введите метку для данного адреса, чтобы добавить его в адресную книгу</translation> - </message> -</context> + </context> <context> <name>SendConfirmationDialog</name> - <message> - <source>Yes</source> - <translation>Да</translation> - </message> -</context> + </context> <context> <name>ShutdownWindow</name> - <message> - <source>%1 is shutting down...</source> - <translation>%1 выключается...</translation> - </message> - <message> - <source>Do not shut down the computer until this window disappears.</source> - <translation>Не выключайте компьютер, пока это окно не исчезнет.</translation> - </message> -</context> + </context> <context> <name>SignVerifyMessageDialog</name> - <message> - <source>Signatures - Sign / Verify a Message</source> - <translation>Подписи - подписать/проверить сообщение</translation> - </message> - <message> - <source>&Sign Message</source> - <translation>&Подписать сообщение</translation> - </message> - <message> - <source>You can sign messages/agreements with your addresses to prove you can receive bitcoins sent to them. Be careful not to sign anything vague or random, as phishing attacks may try to trick you into signing your identity over to them. Only sign fully-detailed statements you agree to.</source> - <translation>Вы можете подписывать сообщения/соглашения своими адресами, чтобы доказать свою возможность получать биткоины на них. Будьте осторожны, не подписывайте что-то неопределённое или случайное, так как фишинговые атаки могут обманным путём заставить вас подписать нежелательные сообщения. Подписывайте только те сообщения, с которыми вы согласны вплоть до мелочей.</translation> - </message> - <message> - <source>The Bitcoin address to sign the message with</source> - <translation>Адрес Bitcoin, которым подписать сообщение</translation> - </message> - <message> - <source>Choose previously used address</source> - <translation>Выберите ранее использованный адрес</translation> - </message> - <message> - <source>Alt+A</source> - <translation>Alt+A</translation> - </message> - <message> - <source>Paste address from clipboard</source> - <translation>Вставить адрес из буфера обмена</translation> - </message> - <message> - <source>Alt+P</source> - <translation>Alt+P</translation> - </message> - <message> - <source>Enter the message you want to sign here</source> - <translation>Введите сообщение для подписи</translation> - </message> - <message> - <source>Signature</source> - <translation>Подпись</translation> - </message> - <message> - <source>Copy the current signature to the system clipboard</source> - <translation>Скопировать текущую подпись в системный буфер обмена</translation> - </message> - <message> - <source>Sign the message to prove you own this Bitcoin address</source> - <translation>Подписать сообщение, чтобы доказать владение адресом Bitcoin</translation> - </message> - <message> - <source>Sign &Message</source> - <translation>Подписать &Сообщение</translation> - </message> - <message> - <source>Reset all sign message fields</source> - <translation>Сбросить значения всех полей подписывания сообщений</translation> - </message> - <message> - <source>Clear &All</source> - <translation>Очистить &всё</translation> - </message> - <message> - <source>&Verify Message</source> - <translation>&Проверить сообщение</translation> - </message> - <message> - <source>Enter the receiver's address, message (ensure you copy line breaks, spaces, tabs, etc. exactly) and signature below to verify the message. Be careful not to read more into the signature than what is in the signed message itself, to avoid being tricked by a man-in-the-middle attack. Note that this only proves the signing party receives with the address, it cannot prove sendership of any transaction!</source> - <translation>Введите ниже адрес получателя, сообщение (убедитесь, что переводы строк, пробелы, табы и т.п. в точности скопированы) и подпись, чтобы проверить сообщение. Убедитесь, что не скопировали лишнего в подпись, по сравнению с самим подписываемым сообщением, чтобы не стать жертвой атаки "man-in-the-middle". Заметьте, что эта операция удостоверяет лишь авторство подписавшего, но не может удостоверить отправителя транзакции.</translation> - </message> - <message> - <source>The Bitcoin address the message was signed with</source> - <translation>Адрес Bitcoin, которым было подписано сообщение</translation> - </message> - <message> - <source>Verify the message to ensure it was signed with the specified Bitcoin address</source> - <translation>Проверить сообщение, чтобы убедиться, что оно было подписано указанным адресом Bitcoin</translation> - </message> - <message> - <source>Verify &Message</source> - <translation>Проверить &Сообщение</translation> - </message> - <message> - <source>Reset all verify message fields</source> - <translation>Сбросить все поля проверки сообщения</translation> - </message> - <message> - <source>Click "Sign Message" to generate signature</source> - <translation>Нажмите "Подписать сообщение" для создания подписи</translation> - </message> - <message> - <source>The entered address is invalid.</source> - <translation>Введённый адрес неверен.</translation> - </message> - <message> - <source>Please check the address and try again.</source> - <translation>Пожалуйста, проверьте адрес и попробуйте ещё раз.</translation> - </message> - <message> - <source>The entered address does not refer to a key.</source> - <translation>Введённый адрес не связан с ключом.</translation> - </message> - <message> - <source>Wallet unlock was cancelled.</source> - <translation>Разблокировка бумажника была отменена.</translation> - </message> - <message> - <source>Private key for the entered address is not available.</source> - <translation>Недоступен секретный ключ для введённого адреса.</translation> - </message> - <message> - <source>Message signing failed.</source> - <translation>Не удалось подписать сообщение.</translation> - </message> - <message> - <source>Message signed.</source> - <translation>Сообщение подписано.</translation> - </message> - <message> - <source>The signature could not be decoded.</source> - <translation>Подпись не может быть раскодирована.</translation> - </message> - <message> - <source>Please check the signature and try again.</source> - <translation>Пожалуйста, проверьте подпись и попробуйте ещё раз.</translation> - </message> - <message> - <source>The signature did not match the message digest.</source> - <translation>Подпись не соответствует отпечатку сообщения.</translation> - </message> - <message> - <source>Message verification failed.</source> - <translation>Сообщение не прошло проверку.</translation> - </message> - <message> - <source>Message verified.</source> - <translation>Сообщение проверено.</translation> - </message> -</context> + </context> <context> <name>SplashScreen</name> - <message> - <source>[testnet]</source> - <translation>[тестовая сеть]</translation> - </message> -</context> + </context> <context> <name>TrafficGraphWidget</name> - <message> - <source>KB/s</source> - <translation>КБ/сек</translation> - </message> -</context> + </context> <context> <name>TransactionDesc</name> - <message numerus="yes"> - <source>Open for %n more block(s)</source> - <translation><numerusform>Открыто для ещё %n блока</numerusform><numerusform>Открыто для ещё %n блоков</numerusform><numerusform>Открыто для ещё %n блоков</numerusform><numerusform>Открыто для ещё %n блоков</numerusform></translation> - </message> - <message> - <source>Open until %1</source> - <translation>Открыто до %1</translation> - </message> - <message> - <source>conflicted with a transaction with %1 confirmations</source> - <translation>конфликт с транзакцией с %1 подтверждений</translation> - </message> - <message> - <source>%1/offline</source> - <translation>%1/отключен</translation> - </message> - <message> - <source>0/unconfirmed, %1</source> - <translation>0/не подтверждено, %1</translation> - </message> - <message> - <source>in memory pool</source> - <translation>В памяти</translation> - </message> - <message> - <source>not in memory pool</source> - <translation>Не в памяти</translation> - </message> - <message> - <source>abandoned</source> - <translation>заброшено</translation> - </message> - <message> - <source>%1/unconfirmed</source> - <translation>%1/не подтверждено</translation> - </message> - <message> - <source>%1 confirmations</source> - <translation>%1 подтверждений</translation> - </message> - <message> - <source>Status</source> - <translation>Статус</translation> - </message> - <message> - <source>, has not been successfully broadcast yet</source> - <translation>, ещё не было успешно разослано</translation> - </message> - <message numerus="yes"> - <source>, broadcast through %n node(s)</source> - <translation><numerusform>, разослано через %n узел</numerusform><numerusform>, разослано через %n узла</numerusform><numerusform>, разослано через %n узлов</numerusform><numerusform>, разослано через %n узлов</numerusform></translation> - </message> - <message> - <source>Date</source> - <translation>Дата</translation> - </message> - <message> - <source>Source</source> - <translation>Источник</translation> - </message> - <message> - <source>Generated</source> - <translation>Сгенерированно</translation> - </message> - <message> - <source>From</source> - <translation>От</translation> - </message> - <message> - <source>unknown</source> - <translation>неизвестно</translation> - </message> - <message> - <source>To</source> - <translation>Для</translation> - </message> - <message> - <source>own address</source> - <translation>свой адрес</translation> - </message> - <message> - <source>watch-only</source> - <translation>только наблюдение</translation> - </message> - <message> - <source>label</source> - <translation>метка</translation> - </message> - <message> - <source>Credit</source> - <translation>Кредит</translation> - </message> - <message numerus="yes"> - <source>matures in %n more block(s)</source> - <translation><numerusform>будет доступно через %n блок</numerusform><numerusform>будет доступно через %n блока</numerusform><numerusform>будет доступно через %n блоков</numerusform><numerusform>будет доступно через %n блоков</numerusform></translation> - </message> - <message> - <source>not accepted</source> - <translation>не принято</translation> - </message> - <message> - <source>Debit</source> - <translation>Дебет</translation> - </message> - <message> - <source>Total debit</source> - <translation>Всего дебет</translation> - </message> - <message> - <source>Total credit</source> - <translation>Всего кредит</translation> - </message> - <message> - <source>Transaction fee</source> - <translation>Комиссия</translation> - </message> - <message> - <source>Net amount</source> - <translation>Чистая сумма</translation> - </message> - <message> - <source>Message</source> - <translation>Сообщение</translation> - </message> - <message> - <source>Comment</source> - <translation>Комментарий</translation> - </message> - <message> - <source>Transaction ID</source> - <translation>ID транзакции</translation> - </message> - <message> - <source>Transaction total size</source> - <translation>Общий размер транзакции</translation> - </message> - <message> - <source>Output index</source> - <translation>Номер выхода</translation> - </message> - <message> - <source>Merchant</source> - <translation>Продавец</translation> - </message> - <message> - <source>Generated coins must mature %1 blocks before they can be spent. When you generated this block, it was broadcast to the network to be added to the block chain. If it fails to get into the chain, its state will change to "not accepted" and it won't be spendable. This may occasionally happen if another node generates a block within a few seconds of yours.</source> - <translation>Сгенерированные монеты должны подождать %1 блоков, прежде чем они могут быть потрачены. Когда вы сгенерировали этот блок, он был отправлен в сеть для добавления в цепочку блоков. Если он не попадёт в цепь, его статус изменится на "не принят", и монеты будут недействительны. Это иногда происходит в случае, если другой узел сгенерирует блок на несколько секунд раньше вас.</translation> - </message> - <message> - <source>Debug information</source> - <translation>Отладочная информация</translation> - </message> - <message> - <source>Transaction</source> - <translation>Транзакция</translation> - </message> - <message> - <source>Inputs</source> - <translation>Входы</translation> - </message> - <message> - <source>Amount</source> - <translation>Сумма</translation> - </message> - <message> - <source>true</source> - <translation>истина</translation> - </message> - <message> - <source>false</source> - <translation>ложь</translation> - </message> -</context> + </context> <context> <name>TransactionDescDialog</name> - <message> - <source>This pane shows a detailed description of the transaction</source> - <translation>Эта панель отображает детальное описание транзакции.</translation> - </message> - <message> - <source>Details for %1</source> - <translation>Подробности %1</translation> - </message> -</context> + </context> <context> <name>TransactionTableModel</name> <message> - <source>Date</source> - <translation>Дата</translation> - </message> - <message> - <source>Type</source> - <translation>Тип</translation> - </message> - <message> <source>Label</source> <translation>Метка</translation> </message> - <message numerus="yes"> - <source>Open for %n more block(s)</source> - <translation><numerusform>Открыто для ещё %n блока</numerusform><numerusform>Открыто для ещё %n блоков</numerusform><numerusform>Открыто для ещё %n блоков</numerusform><numerusform>Открыто для ещё %n блоков</numerusform></translation> - </message> - <message> - <source>Open until %1</source> - <translation>Открыто до %1</translation> - </message> - <message> - <source>Offline</source> - <translation>Отключен</translation> - </message> - <message> - <source>Unconfirmed</source> - <translation>Не подтверждено</translation> - </message> - <message> - <source>Abandoned</source> - <translation>Заброшено</translation> - </message> - <message> - <source>Confirming (%1 of %2 recommended confirmations)</source> - <translation>Подтверждается (%1 из %2 рекомендуемых подтверждений)</translation> - </message> - <message> - <source>Confirmed (%1 confirmations)</source> - <translation>Подтверждено (%1 подтверждений)</translation> - </message> - <message> - <source>Conflicted</source> - <translation>В противоречии</translation> - </message> - <message> - <source>Immature (%1 confirmations, will be available after %2)</source> - <translation>Незрелый (%1 подтверждений, будет доступно после %2)</translation> - </message> - <message> - <source>This block was not received by any other nodes and will probably not be accepted!</source> - <translation>Этот блок не был получен другими узлами и, возможно, не будет принят!</translation> - </message> - <message> - <source>Generated but not accepted</source> - <translation>Сгенерировано, но не принято</translation> - </message> - <message> - <source>Received with</source> - <translation>Получено на</translation> - </message> - <message> - <source>Received from</source> - <translation>Получено от</translation> - </message> - <message> - <source>Sent to</source> - <translation>Отправлено на</translation> - </message> - <message> - <source>Payment to yourself</source> - <translation>Отправлено себе</translation> - </message> - <message> - <source>Mined</source> - <translation>Добыто</translation> - </message> - <message> - <source>watch-only</source> - <translation>только наблюдение</translation> - </message> - <message> - <source>(n/a)</source> - <translation>(недоступно)</translation> - </message> <message> <source>(no label)</source> <translation>(нет метки)</translation> </message> - <message> - <source>Transaction status. Hover over this field to show number of confirmations.</source> - <translation>Статус транзакции. Подведите курсор к этому полю, чтобы увидеть количество подтверждений.</translation> - </message> - <message> - <source>Date and time that the transaction was received.</source> - <translation>Дата и время получения транзакции.</translation> - </message> - <message> - <source>Type of transaction.</source> - <translation>Тип транзакции.</translation> - </message> - <message> - <source>Whether or not a watch-only address is involved in this transaction.</source> - <translation>Использовался ли в транзакции адрес для наблюдения.</translation> - </message> - <message> - <source>User-defined intent/purpose of the transaction.</source> - <translation>Определяемое пользователем намерение/цель транзакции.</translation> - </message> - <message> - <source>Amount removed from or added to balance.</source> - <translation>Снятая или добавленная к балансу сумма.</translation> - </message> -</context> + </context> <context> <name>TransactionView</name> <message> - <source>All</source> - <translation>Все</translation> - </message> - <message> - <source>Today</source> - <translation>Сегодня</translation> - </message> - <message> - <source>This week</source> - <translation>На этой неделе</translation> - </message> - <message> - <source>This month</source> - <translation>В этом месяце</translation> - </message> - <message> - <source>Last month</source> - <translation>В прошлом месяце</translation> - </message> - <message> - <source>This year</source> - <translation>В этом году</translation> - </message> - <message> - <source>Range...</source> - <translation>Диапазон...</translation> - </message> - <message> - <source>Received with</source> - <translation>Получено на</translation> - </message> - <message> - <source>Sent to</source> - <translation>Отправлено на</translation> - </message> - <message> - <source>To yourself</source> - <translation>Себе</translation> - </message> - <message> - <source>Mined</source> - <translation>Добыто</translation> - </message> - <message> - <source>Other</source> - <translation>Другое</translation> - </message> - <message> - <source>Enter address, transaction id, or label to search</source> - <translation>Введите адрес, ID транзакции или метку для поиска</translation> - </message> - <message> - <source>Min amount</source> - <translation>Мин. сумма</translation> - </message> - <message> - <source>Abandon transaction</source> - <translation>Отказаться от транзакции</translation> - </message> - <message> - <source>Increase transaction fee</source> - <translation>Увеличить комиссию</translation> - </message> - <message> - <source>Copy address</source> - <translation>Копировать адрес</translation> - </message> - <message> - <source>Copy label</source> - <translation>Копировать метку</translation> - </message> - <message> - <source>Copy amount</source> - <translation>Копировать сумму</translation> - </message> - <message> - <source>Copy transaction ID</source> - <translation>Копировать ID транзакции</translation> - </message> - <message> - <source>Copy raw transaction</source> - <translation>Копировать исходный код транзакции</translation> - </message> - <message> - <source>Copy full transaction details</source> - <translation>Копировать все подробности транзакции</translation> - </message> - <message> - <source>Edit label</source> - <translation>Изменить метку</translation> - </message> - <message> - <source>Show transaction details</source> - <translation>Показать подробности транзакции</translation> - </message> - <message> - <source>Export Transaction History</source> - <translation>Экспортировать историю транзакций</translation> - </message> - <message> <source>Comma separated file (*.csv)</source> <translation>Текст, разделённый запятыми (*.csv)</translation> </message> <message> - <source>Confirmed</source> - <translation>Подтверждено</translation> - </message> - <message> - <source>Watch-only</source> - <translation>Для наблюдения</translation> - </message> - <message> - <source>Date</source> - <translation>Дата</translation> - </message> - <message> - <source>Type</source> - <translation>Тип</translation> - </message> - <message> <source>Label</source> <translation>Метка</translation> </message> @@ -2991,91 +425,19 @@ <translation>Адрес</translation> </message> <message> - <source>ID</source> - <translation>ID</translation> - </message> - <message> <source>Exporting Failed</source> <translation>Экспорт не удался</translation> </message> - <message> - <source>There was an error trying to save the transaction history to %1.</source> - <translation>Произошла ошибка при сохранении истории транзакций в %1.</translation> - </message> - <message> - <source>Exporting Successful</source> - <translation>Экспорт успешно завершён</translation> - </message> - <message> - <source>The transaction history was successfully saved to %1.</source> - <translation>История транзакций была успешно сохранена в %1.</translation> - </message> - <message> - <source>Range:</source> - <translation>Диапазон:</translation> - </message> - <message> - <source>to</source> - <translation>до</translation> - </message> -</context> + </context> <context> <name>UnitDisplayStatusBarControl</name> - <message> - <source>Unit to show amounts in. Click to select another unit.</source> - <translation>Единица измерения количества монет. Щёлкните для выбора другой единицы.</translation> - </message> -</context> + </context> <context> <name>WalletFrame</name> - <message> - <source>No wallet has been loaded.</source> - <translation>Не был загружен ни один бумажник.</translation> - </message> -</context> + </context> <context> <name>WalletModel</name> - <message> - <source>Send Coins</source> - <translation>Отправка</translation> - </message> - <message> - <source>Fee bump error</source> - <translation>Ошибка повышения комиссии</translation> - </message> - <message> - <source>Increasing transaction fee failed</source> - <translation>Увеличение комиссии не удалось</translation> - </message> - <message> - <source>Do you want to increase the fee?</source> - <translation>Вы хотите увеличить комиссию?</translation> - </message> - <message> - <source>Current fee:</source> - <translation>Текущая комиссия</translation> - </message> - <message> - <source>Increase:</source> - <translation>Увеличение:</translation> - </message> - <message> - <source>New fee:</source> - <translation>Новая комиссия:</translation> - </message> - <message> - <source>Confirm fee bump</source> - <translation>Подтвердите увеличение комиссии</translation> - </message> - <message> - <source>Can't sign transaction.</source> - <translation>Невозможно подписать транзакцию.</translation> - </message> - <message> - <source>Could not commit transaction</source> - <translation>Не удалось совершить транзакцию</translation> - </message> -</context> + </context> <context> <name>WalletView</name> <message> @@ -3086,1012 +448,24 @@ <source>Export the data in the current tab to a file</source> <translation>Экспортировать данные текущей вкладки в файл</translation> </message> - <message> - <source>Backup Wallet</source> - <translation>Резервная копия бумажника</translation> - </message> - <message> - <source>Wallet Data (*.dat)</source> - <translation>Данные бумажника (*.dat)</translation> - </message> - <message> - <source>Backup Failed</source> - <translation>Резервное копирование не удалось</translation> - </message> - <message> - <source>There was an error trying to save the wallet data to %1.</source> - <translation>Произошла ошибка при сохранении данных бумажника в %1.</translation> - </message> - <message> - <source>Backup Successful</source> - <translation>Резервное копирование успешно завершено</translation> - </message> - <message> - <source>The wallet data was successfully saved to %1.</source> - <translation>Данные бумажника были успешно сохранены в %1.</translation> - </message> -</context> + </context> <context> <name>bitcoin-core</name> <message> - <source>Options:</source> - <translation>Параметры:</translation> - </message> - <message> - <source>Specify data directory</source> - <translation>Задать каталог данных</translation> - </message> - <message> - <source>Connect to a node to retrieve peer addresses, and disconnect</source> - <translation>Подключиться к участнику, чтобы получить список адресов других участников и отключиться</translation> - </message> - <message> - <source>Specify your own public address</source> - <translation>Укажите ваш собственный публичный адрес</translation> - </message> - <message> - <source>Accept command line and JSON-RPC commands</source> - <translation>Принимать командную строку и команды JSON-RPC</translation> - </message> - <message> - <source>Distributed under the MIT software license, see the accompanying file %s or %s</source> - <translation>Распространяется под лицензией MIT, см. приложенный файл %s или %s</translation> - </message> - <message> - <source>If <category> is not supplied or if <category> = 1, output all debugging information.</source> - <translation>Если <category> не предоставлена или равна 1, выводить всю отладочную информацию.</translation> - </message> - <message> - <source>Prune configured below the minimum of %d MiB. Please use a higher number.</source> - <translation>Удаление блоков выставлено ниже, чем минимум в %d Мб. Пожалуйста, используйте большее значение.</translation> - </message> - <message> - <source>Prune: last wallet synchronisation goes beyond pruned data. You need to -reindex (download the whole blockchain again in case of pruned node)</source> - <translation>Удаление: последняя синхронизация кошелька вышла за рамки удаленных данных. Вам нужен -reindex (скачать всю цепь блоков в случае удаленного узла)</translation> - </message> - <message> - <source>Rescans are not possible in pruned mode. You will need to use -reindex which will download the whole blockchain again.</source> - <translation>Повторное сканирование не возможно в режиме удаления. Вам надо будет использовать -reindex, который загрузит заново всю цепь блоков.</translation> - </message> - <message> - <source>Error: A fatal internal error occurred, see debug.log for details</source> - <translation>Ошибка: произошла неустранимая ошибка, подробности в debug.log</translation> - </message> - <message> - <source>Fee (in %s/kB) to add to transactions you send (default: %s)</source> - <translation>Комиссия (в %s/Кб) для добавления к вашим транзакциям (по умолчанию: %s)</translation> - </message> - <message> - <source>Pruning blockstore...</source> - <translation>Очистка хранилища блоков...</translation> - </message> - <message> - <source>Run in the background as a daemon and accept commands</source> - <translation>Запускаться в фоне как демон и принимать команды</translation> - </message> - <message> - <source>Unable to start HTTP server. See debug log for details.</source> - <translation>Невозможно запустить HTTP сервер. Смотри debug лог для подробностей.</translation> - </message> - <message> - <source>Bitcoin Core</source> - <translation>Bitcoin Core</translation> - </message> - <message> - <source>The %s developers</source> - <translation>Разработчики %s</translation> - </message> - <message> - <source>Accept relayed transactions received from whitelisted peers even when not relaying transactions (default: %d)</source> - <translation>Принимать транзакции пересылаемые от узлов из белого списка даже если они не удовлетворяют требованиям ретрансляции (по умолчанию: %d)</translation> - </message> - <message> - <source>Add a node to connect to and attempt to keep the connection open (see the `addnode` RPC command help for more info)</source> - <translation>Добавить узел сети для соединения и для возможности сохранять соединение открытым (см. команду RPC `addnode` в справочном разделе)</translation> - </message> - <message> - <source>Bind to given address and always listen on it. Use [host]:port notation for IPv6</source> - <translation>Привязаться к указанному адресу и всегда прослушивать только его. Используйте [хост]:порт для IPv6</translation> - </message> - <message> - <source>Cannot obtain a lock on data directory %s. %s is probably already running.</source> - <translation>Невозможно заблокировать каталог данных %s. %s возможно уже работает.</translation> - </message> - <message> - <source>Cannot provide specific connections and have addrman find outgoing connections at the same.</source> - <translation>Не удалось предоставить определённые подключения, и в то же время найти исходящие подключения через addrman.</translation> - </message> - <message> - <source>Connect only to the specified node(s); -connect=0 disables automatic connections (the rules for this peer are the same as for -addnode)</source> - <translation>Подключаться только к указанному узлу(ам); -connect=0 отключает автоматические подключения (правила для этого участника такие же, как и для -addnode)</translation> - </message> - <message> - <source>Delete all wallet transactions and only recover those parts of the blockchain through -rescan on startup</source> - <translation>Удалить все транзакции бумажника с возможностью восстановить эти части цепи блоков с помощью -rescan при запуске</translation> - </message> - <message> - <source>Error reading %s! All keys read correctly, but transaction data or address book entries might be missing or incorrect.</source> - <translation>Ошибка чтения %s! Все ключи прочитаны верно, но данные транзакций или записи адресной книги могут отсутствовать или быть неправильными.</translation> - </message> - <message> - <source>Exclude debugging information for a category. Can be used in conjunction with -debug=1 to output debug logs for all categories except one or more specified categories.</source> - <translation>Исключить отладочную информацию для категории. Может быть использовано вместе с -debug=1 для вывода отладочных логов по всем категориям, кроме одной или более указанных категорий.</translation> - </message> - <message> - <source>Execute command when a wallet transaction changes (%s in cmd is replaced by TxID)</source> - <translation>Выполнить команду, когда меняется транзакция в бумажнике (%s в команде заменяется на TxID)</translation> - </message> - <message> - <source>Extra transactions to keep in memory for compact block reconstructions (default: %u)</source> - <translation>Хранить в памяти дополнительные транзакции для реконструкции компактных блоков (по умолчанию: %u)</translation> - </message> - <message> - <source>If this block is in the chain assume that it and its ancestors are valid and potentially skip their script verification (0 to verify all, default: %s, testnet: %s)</source> - <translation>Если этот блок в цепи, считать его и последующие блоки верными и потенциально пропускать проверку их скриптов (0 для проверки всех, по умолчанию: %s, тестовая сеть: %s)</translation> - </message> - <message> - <source>Maximum allowed median peer time offset adjustment. Local perspective of time may be influenced by peers forward or backward by this amount. (default: %u seconds)</source> - <translation>Максимально допустимое среднее отклонение времени участников. Локальное представление времени может меняться вперед или назад на это количество. (по умолчанию: %u секунд)</translation> - </message> - <message> - <source>Maximum total fees (in %s) to use in a single wallet transaction or raw transaction; setting this too low may abort large transactions (default: %s)</source> - <translation>Максимальная сумма комиссий (%s) для одной транзакции в бумажнике или сырой транзакции; слишком низкое значение может вызвать прерывание больших транзакций (по умолчанию: %s)</translation> - </message> - <message> - <source>Please check that your computer's date and time are correct! If your clock is wrong, %s will not work properly.</source> - <translation>Пожалуйста убедитесь в корректности установки времени и даты на вашем компьютере! Если время установлено неверно, %s не будет работать правильно.</translation> - </message> - <message> - <source>Please contribute if you find %s useful. Visit %s for further information about the software.</source> - <translation>Пожалуйста, внести свой вклад, если вы найдете %s полезными. Посетите %s для получения дополнительной информации о программном обеспечении.</translation> - </message> - <message> - <source>Query for peer addresses via DNS lookup, if low on addresses (default: 1 unless -connect used)</source> - <translation>Запрашивать адреса участников с помощью DNS, если адресов мало (по умолчанию: 1, если не указан -connect)</translation> - </message> - <message> - <source>Reduce storage requirements by enabling pruning (deleting) of old blocks. This allows the pruneblockchain RPC to be called to delete specific blocks, and enables automatic pruning of old blocks if a target size in MiB is provided. This mode is incompatible with -txindex and -rescan. Warning: Reverting this setting requires re-downloading the entire blockchain. (default: 0 = disable pruning blocks, 1 = allow manual pruning via RPC, >%u = automatically prune block files to stay under the specified target size in MiB)</source> - <translation>Уменьшить размер хранилища за счёт обрезания (удаления) старых блоков. Будет разрешён вызов RPC метода pruneblockchain для удаления определённых блоков и разрешено автоматическое обрезание старых блоков, если указан целевой размер в Мб. Этот режим несовместим с -txindex и -rescan. Внимание: переключение этой опции обратно потребует полной загрузки цепи блоков. (по умолчанию: 0 = отключить обрезание блоков, 1 = разрешить ручное обрезание через RPC, >%u = автоматически обрезать файлы блоков, чтобы они были меньше указанного размера в Мб)</translation> - </message> - <message> - <source>Set lowest fee rate (in %s/kB) for transactions to be included in block creation. (default: %s)</source> - <translation>Задать минимальный курс комиссии (в %s/Кб) для транзакцийб включаемых в создаваемый блок. (по умолчанию: %s)</translation> - </message> - <message> - <source>Set the number of script verification threads (%u to %d, 0 = auto, <0 = leave that many cores free, default: %d)</source> - <translation>Задать число потоков проверки скрипта (от %u до %d, 0=авто, <0 = оставить столько ядер свободными, по умолчанию: %d)</translation> - </message> - <message> - <source>The block database contains a block which appears to be from the future. This may be due to your computer's date and time being set incorrectly. Only rebuild the block database if you are sure that your computer's date and time are correct</source> - <translation>База данных блоков содержит блок, который появляется из будущего. Это может из-за некорректно установленных даты и времени на вашем компьютере. Остается только перестроивать базу блоков, если вы уверены, что дата и время корректны.</translation> - </message> - <message> - <source>This is a pre-release test build - use at your own risk - do not use for mining or merchant applications</source> - <translation>Это пре-релизная тестовая сборка - используйте на свой страх и риск - не используйте для добычи или торговых приложений</translation> - </message> - <message> - <source>This is the transaction fee you may discard if change is smaller than dust at this level</source> - <translation>Это комиссия, которую можно отбросить, если сдача окажется меньше пыли</translation> - </message> - <message> - <source>Unable to replay blocks. You will need to rebuild the database using -reindex-chainstate.</source> - <translation>Не удалось воспроизвести блоки. Вам необходимо пересобрать базу данных с помощью -reindex-chainstate.</translation> - </message> - <message> - <source>Unable to rewind the database to a pre-fork state. You will need to redownload the blockchain</source> - <translation>Невозможно отмотать базу данных до пред-форкового состояния. Вам будет необходимо перекачать цепочку блоков.</translation> - </message> - <message> - <source>Use UPnP to map the listening port (default: 1 when listening and no -proxy)</source> - <translation>Использовать UPnP для проброса порта (по умолчанию: 1, если используется прослушивание и нет -proxy)</translation> - </message> - <message> - <source>Username and hashed password for JSON-RPC connections. The field <userpw> comes in the format: <USERNAME>:<SALT>$<HASH>. A canonical python script is included in share/rpcuser. The client then connects normally using the rpcuser=<USERNAME>/rpcpassword=<PASSWORD> pair of arguments. This option can be specified multiple times</source> - <translation>Имя пользователя и хэш пароля для JSON-RPC соединений. Поле <userpw> использует формат: <USERNAME>:<SALT>$<HASH>. Каноничный пример скрипта на питоне находится в share/rpcuser. Эта опция может быть указана несколько раз</translation> - </message> - <message> - <source>Wallet will not create transactions that violate mempool chain limits (default: %u)</source> - <translation>Бумажник не будет создавать транзакции, которые нарушают лимиты цепочки пула в памяти (по умолчанию: %u)</translation> - </message> - <message> - <source>Warning: The network does not appear to fully agree! Some miners appear to be experiencing issues.</source> - <translation>Внимание: похоже, в сети нет полного согласия! Некоторые майнеры, возможно, испытывают проблемы.</translation> - </message> - <message> - <source>Warning: We do not appear to fully agree with our peers! You may need to upgrade, or other nodes may need to upgrade.</source> - <translation>Внимание: мы не полностью согласны с подключенными участниками! Вам или другим участникам, возможно, следует обновиться.</translation> - </message> - <message> - <source>Whether to save the mempool on shutdown and load on restart (default: %u)</source> - <translation>Сохранять ли mempool при выключении и загружать ли его при запуске (по умолчанию: %u)</translation> - </message> - <message> - <source>%d of last 100 blocks have unexpected version</source> - <translation>%d из последних 100 блоков имеют непредвиденную версию</translation> - </message> - <message> - <source>%s corrupt, salvage failed</source> - <translation>%s поврежден, восстановить не удалось</translation> - </message> - <message> - <source>-maxmempool must be at least %d MB</source> - <translation>-maxmempool должен быть как минимум %d MB</translation> - </message> - <message> - <source><category> can be:</source> - <translation><category> может быть:</translation> - </message> - <message> - <source>Accept connections from outside (default: 1 if no -proxy or -connect)</source> - <translation>Принимать подключения извне (по умолчанию: 1, если не используется -proxy или -connect)</translation> - </message> - <message> - <source>Append comment to the user agent string</source> - <translation>Добавить комментарий к строке пользовательского агента</translation> - </message> - <message> - <source>Attempt to recover private keys from a corrupt wallet on startup</source> - <translation>Попытаться восстановить приватные ключи из повреждённого бумажника при запуске</translation> - </message> - <message> - <source>Block creation options:</source> - <translation>Параметры создания блоков:</translation> - </message> - <message> - <source>Cannot resolve -%s address: '%s'</source> - <translation>Не удаётся разрешить адрес в параметре -%s: '%s'</translation> - </message> - <message> - <source>Chain selection options:</source> - <translation>Параметры выбора цепочки:</translation> - </message> - <message> - <source>Change index out of range</source> - <translation>Изменение индекса вне диапазона</translation> - </message> - <message> - <source>Connection options:</source> - <translation>Параметры подключения:</translation> - </message> - <message> - <source>Copyright (C) %i-%i</source> - <translation>Copyright (C) %i-%i</translation> - </message> - <message> - <source>Corrupted block database detected</source> - <translation>БД блоков повреждена</translation> - </message> - <message> - <source>Debugging/Testing options:</source> - <translation>Параметры отладки/тестирования:</translation> - </message> - <message> - <source>Do not load the wallet and disable wallet RPC calls</source> - <translation>Не загружать бумажник и запретить обращения к нему через RPC</translation> - </message> - <message> - <source>Do you want to rebuild the block database now?</source> - <translation>Пересобрать БД блоков прямо сейчас?</translation> - </message> - <message> - <source>Enable publish hash block in <address></source> - <translation>Включить публичный хеш блока в <address></translation> - </message> - <message> - <source>Enable publish hash transaction in <address></source> - <translation>Включить публичный хеш транзакции в <address></translation> - </message> - <message> - <source>Enable publish raw block in <address></source> - <translation>Включить публичный сырой блок в <address></translation> - </message> - <message> - <source>Enable publish raw transaction in <address></source> - <translation>Включить публичную сырую транзакцию в <address></translation> - </message> - <message> - <source>Enable transaction replacement in the memory pool (default: %u)</source> - <translation>Включить замену транзакций в пуле памяти (по умолчанию:%u)</translation> - </message> - <message> - <source>Error creating %s: You can't create non-HD wallets with this version.</source> - <translation>Ошибка создания %s: Вы не можете создавать не-HD бумажники с помощью этой версии.</translation> - </message> - <message> <source>Error initializing block database</source> <translation>Ошибка инициализации БД блоков</translation> </message> <message> - <source>Error initializing wallet database environment %s!</source> - <translation>Ошибка инициализации окружения БД бумажника %s!</translation> - </message> - <message> - <source>Error loading %s</source> - <translation>Ошибка загрузки %s</translation> - </message> - <message> - <source>Error loading %s: Wallet corrupted</source> - <translation>Ошибка загрузки %s: Бумажник поврежден</translation> - </message> - <message> - <source>Error loading %s: Wallet requires newer version of %s</source> - <translation>Ошибка загрузки %s: Для бумажника требуется более новая версия %s</translation> - </message> - <message> - <source>Error loading block database</source> - <translation>Ошибка чтения базы данных блоков</translation> - </message> - <message> - <source>Error opening block database</source> - <translation>Не удалось открыть БД блоков</translation> - </message> - <message> - <source>Error: Disk space is low!</source> - <translation>Ошибка: мало места на диске!</translation> - </message> - <message> - <source>Failed to listen on any port. Use -listen=0 if you want this.</source> - <translation>Не удалось начать прослушивание на порту. Используйте -listen=0 если вас это устраивает.</translation> - </message> - <message> - <source>Failed to rescan the wallet during initialization</source> - <translation>Не удалось пересканировать бумажник во время инициализации</translation> - </message> - <message> - <source>Importing...</source> - <translation>Импорт ...</translation> - </message> - <message> - <source>Incorrect or no genesis block found. Wrong datadir for network?</source> - <translation>Неверный или отсутствующий начальный блок. Неправильный каталог данных для сети?</translation> - </message> - <message> - <source>Initialization sanity check failed. %s is shutting down.</source> - <translation>Начальная проверка исправности не удалась. %s завершает работу.</translation> - </message> - <message> - <source>Invalid amount for -%s=<amount>: '%s'</source> - <translation>Неверная сумма для -%s=<amount>: '%s'</translation> - </message> - <message> - <source>Invalid amount for -discardfee=<amount>: '%s'</source> - <translation>Неверная сумма для -discardfee=<amount>: '%s'</translation> - </message> - <message> - <source>Invalid amount for -fallbackfee=<amount>: '%s'</source> - <translation>Недопустимая сумма для -fallbackfee=<amount>: '%s'</translation> - </message> - <message> - <source>Keep the transaction memory pool below <n> megabytes (default: %u)</source> - <translation>Сбрасывать транзакции из памяти на диск каждые <n> мегабайт (по умолчанию: %u)</translation> - </message> - <message> - <source>Loading P2P addresses...</source> - <translation>Загрузка P2P адресов...</translation> - </message> - <message> - <source>Loading banlist...</source> - <translation>Загрузка банлиста...</translation> - </message> - <message> - <source>Location of the auth cookie (default: data dir)</source> - <translation>Расположение куки входы(по умолчанию: data dir)</translation> - </message> - <message> - <source>Not enough file descriptors available.</source> - <translation>Недостаточно файловых дескрипторов.</translation> - </message> - <message> - <source>Only connect to nodes in network <net> (ipv4, ipv6 or onion)</source> - <translation>Соединяться только по сети <net> (ipv4, ipv6 или onion)</translation> - </message> - <message> - <source>Print this help message and exit</source> - <translation>Вывести эту справку и выйти</translation> - </message> - <message> - <source>Print version and exit</source> - <translation>Написать версию и выйти</translation> - </message> - <message> - <source>Prune cannot be configured with a negative value.</source> - <translation>Удаление блоков не может использовать отрицательное значение.</translation> - </message> - <message> - <source>Prune mode is incompatible with -txindex.</source> - <translation>Режим удаления блоков несовместим с -txindex.</translation> - </message> - <message> - <source>Rebuild chain state and block index from the blk*.dat files on disk</source> - <translation>Перестроить состояние цепи блоков и индекс блоков из blk*.dat файлов с диска</translation> - </message> - <message> - <source>Rebuild chain state from the currently indexed blocks</source> - <translation>Перестроить индекс цепи из текущих индексированных блоков</translation> - </message> - <message> - <source>Replaying blocks...</source> - <translation>Воспроизведение блоков...</translation> - </message> - <message> - <source>Rewinding blocks...</source> - <translation>Перемотка блоков...</translation> - </message> - <message> - <source>Send transactions with full-RBF opt-in enabled (RPC only, default: %u)</source> - <translation>Отправлять транзакции с включенным full-RBF (только RPC, по умолчанию: %u)</translation> - </message> - <message> - <source>Set database cache size in megabytes (%d to %d, default: %d)</source> - <translation>Установить размер кэша БД в мегабайтах(от %d до %d, по умолчанию: %d)</translation> - </message> - <message> - <source>Specify wallet file (within data directory)</source> - <translation>Укажите файл бумажника (внутри каталога данных)</translation> - </message> - <message> - <source>The source code is available from %s.</source> - <translation>Исходный код доступен в %s.</translation> - </message> - <message> - <source>Transaction fee and change calculation failed</source> - <translation>Не удалось рассчитать комиссию и сдачу</translation> - </message> - <message> - <source>Unable to bind to %s on this computer. %s is probably already running.</source> - <translation>Невозможно привязаться к %s на этом компьютере. Возможно, %s уже работает.</translation> - </message> - <message> - <source>Unsupported argument -benchmark ignored, use -debug=bench.</source> - <translation>Неподдерживаемый аргумент -benchmark проигнорирован, используйте -debug=bench.</translation> - </message> - <message> - <source>Unsupported argument -debugnet ignored, use -debug=net.</source> - <translation>Неподдерживаемый аргумент -debugnet проигнорирован, используйте -debug=net.</translation> - </message> - <message> - <source>Unsupported argument -tor found, use -onion.</source> - <translation>Обнаружен не поддерживаемый параметр -tor, используйте -onion.</translation> - </message> - <message> - <source>Unsupported logging category %s=%s.</source> - <translation>Неподдерживаемая категория лога %s=%s.</translation> - </message> - <message> - <source>Upgrading UTXO database</source> - <translation>Модернизация базы данных UTXO</translation> - </message> - <message> - <source>Use UPnP to map the listening port (default: %u)</source> - <translation>Использовать UPnP для проброса порта (по умолчанию: %u)</translation> - </message> - <message> - <source>Use the test chain</source> - <translation>Использовать тестовую цепочку</translation> - </message> - <message> - <source>User Agent comment (%s) contains unsafe characters.</source> - <translation>Комментарий пользователя (%s) содержит небезопасные символы.</translation> - </message> - <message> - <source>Verifying blocks...</source> - <translation>Проверка блоков...</translation> - </message> - <message> - <source>Wallet debugging/testing options:</source> - <translation>Параметры отладки/тестирования бумажника:</translation> - </message> - <message> - <source>Wallet needed to be rewritten: restart %s to complete</source> - <translation>Необходимо перезаписать бумажник, перезапустите %s для завершения операции.</translation> - </message> - <message> - <source>Wallet options:</source> - <translation>Настройки бумажника:</translation> - </message> - <message> - <source>Allow JSON-RPC connections from specified source. Valid for <ip> are a single IP (e.g. 1.2.3.4), a network/netmask (e.g. 1.2.3.4/255.255.255.0) or a network/CIDR (e.g. 1.2.3.4/24). This option can be specified multiple times</source> - <translation>Разрешить подключения JSON-RPC с указанного источника. Разрешённые значения для <ip> — отдельный IP (например, 1.2.3.4), сеть/маска сети (например, 1.2.3.4/255.255.255.0) или сеть/CIDR (например, 1.2.3.4/24). Эту опцию можно использовать многократно</translation> - </message> - <message> - <source>Bind to given address and whitelist peers connecting to it. Use [host]:port notation for IPv6</source> - <translation>Привязаться к указанному адресу и внести в белый список подключающихся к нему участников. Используйте [хост]:порт для IPv6</translation> - </message> - <message> - <source>Create new files with system default permissions, instead of umask 077 (only effective with disabled wallet functionality)</source> - <translation>Создавать новые файлы с системными правами по умолчанию вместо umask 077 (эффективно только при отключенном бумажнике)</translation> - </message> - <message> - <source>Discover own IP addresses (default: 1 when listening and no -externalip or -proxy)</source> - <translation>Обнаруживать собственный IP адрес (по умолчанию: 1 при прослушивании и без -externalip или -proxy)</translation> - </message> - <message> - <source>Error: Listening for incoming connections failed (listen returned error %s)</source> - <translation>Ошибка: не удалось начать прослушивание входящих подключений (прослушивание вернуло ошибку %s)</translation> - </message> - <message> - <source>Execute command when a relevant alert is received or we see a really long fork (%s in cmd is replaced by message)</source> - <translation>Выполнить команду, когда приходит соответствующее сообщение о тревоге или наблюдается очень длинное расщепление цепи (%s в команде заменяется на сообщение)</translation> - </message> - <message> - <source>Fees (in %s/kB) smaller than this are considered zero fee for relaying, mining and transaction creation (default: %s)</source> - <translation>Комиссии (в %s/Кб) меньшие этого значения считаются нулевыми для создания, ретрансляции, получения транзакции (по умолчанию: %s)</translation> - </message> - <message> - <source>If paytxfee is not set, include enough fee so transactions begin confirmation on average within n blocks (default: %u)</source> - <translation>Если paytxfee не задан, включить достаточную комиссию для подтверждения транзакции в среднем за n блоков (по умолчанию: %u)</translation> - </message> - <message> - <source>Invalid amount for -maxtxfee=<amount>: '%s' (must be at least the minrelay fee of %s to prevent stuck transactions)</source> - <translation>Неверное значение для -maxtxfee=<amount>: '%s' (минимальная комиссия трансляции %s для предотвращения зависания транзакций)</translation> - </message> - <message> - <source>Maximum size of data in data carrier transactions we relay and mine (default: %u)</source> - <translation>Наибольший размер данных в носителе данных транзакций, которые мы передаем и генерируем (по умолчанию: %u)</translation> - </message> - <message> - <source>Randomize credentials for every proxy connection. This enables Tor stream isolation (default: %u)</source> - <translation>Использовать случайные учётные данные для каждого прокси-подключения. Эта функция позволяет изолировать потоки Tor (по умолчанию: %u)</translation> - </message> - <message> - <source>The transaction amount is too small to send after the fee has been deducted</source> - <translation>Сумма транзакции за вычетом комиссии слишком мала</translation> - </message> - <message> - <source>Whitelisted peers cannot be DoS banned and their transactions are always relayed, even if they are already in the mempool, useful e.g. for a gateway</source> - <translation>Участники из белого списка не могуть быть забанены за DoS, и их транзакции всегда транслируются, даже если они уже содержатся в памяти. Полезно, например, для шлюза.</translation> - </message> - <message> - <source>You need to rebuild the database using -reindex to go back to unpruned mode. This will redownload the entire blockchain</source> - <translation>Вам необходимо пересобрать базу данных с помощью -reindex, чтобы вернуться к полному режиму. Это приведёт к перезагрузке всей цепи блоков</translation> - </message> - <message> - <source>(default: %u)</source> - <translation>(по умолчанию: %u)</translation> - </message> - <message> - <source>Accept public REST requests (default: %u)</source> - <translation>Принимать публичные REST-запросы (по умолчанию: %u)</translation> - </message> - <message> - <source>Automatically create Tor hidden service (default: %d)</source> - <translation>Автоматически создавать скрытый Tor сервис (по умолчанию: %d)</translation> - </message> - <message> - <source>Connect through SOCKS5 proxy</source> - <translation>Подключаться через SOCKS5 прокси</translation> - </message> - <message> - <source>Error loading %s: You can't disable HD on an already existing HD wallet</source> - <translation>Ошибка загрузки %s: Вы не можете выключить HD в уже существующем HD кошельке</translation> - </message> - <message> - <source>Error reading from database, shutting down.</source> - <translation>Ошибка чтения базы данных, работа завершается.</translation> - </message> - <message> - <source>Error upgrading chainstate database</source> - <translation>Ошибка модернизации базы блокчейна</translation> - </message> - <message> - <source>Imports blocks from external blk000??.dat file on startup</source> - <translation>Импортировать блоки из внешнего файла blk000?.dat при запуске</translation> - </message> - <message> - <source>Information</source> - <translation>Информация</translation> - </message> - <message> - <source>Invalid -onion address or hostname: '%s'</source> - <translation>Неверный адрес или имя -onion: '%s'</translation> - </message> - <message> - <source>Invalid -proxy address or hostname: '%s'</source> - <translation>Неверный адрес или имя -proxy: '%s'</translation> - </message> - <message> - <source>Invalid amount for -paytxfee=<amount>: '%s' (must be at least %s)</source> - <translation>Неверное количество в параметре -paytxfee=<кол-во>: '%s' (должно быть как минимум %s)</translation> - </message> - <message> - <source>Invalid netmask specified in -whitelist: '%s'</source> - <translation>Указана неверная сетевая маска в -whitelist: '%s'</translation> - </message> - <message> - <source>Keep at most <n> unconnectable transactions in memory (default: %u)</source> - <translation>Держать в памяти до <n> несвязных транзакций (по умолчанию: %u)</translation> - </message> - <message> - <source>Need to specify a port with -whitebind: '%s'</source> - <translation>Необходимо указать порт с помощью -whitebind: '%s'</translation> - </message> - <message> - <source>Node relay options:</source> - <translation>Параметры трансляции узла:</translation> - </message> - <message> - <source>RPC server options:</source> - <translation>Параметры сервера RPC:</translation> - </message> - <message> - <source>Reducing -maxconnections from %d to %d, because of system limitations.</source> - <translation>Уменьшите -maxconnections с %d до %d, из-за ограничений системы.</translation> - </message> - <message> - <source>Rescan the block chain for missing wallet transactions on startup</source> - <translation>Перепроверить цепь блоков на предмет отсутствующих в бумажнике транзакций при запуске</translation> - </message> - <message> - <source>Send trace/debug info to console instead of debug.log file</source> - <translation>Выводить информацию трассировки/отладки на консоль вместо файла debug.log</translation> - </message> - <message> - <source>Show all debugging options (usage: --help -help-debug)</source> - <translation>Показать все отладочные параметры (использование: --help -help-debug)</translation> - </message> - <message> - <source>Shrink debug.log file on client startup (default: 1 when no -debug)</source> - <translation>Сжимать файл debug.log при запуске клиента (по умолчанию: 1, если нет -debug)</translation> - </message> - <message> - <source>Signing transaction failed</source> - <translation>Не удалось подписать транзакцию</translation> - </message> - <message> - <source>Specified -walletdir "%s" does not exist</source> - <translation>Указанный -walletdir "%s" не существует</translation> - </message> - <message> - <source>Specified -walletdir "%s" is a relative path</source> - <translation>Указанный путь -walletdir "%s" является относительным</translation> - </message> - <message> - <source>Specified -walletdir "%s" is not a directory</source> - <translation>Указанный -walletdir "%s" не является директорией</translation> - </message> - <message> - <source>The transaction amount is too small to pay the fee</source> - <translation>Сумма транзакции слишком мала для уплаты комиссии</translation> - </message> - <message> - <source>This is experimental software.</source> - <translation>Это экспериментальное ПО.</translation> - </message> - <message> - <source>Tor control port password (default: empty)</source> - <translation>Пароль от порта управления Tor (по умолчанию: пустой)</translation> - </message> - <message> - <source>Tor control port to use if onion listening enabled (default: %s)</source> - <translation>Порт управления Tor используется, если включено прослушивание onion (по умолчанию: %s)</translation> - </message> - <message> - <source>Transaction amount too small</source> - <translation>Сумма транзакции слишком мала</translation> - </message> - <message> - <source>Transaction too large for fee policy</source> - <translation>Транзакция слишком большая для правил комиссии.</translation> - </message> - <message> - <source>Transaction too large</source> - <translation>Транзакция слишком большая</translation> - </message> - <message> - <source>Unable to bind to %s on this computer (bind returned error %s)</source> - <translation>Невозможно привязаться к %s на этом компьютере (bind вернул ошибку %s)</translation> - </message> - <message> - <source>Unable to generate initial keys</source> - <translation>Невозможно создать ключи инициализации</translation> - </message> - <message> - <source>Upgrade wallet to latest format on startup</source> - <translation>Обновить бумажник до последнего формата при запуске</translation> - </message> - <message> - <source>Username for JSON-RPC connections</source> - <translation>Имя для подключений JSON-RPC</translation> - </message> - <message> - <source>Verifying wallet(s)...</source> - <translation>Проверка кошелька(ов) ...</translation> - </message> - <message> - <source>Wallet %s resides outside wallet directory %s</source> - <translation>Кошелёк %s расположен за пределами директории кошелька %s</translation> - </message> - <message> - <source>Warning</source> - <translation>Внимание</translation> - </message> - <message> - <source>Warning: unknown new rules activated (versionbit %i)</source> - <translation>Внимание: неизвестные правила вступили в силу(versionbit %i)</translation> - </message> - <message> - <source>Whether to operate in a blocks only mode (default: %u)</source> - <translation>Будет работать в режиме только блоков (по умолчанию: %u)</translation> - </message> - <message> - <source>You need to rebuild the database using -reindex to change -txindex</source> - <translation>Вам необходимо пересобрать базу данных с помощью -reindex, чтобы изменить -txindex</translation> - </message> - <message> - <source>Zapping all transactions from wallet...</source> - <translation>Стираем все транзакции из кошелька...</translation> - </message> - <message> - <source>ZeroMQ notification options:</source> - <translation>ZeroMQ параметры оповещения:</translation> - </message> - <message> - <source>Password for JSON-RPC connections</source> - <translation>Пароль для подключений JSON-RPC</translation> - </message> - <message> - <source>Execute command when the best block changes (%s in cmd is replaced by block hash)</source> - <translation>Выполнить команду, когда появляется новый блок (%s в команде заменяется на хэш блока)</translation> - </message> - <message> - <source>Allow DNS lookups for -addnode, -seednode and -connect</source> - <translation>Разрешить поиск в DNS для -addnode, -seednode и -connect</translation> - </message> - <message> - <source>(1 = keep tx meta data e.g. account owner and payment request information, 2 = drop tx meta data)</source> - <translation>(1 = сохранять метаданные транзакции: например, владельца аккаунта и информацию запроса платежа; 2 = отбросить метаданные)</translation> - </message> - <message> - <source>-maxtxfee is set very high! Fees this large could be paid on a single transaction.</source> - <translation>Установлено очень большое значение -maxtxfee. Такие большие комиссии могут быть уплачены в отдельной транзакции.</translation> - </message> - <message> - <source>Bind to given address to listen for JSON-RPC connections. This option is ignored unless -rpcallowip is also passed. Port is optional and overrides -rpcport. Use [host]:port notation for IPv6. This option can be specified multiple times (default: 127.0.0.1 and ::1 i.e., localhost, or if -rpcallowip has been specified, 0.0.0.0 and :: i.e., all addresses)</source> - <translation>Привязаться к указанному адресу для прослушивания JSON-RPC подключений. Этот параметр игнорируется, если не задан -rpcallowip. Порт необязателен и имеет приоритет над -rpcport. Используйте запись [хост]:порт для IPv6. Эту опцию можно использовать многократно (по умолчанию: 127.0.0.1 и ::1, т.е. localhost, или, если указан -rpcallowip, 0.0.0.0 и ::, т.е. все адреса)</translation> - </message> - <message> - <source>Do not keep transactions in the mempool longer than <n> hours (default: %u)</source> - <translation>Не хранить транзакции в памяти дольше, чем <n> часов (по умолчанию %u)</translation> - </message> - <message> - <source>Equivalent bytes per sigop in transactions for relay and mining (default: %u)</source> - <translation>Эквивалентных байт на sigop в транзакциях для ретрансляции или добычи (по умолчанию: %u)</translation> - </message> - <message> - <source>Error loading %s: You can't enable HD on an already existing non-HD wallet</source> - <translation>Ошибка загрузки %s: Вы не можете включить HD в уже существующем не-HD кошельке</translation> - </message> - <message> - <source>Error loading wallet %s. -wallet parameter must only specify a filename (not a path).</source> - <translation>Ошибка загрузки бумажника %s. -wallet должен содержать лишь имя файла, а не путь.</translation> - </message> - <message> - <source>Fees (in %s/kB) smaller than this are considered zero fee for transaction creation (default: %s)</source> - <translation>Комиссии (в %s/Кб) меньшие этого значения считаются нулевыми при создании транзакций (по умолчанию: %s)</translation> - </message> - <message> - <source>Force relay of transactions from whitelisted peers even if they violate local relay policy (default: %d)</source> - <translation>Всегда ретранслировать транзакции, полученные из белого списка участников, даже если они нарушают локальную политику ретрансляции (по умолчанию: %d)</translation> - </message> - <message> - <source>How thorough the block verification of -checkblocks is (0-4, default: %u)</source> - <translation>Насколько тщательна проверка контрольных блоков -checkblocks (0-4, по умолчанию: %u)</translation> - </message> - <message> - <source>Maintain a full transaction index, used by the getrawtransaction rpc call (default: %u)</source> - <translation>Держать полный индекс транзакций, используемый RPC-запросом getrawtransaction (по умолчанию: %u)</translation> - </message> - <message> - <source>Number of seconds to keep misbehaving peers from reconnecting (default: %u)</source> - <translation>Число секунд блокирования неправильно ведущих себя узлов (по умолчанию: %u)</translation> - </message> - <message> - <source>Output debugging information (default: %u, supplying <category> is optional)</source> - <translation>Выводить отладочную информацию (по умолчанию: %u, указание <category> необязательно)</translation> - </message> - <message> - <source>Set maximum BIP141 block weight to this * 4. Deprecated, use blockmaxweight</source> - <translation>Задать максимальный вес BIP141 блока как это * 4. Устарело, используйте blockmaxweight</translation> - </message> - <message> - <source>Sets the serialization of raw transaction or block hex returned in non-verbose mode, non-segwit(0) or segwit(1) (default: %d)</source> - <translation>Задаёт сериализацию сырой транзакции или хекса блока, возвращённого в не подробном режиме, non-segwit(0) или segwit(1) (по умолчанию: %d)</translation> - </message> - <message> - <source>Specify directory to hold wallets (default: <datadir>/wallets if it exists, otherwise <datadir>)</source> - <translation>Укажите папку для хранения бумажников (по умолчанию: <datadir>/wallets если она существует, иначе <datadir>)</translation> - </message> - <message> - <source>Specify location of debug log file: this can be an absolute path or a path relative to the data directory (default: %s)</source> - <translation>Укажите расположение файла журнала отладки: это может быть абсолютный путь или путь относительно папки данных (по умолчанию: %s)</translation> - </message> - <message> - <source>Support filtering of blocks and transaction with bloom filters (default: %u)</source> - <translation>Поддерживать фильтрацию блоков и транзакций с помощью фильтра Блума (по умолчанию: %u)</translation> - </message> - <message> - <source>The fee rate (in %s/kB) that indicates your tolerance for discarding change by adding it to the fee (default: %s). Note: An output is discarded if it is dust at this rate, but we will always discard up to the dust relay fee and a discard fee above that is limited by the fee estimate for the longest target</source> - <translation>Доля комиссии (в %s/Кб), которая означает допустимость отбрасывания сдачи путём добавления её к комиссии (по умолчанию: %s).</translation> - </message> - <message> - <source>This is the transaction fee you may pay when fee estimates are not available.</source> - <translation>Это комиссия за транзакцию, которую вы можете заплатить, когда расчёт комиссии недоступен.</translation> - </message> - <message> - <source>This product includes software developed by the OpenSSL Project for use in the OpenSSL Toolkit %s and cryptographic software written by Eric Young and UPnP software written by Thomas Bernard.</source> - <translation>Этот продукт включает ПО, разработанное OpenSSL Project для использования в OpenSSL Toolkit %s и криптографическое ПО, написанное Eric Young и ПО для работы с UPnP, написанное Thomas Bernard.</translation> - </message> - <message> - <source>Total length of network version string (%i) exceeds maximum length (%i). Reduce the number or size of uacomments.</source> - <translation>Текущая длина строки версии сети (%i) превышает максимальную длину (%i). Увеливается количество или размер uacomments.</translation> - </message> - <message> - <source>Tries to keep outbound traffic under the given target (in MiB per 24h), 0 = no limit (default: %d)</source> - <translation>Пытается ограничить исходящий трафик до (в МБ за 24ч), 0 = не ограничивать (по умолчанию: %d)</translation> - </message> - <message> - <source>Unsupported argument -socks found. Setting SOCKS version isn't possible anymore, only SOCKS5 proxies are supported.</source> - <translation>Обнаружен не поддерживаемый аргумент -socks. Выбор версии SOCKS более невозможен, поддерживаются только прокси SOCKS5.</translation> - </message> - <message> - <source>Unsupported argument -whitelistalwaysrelay ignored, use -whitelistrelay and/or -whitelistforcerelay.</source> - <translation>Не поддерживаемый аргумент -whitelistalwaysrelay игнорируется, используйте -whitelistrelay и/или -whitelistforcerelay.</translation> - </message> - <message> - <source>Use separate SOCKS5 proxy to reach peers via Tor hidden services (default: %s)</source> - <translation>Использовать отдельный прокси SOCKS5 для соединения с участниками через скрытые сервисы Tor (по умолчанию: %s)</translation> - </message> - <message> - <source>Warning: Unknown block versions being mined! It's possible unknown rules are in effect</source> - <translation>Внимание: Получена неизвестная версия блока! Возможно неизвестные правила вступили в силу.</translation> - </message> - <message> - <source>Warning: Wallet file corrupt, data salvaged! Original %s saved as %s in %s; if your balance or transactions are incorrect you should restore from a backup.</source> - <translation>Внимание: Файл бумажника поврежден, данные восстановлены! Оригинальный %s сохранен как %s в %s; Если баланс или транзакции некорректны, вы должны восстановить файл из резервной копии.</translation> - </message> - <message> - <source>Whitelist peers connecting from the given IP address (e.g. 1.2.3.4) or CIDR notated network (e.g. 1.2.3.0/24). Can be specified multiple times.</source> - <translation>Вносить в белый список участников, подключающихся с указанного IP (напр. 1.2.3.4) или CIDR-адреса сети (напр. 1.2.3.0/24). Можно использовать многократно.</translation> - </message> - <message> - <source>%s is set very high!</source> - <translation>%s задан слишком высоким!</translation> - </message> - <message> - <source>(default: %s)</source> - <translation>(по умолчанию: %s)</translation> - </message> - <message> - <source>Always query for peer addresses via DNS lookup (default: %u)</source> - <translation>Всегда запрашивать адреса участников с помощью DNS (по умолчанию: %u)</translation> - </message> - <message> - <source>Error loading wallet %s. -wallet filename must be a regular file.</source> - <translation>Ошибка загрузки бумажника %s. Имя в параметре -wallet должно быть именем обычного файла.</translation> - </message> - <message> - <source>Error loading wallet %s. Duplicate -wallet filename specified.</source> - <translation>Ошибка загрузки бумажника %s. В параметре -wallet указано повторяющееся имя файла.</translation> - </message> - <message> - <source>Error loading wallet %s. Invalid characters in -wallet filename.</source> - <translation>Ошибка загрузки бумажника %s. Неверные символы в параметре -wallet.</translation> - </message> - <message> - <source>How many blocks to check at startup (default: %u, 0 = all)</source> - <translation>Сколько блоков проверять при запуске (по умолчанию: %u, 0 = все)</translation> - </message> - <message> - <source>Include IP addresses in debug output (default: %u)</source> - <translation>Включить IP-адреса в отладочный вывод (по умолчанию: %u)</translation> - </message> - <message> - <source>Keypool ran out, please call keypoolrefill first</source> - <translation>Пул ключей опустел, пожалуйста, выполните keypoolrefill</translation> - </message> - <message> - <source>Listen for JSON-RPC connections on <port> (default: %u or testnet: %u)</source> - <translation>Прослушивать подключения JSON-RPC на <порту> (по умолчанию: %u или %u в тестовой сети)</translation> - </message> - <message> - <source>Listen for connections on <port> (default: %u or testnet: %u)</source> - <translation>Принимать входящие подключения на <port> (по умолчанию: %u или %u в тестовой сети)</translation> - </message> - <message> - <source>Maintain at most <n> connections to peers (default: %u)</source> - <translation>Поддерживать не более <n> подключений к узлам (по умолчанию: %u)</translation> - </message> - <message> - <source>Make the wallet broadcast transactions</source> - <translation>Рассылать транзакции из бумажника</translation> - </message> - <message> - <source>Maximum per-connection receive buffer, <n>*1000 bytes (default: %u)</source> - <translation>Максимальный размер буфера приёма на соединение, <n>*1000 байт (по умолчанию: %u)</translation> - </message> - <message> - <source>Maximum per-connection send buffer, <n>*1000 bytes (default: %u)</source> - <translation>Максимальный размер буфера отправки на соединение, <n>*1000 байт (по умолчанию: %u)</translation> - </message> - <message> - <source>Prepend debug output with timestamp (default: %u)</source> - <translation>Дописывать отметки времени к отладочному выводу (по умолчанию: %u)</translation> - </message> - <message> - <source>Relay and mine data carrier transactions (default: %u)</source> - <translation>Транслировать и генерировать транзакции носителей данных (по умолчанию: %u)</translation> - </message> - <message> - <source>Relay non-P2SH multisig (default: %u)</source> - <translation>Транслировать не-P2SH мультиподпись (по умолчанию: %u)</translation> - </message> - <message> - <source>Set key pool size to <n> (default: %u)</source> - <translation>Установить размер пула ключей в <n> (по умолчанию: %u)</translation> - </message> - <message> - <source>Set maximum BIP141 block weight (default: %d)</source> - <translation>Задать максимальное BIP141 значение блока (по умолчанию: %d)</translation> - </message> - <message> - <source>Set the number of threads to service RPC calls (default: %d)</source> - <translation>Задать число потоков выполнения запросов RPC (по умолчанию: %d)</translation> - </message> - <message> - <source>Specify configuration file (default: %s)</source> - <translation>Указать конфигурационный файл (по умолчанию: %s)</translation> - </message> - <message> - <source>Specify connection timeout in milliseconds (minimum: 1, default: %d)</source> - <translation>Указать тайм-аут соединения в миллисекундах (минимум: 1, по умолчанию: %d)</translation> - </message> - <message> - <source>Specify pid file (default: %s)</source> - <translation>Указать pid-файл (по умолчанию: %s)</translation> - </message> - <message> - <source>Spend unconfirmed change when sending transactions (default: %u)</source> - <translation>Тратить неподтвержденную сдачу при отправке транзакций (по умолчанию: %u)</translation> - </message> - <message> - <source>Starting network threads...</source> - <translation>Запускаем сетевые потоки...</translation> - </message> - <message> <source>The wallet will avoid paying less than the minimum relay fee.</source> - <translation>Бумажник постарается не платить меньше, чем минимальная комиссия передачи.</translation> - </message> - <message> - <source>This is the minimum transaction fee you pay on every transaction.</source> - <translation>Это минимальная комиссия, которую вы платите с каждой транзакцией.</translation> - </message> - <message> - <source>This is the transaction fee you will pay if you send a transaction.</source> - <translation>Это комиссия, которую вы заплатите за эту транзакцию.</translation> - </message> - <message> - <source>Threshold for disconnecting misbehaving peers (default: %u)</source> - <translation>Порог для отключения неправильно ведущих себя узлов (по умолчанию: %u)</translation> + <translation>Кошелёк постарается не платить меньше, чем минимальная комиссия передачи.</translation> </message> <message> <source>Transaction amounts must not be negative</source> - <translation>Сумма транзакции не должна быть негативной</translation> - </message> - <message> - <source>Transaction has too long of a mempool chain</source> - <translation>У транзакции слишком длинная цепочка в пуле в памяти.</translation> - </message> - <message> - <source>Transaction must have at least one recipient</source> - <translation>У транзакции должен быть как минимум один получатель</translation> - </message> - <message> - <source>Unknown network specified in -onlynet: '%s'</source> - <translation>В параметре -onlynet указана неизвестная сеть: '%s'</translation> + <translation>Сумма транзакции не должна быть отрицательной</translation> </message> <message> <source>Insufficient funds</source> - <translation>Недостаточно монет</translation> + <translation>Недостаточно средств</translation> </message> <message> <source>Loading block index...</source> @@ -4099,11 +473,11 @@ </message> <message> <source>Loading wallet...</source> - <translation>Загрузка бумажника...</translation> + <translation>Загрузка электронного кошелька...</translation> </message> <message> <source>Cannot downgrade wallet</source> - <translation>Не удаётся понизить версию бумажника</translation> + <translation>Не удаётся понизить версию электронного кошелька</translation> </message> <message> <source>Rescanning...</source> diff --git a/src/qt/locale/bitcoin_ru_RU.ts b/src/qt/locale/bitcoin_ru_RU.ts index ef6c755711..ea30f39969 100644 --- a/src/qt/locale/bitcoin_ru_RU.ts +++ b/src/qt/locale/bitcoin_ru_RU.ts @@ -30,6 +30,10 @@ <translation>Удалить выбранный адрес из списка</translation> </message> <message> + <source>Enter address or label to search</source> + <translation>Введите адрес или метку для поиска</translation> + </message> + <message> <source>Export the data in the current tab to a file</source> <translation>Экспортировать данные текущей вкладки в файл</translation> </message> @@ -128,6 +132,10 @@ <translation>Повторите новый пароль</translation> </message> <message> + <source>Show password</source> + <translation>Отобразить пароль</translation> + </message> + <message> <source>Enter the new passphrase to the wallet.<br/>Please use a passphrase of <b>ten or more random characters</b>, or <b>eight or more words</b>.</source> <translation>Введите новый пароль для кошелька.<br/> Пожалуйста используйте пароль из <b> десяти или более произвольных символов</b>, или <b>восемь или боле слов</b></translation> </message> @@ -180,6 +188,10 @@ <translation>%1 закроется сейчас для завершения процесса шифрования. Запомните что шифрование вашего кошелька не сможет полностью защитить ваши биткойны от кражи при помощи вредоносного ПО, заразившего ваш компьютер.</translation> </message> <message> + <source>IMPORTANT: Any previous backups you have made of your wallet file should be replaced with the newly generated, encrypted wallet file. For security reasons, previous backups of the unencrypted wallet file will become useless as soon as you start using the new, encrypted wallet.</source> + <translation>ВАЖНО: любые предыдущие резервные копия вашего кошелька, выполненные вами, необходимо заменить новым сгенерированным, зашифрованным файлом кошелька. В целях безопасности, предыдущие резервные копии незашифрованного файла кошелька утратят пригодность после начала использования нового зашифрованного кошелька.</translation> + </message> + <message> <source>Wallet encryption failed</source> <translation>Шифрование кошелька завершилось неудачно.</translation> </message> @@ -210,7 +222,15 @@ </context> <context> <name>BanTableModel</name> - </context> + <message> + <source>IP/Netmask</source> + <translation>IP / маска подсети</translation> + </message> + <message> + <source>Banned Until</source> + <translation>Заблокировано до</translation> + </message> +</context> <context> <name>BitcoinGUI</name> <message> @@ -222,10 +242,18 @@ <translation>Синхронизация с сетью...</translation> </message> <message> + <source>&Overview</source> + <translation>&Обзор</translation> + </message> + <message> <source>Node</source> <translation>Узел</translation> </message> <message> + <source>Show general overview of wallet</source> + <translation>Отобразить общий обзор кошелька</translation> + </message> + <message> <source>&Transactions</source> <translation>&Транзакции</translation> </message> @@ -262,6 +290,10 @@ <translation>&Опции...</translation> </message> <message> + <source>Modify configuration options for %1</source> + <translation>Изменить опции конфигурации для %1</translation> + </message> + <message> <source>&Encrypt Wallet...</source> <translation>&Зашифровать кошелёк</translation> </message> @@ -286,6 +318,14 @@ <translation>Открыть &URI...</translation> </message> <message> + <source>Wallet:</source> + <translation>Кошелек:</translation> + </message> + <message> + <source>default wallet</source> + <translation>Кошелек по умолчанию</translation> + </message> + <message> <source>Click to disable network activity.</source> <translation>Нажмите для отключения взаимодействия с сетью.</translation> </message> @@ -310,6 +350,10 @@ <translation>Послать средства на биткойн адрес</translation> </message> <message> + <source>Backup wallet to another location</source> + <translation>Выполнить резервное копирование кошелька в другом месте расположения</translation> + </message> + <message> <source>Change the passphrase used for wallet encryption</source> <translation>Изменить пароль, используемый для шифрования кошелька</translation> </message> @@ -318,6 +362,10 @@ <translation>&Окно отладки</translation> </message> <message> + <source>Open debugging and diagnostic console</source> + <translation>Открыть консоль отладки и диагностики</translation> + </message> + <message> <source>&Verify message...</source> <translation>&Проверить сообщение...</translation> </message> @@ -350,6 +398,14 @@ <translation>Зашифровать приватные ключи, принадлежащие вашему кошельку</translation> </message> <message> + <source>Sign messages with your Bitcoin addresses to prove you own them</source> + <translation>Подписывайте сообщения Bitcoin адресами чтобы подтвердить что это написали именно Вы</translation> + </message> + <message> + <source>Verify messages to ensure they were signed with specified Bitcoin addresses</source> + <translation>Проверяйте сообщения чтобы убедиться что они подписаны конкретными Bitcoin адресами</translation> + </message> + <message> <source>&File</source> <translation>&Файл</translation> </message> @@ -362,10 +418,46 @@ <translation>&Помощь</translation> </message> <message> + <source>Tabs toolbar</source> + <translation>Панель вкладок</translation> + </message> + <message> + <source>Show the list of used sending addresses and labels</source> + <translation>Показать список использованных адресов и меток получателей</translation> + </message> + <message> + <source>Show the list of used receiving addresses and labels</source> + <translation>Показать список использованных адресов и меток получателей</translation> + </message> + <message> + <source>Open a bitcoin: URI or payment request</source> + <translation>Открыть биткойн: URI или запрос платежа</translation> + </message> + <message> <source>&Command-line options</source> <translation>Опции командной строки</translation> </message> <message> + <source>Indexing blocks on disk...</source> + <translation>Выполняется индексирование блоков на диске...</translation> + </message> + <message> + <source>Processing blocks on disk...</source> + <translation>Выполняется обработка блоков на диске...</translation> + </message> + <message> + <source>%1 behind</source> + <translation>Выполнено %1</translation> + </message> + <message> + <source>Last received block was generated %1 ago.</source> + <translation>Последний полученный блок был сгенерирован %1 назад.</translation> + </message> + <message> + <source>Transactions after this will not yet be visible.</source> + <translation>После этого транзакции больше не будут видны.</translation> + </message> + <message> <source>Error</source> <translation>Ошибка</translation> </message> @@ -385,10 +477,78 @@ <source>Connecting to peers...</source> <translation>Подключение к пирам...</translation> </message> - </context> + <message> + <source>Catching up...</source> + <translation>Синхронизация...</translation> + </message> + <message> + <source>Date: %1 +</source> + <translation>Дата: %1 +</translation> + </message> + <message> + <source>Amount: %1 +</source> + <translation>Объем: %1 +</translation> + </message> + <message> + <source>Wallet: %1 +</source> + <translation>Кошелек: %1 +</translation> + </message> + <message> + <source>Type: %1 +</source> + <translation>Тип: %1 +</translation> + </message> + <message> + <source>Label: %1 +</source> + <translation>Ярлык: %1 +</translation> + </message> + <message> + <source>Address: %1 +</source> + <translation>Адрес: %1 +</translation> + </message> + <message> + <source>Sent transaction</source> + <translation>Отправленная транзакция</translation> + </message> + <message> + <source>Incoming transaction</source> + <translation>Входящая транзакция</translation> + </message> + <message> + <source>Wallet is <b>encrypted</b> and currently <b>unlocked</b></source> + <translation>Кошелек <b>зашифрован</b> и сейчас <b>разблокирован</b></translation> + </message> + <message> + <source>Wallet is <b>encrypted</b> and currently <b>locked</b></source> + <translation>Кошелек <b>зашифрован</b> и сейчас <b>заблокирован</b></translation> + </message> + <message> + <source>A fatal error occurred. Bitcoin can no longer continue safely and will quit.</source> + <translation>Произошла критическая ошибка. Bitcoin больше не может продолжать безопасную работу и будет закрыт.</translation> + </message> +</context> <context> <name>CoinControlDialog</name> <message> + <source>Coin Selection</source> + <translation>Выбор коинов</translation> + </message> + <message> + <source>Quantity:</source> + <translation>Количество:</translation> + </message> + <message> <source>Bytes:</source> <translation>Байтов:</translation> </message> @@ -401,6 +561,38 @@ <translation>Комиссия:</translation> </message> <message> + <source>Dust:</source> + <translation>Пыль:</translation> + </message> + <message> + <source>After Fee:</source> + <translation>После комиссии:</translation> + </message> + <message> + <source>Change:</source> + <translation>Сдача:</translation> + </message> + <message> + <source>Tree mode</source> + <translation>Режим дерева</translation> + </message> + <message> + <source>List mode</source> + <translation>Режим списка</translation> + </message> + <message> + <source>Amount</source> + <translation>Количество</translation> + </message> + <message> + <source>Received with label</source> + <translation>Получено с меткой</translation> + </message> + <message> + <source>Received with address</source> + <translation>Получено с адресом</translation> + </message> + <message> <source>Date</source> <translation>Дата</translation> </message> @@ -429,6 +621,38 @@ <translation>Копировать ID транзакции</translation> </message> <message> + <source>Lock unspent</source> + <translation>Заблокировать непотраченное</translation> + </message> + <message> + <source>Unlock unspent</source> + <translation>Разблокировать непотраченное</translation> + </message> + <message> + <source>Copy quantity</source> + <translation>Копировать количество</translation> + </message> + <message> + <source>Copy fee</source> + <translation>Скопировать комиссию</translation> + </message> + <message> + <source>Copy after fee</source> + <translation>Скопировать после комиссии</translation> + </message> + <message> + <source>Copy bytes</source> + <translation>Скопировать байты</translation> + </message> + <message> + <source>Copy dust</source> + <translation>Скопировать пыль</translation> + </message> + <message> + <source>Copy change</source> + <translation>Скопировать сдачу</translation> + </message> + <message> <source>yes</source> <translation>да</translation> </message> @@ -440,17 +664,57 @@ <source>(no label)</source> <translation>(нет метки)</translation> </message> - </context> + <message> + <source>(change)</source> + <translation>(сдача)</translation> + </message> +</context> <context> <name>EditAddressDialog</name> <message> <source>Edit Address</source> <translation>Изменить адрес</translation> </message> + <message> + <source>&Label</source> + <translation>&Метка</translation> + </message> + <message> + <source>&Address</source> + <translation>&Адрес</translation> + </message> + <message> + <source>New sending address</source> + <translation>Новый адрес отправки</translation> + </message> + <message> + <source>Edit receiving address</source> + <translation>Изменить адрес получения</translation> + </message> + <message> + <source>Edit sending address</source> + <translation>Изменить адрес отправки</translation> + </message> + <message> + <source>Could not unlock wallet.</source> + <translation>Невозможно разблокировать кошелек.</translation> + </message> </context> <context> <name>FreespaceChecker</name> - </context> + <message> + <source>A new data directory will be created.</source> + <translation>Будет создана новая директория данных.</translation> + </message> + <message> + <source>name</source> + <translation>имя</translation> + </message> + <message> + <source>Cannot create data directory here.</source> + <translation>Невозможно создать директорию данных здесь.</translation> + </message> +</context> <context> <name>HelpMessageDialog</name> <message> @@ -458,18 +722,14 @@ <translation>версия</translation> </message> <message> - <source>Command-line options</source> - <translation>Опции командной строки</translation> + <source>About %1</source> + <translation>Около %1</translation> </message> <message> - <source>command-line options</source> + <source>Command-line options</source> <translation>Опции командной строки</translation> </message> - <message> - <source>Start minimized</source> - <translation>Запускать свернутым</translation> - </message> - </context> +</context> <context> <name>Intro</name> <message> @@ -481,10 +741,34 @@ <translation>Добро пожаловать в %1.</translation> </message> <message> + <source>Use the default data directory</source> + <translation>Использовать стандартную директорию данных</translation> + </message> + <message> + <source>Use a custom data directory:</source> + <translation>Использовать пользовательскую директорию данных</translation> + </message> + <message> <source>Bitcoin</source> <translation>Bitcoin Core</translation> </message> <message> + <source>At least %1 GB of data will be stored in this directory, and it will grow over time.</source> + <translation>Как минимум %1 ГБ данных будет сохранен в эту директорию. Со временем размер будет увеличиваться.</translation> + </message> + <message> + <source>Approximately %1 GB of data will be stored in this directory.</source> + <translation>Приблизительно %1 ГБ данных будет сохранено в эту директорию.</translation> + </message> + <message> + <source>The wallet will also be stored in this directory.</source> + <translation>Кошелек также будет сохранен в эту директорию.</translation> + </message> + <message> + <source>Error: Specified data directory "%1" cannot be created.</source> + <translation>Ошибка: невозможно создать указанную директорию данных "%1".</translation> + </message> + <message> <source>Error</source> <translation>Ошибка</translation> </message> @@ -492,14 +776,54 @@ <context> <name>ModalOverlay</name> <message> + <source>Form</source> + <translation>Форма</translation> + </message> + <message> + <source>Recent transactions may not yet be visible, and therefore your wallet's balance might be incorrect. This information will be correct once your wallet has finished synchronizing with the bitcoin network, as detailed below.</source> + <translation>Последние транзакции пока могут быть не видны, поэтому вы можете видеть некорректный баланс ваших кошельков. Отображаемая информация будет верна после завершения синхронизации. Прогресс синхронизации вы можете видеть ниже.</translation> + </message> + <message> + <source>Attempting to spend bitcoins that are affected by not-yet-displayed transactions will not be accepted by the network.</source> + <translation>Попытка потратить средства, использованные в транзакциях, которые ещё не синхронизированы, будет отклонена сетью.</translation> + </message> + <message> + <source>Number of blocks left</source> + <translation>Количество оставшихся блоков</translation> + </message> + <message> + <source>Unknown...</source> + <translation>Неизвестно...</translation> + </message> + <message> + <source>Last block time</source> + <translation>Время последнего блока</translation> + </message> + <message> <source>Progress</source> <translation>Прогресс</translation> </message> <message> + <source>Progress increase per hour</source> + <translation>Прогресс за час</translation> + </message> + <message> + <source>calculating...</source> + <translation>выполняется вычисление...</translation> + </message> + <message> + <source>Estimated time left until synced</source> + <translation>Расчетное время, оставшееся до синхронизации</translation> + </message> + <message> <source>Hide</source> <translation>Спрятать</translation> </message> - </context> + <message> + <source>Unknown. Syncing Headers (%1)...</source> + <translation>Не известно. Синхронизация заголовков (%1)...</translation> + </message> +</context> <context> <name>OpenURIDialog</name> <message> @@ -510,7 +834,15 @@ <source>URI:</source> <translation>URI:</translation> </message> - </context> + <message> + <source>Select payment request file</source> + <translation>Выберите файл запроса платежа</translation> + </message> + <message> + <source>Select payment request file to open</source> + <translation>Выберите файл запроса платежа для открытия</translation> + </message> +</context> <context> <name>OptionsDialog</name> <message> @@ -518,10 +850,38 @@ <translation>Опции</translation> </message> <message> + <source>Automatically start %1 after logging in to the system.</source> + <translation>Автоматически запускать %1 после входа в систему.</translation> + </message> + <message> + <source>Size of &database cache</source> + <translation>Размер кеша &базы данных</translation> + </message> + <message> <source>MB</source> <translation>МБ</translation> </message> <message> + <source>IP address of the proxy (e.g. IPv4: 127.0.0.1 / IPv6: ::1)</source> + <translation>IP-адрес прокси-сервера (к примеру, IPv4: 127.0.0.1 / IPv6: ::1)</translation> + </message> + <message> + <source>Hide the icon from the system tray.</source> + <translation>Убрать значок с области уведомлений.</translation> + </message> + <message> + <source>&Hide tray icon</source> + <translation>&Спрятать иконку в трее</translation> + </message> + <message> + <source>Open Configuration File</source> + <translation>Открыть файл конфигурации</translation> + </message> + <message> + <source>Reset all client options to default.</source> + <translation>Сбросить все опции клиента к значениям по умолчанию.</translation> + </message> + <message> <source>&Reset Options</source> <translation>&Сбросить опции</translation> </message> @@ -530,6 +890,10 @@ <translation>&Сеть</translation> </message> <message> + <source>GB</source> + <translation>ГБ</translation> + </message> + <message> <source>W&allet</source> <translation>К&ошелёк</translation> </message> @@ -538,14 +902,30 @@ <translation>Эксперт</translation> </message> <message> + <source>&Spend unconfirmed change</source> + <translation>&Тратить неподтвержденную сдачу</translation> + </message> + <message> <source>Map port using &UPnP</source> <translation>Пробросить порт через &UPnP</translation> </message> <message> + <source>Accept connections from outside.</source> + <translation>Принимать внешние подключения</translation> + </message> + <message> + <source>Allow incomin&g connections</source> + <translation>Разрешить входящие соединения</translation> + </message> + <message> <source>Connect to the Bitcoin network through a SOCKS5 proxy.</source> <translation>Подключится к сети Bitcoin через SOCKS5 прокси.</translation> </message> <message> + <source>&Connect through SOCKS5 proxy (default proxy):</source> + <translation>&Выполнить подключение через прокси-сервер SOCKS5 (прокси-сервер по умолчанию):</translation> + </message> + <message> <source>Proxy &IP:</source> <translation>IP прокси:</translation> </message> @@ -574,6 +954,22 @@ <translation>&Окно</translation> </message> <message> + <source>Show only a tray icon after minimizing the window.</source> + <translation>Отобразить только значок в области уведомлений после сворачивания окна.</translation> + </message> + <message> + <source>User Interface &language:</source> + <translation>Язык пользовательского интерфейса:</translation> + </message> + <message> + <source>The user interface language can be set here. This setting will take effect after restarting %1.</source> + <translation>Здесь можно выбрать язык пользовательского интерфейса. Параметры будут применены после перезапуска %1</translation> + </message> + <message> + <source>Whether to show coin control features or not.</source> + <translation>Показывать ли опцию управления монетами.</translation> + </message> + <message> <source>&OK</source> <translation>&ОК</translation> </message> @@ -582,13 +978,57 @@ <translation>&Отмена</translation> </message> <message> + <source>default</source> + <translation>по умолчанию</translation> + </message> + <message> + <source>Confirm options reset</source> + <translation>Подтвердить сброс опций</translation> + </message> + <message> + <source>Client restart required to activate changes.</source> + <translation>Для активации изменений необходим перезапуск клиента.</translation> + </message> + <message> + <source>Client will be shut down. Do you want to proceed?</source> + <translation>Клиент будет закрыт. Продолжить далее?</translation> + </message> + <message> + <source>Configuration options</source> + <translation>Опции конфигурации</translation> + </message> + <message> <source>Error</source> <translation>Ошибка</translation> </message> - </context> + <message> + <source>The configuration file could not be opened.</source> + <translation>Невозможно открыть файл конфигурации.</translation> + </message> + <message> + <source>This change would require a client restart.</source> + <translation>Это изменение потребует перезапуск клиента.</translation> + </message> + <message> + <source>The supplied proxy address is invalid.</source> + <translation>Введенный адрес прокси-сервера недействителен.</translation> + </message> +</context> <context> <name>OverviewPage</name> <message> + <source>Form</source> + <translation>Форма</translation> + </message> + <message> + <source>Your current spendable balance</source> + <translation>Ваш доступный баланс</translation> + </message> + <message> + <source>Pending:</source> + <translation>В ожидании:</translation> + </message> + <message> <source>Immature:</source> <translation>Незрелые:</translation> </message> @@ -609,16 +1049,68 @@ <translation>Ваш текущий баланс (только чтение):</translation> </message> <message> + <source>Spendable:</source> + <translation>Доступно:</translation> + </message> + <message> <source>Recent transactions</source> <translation>Последние транзакции</translation> </message> </context> <context> <name>PaymentServer</name> - </context> + <message> + <source>Payment request error</source> + <translation>Ошибка запроса платежа</translation> + </message> + <message> + <source>Invalid payment address %1</source> + <translation>Неверный адрес %1</translation> + </message> + <message> + <source>Payment request rejected</source> + <translation>Запрос платежа отклонен</translation> + </message> + <message> + <source>Payment request expired.</source> + <translation>Истекло время ожидания запроса платежа</translation> + </message> + <message> + <source>Payment request is not initialized.</source> + <translation>Запрос платежа не инициализирован</translation> + </message> + <message> + <source>Invalid payment request.</source> + <translation>Неверный запрос платежа.</translation> + </message> + <message> + <source>Error communicating with %1: %2</source> + <translation>Ошибка связи с %1: %2</translation> + </message> + <message> + <source>Bad response from server %1</source> + <translation>Неправильный ответ от сервера %1</translation> + </message> + <message> + <source>Payment acknowledged</source> + <translation>Оплата подтверждена</translation> + </message> +</context> <context> <name>PeerTableModel</name> <message> + <source>User Agent</source> + <translation>Пользовательский агент</translation> + </message> + <message> + <source>Node/Service</source> + <translation>Узел/служба</translation> + </message> + <message> + <source>NodeId</source> + <translation>Идентификатор узла</translation> + </message> + <message> <source>Sent</source> <translation>Отправлено</translation> </message> @@ -630,10 +1122,34 @@ <context> <name>QObject</name> <message> + <source>Amount</source> + <translation>Количество</translation> + </message> + <message> <source>Enter a Bitcoin address (e.g. %1)</source> <translation>Введите биткоин-адрес (напр. %1)</translation> </message> <message> + <source>%1 d</source> + <translation>%1 д</translation> + </message> + <message> + <source>%1 h</source> + <translation>%1 ч</translation> + </message> + <message> + <source>%1 m</source> + <translation>%1 м</translation> + </message> + <message> + <source>%1 s</source> + <translation>%1 с</translation> + </message> + <message> + <source>N/A</source> + <translation>Н/Д</translation> + </message> + <message> <source>%1 and %2</source> <translation>%1 и %2</translation> </message> @@ -653,10 +1169,18 @@ <source>%1 GB</source> <translation>%1 ГБ</translation> </message> - </context> + <message> + <source>unknown</source> + <translation>неизвестно</translation> + </message> +</context> <context> <name>QObject::QObject</name> <message> + <source>Error: Specified data directory "%1" does not exist.</source> + <translation>Ошибка: указанная директория данных "%1" не существует.</translation> + </message> + <message> <source>Error: %1</source> <translation>Ошибка: %1</translation> </message> @@ -664,6 +1188,14 @@ <context> <name>QRImageWidget</name> <message> + <source>&Save Image...</source> + <translation>&Сохранить изображение...</translation> + </message> + <message> + <source>&Copy Image</source> + <translation>&Копировать изображение</translation> + </message> + <message> <source>Save QR Code</source> <translation>Сохранить QR-код</translation> </message> @@ -675,6 +1207,14 @@ <context> <name>RPCConsole</name> <message> + <source>N/A</source> + <translation>Н/Д</translation> + </message> + <message> + <source>Client version</source> + <translation>Версия клиента</translation> + </message> + <message> <source>&Information</source> <translation>Информация</translation> </message> @@ -683,6 +1223,42 @@ <translation>Окно отладки</translation> </message> <message> + <source>Network</source> + <translation>Сеть</translation> + </message> + <message> + <source>Name</source> + <translation>Название</translation> + </message> + <message> + <source>Number of connections</source> + <translation>Количество соединений</translation> + </message> + <message> + <source>Current number of blocks</source> + <translation>Текущее количество блоков</translation> + </message> + <message> + <source>Memory Pool</source> + <translation>Пул памяти</translation> + </message> + <message> + <source>Current number of transactions</source> + <translation>Текущее количество транзакций</translation> + </message> + <message> + <source>Memory usage</source> + <translation>Использование памяти</translation> + </message> + <message> + <source>Wallet: </source> + <translation>Кошелек:</translation> + </message> + <message> + <source>&Reset</source> + <translation>&Сбросить</translation> + </message> + <message> <source>Received</source> <translation>Получено</translation> </message> @@ -703,6 +1279,54 @@ <translation>Версия</translation> </message> <message> + <source>Synced Headers</source> + <translation>Синхронизировано заголовков</translation> + </message> + <message> + <source>Synced Blocks</source> + <translation>Синхронизировано блоков</translation> + </message> + <message> + <source>User Agent</source> + <translation>Пользовательский агент</translation> + </message> + <message> + <source>Decrease font size</source> + <translation>Уменьшить размер шрифта</translation> + </message> + <message> + <source>Increase font size</source> + <translation>Увеличить размер шрифта</translation> + </message> + <message> + <source>Services</source> + <translation>Сервисы</translation> + </message> + <message> + <source>Connection Time</source> + <translation>Время соединения</translation> + </message> + <message> + <source>Last Send</source> + <translation>Последние отправленные</translation> + </message> + <message> + <source>Last Receive</source> + <translation>Последние полученные</translation> + </message> + <message> + <source>Ping Time</source> + <translation>Время отклика Ping</translation> + </message> + <message> + <source>Min Ping</source> + <translation>Минимальное время отклика Ping</translation> + </message> + <message> + <source>Last block time</source> + <translation>Время последнего блока</translation> + </message> + <message> <source>&Open</source> <translation>&Открыть</translation> </message> @@ -711,6 +1335,18 @@ <translation>&Консоль</translation> </message> <message> + <source>&Network Traffic</source> + <translation>&Сетевой трафик</translation> + </message> + <message> + <source>In:</source> + <translation>Вход:</translation> + </message> + <message> + <source>Out:</source> + <translation>Выход:</translation> + </message> + <message> <source>1 &hour</source> <translation>1 &час</translation> </message> @@ -727,6 +1363,14 @@ <translation>1 &год</translation> </message> <message> + <source>default wallet</source> + <translation>Кошелек по умолчанию</translation> + </message> + <message> + <source>Type %1 for an overview of available commands.</source> + <translation>Ввести %1 для обзора доступных команд.</translation> + </message> + <message> <source>never</source> <translation>никогда</translation> </message> @@ -746,14 +1390,42 @@ <context> <name>ReceiveCoinsDialog</name> <message> + <source>&Label:</source> + <translation>&Метка:</translation> + </message> + <message> + <source>&Message:</source> + <translation>&Сообщение:</translation> + </message> + <message> + <source>Clear all fields of the form.</source> + <translation>Очистить все поля формы.</translation> + </message> + <message> <source>Clear</source> <translation>Отчистить</translation> </message> <message> + <source>Requested payments history</source> + <translation>История платежных запросов</translation> + </message> + <message> + <source>&Request payment</source> + <translation>&Запросить платеж</translation> + </message> + <message> + <source>Show the selected request (does the same as double clicking an entry)</source> + <translation>Отобразить выбранный запрос (выполняет то же, что и двойной щелчок на записи)</translation> + </message> + <message> <source>Show</source> <translation>Показать</translation> </message> <message> + <source>Remove the selected entries from the list</source> + <translation>Удалить выбранные записи со списка</translation> + </message> + <message> <source>Remove</source> <translation>Удалить</translation> </message> @@ -777,28 +1449,112 @@ <context> <name>ReceiveRequestDialog</name> <message> + <source>QR Code</source> + <translation>QR-код</translation> + </message> + <message> + <source>Copy &URI</source> + <translation>Копировать &URI</translation> + </message> + <message> + <source>Copy &Address</source> + <translation>Копировать &Адрес</translation> + </message> + <message> + <source>&Save Image...</source> + <translation>&Сохранить изображение...</translation> + </message> + <message> + <source>Payment information</source> + <translation>Информация о платеже</translation> + </message> + <message> + <source>URI</source> + <translation>URI</translation> + </message> + <message> <source>Address</source> <translation>Адрес</translation> </message> <message> + <source>Amount</source> + <translation>Количество</translation> + </message> + <message> <source>Label</source> <translation>Метка</translation> </message> - </context> + <message> + <source>Message</source> + <translation>Сообщение</translation> + </message> + <message> + <source>Wallet</source> + <translation>Кошелек</translation> + </message> + <message> + <source>Error encoding URI into QR Code.</source> + <translation>Ошибка преобразования URI в QR-код.</translation> + </message> +</context> <context> <name>RecentRequestsTableModel</name> <message> + <source>Date</source> + <translation>Дата</translation> + </message> + <message> <source>Label</source> <translation>Метка</translation> </message> <message> + <source>Message</source> + <translation>Сообщение</translation> + </message> + <message> <source>(no label)</source> <translation>(нет метки)</translation> </message> - </context> + <message> + <source>(no message)</source> + <translation>(нет сообщений)</translation> + </message> + <message> + <source>(no amount requested)</source> + <translation>(не указана запрашиваемая сумма)</translation> + </message> + <message> + <source>Requested</source> + <translation>Запрошено</translation> + </message> +</context> <context> <name>SendCoinsDialog</name> <message> + <source>Send Coins</source> + <translation>Отправить монеты</translation> + </message> + <message> + <source>Coin Control Features</source> + <translation>Опции управления монетами</translation> + </message> + <message> + <source>Inputs...</source> + <translation>Входы...</translation> + </message> + <message> + <source>automatically selected</source> + <translation>выбрано автоматически</translation> + </message> + <message> + <source>Insufficient funds!</source> + <translation>Недостаточно средств!</translation> + </message> + <message> + <source>Quantity:</source> + <translation>Количество:</translation> + </message> + <message> <source>Bytes:</source> <translation>Байтов:</translation> </message> @@ -811,28 +1567,188 @@ <translation>Комиссия:</translation> </message> <message> + <source>After Fee:</source> + <translation>После комиссии:</translation> + </message> + <message> + <source>Change:</source> + <translation>Сдача:</translation> + </message> + <message> + <source>Custom change address</source> + <translation>Указать адрес для сдачи</translation> + </message> + <message> + <source>Transaction Fee:</source> + <translation>Комиссия за транзакцию:</translation> + </message> + <message> <source>Choose...</source> <translation>Выбрать...</translation> </message> <message> + <source>Warning: Fee estimation is currently not possible.</source> + <translation>Предупреждение: оценка комиссии в данный момент невозможна.</translation> + </message> + <message> + <source>collapse fee-settings</source> + <translation>свернуть настройки комиссионных</translation> + </message> + <message> + <source>per kilobyte</source> + <translation>за килобайт</translation> + </message> + <message> <source>Hide</source> <translation>Спрятать</translation> </message> <message> + <source>Recommended:</source> + <translation>Рекомендованное значение:</translation> + </message> + <message> + <source>Custom:</source> + <translation>Пользовательское значение:</translation> + </message> + <message> + <source>Send to multiple recipients at once</source> + <translation>Отправить нескольким получателям сразу</translation> + </message> + <message> + <source>Add &Recipient</source> + <translation>Добавить &получателя</translation> + </message> + <message> + <source>Clear all fields of the form.</source> + <translation>Очистить все поля формы.</translation> + </message> + <message> + <source>Dust:</source> + <translation>Пыль:</translation> + </message> + <message> + <source>Confirmation time target:</source> + <translation>Целевое время подтверждения</translation> + </message> + <message> + <source>Enable Replace-By-Fee</source> + <translation>Включить Replace-By-Fee</translation> + </message> + <message> <source>Balance:</source> <translation>Баланс:</translation> </message> <message> + <source>Copy quantity</source> + <translation>Копировать количество</translation> + </message> + <message> <source>Copy amount</source> <translation>Копировать сумму</translation> </message> <message> + <source>Copy fee</source> + <translation>Скопировать комиссию</translation> + </message> + <message> + <source>Copy after fee</source> + <translation>Скопировать после комиссии</translation> + </message> + <message> + <source>Copy bytes</source> + <translation>Скопировать байты</translation> + </message> + <message> + <source>Copy dust</source> + <translation>Скопировать пыль</translation> + </message> + <message> + <source>Copy change</source> + <translation>Скопировать сдачу</translation> + </message> + <message> + <source>Are you sure you want to send?</source> + <translation>Вы действительно хотите выполнить отправку?</translation> + </message> + <message> + <source>or</source> + <translation>или</translation> + </message> + <message> + <source>Transaction fee</source> + <translation>Комиссия</translation> + </message> + <message> + <source>Confirm send coins</source> + <translation>Подтвердить отправку монет</translation> + </message> + <message> + <source>The amount to pay must be larger than 0.</source> + <translation>Сумма оплаты должна быть больше 0.</translation> + </message> + <message> + <source>The amount exceeds your balance.</source> + <translation>Количество превышает ваш баланс.</translation> + </message> + <message> + <source>Transaction creation failed!</source> + <translation>Создание транзакции завершилось неудачей!</translation> + </message> + <message> + <source>The transaction was rejected with the following reason: %1</source> + <translation>Транзакция была отменена по следующей причине: %1</translation> + </message> + <message> + <source>A fee higher than %1 is considered an absurdly high fee.</source> + <translation>Комиссия более чем в %1 считается абсурдно высокой.</translation> + </message> + <message> + <source>Payment request expired.</source> + <translation>Истекло время ожидания запроса платежа</translation> + </message> + <message> <source>(no label)</source> <translation>(нет метки)</translation> </message> </context> <context> <name>SendCoinsEntry</name> + <message> + <source>&Label:</source> + <translation>&Метка:</translation> + </message> + <message> + <source>Choose previously used address</source> + <translation>Выбрать предыдущий использованный адрес</translation> + </message> + <message> + <source>Alt+A</source> + <translation>Alt+A</translation> + </message> + <message> + <source>Paste address from clipboard</source> + <translation>Вставить адрес из буфера обмена</translation> + </message> + <message> + <source>Alt+P</source> + <translation>Alt+P</translation> + </message> + <message> + <source>Remove this entry</source> + <translation>Удалить эту запись</translation> + </message> + <message> + <source>Use available balance</source> + <translation>Использовать доступный баланс</translation> + </message> + <message> + <source>Message:</source> + <translation>Сообщение:</translation> + </message> + <message> + <source>Pay To:</source> + <translation>Выполнить оплату в пользу:</translation> + </message> </context> <context> <name>SendConfirmationDialog</name> @@ -843,13 +1759,57 @@ </context> <context> <name>ShutdownWindow</name> + <message> + <source>%1 is shutting down...</source> + <translation>%1 завершает работу...</translation> + </message> </context> <context> <name>SignVerifyMessageDialog</name> <message> + <source>Choose previously used address</source> + <translation>Выбрать предыдущий использованный адрес</translation> + </message> + <message> + <source>Alt+A</source> + <translation>Alt+A</translation> + </message> + <message> + <source>Paste address from clipboard</source> + <translation>Вставить адрес из буфера обмена</translation> + </message> + <message> + <source>Alt+P</source> + <translation>Alt+P</translation> + </message> + <message> <source>Signature</source> <translation>Подпись</translation> </message> + <message> + <source>Copy the current signature to the system clipboard</source> + <translation>Скопировать текущую подпись в буфер обмена системы</translation> + </message> + <message> + <source>The entered address is invalid.</source> + <translation>Введенный адрес недействителен.</translation> + </message> + <message> + <source>Please check the address and try again.</source> + <translation>Необходимо проверить адрес и выполнить повторную попытку.</translation> + </message> + <message> + <source>Wallet unlock was cancelled.</source> + <translation>Разблокирование кошелька было отменено.</translation> + </message> + <message> + <source>Message signed.</source> + <translation>Сообщение подписано.</translation> + </message> + <message> + <source>The signature could not be decoded.</source> + <translation>Невозможно расшифровать подпись.</translation> + </message> </context> <context> <name>SplashScreen</name> @@ -859,24 +1819,180 @@ </context> <context> <name>TransactionDesc</name> + <message> + <source>in memory pool</source> + <translation>в мемпуле</translation> + </message> + <message> + <source>not in memory pool</source> + <translation>не в мемпуле</translation> + </message> + <message> + <source>Status</source> + <translation>Статус</translation> + </message> + <message> + <source>Date</source> + <translation>Дата</translation> + </message> + <message> + <source>Source</source> + <translation>Источник</translation> + </message> + <message> + <source>From</source> + <translation>От</translation> + </message> + <message> + <source>unknown</source> + <translation>неизвестно</translation> + </message> + <message> + <source>watch-only</source> + <translation>только просмотр</translation> + </message> + <message> + <source>Transaction fee</source> + <translation>Комиссия</translation> + </message> + <message> + <source>Message</source> + <translation>Сообщение</translation> + </message> + <message> + <source>Comment</source> + <translation>Комментарий</translation> + </message> + <message> + <source>Transaction ID</source> + <translation>ID транзакции</translation> + </message> + <message> + <source>Transaction</source> + <translation>Транзакция</translation> + </message> + <message> + <source>Amount</source> + <translation>Количество</translation> + </message> </context> <context> <name>TransactionDescDialog</name> - </context> + <message> + <source>Details for %1</source> + <translation>Детальная информация по %1</translation> + </message> +</context> <context> <name>TransactionTableModel</name> <message> + <source>Date</source> + <translation>Дата</translation> + </message> + <message> + <source>Type</source> + <translation>Тип</translation> + </message> + <message> <source>Label</source> <translation>Метка</translation> </message> <message> + <source>Received with</source> + <translation>Получено на</translation> + </message> + <message> + <source>Sent to</source> + <translation>Отправить</translation> + </message> + <message> + <source>Mined</source> + <translation>Добыто</translation> + </message> + <message> + <source>watch-only</source> + <translation>только просмотр</translation> + </message> + <message> <source>(no label)</source> <translation>(нет метки)</translation> </message> + <message> + <source>Transaction status. Hover over this field to show number of confirmations.</source> + <translation>Статус транзакции. Для отображения количества подтверждений необходимо навести курсор на это поле.</translation> + </message> + <message> + <source>Date and time that the transaction was received.</source> + <translation>Дата и время получения транзакции.</translation> + </message> + <message> + <source>Type of transaction.</source> + <translation>Тип транзакции.</translation> + </message> </context> <context> <name>TransactionView</name> <message> + <source>All</source> + <translation>Все</translation> + </message> + <message> + <source>Today</source> + <translation>Сегодня</translation> + </message> + <message> + <source>This week</source> + <translation>Эта неделя</translation> + </message> + <message> + <source>This month</source> + <translation>Этот месяц</translation> + </message> + <message> + <source>Last month</source> + <translation>Последний месяц</translation> + </message> + <message> + <source>This year</source> + <translation>Этот год</translation> + </message> + <message> + <source>Range...</source> + <translation>Диапазон...</translation> + </message> + <message> + <source>Received with</source> + <translation>Получено на</translation> + </message> + <message> + <source>Sent to</source> + <translation>Отправить</translation> + </message> + <message> + <source>To yourself</source> + <translation>Себе</translation> + </message> + <message> + <source>Mined</source> + <translation>Добыто</translation> + </message> + <message> + <source>Enter address, transaction id, or label to search</source> + <translation>Введите адрес, ID транзакции или метку для поиска</translation> + </message> + <message> + <source>Min amount</source> + <translation>Минимальное количество</translation> + </message> + <message> + <source>Abandon transaction</source> + <translation>Отказ от транзакции</translation> + </message> + <message> + <source>Increase transaction fee</source> + <translation>Увеличить комиссию за транзакцию</translation> + </message> + <message> <source>Copy address</source> <translation>Копировать адрес</translation> </message> @@ -893,6 +2009,34 @@ <translation>Копировать ID транзакции</translation> </message> <message> + <source>Copy raw transaction</source> + <translation>Копировать raw транзакцию</translation> + </message> + <message> + <source>Copy full transaction details</source> + <translation>Копировать все детали транзакции</translation> + </message> + <message> + <source>Edit label</source> + <translation>Изменить метку</translation> + </message> + <message> + <source>Show transaction details</source> + <translation>Отобразить детали транзакции</translation> + </message> + <message> + <source>Confirmed</source> + <translation>Подтвержденные</translation> + </message> + <message> + <source>Date</source> + <translation>Дата</translation> + </message> + <message> + <source>Type</source> + <translation>Тип</translation> + </message> + <message> <source>Label</source> <translation>Метка</translation> </message> @@ -901,9 +2045,25 @@ <translation>Адрес</translation> </message> <message> + <source>ID</source> + <translation>ИН</translation> + </message> + <message> <source>Exporting Failed</source> <translation>Экспорт не удался</translation> </message> + <message> + <source>There was an error trying to save the transaction history to %1.</source> + <translation>При попытке сохранения истории транзакций в %1 произошла ошибка.</translation> + </message> + <message> + <source>Exporting Successful</source> + <translation>Экспорт выполнен успешно</translation> + </message> + <message> + <source>The transaction history was successfully saved to %1.</source> + <translation>Историю транзакций было успешно сохранено в %1.</translation> + </message> </context> <context> <name>UnitDisplayStatusBarControl</name> @@ -913,35 +2073,211 @@ </context> <context> <name>WalletModel</name> - </context> + <message> + <source>Send Coins</source> + <translation>Отправить монеты</translation> + </message> + <message> + <source>Increasing transaction fee failed</source> + <translation>Увеличение комиссии за транзакцию завершилось неудачей</translation> + </message> + <message> + <source>Do you want to increase the fee?</source> + <translation>Желаете увеличить комиссию?</translation> + </message> + <message> + <source>Current fee:</source> + <translation>Текущее значение комиссии</translation> + </message> + <message> + <source>Increase:</source> + <translation>Увеличить</translation> + </message> + <message> + <source>New fee:</source> + <translation>Новое значение комиссии:</translation> + </message> + <message> + <source>Can't sign transaction.</source> + <translation>Невозможно подписать транзакцию</translation> + </message> + <message> + <source>Could not commit transaction</source> + <translation>Не удалось выполнить транзакцию</translation> + </message> +</context> <context> <name>WalletView</name> <message> <source>&Export</source> <translation>Экспортировать</translation> </message> + <message> + <source>Export the data in the current tab to a file</source> + <translation>Экспортировать данные в текущей вкладке в файл</translation> + </message> + <message> + <source>Backup Wallet</source> + <translation>Создать резервную копию кошелька</translation> + </message> + <message> + <source>Wallet Data (*.dat)</source> + <translation>Данные кошелька (*.dat)</translation> + </message> + <message> + <source>Backup Failed</source> + <translation>Создание резервной копии кошелька завершилось неудачей</translation> + </message> + <message> + <source>There was an error trying to save the wallet data to %1.</source> + <translation>При попытке сохранения данных кошелька в %1 произошла ошибка.</translation> + </message> + <message> + <source>Backup Successful</source> + <translation>Резервное копирование выполнено успешно</translation> + </message> + <message> + <source>The wallet data was successfully saved to %1.</source> + <translation>Данные кошелька были успешно сохранены в %1.</translation> + </message> </context> <context> <name>bitcoin-core</name> <message> + <source>Error: A fatal internal error occurred, see debug.log for details</source> + <translation>Ошибка: произошла критическая внутренняя ошибка, для получения деталей см. debug.log</translation> + </message> + <message> + <source>Unable to start HTTP server. See debug log for details.</source> + <translation>Невозможно запустить HTTP-сервер. Для получения более детальной информации необходимо обратиться к журналу отладки.</translation> + </message> + <message> <source>Bitcoin Core</source> <translation>Bitcoin Core</translation> </message> <message> - <source>Whitelisted peers cannot be DoS banned and their transactions are always relayed, even if they are already in the mempool, useful e.g. for a gateway</source> - <translation>bitcoin-core</translation> + <source>The %s developers</source> + <translation>Разработчики %s</translation> + </message> + <message> + <source>%d of last 100 blocks have unexpected version</source> + <translation>%d из последних 100 блоков имеют неожиданную версию</translation> + </message> + <message> + <source>Copyright (C) %i-%i</source> + <translation>Авторское право (©) %i-%i</translation> + </message> + <message> + <source>Error loading %s</source> + <translation>Ошибка загрузки %s</translation> + </message> + <message> + <source>Error loading %s: Wallet corrupted</source> + <translation>Ошибка загрузки %s: кошелек поврежден</translation> + </message> + <message> + <source>Error loading %s: Wallet requires newer version of %s</source> + <translation>Ошибка загрузки %s: кошелек требует более поздней версии %s</translation> + </message> + <message> + <source>Error: Disk space is low!</source> + <translation>Ошибка: место на диске заканчивается!</translation> + </message> + <message> + <source>Importing...</source> + <translation>Выполняется импорт...</translation> + </message> + <message> + <source>Loading P2P addresses...</source> + <translation>Выполняется загрузка P2P-адресов...</translation> + </message> + <message> + <source>Loading banlist...</source> + <translation>Загрузка черного списка...</translation> + </message> + <message> + <source>Not enough file descriptors available.</source> + <translation>Недоступно достаточного количества дескрипторов файла.</translation> + </message> + <message> + <source>Transaction fee and change calculation failed</source> + <translation>Не удалось рассчитать комиссию и сдачу для транзакции </translation> + </message> + <message> + <source>Unsupported argument -debugnet ignored, use -debug=net.</source> + <translation>Неподдерживаемый аргумент -debugnet пропущен, необходимо использовать -debug=net.</translation> + </message> + <message> + <source>Unsupported argument -tor found, use -onion.</source> + <translation>Обнаружен неподдерживаемый аргумент -tor, необходимо использовать -onion.</translation> + </message> + <message> + <source>Verifying blocks...</source> + <translation>Проверка блоков...</translation> + </message> + <message> + <source>Error reading from database, shutting down.</source> + <translation>Ошибка чтения с базы данных, выполняется закрытие.</translation> </message> <message> <source>Information</source> <translation>Информация</translation> </message> <message> + <source>Signing transaction failed</source> + <translation>Подписание транзакции завершилось неудачей</translation> + </message> + <message> + <source>Transaction amount too small</source> + <translation>Размер транзакции слишком мал</translation> + </message> + <message> + <source>Transaction too large</source> + <translation>Транзакция слишком большая</translation> + </message> + <message> <source>Warning</source> <translation>Предупреждение</translation> </message> <message> - <source>Do not keep transactions in the mempool longer than <n> hours (default: %u)</source> - <translation>Do not keep transactions in the mempool longer than <n> hours (default: %u)</translation> + <source>This is the minimum transaction fee you pay on every transaction.</source> + <translation>Это минимальная комиссия, которую вы платите для любой транзакции</translation> + </message> + <message> + <source>This is the transaction fee you will pay if you send a transaction.</source> + <translation>Это размер комиссии, которую вы заплатите при отправке транзакции </translation> + </message> + <message> + <source>Transaction amounts must not be negative</source> + <translation>Размер транзакции не может быть отрицательным</translation> + </message> + <message> + <source>Transaction must have at least one recipient</source> + <translation>Транзакция должна иметь хотя бы одного получателя</translation> + </message> + <message> + <source>Insufficient funds</source> + <translation>Недостаточно средств</translation> + </message> + <message> + <source>Loading block index...</source> + <translation>Загрузка индекса блоков...</translation> + </message> + <message> + <source>Loading wallet...</source> + <translation>Выполняется загрузка кошелька...</translation> + </message> + <message> + <source>Cannot downgrade wallet</source> + <translation>Невозможно выполнить переход на более раннюю версию кошелька</translation> + </message> + <message> + <source>Rescanning...</source> + <translation>Выполняется повторное сканирование...</translation> + </message> + <message> + <source>Done loading</source> + <translation>Загрузка завершена</translation> </message> <message> <source>Error</source> diff --git a/src/qt/locale/bitcoin_sk.ts b/src/qt/locale/bitcoin_sk.ts index 09cf552e6b..86c5c8abda 100644 --- a/src/qt/locale/bitcoin_sk.ts +++ b/src/qt/locale/bitcoin_sk.ts @@ -30,6 +30,10 @@ <translation>Vymaž vybranú adresu zo zoznamu</translation> </message> <message> + <source>Enter address or label to search</source> + <translation>Zadajte adresu alebo popis pre hľadanie</translation> + </message> + <message> <source>Export the data in the current tab to a file</source> <translation>Exportovať tento náhľad do súboru</translation> </message> @@ -322,6 +326,14 @@ <translation>Otvoriť &URI...</translation> </message> <message> + <source>Wallet:</source> + <translation>Peňaženka:</translation> + </message> + <message> + <source>default wallet</source> + <translation>predvolená peňaženka</translation> + </message> + <message> <source>Click to disable network activity.</source> <translation>Kliknite pre zakázanie sieťovej aktivity.</translation> </message> @@ -342,6 +354,10 @@ <translation>Preindexúvam bloky na disku...</translation> </message> <message> + <source>Proxy is <b>enabled</b>: %1</source> + <translation>Proxy je <b>zapnuté</b>: %1</translation> + </message> + <message> <source>Send coins to a Bitcoin address</source> <translation>Poslať bitcoins na adresu</translation> </message> @@ -439,7 +455,7 @@ </message> <message numerus="yes"> <source>%n active connection(s) to Bitcoin network</source> - <translation><numerusform>%n aktívne pripojenie do siete Bitcoin</numerusform><numerusform>%n aktívne pripojenia do siete Bitcoin</numerusform><numerusform>%n aktívnych pripojení do siete Bitcoin</numerusform></translation> + <translation><numerusform>%n aktívne pripojenie do siete Bitcoin</numerusform><numerusform>%n aktívne pripojenia do siete Bitcoin</numerusform><numerusform>%n aktívnych pripojení do siete Bitcoin</numerusform><numerusform>%n aktívnych pripojení do siete Bitcoin</numerusform></translation> </message> <message> <source>Indexing blocks on disk...</source> @@ -451,7 +467,7 @@ </message> <message numerus="yes"> <source>Processed %n block(s) of transaction history.</source> - <translation><numerusform>Spracovaných %n blok transakčnej histórie.</numerusform><numerusform>Spracovaných %n bloky transakčnej histórie.</numerusform><numerusform>Spracovaných %n blokov transakčnej histórie.</numerusform></translation> + <translation><numerusform>Spracovaných %n blok transakčnej histórie.</numerusform><numerusform>Spracovaných %n bloky transakčnej histórie.</numerusform><numerusform>Spracovaných %n blokov transakčnej histórie.</numerusform><numerusform>Spracovaných %n blokov transakčnej histórie.</numerusform></translation> </message> <message> <source>%1 behind</source> @@ -510,6 +526,12 @@ </translation> </message> <message> + <source>Wallet: %1 +</source> + <translation>Peňaženka: %1 +</translation> + </message> + <message> <source>Type: %1 </source> <translation>Typ: %1 @@ -730,10 +752,6 @@ <translation>&Adresa</translation> </message> <message> - <source>New receiving address</source> - <translation>Nová adresa pre prijímanie</translation> - </message> - <message> <source>New sending address</source> <translation>Nová adresa pre odoslanie</translation> </message> @@ -750,10 +768,6 @@ <translation>Vložená adresa "%1" nieje platnou adresou Bitcoin.</translation> </message> <message> - <source>The entered address "%1" is already in the address book.</source> - <translation>Vložená adresa "%1" sa už nachádza v adresári.</translation> - </message> - <message> <source>Could not unlock wallet.</source> <translation>Nepodarilo sa odomknúť peňaženku.</translation> </message> @@ -803,42 +817,6 @@ <source>Command-line options</source> <translation>Voľby príkazového riadku</translation> </message> - <message> - <source>Usage:</source> - <translation>Použitie:</translation> - </message> - <message> - <source>command-line options</source> - <translation>voľby príkazového riadku</translation> - </message> - <message> - <source>UI Options:</source> - <translation>Možnosti používateľského rozhrania:</translation> - </message> - <message> - <source>Choose data directory on startup (default: %u)</source> - <translation>Vyberte dátový priečinok pri štarte (predvolené: %u)</translation> - </message> - <message> - <source>Set language, for example "de_DE" (default: system locale)</source> - <translation>Nastavte jazyk, napríklad "de_DE" (predvolené: podľa systému)</translation> - </message> - <message> - <source>Start minimized</source> - <translation>Spustiť minimalizované</translation> - </message> - <message> - <source>Set SSL root certificates for payment request (default: -system-)</source> - <translation>Nastaviť SSL root certifikáty pre vyžiadanie platby (predvolené: -system-)</translation> - </message> - <message> - <source>Show splash screen on startup (default: %u)</source> - <translation>Zobraziť uvítaciu obrazovku pri štarte (predvolené: %u)</translation> - </message> - <message> - <source>Reset all settings changed in the GUI</source> - <translation>Zrušiť všetky zmeny v GUI</translation> - </message> </context> <context> <name>Intro</name> @@ -904,11 +882,11 @@ </message> <message numerus="yes"> <source>%n GB of free space available</source> - <translation><numerusform>%n GB voľného miesta</numerusform><numerusform>%n GB voľného miesta</numerusform><numerusform>%n GB voľného miesta</numerusform></translation> + <translation><numerusform>%n GB voľného miesta</numerusform><numerusform>%n GB voľného miesta</numerusform><numerusform>%n GB voľného miesta</numerusform><numerusform>%n GB voľného miesta</numerusform></translation> </message> <message numerus="yes"> <source>(of %n GB needed)</source> - <translation><numerusform>(z %n GB potrebného)</numerusform><numerusform>(z %n GB potrebných)</numerusform><numerusform>(z %n GB potrebných)</numerusform></translation> + <translation><numerusform>(z %n GB potrebného)</numerusform><numerusform>(z %n GB potrebných)</numerusform><numerusform>(z %n GB potrebných)</numerusform><numerusform>(z %n GB potrebných)</numerusform></translation> </message> </context> <context> @@ -1068,6 +1046,10 @@ <translation>&Sieť</translation> </message> <message> + <source>GB</source> + <translation>GB</translation> + </message> + <message> <source>(0 = auto, <0 = leave that many cores free)</source> <translation>(0 = auto, <0 = nechať toľko jadier voľných)</translation> </message> @@ -1334,6 +1316,10 @@ <translation>URI manipulácia</translation> </message> <message> + <source>'bitcoin://' is not a valid URI. Use 'bitcoin:' instead.</source> + <translation>'bitcoin://' je neplatná URI. Použite 'bitcoin:'</translation> + </message> + <message> <source>Payment request fetch URL is invalid: %1</source> <translation>URL pre stiahnutie výzvy na zaplatenie je neplatné: %1</translation> </message> @@ -1477,23 +1463,23 @@ </message> <message numerus="yes"> <source>%n second(s)</source> - <translation><numerusform>%n sekunda</numerusform><numerusform>%n sekundy</numerusform><numerusform>%n sekúnd</numerusform></translation> + <translation><numerusform>%n sekunda</numerusform><numerusform>%n sekundy</numerusform><numerusform>%n sekúnd</numerusform><numerusform>%n sekúnd</numerusform></translation> </message> <message numerus="yes"> <source>%n minute(s)</source> - <translation><numerusform>%n minúta</numerusform><numerusform>%n minúty</numerusform><numerusform>%n minút</numerusform></translation> + <translation><numerusform>%n minúta</numerusform><numerusform>%n minúty</numerusform><numerusform>%n minút</numerusform><numerusform>%n minút</numerusform></translation> </message> <message numerus="yes"> <source>%n hour(s)</source> - <translation><numerusform>%n hodina</numerusform><numerusform>%n hodiny</numerusform><numerusform>%n hodín</numerusform></translation> + <translation><numerusform>%n hodina</numerusform><numerusform>%n hodiny</numerusform><numerusform>%n hodín</numerusform><numerusform>%n hodín</numerusform></translation> </message> <message numerus="yes"> <source>%n day(s)</source> - <translation><numerusform>%n deň</numerusform><numerusform>%n dni</numerusform><numerusform>%n dní</numerusform></translation> + <translation><numerusform>%n deň</numerusform><numerusform>%n dni</numerusform><numerusform>%n dní</numerusform><numerusform>%n dní</numerusform></translation> </message> <message numerus="yes"> <source>%n week(s)</source> - <translation><numerusform>%n týždeň</numerusform><numerusform>%n týždne</numerusform><numerusform>%n týždňov</numerusform></translation> + <translation><numerusform>%n týždeň</numerusform><numerusform>%n týždne</numerusform><numerusform>%n týždňov</numerusform><numerusform>%n týždňov</numerusform></translation> </message> <message> <source>%1 and %2</source> @@ -1501,7 +1487,7 @@ </message> <message numerus="yes"> <source>%n year(s)</source> - <translation><numerusform>%n rok</numerusform><numerusform>%n roky</numerusform><numerusform>%n rokov</numerusform></translation> + <translation><numerusform>%n rok</numerusform><numerusform>%n roky</numerusform><numerusform>%n rokov</numerusform><numerusform>%n rokov</numerusform></translation> </message> <message> <source>%1 B</source> @@ -1535,10 +1521,6 @@ <translation>Chyba: Zadaný adresár pre dáta „%1“ neexistuje.</translation> </message> <message> - <source>Error: Cannot parse configuration file: %1. Only use key=value syntax.</source> - <translation>Chyba: Nemôžem spracovať konfiguračný súbor: %1. Používajte iba syntax klúč=hodnota.</translation> - </message> - <message> <source>Error: %1</source> <translation>Chyba: %1</translation> </message> @@ -1629,6 +1611,14 @@ <translation>Využitie pamäte</translation> </message> <message> + <source>Wallet: </source> + <translation>Peňaženka:</translation> + </message> + <message> + <source>(none)</source> + <translation>(žiadna)</translation> + </message> + <message> <source>&Reset</source> <translation>&Vynulovať</translation> </message> @@ -1798,6 +1788,10 @@ <translation>&Zrušiť zákaz</translation> </message> <message> + <source>default wallet</source> + <translation>predvolená peňaženka</translation> + </message> + <message> <source>Welcome to the %1 RPC console.</source> <translation>Vitajte v %1 RPC konzole</translation> </message> @@ -1893,20 +1887,20 @@ <translation>Vyčistiť</translation> </message> <message> - <source>Requested payments history</source> - <translation>História vyžiadaných platieb</translation> + <source>Native segwit addresses (aka Bech32 or BIP-173) reduce your transaction fees later on and offer better protection against typos, but old wallets don't support them. When unchecked, an address compatible with older wallets will be created instead.</source> + <translation>Natívne segwit adresy (Bech32 or BIP-173) znižujú Vaše budúce transakčné poplatky and ponúkajú lepšiu ochranu pred preklepmi, avšak staré peňaženky ich nepodporujú. Ak je toto pole nezaškrtnuté, bude vytvorená adresa kompatibilná so staršími peňaženkami.</translation> </message> <message> - <source>&Request payment</source> - <translation>&Vyžiadať platbu</translation> + <source>Generate native segwit (Bech32) address</source> + <translation>Generovať natívnu segwit adresu (Bech32)</translation> </message> <message> - <source>Bech32 addresses (BIP-173) are cheaper to spend from and offer better protection against typos. When unchecked a P2SH wrapped SegWit address will be created, compatible with older wallets.</source> - <translation>Je lacnejšie míňať z Bech32 adries (BIP-173), ktoré tiež ponúkajú lepšiu ochranu voči preklepom. Ak túto možnosť nevyberiete, bude vytvorená adresa typu P2SH so SegWit, kompatibilná so staršími peňaženkami.</translation> + <source>Requested payments history</source> + <translation>História vyžiadaných platieb</translation> </message> <message> - <source>Generate Bech32 address</source> - <translation>Generovať adresu Bech32</translation> + <source>&Request payment</source> + <translation>&Vyžiadať platbu</translation> </message> <message> <source>Show the selected request (does the same as double clicking an entry)</source> @@ -1988,6 +1982,10 @@ <translation>Správa</translation> </message> <message> + <source>Wallet</source> + <translation>Peňaženka</translation> + </message> + <message> <source>Resulting URI too long, try to reduce the text for label / message.</source> <translation>Výsledné URI je príliš dlhé, skúste skrátiť text pre popis alebo správu.</translation> </message> @@ -2106,10 +2104,6 @@ <translation>za kilobajt</translation> </message> <message> - <source>If the custom fee is set to 1000 satoshis and the transaction is only 250 bytes, then "per kilobyte" only pays 250 satoshis in fee, while "total at least" pays 1000 satoshis. For transactions bigger than a kilobyte both pay by kilobyte.</source> - <translation>Ak je poplatok nastavený na 1000 satoshi a transakcia je veľká len 250 bajtov, potom "za kilobajt" zaplatí poplatok 250 satoshi, ale "spolu aspoň" zaplatí 1000 satoshi. Pre transakcie väčšie ako kilobajt platia oba spôsoby za každý kilobajt.</translation> - </message> - <message> <source>Hide</source> <translation>Skryť</translation> </message> @@ -2158,6 +2152,10 @@ <translation>Povoliť dodatočné navýšenie poplatku (tzv. „Replace-By-Fee“)</translation> </message> <message> + <source>With Replace-By-Fee (BIP-125) you can increase a transaction's fee after it is sent. Without this, a higher fee may be recommended to compensate for increased transaction delay risk.</source> + <translation>S dodatočným navýšením poplatku (BIP-125, tzv. „Replace-By-Fee“), môžete zvýšiť poplatok aj po odoslaní. Bez toho, by mohol byť navrhnutý väčší transakčný poplatok, aby kompenzoval zvýšené riziko omeškania transakcie.</translation> + </message> + <message> <source>Clear &All</source> <translation>&Zmazať všetko</translation> </message> @@ -2214,14 +2212,6 @@ <translation>Určite chcete odoslať transakciu?</translation> </message> <message> - <source>added as transaction fee</source> - <translation>pridané ako poplatok za transakciu</translation> - </message> - <message> - <source>Total Amount %1</source> - <translation>Celková suma %1</translation> - </message> - <message> <source>or</source> <translation>alebo</translation> </message> @@ -2230,10 +2220,22 @@ <translation>Poplatok môžete navýšiť neskôr (vysiela sa "Replace-By-Fee" - nahradenie poplatkom, BIP-125).</translation> </message> <message> + <source>from wallet %1</source> + <translation>z peňaženky %1</translation> + </message> + <message> + <source>Transaction fee</source> + <translation>Transakčný poplatok</translation> + </message> + <message> <source>Not signalling Replace-By-Fee, BIP-125.</source> <translation>Nevysiela sa "Replace-By-Fee" - nahradenie poplatkom, BIP-125.</translation> </message> <message> + <source>Total Amount</source> + <translation>Celková suma</translation> + </message> + <message> <source>Confirm send coins</source> <translation>Potvrďte odoslanie mincí</translation> </message> @@ -2279,7 +2281,7 @@ </message> <message numerus="yes"> <source>Estimated to begin confirmation within %n block(s).</source> - <translation><numerusform>Odhadovaný začiatok potvrdzovania po %n bloku.</numerusform><numerusform>Odhadovaný začiatok potvrdzovania po %n blokoch.</numerusform><numerusform>Odhadovaný začiatok potvrdzovania po %n blokoch.</numerusform></translation> + <translation><numerusform>Odhadovaný začiatok potvrdzovania po %n bloku.</numerusform><numerusform>Odhadovaný začiatok potvrdzovania po %n blokoch.</numerusform><numerusform>Odhadovaný začiatok potvrdzovania po %n blokoch.</numerusform><numerusform>Odhadovaný začiatok potvrdzovania po %n blokoch.</numerusform></translation> </message> <message> <source>Warning: Invalid Bitcoin address</source> @@ -2564,7 +2566,7 @@ <name>TransactionDesc</name> <message numerus="yes"> <source>Open for %n more block(s)</source> - <translation><numerusform>Otvoriť pre %n ďalší blok</numerusform><numerusform>Otvoriť pre %n ďalšie bloky</numerusform><numerusform>Otvoriť pre %n ďalších blokov</numerusform></translation> + <translation><numerusform>Otvoriť pre %n ďalší blok</numerusform><numerusform>Otvoriť pre %n ďalšie bloky</numerusform><numerusform>Otvoriť pre %n ďalších blokov</numerusform><numerusform>Otvoriť pre %n ďalších blokov</numerusform></translation> </message> <message> <source>Open until %1</source> @@ -2575,10 +2577,6 @@ <translation>koliduje s transakciou s %1 potvrdeniami</translation> </message> <message> - <source>%1/offline</source> - <translation>%1/offline</translation> - </message> - <message> <source>0/unconfirmed, %1</source> <translation>0/nepotvrdené, %1</translation> </message> @@ -2607,14 +2605,6 @@ <translation>Stav</translation> </message> <message> - <source>, has not been successfully broadcast yet</source> - <translation>, ešte nebola úspešne odoslaná</translation> - </message> - <message numerus="yes"> - <source>, broadcast through %n node(s)</source> - <translation><numerusform>, vysielať cez %n uzol</numerusform><numerusform>, vysielať cez %n uzle </numerusform><numerusform>, vysielať cez %n uzolov</numerusform></translation> - </message> - <message> <source>Date</source> <translation>Dátum</translation> </message> @@ -2656,7 +2646,7 @@ </message> <message numerus="yes"> <source>matures in %n more block(s)</source> - <translation><numerusform>dozreje za %n ďalší blok</numerusform><numerusform>dozreje za %n ďalšie bloky</numerusform><numerusform>dozreje za %n ďalších blokov</numerusform></translation> + <translation><numerusform>dozreje za %n ďalší blok</numerusform><numerusform>dozreje za %n ďalšie bloky</numerusform><numerusform>dozreje za %n ďalších blokov</numerusform><numerusform>dozreje za %n ďalších blokov</numerusform></translation> </message> <message> <source>not accepted</source> @@ -2762,17 +2752,13 @@ </message> <message numerus="yes"> <source>Open for %n more block(s)</source> - <translation><numerusform>Otvoriť pre %n ďalší blok</numerusform><numerusform>Otvoriť pre %n ďalšie bloky</numerusform><numerusform>Otvoriť pre %n ďalších blokov</numerusform></translation> + <translation><numerusform>Otvoriť pre %n ďalší blok</numerusform><numerusform>Otvoriť pre %n ďalšie bloky</numerusform><numerusform>Otvoriť pre %n ďalších blokov</numerusform><numerusform>Otvoriť pre %n ďalších blokov</numerusform></translation> </message> <message> <source>Open until %1</source> <translation>Otvorené do %1</translation> </message> <message> - <source>Offline</source> - <translation>Offline</translation> - </message> - <message> <source>Unconfirmed</source> <translation>Nepotvrdené</translation> </message> @@ -2797,10 +2783,6 @@ <translation>Nezrelé (%1 potvrdení, bude dostupné po %2)</translation> </message> <message> - <source>This block was not received by any other nodes and will probably not be accepted!</source> - <translation>Ten blok nebol prijatý žiadnym iným uzlom a pravdepodobne nebude akceptovaný!</translation> - </message> - <message> <source>Generated but not accepted</source> <translation>Vypočítané ale neakceptované</translation> </message> @@ -3111,38 +3093,18 @@ <source>The wallet data was successfully saved to %1.</source> <translation>Dáta peňaženky boli úspešne uložené do %1.</translation> </message> + <message> + <source>Cancel</source> + <translation>Zrušiť</translation> + </message> </context> <context> <name>bitcoin-core</name> <message> - <source>Options:</source> - <translation>Možnosti:</translation> - </message> - <message> - <source>Specify data directory</source> - <translation>Určiť priečinok s dátami</translation> - </message> - <message> - <source>Connect to a node to retrieve peer addresses, and disconnect</source> - <translation>Pripojiť sa k uzlu, získať adresy ďalších počítačov v sieti a odpojiť sa</translation> - </message> - <message> - <source>Specify your own public address</source> - <translation>Určite vašu vlastnú verejnú adresu</translation> - </message> - <message> - <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> <source>Distributed under the MIT software license, see the accompanying file %s or %s</source> <translation>Distribuované pod softvérovou licenciou MIT, viď sprievodný súbor %s alebo %s</translation> </message> <message> - <source>If <category> is not supplied or if <category> = 1, output all debugging information.</source> - <translation>Pokiaľ <category> nie je nastavená, alebo <category> = 1, vypíš všetky informácie pre ladenie.</translation> - </message> - <message> <source>Prune configured below the minimum of %d MiB. Please use a higher number.</source> <translation>Redukcia nastavená pod minimálnu hodnotu %d MiB. Prosím použite vyššiu hodnotu.</translation> </message> @@ -3159,18 +3121,10 @@ <translation>Chyba: Vyskytla sa interná chyba, pre viac informácií zobrazte debug.log</translation> </message> <message> - <source>Fee (in %s/kB) to add to transactions you send (default: %s)</source> - <translation>Poplatok (za %s/kB) pridaný do transakcie, ktorú posielate (predvolené: %s)</translation> - </message> - <message> <source>Pruning blockstore...</source> <translation>Redukovanie blockstore...</translation> </message> <message> - <source>Run in the background as a daemon and accept commands</source> - <translation>Bežať na pozadí ako démon a prijímať príkazy</translation> - </message> - <message> <source>Unable to start HTTP server. See debug log for details.</source> <translation>Nepodarilo sa spustiť HTTP server. Pre viac detailov zobrazte debug log.</translation> </message> @@ -3183,58 +3137,18 @@ <translation>Vývojári %s</translation> </message> <message> - <source>A fee rate (in %s/kB) that will be used when fee estimation has insufficient data (default: %s)</source> - <translation>Sadzba poplatku (v %s/kB), ktorá sa použije, ak nebude k dispozícii dostatok dát pre automatický odhad poplatku (predvolené: %s)</translation> - </message> - <message> - <source>Accept relayed transactions received from whitelisted peers even when not relaying transactions (default: %d)</source> - <translation>Akceptovať postúpené transakcie od povolených partnerov aj keď normálne nepostupujete transakcie (predvolené: %d)</translation> - </message> - <message> - <source>Bind to given address and always listen on it. Use [host]:port notation for IPv6</source> - <translation>Spojiť s danou adresou a vždy na nej počúvať. Použite zápis [host]:port pre IPv6</translation> - </message> - <message> <source>Cannot obtain a lock on data directory %s. %s is probably already running.</source> <translation>Nemožné uzamknúť zložku %s. %s pravdepodobne už beží.</translation> </message> <message> <source>Cannot provide specific connections and have addrman find outgoing connections at the same.</source> - <translation>Nemôžete zadať konkrétne spojenia a zároveň mať nastavený addrman pre hľadanie odchádzajúcich spojení.</translation> - </message> - <message> - <source>Delete all wallet transactions and only recover those parts of the blockchain through -rescan on startup</source> - <translation>Vymazať všetky transakcie z peňaženky a pri spustení znova získať z reťazca blokov iba tie získané pomocou -rescan</translation> + <translation>Nemôžete zadať konkrétne spojenia a zároveň mať nastavený addrman pre hľadanie odchádzajúcich spojení.</translation> </message> <message> <source>Error reading %s! All keys read correctly, but transaction data or address book entries might be missing or incorrect.</source> <translation>Nastala chyba pri čítaní súboru %s! Všetkz kľúče sa prečítali správne, ale dáta o transakcíách alebo záznamy v adresári môžu chýbať alebo byť nesprávne.</translation> </message> <message> - <source>Exclude debugging information for a category. Can be used in conjunction with -debug=1 to output debug logs for all categories except one or more specified categories.</source> - <translation>Vylúčiť ladiacu informáciu danej kategórie. Dá se zkombinovať s -debug=1, aby sa zaznamenávali ladice informácie všetkých kategórií pkrem jednej alebo niekolkých zvolených.</translation> - </message> - <message> - <source>Execute command when a wallet transaction changes (%s in cmd is replaced by TxID)</source> - <translation>Vykonaj príkaz keď sa zmení transakcia peňaženky (%s v príkaze je nahradená TxID)</translation> - </message> - <message> - <source>Extra transactions to keep in memory for compact block reconstructions (default: %u)</source> - <translation>Počet extra transakcíí, ktoré sa majú držať v pamäti pre účely rekonštrukcie kompaktných blokov (predvolené: %u)</translation> - </message> - <message> - <source>If this block is in the chain assume that it and its ancestors are valid and potentially skip their script verification (0 to verify all, default: %s, testnet: %s)</source> - <translation>Pokiaľ je tento blok v reťazci blokov, tak predpokladať, že on i jeho následníci sú platní, a potenciálne preskočiť overovanie ich skriptov (0 = overovať všetko, predvolené: %s, testnet: %s)</translation> - </message> - <message> - <source>Maximum allowed median peer time offset adjustment. Local perspective of time may be influenced by peers forward or backward by this amount. (default: %u seconds)</source> - <translation>Maximálne povolené upravovanie času mediánom časov peerov. Miestne vnímanie času môže byť ovplivnené peerami, a to dopredu alebo dozadu až o toto množstvo. (predvolené: %u sekund)</translation> - </message> - <message> - <source>Maximum total fees (in %s) to use in a single wallet transaction or raw transaction; setting this too low may abort large transactions (default: %s)</source> - <translation>Horná hranica pre celkový poplatok (v %s) za jednu transakciu z peňaženky alebo jednu nespracovanú transakciu. Príliš nízká hodnota môže zmariť velké transakcie (predvolené: %s)</translation> - </message> - <message> <source>Please check that your computer's date and time are correct! If your clock is wrong, %s will not work properly.</source> <translation>Prosím skontrolujte systémový čas a dátum. Keď je váš čas nesprávny, %s nebude fungovať správne.</translation> </message> @@ -3243,22 +3157,6 @@ <translation>Keď si myslíte, že %s je užitočný, podporte nás. Pre viac informácií o software navštívte %s.</translation> </message> <message> - <source>Query for peer addresses via DNS lookup, if low on addresses (default: 1 unless -connect used)</source> - <translation>Pri nedostatku adries získať ďalších peerov z DNS (predvolené: 1, ak nie je použité -connect)</translation> - </message> - <message> - <source>Reduce storage requirements by enabling pruning (deleting) of old blocks. This allows the pruneblockchain RPC to be called to delete specific blocks, and enables automatic pruning of old blocks if a target size in MiB is provided. This mode is incompatible with -txindex and -rescan. Warning: Reverting this setting requires re-downloading the entire blockchain. (default: 0 = disable pruning blocks, 1 = allow manual pruning via RPC, >%u = automatically prune block files to stay under the specified target size in MiB)</source> - <translation>Obmedziť nároky na úložný priestor prerezáváním (mazaním) starých blokov. Táto volba tiež umožní použiť RPC volanie pruneblockchain na zmazanie konkrétnych blokov a ďalej automatické prerezávanie starých blokov, ak je zadána cieľová velikosť súborov z blokmi v MiB. Tento režim nie je zlúčiteľný s -txindex ani -rescan. Upozornenie: opätovná zmena tohoto nastavenia bude vyžadovať nové stiahnutie celého reťazca blokov. (predvolené: 0 = bloky neprerezávať, 1 = povoliť ručné prerezávanie cez RPC, >%u = automatické prerezávanie blokov tak, aby bola udržaná cieľová velikosť súborov s blokmi v MiB)</translation> - </message> - <message> - <source>Set lowest fee rate (in %s/kB) for transactions to be included in block creation. (default: %s)</source> - <translation>Nastaviť nejnižší akceptovateľný poplatok (v %s/kB) pre transakcie, ktoré majú byť zahrnutý do nových blokov. (predvolené: %s)</translation> - </message> - <message> - <source>Set the number of script verification threads (%u to %d, 0 = auto, <0 = leave that many cores free, default: %d)</source> - <translation>Nastaviť počeť vlákien overujúcich skripty (%u až %d, 0 = auto, <0 = nechať toľkoto jadier voľných, prednastavené: %d)</translation> - </message> - <message> <source>The block database contains a block which appears to be from the future. This may be due to your computer's date and time being set incorrectly. Only rebuild the block database if you are sure that your computer's date and time are correct</source> <translation>Databáza blokov obsahuje blok, ktorý vyzerá byť z budúcnosti. Toto môže byť spôsobené nesprávnym systémovým časom vášho počítača. Obnovujte databázu blokov len keď ste si istý, že systémový čas je nastavený správne.</translation> </message> @@ -3279,18 +3177,6 @@ <translation>Nedará sa vrátiť databázu do stavu pred rozdelením. Budete musieť znovu stiahnuť celý reťaztec blokov</translation> </message> <message> - <source>Use UPnP to map the listening port (default: 1 when listening and no -proxy)</source> - <translation>Skúsiť použiť UPnP pre mapovanie počúvajúceho portu (predvolené: 1 počas počúvania a bez -proxy)</translation> - </message> - <message> - <source>Username and hashed password for JSON-RPC connections. The field <userpw> comes in the format: <USERNAME>:<SALT>$<HASH>. A canonical python script is included in share/rpcuser. The client then connects normally using the rpcuser=<USERNAME>/rpcpassword=<PASSWORD> pair of arguments. This option can be specified multiple times</source> - <translation>Užívateľské meno a zahašované heslo pre JSON-RPC spojenie. Pole <userpw> má formát: <USERNAME>:<SALT>$<HASH>. Pomocný python skript je priložený v share/rpcuser. Klient sa potom už pripojuje normálne pomocou páru argumentov rpcuser=<USERNAME>/rpcpassword=<PASSWORD>. Túto voľbu môžete použiť i viackrát</translation> - </message> - <message> - <source>Wallet will not create transactions that violate mempool chain limits (default: %u)</source> - <translation>Peňaženka nebude vytvárať transakcie, ktoré by porušovali limity transakčného zásobníku reťazcov (predvolené: %u)</translation> - </message> - <message> <source>Warning: The network does not appear to fully agree! Some miners appear to be experiencing issues.</source> <translation>Varovanie: Javí sa že sieť sieť úplne nesúhlasí! Niektorí mineri zjavne majú ťažkosti.</translation> </message> @@ -3299,10 +3185,6 @@ <translation>Varovanie: Zjavne sa úplne nezhodujeme s našimi peer-mi! Možno potrebujete prejsť na novšiu verziu alebo ostatné uzly potrebujú vyššiu verziu.</translation> </message> <message> - <source>Whether to save the mempool on shutdown and load on restart (default: %u)</source> - <translation>Či uchovať transakčný zásobník medzi vypnutím a zapnutím (predvolené: %u)</translation> - </message> - <message> <source>%d of last 100 blocks have unexpected version</source> <translation>%d z poslednźých 100 blokov má neočakávanú verziu</translation> </message> @@ -3315,42 +3197,14 @@ <translation>-maxmempool musí byť najmenej %d MB</translation> </message> <message> - <source><category> can be:</source> - <translation><category> môže byť:</translation> - </message> - <message> - <source>Accept connections from outside (default: 1 if no -proxy or -connect)</source> - <translation>Prijať spojenia zvonku (predvolené: 1 ak žiadne -proxy alebo -connect)</translation> - </message> - <message> - <source>Append comment to the user agent string</source> - <translation>Pripojiť komentár k typu klienta</translation> - </message> - <message> - <source>Attempt to recover private keys from a corrupt wallet on startup</source> - <translation>Pokúsiť sa o obnovenie privátnych kľúčov z poškodenej peňaženky pri spustení</translation> - </message> - <message> - <source>Block creation options:</source> - <translation>Voľby vytvorenia bloku:</translation> - </message> - <message> <source>Cannot resolve -%s address: '%s'</source> <translation>Nedá preložiť -%s adresu: '%s'</translation> </message> <message> - <source>Chain selection options:</source> - <translation>Možnosti výberu reťzca blokov:</translation> - </message> - <message> <source>Change index out of range</source> <translation>Menný index mimo rozsah</translation> </message> <message> - <source>Connection options:</source> - <translation>Možnosti pripojenia:</translation> - </message> - <message> <source>Copyright (C) %i-%i</source> <translation>Copyright (C) %i-%i</translation> </message> @@ -3359,38 +3213,10 @@ <translation>Zistená poškodená databáza blokov</translation> </message> <message> - <source>Debugging/Testing options:</source> - <translation>Možnosti ladenia/testovania:</translation> - </message> - <message> - <source>Do not load the wallet and disable wallet RPC calls</source> - <translation>Nenahrat peňaženku a zablokovať volania RPC.</translation> - </message> - <message> <source>Do you want to rebuild the block database now?</source> <translation>Chcete znovu zostaviť databázu blokov?</translation> </message> <message> - <source>Enable publish hash block in <address></source> - <translation>Povoliť zverejneneie hash blokov pre <address></translation> - </message> - <message> - <source>Enable publish hash transaction in <address></source> - <translation>Povoliť zverejnenie hash transakcií pre <address></translation> - </message> - <message> - <source>Enable publish raw block in <address></source> - <translation>Povoliť zverejnenie raw bloku pre <address></translation> - </message> - <message> - <source>Enable publish raw transaction in <address></source> - <translation>Povoliť publikovať hrubý prevod v <address></translation> - </message> - <message> - <source>Enable transaction replacement in the memory pool (default: %u)</source> - <translation>Povoliť výmenu transakcií v transakčnom zásobníku (predvolené: %u)</translation> - </message> - <message> <source>Error creating %s: You can't create non-HD wallets with this version.</source> <translation>Chyba počas vytvárania %s: S touto verziou nemôžete vytvoriť ne-HD peňaženky.</translation> </message> @@ -3431,6 +3257,10 @@ <translation>Chyba počúvania na ktoromkoľvek porte. Použi -listen=0 ak toto chcete.</translation> </message> <message> + <source>Failed to rescan the wallet during initialization</source> + <translation>Počas inicializácie sa nepodarila pre-skenovať peňaženka</translation> + </message> + <message> <source>Importing...</source> <translation>Prebieha import ...</translation> </message> @@ -3455,8 +3285,8 @@ <translation>Neplatná suma pre -fallbackfee=<amount>: '%s'</translation> </message> <message> - <source>Keep the transaction memory pool below <n> megabytes (default: %u)</source> - <translation>Udržovať zasobník transakcií menší než <n> megabajtov (predvolené: %u)</translation> + <source>Upgrading txindex database</source> + <translation>Inovuje sa txindex databáza</translation> </message> <message> <source>Loading P2P addresses...</source> @@ -3467,26 +3297,10 @@ <translation>Načítavam banlist...</translation> </message> <message> - <source>Location of the auth cookie (default: data dir)</source> - <translation>Umiestnenie overovacieho cookie súboru (predvolená: Priečinok s dátami)</translation> - </message> - <message> <source>Not enough file descriptors available.</source> <translation>Nedostatok kľúčových slov súboru.</translation> </message> <message> - <source>Only connect to nodes in network <net> (ipv4, ipv6 or onion)</source> - <translation>Pripojiť iba k uzlom v sieti <net> (ipv4, ipv6, alebo onion)</translation> - </message> - <message> - <source>Print this help message and exit</source> - <translation>Vytlačiť túto pomocnú správu a ukončiť</translation> - </message> - <message> - <source>Print version and exit</source> - <translation>Vytlačiť verziu a ukončiť</translation> - </message> - <message> <source>Prune cannot be configured with a negative value.</source> <translation>Redukovanie nemôže byť nastavené na zápornú hodnotu.</translation> </message> @@ -3495,14 +3309,6 @@ <translation>Redukovanie je nekompatibilné s -txindex.</translation> </message> <message> - <source>Rebuild chain state and block index from the blk*.dat files on disk</source> - <translation>Obnoviť stav reťazca a index blokov zo súborov blk*.dat na disku.</translation> - </message> - <message> - <source>Rebuild chain state from the currently indexed blocks</source> - <translation>Obnoviť stav reťazca z aktuálne indexovaných blokov.</translation> - </message> - <message> <source>Replaying blocks...</source> <translation>Znovu sa aplikujú bloky…</translation> </message> @@ -3511,18 +3317,6 @@ <translation>Vracajú sa bloky dozadu…</translation> </message> <message> - <source>Send transactions with full-RBF opt-in enabled (RPC only, default: %u)</source> - <translation>Posielať transakcie so zapnutým plným RBF (Replace-By-Fee) (iba RPC, predvolené: %u)</translation> - </message> - <message> - <source>Set database cache size in megabytes (%d to %d, default: %d)</source> - <translation>Nastaviť veľkosť pomocnej pamäti databázy v megabajtoch (%d do %d, prednastavené: %d)</translation> - </message> - <message> - <source>Specify wallet file (within data directory)</source> - <translation>Označ súbor peňaženky (v priečinku s dátami)</translation> - </message> - <message> <source>The source code is available from %s.</source> <translation>Zdrojový kód je dostupný z %s</translation> </message> @@ -3535,6 +3329,10 @@ <translation>Nemožné pripojiť k %s na tomto počíťači. %s už pravdepodobne beží.</translation> </message> <message> + <source>Unable to generate keys</source> + <translation>Nepodarilo sa vygenerovať kľúče</translation> + </message> + <message> <source>Unsupported argument -benchmark ignored, use -debug=bench.</source> <translation>Nepodporovaný parameter -benchmark bol ignorovaný, použite -debug=bench.</translation> </message> @@ -3555,14 +3353,6 @@ <translation>Vylepšuje sa databáza neminutých výstupov (UTXO)</translation> </message> <message> - <source>Use UPnP to map the listening port (default: %u)</source> - <translation>Použiť UPnP pre mapovanie počúvajúceho portu (predvolené: %u)</translation> - </message> - <message> - <source>Use the test chain</source> - <translation>Použiť testovaciu sieť</translation> - </message> - <message> <source>User Agent comment (%s) contains unsafe characters.</source> <translation>Komentár u typu klienta (%s) obsahuje riskantné znaky.</translation> </message> @@ -3571,86 +3361,26 @@ <translation>Overujem bloky...</translation> </message> <message> - <source>Wallet debugging/testing options:</source> - <translation>Ladiace / testovacie možnosti peňaženky.</translation> - </message> - <message> <source>Wallet needed to be rewritten: restart %s to complete</source> <translation>Peňaženka musí byť prepísaná: pre dokončenie reštartujte %s</translation> </message> <message> - <source>Wallet options:</source> - <translation>Voľby peňaženky:</translation> - </message> - <message> - <source>Allow JSON-RPC connections from specified source. Valid for <ip> are a single IP (e.g. 1.2.3.4), a network/netmask (e.g. 1.2.3.4/255.255.255.0) or a network/CIDR (e.g. 1.2.3.4/24). This option can be specified multiple times</source> - <translation>Povoliť JSON-RPC pripojenia zo zadaného zdroja. Pre <ip> sú platné jednoduché IP (napr. 1.2.3.4), sieť/netmask (napr. 1.2.3.4/255.255.255.0) alebo sieť/CIDR (napr. 1.2.3.4/24). Táto možnosť môže byť zadaná niekoľko krát</translation> - </message> - <message> - <source>Bind to given address and whitelist peers connecting to it. Use [host]:port notation for IPv6</source> - <translation>Spojiť s danou adresou a povolenými partnerskými zariadeniami ktoré sa tam pripájajú. Použite zápis [host]:port pre IPv6</translation> - </message> - <message> - <source>Create new files with system default permissions, instead of umask 077 (only effective with disabled wallet functionality)</source> - <translation>Vytvoriť nové súbory z predvolenými systémovými právami, namiesto umask 077 (funguje iba z vypnutou funkcionalitou peňaženky)</translation> - </message> - <message> - <source>Discover own IP addresses (default: 1 when listening and no -externalip or -proxy)</source> - <translation>Zisti vlastnú IP adresu (predvolené: 1 pre listen a -externalip alebo -proxy)</translation> - </message> - <message> <source>Error: Listening for incoming connections failed (listen returned error %s)</source> <translation>Chyba: Počúvanie prichádzajúcich spojení zlyhalo (vrátená chyba je %s)</translation> </message> <message> - <source>Execute command when a relevant alert is received or we see a really long fork (%s in cmd is replaced by message)</source> - <translation>Vykonať príkaz po prijatí patričného varovania alebo uvidíme veľmi dlhé rozdvojenie siete (%s v cmd je nahradené správou)</translation> - </message> - <message> - <source>Fees (in %s/kB) smaller than this are considered zero fee for relaying, mining and transaction creation (default: %s)</source> - <translation>Poplatky (v %s/kB) menšie ako toto, sú považované za nulový transakčný poplatok (predvolené: %s)</translation> - </message> - <message> - <source>If paytxfee is not set, include enough fee so transactions begin confirmation on average within n blocks (default: %u)</source> - <translation>Ak nie je nastavené paytxfee, pridať dostatočný poplatok aby sa transakcia začala potvrdzovať priemerne v rámci bloku (predvolené: %u)</translation> - </message> - <message> <source>Invalid amount for -maxtxfee=<amount>: '%s' (must be at least the minrelay fee of %s to prevent stuck transactions)</source> <translation>Neplatná suma pre -maxtxfee=<amount>: '%s' (aby sa transakcia nezasekla, minimálny prenosový poplatok musí byť aspoň %s)</translation> </message> <message> - <source>Maximum size of data in data carrier transactions we relay and mine (default: %u)</source> - <translation>Maximálna veľkosť dát v transakciách nosných dát, ktoré prenášame a ťažíme (predvolené: %u)</translation> - </message> - <message> <source>The transaction amount is too small to send after the fee has been deducted</source> <translation>Suma je príliš malá pre odoslanie transakcie</translation> </message> <message> - <source>Whitelisted peers cannot be DoS banned and their transactions are always relayed, even if they are already in the mempool, useful e.g. for a gateway</source> - <translation>Uzle na zoznam povolených nemôžu byť DoS zakázané a ich transakcie vždy postúpené ďalej, aj v prípade, ak sú už pamäťovej fronte. Užitočné napr. pre brány</translation> - </message> - <message> <source>You need to rebuild the database using -reindex to go back to unpruned mode. This will redownload the entire blockchain</source> <translation>K návratu k neprerezávaciemu režimu je treba prestavať databázu použitím -reindex. Tiež sa znova stiahne celý reťazec blokov</translation> </message> <message> - <source>(default: %u)</source> - <translation>(predvolené: %u)</translation> - </message> - <message> - <source>Accept public REST requests (default: %u)</source> - <translation>Akceptovať verejné REST žiadosti (predvolené: %u)</translation> - </message> - <message> - <source>Automatically create Tor hidden service (default: %d)</source> - <translation>Automaticky vytvoriť skrytú službu Tor (predvolené: %d)</translation> - </message> - <message> - <source>Connect through SOCKS5 proxy</source> - <translation>Pripojiť cez proxy server SOCKS5</translation> - </message> - <message> <source>Error loading %s: You can't disable HD on an already existing HD wallet</source> <translation>Chyba pri načítání %s: nemôžeš vypnúť HD u existujúcej HD peňaženky</translation> </message> @@ -3663,10 +3393,6 @@ <translation>Chyba pri vylepšení databáze reťzcov blokov</translation> </message> <message> - <source>Imports blocks from external blk000??.dat file on startup</source> - <translation>Importovať bloky z externého súboru blk000??.dat pri štarte</translation> - </message> - <message> <source>Information</source> <translation>Informácia</translation> </message> @@ -3687,42 +3413,14 @@ <translation>Nadaná neplatná netmask vo -whitelist: '%s'</translation> </message> <message> - <source>Keep at most <n> unconnectable transactions in memory (default: %u)</source> - <translation>V pamäti udržiavať najviac <n> nepotvrdených transakcií (predvolené: %u)</translation> - </message> - <message> <source>Need to specify a port with -whitebind: '%s'</source> <translation>Je potrebné zadať port s -whitebind: '%s'</translation> </message> <message> - <source>Node relay options:</source> - <translation>Prenosové možnosti uzla:</translation> - </message> - <message> - <source>RPC server options:</source> - <translation>Možnosti servra RPC:</translation> - </message> - <message> <source>Reducing -maxconnections from %d to %d, because of system limitations.</source> <translation>Obmedzuje sa -maxconnections z %d na %d kvôli systémovým obmedzeniam.</translation> </message> <message> - <source>Rescan the block chain for missing wallet transactions on startup</source> - <translation>Pri spustení skontrolovať reťaz blokov pre chýbajúce transakcie peňaženky</translation> - </message> - <message> - <source>Send trace/debug info to console instead of debug.log file</source> - <translation>Odoslať trace/debug informácie na konzolu namiesto debug.info žurnálu</translation> - </message> - <message> - <source>Show all debugging options (usage: --help -help-debug)</source> - <translation>Zobraziť všetky možnosti ladenia (použitie: --help --help-debug)</translation> - </message> - <message> - <source>Shrink debug.log file on client startup (default: 1 when no -debug)</source> - <translation>Zmenšiť debug.log pri spustení klienta (predvolené: 1 ak bez -debug)</translation> - </message> - <message> <source>Signing transaction failed</source> <translation>Podpísanie správy zlyhalo</translation> </message> @@ -3739,6 +3437,12 @@ <translation>Uvedený -walletdir "%s" nie je priečinok</translation> </message> <message> + <source>Specified blocks directory "%s" does not exist. +</source> + <translation>Uvedený priečinok s dátami "%s" neexistuje. +</translation> + </message> + <message> <source>The transaction amount is too small to pay the fee</source> <translation>Suma transakcie je príliš malá na zaplatenie poplatku</translation> </message> @@ -3747,14 +3451,6 @@ <translation>Toto je experimentálny softvér.</translation> </message> <message> - <source>Tor control port password (default: empty)</source> - <translation>Heslo na kontrolu portu pre Tor (predvolené: žiadne)</translation> - </message> - <message> - <source>Tor control port to use if onion listening enabled (default: %s)</source> - <translation>Ovládací port Toru, ak je zapnuté onion počúvanie (predvolené: %s)</translation> - </message> - <message> <source>Transaction amount too small</source> <translation>Suma transakcie príliš malá</translation> </message> @@ -3775,14 +3471,6 @@ <translation>Nepodarilo sa vygenerovať úvodné kľúče</translation> </message> <message> - <source>Upgrade wallet to latest format on startup</source> - <translation>Aktualizovať peňaženku na posledný formát pri štarte</translation> - </message> - <message> - <source>Username for JSON-RPC connections</source> - <translation>Užívateľské meno pre JSON-RPC spojenia</translation> - </message> - <message> <source>Verifying wallet(s)...</source> <translation>Kontrolujem peňaženku(y)…</translation> </message> @@ -3799,110 +3487,18 @@ <translation>Upozornenie: aktivovaná neznáme nové pravidlá (verzový bit %i)</translation> </message> <message> - <source>Whether to operate in a blocks only mode (default: %u)</source> - <translation>Či fungovat iba v čistom blokovom režime (predvolené: %u)</translation> - </message> - <message> - <source>You need to rebuild the database using -reindex to change -txindex</source> - <translation>Je teeba prestavať databázu použitím -reindex, aby bolo možné zmeniť -txindex</translation> - </message> - <message> <source>Zapping all transactions from wallet...</source> <translation>Zmazať všetky transakcie z peňaženky...</translation> </message> <message> - <source>ZeroMQ notification options:</source> - <translation>Možnosti pripojenia ZeroMQ:</translation> - </message> - <message> - <source>Password for JSON-RPC connections</source> - <translation>Heslo pre JSON-rPC spojenia</translation> - </message> - <message> - <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> - <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> - <source>(1 = keep tx meta data e.g. account owner and payment request information, 2 = drop tx meta data)</source> - <translation>(1 = zachovať metaúdaje tx napr. vlastníka účtu a informácie o platobných príkazoch, 2 = zahodiť metaúdaje tx)</translation> - </message> - <message> <source>-maxtxfee is set very high! Fees this large could be paid on a single transaction.</source> <translation>-maxtxfee je nastavené veľmi vysoko! Takto vysoký poplatok môže byť zaplatebý v jednej transakcii.</translation> </message> <message> - <source>Bind to given address to listen for JSON-RPC connections. This option is ignored unless -rpcallowip is also passed. Port is optional and overrides -rpcport. Use [host]:port notation for IPv6. This option can be specified multiple times (default: 127.0.0.1 and ::1 i.e., localhost, or if -rpcallowip has been specified, 0.0.0.0 and :: i.e., all addresses)</source> - <translation>Čakať na zadanej adrese na JSON-RPC spojenie. Táto volba sa ignoruje, ak súčastne nezadáš aj volbu -rpcallowip. Port je voliteľný a má prednosť pred -rpcport. Pre zápis IPv6 adresy použite notáciu [adresa]:port. Túto volbu je možné použiť i viackrát (predvolené: 127.0.0.1 a ::1, tzn. localhost, alebo ak je zadané -rpcallowip, tak 0.0.0.0 a ::, tzn. všetky adresy)</translation> - </message> - <message> - <source>Do not keep transactions in the mempool longer than <n> hours (default: %u)</source> - <translation>Nedržať transakcie v zásobníku dlhšie ako <n> hodín (predvolené: %u)</translation> - </message> - <message> - <source>Equivalent bytes per sigop in transactions for relay and mining (default: %u)</source> - <translation>Ekvivalent bajtov za každý sigop v transakciach pre účely preposielania a ťaženia (predvolené: %u)</translation> - </message> - <message> <source>Error loading %s: You can't enable HD on an already existing non-HD wallet</source> <translation>Chyba pri načítaní %s: nemôžeš zapnúť HD u existujúcej nie-HD peňaženky</translation> </message> <message> - <source>Error loading wallet %s. -wallet parameter must only specify a filename (not a path).</source> - <translation>Chyba pri načítaní peňaženky %s. Parameter -wallet môže obsahovať iba názov súboru (nie cestu k nemu).</translation> - </message> - <message> - <source>Fees (in %s/kB) smaller than this are considered zero fee for transaction creation (default: %s)</source> - <translation>Poplatky (v %s/kB) menšie ako toto, sú považované za nulový transakčný poplatok (predvolené: %s)</translation> - </message> - <message> - <source>Force relay of transactions from whitelisted peers even if they violate local relay policy (default: %d)</source> - <translation>Vynútiť preposíelanie transakcií od vždy vítaných peerov, aj keď porušujú míestne zásady pre preposielanie (predvolené: %d)</translation> - </message> - <message> - <source>How thorough the block verification of -checkblocks is (0-4, default: %u)</source> - <translation>Ako dôkladné je -checkblocks overenie blokov (0-4, predvolené: %u)</translation> - </message> - <message> - <source>Maintain a full transaction index, used by the getrawtransaction rpc call (default: %u)</source> - <translation>Udržiavať kompletný transakčný index, využíva getrawtransaction rpc volanie (predvolené: %u)</translation> - </message> - <message> - <source>Number of seconds to keep misbehaving peers from reconnecting (default: %u)</source> - <translation>Počet sekúnd, počas ktorých nepripájať zle správajúce sa uzle (predvolené: %u)</translation> - </message> - <message> - <source>Output debugging information (default: %u, supplying <category> is optional)</source> - <translation>Výstupné ladiace informácie (predvolené: %u, dodanie <category> je voliteľné)</translation> - </message> - <message> - <source>Set maximum BIP141 block weight to this * 4. Deprecated, use blockmaxweight</source> - <translation>Nastaviť maximálnu váhu bloku pre BIP141 na toto * 4. Zastaralé, použite blockmaxweight</translation> - </message> - <message> - <source>Sets the serialization of raw transaction or block hex returned in non-verbose mode, non-segwit(0) or segwit(1) (default: %d)</source> - <translation>Nastaví serializáciu nespracovaných transakcií alebo bloov, ak sú vrátené v nehovoriacom móde: nie-segwit (0) alebo segwit (1) (predvolené: %d)</translation> - </message> - <message> - <source>Specify directory to hold wallets (default: <datadir>/wallets if it exists, otherwise <datadir>)</source> - <translation>Určiť cestu pre peňaženky (predvolená: <datadir>/wallets ak existuje, inak <datadir>)</translation> - </message> - <message> - <source>Specify location of debug log file: this can be an absolute path or a path relative to the data directory (default: %s)</source> - <translation>Zadajte cestu k súboru debug.log: tá môže byť buď absolútna alebo relatívna ku priečinku s dátami (predvolená: %s)</translation> - </message> - <message> - <source>Support filtering of blocks and transaction with bloom filters (default: %u)</source> - <translation>Umožniť filtrovanie blokov a transakcií pomocou Bloom filtra (predvolené: %u)</translation> - </message> - <message> - <source>The fee rate (in %s/kB) that indicates your tolerance for discarding change by adding it to the fee (default: %s). Note: An output is discarded if it is dust at this rate, but we will always discard up to the dust relay fee and a discard fee above that is limited by the fee estimate for the longest target</source> - <translation>Sadzba poplatku (v %s/kB), ktorá určuje Vašu ochotu v prípade potreby premeniť drobné v poplatok (predvolené: %s). Poznámka: výstup sa premení, ak sa pri tejto sadzbe zmení v prach. Každopádne meniť budeme do výške poplatku pre prenos prachu a premenený poplatok nad túto výšku bude obmedzený odhadom poplatku na nejdlhší čas</translation> - </message> - <message> <source>This is the transaction fee you may pay when fee estimates are not available.</source> <translation>Toto je poplatok za transakciu keď odhad poplatkov ešte nie je k dispozícii.</translation> </message> @@ -3915,10 +3511,6 @@ <translation>Celková dĺžka verzie sieťového reťazca (%i) prekračuje maximálnu dĺžku (%i). Znížte počet a veľkosť komentárov.</translation> </message> <message> - <source>Tries to keep outbound traffic under the given target (in MiB per 24h), 0 = no limit (default: %d)</source> - <translation>Sa snaží držať odchádzajúce prevádzku v rámci daného cieľa (v MB za 24h), 0 = žiadny limit (predvolený: %d)</translation> - </message> - <message> <source>Unsupported argument -socks found. Setting SOCKS version isn't possible anymore, only SOCKS5 proxies are supported.</source> <translation>Nepodporovaný argument -socks nájdený. Nastavenie SOCKS verzie už nie je viac moźné, iba SOCKS5 proxies sú podporované.</translation> </message> @@ -3927,10 +3519,6 @@ <translation>Nepodporovaný argument -whitelistalwaysrelay ignorovaný, použite -whitelistrelay a/alebo -whitelistforcerelay.</translation> </message> <message> - <source>Use separate SOCKS5 proxy to reach peers via Tor hidden services (default: %s)</source> - <translation>Použiť samostatný SOCKS5 proxy server na dosiahnutie počítačov cez skryté služby Tor (predvolené: %s)</translation> - </message> - <message> <source>Warning: Unknown block versions being mined! It's possible unknown rules are in effect</source> <translation>Varovanie: Neznáma verzia blokov sa doluje! Je možné, že neznáme pravidlá majú efekt</translation> </message> @@ -3939,110 +3527,18 @@ <translation>Varovanie: Peňaženka poškodená, dáta boli zachránené! Originálna %s ako %s v %s; ak váš zostatok alebo transakcie sú nesprávne, mali by ste obnoviť zálohu.</translation> </message> <message> - <source>Whitelist peers connecting from the given IP address (e.g. 1.2.3.4) or CIDR notated network (e.g. 1.2.3.0/24). Can be specified multiple times.</source> - <translation>Povoliť partnerov pripájajúcich sa z danej IP adresy (napr. 1.2.3.4) alebo zo siete vo formáte CIDR (napr. 1.2.3.0/24). Môže byť zadané viackrát.</translation> - </message> - <message> <source>%s is set very high!</source> <translation>Hodnota %s je nastavená veľmi vysoko!</translation> </message> <message> - <source>(default: %s)</source> - <translation>(predvolené: %s)</translation> - </message> - <message> - <source>Always query for peer addresses via DNS lookup (default: %u)</source> - <translation>Vždy sa dotazovať adresy partnerských uzlov cez vyhľadávanie DNS (predvolené: %u)</translation> - </message> - <message> - <source>Error loading wallet %s. -wallet filename must be a regular file.</source> - <translation>Chyba pri načítaní peňaženky %s. -wallet musí byť obyčajný súbor.</translation> - </message> - <message> <source>Error loading wallet %s. Duplicate -wallet filename specified.</source> <translation>Chyba pri načítaní peňaženky %s. Zadaný duplicitný názov súboru -wallet.</translation> </message> <message> - <source>Error loading wallet %s. Invalid characters in -wallet filename.</source> - <translation>Chyba pri načítaní peňaženky %s. Neplatné znaky v názvu souboru -wallet.</translation> - </message> - <message> - <source>How many blocks to check at startup (default: %u, 0 = all)</source> - <translation>Koľko blokov overiť pri spustení (predvolené: %u, 0 = všetky)</translation> - </message> - <message> - <source>Include IP addresses in debug output (default: %u)</source> - <translation>Zahrnúť IP adresy v ladiacom výstupe (predvolené: %u)</translation> - </message> - <message> <source>Keypool ran out, please call keypoolrefill first</source> <translation>Vyčerpal sa zásobník kľúčov, zavolať najskôr keypoolrefill</translation> </message> <message> - <source>Listen for JSON-RPC connections on <port> (default: %u or testnet: %u)</source> - <translation>Počúvať JSON-RPC pripojenia na <port> (predvolené: %u alebo testovacia sieť: %u)</translation> - </message> - <message> - <source>Listen for connections on <port> (default: %u or testnet: %u)</source> - <translation>Počúvať pripojenia na <port> (predvolené: %u alebo testovacia sieť: %u)</translation> - </message> - <message> - <source>Maintain at most <n> connections to peers (default: %u)</source> - <translation>Udržiavať najviac <n> spojení s inými počítačmi (predvolené: %u)</translation> - </message> - <message> - <source>Make the wallet broadcast transactions</source> - <translation>Vysielať transakcie z peňaženky</translation> - </message> - <message> - <source>Maximum per-connection receive buffer, <n>*1000 bytes (default: %u)</source> - <translation>Maximálna prijímajúca medzipamäť pre pripojenie, <n>*1000 bajtov (predvolené: %u)</translation> - </message> - <message> - <source>Maximum per-connection send buffer, <n>*1000 bytes (default: %u)</source> - <translation>Maximálna odosielajúca medzipamäť pre pripojenie, <n>*1000 bajtov (predvolené: %u)</translation> - </message> - <message> - <source>Prepend debug output with timestamp (default: %u)</source> - <translation>Na začiatok pripojiť časovú známku k ladiacemu výstupu (predvolené: %u)</translation> - </message> - <message> - <source>Relay and mine data carrier transactions (default: %u)</source> - <translation>Prenášať a ťažiť transakcie nosných dát (predvolené: %u)</translation> - </message> - <message> - <source>Relay non-P2SH multisig (default: %u)</source> - <translation>Prenášať non-P2SH multi-podpis (predvolené: %u)</translation> - </message> - <message> - <source>Set key pool size to <n> (default: %u)</source> - <translation>Nastaviť veľkosť kľúča fronty na <n> (predvolené: %u)</translation> - </message> - <message> - <source>Set maximum BIP141 block weight (default: %d)</source> - <translation>Nastaviť maximálnu váhu bloku pre BIP141 (predvolené: %d)</translation> - </message> - <message> - <source>Set the number of threads to service RPC calls (default: %d)</source> - <translation>Nastaviť počet vlákien na obsluhu RPC volaní (predvolené: %d)</translation> - </message> - <message> - <source>Specify configuration file (default: %s)</source> - <translation>Zadať konfiguračný súbor (predvolené: %s)</translation> - </message> - <message> - <source>Specify connection timeout in milliseconds (minimum: 1, default: %d)</source> - <translation>Zadajte časový limit pripojenia v milisekundách (minimum: 1, predvolené: %d)</translation> - </message> - <message> - <source>Specify pid file (default: %s)</source> - <translation>Zadať pid súbor (predvolené: %s)</translation> - </message> - <message> - <source>Spend unconfirmed change when sending transactions (default: %u)</source> - <translation>Minúť nepotvrdené zmenu pri posielaní transakcií (predvolené: %u)</translation> - </message> - <message> <source>Starting network threads...</source> <translation>Spúšťajú sa sieťové vlákna...</translation> </message> @@ -4059,10 +3555,6 @@ <translation>Toto je poplatok za transakciu pri odoslaní transakcie.</translation> </message> <message> - <source>Threshold for disconnecting misbehaving peers (default: %u)</source> - <translation>Hranica pre odpájanie zle sa správajúcim partnerským uzlom (predvolené: %u)</translation> - </message> - <message> <source>Transaction amounts must not be negative</source> <translation>Sumy transakcií nesmú byť záporné</translation> </message> diff --git a/src/qt/locale/bitcoin_sl_SI.ts b/src/qt/locale/bitcoin_sl_SI.ts index 36e90aae5c..91080a774a 100644 --- a/src/qt/locale/bitcoin_sl_SI.ts +++ b/src/qt/locale/bitcoin_sl_SI.ts @@ -30,6 +30,10 @@ <translation>Izbriši trenutno označeni naslov iz seznama</translation> </message> <message> + <source>Enter address or label to search</source> + <translation>Iščite po naslovu ali oznaki</translation> + </message> + <message> <source>Export the data in the current tab to a file</source> <translation>Izvozi podatke v trenutnem zavihku v datoteko</translation> </message> @@ -62,10 +66,34 @@ <translation>Imenik naslovov za prejemanje</translation> </message> <message> + <source>These are your Bitcoin addresses for sending payments. Always check the amount and the receiving address before sending coins.</source> + <translation>To so vaši Bitcoin naslovi za pošiljanje. Pred pošiljanjem vedno preverite količino in prejemnikov naslov.</translation> + </message> + <message> + <source>These are your Bitcoin addresses for receiving payments. It is recommended to use a new receiving address for each transaction.</source> + <translation>To so vaši Bitcoin naslovi za prejemanje. Priporočeno je, da za vsako transakcijo uporabite nov naslov.</translation> + </message> + <message> + <source>&Copy Address</source> + <translation>&Kopiraj naslov</translation> + </message> + <message> + <source>Copy &Label</source> + <translation>Kopiraj &oznako</translation> + </message> + <message> + <source>&Edit</source> + <translation>&Uredi</translation> + </message> + <message> <source>Export Address List</source> <translation>Izvozi seznam naslovov</translation> </message> <message> + <source>Comma separated file (*.csv)</source> + <translation>Podatki ločenimi z vejico (*.csv)</translation> + </message> + <message> <source>Exporting Failed</source> <translation>Podatkov ni bilo mogoče izvoziti.</translation> </message> @@ -104,14 +132,98 @@ <translation>Ponovite novo geslo</translation> </message> <message> + <source>Show password</source> + <translation>Pokaži geslo</translation> + </message> + <message> + <source>Enter the new passphrase to the wallet.<br/>Please use a passphrase of <b>ten or more random characters</b>, or <b>eight or more words</b>.</source> + <translation>Vnesite novo geslo za dostop do denarnice. Prosimo, da uporabite geslo sestavljeno iz <b>desetih ali več</b> naključnih znakov ali <b>osmih ali večih</b> besed.</translation> + </message> + <message> + <source>Encrypt wallet</source> + <translation>Šifriraj denarnico</translation> + </message> + <message> + <source>This operation needs your wallet passphrase to unlock the wallet.</source> + <translation>To dejanje zahteva geslo za odklepanje vaše denarnice.</translation> + </message> + <message> <source>Unlock wallet</source> <translation>Odkleni denarnico</translation> </message> <message> + <source>This operation needs your wallet passphrase to decrypt the wallet.</source> + <translation>To dejanje zahteva geslo za dešifriranje vaše denarnice.</translation> + </message> + <message> <source>Decrypt wallet</source> <translation>Odšifriraj denarnico</translation> </message> - </context> + <message> + <source>Change passphrase</source> + <translation>Spremeni geslo</translation> + </message> + <message> + <source>Enter the old passphrase and new passphrase to the wallet.</source> + <translation>Vnesite staro in novo geslo denarnice.</translation> + </message> + <message> + <source>Confirm wallet encryption</source> + <translation>Potrdi šifriranje denarnice</translation> + </message> + <message> + <source>Warning: If you encrypt your wallet and lose your passphrase, you will <b>LOSE ALL OF YOUR BITCOINS</b>!</source> + <translation>Opozorilo: V primeru izgube gesla šifrirane denarnice, boste <b>IZGUBILI VSE SVOJE BITCOINE</b>!</translation> + </message> + <message> + <source>Are you sure you wish to encrypt your wallet?</source> + <translation>Ali ste prepričani, da želite šifrirati svojo denarnico?</translation> + </message> + <message> + <source>Wallet encrypted</source> + <translation>Denarnica šifrirana</translation> + </message> + <message> + <source>%1 will close now to finish the encryption process. Remember that encrypting your wallet cannot fully protect your bitcoins from being stolen by malware infecting your computer.</source> + <translation>%1 se bo zaprl, da bi dokončal postopek šifriranja. Zapomnite si, da šifriranje vaše denarnice vaših ne more popolnoma zaščititi vaših bitcoinov pred krajami zlonamernih programov, ki bi lahko bili nameščeni na vašem računalniku.</translation> + </message> + <message> + <source>IMPORTANT: Any previous backups you have made of your wallet file should be replaced with the newly generated, encrypted wallet file. For security reasons, previous backups of the unencrypted wallet file will become useless as soon as you start using the new, encrypted wallet.</source> + <translation>POMEMBNO: Vse starejše varnostne kopije denarnice je potrebno zamenjati z novoizdelano, šifrirano, varnostno kopijo. Zaradi varnosti bodo stare varnostne kopije postale neuporabne takoj, ko začnete uporabljati novo, šifrirano denarnico.</translation> + </message> + <message> + <source>Wallet encryption failed</source> + <translation>Šifriranje denarnice ni uspelo</translation> + </message> + <message> + <source>Wallet encryption failed due to an internal error. Your wallet was not encrypted.</source> + <translation>Šifriranje denarnice ni uspelo zaradi notranje napake. Vaša denarnica ni bila šifrirana.</translation> + </message> + <message> + <source>The supplied passphrases do not match.</source> + <translation>Navedeni gesli se ne ujemata.</translation> + </message> + <message> + <source>Wallet unlock failed</source> + <translation>Denarnice ni bilo mogoče odkleniti.</translation> + </message> + <message> + <source>The passphrase entered for the wallet decryption was incorrect.</source> + <translation>Geslo za dešifriranje denarnice, ki ste ga vnesli, ni pravilno.</translation> + </message> + <message> + <source>Wallet decryption failed</source> + <translation>Dešifriranje denarnice ni uspelo</translation> + </message> + <message> + <source>Wallet passphrase was successfully changed.</source> + <translation>Geslo za dostop do denarnice je bilo uspešno spremenjeno.</translation> + </message> + <message> + <source>Warning: The Caps Lock key is on!</source> + <translation>Opozorilo: Vključena je tipka Caps Lock!</translation> + </message> +</context> <context> <name>BanTableModel</name> <message> @@ -162,6 +274,14 @@ <translation>Ustavite program</translation> </message> <message> + <source>&About %1</source> + <translation>&O nas%1</translation> + </message> + <message> + <source>Show information about %1</source> + <translation>Prikaži informacije o %1</translation> + </message> + <message> <source>About &Qt</source> <translation>O &Qt</translation> </message> @@ -174,6 +294,10 @@ <translation>&Možnosti ...</translation> </message> <message> + <source>Modify configuration options for %1</source> + <translation>Spremeni možnosti konfiguracije za %1</translation> + </message> + <message> <source>&Encrypt Wallet...</source> <translation>&Šifriraj denarnico ...</translation> </message> @@ -198,10 +322,38 @@ <translation>Odpri &URI ...</translation> </message> <message> + <source>Wallet:</source> + <translation>Denarnica:</translation> + </message> + <message> + <source>default wallet</source> + <translation>privzeta denarnica</translation> + </message> + <message> + <source>Click to disable network activity.</source> + <translation>Kliknite, da onemogočite omrežno aktivnosti.</translation> + </message> + <message> + <source>Network activity disabled.</source> + <translation>Omrežna aktivnost onemogočena.</translation> + </message> + <message> + <source>Click to enable network activity again.</source> + <translation>Kliknite, da ponovno vključite omrežno aktivnost.</translation> + </message> + <message> + <source>Syncing Headers (%1%)...</source> + <translation>Sinhronizacija glav (%1%)...</translation> + </message> + <message> <source>Reindexing blocks on disk...</source> <translation>Poustvarjam kazalo blokov na disku ...</translation> </message> <message> + <source>Proxy is <b>enabled</b>: %1</source> + <translation>Namestniški strežnik je omogočen</b>: %1</translation> + </message> + <message> <source>Send coins to a Bitcoin address</source> <translation>Izvedite plačilo na naslov Bitcoin</translation> </message> @@ -535,27 +687,7 @@ <source>Command-line options</source> <translation>Možnosti ukazne vrstice</translation> </message> - <message> - <source>Usage:</source> - <translation>Uporaba:</translation> - </message> - <message> - <source>command-line options</source> - <translation>možnosti ukazne vrstice</translation> - </message> - <message> - <source>UI Options:</source> - <translation>UI možnosti:</translation> - </message> - <message> - <source>Set language, for example "de_DE" (default: system locale)</source> - <translation>Nastavi jezik, na primer "sl_SI" (privzeto: sistemsko)</translation> - </message> - <message> - <source>Start minimized</source> - <translation>Začni minimizirano</translation> - </message> - </context> +</context> <context> <name>Intro</name> <message> @@ -1117,6 +1249,10 @@ <translation>Počisti konzolo</translation> </message> <message> + <source>default wallet</source> + <translation>privzeta denarnica</translation> + </message> + <message> <source>via %1</source> <translation>preko %1</translation> </message> @@ -1234,6 +1370,10 @@ <source>Label</source> <translation>Oznaka</translation> </message> + <message> + <source>Wallet</source> + <translation>Denarnica</translation> + </message> </context> <context> <name>RecentRequestsTableModel</name> @@ -1317,10 +1457,6 @@ <translation>na KiB</translation> </message> <message> - <source>If the custom fee is set to 1000 satoshis and the transaction is only 250 bytes, then "per kilobyte" only pays 250 satoshis in fee, while "total at least" pays 1000 satoshis. For transactions bigger than a kilobyte both pay by kilobyte.</source> - <translation>Če je nastavitev zneska provizije po meri enaka 1000 satoshijev, transakcija pa je velika samo 250 bajtov, je obračunani znesek provizije pri nastavitvi "za KiB" samo 250 satoshijev, medtem ko je pri nastavitvi "skupno vsaj" ta znesek 1000 satoshijev. Za transakcije, večje od 1 KiB, se končni znesek pri obeh nastavitvah obračuna na KiB.</translation> - </message> - <message> <source>Hide</source> <translation>Skrij</translation> </message> @@ -1377,6 +1513,10 @@ <translation>&Pošlji</translation> </message> <message> + <source>Transaction fee</source> + <translation>Provizija transakcije</translation> + </message> + <message> <source>(no label)</source> <translation>(brez oznake)</translation> </message> @@ -1595,6 +1735,10 @@ <context> <name>TransactionView</name> <message> + <source>Comma separated file (*.csv)</source> + <translation>Podatki ločenimi z vejico (*.csv)</translation> + </message> + <message> <source>Label</source> <translation>Oznaka</translation> </message> @@ -1630,74 +1774,14 @@ <context> <name>bitcoin-core</name> <message> - <source>Options:</source> - <translation>Možnosti:</translation> - </message> - <message> - <source>Specify data directory</source> - <translation>Izberite podatkovno mapo</translation> - </message> - <message> - <source>Connect to a node to retrieve peer addresses, and disconnect</source> - <translation>Povežite se z vozliščem za pridobitev naslovov soležnikov in nato prekinite povezavo.</translation> - </message> - <message> - <source>Specify your own public address</source> - <translation>Določite vaš lasten javni naslov</translation> - </message> - <message> - <source>Accept command line and JSON-RPC commands</source> - <translation>Sprejemaj ukaze iz ukazne vrstice in preko JSON-RPC</translation> - </message> - <message> - <source>Run in the background as a daemon and accept commands</source> - <translation>Teci v ozadju in sprejemaj ukaze</translation> - </message> - <message> <source>Bitcoin Core</source> <translation>Bitcoin Core</translation> </message> <message> - <source>Bind to given address and always listen on it. Use [host]:port notation for IPv6</source> - <translation>Veži dani naslov in tam vedno poslušaj. Za naslove protokola IPv6 uporabite zapis [gostitelj]:vrata.</translation> - </message> - <message> - <source>Execute command when a wallet transaction changes (%s in cmd is replaced by TxID)</source> - <translation>Izvedi ukaz, ko bo transakcija denarnice se spremenila (V cmd je bil TxID zamenjan za %s)</translation> - </message> - <message> - <source>Set the number of script verification threads (%u to %d, 0 = auto, <0 = leave that many cores free, default: %d)</source> - <translation>Nastavi število niti za preverjanje skript (%u do %d, 0 = samodejno, <0 toliko procesorskih jeder naj ostane prostih, privzeto: %d)</translation> - </message> - <message> - <source><category> can be:</source> - <translation><category> je lahko:</translation> - </message> - <message> - <source>Accept connections from outside (default: 1 if no -proxy or -connect)</source> - <translation>Sprejemaj zunanje povezave (privzeto: 1, razen če ste vklopili opciji -proxy ali -connect)</translation> - </message> - <message> - <source>Block creation options:</source> - <translation>Možnosti ustvarjanja blokov:</translation> - </message> - <message> - <source>Connection options:</source> - <translation>Izbire povezave:</translation> - </message> - <message> <source>Corrupted block database detected</source> <translation>Podatkovna baza blokov je okvarjena</translation> </message> <message> - <source>Debugging/Testing options:</source> - <translation>Možnosti razhroščevanja in testiranja:</translation> - </message> - <message> - <source>Do not load the wallet and disable wallet RPC calls</source> - <translation>Ne naloži denarnice in onemogoči s tem povezane klice RPC</translation> - </message> - <message> <source>Do you want to rebuild the block database now?</source> <translation>Želite zdaj obnoviti podatkovno bazo blokov?</translation> </message> @@ -1738,10 +1822,6 @@ <translation>Na voljo ni dovolj deskriptorjev datotek.</translation> </message> <message> - <source>Only connect to nodes in network <net> (ipv4, ipv6 or onion)</source> - <translation>Povezuj se samo z vozlišči na omrežju tipa <net> (IPv4, IPv6 ali onion)</translation> - </message> - <message> <source>Prune cannot be configured with a negative value.</source> <translation>Negativne vrednosti parametra funkcije obrezovanja niso sprejemljive.</translation> </message> @@ -1750,66 +1830,14 @@ <translation>Funkcija obrezovanja ni združljiva z opcijo -txindex.</translation> </message> <message> - <source>Set database cache size in megabytes (%d to %d, default: %d)</source> - <translation>Nastavitev velikosti predpomnilnik podatkovne baze v MiB (%d do %d, privzeto: %d)</translation> - </message> - <message> - <source>Specify wallet file (within data directory)</source> - <translation>Ime datoteke z denarnico (znotraj podatkovne mape)</translation> - </message> - <message> - <source>Use UPnP to map the listening port (default: %u)</source> - <translation>Uporabi protokol UPnP za preslikavo vrat za poslušanje (privzeto: %u)</translation> - </message> - <message> <source>Verifying blocks...</source> <translation>Preverjam celovitost blokov ...</translation> </message> <message> - <source>Wallet options:</source> - <translation>Izbire denarnice:</translation> - </message> - <message> - <source>Allow JSON-RPC connections from specified source. Valid for <ip> are a single IP (e.g. 1.2.3.4), a network/netmask (e.g. 1.2.3.4/255.255.255.0) or a network/CIDR (e.g. 1.2.3.4/24). This option can be specified multiple times</source> - <translation>Iz navedenega vira dovoli povezave na JSON-RPC. Veljavne oblike vrednosti parametra <ip> so: edinstven naslov IP (npr.: 1.2.3.4), kombinacija omrežje/netmask (npr.: 1.2.3.4/255.255.255.0), ali pa kombinacija omrežje/CIDR (1.2.3.4/24). To opcijo lahko navedete večkrat.</translation> - </message> - <message> - <source>Bind to given address and whitelist peers connecting to it. Use [host]:port notation for IPv6</source> - <translation>Veži dani naslov in sprejemaj povezave samo od navedenih soležnikov. Za naslove protokola IPv6 uporabite zapis [gostitelj]:vrata.</translation> - </message> - <message> - <source>Create new files with system default permissions, instead of umask 077 (only effective with disabled wallet functionality)</source> - <translation>Ustvarjaj nove datoteke s privzetimi sistemskimi dovoljenji, namesto z umask 077. (To pride v poštev samo, kadar imate izklopljeno funkcijo denarnice.)</translation> - </message> - <message> - <source>Discover own IP addresses (default: 1 when listening and no -externalip or -proxy)</source> - <translation>Odkrij svoj naslov IP (privzeto: 1, če poslušate in sta opciji -externalip in -proxy neaktivni)</translation> - </message> - <message> <source>Error: Listening for incoming connections failed (listen returned error %s)</source> <translation>Napaka: Ni mogoče sprejemati dohodnih povezav (vrnjena napaka: %s)</translation> </message> <message> - <source>Execute command when a relevant alert is received or we see a really long fork (%s in cmd is replaced by message)</source> - <translation>Ko bo prejeto ustrezno opozorilo, ali ko bo opažena zelo dolga razvejitev, izvedi navedeni ukazni niz. (Niz %s bo nadomeščen z vsebino sporočila.)</translation> - </message> - <message> - <source>If paytxfee is not set, include enough fee so transactions begin confirmation on average within n blocks (default: %u)</source> - <translation>Če opcija -paytxfee ni nastavljena, nastavi znesek provizije tako visoko, da bodo transakcije potrjene v povprečno n blokih. (privzeto: %u)</translation> - </message> - <message> - <source>Randomize credentials for every proxy connection. This enables Tor stream isolation (default: %u)</source> - <translation>Na vsak posredniški strežnik se prijavi z drugimi naključnimi podatki. Tako je omogočena osamitev tokov v omrežju Tor (privzeto: %u)</translation> - </message> - <message> - <source>(default: %u)</source> - <translation>(privzeto: %u)</translation> - </message> - <message> - <source>Connect through SOCKS5 proxy</source> - <translation>Poveži se preko posredniškega strežnika SOCKS5</translation> - </message> - <message> <source>Information</source> <translation>Informacije</translation> </message> @@ -1818,14 +1846,6 @@ <translation>Pri opciji -whitebind morate navesti vrata: %s</translation> </message> <message> - <source>Send trace/debug info to console instead of debug.log file</source> - <translation>Pošilja sledilne/razhroščevalne informacije na konzolo namesto v datoteko debug.log</translation> - </message> - <message> - <source>Shrink debug.log file on client startup (default: 1 when no -debug)</source> - <translation>Ob zagonu skrajšaj datoteko debug.log (privzeto: 1, če ni vklopljena opcija -debug)</translation> - </message> - <message> <source>Signing transaction failed</source> <translation>Transakcije ni bilo mogoče podpisati.</translation> </message> @@ -1846,10 +1866,6 @@ <translation>Na tem računalniku ni bilo mogoče vezati naslova %s (vrnjena napaka: %s)</translation> </message> <message> - <source>Username for JSON-RPC connections</source> - <translation>Uporabniško ime za povezave na JSON-RPC</translation> - </message> - <message> <source>Warning</source> <translation>Opozorilo</translation> </message> @@ -1858,50 +1874,6 @@ <translation>Brišem vse transakcije iz denarnice ...</translation> </message> <message> - <source>Password for JSON-RPC connections</source> - <translation>Geslo za povezave na JSON-RPC</translation> - </message> - <message> - <source>Execute command when the best block changes (%s in cmd is replaced by block hash)</source> - <translation>Izvedi ukaz, ko je najden najboljši blok (niz %s v ukazu bo zamenjan s hash vrednostjo bloka)</translation> - </message> - <message> - <source>Allow DNS lookups for -addnode, -seednode and -connect</source> - <translation>Omogoči poizvedbe DNS za opcije -addnode, -seednode in -connect.</translation> - </message> - <message> - <source>Use separate SOCKS5 proxy to reach peers via Tor hidden services (default: %s)</source> - <translation>Za dostop do soležnikov preko skritih storitev Tor uporabi drug posredniški strežnik SOCKS5 (privzeto: %s)</translation> - </message> - <message> - <source>(default: %s)</source> - <translation>(privzeto: %s)</translation> - </message> - <message> - <source>Relay non-P2SH multisig (default: %u)</source> - <translation>Posreduj transakcije tipa multisig, ki niso hkrati tipa P2SH. (privzeto: %u)</translation> - </message> - <message> - <source>Specify configuration file (default: %s)</source> - <translation>Za shranjevanje konfiguracije uporabi navedeno datoteko. (privzeto: %s)</translation> - </message> - <message> - <source>Specify connection timeout in milliseconds (minimum: 1, default: %d)</source> - <translation>Vzpostavljanje nove povezave poteče po navedenem št. pretečenih milisekund. (najmanj: 1, privzeto: %d)</translation> - </message> - <message> - <source>Specify pid file (default: %s)</source> - <translation>Za shranjevanje PID uporabi navedeno datoteko. (privzeto: %s)</translation> - </message> - <message> - <source>Spend unconfirmed change when sending transactions (default: %u)</source> - <translation>Pri odlivnih transakcijah omogoči trošenje drobiža iz še nepotrjenih plačil (privzeto: %u)</translation> - </message> - <message> - <source>Threshold for disconnecting misbehaving peers (default: %u)</source> - <translation>Prekini povezavo s soležnikom, ko št. njegovih kazenskih točk preseže navedeni prag. (privzeto: %u)</translation> - </message> - <message> <source>Unknown network specified in -onlynet: '%s'</source> <translation>Neznano omrežje določeno v -onlynet: '%s'.</translation> </message> diff --git a/src/qt/locale/bitcoin_sq.ts b/src/qt/locale/bitcoin_sq.ts index ecffc2df0a..b550f20541 100644 --- a/src/qt/locale/bitcoin_sq.ts +++ b/src/qt/locale/bitcoin_sq.ts @@ -38,6 +38,14 @@ <translation>Zgjidh adresen ku do te dergoni monedhat</translation> </message> <message> + <source>Choose the address to receive coins with</source> + <translation>Zgjidh adresën ku do të merrni monedhat</translation> + </message> + <message> + <source>C&hoose</source> + <translation>Zgjidh</translation> + </message> + <message> <source>Sending addresses</source> <translation>Duke derguar adresen</translation> </message> @@ -101,15 +109,19 @@ <name>AskPassphraseDialog</name> <message> <source>Enter passphrase</source> - <translation>Futni frazkalimin</translation> + <translation>Futni fjalëkalimin</translation> </message> <message> <source>New passphrase</source> - <translation>Frazkalim i ri</translation> + <translation>Fjalëkalimi i ri</translation> </message> <message> <source>Repeat new passphrase</source> - <translation>Përsërisni frazkalimin e ri</translation> + <translation>Përsërisni fjalëkalimin e ri</translation> + </message> + <message> + <source>Show password</source> + <translation>Trego fjalëkalimin</translation> </message> <message> <source>Encrypt wallet</source> @@ -117,11 +129,11 @@ </message> <message> <source>This operation needs your wallet passphrase to unlock the wallet.</source> - <translation>Ky veprim ka nevojë per frazkalimin e portofolit tuaj që të ç'kyç portofolin.</translation> + <translation>Ky veprim ka nevojë per fjalëkalimin e portofolit tuaj që të hapë portofolin.</translation> </message> <message> <source>Unlock wallet</source> - <translation>ç'kyç portofolin.</translation> + <translation>Hap portofolin.</translation> </message> <message> <source>This operation needs your wallet passphrase to decrypt the wallet.</source> @@ -133,7 +145,11 @@ </message> <message> <source>Change passphrase</source> - <translation>Ndrysho frazkalimin</translation> + <translation>Ndrysho fjalëkalimin</translation> + </message> + <message> + <source>Enter the old passphrase and new passphrase to the wallet.</source> + <translation>Fusni fjalëkalimin e vjetër dhe fjalëkalimin e ri që të hapni portofolin.</translation> </message> <message> <source>Confirm wallet encryption</source> @@ -336,10 +352,6 @@ <translation>&Adresa</translation> </message> <message> - <source>New receiving address</source> - <translation>Adresë e re pritëse</translation> - </message> - <message> <source>New sending address</source> <translation>Adresë e re dërgimi</translation> </message> @@ -352,10 +364,6 @@ <translation>ndrysho adresën dërguese</translation> </message> <message> - <source>The entered address "%1" is already in the address book.</source> - <translation>Adresa e dhënë "%1" është e zënë në librin e adresave. </translation> - </message> - <message> <source>Could not unlock wallet.</source> <translation>Nuk mund të ç'kyçet portofoli.</translation> </message> @@ -504,6 +512,10 @@ <source>Label</source> <translation>Etiketë</translation> </message> + <message> + <source>Wallet</source> + <translation>Portofol</translation> + </message> </context> <context> <name>RecentRequestsTableModel</name> @@ -640,10 +652,6 @@ <translation>%1 konfirmimet</translation> </message> <message> - <source>, has not been successfully broadcast yet</source> - <translation>, nuk është transmetuar me sukses deri tani</translation> - </message> - <message> <source>Date</source> <translation>Data</translation> </message> @@ -690,10 +698,6 @@ <translation>I/E konfirmuar(%1 konfirmime)</translation> </message> <message> - <source>This block was not received by any other nodes and will probably not be accepted!</source> - <translation>Ky bllok është marrë nga ndonjë nyje dhe ka shumë mundësi të mos pranohet! </translation> - </message> - <message> <source>Generated but not accepted</source> <translation>I krijuar por i papranuar</translation> </message> @@ -788,10 +792,6 @@ <context> <name>bitcoin-core</name> <message> - <source>Options:</source> - <translation>Opsionet:</translation> - </message> - <message> <source>Bitcoin Core</source> <translation>Berthama Bitcoin</translation> </message> diff --git a/src/qt/locale/bitcoin_sr.ts b/src/qt/locale/bitcoin_sr.ts index e432f1d334..c6c6a07700 100644 --- a/src/qt/locale/bitcoin_sr.ts +++ b/src/qt/locale/bitcoin_sr.ts @@ -3,71 +3,127 @@ <name>AddressBookPage</name> <message> <source>Right-click to edit address or label</source> - <translation>Desni klik za izmenu adrese ili oznake</translation> + <translation>Десни клик за измену адресе или ознаке</translation> </message> <message> <source>Create a new address</source> - <translation>Napravite novu adresu</translation> + <translation>Направите нову адресу</translation> </message> <message> <source>&New</source> - <translation>Novo</translation> + <translation>&Ново</translation> </message> <message> <source>Copy the currently selected address to the system clipboard</source> - <translation>Kopirajte trenutno izabranu adresu</translation> + <translation>Копирај тренутно одабрану адресу</translation> </message> <message> <source>&Copy</source> - <translation>Kopirajte</translation> + <translation>&Копирај</translation> </message> <message> <source>C&lose</source> - <translation>Zatvorite</translation> + <translation>&Затвори</translation> </message> <message> <source>Delete the currently selected address from the list</source> - <translation>Izbrisite trenutno izabranu adresu sa liste</translation> + <translation>Обришите тренутно одабрану адресу са листе</translation> + </message> + <message> + <source>Enter address or label to search</source> + <translation>Navedite adresu ili naziv koji bi ste potražili</translation> </message> <message> <source>Export the data in the current tab to a file</source> - <translation>Eksportuj podatke iz izabrane kartice u fajl</translation> + <translation>Извези податке из одабране картице у фајлj</translation> </message> <message> <source>&Export</source> - <translation>&Izvedi</translation> + <translation>&Извези</translation> </message> <message> <source>&Delete</source> - <translation>&Izbriši</translation> + <translation>&Обриши</translation> </message> <message> <source>Choose the address to send coins to</source> - <translation>Izbirajte adresu za slanje</translation> + <translation>Изаберите адресу за слање</translation> </message> <message> <source>Choose the address to receive coins with</source> - <translation>Izbirajte adresu za primanje</translation> + <translation>Изаберите адресу за примање</translation> + </message> + <message> + <source>C&hoose</source> + <translation>&Изабери</translation> </message> <message> <source>Sending addresses</source> - <translation>Adresa za slanje</translation> + <translation>Адресе за слање</translation> </message> <message> <source>Receiving addresses</source> - <translation>Adresa za primanje</translation> + <translation>Адресе за примање</translation> </message> - </context> + <message> + <source>These are your Bitcoin addresses for sending payments. Always check the amount and the receiving address before sending coins.</source> + <translation>Ово су ваше Биткоин адресе за слање уплата. Увек добро проверите износ и адресу на коју шаљете пре него што пошаљете уплату.</translation> + </message> + <message> + <source>These are your Bitcoin addresses for receiving payments. It is recommended to use a new receiving address for each transaction.</source> + <translation>Ово су ваше Биткоин адресе за примање уплате. Препоручује се да се за сваку трансакцију користи нова адреса.</translation> + </message> + <message> + <source>&Copy Address</source> + <translation>&Копирај Адресу</translation> + </message> + <message> + <source>Copy &Label</source> + <translation>Копирај & Обележи</translation> + </message> + <message> + <source>&Edit</source> + <translation>&Измени</translation> + </message> + <message> + <source>Export Address List</source> + <translation>Извези Листу Адреса</translation> + </message> + <message> + <source>Comma separated file (*.csv)</source> + <translation>Зарезом одвојене вредности (*.csv)</translation> + </message> + <message> + <source>Exporting Failed</source> + <translation>Извоз Неуспешан</translation> + </message> + <message> + <source>There was an error trying to save the address list to %1. Please try again.</source> + <translation>Десила се грешка приликом покушаја да се листа адреса упамти на %1. Молимо покушајте поново.</translation> + </message> +</context> <context> <name>AddressTableModel</name> <message> + <source>Label</source> + <translation>Етикета</translation> + </message> + <message> <source>Address</source> - <translation>Adresa</translation> + <translation>Адреса</translation> </message> - </context> + <message> + <source>(no label)</source> + <translation>(без етикете)</translation> + </message> +</context> <context> <name>AskPassphraseDialog</name> <message> + <source>Passphrase Dialog</source> + <translation>Прозор за унос лозинке</translation> + </message> + <message> <source>Enter passphrase</source> <translation>Унесите лозинку</translation> </message> @@ -79,13 +135,117 @@ <source>Repeat new passphrase</source> <translation>Поновите нову лозинку</translation> </message> - </context> + <message> + <source>Show password</source> + <translation>Прикажи лозинку</translation> + </message> + <message> + <source>Enter the new passphrase to the wallet.<br/>Please use a passphrase of <b>ten or more random characters</b>, or <b>eight or more words</b>.</source> + <translation>Унесите нову лозинку за приступ новчанику. <br/>Молимо да користите лозинку од <b>десет или више насумично одабраних карактера, или <b>осам или више речи</b>.</translation> + </message> + <message> + <source>Encrypt wallet</source> + <translation>Шифрирај новчаник</translation> + </message> + <message> + <source>This operation needs your wallet passphrase to unlock the wallet.</source> + <translation>Ова операција захтева да унесете лозинку новчаника како би откључали новчаник.</translation> + </message> + <message> + <source>Unlock wallet</source> + <translation>Откључај новчаник</translation> + </message> + <message> + <source>This operation needs your wallet passphrase to decrypt the wallet.</source> + <translation>Ова операција захтева да унесете лозинку новчаника како би дешифровали новчаник.</translation> + </message> + <message> + <source>Decrypt wallet</source> + <translation>Дешифруј новчаник</translation> + </message> + <message> + <source>Change passphrase</source> + <translation>Измену лозинку</translation> + </message> + <message> + <source>Enter the old passphrase and new passphrase to the wallet.</source> + <translation>Унеси стару лозинку и нову лозинку новчаника.</translation> + </message> + <message> + <source>Confirm wallet encryption</source> + <translation>Потврди шифрирање новчаника</translation> + </message> + <message> + <source>Warning: If you encrypt your wallet and lose your passphrase, you will <b>LOSE ALL OF YOUR BITCOINS</b>!</source> + <translation>Упозорење: Уколико шифрирате новчаник и изгубите своју лозинку, <b>ИЗГУБИЋЕТЕ СВЕ СВОЈЕ БИТКОИНЕ</b>!</translation> + </message> + <message> + <source>Are you sure you wish to encrypt your wallet?</source> + <translation>Да ли сте сигурни да желите да шифрирате свој новчаник?</translation> + </message> + <message> + <source>Wallet encrypted</source> + <translation>Новчаник шифриран</translation> + </message> + <message> + <source>%1 will close now to finish the encryption process. Remember that encrypting your wallet cannot fully protect your bitcoins from being stolen by malware infecting your computer.</source> + <translation>%1 ће се сада затворити како би се завршио процес шифрирања. Запамтите да шифрирањем свог новчаника не можете у потпуности заштити своје биткоине од крађе од стране злоћудних програма и компјутерских инфекција.</translation> + </message> + <message> + <source>IMPORTANT: Any previous backups you have made of your wallet file should be replaced with the newly generated, encrypted wallet file. For security reasons, previous backups of the unencrypted wallet file will become useless as soon as you start using the new, encrypted wallet.</source> + <translation>ВАЖНО: Свакa претходнa резерва новчаника коју сте имали треба да се замени новим, шифрираним фајлом новчаника. Из сигурносних разлога, свака претходна резерва нешифрираног фајла новчаника постаће сувишна, чим почнете да користите нови, шифрирани новчаник.</translation> + </message> + <message> + <source>Wallet encryption failed</source> + <translation>Шифрирање новчаника неуспешно.</translation> + </message> + <message> + <source>Wallet encryption failed due to an internal error. Your wallet was not encrypted.</source> + <translation>Шифрирање новчаника није успело због интерне грешке. Ваш новчаник није шифриран.</translation> + </message> + <message> + <source>The supplied passphrases do not match.</source> + <translation>Лозинке које сте унели нису исте.</translation> + </message> + <message> + <source>Wallet unlock failed</source> + <translation>Отључавање новчаника није успело.</translation> + </message> + <message> + <source>The passphrase entered for the wallet decryption was incorrect.</source> + <translation>Лозинка коју сте унели за дешифровање новчаника је погрешна.</translation> + </message> + <message> + <source>Wallet decryption failed</source> + <translation>Дешифровање новчаника неуспешно.</translation> + </message> + <message> + <source>Wallet passphrase was successfully changed.</source> + <translation>Лозинка новчаника успешно је промењена.</translation> + </message> + <message> + <source>Warning: The Caps Lock key is on!</source> + <translation>Упозорање Caps Lock дугме укључено.</translation> + </message> +</context> <context> <name>BanTableModel</name> - </context> + <message> + <source>IP/Netmask</source> + <translation>ИП/Нетмаск</translation> + </message> + <message> + <source>Banned Until</source> + <translation>Забрањен до</translation> + </message> +</context> <context> <name>BitcoinGUI</name> <message> + <source>Sign &message...</source> + <translation>Потпиши &поруку...</translation> + </message> + <message> <source>Synchronizing with network...</source> <translation>Синхронизација са мрежом у току...</translation> </message> @@ -94,6 +254,10 @@ <translation>&Општи преглед</translation> </message> <message> + <source>Node</source> + <translation>Ноде</translation> + </message> + <message> <source>Show general overview of wallet</source> <translation>Погледајте општи преглед новчаника</translation> </message> @@ -107,13 +271,21 @@ </message> <message> <source>E&xit</source> - <translation>I&zlaz</translation> + <translation>И&злаз</translation> </message> <message> <source>Quit application</source> <translation>Напустите програм</translation> </message> <message> + <source>&About %1</source> + <translation>&О %1</translation> + </message> + <message> + <source>Show information about %1</source> + <translation>Прикажи информације о %1</translation> + </message> + <message> <source>About &Qt</source> <translation>О &Qt-у</translation> </message> @@ -126,34 +298,126 @@ <translation>П&оставке...</translation> </message> <message> + <source>Modify configuration options for %1</source> + <translation>Измени конфигурацију поставки за %1</translation> + </message> + <message> <source>&Encrypt Wallet...</source> <translation>&Шифровање новчаника...</translation> </message> <message> <source>&Backup Wallet...</source> - <translation>&Backup новчаника</translation> + <translation>&Резерна копија новчаника</translation> </message> <message> <source>&Change Passphrase...</source> <translation>Промени &лозинку...</translation> </message> <message> + <source>&Sending addresses...</source> + <translation>&Адресе за слање...</translation> + </message> + <message> + <source>&Receiving addresses...</source> + <translation>&Адресе за пријем</translation> + </message> + <message> + <source>Open &URI...</source> + <translation>Отвори &УРИ...</translation> + </message> + <message> + <source>Wallet:</source> + <translation>Новчаник</translation> + </message> + <message> + <source>default wallet</source> + <translation>подразумевани новчаник</translation> + </message> + <message> + <source>Click to disable network activity.</source> + <translation>Кликни да искључиш активност на мрежи.</translation> + </message> + <message> + <source>Network activity disabled.</source> + <translation>Активност на мрежи искључена.</translation> + </message> + <message> + <source>Click to enable network activity again.</source> + <translation>Кликни да поново омогућиш активност на мрежи.</translation> + </message> + <message> + <source>Syncing Headers (%1%)...</source> + <translation>Синхронизовање Заглавља (%1%)...</translation> + </message> + <message> + <source>Reindexing blocks on disk...</source> + <translation>Поново идексирање блокова на диску.</translation> + </message> + <message> + <source>Proxy is <b>enabled</b>: %1</source> + <translation>Прокси је <b>омогућен</b>: %1</translation> + </message> + <message> <source>Send coins to a Bitcoin address</source> - <translation>Пошаљите новац на bitcoin адресу</translation> + <translation>Пошаљите новац на Биткоин адресу</translation> + </message> + <message> + <source>Backup wallet to another location</source> + <translation>Направите резервну копију новчаника на другој локацији</translation> </message> <message> <source>Change the passphrase used for wallet encryption</source> <translation>Мењање лозинке којом се шифрује новчаник</translation> </message> <message> + <source>&Debug window</source> + <translation>&Прозор за отклањање грешке</translation> + </message> + <message> + <source>Open debugging and diagnostic console</source> + <translation>Отвори конзолу за отклањање грешака и дијагностику</translation> + </message> + <message> + <source>&Verify message...</source> + <translation>&Верификовање поруке...</translation> + </message> + <message> + <source>Bitcoin</source> + <translation>Биткоин</translation> + </message> + <message> <source>Wallet</source> - <translation>новчаник</translation> + <translation>Новчаник</translation> </message> <message> <source>&Send</source> <translation>&Пошаљи</translation> </message> <message> + <source>&Receive</source> + <translation>&Прими</translation> + </message> + <message> + <source>&Show / Hide</source> + <translation>&Прикажи / Сакриј</translation> + </message> + <message> + <source>Show or hide the main Window</source> + <translation>Прикажи или сакрији главни прозор</translation> + </message> + <message> + <source>Encrypt the private keys that belong to your wallet</source> + <translation>Шифрирај приватни клуљ који припада новчанику.</translation> + </message> + <message> + <source>Sign messages with your Bitcoin addresses to prove you own them</source> + <translation>Потписуј поруку са своје Биткоин адресе као доказ да си њихов власник</translation> + </message> + <message> + <source>Verify messages to ensure they were signed with specified Bitcoin addresses</source> + <translation>Верификуј поруке и утврди да ли су потписане од стране спецификованих Биткоин адреса</translation> + </message> + <message> <source>&File</source> <translation>&Фајл</translation> </message> @@ -163,25 +427,125 @@ </message> <message> <source>&Help</source> - <translation>П&омоћ</translation> + <translation>&Помоћ</translation> </message> <message> <source>Tabs toolbar</source> <translation>Трака са картицама</translation> </message> <message> + <source>Request payments (generates QR codes and bitcoin: URIs)</source> + <translation>Затражи плаћање (генерише QR кодове и биткоин: URI-е)</translation> + </message> + <message> + <source>Show the list of used sending addresses and labels</source> + <translation>Прегледајте листу коришћених адреса и етикета за слање уплата</translation> + </message> + <message> + <source>Show the list of used receiving addresses and labels</source> + <translation>Прегледајте листу коришћених адреса и етикета за пријем уплата</translation> + </message> + <message> + <source>Open a bitcoin: URI or payment request</source> + <translation>Отворите биткоин: URI или захтев за плаћање</translation> + </message> + <message> + <source>&Command-line options</source> + <translation>&Опције командне линије</translation> + </message> + <message numerus="yes"> + <source>%n active connection(s) to Bitcoin network</source> + <translation><numerusform>%n aктивна веза са Биткоин мрежом</numerusform><numerusform>%n aктивних веза са Биткоин мрежом</numerusform><numerusform>%n aктивних веза са Биткоин мрежом</numerusform></translation> + </message> + <message> + <source>Indexing blocks on disk...</source> + <translation>Идексирање блокова на диску...</translation> + </message> + <message> + <source>Processing blocks on disk...</source> + <translation>Обрада блокова на диску...</translation> + </message> + <message numerus="yes"> + <source>Processed %n block(s) of transaction history.</source> + <translation><numerusform>Обрађенo %n блокова историјата трансакција.</numerusform><numerusform>Обрађенo %n блокова историјата трансакција.</numerusform><numerusform>Обрађенo је %n блокова историјата трансакција.</numerusform></translation> + </message> + <message> + <source>%1 behind</source> + <translation>%1 уназад</translation> + </message> + <message> + <source>Last received block was generated %1 ago.</source> + <translation>Последњи примљени блок је направљен пре %1.</translation> + </message> + <message> + <source>Transactions after this will not yet be visible.</source> + <translation>Трансакције након овога још неће бити видљиве.</translation> + </message> + <message> <source>Error</source> <translation>Greška</translation> </message> <message> + <source>Warning</source> + <translation>Упозорење</translation> + </message> + <message> + <source>Information</source> + <translation>Информације</translation> + </message> + <message> <source>Up to date</source> <translation>Ажурно</translation> </message> <message> + <source>Show the %1 help message to get a list with possible Bitcoin command-line options</source> + <translation>Прикажи поруку помоћи %1 за листу са могућим опцијама Биткоин командне линије</translation> + </message> + <message> + <source>%1 client</source> + <translation>%1 клијент</translation> + </message> + <message> <source>Catching up...</source> <translation>Ажурирање у току...</translation> </message> <message> + <source>Date: %1 +</source> + <translation>Датум: %1 +</translation> + </message> + <message> + <source>Amount: %1 +</source> + <translation>Износ: %1 +</translation> + </message> + <message> + <source>Wallet: %1 +</source> + <translation>Новчаник: %1 +</translation> + </message> + <message> + <source>Type: %1 +</source> + <translation>Тип: %1 +</translation> + </message> + <message> + <source>Label: %1 +</source> + <translation>Етикета: %1 +</translation> + </message> + <message> + <source>Address: %1 +</source> + <translation>Адреса: %1 +</translation> + </message> + <message> <source>Sent transaction</source> <translation>Послана трансакција</translation> </message> @@ -190,6 +554,14 @@ <translation>Придошла трансакција</translation> </message> <message> + <source>HD key generation is <b>enabled</b></source> + <translation>Генерисање ХД кључа је <b>омогућено</b></translation> + </message> + <message> + <source>HD key generation is <b>disabled</b></source> + <translation>Генерисање ХД кључа је <b>онеомогућено</b></translation> + </message> + <message> <source>Wallet is <b>encrypted</b> and currently <b>unlocked</b></source> <translation>Новчаник јс <b>шифрован</b> и тренутно <b>откључан</b></translation> </message> @@ -197,26 +569,143 @@ <source>Wallet is <b>encrypted</b> and currently <b>locked</b></source> <translation>Новчаник јс <b>шифрован</b> и тренутно <b>закључан</b></translation> </message> - </context> + <message> + <source>A fatal error occurred. Bitcoin can no longer continue safely and will quit.</source> + <translation>Дошло је до критичне грешке. Биткоин не може безбедно да настави са радом и искључиће се.</translation> + </message> +</context> <context> <name>CoinControlDialog</name> <message> + <source>Coin Selection</source> + <translation>Избор новчића</translation> + </message> + <message> + <source>Quantity:</source> + <translation>Количина:</translation> + </message> + <message> + <source>Bytes:</source> + <translation>Бајта:</translation> + </message> + <message> <source>Amount:</source> - <translation>Iznos:</translation> + <translation>Износ:</translation> + </message> + <message> + <source>Fee:</source> + <translation>Накнада:</translation> + </message> + <message> + <source>Dust:</source> + <translation>Прашина:</translation> + </message> + <message> + <source>After Fee:</source> + <translation>Након накнаде:</translation> + </message> + <message> + <source>Change:</source> + <translation>Промени:</translation> + </message> + <message> + <source>(un)select all</source> + <translation>изаберите / поништите све +</translation> </message> <message> <source>Amount</source> - <translation>iznos</translation> + <translation>Износ</translation> + </message> + <message> + <source>Received with label</source> + <translation>Примљено са етикетом</translation> + </message> + <message> + <source>Received with address</source> + <translation>Примљено са адресом</translation> </message> <message> <source>Date</source> <translation>datum</translation> </message> <message> + <source>Confirmations</source> + <translation>Потврде</translation> + </message> + <message> <source>Confirmed</source> <translation>Potvrdjen</translation> </message> - </context> + <message> + <source>Copy address</source> + <translation>Копирај адресу</translation> + </message> + <message> + <source>Copy label</source> + <translation>Копирај налепницу</translation> + </message> + <message> + <source>Copy amount</source> + <translation>Копирај износ</translation> + </message> + <message> + <source>Copy transaction ID</source> + <translation>Копирај идентификациони број трансакције</translation> + </message> + <message> + <source>Lock unspent</source> + <translation>Закључај непотрошено</translation> + </message> + <message> + <source>Unlock unspent</source> + <translation>Откључај непотрошено</translation> + </message> + <message> + <source>Copy quantity</source> + <translation>Копирај количину</translation> + </message> + <message> + <source>Copy fee</source> + <translation>Копирај провизију</translation> + </message> + <message> + <source>Copy after fee</source> + <translation>Копирај након провизије</translation> + </message> + <message> + <source>Copy bytes</source> + <translation>Копирај бајтове</translation> + </message> + <message> + <source>Copy dust</source> + <translation>Копирај прашину</translation> + </message> + <message> + <source>Copy change</source> + <translation>Копирај промену</translation> + </message> + <message> + <source>(%1 locked)</source> + <translation>(%1 закључан)</translation> + </message> + <message> + <source>yes</source> + <translation>да</translation> + </message> + <message> + <source>no</source> + <translation>не</translation> + </message> + <message> + <source>(no label)</source> + <translation>(без налепнице)</translation> + </message> + <message> + <source>(change)</source> + <translation>(промени)</translation> + </message> +</context> <context> <name>EditAddressDialog</name> <message> @@ -228,13 +717,61 @@ <translation>&Етикета</translation> </message> <message> + <source>The label associated with this address list entry</source> + <translation>Етикета повезана са овом ставком из листе адреса</translation> + </message> + <message> + <source>The address associated with this address list entry. This can only be modified for sending addresses.</source> + <translation>Адреса повезана са овом ставком из листе адреса. Ово можете променити једини у случају адреса за плаћање.</translation> + </message> + <message> <source>&Address</source> <translation>&Адреса</translation> </message> - </context> + <message> + <source>New sending address</source> + <translation>Нова адреса за слање</translation> + </message> + <message> + <source>Edit receiving address</source> + <translation>Измени адресу за примање</translation> + </message> + <message> + <source>Edit sending address</source> + <translation>Измени адресу за слање</translation> + </message> + <message> + <source>Could not unlock wallet.</source> + <translation>Новчаник није могуће откључати.</translation> + </message> + <message> + <source>New key generation failed.</source> + <translation>Генерисање новог кључа није успело.</translation> + </message> +</context> <context> <name>FreespaceChecker</name> - </context> + <message> + <source>A new data directory will be created.</source> + <translation>Нови директоријум података ће бити креиран.</translation> + </message> + <message> + <source>name</source> + <translation>име</translation> + </message> + <message> + <source>Directory already exists. Add %1 if you intend to create a new directory here.</source> + <translation>Директоријум већ постоји. Додајте %1 ако намеравате да креирате нови директоријум овде.</translation> + </message> + <message> + <source>Path already exists, and is not a directory.</source> + <translation>Путања већ постоји и није директоријум.</translation> + </message> + <message> + <source>Cannot create data directory here.</source> + <translation>Не можете креирати директоријум података овде.</translation> + </message> +</context> <context> <name>HelpMessageDialog</name> <message> @@ -242,13 +779,57 @@ <translation>верзија</translation> </message> <message> - <source>Usage:</source> - <translation>Korišćenje:</translation> + <source>(%1-bit)</source> + <translation>(%1-bit)</translation> </message> - </context> + <message> + <source>About %1</source> + <translation>Приближно %1</translation> + </message> + <message> + <source>Command-line options</source> + <translation>Опције командне линије</translation> + </message> +</context> <context> <name>Intro</name> <message> + <source>Welcome</source> + <translation>Добродошли</translation> + </message> + <message> + <source>Welcome to %1.</source> + <translation>Добродошли на %1.</translation> + </message> + <message> + <source>As this is the first time the program is launched, you can choose where %1 will store its data.</source> + <translation>Пошто је ово први пут да је програм покренут, можете изабрати где ће %1 чувати своје податке.</translation> + </message> + <message> + <source>When you click OK, %1 will begin to download and process the full %4 block chain (%2GB) starting with the earliest transactions in %3 when %4 initially launched.</source> + <translation>Када кликнете на ОК, %1 ће почети с преузимањем и процесирањем целокупног ланца блокова %4 (%2GB), почевши од најранијих трансакција у %3 када је %4 покренут.</translation> + </message> + <message> + <source>This initial synchronisation is very demanding, and may expose hardware problems with your computer that had previously gone unnoticed. Each time you run %1, it will continue downloading where it left off.</source> + <translation>Ова иницијална синхронизација је веома захтевна и може изложити ваш рачунар хардверским проблемима који раније нису били примећени. Сваки пут када покренете %1, преузимање ће се наставити тамо где је било прекинуто.</translation> + </message> + <message> + <source>If you have chosen to limit block chain storage (pruning), the historical data must still be downloaded and processed, but will be deleted afterward to keep your disk usage low.</source> + <translation>Ако сте одлучили да ограничите складиштење ланаца блокова (тримовање), историјски подаци се ипак морају преузети и обрадити, али ће након тога бити избрисани како би се ограничила употреба диска.</translation> + </message> + <message> + <source>Use the default data directory</source> + <translation>Користите подразумевани директоријум података</translation> + </message> + <message> + <source>Use a custom data directory:</source> + <translation>Користите прилагођени директоријум података:</translation> + </message> + <message> + <source>Bitcoin</source> + <translation>Биткоин</translation> + </message> + <message> <source>Error</source> <translation>Greška</translation> </message> @@ -259,6 +840,30 @@ <source>Form</source> <translation>Форма</translation> </message> + <message> + <source>Number of blocks left</source> + <translation>Остала количина блокова</translation> + </message> + <message> + <source>Unknown...</source> + <translation>Непознато...</translation> + </message> + <message> + <source>Last block time</source> + <translation>Време последњег блока</translation> + </message> + <message> + <source>Progress</source> + <translation>Напредак</translation> + </message> + <message> + <source>calculating...</source> + <translation>Рачунање</translation> + </message> + <message> + <source>Hide</source> + <translation>Сакриј</translation> + </message> </context> <context> <name>OpenURIDialog</name> @@ -270,16 +875,40 @@ <translation>Поставке</translation> </message> <message> + <source>Open Configuration File</source> + <translation>Отвори Конфигурациону Датотеку</translation> + </message> + <message> <source>W&allet</source> <translation>новчаник</translation> </message> <message> + <source>Expert</source> + <translation>Експерт</translation> + </message> + <message> + <source>IPv4</source> + <translation>IPv4</translation> + </message> + <message> + <source>IPv6</source> + <translation>IPv6</translation> + </message> + <message> + <source>Tor</source> + <translation>Тор</translation> + </message> + <message> <source>&Unit to show amounts in:</source> <translation>&Јединица за приказивање износа:</translation> </message> <message> <source>&OK</source> - <translation>&OK</translation> + <translation>&Уреду</translation> + </message> + <message> + <source>&Cancel</source> + <translation>&Откажи</translation> </message> <message> <source>Error</source> @@ -292,6 +921,18 @@ <source>Form</source> <translation>Форма</translation> </message> + <message> + <source>Available:</source> + <translation>Доступно:</translation> + </message> + <message> + <source>Pending:</source> + <translation>На чекању:</translation> + </message> + <message> + <source>Total:</source> + <translation>Укупно:</translation> + </message> </context> <context> <name>PaymentServer</name> @@ -319,6 +960,14 @@ <context> <name>RPCConsole</name> <message> + <source>Last block time</source> + <translation>Време последњег блока</translation> + </message> + <message> + <source>default wallet</source> + <translation>подразумевани новчаник</translation> + </message> + <message> <source>Yes</source> <translation>Da</translation> </message> @@ -345,7 +994,16 @@ <source>Show</source> <translation>Prikaži</translation> </message> - </context> + <message> + <source>Copy label</source> + <translation>Копирај налепницу +</translation> + </message> + <message> + <source>Copy amount</source> + <translation>к</translation> + </message> +</context> <context> <name>ReceiveRequestDialog</name> <message> @@ -356,9 +1014,29 @@ <source>Address</source> <translation>Adresa</translation> </message> + <message> + <source>Amount</source> + <translation>Износ</translation> + </message> + <message> + <source>Label</source> + <translation>Налепница</translation> + </message> + <message> + <source>Wallet</source> + <translation>Новчаник</translation> + </message> </context> <context> <name>RecentRequestsTableModel</name> + <message> + <source>Label</source> + <translation>Налепница</translation> + </message> + <message> + <source>(no label)</source> + <translation>(без налепнице)</translation> + </message> </context> <context> <name>SendCoinsDialog</name> @@ -367,10 +1045,38 @@ <translation>Слање новца</translation> </message> <message> + <source>Quantity:</source> + <translation>Количина:</translation> + </message> + <message> + <source>Bytes:</source> + <translation>Бајта:</translation> + </message> + <message> <source>Amount:</source> <translation>Iznos:</translation> </message> <message> + <source>Fee:</source> + <translation>Накнада:</translation> + </message> + <message> + <source>After Fee:</source> + <translation>Након накнаде:</translation> + </message> + <message> + <source>Change:</source> + <translation>Промени:</translation> + </message> + <message> + <source>Hide</source> + <translation>Сакриј</translation> + </message> + <message> + <source>Dust:</source> + <translation>Прашина:</translation> + </message> + <message> <source>Confirm the send action</source> <translation>Потврди акцију слања</translation> </message> @@ -378,7 +1084,35 @@ <source>S&end</source> <translation>&Пошаљи</translation> </message> - </context> + <message> + <source>Copy quantity</source> + <translation>Копирај количину</translation> + </message> + <message> + <source>Copy amount</source> + <translation>к</translation> + </message> + <message> + <source>Copy fee</source> + <translation>Копирај провизију</translation> + </message> + <message> + <source>Copy bytes</source> + <translation>Копирај бајтове</translation> + </message> + <message> + <source>Copy dust</source> + <translation>Копирај прашину</translation> + </message> + <message> + <source>Copy change</source> + <translation>Копирај промену</translation> + </message> + <message> + <source>(no label)</source> + <translation>(без налепнице)</translation> + </message> +</context> <context> <name>SendCoinsEntry</name> <message> @@ -435,6 +1169,10 @@ </context> <context> <name>TransactionDesc</name> + <message> + <source>Amount</source> + <translation>Износ</translation> + </message> </context> <context> <name>TransactionDescDialog</name> @@ -445,13 +1183,50 @@ </context> <context> <name>TransactionTableModel</name> + <message> + <source>Label</source> + <translation>Налепница</translation> + </message> + <message> + <source>(no label)</source> + <translation>(без налепнице)</translation> + </message> </context> <context> <name>TransactionView</name> <message> + <source>Copy address</source> + <translation>Копирај адресу</translation> + </message> + <message> + <source>Copy label</source> + <translation>Копирај налепницу +</translation> + </message> + <message> + <source>Copy amount</source> + <translation>к</translation> + </message> + <message> + <source>Copy transaction ID</source> + <translation>Копирај идентификациони број трансакције</translation> + </message> + <message> + <source>Comma separated file (*.csv)</source> + <translation>Фајл раздојен тачком (*.csv)</translation> + </message> + <message> + <source>Label</source> + <translation>Налепница</translation> + </message> + <message> <source>Address</source> <translation>Adresa</translation> </message> + <message> + <source>Exporting Failed</source> + <translation>Извоз Неуспешан</translation> + </message> </context> <context> <name>UnitDisplayStatusBarControl</name> @@ -468,32 +1243,20 @@ <source>&Export</source> <translation>&Izvedi</translation> </message> + <message> + <source>Export the data in the current tab to a file</source> + <translation>Извези податке из одабране картице у фајлj</translation> + </message> </context> <context> <name>bitcoin-core</name> <message> - <source>Options:</source> - <translation>Opcije</translation> - </message> - <message> - <source>Specify data directory</source> - <translation>Gde je konkretni data direktorijum </translation> - </message> - <message> - <source>Accept command line and JSON-RPC commands</source> - <translation>Prihvati komandnu liniju i JSON-RPC komande</translation> - </message> - <message> - <source>Run in the background as a daemon and accept commands</source> - <translation>Radi u pozadini kao daemon servis i prihvati komande</translation> - </message> - <message> - <source>Username for JSON-RPC connections</source> - <translation>Korisničko ime za JSON-RPC konekcije</translation> + <source>Information</source> + <translation>Информације</translation> </message> <message> - <source>Password for JSON-RPC connections</source> - <translation>Lozinka za JSON-RPC konekcije</translation> + <source>Warning</source> + <translation>Упозорење</translation> </message> <message> <source>Insufficient funds</source> diff --git a/src/qt/locale/bitcoin_sr@latin.ts b/src/qt/locale/bitcoin_sr@latin.ts index 30c14de0a1..6e4e5933ea 100644 --- a/src/qt/locale/bitcoin_sr@latin.ts +++ b/src/qt/locale/bitcoin_sr@latin.ts @@ -582,6 +582,10 @@ <source>Label</source> <translation>Oznaka</translation> </message> + <message> + <source>Wallet</source> + <translation>Novčanik</translation> + </message> </context> <context> <name>RecentRequestsTableModel</name> @@ -613,6 +617,10 @@ <translation>Nakon Naknade:</translation> </message> <message> + <source>Transaction fee</source> + <translation>Taksa transakcije</translation> + </message> + <message> <source>(no label)</source> <translation>(bez oznake)</translation> </message> diff --git a/src/qt/locale/bitcoin_sv.ts b/src/qt/locale/bitcoin_sv.ts index 39d9be2505..d0fcef9297 100644 --- a/src/qt/locale/bitcoin_sv.ts +++ b/src/qt/locale/bitcoin_sv.ts @@ -3,7 +3,7 @@ <name>AddressBookPage</name> <message> <source>Right-click to edit address or label</source> - <translation>Högerklicka för att ändra adressen eller etiketten.</translation> + <translation>Högerklicka för att redigera adressen eller etiketten.</translation> </message> <message> <source>Create a new address</source> @@ -30,8 +30,12 @@ <translation>Ta bort den valda adressen från listan</translation> </message> <message> + <source>Enter address or label to search</source> + <translation>Ange en adress eller etikett att söka efter</translation> + </message> + <message> <source>Export the data in the current tab to a file</source> - <translation>Exportera informationen i den nuvarande fliken till en fil</translation> + <translation>Exportera informationen i aktuell flik till en fil</translation> </message> <message> <source>&Export</source> @@ -43,11 +47,11 @@ </message> <message> <source>Choose the address to send coins to</source> - <translation>Välj en adress att sända betalning till</translation> + <translation>Välj en adress att skicka transaktionen till</translation> </message> <message> <source>Choose the address to receive coins with</source> - <translation>Välj en adress att ta emot betalning till</translation> + <translation>Välj en adress att ta emot transaktionen med</translation> </message> <message> <source>C&hoose</source> @@ -63,11 +67,11 @@ </message> <message> <source>These are your Bitcoin addresses for sending payments. Always check the amount and the receiving address before sending coins.</source> - <translation>Detta är dina Bitcoin adresser för att skicka betalningar. Kolla alltid summan och den mottagande adressen innan du skickar Bitcoins.</translation> + <translation>Detta är dina Bitcoin-adresser för att skicka betalningar. Kontrollera alltid summan och den mottagande adressen innan du skickar bitcoin.</translation> </message> <message> <source>These are your Bitcoin addresses for receiving payments. It is recommended to use a new receiving address for each transaction.</source> - <translation>Detta är dina Bitcoin adresser för att ta emot betalningar. Det rekommenderas att använda en ny mottagningsadress för varje transaktion.</translation> + <translation>Detta är dina Bitcoin-adresser för att ta emot betalningar. Det rekommenderas att använda en ny mottagningsadress för varje transaktion.</translation> </message> <message> <source>&Copy Address</source> @@ -95,7 +99,7 @@ </message> <message> <source>There was an error trying to save the address list to %1. Please try again.</source> - <translation>Det inträffade ett fel när adresslistan skulle sparas till %1. + <translation>Ett fel inträffade när adresslistan skulle sparas till %1. Var vänlig och försök igen.</translation> </message> </context> @@ -133,6 +137,10 @@ Var vänlig och försök igen.</translation> <translation>Upprepa nytt lösenord</translation> </message> <message> + <source>Show password</source> + <translation>Visa lösenord</translation> + </message> + <message> <source>Enter the new passphrase to the wallet.<br/>Please use a passphrase of <b>ten or more random characters</b>, or <b>eight or more words</b>.</source> <translation>Ange plånbokens nya lösenord. <br/> Använd ett lösenord på <b>tio eller fler slumpmässiga tecken,</b> eller <b>åtta eller fler ord.</b>.</translation> </message> @@ -182,11 +190,11 @@ Var vänlig och försök igen.</translation> </message> <message> <source>%1 will close now to finish the encryption process. Remember that encrypting your wallet cannot fully protect your bitcoins from being stolen by malware infecting your computer.</source> - <translation>%1 kommer nu att stänga ner för att färdigställa krypteringen. Tänk på att en krypterad plånbok inte skyddar mot stöld om din dator är infekterad med en keylogger.</translation> + <translation>%1 kommer nu att stänga ner för att slutföra krypteringen. Tänk på att en krypterad plånbok inte skyddar mot stöld om din dator är infekterad med en keylogger.</translation> </message> <message> <source>IMPORTANT: Any previous backups you have made of your wallet file should be replaced with the newly generated, encrypted wallet file. For security reasons, previous backups of the unencrypted wallet file will become useless as soon as you start using the new, encrypted wallet.</source> - <translation>VIKTIGT: Alla tidigare säkerhetskopior du har gjort av plånboksfilen ska ersättas med den nya genererade, krypterade plånboksfilen. Av säkerhetsskäl kommer tidigare säkerhetskopior av den okrypterade plånboksfilen blir oanvändbara när du börjar använda en ny, krypterad plånbok.</translation> + <translation>VIKTIGT: Alla tidigare säkerhetskopior du har skapat av plånboksfilen ska ersättas med den nyss skapade, krypterade plånboksfilen. Av säkerhetsskäl kommer tidigare säkerhetskopior av den okrypterade plånboksfilen att bli oanvändbara när du börjar använda den nya, krypterade plånboken.</translation> </message> <message> <source>Wallet encryption failed</source> @@ -194,7 +202,7 @@ Var vänlig och försök igen.</translation> </message> <message> <source>Wallet encryption failed due to an internal error. Your wallet was not encrypted.</source> - <translation>Kryptering av plånbok misslyckades på grund av ett internt fel. Din plånbok blev inte krypterad.</translation> + <translation>Kryptering av plånbok misslyckades på grund av ett internt fel. Din plånbok krypterades inte.</translation> </message> <message> <source>The supplied passphrases do not match.</source> @@ -206,7 +214,7 @@ Var vänlig och försök igen.</translation> </message> <message> <source>The passphrase entered for the wallet decryption was incorrect.</source> - <translation>Lösenordet för dekryptering av plånboken var felaktig.</translation> + <translation>Lösenordet för dekryptering av plånboken var felaktigt.</translation> </message> <message> <source>Wallet decryption failed</source> @@ -214,7 +222,7 @@ Var vänlig och försök igen.</translation> </message> <message> <source>Wallet passphrase was successfully changed.</source> - <translation>Plånbokens lösenord har ändrats.</translation> + <translation>Plånbokens lösenord ändrades.</translation> </message> <message> <source>Warning: The Caps Lock key is on!</source> @@ -304,7 +312,7 @@ Var vänlig och försök igen.</translation> </message> <message> <source>&Change Passphrase...</source> - <translation>&Byt lösenord...</translation> + <translation>&Ändra lösenord...</translation> </message> <message> <source>&Sending addresses...</source> @@ -340,7 +348,7 @@ Var vänlig och försök igen.</translation> </message> <message> <source>Send coins to a Bitcoin address</source> - <translation>Skicka bitcoins till en Bitcoin-adress</translation> + <translation>Skicka bitcoin till en Bitcoin-adress</translation> </message> <message> <source>Backup wallet to another location</source> @@ -392,11 +400,11 @@ Var vänlig och försök igen.</translation> </message> <message> <source>Sign messages with your Bitcoin addresses to prove you own them</source> - <translation>Signera meddelanden med din Bitcoin-adress för att bevisa att du äger dem</translation> + <translation>Signera meddelanden med dina Bitcoin-adresser för att bevisa att du äger dem</translation> </message> <message> <source>Verify messages to ensure they were signed with specified Bitcoin addresses</source> - <translation>Verifiera meddelanden för att vara säker på att de var signerade med specificerade Bitcoin-adresser</translation> + <translation>Verifiera meddelanden för att vara säker på att de signerades med angivna Bitcoin-adresser</translation> </message> <message> <source>&File</source> @@ -416,15 +424,15 @@ Var vänlig och försök igen.</translation> </message> <message> <source>Request payments (generates QR codes and bitcoin: URIs)</source> - <translation>Begär betalning (genererar QR-koder och bitcoin-URI)</translation> + <translation>Begär betalningar (skapar QR-koder och bitcoin: -URIer)</translation> </message> <message> <source>Show the list of used sending addresses and labels</source> - <translation>Visa listan av använda avsändaradresser och etiketter</translation> + <translation>Visa listan med använda avsändaradresser och etiketter</translation> </message> <message> <source>Show the list of used receiving addresses and labels</source> - <translation>Visa listan av använda mottagningsadresser och etiketter</translation> + <translation>Visa listan med använda mottagningsadresser och etiketter</translation> </message> <message> <source>Open a bitcoin: URI or payment request</source> @@ -456,7 +464,7 @@ Var vänlig och försök igen.</translation> </message> <message> <source>Last received block was generated %1 ago.</source> - <translation>Senast mottagna block genererades för %1 sen.</translation> + <translation>Senast mottagna block skapades för %1 sedan.</translation> </message> <message> <source>Transactions after this will not yet be visible.</source> @@ -685,7 +693,7 @@ Var vänlig och försök igen.</translation> </message> <message> <source>This label turns red if any recipient receives an amount smaller than the current dust threshold.</source> - <translation>Denna etikett blir röd om någon mottagare får en betalning som är mindre än aktuella dammtröskeln.</translation> + <translation>Denna etikett blir röd om någon mottagare får en betalning som är mindre än aktuell dammtröskel.</translation> </message> <message> <source>Can vary +/- %1 satoshi(s) per input.</source> @@ -716,21 +724,17 @@ Var vänlig och försök igen.</translation> </message> <message> <source>The label associated with this address list entry</source> - <translation>Etiketten associerad med denna adresslistas post</translation> + <translation>Etiketten associerad med denna post i adresslistan</translation> </message> <message> <source>The address associated with this address list entry. This can only be modified for sending addresses.</source> - <translation>Adressen associerad med denna adresslistas post. Detta kan bara ändras för sändningsadresser.</translation> + <translation>Adressen associerad med denna post i adresslistan. Den kan bara ändras för sändningsadresser.</translation> </message> <message> <source>&Address</source> <translation>&Adress</translation> </message> <message> - <source>New receiving address</source> - <translation>Ny mottagaradress</translation> - </message> - <message> <source>New sending address</source> <translation>Ny avsändaradress</translation> </message> @@ -747,10 +751,6 @@ Var vänlig och försök igen.</translation> <translation>Den angivna adressen "%1" är inte en giltig Bitcoin-adress.</translation> </message> <message> - <source>The entered address "%1" is already in the address book.</source> - <translation>Den angivna adressen "%1" finns redan i adressboken.</translation> - </message> - <message> <source>Could not unlock wallet.</source> <translation>Kunde inte låsa upp plånboken.</translation> </message> @@ -800,42 +800,6 @@ Var vänlig och försök igen.</translation> <source>Command-line options</source> <translation>Kommandoradsalternativ</translation> </message> - <message> - <source>Usage:</source> - <translation>Användning:</translation> - </message> - <message> - <source>command-line options</source> - <translation>kommandoradsalternativ</translation> - </message> - <message> - <source>UI Options:</source> - <translation>UI-inställningar:</translation> - </message> - <message> - <source>Choose data directory on startup (default: %u)</source> - <translation>Välj datakatalog vid uppstart (standard: %u)</translation> - </message> - <message> - <source>Set language, for example "de_DE" (default: system locale)</source> - <translation>Ange språk, till exempel "de_DE" (standard: systemspråk)</translation> - </message> - <message> - <source>Start minimized</source> - <translation>Starta minimerad</translation> - </message> - <message> - <source>Set SSL root certificates for payment request (default: -system-)</source> - <translation>Ange SSL rotcertifikat för betalningsansökan (standard: -system-)</translation> - </message> - <message> - <source>Show splash screen on startup (default: %u)</source> - <translation>Visa startbild vid uppstart (standard: %u)</translation> - </message> - <message> - <source>Reset all settings changed in the GUI</source> - <translation>Återställ alla inställningar som gjorts i GUI</translation> - </message> </context> <context> <name>Intro</name> @@ -852,6 +816,10 @@ Var vänlig och försök igen.</translation> <translation>Eftersom detta är första gången programmet startas får du välja var %1 skall lagra sitt data.</translation> </message> <message> + <source>When you click OK, %1 will begin to download and process the full %4 block chain (%2GB) starting with the earliest transactions in %3 when %4 initially launched.</source> + <translation>När du trycker OK kommer %1 påbörja nedladdning och bearbetning av den fulla %4-blockkedjan (%2GB), med start vid de första transaktionerna i %3 när %4 först lanserades.</translation> + </message> + <message> <source>This initial synchronisation is very demanding, and may expose hardware problems with your computer that had previously gone unnoticed. Each time you run %1, it will continue downloading where it left off.</source> <translation>Denna första synkronisering är väldigt krävande, och kan påvisa hårdvaruproblem med din dator som tidigare inte visats sig. Varje gång du kör %1, kommer nerladdningen att fortsätta där den avslutades.</translation> </message> @@ -877,7 +845,7 @@ Var vänlig och försök igen.</translation> </message> <message> <source>%1 will download and store a copy of the Bitcoin block chain.</source> - <translation>%1 kommer att hämta och lagra en kopia av Bitcoin-blockkedjan.</translation> + <translation>%1 kommer att ladda ner och lagra en kopia av Bitcoin-blockkedjan.</translation> </message> <message> <source>The wallet will also be stored in this directory.</source> @@ -885,7 +853,7 @@ Var vänlig och försök igen.</translation> </message> <message> <source>Error: Specified data directory "%1" cannot be created.</source> - <translation>Fel: Den angivna datakatalogen "%1" kan inte skapas.</translation> + <translation>Fel: Angiven datakatalog "%1" kan inte skapas.</translation> </message> <message> <source>Error</source> @@ -908,11 +876,11 @@ Var vänlig och försök igen.</translation> </message> <message> <source>Recent transactions may not yet be visible, and therefore your wallet's balance might be incorrect. This information will be correct once your wallet has finished synchronizing with the bitcoin network, as detailed below.</source> - <translation>Nyligen gjorda transaktioner visas inte korrekt och därför kan din plånboks saldo visas felaktigt. Denna information kommer att visas korrekt så snart din plånbok har synkroniserat klart med bitcoin nätverket enligt detaljer nedan.</translation> + <translation>Nyligen gjorda transaktioner visas inte korrekt och därför kan din plånboks saldo visas felaktigt. Denna information kommer att visas korrekt så snart din plånbok har synkroniserat klart med Bitcoin-nätverket enligt detaljer nedan.</translation> </message> <message> <source>Attempting to spend bitcoins that are affected by not-yet-displayed transactions will not be accepted by the network.</source> - <translation>Försöka sig på att spendera bitcoins som påverkas av transaktioner som ännu inte visas kommer inte bli accepterade av nätverket. </translation> + <translation>Att försöka spendera bitcoin som påverkas av transaktioner som ännu inte visas kommer inte accepteras av nätverket. </translation> </message> <message> <source>Number of blocks left</source> @@ -971,7 +939,7 @@ Var vänlig och försök igen.</translation> </message> <message> <source>Select payment request file to open</source> - <translation>Välj betalningsförfrågningsfil som ska öppnas</translation> + <translation>Välj betalningsbegäransfil som ska öppnas</translation> </message> </context> <context> @@ -1013,6 +981,18 @@ Var vänlig och försök igen.</translation> <translation>Visas, om den angivna standard-SOCKS5-proxyn används för att nå noder via den här nätverkstypen.</translation> </message> <message> + <source>Use separate SOCKS&5 proxy to reach peers via Tor hidden services:</source> + <translation>Använd separata SOCKS&5-proxy för att nå noder via Tors dolda tjänster:</translation> + </message> + <message> + <source>Hide the icon from the system tray.</source> + <translation>Göm ikonen från aktivitetsfältet.</translation> + </message> + <message> + <source>&Hide tray icon</source> + <translation>&Göm ikonen</translation> + </message> + <message> <source>Minimize instead of exit the application when the window is closed. When this option is enabled, the application will be closed only after selecting Exit in the menu.</source> <translation>Minimera istället för att stänga programmet när fönstret stängs. När detta alternativ är aktiverat stängs programmet endast genom att välja Stäng i menyn.</translation> </message> @@ -1062,7 +1042,7 @@ Var vänlig och försök igen.</translation> </message> <message> <source>If you disable the spending of unconfirmed change, the change from a transaction cannot be used until that transaction has at least one confirmation. This also affects how your balance is computed.</source> - <translation>Om du avaktiverar betalning med obekräftad växel, kan inte växeln från en transaktion användas förrän den transaktionen har minst en bekräftelse.</translation> + <translation>Om du avaktiverar spendering av obekräftad växel, kan inte växeln från en transaktion användas förrän transaktionen har minst en bekräftelse. Detta påverkar också hur ditt saldo beräknas.</translation> </message> <message> <source>&Spend unconfirmed change</source> @@ -1070,13 +1050,21 @@ Var vänlig och försök igen.</translation> </message> <message> <source>Automatically open the Bitcoin client port on the router. This only works when your router supports UPnP and it is enabled.</source> - <translation>Öppna automatiskt Bitcoin-klientens port på routern. Detta fungerar endast om din router har UPnP aktiverat.</translation> + <translation>Öppna automatiskt Bitcoin-klientens port på routern. Detta fungerar endast om din router stödjer UPnP och det är är aktiverat.</translation> </message> <message> <source>Map port using &UPnP</source> <translation>Tilldela port med hjälp av &UPnP</translation> </message> <message> + <source>Accept connections from outside.</source> + <translation>Acceptera anslutningar utifrån.</translation> + </message> + <message> + <source>Allow incomin&g connections</source> + <translation>Tillåt ankommande anslutningar</translation> + </message> + <message> <source>Connect to the Bitcoin network through a SOCKS5 proxy.</source> <translation>Anslut till Bitcoin-nätverket genom en SOCKS5-proxy.</translation> </message> @@ -1157,6 +1145,10 @@ Var vänlig och försök igen.</translation> <translation>Om myntkontrollfunktioner skall visas eller inte</translation> </message> <message> + <source>&Third party transaction URLs</source> + <translation>&URL:er för tredjepartstransaktioner</translation> + </message> + <message> <source>&OK</source> <translation>&OK</translation> </message> @@ -1245,11 +1237,11 @@ Var vänlig och försök igen.</translation> </message> <message> <source>Mined balance that has not yet matured</source> - <translation>Den genererade balansen som ännu inte har mognat</translation> + <translation>Genererat saldo som ännu inte har mognat</translation> </message> <message> <source>Balances</source> - <translation>Balanser</translation> + <translation>Saldon</translation> </message> <message> <source>Total:</source> @@ -1257,11 +1249,11 @@ Var vänlig och försök igen.</translation> </message> <message> <source>Your current total balance</source> - <translation>Ditt nuvarande totala saldo</translation> + <translation>Ditt aktuella totala saldo</translation> </message> <message> <source>Your current balance in watch-only addresses</source> - <translation>Ditt nuvarande saldo i granska-bara adresser</translation> + <translation>Ditt aktuella saldo i granska-bara adresser</translation> </message> <message> <source>Spendable:</source> @@ -1273,15 +1265,15 @@ Var vänlig och försök igen.</translation> </message> <message> <source>Unconfirmed transactions to watch-only addresses</source> - <translation>Okonfirmerade transaktioner till granska-bara adresser</translation> + <translation>Obekräftade transaktioner till granska-bara adresser</translation> </message> <message> <source>Mined balance in watch-only addresses that has not yet matured</source> - <translation>Den genererade balansen i granska-bara adresser som ännu inte har mognat</translation> + <translation>Genererat saldo i granska-bara adresser som ännu inte har mognat</translation> </message> <message> <source>Current total balance in watch-only addresses</source> - <translation>Nuvarande total balans i granska-bara adresser</translation> + <translation>Aktuellt totalt saldo i granska-bara adresser</translation> </message> </context> <context> @@ -1292,7 +1284,7 @@ Var vänlig och försök igen.</translation> </message> <message> <source>Cannot start bitcoin: click-to-pay handler</source> - <translation>Kan inte starta bitcoin: klicka-och-betala handhavare</translation> + <translation>Kan inte starta bitcoin: klicka-och-betala hanteraren</translation> </message> <message> <source>URI handling</source> @@ -1300,7 +1292,7 @@ Var vänlig och försök igen.</translation> </message> <message> <source>Payment request fetch URL is invalid: %1</source> - <translation>Hämtningsadressen för betalningsförfrågan är ogiltig: %1</translation> + <translation>Hämtningsadressen för betalningsbegäran är ogiltig: %1</translation> </message> <message> <source>Invalid payment address %1</source> @@ -1308,15 +1300,15 @@ Var vänlig och försök igen.</translation> </message> <message> <source>URI cannot be parsed! This can be caused by an invalid Bitcoin address or malformed URI parameters.</source> - <translation>URI kan inte tolkas! Detta kan orsakas av en ogiltig Bitcoin-adress eller felaktiga URI parametrar.</translation> + <translation>URI kan inte parsas! Detta kan orsakas av en ogiltig Bitcoin-adress eller felaktiga URI-parametrar.</translation> </message> <message> <source>Payment request file handling</source> - <translation>Hantering av betalningsförfrågningsfil</translation> + <translation>Hantering av betalningsbegäransfil</translation> </message> <message> <source>Payment request file cannot be read! This can be caused by an invalid payment request file.</source> - <translation>Betalningsförfrågningsfilen kan inte läsas! Detta kan orsakas av en felaktig betalningsförfrågnigsfil.</translation> + <translation>Betalningsbegäransfilen kan inte läsas! Detta kan orsakas av en ogiltig betalningsbegäransfil.</translation> </message> <message> <source>Payment request rejected</source> @@ -1336,7 +1328,7 @@ Var vänlig och försök igen.</translation> </message> <message> <source>Unverified payment requests to custom payment scripts are unsupported.</source> - <translation>Overifierade betalningsförfrågningar till anpassade betalningsskript stöds inte.</translation> + <translation>Overifierade betalningsbegäranden till anpassade betalningsskript stöds inte.</translation> </message> <message> <source>Invalid payment request.</source> @@ -1360,7 +1352,7 @@ Var vänlig och försök igen.</translation> </message> <message> <source>Payment request cannot be parsed!</source> - <translation>Betalningsbegäran kan inte behandlas!</translation> + <translation>Betalningsbegäran kan inte parsas!</translation> </message> <message> <source>Bad response from server %1</source> @@ -1368,7 +1360,7 @@ Var vänlig och försök igen.</translation> </message> <message> <source>Network request error</source> - <translation>Fel vid närverksbegäran</translation> + <translation>Fel vid nätverksbegäran</translation> </message> <message> <source>Payment acknowledged</source> @@ -1497,11 +1489,7 @@ Var vänlig och försök igen.</translation> <name>QObject::QObject</name> <message> <source>Error: Specified data directory "%1" does not exist.</source> - <translation>Fel: Den angivna datakatalogen "%1" finns inte.</translation> - </message> - <message> - <source>Error: Cannot parse configuration file: %1. Only use key=value syntax.</source> - <translation>Fel: Kan inte läsa konfigurationsfilen: %1. Använd bara nyckel=värde formatet.</translation> + <translation>Fel: Angiven datakatalog "%1" finns inte.</translation> </message> <message> <source>Error: %1</source> @@ -1587,7 +1575,7 @@ Var vänlig och försök igen.</translation> </message> <message> <source>Current number of transactions</source> - <translation>Nuvarande antal transaktioner</translation> + <translation>Aktuellt antal transaktioner</translation> </message> <message> <source>Memory usage</source> @@ -1683,7 +1671,7 @@ Var vänlig och försök igen.</translation> </message> <message> <source>The duration of a currently outstanding ping.</source> - <translation>Tidsåtgången för en nuvarande utestående ping.</translation> + <translation>Tidsåtgången för en aktuell utestående ping.</translation> </message> <message> <source>Ping Wait</source> @@ -1770,6 +1758,18 @@ Var vänlig och försök igen.</translation> <translation>Använd upp- och ner-pilarna för att navigera i historiken, och %1 för att rensa skärmen.</translation> </message> <message> + <source>Type %1 for an overview of available commands.</source> + <translation>Skriv %1 för att få en överblick över tillgängliga kommandon.</translation> + </message> + <message> + <source>For more information on using this console type %1.</source> + <translation>För mer information om att använda denna konsol, skriv %1.</translation> + </message> + <message> + <source>WARNING: Scammers have been active, telling users to type commands here, stealing their wallet contents. Do not use this console without fully understanding the ramifications of a command.</source> + <translation>VARNING: Bedragare är kända för att be användare skriva olika kommandon här, varpå de stjäl plånböckernas innehåll. Använd inte konsolen utan att fullt ut förstå konsekvenserna av ett visst kommando.</translation> + </message> + <message> <source>Network activity disabled</source> <translation>Nätverksaktivitet inaktiverad</translation> </message> @@ -1822,15 +1822,15 @@ Var vänlig och försök igen.</translation> </message> <message> <source>An optional message to attach to the payment request, which will be displayed when the request is opened. Note: The message will not be sent with the payment over the Bitcoin network.</source> - <translation>Ett frivilligt meddelande att bifoga betalningsbegäran, vilket visas när begäran öppnas. NB: Meddelandet kommer inte att sändas med betalningen över Bitcoinnätverket.</translation> + <translation>Ett valfritt meddelande att bifoga betalningsbegäran, vilket visas när begäran öppnas. Obs: Meddelandet kommer inte att sändas med betalningen över Bitcoin-nätverket.</translation> </message> <message> <source>An optional label to associate with the new receiving address.</source> - <translation>En frivillig etikett att associera med den nya mottagningsadressen.</translation> + <translation>En valfri etikett att associera med den nya mottagningsadressen.</translation> </message> <message> <source>Use this form to request payments. All fields are <b>optional</b>.</source> - <translation>Använd detta formulär för att begära betalningar. Alla fält är <b>frivilliga</b>.</translation> + <translation>Använd detta formulär för att begära betalningar. Alla fält är <b>valfria</b>.</translation> </message> <message> <source>An optional amount to request. Leave this empty or zero to not request a specific amount.</source> @@ -1932,6 +1932,10 @@ Var vänlig och försök igen.</translation> <translation>Meddelande</translation> </message> <message> + <source>Wallet</source> + <translation>Plånbok</translation> + </message> + <message> <source>Resulting URI too long, try to reduce the text for label / message.</source> <translation>URI:n är för lång, försöka minska texten för etikett / meddelande.</translation> </message> @@ -1964,11 +1968,11 @@ Var vänlig och försök igen.</translation> </message> <message> <source>(no amount requested)</source> - <translation>(inget belopp begärd)</translation> + <translation>(inget belopp begärt)</translation> </message> <message> <source>Requested</source> - <translation>Begärd</translation> + <translation>Begärt</translation> </message> </context> <context> @@ -2019,11 +2023,11 @@ Var vänlig och försök igen.</translation> </message> <message> <source>If this is activated, but the change address is empty or invalid, change will be sent to a newly generated address.</source> - <translation>Om denna är aktiverad men växeladressen är tom eller felaktig kommer växeln att sändas till en nygenererad adress.</translation> + <translation>Om denna är aktiverad men växeladressen är tom eller ogiltig kommer växeln att sändas till en nyss skapad adress.</translation> </message> <message> <source>Custom change address</source> - <translation>Specialväxeladress</translation> + <translation>Anpassad växeladress</translation> </message> <message> <source>Transaction Fee:</source> @@ -2034,6 +2038,10 @@ Var vänlig och försök igen.</translation> <translation>Välj...</translation> </message> <message> + <source>Using the fallbackfee can result in sending a transaction that will take several hours or days (or never) to confirm. Consider choosing your fee manually or wait until you have validated the complete chain.</source> + <translation>Med standardavgiften riskerar en transaktion ta timmar eller dagar för att bekräftas, om den ens gör det. Överväg att själv välja avgift alternativt vänta tills du har validerat hela kedjan.</translation> + </message> + <message> <source>Warning: Fee estimation is currently not possible.</source> <translation>Varning: Avgiftsberäkning är för närvarande inte möjlig.</translation> </message> @@ -2046,16 +2054,12 @@ Var vänlig och försök igen.</translation> <translation>per kilobyte</translation> </message> <message> - <source>If the custom fee is set to 1000 satoshis and the transaction is only 250 bytes, then "per kilobyte" only pays 250 satoshis in fee, while "total at least" pays 1000 satoshis. For transactions bigger than a kilobyte both pay by kilobyte.</source> - <translation>Om den anpassad avgiften är satt till 1000 satoshi och transaktionen bara är 250 byte, betalar "per kilobyte" bara 250 satoshi i avgift, medans "totalt minst" betalar 1000 satoshi. För transaktioner större än en kilobyte betalar både per kilobyte.</translation> - </message> - <message> <source>Hide</source> <translation>Göm</translation> </message> <message> <source>Paying only the minimum fee is just fine as long as there is less transaction volume than space in the blocks. But be aware that this can end up in a never confirming transaction once there is more demand for bitcoin transactions than the network can process.</source> - <translation>Att betala endast den minsta avgiften är bara bra så länge det är mindre transaktionsvolym än utrymme i blocken. Men tänk på att det kan hamna i en aldrig bekräftar transaktion när det finns mer efterfrågan på bitcoin transaktioner än nätverket kan bearbeta.</translation> + <translation>Att bara betala den minsta avgiften är helt ok så länge transaktionsvolymen är mindre än ledigt utrymme i blocken. Men tänk på att det kan bli en en transaktion som aldrig bekräftas om efterfrågan på bitcoin-transaktioner är större än vad nätverket kan hantera.</translation> </message> <message> <source>(read the tooltip)</source> @@ -2094,16 +2098,24 @@ Var vänlig och försök igen.</translation> <translation>Bekräftelsestidsmål:</translation> </message> <message> + <source>Enable Replace-By-Fee</source> + <translation>Möjliggör ersättande avgift</translation> + </message> + <message> + <source>With Replace-By-Fee (BIP-125) you can increase a transaction's fee after it is sent. Without this, a higher fee may be recommended to compensate for increased transaction delay risk.</source> + <translation>Med ersättande avgift (BIP-125) kan du höja transaktionsavgiften efter att transaktionen redan skickats. Om du väljer bort det kan en högre avgift rekommenderas för att kompensera för ökad risk för förhöjd transaktionstid.</translation> + </message> + <message> <source>Clear &All</source> <translation>Rensa &alla</translation> </message> <message> <source>Balance:</source> - <translation>Balans:</translation> + <translation>Saldo:</translation> </message> <message> <source>Confirm the send action</source> - <translation>Bekräfta sändordern</translation> + <translation>Bekräfta sändåtgärden</translation> </message> <message> <source>S&end</source> @@ -2150,20 +2162,24 @@ Var vänlig och försök igen.</translation> <translation>Är du säker på att du vill skicka?</translation> </message> <message> - <source>added as transaction fee</source> - <translation>adderad som transaktionsavgift</translation> + <source>or</source> + <translation>eller</translation> </message> <message> - <source>Total Amount %1</source> - <translation>Totalt belopp %1</translation> + <source>You can increase the fee later (signals Replace-By-Fee, BIP-125).</source> + <translation>Du kan välja att höja avgiften senare (med ersättande avgift, BIP-125).</translation> </message> <message> - <source>or</source> - <translation>eller</translation> + <source>Transaction fee</source> + <translation>Transaktionsavgift</translation> + </message> + <message> + <source>Not signalling Replace-By-Fee, BIP-125.</source> + <translation>Använder inte ersättande avgift, BIP-125.</translation> </message> <message> <source>Confirm send coins</source> - <translation>Bekräfta skickade mynt</translation> + <translation>Bekräfta att mynt ska skickas</translation> </message> <message> <source>The recipient address is not valid. Please recheck.</source> @@ -2175,15 +2191,15 @@ Var vänlig och försök igen.</translation> </message> <message> <source>The amount exceeds your balance.</source> - <translation>Värdet överstiger ditt saldo.</translation> + <translation>Beloppet överstiger ditt saldo.</translation> </message> <message> <source>The total exceeds your balance when the %1 transaction fee is included.</source> - <translation>Totalvärdet överstiger ditt saldo när transaktionsavgiften %1 är pålagd.</translation> + <translation>Totalbeloppet överstiger ditt saldo när transaktionsavgiften %1 är pålagd.</translation> </message> <message> <source>Duplicate address found: addresses should only be used once each.</source> - <translation>Duplicerad adress upptäckt: adresser skall endast användas en gång var.</translation> + <translation>Dubblettadress hittades: adresser skall endast användas en gång var.</translation> </message> <message> <source>Transaction creation failed!</source> @@ -2211,7 +2227,7 @@ Var vänlig och försök igen.</translation> </message> <message> <source>Warning: Invalid Bitcoin address</source> - <translation>Varning: Felaktig Bitcoinadress</translation> + <translation>Varning: Ogiltig Bitcoin-adress</translation> </message> <message> <source>Warning: Unknown change address</source> @@ -2219,15 +2235,15 @@ Var vänlig och försök igen.</translation> </message> <message> <source>Confirm custom change address</source> - <translation>Bekräfta anpassad växlingsadress</translation> + <translation>Bekräfta anpassad växeladress</translation> </message> <message> <source>The address you selected for change is not part of this wallet. Any or all funds in your wallet may be sent to this address. Are you sure?</source> - <translation>Den adress du valt för växel ingår inte i denna plånbok. Eventuella eller alla pengar i din plånbok kan skickas till den här adressen. Är du säker?</translation> + <translation>Den adress du valt för växel ingår inte i denna plånbok. Eventuella eller alla pengar i din plånbok kan komma att skickas till den här adressen. Är du säker?</translation> </message> <message> <source>(no label)</source> - <translation>(Ingen etikett)</translation> + <translation>(ingen etikett)</translation> </message> </context> <context> @@ -2254,7 +2270,7 @@ Var vänlig och försök igen.</translation> </message> <message> <source>The Bitcoin address to send the payment to</source> - <translation>Bitcoinadress att sända betalning till</translation> + <translation>Bitcoin-adress att sända betalning till</translation> </message> <message> <source>Alt+A</source> @@ -2274,13 +2290,17 @@ Var vänlig och försök igen.</translation> </message> <message> <source>The fee will be deducted from the amount being sent. The recipient will receive less bitcoins than you enter in the amount field. If multiple recipients are selected, the fee is split equally.</source> - <translation>Avgiften dras från beloppet som skickas. Mottagaren kommer att få mindre bitcoins än du angivit i belopp-fältet. Om flera mottagare valts kommer avgiften delas jämt.</translation> + <translation>Avgiften dras från beloppet som skickas. Mottagaren kommer att ta emot mindre bitcoin än du angivit i beloppsfältet. Om flera mottagare valts kommer avgiften att fördelas jämt.</translation> </message> <message> <source>S&ubtract fee from amount</source> <translation>S&ubtrahera avgiften från beloppet</translation> </message> <message> + <source>Use available balance</source> + <translation>Använd tillgängligt saldo</translation> + </message> + <message> <source>Message:</source> <translation>Meddelande:</translation> </message> @@ -2294,11 +2314,11 @@ Var vänlig och försök igen.</translation> </message> <message> <source>Enter a label for this address to add it to the list of used addresses</source> - <translation>Ange en etikett för denna adress att adderas till listan över använda adresser</translation> + <translation>Ange en etikett för denna adress för att lägga till den i listan med använda adresser</translation> </message> <message> <source>A message that was attached to the bitcoin: URI which will be stored with the transaction for your reference. Note: This message will not be sent over the Bitcoin network.</source> - <translation>Ett meddelande som bifogades bitcoin-URI, vilket lagras med transaktionen som referens. NB: Meddelandet kommer inte att sändas över Bitcoinnätverket.</translation> + <translation>Ett meddelande som bifogades bitcoin: -URIn och som lagras med transaktionen som referens. NB: Meddelandet kommer inte att sändas över Bitcoin-nätverket.</translation> </message> <message> <source>Pay To:</source> @@ -2310,7 +2330,7 @@ Var vänlig och försök igen.</translation> </message> <message> <source>Enter a label for this address to add it to your address book</source> - <translation>Ange en etikett för den här adressen och lägg till den i din adressbok</translation> + <translation>Ange en etikett för denna adress för att lägga till den i din adressbok</translation> </message> </context> <context> @@ -2343,11 +2363,11 @@ Var vänlig och försök igen.</translation> </message> <message> <source>You can sign messages/agreements with your addresses to prove you can receive bitcoins sent to them. Be careful not to sign anything vague or random, as phishing attacks may try to trick you into signing your identity over to them. Only sign fully-detailed statements you agree to.</source> - <translation>Du kan underteckna meddelanden/avtal med dina adresser för att bevisa att du kan ta emot bitcoins som skickats till dem. Var försiktig så du inte undertecknar något oklart eller konstigt, eftersom phishing-angrepp kan försöka få dig att underteckna din identitet till dem. Underteckna endast väldetaljerade meddelanden som du godkänner.</translation> + <translation>Du kan signera meddelanden/avtal med dina adresser för att bevisa att du kan ta emot bitcoin som skickats till dem. Var försiktig så du inte signerar något oklart eller konstigt, eftersom phishing-angrepp kan försöka få dig att signera över din identitet till dem. Signera endast väldetaljerade meddelanden som du godkänner.</translation> </message> <message> <source>The Bitcoin address to sign the message with</source> - <translation>Bitcoinadress att signera meddelandet med</translation> + <translation>Bitcoin-adress att signera meddelandet med</translation> </message> <message> <source>Choose previously used address</source> @@ -2379,7 +2399,7 @@ Var vänlig och försök igen.</translation> </message> <message> <source>Sign the message to prove you own this Bitcoin address</source> - <translation>Signera meddelandet för att bevisa att du äger denna adress</translation> + <translation>Signera meddelandet för att bevisa att du äger denna Bitcoin-adress</translation> </message> <message> <source>Sign &Message</source> @@ -2399,15 +2419,15 @@ Var vänlig och försök igen.</translation> </message> <message> <source>Enter the receiver's address, message (ensure you copy line breaks, spaces, tabs, etc. exactly) and signature below to verify the message. Be careful not to read more into the signature than what is in the signed message itself, to avoid being tricked by a man-in-the-middle attack. Note that this only proves the signing party receives with the address, it cannot prove sendership of any transaction!</source> - <translation>Ange mottagarens adress, meddelande (kopiera radbrytningar, mellanrum, flikar, etc. exakt) och signatur nedan för att verifiera meddelandet. Undvik att läsa in mera information i signaturen än vad som stod i själva undertecknade meddelandet, för att undvika ett man-in-the-middle-angrepp. Notera att detta endast bevisar att undertecknad tar emot med adressen, det bevisar inte vem som skickat transaktionen!</translation> + <translation>Ange mottagarens adress, meddelande (kopiera radbrytningar, mellanslag, TAB-tecken, osv. exakt) och signatur nedan, för att verifiera meddelandet. Undvik att läsa in mera information i signaturen än vad som stod i själva det signerade meddelandet, för att undvika ett man-in-the-middle-angrepp. Notera att detta endast bevisar att den signerande parten tar emot med adressen, det bevisar inte vem som skickat transaktionen!</translation> </message> <message> <source>The Bitcoin address the message was signed with</source> - <translation>Bitcoinadressen som meddelandet signerades med</translation> + <translation>Bitcoin-adress som meddelandet signerades med</translation> </message> <message> <source>Verify the message to ensure it was signed with the specified Bitcoin address</source> - <translation>Verifiera meddelandet för att vara säker på att den var signerad med den angivna Bitcoin-adressen</translation> + <translation>Verifiera meddelandet för att vara säker på att det signerades med angiven Bitcoin-adress</translation> </message> <message> <source>Verify &Message</source> @@ -2419,7 +2439,7 @@ Var vänlig och försök igen.</translation> </message> <message> <source>Click "Sign Message" to generate signature</source> - <translation>Klicka "Signera Meddelande" för att generera en signatur</translation> + <translation>Klicka "Signera Meddelande" för att skapa en signatur</translation> </message> <message> <source>The entered address is invalid.</source> @@ -2439,7 +2459,7 @@ Var vänlig och försök igen.</translation> </message> <message> <source>Private key for the entered address is not available.</source> - <translation>Privata nyckel för den angivna adressen är inte tillgänglig.</translation> + <translation>Den privata nyckeln för den angivna adressen är inte tillgänglig.</translation> </message> <message> <source>Message signing failed.</source> @@ -2499,10 +2519,6 @@ Var vänlig och försök igen.</translation> <translation>konflikt med en transaktion med %1 konfirmationer</translation> </message> <message> - <source>%1/offline</source> - <translation>%1/nedkopplad</translation> - </message> - <message> <source>0/unconfirmed, %1</source> <translation>0/obekräftade, %1</translation> </message> @@ -2531,10 +2547,6 @@ Var vänlig och försök igen.</translation> <translation>Status</translation> </message> <message> - <source>, has not been successfully broadcast yet</source> - <translation>,har inte lyckats sända än</translation> - </message> - <message> <source>Date</source> <translation>Datum</translation> </message> @@ -2628,7 +2640,7 @@ Var vänlig och försök igen.</translation> </message> <message> <source>Generated coins must mature %1 blocks before they can be spent. When you generated this block, it was broadcast to the network to be added to the block chain. If it fails to get into the chain, its state will change to "not accepted" and it won't be spendable. This may occasionally happen if another node generates a block within a few seconds of yours.</source> - <translation>Genererade mynt måste vänta %1 block innan de kan användas. När du skapade detta block sändes det till nätverket för att läggas till i blockkedjan. Om blocket inte kommer in i kedjan kommer dess status att ändras till "accepteras inte" och kommer ej att gå att spendera. Detta kan ibland hända om en annan nod genererar ett block nästan samtidigt som dig.</translation> + <translation>Skapade mynt måste mogna i %1 block innan de kan spenderas. När du skapade detta block sändes det till nätverket för att läggas till i blockkedjan. Om blocket inte kommer in i kedjan kommer dess status att ändras till "ej accepterat" och går inte att spendera. Detta kan ibland hända om en annan nod skapar ett block nästan samtidigt som dig.</translation> </message> <message> <source>Debug information</source> @@ -2689,12 +2701,8 @@ Var vänlig och försök igen.</translation> <translation>Öppet till %1</translation> </message> <message> - <source>Offline</source> - <translation>Nerkopplad</translation> - </message> - <message> <source>Unconfirmed</source> - <translation>Obekräftade:</translation> + <translation>Obekräftade</translation> </message> <message> <source>Abandoned</source> @@ -2702,7 +2710,7 @@ Var vänlig och försök igen.</translation> </message> <message> <source>Confirming (%1 of %2 recommended confirmations)</source> - <translation>Bekräftar (%1 av %2 bekräftelser)</translation> + <translation>Bekräftar (%1 av %2 rekommenderade bekräftelser)</translation> </message> <message> <source>Confirmed (%1 confirmations)</source> @@ -2717,12 +2725,8 @@ Var vänlig och försök igen.</translation> <translation>Omogen (%1 bekräftelser, blir tillgänglig efter %2)</translation> </message> <message> - <source>This block was not received by any other nodes and will probably not be accepted!</source> - <translation>Det här blocket togs inte emot av några andra noder och kommer antagligen inte att bli accepterad!</translation> - </message> - <message> <source>Generated but not accepted</source> - <translation>Genererad men inte accepterad</translation> + <translation>Skapad men inte accepterad</translation> </message> <message> <source>Received with</source> @@ -2754,7 +2758,7 @@ Var vänlig och försök igen.</translation> </message> <message> <source>(no label)</source> - <translation>(Ingen etikett)</translation> + <translation>(ingen etikett)</translation> </message> <message> <source>Transaction status. Hover over this field to show number of confirmations.</source> @@ -2762,7 +2766,7 @@ Var vänlig och försök igen.</translation> </message> <message> <source>Date and time that the transaction was received.</source> - <translation>Tidpunkt då transaktionen mottogs.</translation> + <translation>Datum och tid då transaktionen mottogs.</translation> </message> <message> <source>Type of transaction.</source> @@ -2770,7 +2774,7 @@ Var vänlig och försök igen.</translation> </message> <message> <source>Whether or not a watch-only address is involved in this transaction.</source> - <translation>Anger om granska-bara--adresser är involverade i denna transaktion.</translation> + <translation>Anger om en granska-bara--adress är involverad i denna transaktion.</translation> </message> <message> <source>User-defined intent/purpose of the transaction.</source> @@ -2778,7 +2782,7 @@ Var vänlig och försök igen.</translation> </message> <message> <source>Amount removed from or added to balance.</source> - <translation>Belopp draget eller tillagt till balans.</translation> + <translation>Belopp draget eller tillagt till saldo.</translation> </message> </context> <context> @@ -2832,6 +2836,10 @@ Var vänlig och försök igen.</translation> <translation>Övriga</translation> </message> <message> + <source>Enter address, transaction id, or label to search</source> + <translation>Ange adress, transaktions-id eller etikett för att söka</translation> + </message> + <message> <source>Min amount</source> <translation>Minsta belopp</translation> </message> @@ -2869,7 +2877,7 @@ Var vänlig och försök igen.</translation> </message> <message> <source>Edit label</source> - <translation>Ändra etikett</translation> + <translation>Redigera etikett</translation> </message> <message> <source>Show transaction details</source> @@ -2917,7 +2925,7 @@ Var vänlig och försök igen.</translation> </message> <message> <source>There was an error trying to save the transaction history to %1.</source> - <translation>Det inträffade ett fel när transaktionshistoriken skulle sparas till %1.</translation> + <translation>Ett fel inträffade när transaktionshistoriken skulle sparas till %1.</translation> </message> <message> <source>Exporting Successful</source> @@ -2925,7 +2933,7 @@ Var vänlig och försök igen.</translation> </message> <message> <source>The transaction history was successfully saved to %1.</source> - <translation>Transaktionshistoriken sparades utan problem till %1.</translation> + <translation>Transaktionshistoriken sparades till %1.</translation> </message> <message> <source>Range:</source> @@ -2947,7 +2955,7 @@ Var vänlig och försök igen.</translation> <name>WalletFrame</name> <message> <source>No wallet has been loaded.</source> - <translation>Ingen plånbok har laddats in.</translation> + <translation>Ingen plånbok har lästs in.</translation> </message> </context> <context> @@ -2966,7 +2974,7 @@ Var vänlig och försök igen.</translation> </message> <message> <source>Current fee:</source> - <translation>Nuvarande avgift:</translation> + <translation>Aktuell avgift:</translation> </message> <message> <source>Increase:</source> @@ -2977,6 +2985,10 @@ Var vänlig och försök igen.</translation> <translation>Ny avgift:</translation> </message> <message> + <source>Confirm fee bump</source> + <translation>Bekräfta avgiftshöjning</translation> + </message> + <message> <source>Can't sign transaction.</source> <translation>Kan ej signera transaktion.</translation> </message> @@ -2993,7 +3005,7 @@ Var vänlig och försök igen.</translation> </message> <message> <source>Export the data in the current tab to a file</source> - <translation>Exportera informationen i den nuvarande fliken till en fil</translation> + <translation>Exportera informationen i aktuell flik till en fil</translation> </message> <message> <source>Backup Wallet</source> @@ -3009,7 +3021,7 @@ Var vänlig och försök igen.</translation> </message> <message> <source>There was an error trying to save the wallet data to %1.</source> - <translation>Det inträffade ett fel när plånbokens data skulle sparas till %1.</translation> + <translation>Ett fel inträffade när plånbokens data skulle sparas till %1.</translation> </message> <message> <source>Backup Successful</source> @@ -3017,40 +3029,16 @@ Var vänlig och försök igen.</translation> </message> <message> <source>The wallet data was successfully saved to %1.</source> - <translation>Plånbokens data sparades utan problem till %1.</translation> + <translation>Plånbokens data sparades till %1.</translation> </message> -</context> + </context> <context> <name>bitcoin-core</name> <message> - <source>Options:</source> - <translation>Inställningar:</translation> - </message> - <message> - <source>Specify data directory</source> - <translation>Ange katalog för data</translation> - </message> - <message> - <source>Connect to a node to retrieve peer addresses, and disconnect</source> - <translation>Anslut till en nod för att hämta klientadresser, och koppla från</translation> - </message> - <message> - <source>Specify your own public address</source> - <translation>Ange din egen publika adress</translation> - </message> - <message> - <source>Accept command line and JSON-RPC commands</source> - <translation>Tillåt kommandon från kommandotolken och JSON-RPC-kommandon</translation> - </message> - <message> <source>Distributed under the MIT software license, see the accompanying file %s or %s</source> <translation>Distribuerad under MIT mjukvarulicens, se den bifogade filen %s eller %s</translation> </message> <message> - <source>If <category> is not supplied or if <category> = 1, output all debugging information.</source> - <translation>Om <kategori> inte anges eller om <category> = 1, visa all avlusningsinformation.</translation> - </message> - <message> <source>Prune configured below the minimum of %d MiB. Please use a higher number.</source> <translation>Beskärning konfigurerad under miniminivån %d MiB. Vänligen använd ett högre värde.</translation> </message> @@ -3067,18 +3055,10 @@ Var vänlig och försök igen.</translation> <translation>Fel: Ett kritiskt internt fel uppstod, se debug.log för detaljer</translation> </message> <message> - <source>Fee (in %s/kB) to add to transactions you send (default: %s)</source> - <translation>Avgift (i %s/kB) att lägga till på transaktioner du skickar (förvalt: %s)</translation> - </message> - <message> <source>Pruning blockstore...</source> <translation>Rensar blockstore...</translation> </message> <message> - <source>Run in the background as a daemon and accept commands</source> - <translation>Kör i bakgrunden som tjänst och acceptera kommandon</translation> - </message> - <message> <source>Unable to start HTTP server. See debug log for details.</source> <translation>Kunde inte starta HTTP-server. Se avlusningsloggen för detaljer.</translation> </message> @@ -3091,44 +3071,12 @@ Var vänlig och försök igen.</translation> <translation>%s-utvecklarna</translation> </message> <message> - <source>A fee rate (in %s/kB) that will be used when fee estimation has insufficient data (default: %s)</source> - <translation>En avgiftskurs (i %s/kB) som används när det inte finns tillräcklig data för att uppskatta avgiften (förvalt: %s)</translation> - </message> - <message> - <source>Accept relayed transactions received from whitelisted peers even when not relaying transactions (default: %d)</source> - <translation>Acceptera vidarebefodrade transaktioner från vitlistade noder även när transaktioner inte vidarebefodras (förvalt: %d)</translation> - </message> - <message> - <source>Bind to given address and always listen on it. Use [host]:port notation for IPv6</source> - <translation>Bind till given adress och lyssna alltid på den. Använd [värd]:port notation för IPv6</translation> - </message> - <message> <source>Cannot obtain a lock on data directory %s. %s is probably already running.</source> <translation>Kan inte låsa data-mappen %s. %s körs förmodligen redan.</translation> </message> <message> - <source>Delete all wallet transactions and only recover those parts of the blockchain through -rescan on startup</source> - <translation>Ta bort alla plånbokstransaktioner och återskapa bara dom som är en del av blockkedjan genom att ange -rescan vid uppstart</translation> - </message> - <message> <source>Error reading %s! All keys read correctly, but transaction data or address book entries might be missing or incorrect.</source> - <translation>Fel vid läsning av %s! Alla nycklar lästes korrekt, men transaktionsdatat eller adressbokens poster kanske saknas eller är felaktiga.</translation> - </message> - <message> - <source>Execute command when a wallet transaction changes (%s in cmd is replaced by TxID)</source> - <translation>Exekvera kommando när en plånbokstransaktion ändras (%s i cmd är ersatt av TxID)</translation> - </message> - <message> - <source>Extra transactions to keep in memory for compact block reconstructions (default: %u)</source> - <translation>Extra transaktioner att hålla i minnet för kompakta blockrekonstruktioner (standard: %u)</translation> - </message> - <message> - <source>Maximum allowed median peer time offset adjustment. Local perspective of time may be influenced by peers forward or backward by this amount. (default: %u seconds)</source> - <translation>Maximalt tillåten median-peer tidsoffset justering. Lokalt perspektiv av tiden kan bli påverkad av partners, framåt eller bakåt denna tidsrymd. (förvalt: %u sekunder)</translation> - </message> - <message> - <source>Maximum total fees (in %s) to use in a single wallet transaction or raw transaction; setting this too low may abort large transactions (default: %s)</source> - <translation>Maximal total avgift (i %s) att använda i en plånbokstransaktion eller råa transaktioner. Sätts denna för lågt kan stora transaktioner avbrytas (förvalt: %s)</translation> + <translation>Fel vid läsning av %s! Alla nycklar lästes korrekt, men transaktionsdata eller poster i adressboken kanske saknas eller är felaktiga.</translation> </message> <message> <source>Please check that your computer's date and time are correct! If your clock is wrong, %s will not work properly.</source> @@ -3139,46 +3087,30 @@ Var vänlig och försök igen.</translation> <translation>Var snäll och bidra om du finner %s användbar. Besök %s för mer information om mjukvaran.</translation> </message> <message> - <source>Set the number of script verification threads (%u to %d, 0 = auto, <0 = leave that many cores free, default: %d)</source> - <translation>Ange antalet skriptkontrolltrådar (%u till %d, 0 = auto, <0 = lämna så många kärnor lediga, förval: %d)</translation> - </message> - <message> <source>The block database contains a block which appears to be from the future. This may be due to your computer's date and time being set incorrectly. Only rebuild the block database if you are sure that your computer's date and time are correct</source> <translation>Blockdatabasen innehåller ett block som verkar vara från framtiden. Detta kan vara på grund av att din dators datum och tid är felaktiga. Bygg bara om blockdatabasen om du är säker på att datorns datum och tid är korrekt</translation> </message> <message> <source>This is a pre-release test build - use at your own risk - do not use for mining or merchant applications</source> - <translation>Detta är ett förhandstestbygge - använd på egen risk - använd inte för mining eller handels applikationer</translation> + <translation>Detta är ett förhandstestbygge - använd på egen risk - använd inte för brytning eller handelsapplikationer</translation> </message> <message> - <source>Unable to rewind the database to a pre-fork state. You will need to redownload the blockchain</source> - <translation>Kan inte spola tillbaka databasen till obeskärt läge. Du måste ladda ner blockkedjan igen</translation> - </message> - <message> - <source>Use UPnP to map the listening port (default: 1 when listening and no -proxy)</source> - <translation>Använd UPnP för att mappa den lyssnande porten (förvalt: 1 när lyssning aktiverat och utan -proxy)</translation> - </message> - <message> - <source>Username and hashed password for JSON-RPC connections. The field <userpw> comes in the format: <USERNAME>:<SALT>$<HASH>. A canonical python script is included in share/rpcuser. The client then connects normally using the rpcuser=<USERNAME>/rpcpassword=<PASSWORD> pair of arguments. This option can be specified multiple times</source> - <translation>Användarnamn och hashat lösenord för JSON-RPC-anslutningar. Fältet <userpw> kommer i formatet: <USERNAME>:<SALT>$<HASH>. Ett kanoniskt pythonskript finns inkluderat i share/rpcuser. Klienten kopplas sedan normalt med rpcuser=<USERNAME>/rpcpassword=<PASSWORD> par argument. Detta alternativ kan anges flera gånger</translation> + <source>Unable to replay blocks. You will need to rebuild the database using -reindex-chainstate.</source> + <translation>Kunde inte spela om block. Du kommer att behöva bygga om databasen med -reindex-chainstate.</translation> </message> <message> - <source>Wallet will not create transactions that violate mempool chain limits (default: %u)</source> - <translation>Plånboken skapar inte transaktioner som bryter mot mempools kedjegränser (förval: %u)</translation> + <source>Unable to rewind the database to a pre-fork state. You will need to redownload the blockchain</source> + <translation>Kan inte spola tillbaka databasen till obeskärt läge. Du måste ladda ner blockkedjan igen</translation> </message> <message> <source>Warning: The network does not appear to fully agree! Some miners appear to be experiencing issues.</source> - <translation>Varning: Nätverket verkar inte vara helt överens! Några miners verkar ha problem.</translation> + <translation>Varning: Nätverket verkar inte vara helt överens! Några brytare verkar ha problem.</translation> </message> <message> <source>Warning: We do not appear to fully agree with our peers! You may need to upgrade, or other nodes may need to upgrade.</source> <translation>Varning: Vi verkar inte helt överens med våra peers! Du kan behöva uppgradera, eller andra noder kan behöva uppgradera.</translation> </message> <message> - <source>Whether to save the mempool on shutdown and load on restart (default: %u)</source> - <translation>Hurvida du vill spara mempoolen vid avstängning och ladda på omstart (förval: %u)</translation> - </message> - <message> <source>%d of last 100 blocks have unexpected version</source> <translation>%d av de senaste 100 blocken har oväntad version</translation> </message> @@ -3191,36 +3123,12 @@ Var vänlig och försök igen.</translation> <translation>-maxmempool måste vara minst %d MB</translation> </message> <message> - <source><category> can be:</source> - <translation><category> Kan vara:</translation> - </message> - <message> - <source>Accept connections from outside (default: 1 if no -proxy or -connect)</source> - <translation>Acceptera anslutningar utifrån (förvalt: 1 om ingen -proxy eller -connect)</translation> - </message> - <message> - <source>Append comment to the user agent string</source> - <translation>Lägg till kommentar till user-agent-strängen</translation> - </message> - <message> - <source>Attempt to recover private keys from a corrupt wallet on startup</source> - <translation>Försök att rädda privata nycklar från en korrupt plånbok vid uppstart</translation> - </message> - <message> - <source>Block creation options:</source> - <translation>Block skapande inställningar:</translation> - </message> - <message> <source>Cannot resolve -%s address: '%s'</source> <translation>Kan inte matcha -%s adress: '%s'</translation> </message> <message> <source>Change index out of range</source> - <translation>Förändringsindexet utom räckhåll</translation> - </message> - <message> - <source>Connection options:</source> - <translation>Anslutningsalternativ:</translation> + <translation>Förändringsindexet utanför tillåtet intervall</translation> </message> <message> <source>Copyright (C) %i-%i</source> @@ -3231,38 +3139,10 @@ Var vänlig och försök igen.</translation> <translation>Korrupt blockdatabas har upptäckts</translation> </message> <message> - <source>Debugging/Testing options:</source> - <translation>Avlusnings/Test-alternativ:</translation> - </message> - <message> - <source>Do not load the wallet and disable wallet RPC calls</source> - <translation>Ladda inte plånboken och stäng av RPC-anrop till plånboken</translation> - </message> - <message> <source>Do you want to rebuild the block database now?</source> <translation>Vill du bygga om blockdatabasen nu?</translation> </message> <message> - <source>Enable publish hash block in <address></source> - <translation>Aktivera publicering av hashblock i <adress></translation> - </message> - <message> - <source>Enable publish hash transaction in <address></source> - <translation>Aktivera publicering av hashtransaktion i <adress></translation> - </message> - <message> - <source>Enable publish raw block in <address></source> - <translation>Aktivera publicering av råa block i <adress></translation> - </message> - <message> - <source>Enable publish raw transaction in <address></source> - <translation>Aktivera publicering av råa transaktioner i <adress></translation> - </message> - <message> - <source>Enable transaction replacement in the memory pool (default: %u)</source> - <translation>Aktivera byte av transaktioner i minnespoolen (förvalt: %u)</translation> - </message> - <message> <source>Error initializing block database</source> <translation>Fel vid initiering av blockdatabasen</translation> </message> @@ -3276,11 +3156,11 @@ Var vänlig och försök igen.</translation> </message> <message> <source>Error loading %s: Wallet corrupted</source> - <translation>Fel vid inläsningen av %s: Plånboken är koruppt</translation> + <translation>Fel vid inläsning av %s: Plånboken är korrupt</translation> </message> <message> <source>Error loading %s: Wallet requires newer version of %s</source> - <translation>Fel vid inläsningen av %s: Plånboken kräver en senare version av %s</translation> + <translation>Fel vid inläsning av %s: Plånboken kräver en senare version av %s</translation> </message> <message> <source>Error loading block database</source> @@ -3299,6 +3179,10 @@ Var vänlig och försök igen.</translation> <translation>Misslyckades att lyssna på någon port. Använd -listen=0 om du vill detta.</translation> </message> <message> + <source>Failed to rescan the wallet during initialization</source> + <translation>Misslyckades med att skanna om plånboken under initiering.</translation> + </message> + <message> <source>Importing...</source> <translation>Importerar...</translation> </message> @@ -3312,7 +3196,7 @@ Var vänlig och försök igen.</translation> </message> <message> <source>Invalid amount for -%s=<amount>: '%s'</source> - <translation>Ogiltigt belopp för -%s=<belopp>:'%s'</translation> + <translation>Ogiltigt belopp för -%s=<amount>:'%s'</translation> </message> <message> <source>Invalid amount for -discardfee=<amount>: '%s'</source> @@ -3320,41 +3204,21 @@ Var vänlig och försök igen.</translation> </message> <message> <source>Invalid amount for -fallbackfee=<amount>: '%s'</source> - <translation>Ogiltigt belopp för -fallbackfee=<belopp>: '%s'</translation> - </message> - <message> - <source>Keep the transaction memory pool below <n> megabytes (default: %u)</source> - <translation>Håll minnespoolen över transaktioner under <n> megabyte (förvalt: %u)</translation> + <translation>Ogiltigt belopp för -fallbackfee=<amount>: '%s'</translation> </message> <message> <source>Loading P2P addresses...</source> - <translation>Laddar P2P adresser...</translation> + <translation>Läser in P2P-adresser...</translation> </message> <message> <source>Loading banlist...</source> - <translation>Laddar svarta listan...</translation> - </message> - <message> - <source>Location of the auth cookie (default: data dir)</source> - <translation>Plats för authcookie (förvalt: datamapp)</translation> + <translation>Läser in svarta listan...</translation> </message> <message> <source>Not enough file descriptors available.</source> <translation>Inte tillräckligt med filbeskrivningar tillgängliga.</translation> </message> <message> - <source>Only connect to nodes in network <net> (ipv4, ipv6 or onion)</source> - <translation>Anslut enbart till noder i nätverket <net> (IPv4, IPv6 eller onion)</translation> - </message> - <message> - <source>Print this help message and exit</source> - <translation>Visa denna hjälptext och avsluta</translation> - </message> - <message> - <source>Print version and exit</source> - <translation>Visa version och avsluta</translation> - </message> - <message> <source>Prune cannot be configured with a negative value.</source> <translation>Beskärning kan inte konfigureras med ett negativt värde.</translation> </message> @@ -3363,30 +3227,22 @@ Var vänlig och försök igen.</translation> <translation>Beskärningsläge är inkompatibel med -txindex.</translation> </message> <message> - <source>Rebuild chain state and block index from the blk*.dat files on disk</source> - <translation>Återskapa blockkedjans status och index från blk*.dat filer på disken</translation> - </message> - <message> - <source>Rebuild chain state from the currently indexed blocks</source> - <translation>Återskapa blockkedjans status från aktuella indexerade block</translation> + <source>Replaying blocks...</source> + <translation>Spelar om block...</translation> </message> <message> <source>Rewinding blocks...</source> <translation>Spolar tillbaka blocken...</translation> </message> <message> - <source>Set database cache size in megabytes (%d to %d, default: %d)</source> - <translation>Sätt databasens cachestorlek i megabyte (%d till %d, förvalt: %d)</translation> - </message> - <message> - <source>Specify wallet file (within data directory)</source> - <translation>Ange plånboksfil (inom datakatalogen)</translation> - </message> - <message> <source>The source code is available from %s.</source> <translation>Källkoden är tillgänglig från %s.</translation> </message> <message> + <source>Transaction fee and change calculation failed</source> + <translation>Beräkning av transaktionsavgift och växel mislyckades</translation> + </message> + <message> <source>Unable to bind to %s on this computer. %s is probably already running.</source> <translation>Det går inte att binda till %s på den här datorn. %s är förmodligen redan igång.</translation> </message> @@ -3403,16 +3259,12 @@ Var vänlig och försök igen.</translation> <translation>Argumentet -tor hittades men stöds inte, använd -onion.</translation> </message> <message> - <source>Upgrading UTXO database</source> - <translation>Uppgraderar UTXO-databasen</translation> - </message> - <message> - <source>Use UPnP to map the listening port (default: %u)</source> - <translation>Använd UPnP för att mappa den lyssnande porten (förvalt: %u)</translation> + <source>Unsupported logging category %s=%s.</source> + <translation>Saknar stöd för loggningskategori %s=%s.</translation> </message> <message> - <source>Use the test chain</source> - <translation>Använd testkedjan</translation> + <source>Upgrading UTXO database</source> + <translation>Uppgraderar UTXO-databasen</translation> </message> <message> <source>User Agent comment (%s) contains unsafe characters.</source> @@ -3423,100 +3275,36 @@ Var vänlig och försök igen.</translation> <translation>Verifierar block...</translation> </message> <message> - <source>Wallet debugging/testing options:</source> - <translation>Plånbokens Avlusnings/Testnings optioner:</translation> - </message> - <message> <source>Wallet needed to be rewritten: restart %s to complete</source> <translation>Plånboken behöver sparas om: Starta om %s för att fullfölja</translation> </message> <message> - <source>Wallet options:</source> - <translation>Plånboksinställningar:</translation> - </message> - <message> - <source>Allow JSON-RPC connections from specified source. Valid for <ip> are a single IP (e.g. 1.2.3.4), a network/netmask (e.g. 1.2.3.4/255.255.255.0) or a network/CIDR (e.g. 1.2.3.4/24). This option can be specified multiple times</source> - <translation>Tillåt JSON-RPC-anslutningar från specifik källa. Tillåtna <ip> är enkel IP (t.ex 1.2.3.4), en nätverk/nätmask (t.ex. 1.2.3.4/255.255.255.0) eller ett nätverk/CIDR (t.ex. 1.2.3.4/24). Detta alternativ anges flera gånger</translation> - </message> - <message> - <source>Bind to given address and whitelist peers connecting to it. Use [host]:port notation for IPv6</source> - <translation>Bind till given adress och vitlista klienter som ansluter till den. Använd [värd]:port notation för IPv6</translation> - </message> - <message> - <source>Create new files with system default permissions, instead of umask 077 (only effective with disabled wallet functionality)</source> - <translation>Skapa nya filer med systemets förvalda rättigheter, istället för umask 077 (bara effektivt med avaktiverad plånboks funktionalitet)</translation> - </message> - <message> - <source>Discover own IP addresses (default: 1 when listening and no -externalip or -proxy)</source> - <translation>Upptäck egna IP adresser (standard: 1 vid lyssning ingen -externalip eller -proxy)</translation> - </message> - <message> <source>Error: Listening for incoming connections failed (listen returned error %s)</source> <translation>Fel: Avlyssning av inkommande anslutningar misslyckades (Avlyssningen returnerade felkod %s)</translation> </message> <message> - <source>Execute command when a relevant alert is received or we see a really long fork (%s in cmd is replaced by message)</source> - <translation>Exekvera kommando när ett relevant meddelande är mottagen eller när vi ser en väldigt lång förgrening (%s i cmd är utbytt med ett meddelande)</translation> - </message> - <message> - <source>Fees (in %s/kB) smaller than this are considered zero fee for relaying, mining and transaction creation (default: %s)</source> - <translation>Avgifter (i %s/kB) mindre än detta betraktas som nollavgift för vidarebefordran, mining och transaktionsskapande (förvalt: %s)</translation> - </message> - <message> - <source>If paytxfee is not set, include enough fee so transactions begin confirmation on average within n blocks (default: %u)</source> - <translation>Om paytxfee inte är satt, inkludera tillräcklig avgift så att transaktionen börjar att konfirmeras inom n blocks (förvalt: %u)</translation> - </message> - <message> <source>Invalid amount for -maxtxfee=<amount>: '%s' (must be at least the minrelay fee of %s to prevent stuck transactions)</source> - <translation>Otillåtet belopp för -maxtxfee=<belopp>: '%s' (måste åtminstånde vara minrelay avgift %s för att förhindra stoppade transkationer)</translation> - </message> - <message> - <source>Maximum size of data in data carrier transactions we relay and mine (default: %u)</source> - <translation>Maximal storlek på data i databärartransaktioner som vi reläar och bryter (förvalt: %u) </translation> - </message> - <message> - <source>Randomize credentials for every proxy connection. This enables Tor stream isolation (default: %u)</source> - <translation>Slumpa autentiseringen för varje proxyanslutning. Detta möjliggör Tor ström-isolering (förvalt: %u)</translation> + <translation>Ogiltigt belopp för -maxtxfee=<amount>: '%s' (måste vara åtminstone minrelay avgift %s för att förhindra stoppade transaktioner)</translation> </message> <message> <source>The transaction amount is too small to send after the fee has been deducted</source> <translation>Transaktionen är för liten att skicka efter det att avgiften har dragits</translation> </message> <message> - <source>Whitelisted peers cannot be DoS banned and their transactions are always relayed, even if they are already in the mempool, useful e.g. for a gateway</source> - <translation>Vitlistade klienter kan inte bli DoS-bannade och deras transaktioner reläas alltid, även om dom redan är i mempoolen, användbart för t.ex en gateway </translation> - </message> - <message> <source>You need to rebuild the database using -reindex to go back to unpruned mode. This will redownload the entire blockchain</source> - <translation>Du måste bygga om databasen genom att använda -reindex för att återgå till obeskärt läge. Detta kommer att ladda ner hela blockkedjan.</translation> - </message> - <message> - <source>(default: %u)</source> - <translation>(förvalt: %u)</translation> - </message> - <message> - <source>Accept public REST requests (default: %u)</source> - <translation>Acceptera publika REST förfrågningar (förvalt: %u)</translation> - </message> - <message> - <source>Automatically create Tor hidden service (default: %d)</source> - <translation>Skapa automatiskt dold tjänst i Tor (förval: %d)</translation> - </message> - <message> - <source>Connect through SOCKS5 proxy</source> - <translation>Anslut genom SOCKS5 proxy</translation> + <translation>Du måste bygga om databasen genom att använda -reindex för att återgå till obeskärt läge. Detta kommer att ladda ner hela blockkedjan på nytt.</translation> </message> <message> <source>Error loading %s: You can't disable HD on an already existing HD wallet</source> - <translation>Fel vid laddning av %s: Du kan inte avaktivera HD på en redan existerande HD plånbok</translation> + <translation>Fel vid inläsning av %s: Du kan inte avaktivera HD på en redan existerande HD-plånbok</translation> </message> <message> <source>Error reading from database, shutting down.</source> <translation>Fel vid läsning från databas, avslutar.</translation> </message> <message> - <source>Imports blocks from external blk000??.dat file on startup</source> - <translation>Importera block från extern blk000??.dat-fil vid uppstart</translation> + <source>Error upgrading chainstate database</source> + <translation>Fel vid uppgradering av blockdatabasen</translation> </message> <message> <source>Information</source> @@ -3532,51 +3320,35 @@ Var vänlig och försök igen.</translation> </message> <message> <source>Invalid amount for -paytxfee=<amount>: '%s' (must be at least %s)</source> - <translation>Ogiltigt belopp för -paytxfee=<belopp>:'%s' (måste vara minst %s)</translation> + <translation>Ogiltigt belopp för -paytxfee=<amount>:'%s' (måste vara minst %s)</translation> </message> <message> <source>Invalid netmask specified in -whitelist: '%s'</source> <translation>Ogiltig nätmask angiven i -whitelist: '%s'</translation> </message> <message> - <source>Keep at most <n> unconnectable transactions in memory (default: %u)</source> - <translation>Håll som mest <n> oanslutningsbara transaktioner i minnet (förvalt: %u)</translation> - </message> - <message> <source>Need to specify a port with -whitebind: '%s'</source> <translation>Port måste anges med -whitelist: '%s'</translation> </message> <message> - <source>Node relay options:</source> - <translation>Nodreläalternativ:</translation> - </message> - <message> - <source>RPC server options:</source> - <translation>RPC-serveralternativ:</translation> - </message> - <message> <source>Reducing -maxconnections from %d to %d, because of system limitations.</source> <translation>Minskar -maxconnections från %d till %d, på grund av systembegränsningar.</translation> </message> <message> - <source>Rescan the block chain for missing wallet transactions on startup</source> - <translation>Sök i blockkedjan efter saknade plånbokstransaktioner vid uppstart</translation> - </message> - <message> - <source>Send trace/debug info to console instead of debug.log file</source> - <translation>Skicka trace-/debuginformation till terminalen istället för till debug.log</translation> + <source>Signing transaction failed</source> + <translation>Signering av transaktion misslyckades</translation> </message> <message> - <source>Show all debugging options (usage: --help -help-debug)</source> - <translation>Visa alla avlusningsalternativ (använd: --help -help-debug)</translation> + <source>Specified -walletdir "%s" does not exist</source> + <translation>Angiven -walletdir "%s" finns inte</translation> </message> <message> - <source>Shrink debug.log file on client startup (default: 1 when no -debug)</source> - <translation>Krymp debug.log filen vid klient start (förvalt: 1 vid ingen -debug)</translation> + <source>Specified -walletdir "%s" is a relative path</source> + <translation>Angiven -walletdir "%s" är en relativ sökväg</translation> </message> <message> - <source>Signing transaction failed</source> - <translation>Signering av transaktion misslyckades</translation> + <source>Specified -walletdir "%s" is not a directory</source> + <translation>Angiven -walletdir "%s" är inte en katalog</translation> </message> <message> <source>The transaction amount is too small to pay the fee</source> @@ -3587,14 +3359,6 @@ Var vänlig och försök igen.</translation> <translation>Detta är experimentmjukvara.</translation> </message> <message> - <source>Tor control port password (default: empty)</source> - <translation>Lösenord för Tor-kontrollport (förval: inget)</translation> - </message> - <message> - <source>Tor control port to use if onion listening enabled (default: %s)</source> - <translation>Tor-kontrollport att använda om onion är aktiverat (förval: %s)</translation> - </message> - <message> <source>Transaction amount too small</source> <translation>Transaktions belopp för liten</translation> </message> @@ -3611,12 +3375,8 @@ Var vänlig och försök igen.</translation> <translation>Det går inte att binda till %s på den här datorn (bind returnerade felmeddelande %s)</translation> </message> <message> - <source>Upgrade wallet to latest format on startup</source> - <translation>Uppgradera plånbok till senaste formatet vid uppstart</translation> - </message> - <message> - <source>Username for JSON-RPC connections</source> - <translation>Användarnamn för JSON-RPC-anslutningar</translation> + <source>Unable to generate initial keys</source> + <translation>Det gick inte att skapa ursprungliga nycklar</translation> </message> <message> <source>Verifying wallet(s)...</source> @@ -3631,84 +3391,16 @@ Var vänlig och försök igen.</translation> <translation>Varning: okända nya regler aktiverade (versionsbit %i)</translation> </message> <message> - <source>Whether to operate in a blocks only mode (default: %u)</source> - <translation>Ska allt göras i endast block-läge (förval: %u)</translation> - </message> - <message> - <source>You need to rebuild the database using -reindex to change -txindex</source> - <translation>Du måste återskapa databasen med -reindex för att ändra -txindex</translation> - </message> - <message> <source>Zapping all transactions from wallet...</source> <translation>Töm plånboken på alla transaktioner...</translation> </message> <message> - <source>ZeroMQ notification options:</source> - <translation>ZeroMQ-alternativ för notiser:</translation> - </message> - <message> - <source>Password for JSON-RPC connections</source> - <translation>Lösenord för JSON-RPC-anslutningar</translation> - </message> - <message> - <source>Execute command when the best block changes (%s in cmd is replaced by block hash)</source> - <translation>Exekvera kommando när det bästa blocket ändras (%s i cmd är utbytt av blockhash)</translation> - </message> - <message> - <source>Allow DNS lookups for -addnode, -seednode and -connect</source> - <translation>Tillåt DNS-sökningar för -addnode, -seednode och -connect</translation> - </message> - <message> - <source>(1 = keep tx meta data e.g. account owner and payment request information, 2 = drop tx meta data)</source> - <translation>(1 = spara tx metadata t.ex. kontoägare och betalningsbegäransinformation, 2 = släng tx metadata)</translation> - </message> - <message> <source>-maxtxfee is set very high! Fees this large could be paid on a single transaction.</source> <translation>-maxtxfee är väldigt högt satt! Så höga avgifter kan komma att betalas för en enstaka transaktion.</translation> </message> <message> - <source>Do not keep transactions in the mempool longer than <n> hours (default: %u)</source> - <translation>Håll inte transaktioner i minnespoolen längre än <n> timmar (förvalt: %u)</translation> - </message> - <message> - <source>Equivalent bytes per sigop in transactions for relay and mining (default: %u)</source> - <translation>Samma antal byte per sigop i transaktioner som vi reläar och bryter (förvalt: %u)</translation> - </message> - <message> <source>Error loading %s: You can't enable HD on an already existing non-HD wallet</source> - <translation>Fel vid laddning av %s: Du kan inte aktivera HD på en existerande icke-HD plånbok</translation> - </message> - <message> - <source>Error loading wallet %s. -wallet parameter must only specify a filename (not a path).</source> - <translation>Fel vid inläsningen av plånbok %s. -wallet parametern kan bara innehålla ett filnamn (inte en sökväg).</translation> - </message> - <message> - <source>Fees (in %s/kB) smaller than this are considered zero fee for transaction creation (default: %s)</source> - <translation>Avgifter (i %s/kB) mindre än detta anses vara nollavgifter vid skapande av transaktion (standard: %s)</translation> - </message> - <message> - <source>Force relay of transactions from whitelisted peers even if they violate local relay policy (default: %d)</source> - <translation>Vidarebefordra alltid transaktioner från vitlistade noder även om de bryter mot den lokala reläpolicyn (förvalt: %d)</translation> - </message> - <message> - <source>How thorough the block verification of -checkblocks is (0-4, default: %u)</source> - <translation>Hur grundlig blockverifikationen vid -checkblocks är (0-4, förvalt: %u)</translation> - </message> - <message> - <source>Maintain a full transaction index, used by the getrawtransaction rpc call (default: %u)</source> - <translation>Upprätthåll ett fullständigt transaktionsindex, som används av getrawtransaction rpc-anrop (förval: %u)</translation> - </message> - <message> - <source>Number of seconds to keep misbehaving peers from reconnecting (default: %u)</source> - <translation>Antal sekunder att hindra klienter som missköter sig från att ansluta (förvalt: %u)</translation> - </message> - <message> - <source>Output debugging information (default: %u, supplying <category> is optional)</source> - <translation>Skriv ut avlusningsinformation (förvalt: %u, att ange <category> är frivilligt)</translation> - </message> - <message> - <source>Support filtering of blocks and transaction with bloom filters (default: %u)</source> - <translation>Stöd filtrering av block och transaktioner med bloomfilter (standard: %u)</translation> + <translation>Fel vid inläsning av %s: Du kan inte aktivera HD på en existerande icke-HD plånbok</translation> </message> <message> <source>This is the transaction fee you may pay when fee estimates are not available.</source> @@ -3723,10 +3415,6 @@ Var vänlig och försök igen.</translation> <translation>Total längd på strängen för nätverksversion (%i) överskrider maxlängden (%i). Minska numret eller storleken på uacomments.</translation> </message> <message> - <source>Tries to keep outbound traffic under the given target (in MiB per 24h), 0 = no limit (default: %d)</source> - <translation>Försöker hålla utgående trafik under givet mål (i MiB per 24 timmar), 0 = ingen gräns (förvalt: %d)</translation> - </message> - <message> <source>Unsupported argument -socks found. Setting SOCKS version isn't possible anymore, only SOCKS5 proxies are supported.</source> <translation>Argumentet -socks hittades och stöds inte. Det är inte längre möjligt att sätta SOCKS-version längre, bara SOCKS5-proxy stöds.</translation> </message> @@ -3735,112 +3423,20 @@ Var vänlig och försök igen.</translation> <translation>Argumentet -whitelistalwaysrelay stöds inte utan ignoreras, använd -whitelistrelay och/eller -whitelistforcerelay.</translation> </message> <message> - <source>Use separate SOCKS5 proxy to reach peers via Tor hidden services (default: %s)</source> - <translation>Använd separat SOCKS5 proxy för att nå kollegor via dolda tjänster i Tor (förvalt: -%s)</translation> - </message> - <message> <source>Warning: Unknown block versions being mined! It's possible unknown rules are in effect</source> <translation>Varning: Okända blockversioner bryts! Det är möjligt att okända regler används</translation> </message> <message> <source>Warning: Wallet file corrupt, data salvaged! Original %s saved as %s in %s; if your balance or transactions are incorrect you should restore from a backup.</source> - <translation>Varning: Plånboksfilen var korrupt, datat har räddats! Den ursprungliga %s har sparas som %s i %s. Om ditt saldo eller transaktioner är felaktiga bör du återställa från en säkerhetskopia.</translation> + <translation>Varning: Plånboksfilen var korrupt, data har räddats! Den ursprungliga %s har sparas som %s i %s. Om ditt saldo eller transaktioner är felaktiga bör du återställa från en säkerhetskopia.</translation> </message> <message> <source>%s is set very high!</source> <translation>%s är satt väldigt högt!</translation> </message> <message> - <source>(default: %s)</source> - <translation>(förvalt: %s)</translation> - </message> - <message> - <source>Always query for peer addresses via DNS lookup (default: %u)</source> - <translation>Sök alltid efter klientadresser med DNS sökningen (förvalt: %u)</translation> - </message> - <message> - <source>Error loading wallet %s. -wallet filename must be a regular file.</source> - <translation>Fel vid inläsningen av plånbok %s. -wallet filnamn måste var en vanlig fil.</translation> - </message> - <message> <source>Error loading wallet %s. Duplicate -wallet filename specified.</source> - <translation>Fel vid inläsningen av plånbok %s. Dublett -wallet filnamn anges.</translation> - </message> - <message> - <source>Error loading wallet %s. Invalid characters in -wallet filename.</source> - <translation>Fel vid inläsningen av plånbok %s. Ogiltiga tecken i -wallet filnamn.</translation> - </message> - <message> - <source>How many blocks to check at startup (default: %u, 0 = all)</source> - <translation>Hur många block att kontrollera vid uppstart (förvalt: %u, 0 = alla)</translation> - </message> - <message> - <source>Include IP addresses in debug output (default: %u)</source> - <translation>Inkludera IP-adresser i debugutskrift (förvalt: %u)</translation> - </message> - <message> - <source>Listen for JSON-RPC connections on <port> (default: %u or testnet: %u)</source> - <translation>Lyssna på JSON-RPC-anslutningar på <port> (förval: %u eller testnet: %u)</translation> - </message> - <message> - <source>Listen for connections on <port> (default: %u or testnet: %u)</source> - <translation>Lyssna efter anslutningar på <port> (förvalt: %u eller testnet: %u)</translation> - </message> - <message> - <source>Maintain at most <n> connections to peers (default: %u)</source> - <translation>Ha som mest <n> anslutningar till andra klienter (förvalt: %u)</translation> - </message> - <message> - <source>Make the wallet broadcast transactions</source> - <translation>Gör så att plånboken sänder ut transaktionerna</translation> - </message> - <message> - <source>Maximum per-connection receive buffer, <n>*1000 bytes (default: %u)</source> - <translation>Maximal mottagningsbuffert per anslutning, <n>*1000 byte (förvalt: %u)</translation> - </message> - <message> - <source>Maximum per-connection send buffer, <n>*1000 bytes (default: %u)</source> - <translation>Maximal sändningsbuffert per anslutning, <n>*1000 byte (förvalt: %u)</translation> - </message> - <message> - <source>Prepend debug output with timestamp (default: %u)</source> - <translation>Skriv ut tidsstämpel i avlusningsinformationen (förvalt: %u)</translation> - </message> - <message> - <source>Relay and mine data carrier transactions (default: %u)</source> - <translation>Reläa och bearbeta databärartransaktioner (förvalt: %u) </translation> - </message> - <message> - <source>Relay non-P2SH multisig (default: %u)</source> - <translation>Reläa icke-P2SH multisig (förvalt: %u)</translation> - </message> - <message> - <source>Set key pool size to <n> (default: %u)</source> - <translation>Sätt storleken på nyckelpoolen till <n> (förvalt: %u)</translation> - </message> - <message> - <source>Set maximum BIP141 block weight (default: %d)</source> - <translation>Sätt maximal BIP141 blockvikt (förvalt: %d)</translation> - </message> - <message> - <source>Set the number of threads to service RPC calls (default: %d)</source> - <translation>Ange antalet trådar för att hantera RPC anrop (förvalt: %d)</translation> - </message> - <message> - <source>Specify configuration file (default: %s)</source> - <translation>Ange konfigurationsfil (förvalt: %s)</translation> - </message> - <message> - <source>Specify connection timeout in milliseconds (minimum: 1, default: %d)</source> - <translation>Ange timeout för uppkoppling i millisekunder (minimum:1, förvalt: %d)</translation> - </message> - <message> - <source>Specify pid file (default: %s)</source> - <translation>Ange pid-fil (förvalt: %s)</translation> - </message> - <message> - <source>Spend unconfirmed change when sending transactions (default: %u)</source> - <translation>Spendera okonfirmerad växel när transaktioner sänds (förvalt: %u)</translation> + <translation>Fel vid inläsningen av plånbok %s. Dublett -wallet filnamn angavs.</translation> </message> <message> <source>Starting network threads...</source> @@ -3859,10 +3455,6 @@ Var vänlig och försök igen.</translation> <translation>Det här är transaktionsavgiften du kommer betala om du skickar en transaktion. </translation> </message> <message> - <source>Threshold for disconnecting misbehaving peers (default: %u)</source> - <translation>Tröskelvärde för att koppla ifrån klienter som missköter sig (förvalt: %u)</translation> - </message> - <message> <source>Transaction amounts must not be negative</source> <translation>Transaktionens belopp får ej vara negativ</translation> </message> @@ -3876,7 +3468,7 @@ Var vänlig och försök igen.</translation> </message> <message> <source>Unknown network specified in -onlynet: '%s'</source> - <translation>Okänt nätverk som anges i -onlynet: '%s'</translation> + <translation>Okänt nätverk angavs i -onlynet: '%s'</translation> </message> <message> <source>Insufficient funds</source> diff --git a/src/qt/locale/bitcoin_ta.ts b/src/qt/locale/bitcoin_ta.ts index e43fa04e27..9e598c0483 100644 --- a/src/qt/locale/bitcoin_ta.ts +++ b/src/qt/locale/bitcoin_ta.ts @@ -580,6 +580,10 @@ <source>Address</source> <translation>முகவரி</translation> </message> + <message> + <source>Wallet</source> + <translation>பணப்பை</translation> + </message> </context> <context> <name>RecentRequestsTableModel</name> @@ -712,10 +716,6 @@ <translation>Bitcoin மையம்</translation> </message> <message> - <source>(default: %u)</source> - <translation>(default: %u)</translation> - </message> - <message> <source>Information</source> <translation>தகவல்</translation> </message> @@ -724,10 +724,6 @@ <translation>எச்சரிக்கை</translation> </message> <message> - <source>(default: %s)</source> - <translation>(default: %s)</translation> - </message> - <message> <source>Error</source> <translation>தவறு</translation> </message> diff --git a/src/qt/locale/bitcoin_th_TH.ts b/src/qt/locale/bitcoin_th_TH.ts index 8ee52ffca4..81491c8ddc 100644 --- a/src/qt/locale/bitcoin_th_TH.ts +++ b/src/qt/locale/bitcoin_th_TH.ts @@ -511,42 +511,6 @@ <source>Command-line options</source> <translation>ตัวเลือก Command-line</translation> </message> - <message> - <source>Usage:</source> - <translation>วิธีใช้งาน:</translation> - </message> - <message> - <source>command-line options</source> - <translation>ตัวเลือก command-line</translation> - </message> - <message> - <source>UI Options:</source> - <translation>ตัวเลือก UI:</translation> - </message> - <message> - <source>Choose data directory on startup (default: %u)</source> - <translation>เลือกไดเร็กทอรี่ข้อมูลตั้งแต่เริ่มต้นสตาร์ทอัพ (ค่าเริ่มต้น: %u)</translation> - </message> - <message> - <source>Set language, for example "de_DE" (default: system locale)</source> - <translation>ตั้งค่าภาษา ยกตัวอย่าง "de_DE" (ค่าเริ่มต้น: ภาษาท้องถิ่นของระบบ)</translation> - </message> - <message> - <source>Start minimized</source> - <translation>เริ่มต้นมินิไมซ์</translation> - </message> - <message> - <source>Set SSL root certificates for payment request (default: -system-)</source> - <translation>ตั้งค่า SSL root certificates สำหรับเรียกการชำระเงิน (ค่าเริ่มต้น: -system-)</translation> - </message> - <message> - <source>Show splash screen on startup (default: %u)</source> - <translation>แสดง splash screen ตอนเริ่มต้น (ค่าเริ่มต้น: %u)</translation> - </message> - <message> - <source>Reset all settings changed in the GUI</source> - <translation>รีเซตการเปลี่ยนการตั้งค่าทั้งหมดใน GUI</translation> - </message> </context> <context> <name>Intro</name> @@ -802,6 +766,10 @@ </context> <context> <name>ReceiveRequestDialog</name> + <message> + <source>Wallet</source> + <translation>กระเป๋าเงิน</translation> + </message> </context> <context> <name>RecentRequestsTableModel</name> @@ -894,10 +862,6 @@ <context> <name>bitcoin-core</name> <message> - <source>Options:</source> - <translation>ตัวเลือก:</translation> - </message> - <message> <source>Information</source> <translation>ข้อมูล</translation> </message> diff --git a/src/qt/locale/bitcoin_tr.ts b/src/qt/locale/bitcoin_tr.ts index a5623c0173..b092ee060e 100644 --- a/src/qt/locale/bitcoin_tr.ts +++ b/src/qt/locale/bitcoin_tr.ts @@ -30,6 +30,10 @@ <translation>Seçili adresi listeden sil</translation> </message> <message> + <source>Enter address or label to search</source> + <translation>Aranacak adres ya da etiket giriniz</translation> + </message> + <message> <source>Export the data in the current tab to a file</source> <translation>Açık olan sekmedeki verileri bir dosyaya aktar</translation> </message> @@ -730,10 +734,6 @@ <translation>&Adres</translation> </message> <message> - <source>New receiving address</source> - <translation>Yeni alım adresi</translation> - </message> - <message> <source>New sending address</source> <translation>Yeni gönderi adresi</translation> </message> @@ -750,10 +750,6 @@ <translation>Girilen "%1" adresi geçerli bir Bitcoin adresi değildir.</translation> </message> <message> - <source>The entered address "%1" is already in the address book.</source> - <translation>Girilen "%1" adresi zaten adres defterinde mevcuttur.</translation> - </message> - <message> <source>Could not unlock wallet.</source> <translation>Cüzdan kilidi açılamadı.</translation> </message> @@ -803,42 +799,6 @@ <source>Command-line options</source> <translation>Komut satırı seçenekleri</translation> </message> - <message> - <source>Usage:</source> - <translation>Kullanım:</translation> - </message> - <message> - <source>command-line options</source> - <translation>komut satırı seçenekleri</translation> - </message> - <message> - <source>UI Options:</source> - <translation>Arayüz Seçenekleri:</translation> - </message> - <message> - <source>Choose data directory on startup (default: %u)</source> - <translation>Başlangıçta veri klasörü seç (varsayılan: %u)</translation> - </message> - <message> - <source>Set language, for example "de_DE" (default: system locale)</source> - <translation>Lisan belirt, mesela "de_De" (varsayılan: sistem dili)</translation> - </message> - <message> - <source>Start minimized</source> - <translation>Küçültülmüş olarak başlat</translation> - </message> - <message> - <source>Set SSL root certificates for payment request (default: -system-)</source> - <translation>Ödeme talebi için SSL kök sertifikalarını belirle (varsayılan: -system-)</translation> - </message> - <message> - <source>Show splash screen on startup (default: %u)</source> - <translation>Başlatıldığında başlangıç ekranını göster (varsayılan: %u)</translation> - </message> - <message> - <source>Reset all settings changed in the GUI</source> - <translation>Grafik arayüzde yapılan tüm seçenek değişikliklerini sıfırla</translation> - </message> </context> <context> <name>Intro</name> @@ -1519,10 +1479,6 @@ <translation>Hata: Belirtilen "%1" veri klasörü yoktur.</translation> </message> <message> - <source>Error: Cannot parse configuration file: %1. Only use key=value syntax.</source> - <translation>Hata: %1 yapılandırma dosyası ayrıştırılamadı. Sadece anahtar=değer dizimini kullanınız.</translation> - </message> - <message> <source>Error: %1</source> <translation>Hata: %1</translation> </message> @@ -1884,10 +1840,6 @@ <translation>Ödeme &talep et</translation> </message> <message> - <source>Generate Bech32 address</source> - <translation>Bech32 adresi oluştur</translation> - </message> - <message> <source>Show the selected request (does the same as double clicking an entry)</source> <translation>Seçilen talebi göster (bir unsura çift tıklamakla aynı anlama gelir)</translation> </message> @@ -1967,6 +1919,10 @@ <translation>İleti</translation> </message> <message> + <source>Wallet</source> + <translation>Cüzdan</translation> + </message> + <message> <source>Resulting URI too long, try to reduce the text for label / message.</source> <translation>Sonuç URI çok uzun, etiket ya da ileti metnini kısaltmayı deneyiniz.</translation> </message> @@ -2081,10 +2037,6 @@ <translation>kilobayt başı</translation> </message> <message> - <source>If the custom fee is set to 1000 satoshis and the transaction is only 250 bytes, then "per kilobyte" only pays 250 satoshis in fee, while "total at least" pays 1000 satoshis. For transactions bigger than a kilobyte both pay by kilobyte.</source> - <translation>Eğer özel ücret 1000 satoşi olarak ayarlandıysa ve işlem sadece 250 baytsa, "kilobayt başı" ücret olarak sadece 250 satoşi öder ve "toplam asgari" 1000 satoşi öder. Bir kilobayttan yüksek işlemler için ikisi de kilobayt başı ödeme yapar.</translation> - </message> - <message> <source>Hide</source> <translation>Gizle</translation> </message> @@ -2185,18 +2137,14 @@ <translation>Göndermek istediğinizden emin misiniz?</translation> </message> <message> - <source>added as transaction fee</source> - <translation>işlem ücreti olarak eklendi</translation> - </message> - <message> - <source>Total Amount %1</source> - <translation>Toplam Tutar %1</translation> - </message> - <message> <source>or</source> <translation>veya</translation> </message> <message> + <source>Transaction fee</source> + <translation>İşlem ücreti</translation> + </message> + <message> <source>Confirm send coins</source> <translation>Bitcoin gönderimini onaylayın</translation> </message> @@ -2534,10 +2482,6 @@ <translation>%1 doğrulamalı bir işlem ile çelişti</translation> </message> <message> - <source>%1/offline</source> - <translation>%1/çevrim dışı</translation> - </message> - <message> <source>0/unconfirmed, %1</source> <translation>0/doğrulanmamış, %1</translation> </message> @@ -2566,14 +2510,6 @@ <translation>Durum</translation> </message> <message> - <source>, has not been successfully broadcast yet</source> - <translation>, henüz başarılı bir şekilde yayınlanmadı</translation> - </message> - <message numerus="yes"> - <source>, broadcast through %n node(s)</source> - <translation><numerusform>, %n düğüm aracılığıyla yayınlandı</numerusform><numerusform>, %n düğüm aracılığıyla yayınlandı</numerusform></translation> - </message> - <message> <source>Date</source> <translation>Tarih</translation> </message> @@ -2728,10 +2664,6 @@ <translation>%1 değerine dek açık</translation> </message> <message> - <source>Offline</source> - <translation>Çevrim dışı</translation> - </message> - <message> <source>Unconfirmed</source> <translation>Doğrulanmamış</translation> </message> @@ -2756,10 +2688,6 @@ <translation>Olgunlaşmamış (%1 doğrulama, %2 doğrulama sonra kullanılabilir olacaktır)</translation> </message> <message> - <source>This block was not received by any other nodes and will probably not be accepted!</source> - <translation>Bu blok başka hiçbir düğüm tarafından alınmamıştır ve muhtemelen kabul edilmeyecektir!</translation> - </message> - <message> <source>Generated but not accepted</source> <translation>Oluşturuldu ama kabul edilmedi</translation> </message> @@ -2871,6 +2799,10 @@ <translation>Diğer</translation> </message> <message> + <source>Enter address, transaction id, or label to search</source> + <translation>Aramak için adres, gönderim numarası ya da etiket yazınız</translation> + </message> + <message> <source>Min amount</source> <translation>En düşük tutar</translation> </message> @@ -3058,38 +2990,14 @@ <source>The wallet data was successfully saved to %1.</source> <translation>Cüzdan verileri %1 konumuna başarıyla kaydedildi.</translation> </message> -</context> + </context> <context> <name>bitcoin-core</name> <message> - <source>Options:</source> - <translation>Seçenekler:</translation> - </message> - <message> - <source>Specify data directory</source> - <translation>Veri dizinini belirt</translation> - </message> - <message> - <source>Connect to a node to retrieve peer addresses, and disconnect</source> - <translation>Eş adresleri elde etmek için bir düğüme bağlan ve ardından bağlantıyı kes</translation> - </message> - <message> - <source>Specify your own public address</source> - <translation>Kendi genel adresinizi tanımlayın</translation> - </message> - <message> - <source>Accept command line and JSON-RPC commands</source> - <translation>Komut satırı ve JSON-RPC komutlarını kabul et</translation> - </message> - <message> <source>Distributed under the MIT software license, see the accompanying file %s or %s</source> <translation>MIT yazılım lisansı altında dağıtılmıştır, beraberindeki %s ya da %s dosyasına bakınız.</translation> </message> <message> - <source>If <category> is not supplied or if <category> = 1, output all debugging information.</source> - <translation>Eğer <category> belirtilmemişse ya da <category> = 1 ise, tüm hata ayıklama verilerini çıktı al.</translation> - </message> - <message> <source>Prune configured below the minimum of %d MiB. Please use a higher number.</source> <translation>Budama, en düşük değer olan %d MiB'den düşük olarak ayarlanmıştır. Lütfen daha yüksek bir sayı kullanınız.</translation> </message> @@ -3106,18 +3014,10 @@ <translation>Hata: Ölümcül dahili bir hata meydana geldi, ayrıntılar için debug.log dosyasına bakınız</translation> </message> <message> - <source>Fee (in %s/kB) to add to transactions you send (default: %s)</source> - <translation>Yolladığınız işlemlere eklenecek ücret (%s/kB olarak) (varsayılan: %s)</translation> - </message> - <message> <source>Pruning blockstore...</source> <translation>Blockstore budanıyor...</translation> </message> <message> - <source>Run in the background as a daemon and accept commands</source> - <translation>Arka planda daemon (servis) olarak çalış ve komutları kabul et</translation> - </message> - <message> <source>Unable to start HTTP server. See debug log for details.</source> <translation>HTTP sunucusu başlatılamadı. Ayrıntılar için debug.log dosyasına bakınız.</translation> </message> @@ -3130,50 +3030,14 @@ <translation>%s geliştiricileri</translation> </message> <message> - <source>A fee rate (in %s/kB) that will be used when fee estimation has insufficient data (default: %s)</source> - <translation>Ücret tahmini için yetersiz veri bulunduğunda kullanılacak ücret oranı (%s/kB olarak) (varsayılan: %s)</translation> - </message> - <message> - <source>Accept relayed transactions received from whitelisted peers even when not relaying transactions (default: %d)</source> - <translation>İşlemler aktarılmadığında dahi beyaz listedeki eşlerden aktarılan işlemleri kabul et (varsayılan: %d)</translation> - </message> - <message> - <source>Bind to given address and always listen on it. Use [host]:port notation for IPv6</source> - <translation>Belirtilen adrese bağlan ve daima ondan dinle. IPv6 için [makine]:port yazımını kullanınız</translation> - </message> - <message> <source>Cannot obtain a lock on data directory %s. %s is probably already running.</source> <translation>%s veri dizininde kilit elde edilemedi. %s muhtemelen hâlihazırda çalışmaktadır.</translation> </message> <message> - <source>Delete all wallet transactions and only recover those parts of the blockchain through -rescan on startup</source> - <translation>Tüm cüzdan işlemlerini sil ve başlangıçta -rescan ile sadece blok zincirinin parçası olanları geri getir</translation> - </message> - <message> <source>Error reading %s! All keys read correctly, but transaction data or address book entries might be missing or incorrect.</source> <translation>%s dosyasının okunması sırasında bir hata meydana geldi! Tüm anahtarlar doğru bir şekilde okundu, ancak işlem verileri ya da adres defteri ögeleri hatalı veya eksik olabilir.</translation> </message> <message> - <source>Execute command when a wallet transaction changes (%s in cmd is replaced by TxID)</source> - <translation>Bir cüzdan işlemi değiştiğinde komutu çalıştır (komuttaki %s işlem kimliği ile değiştirilecektir)</translation> - </message> - <message> - <source>Extra transactions to keep in memory for compact block reconstructions (default: %u)</source> - <translation>Daha küçük boyutlu blok yeniden yapılandırması için fazladan işlemleri bellekte tut. (varsayılan: %u)</translation> - </message> - <message> - <source>If this block is in the chain assume that it and its ancestors are valid and potentially skip their script verification (0 to verify all, default: %s, testnet: %s)</source> - <translation>Eğer bu blok zincirde yer alıyorsa onun ve atalarının geçerli olduğunu varsay ve potansiyel olarak onların betik doğrulamasını atla. (Tümünü doğrulamak için 0, varsayılan %s, testnet: %s)</translation> - </message> - <message> - <source>Maximum allowed median peer time offset adjustment. Local perspective of time may be influenced by peers forward or backward by this amount. (default: %u seconds)</source> - <translation>İzin verilen edilen en yüksek medyan eş zamanı değişiklik sınırının ayarlaması. Zamanın yerel perspektifi bu miktar kadar ileri ya da geri eşler tarafından etkilenebilir. (Varsayılan %u saniye)</translation> - </message> - <message> - <source>Maximum total fees (in %s) to use in a single wallet transaction or raw transaction; setting this too low may abort large transactions (default: %s)</source> - <translation>Tek bir cüzdan işleminde ya da ham işlemde kullanılacak en yüksek toplam ücret (%s olarak); bunu çok düşük olarak ayarlamak büyük işlemleri iptal edebilir (varsayılan: %s)</translation> - </message> - <message> <source>Please check that your computer's date and time are correct! If your clock is wrong, %s will not work properly.</source> <translation>Lütfen bilgisayarınızın saat ve tarihinin doğru olduğunu kontrol ediniz! Saatinizde gecikme varsa %s doğru şekilde çalışamaz.</translation> </message> @@ -3182,18 +3046,6 @@ <translation>%s programını faydalı buluyorsanız lütfen katkıda bulununuz. Yazılım hakkında daha fazla bilgi için %s adresini ziyaret ediniz.</translation> </message> <message> - <source>Reduce storage requirements by enabling pruning (deleting) of old blocks. This allows the pruneblockchain RPC to be called to delete specific blocks, and enables automatic pruning of old blocks if a target size in MiB is provided. This mode is incompatible with -txindex and -rescan. Warning: Reverting this setting requires re-downloading the entire blockchain. (default: 0 = disable pruning blocks, 1 = allow manual pruning via RPC, >%u = automatically prune block files to stay under the specified target size in MiB)</source> - <translation>Eski blokları budamayı (silme) etkinleştirerek depolama gereksinimlerini azaltın. Bu belirli blokları silmek için pruneblockchain uzak yordam çağrısına (RPC) izin verir. Eğer bloklar hedef mebibyte boyutuna ulaşırsa eski blokların otomatik olarak budanmasını sağlar. Bu kip, -txindex ve -rescan ile uyumsuzdur. Uyarı: Bu ayarı geri almak, blok zincirinin tamamını yeniden yüklemeyi gerektirir. (varsayılan: 0 = blok budaması devre dışı, 1 = RPC üzerinden manuel budamaya izin verir, >%u = mebibyte olarak belirtilen hedef boyutun altında kalması için blok dosyalarını otomatik olarak budar)</translation> - </message> - <message> - <source>Set lowest fee rate (in %s/kB) for transactions to be included in block creation. (default: %s)</source> - <translation>Blok oluşturmaya dahil olan işlemler için en düşük ücret oranını (%s/kB olarak) ayarla. (varsayılan: %s)</translation> - </message> - <message> - <source>Set the number of script verification threads (%u to %d, 0 = auto, <0 = leave that many cores free, default: %d)</source> - <translation>Betik kontrolü iş parçacıklarının sayısını belirler (%u ilâ %d, 0 = otomatik, <0 = bu sayıda çekirdeği kullanma, varsayılan: %d)</translation> - </message> - <message> <source>The block database contains a block which appears to be from the future. This may be due to your computer's date and time being set incorrectly. Only rebuild the block database if you are sure that your computer's date and time are correct</source> <translation>Blok veritabanı gelecekten gibi görünen bir blok içermektedir. Bu, bilgisayarınızın saat ve tarihinin yanlış ayarlanmış olmasından kaynaklanabilir. Blok veritabanını sadece bilgisayarınızın tarih ve saatinin doğru olduğundan eminseniz yeniden derleyin.</translation> </message> @@ -3206,18 +3058,6 @@ <translation>Veritabanını çatallama öncesi duruma geri sarmak mümkün değil. Blok zincirini tekrar indirmeniz gerekmektedir</translation> </message> <message> - <source>Use UPnP to map the listening port (default: 1 when listening and no -proxy)</source> - <translation>Dinlenecek portu haritalamak için UPnP kullan (varsayılan: dinlenildiğinde ve -proxy olmadığında 1)</translation> - </message> - <message> - <source>Username and hashed password for JSON-RPC connections. The field <userpw> comes in the format: <USERNAME>:<SALT>$<HASH>. A canonical python script is included in share/rpcuser. The client then connects normally using the rpcuser=<USERNAME>/rpcpassword=<PASSWORD> pair of arguments. This option can be specified multiple times</source> - <translation>JSON-RPC bağlantıları için kullanıcı adı ve karmalanmış parola. <userpw> alanı şu biçimdedir: <KULLANICI ADI>:<SALT>$<HASH>. Kanonik bir Python betiği share/rpcuser klasöründe bulunabilir. Ardından istemci normal şekilde rpcuser=<KULLANICI ADI>/rpcpassword=<PAROLA> argüman çiftini kullanarak bağlanabilir. Bu seçenek birden çok kez belirtilebilir.</translation> - </message> - <message> - <source>Wallet will not create transactions that violate mempool chain limits (default: %u)</source> - <translation>Cüzdan, zincir bellek alanı limitlerini ihlal eden işlem oluşturmayacak. (varsayılan: %u)</translation> - </message> - <message> <source>Warning: The network does not appear to fully agree! Some miners appear to be experiencing issues.</source> <translation>Uyarı: Ağ üyeleri aralarında tamamen anlaşmış gibi gözükmüyor! Bazı madenciler sorun yaşıyor gibi görünmektedir.</translation> </message> @@ -3238,42 +3078,14 @@ <translation>-maxmempool en az %d MB olmalıdır</translation> </message> <message> - <source><category> can be:</source> - <translation><kategori> şunlar olabilir:</translation> - </message> - <message> - <source>Accept connections from outside (default: 1 if no -proxy or -connect)</source> - <translation>Dışarıdan gelen bağlantıları kabul et (varsayılan: -proxy veya -connect yoksa 1)</translation> - </message> - <message> - <source>Append comment to the user agent string</source> - <translation>Kullanıcı aracı zincirine yorumu ekle</translation> - </message> - <message> - <source>Attempt to recover private keys from a corrupt wallet on startup</source> - <translation>Başlangıçta bozuk bir cüzdandan özel anahtarları geri kazanmayı dene</translation> - </message> - <message> - <source>Block creation options:</source> - <translation>Blok oluşturma seçenekleri:</translation> - </message> - <message> <source>Cannot resolve -%s address: '%s'</source> <translation>Çözümlenemedi - %s adres: '%s'</translation> </message> <message> - <source>Chain selection options:</source> - <translation>Blok zinciri seçim ayarları:</translation> - </message> - <message> <source>Change index out of range</source> <translation>Aralık dışında değişiklik indeksi</translation> </message> <message> - <source>Connection options:</source> - <translation>Bağlantı seçenekleri:</translation> - </message> - <message> <source>Copyright (C) %i-%i</source> <translation>Telif hakkı (C) %i-%i</translation> </message> @@ -3282,38 +3094,10 @@ <translation>Bozuk blok veritabanı tespit edildi</translation> </message> <message> - <source>Debugging/Testing options:</source> - <translation>Hata ayıklama/deneme seçenekleri:</translation> - </message> - <message> - <source>Do not load the wallet and disable wallet RPC calls</source> - <translation>Cüzdanı yükleme ve cüzdan RPC çağrılarını devre dışı bırak</translation> - </message> - <message> <source>Do you want to rebuild the block database now?</source> <translation>Blok veritabanını şimdi yeniden inşa etmek istiyor musunuz?</translation> </message> <message> - <source>Enable publish hash block in <address></source> - <translation>Blok karma değerinin <adres>te yayınlanmasını etkinleştir</translation> - </message> - <message> - <source>Enable publish hash transaction in <address></source> - <translation>Karma değer işleminin <adres>te yayınlanmasını etkinleştir</translation> - </message> - <message> - <source>Enable publish raw block in <address></source> - <translation>Ham blokun <adres>te yayınlanmasını etkinleştir</translation> - </message> - <message> - <source>Enable publish raw transaction in <address></source> - <translation>Ham işlemin <adres>te yayınlanmasını etkinleştir</translation> - </message> - <message> - <source>Enable transaction replacement in the memory pool (default: %u)</source> - <translation>Bellek alanında işlem değiştirmeyi etkinleştir (varsayılan: %u)</translation> - </message> - <message> <source>Error initializing block database</source> <translation>Blok veritabanını başlatılırken bir hata meydana geldi</translation> </message> @@ -3378,10 +3162,6 @@ <translation> -fallbackfee=<tutar> için geçersiz tutar: '%s'</translation> </message> <message> - <source>Keep the transaction memory pool below <n> megabytes (default: %u)</source> - <translation>İşlem bellek alanını <n> megabayttan düşük tut (varsayılan: %u)</translation> - </message> - <message> <source>Loading P2P addresses...</source> <translation>P2P adresleri yükleniyor...</translation> </message> @@ -3390,26 +3170,10 @@ <translation>Yasaklama listesi yükleniyor...</translation> </message> <message> - <source>Location of the auth cookie (default: data dir)</source> - <translation>auth çerezinin konumu (varsayılan: veri klasörü)</translation> - </message> - <message> <source>Not enough file descriptors available.</source> <translation>Kafi derecede dosya tanımlayıcıları mevcut değil.</translation> </message> <message> - <source>Only connect to nodes in network <net> (ipv4, ipv6 or onion)</source> - <translation>Sadece <net> ağındaki düğümlere bağlan (ipv4, ipv6 veya onion)</translation> - </message> - <message> - <source>Print this help message and exit</source> - <translation>Bu yardım mesajını yaz ve çık</translation> - </message> - <message> - <source>Print version and exit</source> - <translation>Sürümü yaz ve çık</translation> - </message> - <message> <source>Prune cannot be configured with a negative value.</source> <translation>Budama negatif bir değerle yapılandırılamaz.</translation> </message> @@ -3418,14 +3182,6 @@ <translation>Budama kipi -txindex ile uyumsuzdur.</translation> </message> <message> - <source>Rebuild chain state and block index from the blk*.dat files on disk</source> - <translation>Zincir durumu ve blok indeksini diskteki blk*.dat dosyalarından yeniden derle</translation> - </message> - <message> - <source>Rebuild chain state from the currently indexed blocks</source> - <translation>Zincir durumunu güncel olarak indekslenen bloklardan yeniden derle</translation> - </message> - <message> <source>Replaying blocks...</source> <translation>Bloklar tekrar işleniyor...</translation> </message> @@ -3434,14 +3190,6 @@ <translation>Bloklar geri sarılıyor...</translation> </message> <message> - <source>Set database cache size in megabytes (%d to %d, default: %d)</source> - <translation>Veritabanı önbellek boyutunu megabayt olarak belirt (%d ilâ %d, varsayılan: %d)</translation> - </message> - <message> - <source>Specify wallet file (within data directory)</source> - <translation>Cüzdan dosyası belirtiniz (veri klasörünün içinde)</translation> - </message> - <message> <source>The source code is available from %s.</source> <translation>Kaynak kod şuradan elde edilebilir: %s.</translation> </message> @@ -3474,14 +3222,6 @@ <translation>UTXO veritabanı yükseltiliyor</translation> </message> <message> - <source>Use UPnP to map the listening port (default: %u)</source> - <translation>Dinleme portunu haritalamak için UPnP kullan (varsayılan: %u)</translation> - </message> - <message> - <source>Use the test chain</source> - <translation>Test blok zincirini kullan</translation> - </message> - <message> <source>User Agent comment (%s) contains unsafe characters.</source> <translation>Kullanıcı Aracı açıklaması (%s) güvensiz karakterler içermektedir.</translation> </message> @@ -3490,90 +3230,26 @@ <translation>Bloklar kontrol ediliyor...</translation> </message> <message> - <source>Wallet debugging/testing options:</source> - <translation>Cüzdan hata ayıklama/test etme seçenekleri:</translation> - </message> - <message> <source>Wallet needed to be rewritten: restart %s to complete</source> <translation>Cüzdanın tekrar yazılması gerekiyordu: işlemi tamamlamak için %s programını yeniden başlatınız</translation> </message> <message> - <source>Wallet options:</source> - <translation>Cüzdan seçenekleri:</translation> - </message> - <message> - <source>Allow JSON-RPC connections from specified source. Valid for <ip> are a single IP (e.g. 1.2.3.4), a network/netmask (e.g. 1.2.3.4/255.255.255.0) or a network/CIDR (e.g. 1.2.3.4/24). This option can be specified multiple times</source> - <translation>Belirtilen kaynaktan JSON-RPC bağlantılarını kabul et. Bir <ip> için geçerli olanlar şunlardır: IP adresi (mesela 1.2.3.4), bir ağ/ağ maskesi (örneğin 1.2.3.4/255.255.255.0) ya da bir ağ/CIDR (mesela 1.2.3.4/24). Bu seçenek birden fazla kez belirtilebilir</translation> - </message> - <message> - <source>Bind to given address and whitelist peers connecting to it. Use [host]:port notation for IPv6</source> - <translation>Belirtilen adrese bağlan ve ona bağlanan eşleri beyaz listeye al. IPv6 için [makine]:port imlasını kullanınız</translation> - </message> - <message> - <source>Create new files with system default permissions, instead of umask 077 (only effective with disabled wallet functionality)</source> - <translation>Yeni dosyaları umask 077 yerine varsayılan izinlerle oluştur (sadece devre dışı cüzdan işlevselliği ile etkilidir)</translation> - </message> - <message> - <source>Discover own IP addresses (default: 1 when listening and no -externalip or -proxy)</source> - <translation>Kendi IP adreslerini keşfet (varsayılan: dinlenildiğinde ve -externalip ya da -proxy yoksa 1)</translation> - </message> - <message> <source>Error: Listening for incoming connections failed (listen returned error %s)</source> <translation>Hata: İçeri gelen bağlantıların dinlenmesi başarısız oldu (dinleme %s hatasını verdi)</translation> </message> <message> - <source>Execute command when a relevant alert is received or we see a really long fork (%s in cmd is replaced by message)</source> - <translation>İlgili bir uyarı alındığında ya da gerçekten uzun bir çatallama gördüğümüzde komutu çalıştır (komuttaki %s mesaj ile değiştirilir)</translation> - </message> - <message> - <source>Fees (in %s/kB) smaller than this are considered zero fee for relaying, mining and transaction creation (default: %s)</source> - <translation>Bundan düşük ücretler (%s/kB olarak) aktarma, oluşturma ve işlem yaratma için sıfır değerinde ücret olarak kabul edilir (varsayılan: %s)</translation> - </message> - <message> - <source>If paytxfee is not set, include enough fee so transactions begin confirmation on average within n blocks (default: %u)</source> - <translation>Eğer paytxfee ayarlanmadıysa kafi derecede ücret ekleyin ki işlemler teyite vasati n blok içinde başlasın (varsayılan: %u)</translation> - </message> - <message> <source>Invalid amount for -maxtxfee=<amount>: '%s' (must be at least the minrelay fee of %s to prevent stuck transactions)</source> <translation>-maxtxfee=<tutar> için geçersiz tutar: '%s' (Sıkışmış işlemleri önlemek için en az %s değerinde en düşük aktarım ücretine eşit olmalıdır)</translation> </message> <message> - <source>Maximum size of data in data carrier transactions we relay and mine (default: %u)</source> - <translation>Aktardığımız ve oluşturduğumuz veri taşıyıcı işlemlerindeki en yüksek veri boyutu (varsayılan: %u)</translation> - </message> - <message> - <source>Randomize credentials for every proxy connection. This enables Tor stream isolation (default: %u)</source> - <translation>Her vekil bağlantısı için kimlik verilerini rastgele yap. Bu, Tor akış izolasyonunu etkinleştirir (varsayılan: %u)</translation> - </message> - <message> <source>The transaction amount is too small to send after the fee has been deducted</source> <translation>Bu işlem, tutar düşüldükten sonra göndermek için çok düşük</translation> </message> <message> - <source>Whitelisted peers cannot be DoS banned and their transactions are always relayed, even if they are already in the mempool, useful e.g. for a gateway</source> - <translation>Beyaz listeye alınan eşler DoS yasaklamasına uğramazlar ve işlemleri zaten mempool'da olsalar da daima aktarılır, bu mesela bir geçit için kullanışlıdır</translation> - </message> - <message> <source>You need to rebuild the database using -reindex to go back to unpruned mode. This will redownload the entire blockchain</source> <translation>Budama olmayan kipe dönmek için veritabanını -reindex ile tekrar derlemeniz gerekir. Bu, tüm blok zincirini tekrar indirecektir</translation> </message> <message> - <source>(default: %u)</source> - <translation>(varsayılan: %u)</translation> - </message> - <message> - <source>Accept public REST requests (default: %u)</source> - <translation>Herkese açık REST taleplerini kabul et (varsayılan: %u)</translation> - </message> - <message> - <source>Automatically create Tor hidden service (default: %d)</source> - <translation>Otomatik olarak gizli Tor servisi oluştur (varsayılan: %d)</translation> - </message> - <message> - <source>Connect through SOCKS5 proxy</source> - <translation>SOCKS5 vekil sunucusu vasıtasıyla bağlan</translation> - </message> - <message> <source>Error loading %s: You can't disable HD on an already existing HD wallet</source> <translation>%s yüklemesinde hata: Zaten HD olan bir cüzdanda HD devre dışı bırakılamaz </translation> </message> @@ -3586,10 +3262,6 @@ <translation>Zincirdurumu veritabanı yükseltme hatası</translation> </message> <message> - <source>Imports blocks from external blk000??.dat file on startup</source> - <translation>Başlangıçta harici blk000??.dat dosyasından blokları içe aktarır</translation> - </message> - <message> <source>Information</source> <translation>Bilgi</translation> </message> @@ -3610,44 +3282,28 @@ <translation>-whitelist: '%s' unsurunda geçersiz bir ağ maskesi belirtildi</translation> </message> <message> - <source>Keep at most <n> unconnectable transactions in memory (default: %u)</source> - <translation>Hafızada en çok <n> bağlanılamaz işlem tut (varsayılan: %u)</translation> - </message> - <message> <source>Need to specify a port with -whitebind: '%s'</source> <translation>-whitebind: '%s' ile bir port belirtilmesi lazımdır</translation> </message> <message> - <source>Node relay options:</source> - <translation>Düğüm aktarma seçenekleri:</translation> - </message> - <message> - <source>RPC server options:</source> - <translation>RPC sunucu seçenekleri:</translation> - </message> - <message> <source>Reducing -maxconnections from %d to %d, because of system limitations.</source> <translation>Sistem sınırlamaları sebebiyle -maxconnections %d değerinden %d değerine düşürülmüştür.</translation> </message> <message> - <source>Rescan the block chain for missing wallet transactions on startup</source> - <translation>Başlangıçta blok zincirini eksik cüzdan işlemleri için tekrar tara</translation> - </message> - <message> - <source>Send trace/debug info to console instead of debug.log file</source> - <translation>İzleme/hata ayıklama verilerini debug.log dosyası yerine konsola gönder</translation> + <source>Signing transaction failed</source> + <translation>İşlemin imzalanması başarısız oldu</translation> </message> <message> - <source>Show all debugging options (usage: --help -help-debug)</source> - <translation>Tüm hata ayıklama seçeneklerini göster (kullanımı: --help -help-debug)</translation> + <source>Specified -walletdir "%s" does not exist</source> + <translation>Belirtilen -walletdir "%s" mevcut değil</translation> </message> <message> - <source>Shrink debug.log file on client startup (default: 1 when no -debug)</source> - <translation>İstemci başlatıldığında debug.log dosyasını küçült (varsayılan: -debug bulunmadığında 1)</translation> + <source>Specified -walletdir "%s" is a relative path</source> + <translation>Belirtilen -walletdir "%s" göreceli bir yoldur</translation> </message> <message> - <source>Signing transaction failed</source> - <translation>İşlemin imzalanması başarısız oldu</translation> + <source>Specified -walletdir "%s" is not a directory</source> + <translation>Belirtilen -walletdir "%s" bir dizin değildir</translation> </message> <message> <source>The transaction amount is too small to pay the fee</source> @@ -3658,14 +3314,6 @@ <translation>Bu, deneysel bir yazılımdır.</translation> </message> <message> - <source>Tor control port password (default: empty)</source> - <translation>Tor kontrol portu parolası (varsayılan: boş)</translation> - </message> - <message> - <source>Tor control port to use if onion listening enabled (default: %s)</source> - <translation>Eğer onion dinlemesi etkinse kullanılacak Tor kontrol portu (varsayılan: %s)</translation> - </message> - <message> <source>Transaction amount too small</source> <translation>İşlem tutarı çok düşük</translation> </message> @@ -3682,12 +3330,8 @@ <translation>Bu bilgisayarda %s ögesine bağlanılamadı (bağlanma %s hatasını verdi)</translation> </message> <message> - <source>Upgrade wallet to latest format on startup</source> - <translation>Başlangıçta cüzdanı en yeni biçime güncelle</translation> - </message> - <message> - <source>Username for JSON-RPC connections</source> - <translation>JSON-RPC bağlantıları için kullanıcı ismi</translation> + <source>Unable to generate initial keys</source> + <translation>Başlangıç anahtarları üretilemiyor</translation> </message> <message> <source>Verifying wallet(s)...</source> @@ -3702,94 +3346,18 @@ <translation>Uyarı: bilinmeyen yeni kurallar etkinleştirilmiştir (versionbit %i)</translation> </message> <message> - <source>Whether to operate in a blocks only mode (default: %u)</source> - <translation>Sadece blok kipinde çalışılıp çalışılmayacağı (varsayılan: %u)</translation> - </message> - <message> - <source>You need to rebuild the database using -reindex to change -txindex</source> - <translation>Veritabanını -txindex değerini değiştirmek için -reindex kullanarak tekrar oluşturmanız gerekiyor</translation> - </message> - <message> <source>Zapping all transactions from wallet...</source> <translation>Cüzdandaki tüm işlemler kaldırılıyor...</translation> </message> <message> - <source>ZeroMQ notification options:</source> - <translation>ZeroMQ bildirim seçenekleri:</translation> - </message> - <message> - <source>Password for JSON-RPC connections</source> - <translation>JSON-RPC bağlantıları için parola</translation> - </message> - <message> - <source>Execute command when the best block changes (%s in cmd is replaced by block hash)</source> - <translation>En iyi blok değiştiğinde komutu çalıştır (komut için %s parametresi blok hash değeri ile değiştirilecektir)</translation> - </message> - <message> - <source>Allow DNS lookups for -addnode, -seednode and -connect</source> - <translation>-addnode, -seednode ve -connect için DNS aramalarına izin ver</translation> - </message> - <message> - <source>(1 = keep tx meta data e.g. account owner and payment request information, 2 = drop tx meta data)</source> - <translation>(1 = tx meta verilerini tut mesela hesap sahibi ve ödeme talebi bilgileri, 2 = tx meta verilerini at)</translation> - </message> - <message> <source>-maxtxfee is set very high! Fees this large could be paid on a single transaction.</source> <translation>-maxtxfee çok yüksek bir değere ayarlanmış! Bu denli yüksek ücretler tek bir işlemde ödenebilir.</translation> </message> <message> - <source>Do not keep transactions in the mempool longer than <n> hours (default: %u)</source> - <translation>İşlemleri bellek alanında <n> saatten fazla tutma (varsayılan: %u)</translation> - </message> - <message> - <source>Equivalent bytes per sigop in transactions for relay and mining (default: %u)</source> - <translation>Oluşturma ve aktarma işlemlerinde sigop başına eşdeğer bayt (varsayılan: %u)</translation> - </message> - <message> <source>Error loading %s: You can't enable HD on an already existing non-HD wallet</source> <translation>%s yüklenmesinde hata: zaten var olan ve HD olmayan bir cüzdanda HD etkinleştirilemez.</translation> </message> <message> - <source>Error loading wallet %s. -wallet parameter must only specify a filename (not a path).</source> - <translation>%s cüzdanı yüklenirken hata oluştu. -wallet değişkeni sadece belirli bir dosya adını belirtmelidir (bir dizini değil).</translation> - </message> - <message> - <source>Fees (in %s/kB) smaller than this are considered zero fee for transaction creation (default: %s)</source> - <translation>Bundan düşük ücretler (%s/kB olarak) işlem oluşturulması için sıfır değerinde ücret olarak kabul edilir (varsayılan: %s)</translation> - </message> - <message> - <source>Force relay of transactions from whitelisted peers even if they violate local relay policy (default: %d)</source> - <translation>Yerel aktarma politikasını ihlal etseler bile beyaz listedeki eşlerden gelen işlemlerin aktarılmasını zorla (varsayılan: %d)</translation> - </message> - <message> - <source>How thorough the block verification of -checkblocks is (0-4, default: %u)</source> - <translation>-checkblocks'un blok kontrolünün ne kadar kapsamlı olacağı (0 ilâ 4, varsayılan: %u)</translation> - </message> - <message> - <source>Maintain a full transaction index, used by the getrawtransaction rpc call (default: %u)</source> - <translation>İşlemlerin tamamının indeksini tut, getrawtransaction rpc çağrısı tarafından kullanılır (varsayılan: %u)</translation> - </message> - <message> - <source>Number of seconds to keep misbehaving peers from reconnecting (default: %u)</source> - <translation>Aksaklık gösteren eşlerle terkar bağlantıyı engelleme süresi, saniye olarak (varsayılan: %u)</translation> - </message> - <message> - <source>Output debugging information (default: %u, supplying <category> is optional)</source> - <translation>Hata ayıklama bilgisini dök (varsayılan: %u, <category> sağlanması seçime dayalıdır)</translation> - </message> - <message> - <source>Sets the serialization of raw transaction or block hex returned in non-verbose mode, non-segwit(0) or segwit(1) (default: %d)</source> - <translation>Ham işlemin serileştirilmesini ayarlar veya blok non-verbose, non-segwit(0) veya segwit(1) kipinde onaltılık değeri döndürür (default: %d)</translation> - </message> - <message> - <source>Specify directory to hold wallets (default: <datadir>/wallets if it exists, otherwise <datadir>)</source> - <translation>Cüzdanları tutmak için bir dizin belirtin (eğer varsa varsayılan: <datadir>/wallets, yoksa <datadir>)</translation> - </message> - <message> - <source>Support filtering of blocks and transaction with bloom filters (default: %u)</source> - <translation>Blokların ve işlemlerin bloom filtreleri ile süzülmesini destekle (varsayılan: %u)</translation> - </message> - <message> <source>This is the transaction fee you may pay when fee estimates are not available.</source> <translation>İşlem ücret tahminleri mevcut olmadığında ödeyebileceğiniz işlem ücreti budur.</translation> </message> @@ -3802,10 +3370,6 @@ <translation>Ağ sürümü zincirinin toplam boyutu (%i) en yüksek boyutu geçmektedir (%i). Kullanıcı aracı açıklamasının sayısı veya boyutunu azaltınız.</translation> </message> <message> - <source>Tries to keep outbound traffic under the given target (in MiB per 24h), 0 = no limit (default: %d)</source> - <translation>Giden trafiği belirtilen hedefin altında tutmaya çalışır (24 saat başı MiB olarak), 0 = sınırsız (varsayılan: %d)</translation> - </message> - <message> <source>Unsupported argument -socks found. Setting SOCKS version isn't possible anymore, only SOCKS5 proxies are supported.</source> <translation>Desteklenmeyen -socks argümanı bulundu. SOCKS sürümünün ayarlanması artık mümkün değildir, sadece SOCKS5 vekilleri desteklenmektedir.</translation> </message> @@ -3814,10 +3378,6 @@ <translation>Desteklenmeyen argüman -whitelistalwaysrelay görmezden gelindi, -whitelistrelay ve/veya -whitelistforcerelay kullanın.</translation> </message> <message> - <source>Use separate SOCKS5 proxy to reach peers via Tor hidden services (default: %s)</source> - <translation>Eşlere gizli Tor servisleri ile ulaşmak için ayrı SOCKS5 vekil sunucusu kullan (varsayılan: %s)</translation> - </message> - <message> <source>Warning: Unknown block versions being mined! It's possible unknown rules are in effect</source> <translation>Uyarı: Bilinmeyen blok sürümü oluşturulmaya çalışılıyor. Bilinmeyen kuralların işlemesi mümkündür.</translation> </message> @@ -3826,110 +3386,18 @@ <translation>Uyarı: wallet.dat bozuk, veriler geri kazanıldı! Özgün %s, %s olarak %s klasörüne kaydedildi; bakiyeniz ya da işlemleriniz yanlışsa bir yedeklemeden tekrar yüklemeniz gerekir.</translation> </message> <message> - <source>Whitelist peers connecting from the given IP address (e.g. 1.2.3.4) or CIDR notated network (e.g. 1.2.3.0/24). Can be specified multiple times.</source> - <translation>Beyaz listeye eklenen eşler verilen IP adresinden (ör. 1.2.3.4) veya CIDR ağından (ör. 1.2.3.0/24) bağlanabilir. Değerler birden çok kez kullanılabilir.</translation> - </message> - <message> <source>%s is set very high!</source> <translation>%s çok yüksek ayarlanmış!</translation> </message> <message> - <source>(default: %s)</source> - <translation>(varsayılan: %s)</translation> - </message> - <message> - <source>Always query for peer addresses via DNS lookup (default: %u)</source> - <translation>Eş adresleri sorgulaması için daima DNS aramasını kullan (varsayılan: %u)</translation> - </message> - <message> - <source>Error loading wallet %s. -wallet filename must be a regular file.</source> - <translation>%s cüzdanı yüklenirken hata oluştu. -wallet dosya adı normal bir dosya adı olmalıdır.</translation> - </message> - <message> <source>Error loading wallet %s. Duplicate -wallet filename specified.</source> <translation>%s cüzdanı yüklenirken hata oluştu. Belirtilen -wallet dosya adında başka bir kopya daha var.</translation> </message> <message> - <source>Error loading wallet %s. Invalid characters in -wallet filename.</source> - <translation>%s cüzdanı yüklenirken hata oluştu. -wallet dosya adında geçersiz karakterler var.</translation> - </message> - <message> - <source>How many blocks to check at startup (default: %u, 0 = all)</source> - <translation>Başlangıçta kontrol edilecek blok sayısı (varsayılan: %u, 0 = hepsi)</translation> - </message> - <message> - <source>Include IP addresses in debug output (default: %u)</source> - <translation>Hata ayıklama çıktısına IP adreslerini dahil et (varsayılan: %u)</translation> - </message> - <message> <source>Keypool ran out, please call keypoolrefill first</source> <translation>Keypool tükendi, lütfen önce keypoolrefill'i çağırın</translation> </message> <message> - <source>Listen for JSON-RPC connections on <port> (default: %u or testnet: %u)</source> - <translation>JSON-RPC bağlantılarını <port> üzerinde dinle (varsayılan: %u veya tesnet: %u)</translation> - </message> - <message> - <source>Listen for connections on <port> (default: %u or testnet: %u)</source> - <translation>Bağlantılar için dinlenecek <port> (varsayılan: %u ya da testnet: %u)</translation> - </message> - <message> - <source>Maintain at most <n> connections to peers (default: %u)</source> - <translation>Eşler ile en çok <n> adet bağlantı kur (varsayılan: %u)</translation> - </message> - <message> - <source>Make the wallet broadcast transactions</source> - <translation>Cüzdanın işlemleri yayınlamasını sağla</translation> - </message> - <message> - <source>Maximum per-connection receive buffer, <n>*1000 bytes (default: %u)</source> - <translation>Her bağlantı için en yüksek alım tamponu, <n>*1000 bayt (varsayılan: %u)</translation> - </message> - <message> - <source>Maximum per-connection send buffer, <n>*1000 bytes (default: %u)</source> - <translation>Her bağlantı için çok gönderme tamponu, <n>*1000 bayt (varsayılan: %u)</translation> - </message> - <message> - <source>Prepend debug output with timestamp (default: %u)</source> - <translation>Hata ayıklama verilerinin önüne zaman damgası ekle (varsayılan: %u)</translation> - </message> - <message> - <source>Relay and mine data carrier transactions (default: %u)</source> - <translation>Veri taşıyıcı işlemleri oluştur ve aktar (varsayılan: %u)</translation> - </message> - <message> - <source>Relay non-P2SH multisig (default: %u)</source> - <translation>P2SH olmayan çoklu imzaları aktar (varsayılan: %u)</translation> - </message> - <message> - <source>Set key pool size to <n> (default: %u)</source> - <translation>Anahtar alan boyutunu <n> değerine ayarla (varsayılan: %u)</translation> - </message> - <message> - <source>Set maximum BIP141 block weight (default: %d)</source> - <translation>En yüksek BIP141 blok ağırlığını ayarla (varsayılan: %d)</translation> - </message> - <message> - <source>Set the number of threads to service RPC calls (default: %d)</source> - <translation>Hizmet RCP aramaları iş parçacığı sayısını belirle (varsayılan: %d)</translation> - </message> - <message> - <source>Specify configuration file (default: %s)</source> - <translation>Yapılandırma dosyası belirtiniz (varsayılan: %s)</translation> - </message> - <message> - <source>Specify connection timeout in milliseconds (minimum: 1, default: %d)</source> - <translation>Bağlantı zaman aşım süresini milisaniye olarak belirt (en düşüki: 1, varsayılan: %d)</translation> - </message> - <message> - <source>Specify pid file (default: %s)</source> - <translation>Pid dosyası belirtiniz (varsayılan: %s)</translation> - </message> - <message> - <source>Spend unconfirmed change when sending transactions (default: %u)</source> - <translation>Gönderme işlemlerinde doğrulanmamış para üstünü harca (varsayılan: %u)</translation> - </message> - <message> <source>Starting network threads...</source> <translation>Ağ iş parçacıkları başlatılıyor...</translation> </message> @@ -3946,10 +3414,6 @@ <translation>Eğer bir gönderme işlemi yaparsanız bu ödeyeceğiniz işlem ücretidir.</translation> </message> <message> - <source>Threshold for disconnecting misbehaving peers (default: %u)</source> - <translation>Aksaklık gösteren eşlerle bağlantıyı kesme sınırı (varsayılan: %u)</translation> - </message> - <message> <source>Transaction amounts must not be negative</source> <translation>İşlem tutarı negatif olmamalıdır</translation> </message> diff --git a/src/qt/locale/bitcoin_tr_TR.ts b/src/qt/locale/bitcoin_tr_TR.ts index efaca68e01..cf119c65c2 100644 --- a/src/qt/locale/bitcoin_tr_TR.ts +++ b/src/qt/locale/bitcoin_tr_TR.ts @@ -210,6 +210,10 @@ <context> <name>BitcoinGUI</name> <message> + <source>Sign &message...</source> + <translation>İmza &mesaj</translation> + </message> + <message> <source>Synchronizing with network...</source> <translation>Ağ ile bağlantı kuruluyor...</translation> </message> @@ -234,6 +238,18 @@ <translation>Hakkında%1</translation> </message> <message> + <source>Show information about %1</source> + <translation>%1 hakkındaki bilgileri görüntüle</translation> + </message> + <message> + <source>About &Qt</source> + <translation>Qt Hakkında</translation> + </message> + <message> + <source>Show information about Qt</source> + <translation>Qt hakkındaki bilgileri görüntüleyin</translation> + </message> + <message> <source>&Options...</source> <translation>&Seçenekler</translation> </message> @@ -246,18 +262,46 @@ <translation>&Cüzdan Yedekleme</translation> </message> <message> + <source>&Sending addresses...</source> + <translation>Gönderme adresleri</translation> + </message> + <message> <source>&Receiving addresses...</source> <translation>Alış adresleri</translation> </message> <message> + <source>Open &URI...</source> + <translation>URI'yi aç</translation> + </message> + <message> <source>Network activity disabled.</source> <translation>Ağ etkinliği devre dışı.</translation> </message> <message> + <source>Click to enable network activity again.</source> + <translation>Ağ aktivitesini tekrar başlatmak için tıklayın.</translation> + </message> + <message> + <source>Reindexing blocks on disk...</source> + <translation>Bloklar disk üzerinde yeniden indeksleniyor...</translation> + </message> + <message> <source>Send coins to a Bitcoin address</source> <translation>Bitcoin adresine madeni para gönderin</translation> </message> <message> + <source>Backup wallet to another location</source> + <translation>Cüzdanınızı başka bir lokasyona yedekleyin</translation> + </message> + <message> + <source>Open debugging and diagnostic console</source> + <translation>Hata giderme konsolunu aç</translation> + </message> + <message> + <source>&Verify message...</source> + <translation>Onay mesajı...</translation> + </message> + <message> <source>Bitcoin</source> <translation>Bitcoin </translation> @@ -267,10 +311,38 @@ <translation>Cüzdan</translation> </message> <message> + <source>&Send</source> + <translation>Gönder</translation> + </message> + <message> + <source>&Receive</source> + <translation>Al</translation> + </message> + <message> + <source>&Show / Hide</source> + <translation>Göster / Gizle</translation> + </message> + <message> <source>&Settings</source> <translation>&Ayarlar</translation> </message> <message> + <source>Show the list of used sending addresses and labels</source> + <translation>Kullanılan gönderim adreslerinin ve etiketlerinin listesini göster</translation> + </message> + <message> + <source>Show the list of used receiving addresses and labels</source> + <translation>Kullanılan alış adreslerinin ve etiketlerinin listesini göster</translation> + </message> + <message> + <source>&Command-line options</source> + <translation>Komut satırı ayarları</translation> + </message> + <message> + <source>Indexing blocks on disk...</source> + <translation>Bloklar disk üzerinde indeksleniyor...</translation> + </message> + <message> <source>Error</source> <translation>Hata</translation> </message> @@ -282,10 +354,79 @@ <source>Information</source> <translation>Bilgi</translation> </message> + <message> + <source>Date: %1 +</source> + <translation>Tarih %1</translation> + </message> + <message> + <source>HD key generation is <b>enabled</b></source> + <translation>HD anahtar üretimi<b>aktif</b></translation> + </message> + <message> + <source>HD key generation is <b>disabled</b></source> + <translation>HD anahtar üretimi <b>pasif</b></translation> + </message> </context> <context> <name>CoinControlDialog</name> <message> + <source>Bytes:</source> + <translation>Bayt</translation> + </message> + <message> + <source>Fee:</source> + <translation>Ücret:</translation> + </message> + <message> + <source>After Fee:</source> + <translation>Ücretten sonra kalan:</translation> + </message> + <message> + <source>Change:</source> + <translation>Değişen:</translation> + </message> + <message> + <source>List mode</source> + <translation>Listeleme modu</translation> + </message> + <message> + <source>Date</source> + <translation>Tarih</translation> + </message> + <message> + <source>Confirmations</source> + <translation>Onaylamalar</translation> + </message> + <message> + <source>Confirmed</source> + <translation>Kabul edilen</translation> + </message> + <message> + <source>Copy address</source> + <translation>Adresi kopyala</translation> + </message> + <message> + <source>Copy label</source> + <translation>Etiketi kopyala</translation> + </message> + <message> + <source>Copy fee</source> + <translation>Ücreti kopyala</translation> + </message> + <message> + <source>(%1 locked)</source> + <translation>(%1 kilitli)</translation> + </message> + <message> + <source>yes</source> + <translation>Evet</translation> + </message> + <message> + <source>no</source> + <translation>Hayır</translation> + </message> + <message> <source>(no label)</source> <translation>(etiket yok)</translation> </message> @@ -293,6 +434,10 @@ <context> <name>EditAddressDialog</name> <message> + <source>Edit Address</source> + <translation>Adresi Düzenle</translation> + </message> + <message> <source>&Label</source> <translation>Etiket</translation> </message> @@ -300,16 +445,56 @@ <source>&Address</source> <translation>Adres</translation> </message> - </context> + <message> + <source>New sending address</source> + <translation>Yeni gönderim adresi</translation> + </message> + <message> + <source>Edit receiving address</source> + <translation>Alış adresini düzenleyin</translation> + </message> + <message> + <source>Edit sending address</source> + <translation>Gönderim adresini düzenleyin</translation> + </message> + <message> + <source>The entered address "%1" is not a valid Bitcoin address.</source> + <translation>Girilen adres "%1" Bitcoin adresiyle eşleşmiyor.</translation> + </message> + <message> + <source>New key generation failed.</source> + <translation>Yeni anahtar üretimi başarısız.</translation> + </message> +</context> <context> <name>FreespaceChecker</name> + <message> + <source>name</source> + <translation>isim</translation> + </message> </context> <context> <name>HelpMessageDialog</name> - </context> + <message> + <source>version</source> + <translation>versiyon</translation> + </message> + <message> + <source>About %1</source> + <translation>Hakkında %1</translation> + </message> + <message> + <source>Command-line options</source> + <translation>Komut satırı ayarları</translation> + </message> +</context> <context> <name>Intro</name> <message> + <source>Welcome</source> + <translation>Hoş geldiniz</translation> + </message> + <message> <source>Bitcoin</source> <translation>Bitcoin </translation> @@ -321,6 +506,30 @@ </context> <context> <name>ModalOverlay</name> + <message> + <source>Form</source> + <translation>Form</translation> + </message> + <message> + <source>Number of blocks left</source> + <translation>Kalan blokların sayısı</translation> + </message> + <message> + <source>Unknown...</source> + <translation>Bilinmiyor...</translation> + </message> + <message> + <source>Last block time</source> + <translation>Son blok zamanı</translation> + </message> + <message> + <source>calculating...</source> + <translation>hesaplanıyor...</translation> + </message> + <message> + <source>Hide</source> + <translation>Gizle</translation> + </message> </context> <context> <name>OpenURIDialog</name> @@ -328,41 +537,445 @@ <context> <name>OptionsDialog</name> <message> + <source>Options</source> + <translation>Ayarlar</translation> + </message> + <message> + <source>&Main</source> + <translation>&Ana Menü</translation> + </message> + <message> + <source>Size of &database cache</source> + <translation>Veritabanı önbelleğinin boyutu</translation> + </message> + <message> + <source>IP address of the proxy (e.g. IPv4: 127.0.0.1 / IPv6: ::1)</source> + <translation>Proxy bağlantısı IP adresleri (örneğin IPv4: 127.0.0.1 / IPv6: ::1)</translation> + </message> + <message> + <source>Open Configuration File</source> + <translation>Konfigürasyon dosyasını aç</translation> + </message> + <message> + <source>Reset all client options to default.</source> + <translation>Bütün ayarları varsayılana çevir</translation> + </message> + <message> + <source>&Network</source> + <translation>Ağ</translation> + </message> + <message> + <source>W&allet</source> + <translation>Cüzdan</translation> + </message> + <message> + <source>Port of the proxy (e.g. 9050)</source> + <translation>Proxy portu (örneğin 9050)</translation> + </message> + <message> + <source>&Window</source> + <translation>Pencere</translation> + </message> + <message> + <source>User Interface &language:</source> + <translation>Kullanıcı arayüzü dili</translation> + </message> + <message> + <source>&OK</source> + <translation>Tamam</translation> + </message> + <message> + <source>&Cancel</source> + <translation>İptal</translation> + </message> + <message> + <source>default</source> + <translation>Varsayılan</translation> + </message> + <message> + <source>Client restart required to activate changes.</source> + <translation>Değişikliklerin aktif edilebilmesi için yeniden başlatma gerekiyor.</translation> + </message> + <message> + <source>Configuration options</source> + <translation>Konfigürasyon ayarları</translation> + </message> + <message> + <source>The configuration file is used to specify advanced user options which override GUI settings. Additionally, any command-line options will override this configuration file.</source> + <translation>Konfigürasyon dosyası GUI ayarlarını geçersiz kılmak için gelişmiş kullanıcı ayarlarını değiştirir. Ek olarak, herhangi bir komut satırı seçeneği konfigürasyon dosyasını geçersiz kılar.</translation> + </message> + <message> <source>Error</source> <translation>Hata</translation> </message> - </context> + <message> + <source>The configuration file could not be opened.</source> + <translation>Konfigürasyon dosyası açılamadı.</translation> + </message> + <message> + <source>This change would require a client restart.</source> + <translation>Bu değişiklik istemcinin yeniden başlatılmasını gerektirir.</translation> + </message> + <message> + <source>The supplied proxy address is invalid.</source> + <translation>Sağlanan proxy adresi geçerli değil.</translation> + </message> +</context> <context> <name>OverviewPage</name> - </context> + <message> + <source>Form</source> + <translation>Form</translation> + </message> + <message> + <source>The displayed information may be out of date. Your wallet automatically synchronizes with the Bitcoin network after a connection is established, but this process has not completed yet.</source> + <translation>Gösterilen bilgi geçerli olmayabilir. Bağlantı tekrar sağlandıktan sonra cüzdanınız otomatik olarak senkronize olacaktır. Henüz senkronize olma işlemi tamamlanmadı.</translation> + </message> + <message> + <source>Watch-only:</source> + <translation>Sadece görüntülenebilir:</translation> + </message> + <message> + <source>Available:</source> + <translation>Kullanılabilir:</translation> + </message> + <message> + <source>Your current spendable balance</source> + <translation>Mevcut harcanabilir tutarınız</translation> + </message> + <message> + <source>Pending:</source> + <translation>Bekleyen:</translation> + </message> + <message> + <source>Total:</source> + <translation>Toplam:</translation> + </message> + <message> + <source>Your current total balance</source> + <translation>Toplam mevcut miktarınız</translation> + </message> + <message> + <source>Your current balance in watch-only addresses</source> + <translation>Sadece görüntülenebilir adreslerdeki mevcut miktarınız</translation> + </message> + <message> + <source>Spendable:</source> + <translation>Harcanabilir:</translation> + </message> + <message> + <source>Recent transactions</source> + <translation>Yakın zamanda yapılmış işlemler</translation> + </message> + <message> + <source>Unconfirmed transactions to watch-only addresses</source> + <translation>Sadece görüntülenebilir adreslerdeki doğrulanmamış işlemler</translation> + </message> + <message> + <source>Current total balance in watch-only addresses</source> + <translation>Sadece görüntülenebilir adreslerdeki mevcut toplam miktar</translation> + </message> +</context> <context> <name>PaymentServer</name> + <message> + <source>Payment request error</source> + <translation>Ödeme isteği hatası</translation> + </message> + <message> + <source>Payment request fetch URL is invalid: %1</source> + <translation>Ödeme isteği URL'si hatalı: %1</translation> + </message> + <message> + <source>Invalid payment address %1</source> + <translation>Hatalı ödeme adresi %1</translation> + </message> + <message> + <source>Network request error</source> + <translation>Ağ hatası</translation> + </message> </context> <context> <name>PeerTableModel</name> - </context> + <message> + <source>Sent</source> + <translation>Gönder</translation> + </message> + <message> + <source>Received</source> + <translation>Alındı</translation> + </message> +</context> <context> <name>QObject</name> - </context> + <message> + <source>Enter a Bitcoin address (e.g. %1)</source> + <translation>Bitcoin adresinizi girin (örneğin %1)</translation> + </message> + <message> + <source>N/A</source> + <translation>Yok</translation> + </message> + <message> + <source>%1 and %2</source> + <translation>%1 ve %2</translation> + </message> + <message> + <source>unknown</source> + <translation>bilinmiyor</translation> + </message> +</context> <context> <name>QObject::QObject</name> - </context> + <message> + <source>Error: %1</source> + <translation>Hata: %1</translation> + </message> +</context> <context> <name>QRImageWidget</name> + <message> + <source>&Save Image...</source> + <translation>&Görüntüyü kaydet</translation> + </message> + <message> + <source>&Copy Image</source> + <translation>&Görüntüyü kopyala</translation> + </message> + <message> + <source>Save QR Code</source> + <translation>QR kodu kaydet</translation> + </message> </context> <context> <name>RPCConsole</name> - </context> + <message> + <source>N/A</source> + <translation>Yok</translation> + </message> + <message> + <source>Client version</source> + <translation>Arayüz versiyonu</translation> + </message> + <message> + <source>&Information</source> + <translation>&Bilgi</translation> + </message> + <message> + <source>Debug window</source> + <translation>Hata giderme penceresi</translation> + </message> + <message> + <source>General</source> + <translation>Genel</translation> + </message> + <message> + <source>Using BerkeleyDB version</source> + <translation>Kullanılan BerkeleyDB versiyonu</translation> + </message> + <message> + <source>Startup time</source> + <translation>Başlangıç zamanı</translation> + </message> + <message> + <source>Network</source> + <translation>Ağ</translation> + </message> + <message> + <source>Name</source> + <translation>İsim</translation> + </message> + <message> + <source>Number of connections</source> + <translation>Bağlantı sayısı</translation> + </message> + <message> + <source>Block chain</source> + <translation>Blok zinciri</translation> + </message> + <message> + <source>Memory usage</source> + <translation>Bellek kullanımı</translation> + </message> + <message> + <source>&Reset</source> + <translation>&Yeniden başlat</translation> + </message> + <message> + <source>Received</source> + <translation>Alındı</translation> + </message> + <message> + <source>Sent</source> + <translation>Gönder</translation> + </message> + <message> + <source>Whitelisted</source> + <translation>Beyaz listede</translation> + </message> + <message> + <source>Version</source> + <translation>Versiyon</translation> + </message> + <message> + <source>Services</source> + <translation>Servisler</translation> + </message> + <message> + <source>Connection Time</source> + <translation>Bağlantı süresi</translation> + </message> + <message> + <source>Last Send</source> + <translation>Son gönderim</translation> + </message> + <message> + <source>Last Receive</source> + <translation>Son alış</translation> + </message> + <message> + <source>Ping Time</source> + <translation>Ping süresi</translation> + </message> + <message> + <source>Ping Wait</source> + <translation>Ping bekliyor</translation> + </message> + <message> + <source>Last block time</source> + <translation>Son blok zamanı</translation> + </message> + <message> + <source>&Open</source> + <translation>&Aç</translation> + </message> + <message> + <source>&Console</source> + <translation>&Konsol</translation> + </message> + <message> + <source>&Network Traffic</source> + <translation>&Ağ trafiği</translation> + </message> + <message> + <source>Totals</source> + <translation>Toplam</translation> + </message> + <message> + <source>Clear console</source> + <translation>Konsolu temizle</translation> + </message> + <message> + <source>1 &hour</source> + <translation>1 &saat</translation> + </message> + <message> + <source>1 &day</source> + <translation>1 &gün</translation> + </message> + <message> + <source>1 &week</source> + <translation>1 &hafta</translation> + </message> + <message> + <source>1 &year</source> + <translation>1 &yıl</translation> + </message> + <message> + <source>&Disconnect</source> + <translation>&Bağlantı kesildi</translation> + </message> + <message> + <source>Network activity disabled</source> + <translation>Ağ aktivitesi pasif</translation> + </message> + <message> + <source>never</source> + <translation>asla</translation> + </message> + <message> + <source>Inbound</source> + <translation>Gelen</translation> + </message> + <message> + <source>Outbound</source> + <translation>Giden</translation> + </message> + <message> + <source>Yes</source> + <translation>Evet</translation> + </message> + <message> + <source>No</source> + <translation>Hayır</translation> + </message> + <message> + <source>Unknown</source> + <translation>Bilinmiyor</translation> + </message> +</context> <context> <name>ReceiveCoinsDialog</name> + <message> + <source>&Label:</source> + <translation>&Etiket</translation> + </message> + <message> + <source>&Message:</source> + <translation>&Mesaj</translation> + </message> + <message> + <source>Clear</source> + <translation>Temizle</translation> + </message> + <message> + <source>Show</source> + <translation>Göster</translation> + </message> + <message> + <source>Remove</source> + <translation>Sil</translation> + </message> + <message> + <source>Copy URI</source> + <translation>URI'yi kopyala</translation> + </message> + <message> + <source>Copy label</source> + <translation>Etiketi kopyala</translation> + </message> + <message> + <source>Copy message</source> + <translation>Mesajı kopyala</translation> + </message> </context> <context> <name>ReceiveRequestDialog</name> <message> + <source>QR Code</source> + <translation>QR kod</translation> + </message> + <message> + <source>Copy &URI</source> + <translation>URI'yi kopyala</translation> + </message> + <message> <source>Copy &Address</source> <translation>&Adresi Kopyala</translation> </message> <message> + <source>&Save Image...</source> + <translation>&Görüntüyü kaydet</translation> + </message> + <message> + <source>Payment information</source> + <translation>Ödeme bilgisi</translation> + </message> + <message> + <source>URI</source> + <translation>URI</translation> + </message> + <message> <source>Address</source> <translation>adres</translation> </message> @@ -370,37 +983,189 @@ <source>Label</source> <translation>etiket</translation> </message> + <message> + <source>Message</source> + <translation>Mesaj</translation> + </message> + <message> + <source>Wallet</source> + <translation>Cüzdan</translation> + </message> </context> <context> <name>RecentRequestsTableModel</name> <message> + <source>Date</source> + <translation>Tarih</translation> + </message> + <message> <source>Label</source> <translation>etiket</translation> </message> <message> + <source>Message</source> + <translation>Mesaj</translation> + </message> + <message> <source>(no label)</source> <translation>(etiket yok)</translation> </message> + <message> + <source>(no message)</source> + <translation>(mesaj yok)</translation> + </message> </context> <context> <name>SendCoinsDialog</name> <message> + <source>Send Coins</source> + <translation>Coin gönder</translation> + </message> + <message> + <source>automatically selected</source> + <translation>Otomatik seçildi</translation> + </message> + <message> + <source>Bytes:</source> + <translation>Bayt</translation> + </message> + <message> + <source>Fee:</source> + <translation>Ücret:</translation> + </message> + <message> + <source>After Fee:</source> + <translation>Ücretten sonra kalan:</translation> + </message> + <message> + <source>Change:</source> + <translation>Değişen:</translation> + </message> + <message> + <source>Transaction Fee:</source> + <translation>Gönderim ücreti:</translation> + </message> + <message> + <source>Choose...</source> + <translation>Seçiniz...</translation> + </message> + <message> + <source>per kilobyte</source> + <translation>kilobyte başına</translation> + </message> + <message> + <source>Hide</source> + <translation>Gizle</translation> + </message> + <message> + <source>Recommended:</source> + <translation>Önerilen:</translation> + </message> + <message> + <source>Clear &All</source> + <translation>Hepsini sil</translation> + </message> + <message> + <source>Copy fee</source> + <translation>Ücreti kopyala</translation> + </message> + <message> + <source>%1 (%2 blocks)</source> + <translation>%1 (%2 blok)</translation> + </message> + <message> + <source>%1 to %2</source> + <translation>%1'den %2'e</translation> + </message> + <message> + <source>Are you sure you want to send?</source> + <translation>Göndermek istediğinize emin misiniz?</translation> + </message> + <message> + <source>or</source> + <translation>ya da</translation> + </message> + <message> + <source>Transaction fee</source> + <translation>Gönderim ücreti</translation> + </message> + <message> + <source>Confirm send coins</source> + <translation>Coin gönderimini onaylayın</translation> + </message> + <message> + <source>Warning: Invalid Bitcoin address</source> + <translation>Uyarı: Hatalı Bitcoin adresi</translation> + </message> + <message> <source>(no label)</source> <translation>(etiket yok)</translation> </message> </context> <context> <name>SendCoinsEntry</name> + <message> + <source>&Label:</source> + <translation>&Etiket</translation> + </message> + <message> + <source>Paste address from clipboard</source> + <translation>Panodaki adresi yapıştırın</translation> + </message> + <message> + <source>Message:</source> + <translation>Mesaj:</translation> + </message> </context> <context> <name>SendConfirmationDialog</name> - </context> + <message> + <source>Yes</source> + <translation>Evet</translation> + </message> +</context> <context> <name>ShutdownWindow</name> </context> <context> <name>SignVerifyMessageDialog</name> - </context> + <message> + <source>Paste address from clipboard</source> + <translation>Panodaki adresi yapıştırın</translation> + </message> + <message> + <source>Signature</source> + <translation>İmza</translation> + </message> + <message> + <source>Sign &Message</source> + <translation>İmza &Mesaj</translation> + </message> + <message> + <source>Clear &All</source> + <translation>Hepsini sil</translation> + </message> + <message> + <source>The entered address is invalid.</source> + <translation>Girilen adres hatalı.</translation> + </message> + <message> + <source>Please check the address and try again.</source> + <translation>Adresi kontrol ettikten sonra lütfen tekrar deneyin.</translation> + </message> + <message> + <source>Please check the signature and try again.</source> + <translation>İmzanızı kontrol ettikten sonra lütfen tekrar deneyin.</translation> + </message> + <message> + <source>Message verification failed.</source> + <translation>Mesaj onayı hatalı.</translation> + </message> + <message> + <source>Message verified.</source> + <translation>Mesaj onaylandı.</translation> + </message> +</context> <context> <name>SplashScreen</name> </context> @@ -409,17 +1174,101 @@ </context> <context> <name>TransactionDesc</name> - </context> + <message> + <source>Status</source> + <translation>Durum</translation> + </message> + <message> + <source>Date</source> + <translation>Tarih</translation> + </message> + <message> + <source>Source</source> + <translation>Kaynak</translation> + </message> + <message> + <source>Generated</source> + <translation>Oluşturuldu</translation> + </message> + <message> + <source>unknown</source> + <translation>bilinmiyor</translation> + </message> + <message> + <source>label</source> + <translation>etiket</translation> + </message> + <message> + <source>not accepted</source> + <translation>kabul edilmedi</translation> + </message> + <message> + <source>Transaction fee</source> + <translation>Gönderim ücreti</translation> + </message> + <message> + <source>Message</source> + <translation>Mesaj</translation> + </message> + <message> + <source>Comment</source> + <translation>Yorum</translation> + </message> + <message> + <source>Transaction total size</source> + <translation>Gönderimin toplam boyutu</translation> + </message> + <message> + <source>Debug information</source> + <translation>Hata giderme bilgisi</translation> + </message> + <message> + <source>true</source> + <translation>doğru</translation> + </message> + <message> + <source>false</source> + <translation>anlış</translation> + </message> +</context> <context> <name>TransactionDescDialog</name> </context> <context> <name>TransactionTableModel</name> <message> + <source>Date</source> + <translation>Tarih</translation> + </message> + <message> + <source>Type</source> + <translation>Tip</translation> + </message> + <message> <source>Label</source> <translation>etiket</translation> </message> <message> + <source>Confirmed (%1 confirmations)</source> + <translation>Onaylandı (%1 onaylanan)</translation> + </message> + <message> + <source>Generated but not accepted</source> + <translation>Oluşturuldu fakat kabul edilmedi</translation> + </message> + <message> + <source>Received with</source> + <translation>ile alındı</translation> + </message> + <message> + <source>Mined</source> + <translation>Kazıldı</translation> + </message> + <message> + <source>(n/a)</source> + <translation>(yok)</translation> + </message> + <message> <source>(no label)</source> <translation>(etiket yok)</translation> </message> @@ -427,10 +1276,66 @@ <context> <name>TransactionView</name> <message> + <source>All</source> + <translation>Hepsi</translation> + </message> + <message> + <source>Today</source> + <translation>Bugün</translation> + </message> + <message> + <source>This week</source> + <translation>Bu hafta</translation> + </message> + <message> + <source>This month</source> + <translation>Bu Ay</translation> + </message> + <message> + <source>Last month</source> + <translation>Son ay</translation> + </message> + <message> + <source>This year</source> + <translation>Bu yıl</translation> + </message> + <message> + <source>Received with</source> + <translation>ile alındı</translation> + </message> + <message> + <source>Mined</source> + <translation>Kazıldı</translation> + </message> + <message> + <source>Other</source> + <translation>Diğerleri</translation> + </message> + <message> + <source>Copy address</source> + <translation>Adresi kopyala</translation> + </message> + <message> + <source>Copy label</source> + <translation>Etiketi kopyala</translation> + </message> + <message> <source>Comma separated file (*.csv)</source> <translation>Virgül ile ayrılmış dosya (*.csv)</translation> </message> <message> + <source>Confirmed</source> + <translation>Kabul edilen</translation> + </message> + <message> + <source>Date</source> + <translation>Tarih</translation> + </message> + <message> + <source>Type</source> + <translation>Tip</translation> + </message> + <message> <source>Label</source> <translation>etiket</translation> </message> @@ -451,59 +1356,91 @@ </context> <context> <name>WalletModel</name> + <message> + <source>Send Coins</source> + <translation>Coin gönder</translation> + </message> + <message> + <source>New fee:</source> + <translation>Yeni ücret:</translation> + </message> </context> <context> <name>WalletView</name> + <message> + <source>&Export</source> + <translation>&Çıkar</translation> + </message> + <message> + <source>Backup Wallet</source> + <translation>Cüzdanı yedekle</translation> + </message> + <message> + <source>Backup Failed</source> + <translation>Yedekleme başarısız</translation> + </message> + <message> + <source>Backup Successful</source> + <translation>Yedekleme tamamlandı</translation> + </message> </context> <context> <name>bitcoin-core</name> <message> - <source>Print this help message and exit</source> - <translation>Bu yardım mesajını yazdır ve çıkış yap</translation> + <source>Bitcoin Core</source> + <translation>Bitcoin Çekirdeği</translation> </message> <message> - <source>Print version and exit</source> - <translation>Versiyonu yazdır ve çıkış yap</translation> + <source>Copyright (C) %i-%i</source> + <translation>Copyright (C) %i-%i</translation> </message> <message> - <source>Verifying blocks...</source> - <translation>Bloklar Onaylanıyor...</translation> + <source>Error: Disk space is low!</source> + <translation>Hata: Disk boyutu düşük!</translation> </message> <message> - <source>Wallet options:</source> - <translation>Cüzdan Ayarları</translation> + <source>Loading P2P addresses...</source> + <translation>P2P adresleri yükleniyor...</translation> </message> <message> - <source>Information</source> - <translation>Bilgi</translation> + <source>Loading banlist...</source> + <translation>Ban listesi yükleniyor...</translation> + </message> + <message> + <source>Verifying blocks...</source> + <translation>Bloklar Onaylanıyor...</translation> </message> <message> - <source>RPC server options:</source> - <translation>RPC sunucu ayarları</translation> + <source>Wallet needed to be rewritten: restart %s to complete</source> + <translation>%s tamamlanması için cüzdanın yeniden başlatılması gerekiyor</translation> </message> <message> - <source>Transaction too large</source> - <translation>İşlem çok büyük</translation> + <source>Error reading from database, shutting down.</source> + <translation>Veritabanı okuma hatası, kapatıldı.</translation> </message> <message> - <source>Warning</source> - <translation>Uyarı</translation> + <source>Information</source> + <translation>Bilgi</translation> </message> <message> - <source>Specify configuration file (default: %s)</source> - <translation>Yapılandırma dosyasını belirle (varsayılan: %s)</translation> + <source>Invalid -onion address or hostname: '%s'</source> + <translation>Hatalı -onion adresi ya da host adı: '%s'</translation> </message> <message> - <source>Specify connection timeout in milliseconds (minimum: 1, default: %d)</source> - <translation>Milisaniyelik zaman aşımına uğramış bağlantıyı belirle (minimum: 1, varsayılan: %d)</translation> + <source>This is experimental software.</source> + <translation>Bu deneysel bir yazılımdır.</translation> </message> <message> - <source>Specify pid file (default: %s)</source> - <translation>Pid dosyasını belirle (Varsayılan: %s)</translation> + <source>Transaction too large</source> + <translation>İşlem çok büyük</translation> + </message> + <message> + <source>Verifying wallet(s)...</source> + <translation>Cüzdan(lar) onaylanıyor...</translation> </message> <message> - <source>Spend unconfirmed change when sending transactions (default: %u)</source> - <translation>İşlem gönderiminde onaylanmamış değişimi öde (Varsayılan: %u)</translation> + <source>Warning</source> + <translation>Uyarı</translation> </message> <message> <source>Starting network threads...</source> @@ -522,10 +1459,6 @@ <translation>Bir işlem göndermeniz durumunda işlem ücretiniz budur</translation> </message> <message> - <source>Threshold for disconnecting misbehaving peers (default: %u)</source> - <translation>Sorunlu emsalleri koparma eşiği (Varsayılan: %u)</translation> - </message> - <message> <source>Transaction amounts must not be negative</source> <translation>İşlem miktarı negatif olmamalı</translation> </message> diff --git a/src/qt/locale/bitcoin_uk.ts b/src/qt/locale/bitcoin_uk.ts index 6ea28b3141..6698aa4235 100644 --- a/src/qt/locale/bitcoin_uk.ts +++ b/src/qt/locale/bitcoin_uk.ts @@ -30,6 +30,10 @@ <translation>Вилучити вибрані адреси з переліку</translation> </message> <message> + <source>Enter address or label to search</source> + <translation>Введіть адресу чи мітку для пошуку</translation> + </message> + <message> <source>Export the data in the current tab to a file</source> <translation>Експортувати дані з поточної вкладки в файл</translation> </message> @@ -132,6 +136,10 @@ <translation>Повторіть пароль</translation> </message> <message> + <source>Show password</source> + <translation>Показати пароль</translation> + </message> + <message> <source>Enter the new passphrase to the wallet.<br/>Please use a passphrase of <b>ten or more random characters</b>, or <b>eight or more words</b>.</source> <translation>Введіть нову кодову фразу для гаманця.<br/>Будь ласка, використовуйте кодові фрази що містять <b> щонайменше десять випадкових символів </b> або <b> щонайменше вісім слів </b>.</translation> </message> @@ -318,6 +326,14 @@ <translation>Відкрити &URI</translation> </message> <message> + <source>Wallet:</source> + <translation>Гаманець:</translation> + </message> + <message> + <source>default wallet</source> + <translation>типовий гаманець</translation> + </message> + <message> <source>Click to disable network activity.</source> <translation>Натисніть, щоб вимкнути активність мережі.</translation> </message> @@ -338,6 +354,10 @@ <translation>Переіндексація блоків на диску ...</translation> </message> <message> + <source>Proxy is <b>enabled</b>: %1</source> + <translation>Проксі <b>увімкнено</b>: %1</translation> + </message> + <message> <source>Send coins to a Bitcoin address</source> <translation>Відправити монети на вказану адресу</translation> </message> @@ -435,7 +455,7 @@ </message> <message numerus="yes"> <source>%n active connection(s) to Bitcoin network</source> - <translation><numerusform>%n активне з'єднання з мережею Bitcoin</numerusform><numerusform>%n активні з'єднання з мережею Bitcoin</numerusform><numerusform>%n активних з'єднань з мережею Bitcoin</numerusform></translation> + <translation><numerusform>%n активне з'єднання з мережею Bitcoin</numerusform><numerusform>%n активні з'єднання з мережею Bitcoin</numerusform><numerusform>%n активних з'єднань з мережею Bitcoin</numerusform><numerusform>%n активних з'єднань з мережею Bitcoin</numerusform></translation> </message> <message> <source>Indexing blocks on disk...</source> @@ -447,7 +467,7 @@ </message> <message numerus="yes"> <source>Processed %n block(s) of transaction history.</source> - <translation><numerusform>Оброблено %n блок історії транзакцій.</numerusform><numerusform>Оброблено %n блоки історії транзакцій.</numerusform><numerusform>Оброблено %n блоків історії транзакцій.</numerusform></translation> + <translation><numerusform>Оброблено %n блок історії транзакцій.</numerusform><numerusform>Оброблено %n блоки історії транзакцій.</numerusform><numerusform>Оброблено %n блоків історії транзакцій.</numerusform><numerusform>Оброблено %n блоків історії транзакцій.</numerusform></translation> </message> <message> <source>%1 behind</source> @@ -506,6 +526,12 @@ </translation> </message> <message> + <source>Wallet: %1 +</source> + <translation>Гаманець: %1 +</translation> + </message> + <message> <source>Type: %1 </source> <translation>Тип: %1 @@ -722,10 +748,6 @@ <translation>&Адреса</translation> </message> <message> - <source>New receiving address</source> - <translation>Нова адреса для отримання</translation> - </message> - <message> <source>New sending address</source> <translation>Нова адреса для відправлення</translation> </message> @@ -742,8 +764,12 @@ <translation>Введена адреса "%1" не є адресою в мережі Bitcoin.</translation> </message> <message> - <source>The entered address "%1" is already in the address book.</source> - <translation>Введена адреса "%1" вже присутня в адресній книзі.</translation> + <source>Address "%1" already exists as a receiving address with label "%2" and so cannot be added as a sending address.</source> + <translation>Адреса "%1" вже існує як отримувач з міткою "%2" і не може бути додана як відправник.</translation> + </message> + <message> + <source>The entered address "%1" is already in the address book with label "%2".</source> + <translation>Введена адреса "%1" вже присутня в адресній книзі з міткою "%2".</translation> </message> <message> <source>Could not unlock wallet.</source> @@ -795,42 +821,6 @@ <source>Command-line options</source> <translation>Параметри командного рядка</translation> </message> - <message> - <source>Usage:</source> - <translation>Використання:</translation> - </message> - <message> - <source>command-line options</source> - <translation>параметри командного рядка</translation> - </message> - <message> - <source>UI Options:</source> - <translation>Параметри інтерфейсу:</translation> - </message> - <message> - <source>Choose data directory on startup (default: %u)</source> - <translation>Обирати каталог даних під час запуску (типово: %u)</translation> - </message> - <message> - <source>Set language, for example "de_DE" (default: system locale)</source> - <translation>Встановити мову (наприклад: "de_DE") (типово: системна)</translation> - </message> - <message> - <source>Start minimized</source> - <translation>Запускати згорнутим</translation> - </message> - <message> - <source>Set SSL root certificates for payment request (default: -system-)</source> - <translation>Вказати кореневі SSL-сертифікати для запиту платежу (типово: -системні-)</translation> - </message> - <message> - <source>Show splash screen on startup (default: %u)</source> - <translation>Показувати заставку під час запуску (типово: %u)</translation> - </message> - <message> - <source>Reset all settings changed in the GUI</source> - <translation>Скинути налаштування, які було змінено через графічний інтерфейс користувача</translation> - </message> </context> <context> <name>Intro</name> @@ -892,11 +882,11 @@ </message> <message numerus="yes"> <source>%n GB of free space available</source> - <translation><numerusform>Доступно %n ГБ вільного простору</numerusform><numerusform>Доступно %n ГБ вільного простору</numerusform><numerusform>Доступно %n ГБ вільного простору</numerusform></translation> + <translation><numerusform>Доступно %n ГБ вільного простору</numerusform><numerusform>Доступно %n ГБ вільного простору</numerusform><numerusform>Доступно %n ГБ вільного простору</numerusform><numerusform>Доступно %n ГБ вільного простору</numerusform></translation> </message> <message numerus="yes"> <source>(of %n GB needed)</source> - <translation><numerusform>(в той час, як необхідно %n ГБ)</numerusform><numerusform>(в той час, як необхідно %n ГБ)</numerusform><numerusform>(в той час, як необхідно %n ГБ)</numerusform></translation> + <translation><numerusform>(в той час, як необхідно %n ГБ)</numerusform><numerusform>(в той час, як необхідно %n ГБ)</numerusform><numerusform>(в той час, як необхідно %n ГБ)</numerusform><numerusform>(в той час, як необхідно %n ГБ)</numerusform></translation> </message> </context> <context> @@ -1004,6 +994,18 @@ <translation>Показує, чи типово використовується проксі SOCKS5 для досягнення рівної участі для цього типу мережі.</translation> </message> <message> + <source>Use separate SOCKS&5 proxy to reach peers via Tor hidden services:</source> + <translation>Використовуйте окремі проксі-сервери SOCKS&5 для підключення до вузлів через приховані сервіси Tor:</translation> + </message> + <message> + <source>Hide the icon from the system tray.</source> + <translation>Приховати значок із системного лотка.</translation> + </message> + <message> + <source>&Hide tray icon</source> + <translation>&Приховати піктограму з лотка</translation> + </message> + <message> <source>Minimize instead of exit the application when the window is closed. When this option is enabled, the application will be closed only after selecting Exit in the menu.</source> <translation>Згортати замість закриття. Якщо ця опція включена, програма закриється лише після вибору відповідного пункту в меню.</translation> </message> @@ -1036,6 +1038,22 @@ <translation>&Мережа</translation> </message> <message> + <source>Disables some advanced features but all blocks will still be fully validated. Reverting this setting requires re-downloading the entire blockchain. Actual disk usage may be somewhat higher.</source> + <translation>Вимикає деякі нові властивості але всі блоки будуть повністю перевірені. Повернення цієї опції вимагає перезавантаження вього ланцюжка блоків. Фактичний розмір бази може бути дещо більший.</translation> + </message> + <message> + <source>Prune &block storage to</source> + <translation>Скоротити місце під блоки...</translation> + </message> + <message> + <source>GB</source> + <translation>ГБ</translation> + </message> + <message> + <source>Reverting this setting requires re-downloading the entire blockchain.</source> + <translation>Повернення цієї опції вимагає перезавантаження вього ланцюжка блоків.</translation> + </message> + <message> <source>(0 = auto, <0 = leave that many cores free)</source> <translation>(0 = автоматично, <0 = вказує кількість вільних ядер)</translation> </message> @@ -1068,6 +1086,14 @@ <translation>Відображення порту через &UPnP</translation> </message> <message> + <source>Accept connections from outside.</source> + <translation>Приймати з'єднання ззовні.</translation> + </message> + <message> + <source>Allow incomin&g connections</source> + <translation>Дозволити вхідні з'єднання</translation> + </message> + <message> <source>Connect to the Bitcoin network through a SOCKS5 proxy.</source> <translation>Підключення до мережі Bitcoin через SOCKS5 проксі.</translation> </message> @@ -1148,6 +1174,10 @@ <translation>Показати або сховати керування входами.</translation> </message> <message> + <source>&Third party transaction URLs</source> + <translation>&URL-адреси транзакцій сторонніх розробників</translation> + </message> + <message> <source>&OK</source> <translation>&Гаразд</translation> </message> @@ -1180,6 +1210,10 @@ <translation>Редагувати параметри</translation> </message> <message> + <source>The configuration file is used to specify advanced user options which override GUI settings. Additionally, any command-line options will override this configuration file.</source> + <translation>Файл конфігурації використовується для вказування додаткових параметрів користувача, що перекривають настройки графічного інтерфейсу користувача. Крім того, будь-які параметри командного рядка замінять цей конфігураційний файл.</translation> + </message> + <message> <source>Error</source> <translation>Помилка</translation> </message> @@ -1278,10 +1312,18 @@ <translation>Помилка запиту платежу</translation> </message> <message> + <source>Cannot start bitcoin: click-to-pay handler</source> + <translation>Не вдається запустити біткойн: обробник клацни-плати</translation> + </message> + <message> <source>URI handling</source> <translation>Обробка URI</translation> </message> <message> + <source>'bitcoin://' is not a valid URI. Use 'bitcoin:' instead.</source> + <translation>'bitcoin://' не вірний URI. Використовуйте 'bitcoin:'.</translation> + </message> + <message> <source>Payment request fetch URL is invalid: %1</source> <translation>URL запиту платежу є некоректним: %1</translation> </message> @@ -1290,6 +1332,10 @@ <translation>Помилка в адресі платежу %1</translation> </message> <message> + <source>URI cannot be parsed! This can be caused by an invalid Bitcoin address or malformed URI parameters.</source> + <translation>Неможливо обробити URI! Причиною цього може бути некоректна Біткойн-адреса або неправильні параметри URI.</translation> + </message> + <message> <source>Payment request file handling</source> <translation>Обробка файлу запиту платежу</translation> </message> @@ -1314,6 +1360,12 @@ <translation>Запит платежу не ініціалізовано.</translation> </message> <message> + <source>Unverified payment requests to custom payment scripts are unsupported.</source> + <translation> +70/5000 +Неперевірені запити на оплату до індивідуальних платіжних скриптів не підтримуються.</translation> + </message> + <message> <source>Invalid payment request.</source> <translation>Помилка в запиті платежу.</translation> </message> @@ -1361,6 +1413,10 @@ <translation>Вузол/Сервіс</translation> </message> <message> + <source>NodeId</source> + <translation>Ідентифікатор вузла</translation> + </message> + <message> <source>Ping</source> <translation>Затримка</translation> </message> @@ -1411,10 +1467,34 @@ <source>%1 ms</source> <translation>%1 мс</translation> </message> + <message numerus="yes"> + <source>%n second(s)</source> + <translation><numerusform>%n секунда</numerusform><numerusform>%n секунд</numerusform><numerusform>%n секунд</numerusform><numerusform>%n секунд</numerusform></translation> + </message> + <message numerus="yes"> + <source>%n minute(s)</source> + <translation><numerusform>%n хвилина</numerusform><numerusform>%n хвилин</numerusform><numerusform>%n хвилин</numerusform><numerusform>%n хвилин</numerusform></translation> + </message> + <message numerus="yes"> + <source>%n hour(s)</source> + <translation><numerusform>%n година</numerusform><numerusform>%n годин</numerusform><numerusform>%n годин</numerusform><numerusform>%n годин</numerusform></translation> + </message> + <message numerus="yes"> + <source>%n day(s)</source> + <translation><numerusform>%n день</numerusform><numerusform>%n днів</numerusform><numerusform>%n днів</numerusform><numerusform>%n днів</numerusform></translation> + </message> + <message numerus="yes"> + <source>%n week(s)</source> + <translation><numerusform>%n тиждень</numerusform><numerusform>%n тижнів</numerusform><numerusform>%n тижнів</numerusform><numerusform>%n тижнів</numerusform></translation> + </message> <message> <source>%1 and %2</source> <translation>%1 та %2</translation> </message> + <message numerus="yes"> + <source>%n year(s)</source> + <translation><numerusform>%n рік</numerusform><numerusform>%n років</numerusform><numerusform>%n років</numerusform><numerusform>%n років</numerusform></translation> + </message> <message> <source>%1 B</source> <translation>%1 Б</translation> @@ -1432,6 +1512,10 @@ <translation>%1 ГБ</translation> </message> <message> + <source>%1 didn't yet exit safely...</source> + <translation>%1 безпечний вихід ще не виконано...</translation> + </message> + <message> <source>unknown</source> <translation>невідомо</translation> </message> @@ -1439,6 +1523,18 @@ <context> <name>QObject::QObject</name> <message> + <source>Error parsing command line arguments: %1.</source> + <translation>Помилка розбору параметрів команди: %1</translation> + </message> + <message> + <source>Error: Specified data directory "%1" does not exist.</source> + <translation>Помилка: Вказаного каталогу даних «%1» не існує.</translation> + </message> + <message> + <source>Error: Cannot parse configuration file: %1.</source> + <translation>Помилка: Неможливо розібрати файл конфігурації: %1.</translation> + </message> + <message> <source>Error: %1</source> <translation>Помилка: %1</translation> </message> @@ -1489,6 +1585,10 @@ <translation>Використовується BerkeleyDB версії</translation> </message> <message> + <source>Datadir</source> + <translation>Каталог даних</translation> + </message> + <message> <source>Startup time</source> <translation>Час запуску</translation> </message> @@ -1525,6 +1625,18 @@ <translation>Використання пам'яті</translation> </message> <message> + <source>Wallet: </source> + <translation>Гаманець:</translation> + </message> + <message> + <source>(none)</source> + <translation>(відсутні)</translation> + </message> + <message> + <source>&Reset</source> + <translation>&Скинути</translation> + </message> + <message> <source>Received</source> <translation>Отримано</translation> </message> @@ -1573,6 +1685,10 @@ <translation>Клієнт користувача</translation> </message> <message> + <source>Open the %1 debug log file from the current data directory. This can take a few seconds for large log files.</source> + <translation>Відкрийте файл журналу налагодження %1 з поточного каталогу даних. Це може зайняти кілька секунд для файлів великого розміру.</translation> + </message> + <message> <source>Decrease font size</source> <translation>Зменшити розмір шрифту</translation> </message> @@ -1613,6 +1729,10 @@ <translation>Поточна Затримка</translation> </message> <message> + <source>Min Ping</source> + <translation>Мін Пінг</translation> + </message> + <message> <source>Time Offset</source> <translation>Різниця часу</translation> </message> @@ -1669,10 +1789,54 @@ <translation>1 &рік</translation> </message> <message> + <source>&Disconnect</source> + <translation>&Від'єднати</translation> + </message> + <message> + <source>Ban for</source> + <translation>Заблокувати на</translation> + </message> + <message> + <source>&Unban</source> + <translation>&Розблокувати</translation> + </message> + <message> + <source>default wallet</source> + <translation>гаманець за змовчуванням</translation> + </message> + <message> + <source>Welcome to the %1 RPC console.</source> + <translation>Ласкаво просимо до консолі RPC %1.</translation> + </message> + <message> + <source>Use up and down arrows to navigate history, and %1 to clear screen.</source> + <translation>Використовуйте стрілки вгору та вниз для навігації історії та %1 для очищення екрана.</translation> + </message> + <message> + <source>Type %1 for an overview of available commands.</source> + <translation>Введіть %1 для перегляду доступних команд.</translation> + </message> + <message> + <source>For more information on using this console type %1.</source> + <translation>Щоб отримати додаткові відомості про використання консолі введіть %1.</translation> + </message> + <message> + <source>WARNING: Scammers have been active, telling users to type commands here, stealing their wallet contents. Do not use this console without fully understanding the ramifications of a command.</source> + <translation>ПОПЕРЕДЖЕННЯ. Шахраї активно вказували вводити тут команди і отримували доступ до вмісту гаманця користувачів. Не використовуйте цю консоль без повного розуміння наслідків виконання команд.</translation> + </message> + <message> <source>Network activity disabled</source> <translation>Мережева активність вимкнена.</translation> </message> <message> + <source>Executing command without any wallet</source> + <translation>Виконати команду без гаманця</translation> + </message> + <message> + <source>Executing command using "%1" wallet</source> + <translation>Виконати команду для "%1" гаманця</translation> + </message> + <message> <source>(node id: %1)</source> <translation>(ІД вузла: %1)</translation> </message> @@ -1744,6 +1908,14 @@ <translation>Очистити</translation> </message> <message> + <source>Native segwit addresses (aka Bech32 or BIP-173) reduce your transaction fees later on and offer better protection against typos, but old wallets don't support them. When unchecked, an address compatible with older wallets will be created instead.</source> + <translation>Чиста сегвіт адреса (segwit, Bech32, BIP-173) знижує комісію та пропонує кращий захист від помилок, але старі гаманці її не підтримують. Якщо позначка знята, буде створено адресу, сумісну зі старими гаманцями.</translation> + </message> + <message> + <source>Generate native segwit (Bech32) address</source> + <translation>Згенерувати чисту SegWit (Bech32) адресу</translation> + </message> + <message> <source>Requested payments history</source> <translation>Історія запитів платежу</translation> </message> @@ -1803,10 +1975,18 @@ <translation>&Зберегти зображення...</translation> </message> <message> + <source>Request payment to %1</source> + <translation>Запит платежу на %1</translation> + </message> + <message> <source>Payment information</source> <translation>Інформація про платіж</translation> </message> <message> + <source>URI</source> + <translation>URI</translation> + </message> + <message> <source>Address</source> <translation>Адреса</translation> </message> @@ -1822,7 +2002,19 @@ <source>Message</source> <translation>Повідомлення</translation> </message> - </context> + <message> + <source>Wallet</source> + <translation>Гаманець</translation> + </message> + <message> + <source>Resulting URI too long, try to reduce the text for label / message.</source> + <translation>Кінцевий URI занадто довгий, спробуйте зменшити текст для мітки / повідомлення.</translation> + </message> + <message> + <source>Error encoding URI into QR Code.</source> + <translation>Помилка кодування URI в QR-код.</translation> + </message> +</context> <context> <name>RecentRequestsTableModel</name> <message> @@ -1917,16 +2109,28 @@ <translation>Виберіть...</translation> </message> <message> + <source>Using the fallbackfee can result in sending a transaction that will take several hours or days (or never) to confirm. Consider choosing your fee manually or wait until you have validated the complete chain.</source> + <translation>Використання зарезервованої комісії може призвести до виконання транзакції, підтвердження котрої займе години, або дні, або ніколи не буде підтверджено. Обміркуйте можливість вибору комісії вручну, або зачекайте завершення валідації повного ланцюгу.</translation> + </message> + <message> + <source>Warning: Fee estimation is currently not possible.</source> + <translation>Попередження: оцінка розміру комісії наразі неможлива.</translation> + </message> + <message> <source>collapse fee-settings</source> <translation>згорнути налаштування оплат</translation> </message> <message> - <source>per kilobyte</source> - <translation>за кілобайт</translation> + <source>Specify a custom fee per kB (1,000 bytes) of the transaction's virtual size. + +Note: Since the fee is calculated on a per-byte basis, a fee of "100 satoshis per kB" for a transaction size of 500 bytes (half of 1 kB) would ultimately yield a fee of only 50 satoshis.</source> + <translation>Вкажіть комісію за кБ (1,000 байт) віртуального розміру транзакції. + +Примітка: Так як комісія нараховується за байт, комісія "100 сатоші за кБ" для транзакції розміром 500 байт (пів 1 кБ) буде приблизно 50 сатоші. </translation> </message> <message> - <source>If the custom fee is set to 1000 satoshis and the transaction is only 250 bytes, then "per kilobyte" only pays 250 satoshis in fee, while "total at least" pays 1000 satoshis. For transactions bigger than a kilobyte both pay by kilobyte.</source> - <translation>Якщо комісія встановлюється в 1000 сатоші і розмір транзакції лише 250 байтів, то опція "за кілобайт" встановлює комісію в 250 сатоші, в той час, як "всього щонайменше" - в 1000 сатоші. Для транзакцій більших за кілобайт в обох випадках буде знято комісію за кілобайт.</translation> + <source>per kilobyte</source> + <translation>за кілобайт</translation> </message> <message> <source>Hide</source> @@ -1973,6 +2177,14 @@ <translation>Час підтвердження:</translation> </message> <message> + <source>Enable Replace-By-Fee</source> + <translation>Увімкнути Заміна-Через-Комісію</translation> + </message> + <message> + <source>With Replace-By-Fee (BIP-125) you can increase a transaction's fee after it is sent. Without this, a higher fee may be recommended to compensate for increased transaction delay risk.</source> + <translation>З опцією Заміна-Через-Комісію (BIP-125) ви можете збільшити комісію за транзакцію після її надсилання. Інакше може бути рекомендоване збільшення розміру комісії для компенсації підвищеного ризику затримки транзакції.</translation> + </message> + <message> <source>Clear &All</source> <translation>Очистити &все</translation> </message> @@ -2017,10 +2229,110 @@ <translation>Скопіювати решту</translation> </message> <message> + <source>%1 (%2 blocks)</source> + <translation>%1 (%2 блоків)</translation> + </message> + <message> + <source>%1 to %2</source> + <translation>%1 до %2</translation> + </message> + <message> + <source>Are you sure you want to send?</source> + <translation>Ви впевнені, що хочете відправити?</translation> + </message> + <message> + <source>or</source> + <translation>або</translation> + </message> + <message> + <source>You can increase the fee later (signals Replace-By-Fee, BIP-125).</source> + <translation>Ви можете збільшити комісію пізніше (сигналізує Заміна-Через-Комісію, BIP-125).</translation> + </message> + <message> + <source>from wallet %1</source> + <translation>з гаманця %1</translation> + </message> + <message> + <source>Please, review your transaction.</source> + <translation>Будь-ласка, перевірте вашу транзакцію.</translation> + </message> + <message> + <source>Transaction fee</source> + <translation>Комісія за транзакцію</translation> + </message> + <message> + <source>Not signalling Replace-By-Fee, BIP-125.</source> + <translation>Не сигналізує Заміна-Через-Комісію, BIP-125.</translation> + </message> + <message> + <source>Total Amount</source> + <translation>Всього</translation> + </message> + <message> + <source>Confirm send coins</source> + <translation>Підтвердьте надсилання монет</translation> + </message> + <message> + <source>The recipient address is not valid. Please recheck.</source> + <translation>Неприпустима адреса отримувача. Будь ласка, перевірте.</translation> + </message> + <message> + <source>The amount to pay must be larger than 0.</source> + <translation>Сума платні повинна бути більше 0.</translation> + </message> + <message> + <source>The amount exceeds your balance.</source> + <translation>Сума перевищує ваш баланс.</translation> + </message> + <message> + <source>The total exceeds your balance when the %1 transaction fee is included.</source> + <translation>Після додавання комісії %1, сума перевищить ваш баланс.</translation> + </message> + <message> + <source>Duplicate address found: addresses should only be used once each.</source> + <translation>Знайдено адресу, що дублюється: кожна адреса має бути вказана тільки один раз.</translation> + </message> + <message> + <source>Transaction creation failed!</source> + <translation>Транзакцію не виконано!</translation> + </message> + <message> + <source>The transaction was rejected with the following reason: %1</source> + <translation>Транзакцію відхилено з наступної причини: %1</translation> + </message> + <message> + <source>A fee higher than %1 is considered an absurdly high fee.</source> + <translation>Комісія більша, ніж %1, вважається абсурдно високою.</translation> + </message> + <message> <source>Payment request expired.</source> <translation>Запит платежу прострочено.</translation> </message> <message> + <source>Pay only the required fee of %1</source> + <translation>Сплатіть лише обов'язкову комісію у розмірі %1</translation> + </message> + <message numerus="yes"> + <source>Estimated to begin confirmation within %n block(s).</source> + <translation><numerusform>Очікуваний початок підтвердження через %n блок.</numerusform><numerusform>Очікуваний початок підтвердження протягом %n блоків.</numerusform><numerusform>Очікуваний початок підтвердження протягом %n блоків.</numerusform><numerusform>Очікуваний початок підтвердження протягом %n блоків.</numerusform></translation> + </message> + <message> + <source>Warning: Invalid Bitcoin address</source> + <translation>Увага: Неприпустима Біткойн-адреса.</translation> + </message> + <message> + <source>Warning: Unknown change address</source> + <translation>Увага: Невідома адреса для решти</translation> + </message> + <message> + <source>Confirm custom change address</source> + <translation>Підтвердити індивідуальну адресу для решти</translation> + </message> + <message> + <source>The address you selected for change is not part of this wallet. Any or all funds in your wallet may be sent to this address. Are you sure?</source> + <translation>Адреса, яку ви обрали для решти, не є частиною цього гаманця. Будь-які або всі кошти з вашого гаманця можуть бути надіслані на цю адресу. Ви впевнені?</translation> + </message> + <message> <source>(no label)</source> <translation>немає мітки</translation> </message> @@ -2076,6 +2388,10 @@ <translation>В&ідняти комісію від суми</translation> </message> <message> + <source>Use available balance</source> + <translation>Використати наявний баланс</translation> + </message> + <message> <source>Message:</source> <translation>Повідомлення:</translation> </message> @@ -2118,6 +2434,10 @@ <context> <name>ShutdownWindow</name> <message> + <source>%1 is shutting down...</source> + <translation>%1 припиняє роботу...</translation> + </message> + <message> <source>Do not shut down the computer until this window disappears.</source> <translation>Не вимикайте комп’ютер до зникнення цього вікна.</translation> </message> @@ -2277,11 +2597,43 @@ </context> <context> <name>TransactionDesc</name> + <message numerus="yes"> + <source>Open for %n more block(s)</source> + <translation><numerusform>Відкрито на %n блок</numerusform><numerusform>Відкрито на %n блоків</numerusform><numerusform>Відкрито на %n блоків</numerusform><numerusform>Відкрито на %n блоків</numerusform></translation> + </message> <message> <source>Open until %1</source> <translation>Відкрито до %1</translation> </message> <message> + <source>conflicted with a transaction with %1 confirmations</source> + <translation>конфліктує з транзакцією із %1 підтвердженнями</translation> + </message> + <message> + <source>0/unconfirmed, %1</source> + <translation>0/не підтверджено, %1</translation> + </message> + <message> + <source>in memory pool</source> + <translation>в пулі пам'яті</translation> + </message> + <message> + <source>not in memory pool</source> + <translation>не в пулі пам'яті</translation> + </message> + <message> + <source>abandoned</source> + <translation>відкинуто</translation> + </message> + <message> + <source>%1/unconfirmed</source> + <translation>%1/не підтверджено</translation> + </message> + <message> + <source>%1 confirmations</source> + <translation>%1 підтверджень</translation> + </message> + <message> <source>Status</source> <translation>Статут</translation> </message> @@ -2314,6 +2666,10 @@ <translation>Власна адреса</translation> </message> <message> + <source>watch-only</source> + <translation>тільки спостереження</translation> + </message> + <message> <source>label</source> <translation>мітка</translation> </message> @@ -2321,6 +2677,10 @@ <source>Credit</source> <translation>Кредит</translation> </message> + <message numerus="yes"> + <source>matures in %n more block(s)</source> + <translation><numerusform>дозріє через %n блок</numerusform><numerusform>дозріє через %n блоків</numerusform><numerusform>дозріє через %n блоків</numerusform><numerusform>дозріє через %n блоків</numerusform></translation> + </message> <message> <source>not accepted</source> <translation>не прийнято</translation> @@ -2362,10 +2722,26 @@ <translation>Розмір транзакції</translation> </message> <message> + <source>Transaction virtual size</source> + <translation>Віртуальний розмір транзакції</translation> + </message> + <message> + <source>Output index</source> + <translation>Вихідний індекс</translation> + </message> + <message> <source>Merchant</source> <translation>Продавець</translation> </message> <message> + <source>Generated coins must mature %1 blocks before they can be spent. When you generated this block, it was broadcast to the network to be added to the block chain. If it fails to get into the chain, its state will change to "not accepted" and it won't be spendable. This may occasionally happen if another node generates a block within a few seconds of yours.</source> + <translation>Згенеровані монети стануть доступні для використання після %1 підтверджень. Коли ви згенерували цей блок, його було відправлено в мережу для внесення до ланцюжку блоків. Якщо блок не буде додано до ланцюжку блоків, його статус зміниться на «не підтверджено», і згенеровані монети неможливо буде витратити. Таке часом трапляється, якщо хтось згенерував інший блок на декілька секунд раніше.</translation> + </message> + <message> + <source>Debug information</source> + <translation>Налагоджувальна інформація</translation> + </message> + <message> <source>Transaction</source> <translation>Транзакція</translation> </message> @@ -2411,15 +2787,15 @@ <source>Label</source> <translation>Мітка</translation> </message> + <message numerus="yes"> + <source>Open for %n more block(s)</source> + <translation><numerusform>Відкрито на %n блок</numerusform><numerusform>Відкрито на %n блоків</numerusform><numerusform>Відкрито на %n блоків</numerusform><numerusform>Відкрито на %n блоків</numerusform></translation> + </message> <message> <source>Open until %1</source> <translation>Відкрито до %1</translation> </message> <message> - <source>Offline</source> - <translation>Поза мережею</translation> - </message> - <message> <source>Unconfirmed</source> <translation>Не підтверджено</translation> </message> @@ -2444,10 +2820,6 @@ <translation>Повністтю не підтверджено (%1 підтверджень, будуть доступні після %2)</translation> </message> <message> - <source>This block was not received by any other nodes and will probably not be accepted!</source> - <translation>Цей блок не був отриманий жодними іншими вузлами і, ймовірно, не буде прийнятий!</translation> - </message> - <message> <source>Generated but not accepted</source> <translation>Згенеровано (не підтверджено)</translation> </message> @@ -2472,6 +2844,14 @@ <translation>Добуто</translation> </message> <message> + <source>watch-only</source> + <translation>тільки спостереження</translation> + </message> + <message> + <source>(n/a)</source> + <translation>(н/д)</translation> + </message> + <message> <source>(no label)</source> <translation>немає мітки</translation> </message> @@ -2488,6 +2868,10 @@ <translation>Тип транзакції.</translation> </message> <message> + <source>Whether or not a watch-only address is involved in this transaction.</source> + <translation>Чи було залучено адресу для спостереження в цій транзакції.</translation> + </message> + <message> <source>User-defined intent/purpose of the transaction.</source> <translation>Визначений користувачем намір чи мета транзакції.</translation> </message> @@ -2547,6 +2931,10 @@ <translation>Інше</translation> </message> <message> + <source>Enter address, transaction id, or label to search</source> + <translation>Введіть адресу, ідентифікатор транзакції або мітку для пошуку</translation> + </message> + <message> <source>Min amount</source> <translation>Мінімальна сума</translation> </message> @@ -2630,7 +3018,27 @@ <source>Exporting Failed</source> <translation>Експортування пройшло не успішно</translation> </message> - </context> + <message> + <source>There was an error trying to save the transaction history to %1.</source> + <translation>Виникла помилка при спробі зберегти історію транзакцій до %1.</translation> + </message> + <message> + <source>Exporting Successful</source> + <translation>Експортовано успішно</translation> + </message> + <message> + <source>The transaction history was successfully saved to %1.</source> + <translation>Історію транзакцій було успішно збережено до %1.</translation> + </message> + <message> + <source>Range:</source> + <translation>Діапазон:</translation> + </message> + <message> + <source>to</source> + <translation>до</translation> + </message> +</context> <context> <name>UnitDisplayStatusBarControl</name> <message> @@ -2640,18 +3048,54 @@ </context> <context> <name>WalletFrame</name> - </context> + <message> + <source>No wallet has been loaded.</source> + <translation>Жоден гаманець не завантажено.</translation> + </message> +</context> <context> <name>WalletModel</name> <message> + <source>Send Coins</source> + <translation>Відправити Монети</translation> + </message> + <message> + <source>Fee bump error</source> + <translation>Помилка штурхання комісії</translation> + </message> + <message> + <source>Increasing transaction fee failed</source> + <translation>Підвищення комісії за транзакцію не виконано</translation> + </message> + <message> + <source>Do you want to increase the fee?</source> + <translation>Ви бажаєте збільшити комісію?</translation> + </message> + <message> <source>Current fee:</source> <translation>Поточна комісія:</translation> </message> <message> + <source>Increase:</source> + <translation>Збільшити:</translation> + </message> + <message> <source>New fee:</source> <translation>Нова комісія:</translation> </message> - </context> + <message> + <source>Confirm fee bump</source> + <translation>Підтвердити штурхання комісії</translation> + </message> + <message> + <source>Can't sign transaction.</source> + <translation>Не можливо підписати транзакцію.</translation> + </message> + <message> + <source>Could not commit transaction</source> + <translation>Не вдалось виконати транзакцію</translation> + </message> +</context> <context> <name>WalletView</name> <message> @@ -2675,6 +3119,10 @@ <translation>Помилка резервного копіювання</translation> </message> <message> + <source>There was an error trying to save the wallet data to %1.</source> + <translation>Виникла помилка при спробі зберегти дані гаманця до %1.</translation> + </message> + <message> <source>Backup Successful</source> <translation>Резервну копію створено успішно</translation> </message> @@ -2682,32 +3130,16 @@ <source>The wallet data was successfully saved to %1.</source> <translation>Дані гаманця успішно збережено в %1.</translation> </message> + <message> + <source>Cancel</source> + <translation>Скасувати</translation> + </message> </context> <context> <name>bitcoin-core</name> <message> - <source>Options:</source> - <translation>Параметри:</translation> - </message> - <message> - <source>Specify data directory</source> - <translation>Вкажіть робочий каталог</translation> - </message> - <message> - <source>Connect to a node to retrieve peer addresses, and disconnect</source> - <translation>Підключитись до вузла, щоб отримати список адрес інших учасників та від'єднатись</translation> - </message> - <message> - <source>Specify your own public address</source> - <translation>Вкажіть вашу власну публічну адресу</translation> - </message> - <message> - <source>Accept command line and JSON-RPC commands</source> - <translation>Приймати команди із командного рядка та команди JSON-RPC</translation> - </message> - <message> - <source>If <category> is not supplied or if <category> = 1, output all debugging information.</source> - <translation>Якщо <category> не задано, або ж якщо <category> = 1, виводить всю налагоджувальну інформацію.</translation> + <source>Distributed under the MIT software license, see the accompanying file %s or %s</source> + <translation>Розповсюджується за ліцензією на програмне забезпечення MIT, дивіться супровідний файл %s або %s</translation> </message> <message> <source>Prune configured below the minimum of %d MiB. Please use a higher number.</source> @@ -2726,18 +3158,10 @@ <translation>Помилка: Сталася фатальна помилка (детальніший опис наведено в debug.log)</translation> </message> <message> - <source>Fee (in %s/kB) to add to transactions you send (default: %s)</source> - <translation>Комісія (в %s/КБ), що додаватиметься до вихідних транзакцій (типово: %s)</translation> - </message> - <message> <source>Pruning blockstore...</source> <translation>Скорочення кількості блоків...</translation> </message> <message> - <source>Run in the background as a daemon and accept commands</source> - <translation>Запустити в фоновому режимі (як демон) та приймати команди</translation> - </message> - <message> <source>Unable to start HTTP server. See debug log for details.</source> <translation>Неможливо запустити HTTP-сервер. Детальніший опис наведено в журналі зневадження.</translation> </message> @@ -2746,84 +3170,92 @@ <translation>Bitcoin Core</translation> </message> <message> - <source>Bind to given address and always listen on it. Use [host]:port notation for IPv6</source> - <translation>Прив'язатися до даної адреси та прослуховувати її. Використовуйте запис виду [хост]:порт для IPv6</translation> + <source>The %s developers</source> + <translation>Розробники %s</translation> </message> <message> - <source>Delete all wallet transactions and only recover those parts of the blockchain through -rescan on startup</source> - <translation>Видалити всі транзакції гаманця та відновити ті, що будуть знайдені під час запуску за допомогою -rescan</translation> + <source>Cannot obtain a lock on data directory %s. %s is probably already running.</source> + <translation>Неможливо блокувати каталог даних %s. %s, ймовірно, вже працює.</translation> </message> <message> - <source>Execute command when a wallet transaction changes (%s in cmd is replaced by TxID)</source> - <translation>Виконати команду, коли транзакція гаманця зміниться (замість %s в команді буде підставлено ідентифікатор транзакції)</translation> + <source>Cannot provide specific connections and have addrman find outgoing connections at the same.</source> + <translation>Неможливо встановити визначені з'єднання і одночасно використовувати addrman для встановлення вихідних з'єднань.</translation> </message> <message> - <source>Set the number of script verification threads (%u to %d, 0 = auto, <0 = leave that many cores free, default: %d)</source> - <translation>Встановити кількість потоків скрипту перевірки (від %u до %d, 0 = автоматично, <0 = вказує кількість вільних ядер, типово: %d)</translation> + <source>Error reading %s! All keys read correctly, but transaction data or address book entries might be missing or incorrect.</source> + <translation>Помилка читання %s! Всі ключі зчитано правильно, але записи в адресній книзі, або дані транзакцій можуть бути відсутніми чи невірними.</translation> + </message> + <message> + <source>Please check that your computer's date and time are correct! If your clock is wrong, %s will not work properly.</source> + <translation>Перевірте правильність дати та часу комп'ютера. Якщо ваш годинник налаштовано невірно, %s не буде працювати належним чином.</translation> + </message> + <message> + <source>Please contribute if you find %s useful. Visit %s for further information about the software.</source> + <translation>Будь ласка, зробіть внесок, якщо ви знаходите %s корисним. Відвідайте %s для отримання додаткової інформації про програмне забезпечення.</translation> </message> <message> <source>The block database contains a block which appears to be from the future. This may be due to your computer's date and time being set incorrectly. Only rebuild the block database if you are sure that your computer's date and time are correct</source> <translation>Схоже, що база даних блоків містить блок з майбутнього. Це може статися із-за некоректно встановленої дати та/або часу. Перебудовуйте базу даних блоків лише тоді, коли ви переконані, що встановлено правильну дату і час</translation> </message> <message> - <source>Use UPnP to map the listening port (default: 1 when listening and no -proxy)</source> - <translation>Використовувати UPnP для відображення порту, що прослуховується (типово: 1 при прослуховуванні та за відсутності -proxy)</translation> + <source>This is a pre-release test build - use at your own risk - do not use for mining or merchant applications</source> + <translation>Це перед-релізна тестова збірка - використовуйте на свій власний ризик - не використовуйте для майнінгу або в торговельних додатках</translation> </message> <message> - <source>-maxmempool must be at least %d MB</source> - <translation>-maxmempool має бути не менше %d МБ</translation> + <source>This is the transaction fee you may discard if change is smaller than dust at this level</source> + <translation>Це комісія за транзакцію, яку ви можете відкинути, якщо решта менша, ніж пил на цьому рівні</translation> </message> <message> - <source><category> can be:</source> - <translation><category> може бути:</translation> + <source>Unable to replay blocks. You will need to rebuild the database using -reindex-chainstate.</source> + <translation>Неможливо відтворити блоки. Вам потрібно буде перебудувати базу даних, використовуючи -reindex-chainstate.</translation> </message> <message> - <source>Accept connections from outside (default: 1 if no -proxy or -connect)</source> - <translation>Приймати підключення ззовні (типово: 1 за відсутності -proxy чи -connect)</translation> + <source>Unable to rewind the database to a pre-fork state. You will need to redownload the blockchain</source> + <translation>Неможливо повернути базу даних в стан до розвилки. Вам потрібно буде перезавантажити ланцюжок блоків</translation> </message> <message> - <source>Block creation options:</source> - <translation>Опції створення блоку:</translation> + <source>Warning: The network does not appear to fully agree! Some miners appear to be experiencing issues.</source> + <translation>Увага: Мережа, здається, не повністю погоджується! Деякі добувачі напевно зазнають проблем.</translation> </message> <message> - <source>Connection options:</source> - <translation>Параметри з'єднання:</translation> + <source>Warning: We do not appear to fully agree with our peers! You may need to upgrade, or other nodes may need to upgrade.</source> + <translation>Попередження: неможливо досягти консенсусу з підключеними вузлами! Вам, або іншим вузлам необхідно оновити програмне забезпечення.</translation> </message> <message> - <source>Copyright (C) %i-%i</source> - <translation>Всі права збережено. %i-%i</translation> + <source>%d of last 100 blocks have unexpected version</source> + <translation>%d з останніх 100 блоків мають неочікувану версію</translation> </message> <message> - <source>Corrupted block database detected</source> - <translation>Виявлено пошкоджений блок бази даних</translation> + <source>%s corrupt, salvage failed</source> + <translation>%s пошкоджено, відновлення невдале</translation> </message> <message> - <source>Debugging/Testing options:</source> - <translation>Параметри тестування/налагодження:</translation> + <source>-maxmempool must be at least %d MB</source> + <translation>-maxmempool має бути не менше %d МБ</translation> </message> <message> - <source>Do not load the wallet and disable wallet RPC calls</source> - <translation>Не завантажувати гаманець та вимкнути звернення до нього через RPC</translation> + <source>Cannot resolve -%s address: '%s'</source> + <translation>Не можу вирішити -%s адресу: '%s'</translation> </message> <message> - <source>Do you want to rebuild the block database now?</source> - <translation>Ви хочете перебудувати базу даних блоків зараз?</translation> + <source>Change index out of range</source> + <translation>Індекс решти за межами діапазону</translation> </message> <message> - <source>Enable publish hash block in <address></source> - <translation>Дозволено введення хеш блоку в рядок <address></translation> + <source>Copyright (C) %i-%i</source> + <translation>Всі права збережено. %i-%i</translation> </message> <message> - <source>Enable publish hash transaction in <address></source> - <translation>Дозволено введення хеш транзакції в рядок <address></translation> + <source>Corrupted block database detected</source> + <translation>Виявлено пошкоджений блок бази даних</translation> </message> <message> - <source>Enable publish raw block in <address></source> - <translation>Дозволено введення RAW блоку в рядок <address></translation> + <source>Do you want to rebuild the block database now?</source> + <translation>Ви хочете перебудувати базу даних блоків зараз?</translation> </message> <message> - <source>Enable publish raw transaction in <address></source> - <translation>Дозволено введення RAW транзакції в рядок <address></translation> + <source>Error creating %s: You can't create non-HD wallets with this version.</source> + <translation>Помилка створення %s: Ви не можете створювати не-HD гаманці з цією версією.</translation> </message> <message> <source>Error initializing block database</source> @@ -2834,6 +3266,22 @@ <translation>Помилка ініціалізації середовища бази даних гаманця %s!</translation> </message> <message> + <source>Error loading %s</source> + <translation>Помилка завантаження %s</translation> + </message> + <message> + <source>Error loading %s: Private keys can only be disabled during creation</source> + <translation>Помилка завантаження %s: Власні ключі можуть бути тільки вимкнені при створенні</translation> + </message> + <message> + <source>Error loading %s: Wallet corrupted</source> + <translation>Помилка завантаження %s: Гаманець пошкоджено</translation> + </message> + <message> + <source>Error loading %s: Wallet requires newer version of %s</source> + <translation>Помилка завантаження %s: Гаманець потребує новішої версії %s</translation> + </message> + <message> <source>Error loading block database</source> <translation>Помилка завантаження бази даних блоків</translation> </message> @@ -2850,6 +3298,10 @@ <translation>Не вдалося слухати на жодному порту. Використовуйте -listen=0, якщо ви хочете цього.</translation> </message> <message> + <source>Failed to rescan the wallet during initialization</source> + <translation>Помилка пересканування гаманця під час ініціалізації</translation> + </message> + <message> <source>Importing...</source> <translation>Імпорт...</translation> </message> @@ -2858,24 +3310,36 @@ <translation>Початковий блок некоректний/відсутній. Чи правильно вказано каталог даних для обраної мережі?</translation> </message> <message> - <source>Keep the transaction memory pool below <n> megabytes (default: %u)</source> - <translation>Утримувати розмір пам'яті для пулу транзакцій меншим за <n> мегабайтів (типово: %u)</translation> + <source>Initialization sanity check failed. %s is shutting down.</source> + <translation>Невдала перевірка правильності ініціалізації. %s закривається.</translation> </message> <message> - <source>Not enough file descriptors available.</source> - <translation>Бракує доступних дескрипторів файлів.</translation> + <source>Invalid amount for -%s=<amount>: '%s'</source> + <translation>Невірна сума -%s=<amount>: '%s'</translation> + </message> + <message> + <source>Invalid amount for -discardfee=<amount>: '%s'</source> + <translation>Невірна сума для -discardfee=<amount>: '%s'</translation> + </message> + <message> + <source>Invalid amount for -fallbackfee=<amount>: '%s'</source> + <translation>Невірна сума для зарезервованої комісії -fallbackfee=<amount>: '%s'</translation> + </message> + <message> + <source>Upgrading txindex database</source> + <translation>Оновлення txindex бази</translation> </message> <message> - <source>Only connect to nodes in network <net> (ipv4, ipv6 or onion)</source> - <translation>Підключатися тільки до вузлів в мережі <net> (ipv4, ipv6 або onion)</translation> + <source>Loading P2P addresses...</source> + <translation>Завантаження P2P адрес...</translation> </message> <message> - <source>Print this help message and exit</source> - <translation>Надрукувати це довідкове повідомлення та вийти</translation> + <source>Loading banlist...</source> + <translation>Завантаження бан-списку...</translation> </message> <message> - <source>Print version and exit</source> - <translation>Версія для друку і виходу</translation> + <source>Not enough file descriptors available.</source> + <translation>Бракує доступних дескрипторів файлів.</translation> </message> <message> <source>Prune cannot be configured with a negative value.</source> @@ -2894,12 +3358,20 @@ <translation>Перетворювання блоків...</translation> </message> <message> - <source>Set database cache size in megabytes (%d to %d, default: %d)</source> - <translation>Встановити розмір кешу бази даних в мегабайтах (від %d до %d, типово: %d)</translation> + <source>The source code is available from %s.</source> + <translation>Вихідний код доступний з %s.</translation> + </message> + <message> + <source>Transaction fee and change calculation failed</source> + <translation>Не вдалось розрахувати обсяг комісії за транзакцію та решти</translation> </message> <message> - <source>Specify wallet file (within data directory)</source> - <translation>Вкажіть файл гаманця (в межах каталогу даних)</translation> + <source>Unable to bind to %s on this computer. %s is probably already running.</source> + <translation>Неможливо прив'язати %s на цьому комп'ютері. %s, ймовірно, вже працює.</translation> + </message> + <message> + <source>Unable to generate keys</source> + <translation>Не вдається створити ключі</translation> </message> <message> <source>Unsupported argument -benchmark ignored, use -debug=bench.</source> @@ -2914,8 +3386,12 @@ <translation>Параметр -tor не підтримується; використовуйте -onion.</translation> </message> <message> - <source>Use UPnP to map the listening port (default: %u)</source> - <translation>Використовувати UPnP для відображення порту, що прослуховується (типово: %u)</translation> + <source>Unsupported logging category %s=%s.</source> + <translation>Непідтримувана категорія ведення журналу %s=%s.</translation> + </message> + <message> + <source>Upgrading UTXO database</source> + <translation>Оновлення бази даних UTXO</translation> </message> <message> <source>User Agent comment (%s) contains unsafe characters.</source> @@ -2926,94 +3402,50 @@ <translation>Перевірка блоків...</translation> </message> <message> - <source>Wallet options:</source> - <translation>Параметри гаманця:</translation> - </message> - <message> - <source>Allow JSON-RPC connections from specified source. Valid for <ip> are a single IP (e.g. 1.2.3.4), a network/netmask (e.g. 1.2.3.4/255.255.255.0) or a network/CIDR (e.g. 1.2.3.4/24). This option can be specified multiple times</source> - <translation>Дозволити підключення по протоколу JSON-RPC зі вказаного джерела. Правильною для <ip> є окрема IP-адреса (наприклад, 1.2.3.4), IP-адреса та маска підмережі (наприклад, 1.2.3.4/255.255.255.0) або CIDR-адреса (наприклад, 1.2.3.4/24). Цей параметр можна вказувати декілька разів.</translation> - </message> - <message> - <source>Bind to given address and whitelist peers connecting to it. Use [host]:port notation for IPv6</source> - <translation>Прив'язатися до даної адреси та вносити до білого списку учасників, що під'єднуються до неї. Використовуйте запис виду [хост]:порт для IPv6</translation> - </message> - <message> - <source>Create new files with system default permissions, instead of umask 077 (only effective with disabled wallet functionality)</source> - <translation>Створювати нові файли з типовими для системи атрибутами доступу замість маски 077 (діє тільки при вимкненому гаманці)</translation> - </message> - <message> - <source>Discover own IP addresses (default: 1 when listening and no -externalip or -proxy)</source> - <translation>Визначити власні IP-адреси (типово: 1 при прослуховуванні та за відсутності -externalip або -proxy)</translation> + <source>Wallet needed to be rewritten: restart %s to complete</source> + <translation>Гаманець вимагав перезапису: перезавантажте %s для завершення</translation> </message> <message> <source>Error: Listening for incoming connections failed (listen returned error %s)</source> <translation>Помилка: Не вдалося налаштувати прослуховування вхідних підключень (listen повернув помилку: %s)</translation> </message> <message> - <source>Execute command when a relevant alert is received or we see a really long fork (%s in cmd is replaced by message)</source> - <translation>Виконати команду при надходженні важливого сповіщення або при спостереженні тривалого розгалуження ланцюжка (замість %s буде підставлено повідомлення)</translation> - </message> - <message> - <source>Fees (in %s/kB) smaller than this are considered zero fee for relaying, mining and transaction creation (default: %s)</source> - <translation>Комісії (в %s/kB), що менші за вказану, вважатимуться нульовими для зміни, аналізу та створення транзакцій (типово: %s)</translation> - </message> - <message> - <source>If paytxfee is not set, include enough fee so transactions begin confirmation on average within n blocks (default: %u)</source> - <translation>Якщо параметр paytxfee не встановлено, включити комісію для отримання перших підтверджень транзакцій протягом n блоків (типово: %u)</translation> - </message> - <message> <source>Invalid amount for -maxtxfee=<amount>: '%s' (must be at least the minrelay fee of %s to prevent stuck transactions)</source> <translation>Неприпустима сума для -maxtxfee = <amount>: «%s» ( плата повинна бути, принаймні %s, щоб запобігти зависанню транзакцій)</translation> </message> <message> - <source>Maximum size of data in data carrier transactions we relay and mine (default: %u)</source> - <translation>Максимальний розмір даних в транзакціях носіїв даних, що ми передаємо і добуваємо (за замовчуванням: %u)</translation> - </message> - <message> - <source>Randomize credentials for every proxy connection. This enables Tor stream isolation (default: %u)</source> - <translation>Надавати випадкові дані доступу для кожного проксі-з'єднання. Це дозволяє ввімкнути ізоляцію потоків Tor'у (типово: %u)</translation> - </message> - <message> <source>The transaction amount is too small to send after the fee has been deducted</source> <translation>Залишок від суми транзакції зі сплатою комісії занадто малий </translation> </message> <message> - <source>Whitelisted peers cannot be DoS banned and their transactions are always relayed, even if they are already in the mempool, useful e.g. for a gateway</source> - <translation>Учасники, що знаходяться в білому списку, не можуть бути заблоковані за DoS та їхні транзакції завжди ретранслюватимуться (навіть якщо вони є в пам'яті), що може бути корисним, наприклад, для шлюзу</translation> - </message> - <message> <source>You need to rebuild the database using -reindex to go back to unpruned mode. This will redownload the entire blockchain</source> <translation>Вам необхідно перебудувати базу даних з використанням -reindex для завантаження повного ланцюжка блоків.</translation> </message> <message> - <source>(default: %u)</source> - <translation>(типово: %u)</translation> - </message> - <message> - <source>Accept public REST requests (default: %u)</source> - <translation>Приймати публічні REST-запити (типово: %u)</translation> - </message> - <message> - <source>Automatically create Tor hidden service (default: %d)</source> - <translation>Автоматичне з'єднання з прихованим сервісом Tor (типово: %d)</translation> - </message> - <message> - <source>Connect through SOCKS5 proxy</source> - <translation>Підключитись через SOCKS5-проксі</translation> + <source>Error loading %s: You can't disable HD on an already existing HD wallet</source> + <translation>Помилка завантаження %s: Ви не можете відключити режим HD в існуючому HD-гаманці</translation> </message> <message> <source>Error reading from database, shutting down.</source> <translation>Помилка читання бази даних, припиняю роботу.</translation> </message> <message> - <source>Imports blocks from external blk000??.dat file on startup</source> - <translation>Спочатку імпортує блоки з зовнішнього файлу blk000??.dat </translation> + <source>Error upgrading chainstate database</source> + <translation>Помилка оновлення бази даних стану ланцюжка</translation> </message> <message> <source>Information</source> <translation>Інформація</translation> </message> <message> + <source>Invalid -onion address or hostname: '%s'</source> + <translation>Невірна -onion адреса або ім'я хоста: '%s'</translation> + </message> + <message> + <source>Invalid -proxy address or hostname: '%s'</source> + <translation>Невірна -proxy адреса або ім'я хоста: '%s'</translation> + </message> + <message> <source>Invalid amount for -paytxfee=<amount>: '%s' (must be at least %s)</source> <translation>Вказано некоректну суму для параметру -paytxfee: «%s» (повинно бути щонайменше %s)</translation> </message> @@ -3022,44 +3454,34 @@ <translation>Вказано неправильну маску підмережі для -whitelist: «%s»</translation> </message> <message> - <source>Keep at most <n> unconnectable transactions in memory (default: %u)</source> - <translation>Утримувати в пам'яті щонайбільше <n> транзакцій, що споживають невідомі входи (типово: %u)</translation> - </message> - <message> <source>Need to specify a port with -whitebind: '%s'</source> <translation>Необхідно вказати порт для -whitebind: «%s»</translation> </message> <message> - <source>Node relay options:</source> - <translation>Параметри вузла ретрансляції:</translation> - </message> - <message> - <source>RPC server options:</source> - <translation>Параметри сервера RPC:</translation> - </message> - <message> <source>Reducing -maxconnections from %d to %d, because of system limitations.</source> <translation>Зменшення значення -maxconnections з %d до %d із-за обмежень системи.</translation> </message> <message> - <source>Rescan the block chain for missing wallet transactions on startup</source> - <translation>Спочатку переглянте ланцюжок блоків на наявність втрачених транзакцій гаманця</translation> + <source>Signing transaction failed</source> + <translation>Підписання транзакції не вдалося</translation> </message> <message> - <source>Send trace/debug info to console instead of debug.log file</source> - <translation>Відсилати налагоджувальну інформацію на консоль, а не у файл debug.log</translation> + <source>Specified -walletdir "%s" does not exist</source> + <translation>Вказаний каталог гаманця -walletdir "%s" не існує</translation> </message> <message> - <source>Show all debugging options (usage: --help -help-debug)</source> - <translation>Показати всі налагоджувальні параметри (використання: --help -help-debug)</translation> + <source>Specified -walletdir "%s" is a relative path</source> + <translation>Вказаний каталог гаманця -walletdir "%s" є відносним шляхом</translation> </message> <message> - <source>Shrink debug.log file on client startup (default: 1 when no -debug)</source> - <translation>Стискати файл debug.log під час старту клієнта (типово: 1 коли відсутній параметр -debug)</translation> + <source>Specified -walletdir "%s" is not a directory</source> + <translation>Вказаний шлях -walletdir "%s" не є каталогом</translation> </message> <message> - <source>Signing transaction failed</source> - <translation>Підписання транзакції не вдалося</translation> + <source>Specified blocks directory "%s" does not exist. +</source> + <translation>Вказаний шлях до блоків "%s" не існує +</translation> </message> <message> <source>The transaction amount is too small to pay the fee</source> @@ -3070,14 +3492,6 @@ <translation>Це програмне забезпечення є експериментальним.</translation> </message> <message> - <source>Tor control port password (default: empty)</source> - <translation>Пароль управління порт протоколом Tor (типово: empty)</translation> - </message> - <message> - <source>Tor control port to use if onion listening enabled (default: %s)</source> - <translation>Скористайтесь управлінням порт протоколом Tor, в разі перехоплення обміну цибулевої маршрутизації (типово: %s)</translation> - </message> - <message> <source>Transaction amount too small</source> <translation>Сума транзакції занадто мала</translation> </message> @@ -3094,180 +3508,76 @@ <translation>Неможливо прив'язатися до %s на цьому комп'ютері (bind повернув помилку: %s)</translation> </message> <message> - <source>Upgrade wallet to latest format on startup</source> - <translation>Спочатку оновіть гаманець до останньої версії</translation> - </message> - <message> - <source>Username for JSON-RPC connections</source> - <translation>Ім'я користувача для JSON-RPC-з'єднань</translation> + <source>Unable to generate initial keys</source> + <translation>Не вдається створити початкові ключі</translation> </message> <message> <source>Verifying wallet(s)...</source> <translation>Перевірка гаманця(ців)... </translation> </message> <message> + <source>Wallet %s resides outside wallet directory %s</source> + <translation>Гаманець %s знаходиться поза каталогом гаманця %s</translation> + </message> + <message> <source>Warning</source> <translation>Попередження</translation> </message> <message> - <source>Whether to operate in a blocks only mode (default: %u)</source> - <translation>Чи слід працювати в режимі тільки блоки (типово: %u)</translation> + <source>Warning: unknown new rules activated (versionbit %i)</source> + <translation>Попередження: активовано невідомі нові правила (versionbit %i)</translation> </message> <message> <source>Zapping all transactions from wallet...</source> <translation>Видалення всіх транзакцій з гаманця...</translation> </message> <message> - <source>ZeroMQ notification options:</source> - <translation>Параметри сповіщень ZeroMQ:</translation> - </message> - <message> - <source>Password for JSON-RPC connections</source> - <translation>Пароль для JSON-RPC-з'єднань</translation> - </message> - <message> - <source>Execute command when the best block changes (%s in cmd is replaced by block hash)</source> - <translation>Виконати команду, коли з'явиться новий блок (%s в команді змінюється на хеш блоку)</translation> - </message> - <message> - <source>Allow DNS lookups for -addnode, -seednode and -connect</source> - <translation>Дозволити пошук в DNS для команд -addnode, -seednode та -connect</translation> - </message> - <message> - <source>(1 = keep tx meta data e.g. account owner and payment request information, 2 = drop tx meta data)</source> - <translation>(1 = утримувати метадані транзакцій (до яких відноситься інформація про власника рахунку та запити платежів), 2 - відкинути)</translation> - </message> - <message> <source>-maxtxfee is set very high! Fees this large could be paid on a single transaction.</source> <translation>Встановлено дуже велике значення -maxtxfee! Такі великі комісії можуть бути сплачені окремою транзакцією.</translation> </message> <message> - <source>Do not keep transactions in the mempool longer than <n> hours (default: %u)</source> - <translation>Не тримати транзакції в пам'яті довше <n> годин (типово: %u)</translation> - </message> - <message> - <source>Fees (in %s/kB) smaller than this are considered zero fee for transaction creation (default: %s)</source> - <translation>Комісії (в %s/kB), що менші за вказану, вважатимуться нульовими для створення транзакцій (типово: %s)</translation> - </message> - <message> - <source>How thorough the block verification of -checkblocks is (0-4, default: %u)</source> - <translation>Рівень ретельності перевірки блоків (0-4, типово: %u)</translation> + <source>Error loading %s: You can't enable HD on an already existing non-HD wallet</source> + <translation>Помилка завантаження %s: Ви не можете ввімкнути режим HD в існуючому не-HD гаманці</translation> </message> <message> - <source>Maintain a full transaction index, used by the getrawtransaction rpc call (default: %u)</source> - <translation>Утримувати повний індекс транзакцій (використовується RPC-викликом getrawtransaction) (типово: %u)</translation> + <source>This is the transaction fee you may pay when fee estimates are not available.</source> + <translation>Це комісія за транзакцію, яку ви можете сплатити, коли кошторисна вартість недоступна.</translation> </message> <message> - <source>Number of seconds to keep misbehaving peers from reconnecting (default: %u)</source> - <translation>Час в секундах, протягом якого відключені учасники з поганою поведінкою не зможуть підключитися (типово: %u)</translation> - </message> - <message> - <source>Output debugging information (default: %u, supplying <category> is optional)</source> - <translation>Виводити налагоджувальну інформацію (типово: %u, вказання <category> необов'язкове)</translation> - </message> - <message> - <source>Support filtering of blocks and transaction with bloom filters (default: %u)</source> - <translation>Фільтрація блоків та транзакцій з допомогою фільтрів Блума (типово: %u)</translation> + <source>This product includes software developed by the OpenSSL Project for use in the OpenSSL Toolkit %s and cryptographic software written by Eric Young and UPnP software written by Thomas Bernard.</source> + <translation>Цей продукт включає в себе програмне забезпечення, розроблене проектом OpenSSL для використання в OpenSSL Toolkit %s та криптографічне програмне забезпечення, написане Еріком Янгом та програмне забезпечення UPnP, написане Томасом Бернардом.</translation> </message> <message> <source>Total length of network version string (%i) exceeds maximum length (%i). Reduce the number or size of uacomments.</source> <translation>Загальна довжина рядку мережевої версії (%i) перевищує максимально допустиму (%i). Зменшіть число чи розмір коментарів клієнта користувача.</translation> </message> <message> - <source>Tries to keep outbound traffic under the given target (in MiB per 24h), 0 = no limit (default: %d)</source> - <translation>Намагається зберегти вихідний трафік відповідно до зданого значення (в MIB за 24 години), 0 = без обмежень (типово: %d)</translation> - </message> - <message> <source>Unsupported argument -socks found. Setting SOCKS version isn't possible anymore, only SOCKS5 proxies are supported.</source> <translation>Параметр -socks не підтримується. Можливість вказувати версію SOCKS було видалено, так як підтримується лише SOCKS5.</translation> </message> <message> - <source>Use separate SOCKS5 proxy to reach peers via Tor hidden services (default: %s)</source> - <translation>Використовувати окремий SOCKS5-проксі для з'єднання з учасниками через приховані сервіси Tor (типово: %s)</translation> - </message> - <message> - <source>(default: %s)</source> - <translation>(типово: %s)</translation> - </message> - <message> - <source>Always query for peer addresses via DNS lookup (default: %u)</source> - <translation>Завжди дізнаватися адреси учасників через DNS (типово: %u)</translation> - </message> - <message> - <source>Error loading wallet %s. Invalid characters in -wallet filename.</source> - <translation>Помилка завантаження гаманця %s. Недійсні символи в імені файлу -wallet.</translation> - </message> - <message> - <source>How many blocks to check at startup (default: %u, 0 = all)</source> - <translation>Скільки блоків перевіряти під час запуску (типово: %u, 0 = всі)</translation> - </message> - <message> - <source>Include IP addresses in debug output (default: %u)</source> - <translation>Включити IP-адреси до налагоджувального виводу (типово: %u)</translation> - </message> - <message> - <source>Listen for JSON-RPC connections on <port> (default: %u or testnet: %u)</source> - <translation>Прослуховувати <port> для JSON-RPC з'єднань (типово: %u, для тестової мережі: %u)</translation> - </message> - <message> - <source>Listen for connections on <port> (default: %u or testnet: %u)</source> - <translation>Чекати на з'єднання на <port> (типово: %u, для тестової мережі: %u)</translation> - </message> - <message> - <source>Maintain at most <n> connections to peers (default: %u)</source> - <translation>Підтримувати щонайбільше <n> з'єднань з учасниками (типово: %u)</translation> + <source>Unsupported argument -whitelistalwaysrelay ignored, use -whitelistrelay and/or -whitelistforcerelay.</source> + <translation>Непідтримуваний аргумент -whitelistalwaysrelay ігнорується, використовуйте -whitelistrelay та/або -whitelistforcerelay.</translation> </message> <message> - <source>Make the wallet broadcast transactions</source> - <translation>Дозволити гаманцю розповсюджувати транзакції</translation> + <source>Warning: Unknown block versions being mined! It's possible unknown rules are in effect</source> + <translation>Попередження: видобуваються невідомі версії блоків! Можливо активовано невідомі правила</translation> </message> <message> - <source>Maximum per-connection receive buffer, <n>*1000 bytes (default: %u)</source> - <translation>Максимальний розмір вхідного буферу на одне з'єднання, <n>*1000 байтів (типово: %u)</translation> + <source>Warning: Wallet file corrupt, data salvaged! Original %s saved as %s in %s; if your balance or transactions are incorrect you should restore from a backup.</source> + <translation>Попередження: файл гаманця пошкоджено, дані врятовано! Оригінальний %s збережено як %s в %s; якщо ваш баланс або транзакції некорректно відображаються, ви повинні відновити його з резервної копії.</translation> </message> <message> - <source>Maximum per-connection send buffer, <n>*1000 bytes (default: %u)</source> - <translation>Максимальний розмір вихідного буферу на одне з'єднання, <n>*1000 байтів (типово: %u)</translation> + <source>%s is set very high!</source> + <translation>%s встановлено дуже високо!</translation> </message> <message> - <source>Prepend debug output with timestamp (default: %u)</source> - <translation>Доповнювати налагоджувальний вивід відміткою часу (типово: %u)</translation> + <source>Error loading wallet %s. Duplicate -wallet filename specified.</source> + <translation>Помилка завантаження гаманця %s. Значення параметра -wallet дублюється.</translation> </message> <message> - <source>Relay and mine data carrier transactions (default: %u)</source> - <translation>Ретранслювати та створювати транзакції носіїв даних (типово: %u)</translation> - </message> - <message> - <source>Relay non-P2SH multisig (default: %u)</source> - <translation>Ретранслювати не-P2SH транзакції з мультипідписом (типово: %u)</translation> - </message> - <message> - <source>Set key pool size to <n> (default: %u)</source> - <translation>Встановити розмір пулу ключів <n> (типово: %u)</translation> - </message> - <message> - <source>Set maximum BIP141 block weight (default: %d)</source> - <translation>Встановити максимальний розмір блоку BIP141 (за замовчуванням: %d)</translation> - </message> - <message> - <source>Set the number of threads to service RPC calls (default: %d)</source> - <translation>Встановити число потоків для обслуговування викликів RPC (типово: %d)</translation> - </message> - <message> - <source>Specify configuration file (default: %s)</source> - <translation>Вказати файл конфігурації (типово: %s)</translation> - </message> - <message> - <source>Specify connection timeout in milliseconds (minimum: 1, default: %d)</source> - <translation>Вказати тайм-аут підключення в мілісекундах (щонайменше: 1, типово: %d)</translation> - </message> - <message> - <source>Specify pid file (default: %s)</source> - <translation>Вказати pid-файл (типово: %s)</translation> - </message> - <message> - <source>Spend unconfirmed change when sending transactions (default: %u)</source> - <translation>Витрачати непідтверджену решту при відправленні транзакцій (типово: %u)</translation> + <source>Keypool ran out, please call keypoolrefill first</source> + <translation>Пул ключів скінчився, потрібно викликати keypoolrefill</translation> </message> <message> <source>Starting network threads...</source> @@ -3286,10 +3596,6 @@ <translation>Це транзакційна комісія, яку ви сплатите, якщо будете надсилати транзакцію.</translation> </message> <message> - <source>Threshold for disconnecting misbehaving peers (default: %u)</source> - <translation>Поріг відключення учасників з поганою поведінкою (типово: %u)</translation> - </message> - <message> <source>Transaction amounts must not be negative</source> <translation>Сума транзакції занадто мала (зменьшіть комісію, якщо можливо)</translation> </message> @@ -3310,6 +3616,26 @@ <translation>Недостатньо коштів</translation> </message> <message> + <source>Can't generate a change-address key. Private keys are disabled for this wallet.</source> + <translation>Неможливо створити ключ зміни адреси. Власні ключі вимкнено для цього гаманця.</translation> + </message> + <message> + <source>Cannot upgrade a non HD split wallet without upgrading to support pre split keypool. Please use -upgradewallet=169900 or -upgradewallet with no version specified.</source> + <translation>Неможливо оновити не-HD гаманець без оновлення підтримки пулу ключів. Будь-ласка використовуйте -upgradewallet=169900 чи -upgradewallet без вказівки версії. </translation> + </message> + <message> + <source>Fee estimation failed. Fallbackfee is disabled. Wait a few blocks or enable -fallbackfee.</source> + <translation>Оцінка комісії не вдалася. Fallbackfee вимкнено. Зачекайте кілька блоків або ввімкніть -fallbackfee. </translation> + </message> + <message> + <source>Warning: Private keys detected in wallet {%s} with disabled private keys</source> + <translation>Попередження: Власні ключі виявлено в гаманці {%s} з забороненими власними ключами</translation> + </message> + <message> + <source>Cannot write to data directory '%s'; check permissions.</source> + <translation>Неможливо записати до каталог даних '%s'; перевірте дозвіл.</translation> + </message> + <message> <source>Loading block index...</source> <translation>Завантаження індексу блоків...</translation> </message> diff --git a/src/qt/locale/bitcoin_uz@Cyrl.ts b/src/qt/locale/bitcoin_uz@Cyrl.ts index ad70b3309a..d369d4f16a 100644 --- a/src/qt/locale/bitcoin_uz@Cyrl.ts +++ b/src/qt/locale/bitcoin_uz@Cyrl.ts @@ -30,6 +30,10 @@ <translation>Жорий танланган манзилни рўйхатдан ўчириш</translation> </message> <message> + <source>Enter address or label to search</source> + <translation>Излаш учун манзил ёки ёрлиқни киритинг</translation> + </message> + <message> <source>Export the data in the current tab to a file</source> <translation>Жорий ички ойна ичидаги маълумотларни файлга экспорт қилиш</translation> </message> @@ -413,15 +417,7 @@ <source>Command-line options</source> <translation>Буйруқлар сатри мосламалари</translation> </message> - <message> - <source>Usage:</source> - <translation>Фойдаланиш:</translation> - </message> - <message> - <source>command-line options</source> - <translation>буйруқлар қатори орқали мослаш</translation> - </message> - </context> +</context> <context> <name>Intro</name> <message> @@ -952,6 +948,10 @@ <source>&Save Image...</source> <translation>Расмни &сақлаш</translation> </message> + <message> + <source>Wallet</source> + <translation>Ҳамён</translation> + </message> </context> <context> <name>RecentRequestsTableModel</name> @@ -1050,6 +1050,10 @@ <source>S&end</source> <translation>Жў&натиш</translation> </message> + <message> + <source>Transaction fee</source> + <translation>Ўтказма тўлови</translation> + </message> </context> <context> <name>SendCoinsEntry</name> @@ -1168,46 +1172,18 @@ <context> <name>bitcoin-core</name> <message> - <source>Options:</source> - <translation>Танламалар:</translation> - </message> - <message> - <source>Specify data directory</source> - <translation>Маълумотлар директориясини кўрсатинг</translation> - </message> - <message> - <source>Accept command line and JSON-RPC commands</source> - <translation>Буйруқлар сатри ва JSON-RPC буйруқларига рози бўлинг</translation> - </message> - <message> - <source>Run in the background as a daemon and accept commands</source> - <translation>Демон сифатида орқа фонда ишга туширинг ва буйруқларга рози бўлинг</translation> - </message> - <message> <source>Bitcoin Core</source> <translation>Bitcoin Core</translation> </message> <message> - <source>Connection options:</source> - <translation>Уланиш кўрсаткичлари:</translation> - </message> - <message> <source>Information</source> <translation>Маълумот</translation> </message> <message> - <source>Username for JSON-RPC connections</source> - <translation>JSON-RPC уланишлари учун фойдаланувчи номи</translation> - </message> - <message> <source>Warning</source> <translation>Диққат</translation> </message> <message> - <source>Password for JSON-RPC connections</source> - <translation>JSON-RPC уланишлари учун парол</translation> - </message> - <message> <source>Insufficient funds</source> <translation>Кам миқдор</translation> </message> diff --git a/src/qt/locale/bitcoin_vi.ts b/src/qt/locale/bitcoin_vi.ts index 5e1e13ba8e..563d047ff7 100644 --- a/src/qt/locale/bitcoin_vi.ts +++ b/src/qt/locale/bitcoin_vi.ts @@ -30,6 +30,10 @@ <translation>Xóa địa chỉ đang chọn từ danh sách</translation> </message> <message> + <source>Enter address or label to search</source> + <translation>Enter address or label to search</translation> + </message> + <message> <source>Export the data in the current tab to a file</source> <translation>Xuất dữ liệu trong thẻ hiện tại ra file</translation> </message> @@ -722,10 +726,6 @@ <translation>Địa chỉ</translation> </message> <message> - <source>New receiving address</source> - <translation>Address đang nhận mới</translation> - </message> - <message> <source>New sending address</source> <translation>Address đang gửi mới</translation> </message> @@ -742,10 +742,6 @@ <translation>Address đã nhập "%1" không valid Bitcoin address.</translation> </message> <message> - <source>The entered address "%1" is already in the address book.</source> - <translation>Address đã nhập "%1" đã có trong address book.</translation> - </message> - <message> <source>Could not unlock wallet.</source> <translation>Không thể unlock wallet.</translation> </message> @@ -795,42 +791,6 @@ <source>Command-line options</source> <translation>Command-line options</translation> </message> - <message> - <source>Usage:</source> - <translation>Usage:</translation> - </message> - <message> - <source>command-line options</source> - <translation>command-line options</translation> - </message> - <message> - <source>UI Options:</source> - <translation>Tùy chỉnh UI:</translation> - </message> - <message> - <source>Choose data directory on startup (default: %u)</source> - <translation>Chọn dữ liệu danh mục trên startup (default: %u)</translation> - </message> - <message> - <source>Set language, for example "de_DE" (default: system locale)</source> - <translation>Cài đặt ngôn ngữ, ví dụ "de_DE" (default: system locale)</translation> - </message> - <message> - <source>Start minimized</source> - <translation>Khởi tạo tối thiểu</translation> - </message> - <message> - <source>Set SSL root certificates for payment request (default: -system-)</source> - <translation>Đặt chứng chỉ SSL root certificates cho payment request (default: -system-)</translation> - </message> - <message> - <source>Show splash screen on startup (default: %u)</source> - <translation>Hiển thị splash screen trên startup (default: %u)</translation> - </message> - <message> - <source>Reset all settings changed in the GUI</source> - <translation>Reset tất cả cài đặt thay đổi trong GUI</translation> - </message> </context> <context> <name>Intro</name> @@ -1503,10 +1463,6 @@ <translation>Error: Xác định data directory "%1" không tồn tại.</translation> </message> <message> - <source>Error: Cannot parse configuration file: %1. Only use key=value syntax.</source> - <translation>Error: Không thể parse configuration file: %1. Chỉ dùng key=value syntax.</translation> - </message> - <message> <source>Error: %1</source> <translation>Error: %1</translation> </message> @@ -1939,6 +1895,10 @@ <translation>Tin nhắn</translation> </message> <message> + <source>Wallet</source> + <translation>Ví</translation> + </message> + <message> <source>Resulting URI too long, try to reduce the text for label / message.</source> <translation>Đang tính toán URI quá dài, cố gắng giảm text cho label / message.</translation> </message> @@ -2057,10 +2017,6 @@ <translation>trên mỗi kilobyte</translation> </message> <message> - <source>If the custom fee is set to 1000 satoshis and the transaction is only 250 bytes, then "per kilobyte" only pays 250 satoshis in fee, while "total at least" pays 1000 satoshis. For transactions bigger than a kilobyte both pay by kilobyte.</source> - <translation>Nếu the custom fee được đặt 1000 satoshis và the transaction chỉ 250 bytes, nên "per kilobyte" chỉ trả 250 satoshis trong fee, trong khi "total at least" trả 1000 satoshis. Để các giao dịch lớn hơn a kilobyte both pay by kilobyte.</translation> - </message> - <message> <source>Hide</source> <translation>Ẩn</translation> </message> @@ -2161,18 +2117,14 @@ <translation>Bạn chắc chắn muốn gửi chứ?</translation> </message> <message> - <source>added as transaction fee</source> - <translation>đã thêm transaction fee</translation> - </message> - <message> - <source>Total Amount %1</source> - <translation>Tổng Số lượng %1</translation> - </message> - <message> <source>or</source> <translation>hoặc</translation> </message> <message> + <source>Transaction fee</source> + <translation>Transaction fee</translation> + </message> + <message> <source>Confirm send coins</source> <translation>Confirm gửi coins</translation> </message> @@ -2510,10 +2462,6 @@ <translation>conflicted with a transaction with %1 confirmations</translation> </message> <message> - <source>%1/offline</source> - <translation>%1/offline</translation> - </message> - <message> <source>0/unconfirmed, %1</source> <translation>0/unconfirmed, %1</translation> </message> @@ -2542,14 +2490,6 @@ <translation>Status</translation> </message> <message> - <source>, has not been successfully broadcast yet</source> - <translation>, has not been successfully broadcast yet</translation> - </message> - <message numerus="yes"> - <source>, broadcast through %n node(s)</source> - <translation><numerusform>, broadcast qua %n nodes</numerusform></translation> - </message> - <message> <source>Date</source> <translation>Ngày</translation> </message> @@ -2704,10 +2644,6 @@ <translation>Open until %1</translation> </message> <message> - <source>Offline</source> - <translation>Offline</translation> - </message> - <message> <source>Unconfirmed</source> <translation>Unconfirmed</translation> </message> @@ -2732,10 +2668,6 @@ <translation>Immature (%1 confirmations, will be available after %2)</translation> </message> <message> - <source>This block was not received by any other nodes and will probably not be accepted!</source> - <translation>This block was not received by any other nodes and will probably not be accepted!</translation> - </message> - <message> <source>Generated but not accepted</source> <translation>Generated but not accepted</translation> </message> @@ -3042,38 +2974,14 @@ <source>The wallet data was successfully saved to %1.</source> <translation>The wallet data was successfully saved to %1.</translation> </message> -</context> + </context> <context> <name>bitcoin-core</name> <message> - <source>Options:</source> - <translation>Options:</translation> - </message> - <message> - <source>Specify data directory</source> - <translation>Specify data directory</translation> - </message> - <message> - <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> - <source>Specify your own public address</source> - <translation>Specify your own public address</translation> - </message> - <message> - <source>Accept command line and JSON-RPC commands</source> - <translation>Accept command line and JSON-RPC commands</translation> - </message> - <message> <source>Distributed under the MIT software license, see the accompanying file %s or %s</source> <translation>Distributed under the MIT software license, see the accompanying file %s or %s</translation> </message> <message> - <source>If <category> is not supplied or if <category> = 1, output all debugging information.</source> - <translation>If <category> is not supplied or if <category> = 1, output all debugging information.</translation> - </message> - <message> <source>Prune configured below the minimum of %d MiB. Please use a higher number.</source> <translation>Prune configured below the minimum of %d MiB. Please use a higher number.</translation> </message> @@ -3090,18 +2998,10 @@ <translation>Error: A fatal internal error occurred, see debug.log for details</translation> </message> <message> - <source>Fee (in %s/kB) to add to transactions you send (default: %s)</source> - <translation>Fee (in %s/kB) to add to transactions you send (default: %s)</translation> - </message> - <message> <source>Pruning blockstore...</source> <translation>Pruning blockstore...</translation> </message> <message> - <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> <source>Unable to start HTTP server. See debug log for details.</source> <translation>Unable to start HTTP server. See debug log for details.</translation> </message> @@ -3114,54 +3014,14 @@ <translation>The %s developers</translation> </message> <message> - <source>A fee rate (in %s/kB) that will be used when fee estimation has insufficient data (default: %s)</source> - <translation>A fee rate (in %s/kB) that will be used when fee estimation has insufficient data (default: %s)</translation> - </message> - <message> - <source>Accept relayed transactions received from whitelisted peers even when not relaying transactions (default: %d)</source> - <translation>Accept relayed transactions received from whitelisted peers even when not relaying transactions (default: %d)</translation> - </message> - <message> - <source>Bind to given address and always listen on it. Use [host]:port notation for IPv6</source> - <translation>Bind to given address and always listen on it. Use [host]:port notation for IPv6</translation> - </message> - <message> <source>Cannot obtain a lock on data directory %s. %s is probably already running.</source> <translation>Cannot obtain a lock on data directory %s. %s is probably already running.</translation> </message> <message> - <source>Delete all wallet transactions and only recover those parts of the blockchain through -rescan on startup</source> - <translation>Delete all wallet transactions and only recover those parts of the blockchain through -rescan on startup</translation> - </message> - <message> <source>Error reading %s! All keys read correctly, but transaction data or address book entries might be missing or incorrect.</source> <translation>Error reading %s! All keys read correctly, but transaction data or address book entries might be missing or incorrect.</translation> </message> <message> - <source>Exclude debugging information for a category. Can be used in conjunction with -debug=1 to output debug logs for all categories except one or more specified categories.</source> - <translation>Exclude debugging information for a category. Can be used in conjunction with -debug=1 to output debug logs for all categories except one or more specified categories.</translation> - </message> - <message> - <source>Execute command when a wallet transaction changes (%s in cmd is replaced by TxID)</source> - <translation>Execute command when a wallet transaction changes (%s in cmd is replaced by TxID)</translation> - </message> - <message> - <source>Extra transactions to keep in memory for compact block reconstructions (default: %u)</source> - <translation>Extra transactions to keep in memory for compact block reconstructions (default: %u)</translation> - </message> - <message> - <source>If this block is in the chain assume that it and its ancestors are valid and potentially skip their script verification (0 to verify all, default: %s, testnet: %s)</source> - <translation>If this block is in the chain assume that it and its ancestors are valid and potentially skip their script verification (0 to verify all, default: %s, testnet: %s)</translation> - </message> - <message> - <source>Maximum allowed median peer time offset adjustment. Local perspective of time may be influenced by peers forward or backward by this amount. (default: %u seconds)</source> - <translation>Maximum allowed median peer time offset adjustment. Local perspective of time may be influenced by peers forward or backward by this amount. (default: %u seconds)</translation> - </message> - <message> - <source>Maximum total fees (in %s) to use in a single wallet transaction or raw transaction; setting this too low may abort large transactions (default: %s)</source> - <translation>Maximum total fees (in %s) to use in a single wallet transaction or raw transaction; setting this too low may abort large transactions (default: %s)</translation> - </message> - <message> <source>Please check that your computer's date and time are correct! If your clock is wrong, %s will not work properly.</source> <translation>Please check that your computer's date and time are correct! If your clock is wrong, %s will not work properly.</translation> </message> @@ -3170,22 +3030,6 @@ <translation>Please contribute if you find %s useful. Visit %s for further information about the software.</translation> </message> <message> - <source>Query for peer addresses via DNS lookup, if low on addresses (default: 1 unless -connect used)</source> - <translation>Query for peer addresses via DNS lookup, if low on addresses (default: 1 unless -connect used)</translation> - </message> - <message> - <source>Reduce storage requirements by enabling pruning (deleting) of old blocks. This allows the pruneblockchain RPC to be called to delete specific blocks, and enables automatic pruning of old blocks if a target size in MiB is provided. This mode is incompatible with -txindex and -rescan. Warning: Reverting this setting requires re-downloading the entire blockchain. (default: 0 = disable pruning blocks, 1 = allow manual pruning via RPC, >%u = automatically prune block files to stay under the specified target size in MiB)</source> - <translation>Reduce storage requirements by enabling pruning (deleting) of old blocks. This allows the pruneblockchain RPC to be called to delete specific blocks, and enables automatic pruning of old blocks if a target size in MiB is provided. This mode is incompatible with -txindex and -rescan. Warning: Reverting this setting requires re-downloading the entire blockchain. (default: 0 = disable pruning blocks, 1 = allow manual pruning via RPC, >%u = automatically prune block files to stay under the specified target size in MiB)</translation> - </message> - <message> - <source>Set lowest fee rate (in %s/kB) for transactions to be included in block creation. (default: %s)</source> - <translation>Set lowest fee rate (in %s/kB) for transactions to be included in block creation. (default: %s)</translation> - </message> - <message> - <source>Set the number of script verification threads (%u to %d, 0 = auto, <0 = leave that many cores free, default: %d)</source> - <translation>Set the number of script verification threads (%u to %d, 0 = auto, <0 = leave that many cores free, default: %d)</translation> - </message> - <message> <source>The block database contains a block which appears to be from the future. This may be due to your computer's date and time being set incorrectly. Only rebuild the block database if you are sure that your computer's date and time are correct</source> <translation>The block database contains a block which appears to be from the future. This may be due to your computer's date and time being set incorrectly. Only rebuild the block database if you are sure that your computer's date and time are correct</translation> </message> @@ -3206,18 +3050,6 @@ <translation>Unable to rewind the database to a pre-fork state. You will need to redownload the blockchain</translation> </message> <message> - <source>Use UPnP to map the listening port (default: 1 when listening and no -proxy)</source> - <translation>Use UPnP to map the listening port (default: 1 when listening and no -proxy)</translation> - </message> - <message> - <source>Username and hashed password for JSON-RPC connections. The field <userpw> comes in the format: <USERNAME>:<SALT>$<HASH>. A canonical python script is included in share/rpcuser. The client then connects normally using the rpcuser=<USERNAME>/rpcpassword=<PASSWORD> pair of arguments. This option can be specified multiple times</source> - <translation>Username and hashed password for JSON-RPC connections. The field <userpw> comes in the format: <USERNAME>:<SALT>$<HASH>. A canonical python script is included in share/rpcuser. The client then connects normally using the rpcuser=<USERNAME>/rpcpassword=<PASSWORD> pair of arguments. This option can be specified multiple times</translation> - </message> - <message> - <source>Wallet will not create transactions that violate mempool chain limits (default: %u)</source> - <translation>Wallet will not create transactions that violate mempool chain limits (default: %u)</translation> - </message> - <message> <source>Warning: The network does not appear to fully agree! Some miners appear to be experiencing issues.</source> <translation>Warning: The network does not appear to fully agree! Some miners appear to be experiencing issues.</translation> </message> @@ -3226,10 +3058,6 @@ <translation>Warning: We do not appear to fully agree with our peers! You may need to upgrade, or other nodes may need to upgrade.</translation> </message> <message> - <source>Whether to save the mempool on shutdown and load on restart (default: %u)</source> - <translation>Whether to save the mempool on shutdown and load on restart (default: %u)</translation> - </message> - <message> <source>%d of last 100 blocks have unexpected version</source> <translation>%d of last 100 blocks have unexpected version</translation> </message> @@ -3242,42 +3070,14 @@ <translation>-maxmempool must be at least %d MB</translation> </message> <message> - <source><category> can be:</source> - <translation><category> can be:</translation> - </message> - <message> - <source>Accept connections from outside (default: 1 if no -proxy or -connect)</source> - <translation>Accept connections from outside (default: 1 if no -proxy or -connect)</translation> - </message> - <message> - <source>Append comment to the user agent string</source> - <translation>Append comment to the user agent string</translation> - </message> - <message> - <source>Attempt to recover private keys from a corrupt wallet on startup</source> - <translation>Attempt to recover private keys from a corrupt wallet on startup</translation> - </message> - <message> - <source>Block creation options:</source> - <translation>Block creation options:</translation> - </message> - <message> <source>Cannot resolve -%s address: '%s'</source> <translation>Cannot resolve -%s address: '%s'</translation> </message> <message> - <source>Chain selection options:</source> - <translation>Chain selection options:</translation> - </message> - <message> <source>Change index out of range</source> <translation>Change index out of range</translation> </message> <message> - <source>Connection options:</source> - <translation>Connection options:</translation> - </message> - <message> <source>Copyright (C) %i-%i</source> <translation>Copyright (C) %i-%i</translation> </message> @@ -3286,38 +3086,10 @@ <translation>Corrupted block database detected</translation> </message> <message> - <source>Debugging/Testing options:</source> - <translation>Debugging/Testing options:</translation> - </message> - <message> - <source>Do not load the wallet and disable wallet RPC calls</source> - <translation>Do not load the wallet and disable wallet RPC calls</translation> - </message> - <message> <source>Do you want to rebuild the block database now?</source> <translation>Do you want to rebuild the block database now?</translation> </message> <message> - <source>Enable publish hash block in <address></source> - <translation>Enable publish hash block in <address></translation> - </message> - <message> - <source>Enable publish hash transaction in <address></source> - <translation>Enable publish hash transaction in <address></translation> - </message> - <message> - <source>Enable publish raw block in <address></source> - <translation>Enable publish raw block in <address></translation> - </message> - <message> - <source>Enable publish raw transaction in <address></source> - <translation>Enable publish raw transaction in <address></translation> - </message> - <message> - <source>Enable transaction replacement in the memory pool (default: %u)</source> - <translation>Enable transaction replacement in the memory pool (default: %u)</translation> - </message> - <message> <source>Error initializing block database</source> <translation>Error initializing block database</translation> </message> @@ -3378,10 +3150,6 @@ <translation>Invalid amount for -fallbackfee=<amount>: '%s'</translation> </message> <message> - <source>Keep the transaction memory pool below <n> megabytes (default: %u)</source> - <translation>Keep the transaction memory pool below <n> megabytes (default: %u)</translation> - </message> - <message> <source>Loading P2P addresses...</source> <translation>Loading P2P addresses...</translation> </message> @@ -3390,26 +3158,10 @@ <translation>Loading banlist...</translation> </message> <message> - <source>Location of the auth cookie (default: data dir)</source> - <translation>Location of the auth cookie (default: data dir)</translation> - </message> - <message> <source>Not enough file descriptors available.</source> <translation>Not enough file descriptors available.</translation> </message> <message> - <source>Only connect to nodes in network <net> (ipv4, ipv6 or onion)</source> - <translation>Only connect to nodes in network <net> (ipv4, ipv6 or onion)</translation> - </message> - <message> - <source>Print this help message and exit</source> - <translation>Print this help message and exit</translation> - </message> - <message> - <source>Print version and exit</source> - <translation>Print version and exit</translation> - </message> - <message> <source>Prune cannot be configured with a negative value.</source> <translation>Prune cannot be configured with a negative value.</translation> </message> @@ -3418,14 +3170,6 @@ <translation>Prune mode is incompatible with -txindex.</translation> </message> <message> - <source>Rebuild chain state and block index from the blk*.dat files on disk</source> - <translation>Rebuild chain state and block index from the blk*.dat files on disk</translation> - </message> - <message> - <source>Rebuild chain state from the currently indexed blocks</source> - <translation>Rebuild chain state from the currently indexed blocks</translation> - </message> - <message> <source>Replaying blocks...</source> <translation>Replaying blocks...</translation> </message> @@ -3434,14 +3178,6 @@ <translation>Rewinding blocks...</translation> </message> <message> - <source>Set database cache size in megabytes (%d to %d, default: %d)</source> - <translation>Set database cache size in megabytes (%d to %d, default: %d)</translation> - </message> - <message> - <source>Specify wallet file (within data directory)</source> - <translation>Specify wallet file (within data directory)</translation> - </message> - <message> <source>The source code is available from %s.</source> <translation>The source code is available from %s.</translation> </message> @@ -3474,14 +3210,6 @@ <translation>Upgrading UTXO database</translation> </message> <message> - <source>Use UPnP to map the listening port (default: %u)</source> - <translation>Use UPnP to map the listening port (default: %u)</translation> - </message> - <message> - <source>Use the test chain</source> - <translation>Use the test chain</translation> - </message> - <message> <source>User Agent comment (%s) contains unsafe characters.</source> <translation>User Agent comment (%s) contains unsafe characters.</translation> </message> @@ -3490,90 +3218,26 @@ <translation>Verifying blocks...</translation> </message> <message> - <source>Wallet debugging/testing options:</source> - <translation>Wallet debugging/testing options:</translation> - </message> - <message> <source>Wallet needed to be rewritten: restart %s to complete</source> <translation>Wallet needed to be rewritten: restart %s to complete</translation> </message> <message> - <source>Wallet options:</source> - <translation>Wallet options:</translation> - </message> - <message> - <source>Allow JSON-RPC connections from specified source. Valid for <ip> are a single IP (e.g. 1.2.3.4), a network/netmask (e.g. 1.2.3.4/255.255.255.0) or a network/CIDR (e.g. 1.2.3.4/24). This option can be specified multiple times</source> - <translation>Allow JSON-RPC connections from specified source. Valid for <ip> are a single IP (e.g. 1.2.3.4), a network/netmask (e.g. 1.2.3.4/255.255.255.0) or a network/CIDR (e.g. 1.2.3.4/24). This option can be specified multiple times</translation> - </message> - <message> - <source>Bind to given address and whitelist peers connecting to it. Use [host]:port notation for IPv6</source> - <translation>Bind to given address and whitelist peers connecting to it. Use [host]:port notation for IPv6</translation> - </message> - <message> - <source>Create new files with system default permissions, instead of umask 077 (only effective with disabled wallet functionality)</source> - <translation>Create new files with system default permissions, instead of umask 077 (only effective with disabled wallet functionality)</translation> - </message> - <message> - <source>Discover own IP addresses (default: 1 when listening and no -externalip or -proxy)</source> - <translation>Discover own IP addresses (default: 1 when listening and no -externalip or -proxy)</translation> - </message> - <message> <source>Error: Listening for incoming connections failed (listen returned error %s)</source> <translation>Error: Listening for incoming connections failed (listen returned error %s)</translation> </message> <message> - <source>Execute command when a relevant alert is received or we see a really long fork (%s in cmd is replaced by message)</source> - <translation>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> - <source>Fees (in %s/kB) smaller than this are considered zero fee for relaying, mining and transaction creation (default: %s)</source> - <translation>Fees (in %s/kB) smaller than this are considered zero fee for relaying, mining and transaction creation (default: %s)</translation> - </message> - <message> - <source>If paytxfee is not set, include enough fee so transactions begin confirmation on average within n blocks (default: %u)</source> - <translation>If paytxfee is not set, include enough fee so transactions begin confirmation on average within n blocks (default: %u)</translation> - </message> - <message> <source>Invalid amount for -maxtxfee=<amount>: '%s' (must be at least the minrelay fee of %s to prevent stuck transactions)</source> <translation>Invalid amount for -maxtxfee=<amount>: '%s' (must be at least the minrelay fee of %s to prevent stuck transactions)</translation> </message> <message> - <source>Maximum size of data in data carrier transactions we relay and mine (default: %u)</source> - <translation>Maximum size of data in data carrier transactions we relay and mine (default: %u)</translation> - </message> - <message> - <source>Randomize credentials for every proxy connection. This enables Tor stream isolation (default: %u)</source> - <translation>Randomize credentials for every proxy connection. This enables Tor stream isolation (default: %u)</translation> - </message> - <message> <source>The transaction amount is too small to send after the fee has been deducted</source> <translation>The transaction amount is too small to send after the fee has been deducted</translation> </message> <message> - <source>Whitelisted peers cannot be DoS banned and their transactions are always relayed, even if they are already in the mempool, useful e.g. for a gateway</source> - <translation>Whitelisted peers cannot be DoS banned and their transactions are always relayed, even if they are already in the mempool, useful e.g. for a gateway</translation> - </message> - <message> <source>You need to rebuild the database using -reindex to go back to unpruned mode. This will redownload the entire blockchain</source> <translation>You need to rebuild the database using -reindex to go back to unpruned mode. This will redownload the entire blockchain</translation> </message> <message> - <source>(default: %u)</source> - <translation>(default: %u)</translation> - </message> - <message> - <source>Accept public REST requests (default: %u)</source> - <translation>Accept public REST requests (default: %u)</translation> - </message> - <message> - <source>Automatically create Tor hidden service (default: %d)</source> - <translation>Automatically create Tor hidden service (default: %d)</translation> - </message> - <message> - <source>Connect through SOCKS5 proxy</source> - <translation>Connect through SOCKS5 proxy</translation> - </message> - <message> <source>Error loading %s: You can't disable HD on an already existing HD wallet</source> <translation>Error loading %s: You can't disable HD on an already existing HD wallet</translation> </message> @@ -3586,10 +3250,6 @@ <translation>Error upgrading chainstate database</translation> </message> <message> - <source>Imports blocks from external blk000??.dat file on startup</source> - <translation>Imports blocks from external blk000??.dat file on startup</translation> - </message> - <message> <source>Information</source> <translation>Thông tin</translation> </message> @@ -3610,42 +3270,14 @@ <translation>Invalid netmask specified in -whitelist: '%s'</translation> </message> <message> - <source>Keep at most <n> unconnectable transactions in memory (default: %u)</source> - <translation>Keep at most <n> unconnectable transactions in memory (default: %u)</translation> - </message> - <message> <source>Need to specify a port with -whitebind: '%s'</source> <translation>Need to specify a port with -whitebind: '%s'</translation> </message> <message> - <source>Node relay options:</source> - <translation>Node relay options:</translation> - </message> - <message> - <source>RPC server options:</source> - <translation>RPC server options:</translation> - </message> - <message> <source>Reducing -maxconnections from %d to %d, because of system limitations.</source> <translation>Reducing -maxconnections from %d to %d, because of system limitations.</translation> </message> <message> - <source>Rescan the block chain for missing wallet transactions on startup</source> - <translation>Rescan the block chain for missing wallet transactions on startup</translation> - </message> - <message> - <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> - <message> - <source>Show all debugging options (usage: --help -help-debug)</source> - <translation>Show all debugging options (usage: --help -help-debug)</translation> - </message> - <message> - <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> - <message> <source>Signing transaction failed</source> <translation>Signing transaction failed</translation> </message> @@ -3658,14 +3290,6 @@ <translation>This is experimental software.</translation> </message> <message> - <source>Tor control port password (default: empty)</source> - <translation>Tor control port password (default: empty)</translation> - </message> - <message> - <source>Tor control port to use if onion listening enabled (default: %s)</source> - <translation>Tor control port to use if onion listening enabled (default: %s)</translation> - </message> - <message> <source>Transaction amount too small</source> <translation>Transaction amount too small</translation> </message> @@ -3682,14 +3306,6 @@ <translation>Unable to bind to %s on this computer (bind returned error %s)</translation> </message> <message> - <source>Upgrade wallet to latest format on startup</source> - <translation>Upgrade wallet to latest format on startup</translation> - </message> - <message> - <source>Username for JSON-RPC connections</source> - <translation>Username for JSON-RPC connections</translation> - </message> - <message> <source>Verifying wallet(s)...</source> <translation>Verifying wallet(s)...</translation> </message> @@ -3702,98 +3318,18 @@ <translation>Warning: unknown new rules activated (versionbit %i)</translation> </message> <message> - <source>Whether to operate in a blocks only mode (default: %u)</source> - <translation>Whether to operate in a blocks only mode (default: %u)</translation> - </message> - <message> - <source>You need to rebuild the database using -reindex to change -txindex</source> - <translation>You need to rebuild the database using -reindex to change -txindex</translation> - </message> - <message> <source>Zapping all transactions from wallet...</source> <translation>Zapping all transactions from wallet...</translation> </message> <message> - <source>ZeroMQ notification options:</source> - <translation>ZeroMQ notification options:</translation> - </message> - <message> - <source>Password for JSON-RPC connections</source> - <translation>Password for JSON-RPC connections</translation> - </message> - <message> - <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> - <source>Allow DNS lookups for -addnode, -seednode and -connect</source> - <translation>Allow DNS lookups for -addnode, -seednode and -connect</translation> - </message> - <message> - <source>(1 = keep tx meta data e.g. account owner and payment request information, 2 = drop tx meta data)</source> - <translation>(1 = keep tx meta data e.g. account owner and payment request information, 2 = drop tx meta data)</translation> - </message> - <message> <source>-maxtxfee is set very high! Fees this large could be paid on a single transaction.</source> <translation>-maxtxfee is set very high! Fees this large could be paid on a single transaction.</translation> </message> <message> - <source>Bind to given address to listen for JSON-RPC connections. This option is ignored unless -rpcallowip is also passed. Port is optional and overrides -rpcport. Use [host]:port notation for IPv6. This option can be specified multiple times (default: 127.0.0.1 and ::1 i.e., localhost, or if -rpcallowip has been specified, 0.0.0.0 and :: i.e., all addresses)</source> - <translation>Bind to given address to listen for JSON-RPC connections. This option is ignored unless -rpcallowip is also passed. Port is optional and overrides -rpcport. Use [host]:port notation for IPv6. This option can be specified multiple times (default: 127.0.0.1 and ::1 i.e., localhost, or if -rpcallowip has been specified, 0.0.0.0 and :: i.e., all addresses)</translation> - </message> - <message> - <source>Do not keep transactions in the mempool longer than <n> hours (default: %u)</source> - <translation>Do not keep transactions in the mempool longer than <n> hours (default: %u)</translation> - </message> - <message> - <source>Equivalent bytes per sigop in transactions for relay and mining (default: %u)</source> - <translation>Equivalent bytes per sigop in transactions for relay and mining (default: %u)</translation> - </message> - <message> <source>Error loading %s: You can't enable HD on an already existing non-HD wallet</source> <translation>Error loading %s: You can't enable HD on an already existing non-HD wallet</translation> </message> <message> - <source>Error loading wallet %s. -wallet parameter must only specify a filename (not a path).</source> - <translation>Error loading wallet %s. -wallet parameter must only specify a filename (not a path).</translation> - </message> - <message> - <source>Fees (in %s/kB) smaller than this are considered zero fee for transaction creation (default: %s)</source> - <translation>Fees (in %s/kB) smaller than this are considered zero fee for transaction creation (default: %s)</translation> - </message> - <message> - <source>Force relay of transactions from whitelisted peers even if they violate local relay policy (default: %d)</source> - <translation>Force relay of transactions from whitelisted peers even if they violate local relay policy (default: %d)</translation> - </message> - <message> - <source>How thorough the block verification of -checkblocks is (0-4, default: %u)</source> - <translation>How thorough the block verification of -checkblocks is (0-4, default: %u)</translation> - </message> - <message> - <source>Maintain a full transaction index, used by the getrawtransaction rpc call (default: %u)</source> - <translation>Maintain a full transaction index, used by the getrawtransaction rpc call (default: %u)</translation> - </message> - <message> - <source>Number of seconds to keep misbehaving peers from reconnecting (default: %u)</source> - <translation>Number of seconds to keep misbehaving peers from reconnecting (default: %u)</translation> - </message> - <message> - <source>Output debugging information (default: %u, supplying <category> is optional)</source> - <translation>Output debugging information (default: %u, supplying <category> is optional)</translation> - </message> - <message> - <source>Sets the serialization of raw transaction or block hex returned in non-verbose mode, non-segwit(0) or segwit(1) (default: %d)</source> - <translation>Sets the serialization of raw transaction or block hex returned in non-verbose mode, non-segwit(0) or segwit(1) (default: %d)</translation> - </message> - <message> - <source>Support filtering of blocks and transaction with bloom filters (default: %u)</source> - <translation>Support filtering of blocks and transaction with bloom filters (default: %u)</translation> - </message> - <message> - <source>The fee rate (in %s/kB) that indicates your tolerance for discarding change by adding it to the fee (default: %s). Note: An output is discarded if it is dust at this rate, but we will always discard up to the dust relay fee and a discard fee above that is limited by the fee estimate for the longest target</source> - <translation>The fee rate (in %s/kB) that indicates your tolerance for discarding change by adding it to the fee (default: %s). Note: An output is discarded if it is dust at this rate, but we will always discard up to the dust relay fee and a discard fee above that is limited by the fee estimate for the longest target</translation> - </message> - <message> <source>This is the transaction fee you may pay when fee estimates are not available.</source> <translation>This is the transaction fee you may pay when fee estimates are not available.</translation> </message> @@ -3806,10 +3342,6 @@ <translation>Total length of network version string (%i) exceeds maximum length (%i). Reduce the number or size of uacomments.</translation> </message> <message> - <source>Tries to keep outbound traffic under the given target (in MiB per 24h), 0 = no limit (default: %d)</source> - <translation>Tries to keep outbound traffic under the given target (in MiB per 24h), 0 = no limit (default: %d)</translation> - </message> - <message> <source>Unsupported argument -socks found. Setting SOCKS version isn't possible anymore, only SOCKS5 proxies are supported.</source> <translation>Unsupported argument -socks found. Setting SOCKS version isn't possible anymore, only SOCKS5 proxies are supported.</translation> </message> @@ -3818,10 +3350,6 @@ <translation>Unsupported argument -whitelistalwaysrelay ignored, use -whitelistrelay and/or -whitelistforcerelay.</translation> </message> <message> - <source>Use separate SOCKS5 proxy to reach peers via Tor hidden services (default: %s)</source> - <translation>Use separate SOCKS5 proxy to reach peers via Tor hidden services (default: %s)</translation> - </message> - <message> <source>Warning: Unknown block versions being mined! It's possible unknown rules are in effect</source> <translation>Warning: Unknown block versions being mined! It's possible unknown rules are in effect</translation> </message> @@ -3830,110 +3358,18 @@ <translation>Warning: Wallet file corrupt, data salvaged! Original %s saved as %s in %s; if your balance or transactions are incorrect you should restore from a backup.</translation> </message> <message> - <source>Whitelist peers connecting from the given IP address (e.g. 1.2.3.4) or CIDR notated network (e.g. 1.2.3.0/24). Can be specified multiple times.</source> - <translation>Whitelist peers connecting from the given IP address (e.g. 1.2.3.4) or CIDR notated network (e.g. 1.2.3.0/24). Can be specified multiple times.</translation> - </message> - <message> <source>%s is set very high!</source> <translation>%s is set very high!</translation> </message> <message> - <source>(default: %s)</source> - <translation>(default: %s)</translation> - </message> - <message> - <source>Always query for peer addresses via DNS lookup (default: %u)</source> - <translation>Always query for peer addresses via DNS lookup (default: %u)</translation> - </message> - <message> - <source>Error loading wallet %s. -wallet filename must be a regular file.</source> - <translation>Error loading wallet %s. -wallet filename must be a regular file.</translation> - </message> - <message> <source>Error loading wallet %s. Duplicate -wallet filename specified.</source> <translation>Error loading wallet %s. Duplicate -wallet filename specified.</translation> </message> <message> - <source>Error loading wallet %s. Invalid characters in -wallet filename.</source> - <translation>Error loading wallet %s. Invalid characters in -wallet filename.</translation> - </message> - <message> - <source>How many blocks to check at startup (default: %u, 0 = all)</source> - <translation>How many blocks to check at startup (default: %u, 0 = all)</translation> - </message> - <message> - <source>Include IP addresses in debug output (default: %u)</source> - <translation>Include IP addresses in debug output (default: %u)</translation> - </message> - <message> <source>Keypool ran out, please call keypoolrefill first</source> <translation>Keypool ran out, please call keypoolrefill first</translation> </message> <message> - <source>Listen for JSON-RPC connections on <port> (default: %u or testnet: %u)</source> - <translation>Listen for JSON-RPC connections on <port> (default: %u or testnet: %u)</translation> - </message> - <message> - <source>Listen for connections on <port> (default: %u or testnet: %u)</source> - <translation>Listen for connections on <port> (default: %u or testnet: %u)</translation> - </message> - <message> - <source>Maintain at most <n> connections to peers (default: %u)</source> - <translation>Maintain at most <n> connections to peers (default: %u)</translation> - </message> - <message> - <source>Make the wallet broadcast transactions</source> - <translation>Make the wallet broadcast transactions</translation> - </message> - <message> - <source>Maximum per-connection receive buffer, <n>*1000 bytes (default: %u)</source> - <translation>Maximum per-connection receive buffer, <n>*1000 bytes (default: %u)</translation> - </message> - <message> - <source>Maximum per-connection send buffer, <n>*1000 bytes (default: %u)</source> - <translation>Maximum per-connection send buffer, <n>*1000 bytes (default: %u)</translation> - </message> - <message> - <source>Prepend debug output with timestamp (default: %u)</source> - <translation>Prepend debug output with timestamp (default: %u)</translation> - </message> - <message> - <source>Relay and mine data carrier transactions (default: %u)</source> - <translation>Relay and mine data carrier transactions (default: %u)</translation> - </message> - <message> - <source>Relay non-P2SH multisig (default: %u)</source> - <translation>Relay non-P2SH multisig (default: %u)</translation> - </message> - <message> - <source>Set key pool size to <n> (default: %u)</source> - <translation>Set key pool size to <n> (default: %u)</translation> - </message> - <message> - <source>Set maximum BIP141 block weight (default: %d)</source> - <translation>Set maximum BIP141 block weight (default: %d)</translation> - </message> - <message> - <source>Set the number of threads to service RPC calls (default: %d)</source> - <translation>Set the number of threads to service RPC calls (default: %d)</translation> - </message> - <message> - <source>Specify configuration file (default: %s)</source> - <translation>Specify configuration file (default: %s)</translation> - </message> - <message> - <source>Specify connection timeout in milliseconds (minimum: 1, default: %d)</source> - <translation>Specify connection timeout in milliseconds (minimum: 1, default: %d)</translation> - </message> - <message> - <source>Specify pid file (default: %s)</source> - <translation>Specify pid file (default: %s)</translation> - </message> - <message> - <source>Spend unconfirmed change when sending transactions (default: %u)</source> - <translation>Spend unconfirmed change khi đang gửi transactions (default: %u)</translation> - </message> - <message> <source>Starting network threads...</source> <translation>Starting network threads...</translation> </message> @@ -3950,10 +3386,6 @@ <translation>Đây là transaction fee bạn sẽ pay nếu gửi transaction.</translation> </message> <message> - <source>Threshold for disconnecting misbehaving peers (default: %u)</source> - <translation>Ngường ngắt kết nối không hoạt động peers (default: %u)</translation> - </message> - <message> <source>Transaction amounts must not be negative</source> <translation>Transaction amounts phải không âm</translation> </message> diff --git a/src/qt/locale/bitcoin_vi_VN.ts b/src/qt/locale/bitcoin_vi_VN.ts index 50aa1889eb..c9f9ca2add 100644 --- a/src/qt/locale/bitcoin_vi_VN.ts +++ b/src/qt/locale/bitcoin_vi_VN.ts @@ -11,7 +11,7 @@ </message> <message> <source>&New</source> - <translation>&Mới</translation> + <translation>&Tạo mới</translation> </message> <message> <source>Copy the currently selected address to the system clipboard</source> @@ -62,6 +62,14 @@ <translation>Địa chỉ nhận</translation> </message> <message> + <source>These are your Bitcoin addresses for sending payments. Always check the amount and the receiving address before sending coins.</source> + <translation>Đây là các địa chỉ Bitcoin để gửi bạn gửi tiền. Trước khi gửi bạn nên kiểm tra lại số tiền bạn muốn gửi và địa chỉ bitcoin của người nhận.</translation> + </message> + <message> + <source>These are your Bitcoin addresses for receiving payments. It is recommended to use a new receiving address for each transaction.</source> + <translation>Đây là các địa chỉ Bitcoin để bạn nhận tiền. Với mỗi giao dịch, bạn nên dùng một địa chỉ Bitcoin mới để nhận tiền.</translation> + </message> + <message> <source>&Copy Address</source> <translation>&Chép Địa chỉ</translation> </message> @@ -120,6 +128,14 @@ <translation>Điền lại passphrase</translation> </message> <message> + <source>Show password</source> + <translation>Hiện mật khẩu</translation> + </message> + <message> + <source>Enter the new passphrase to the wallet.<br/>Please use a passphrase of <b>ten or more random characters</b>, or <b>eight or more words</b>.</source> + <translation>Nhập passphrase mới cho Ví của bạn.<br/>Vui long dùng passphrase gồm<b>ít nhất 10 ký tự bất kỳ </b>, hoặc <b>ít nhất 8 chữ</b>.</translation> + </message> + <message> <source>Encrypt wallet</source> <translation>Mã hóa ví</translation> </message> @@ -608,23 +624,7 @@ Ví của bạn chưa được mã hóa.</translation> <source>Command-line options</source> <translation>&Tùy chọn dòng lệnh</translation> </message> - <message> - <source>Usage:</source> - <translation>Mức sử dụng</translation> - </message> - <message> - <source>command-line options</source> - <translation>tùy chọn dòng lệnh</translation> - </message> - <message> - <source>Set language, for example "de_DE" (default: system locale)</source> - <translation>Chọn ngôn ngữ, ví dụ "de_DE" (mặc định: Vị trí hệ thống)</translation> - </message> - <message> - <source>Set SSL root certificates for payment request (default: -system-)</source> - <translation>Đặt chứng nhận SSL gốc cho yêu cầu giao dịch (mặc định: -hệ thống-)</translation> - </message> - </context> +</context> <context> <name>Intro</name> <message> @@ -964,6 +964,10 @@ Ví của bạn chưa được mã hóa.</translation> <translation>Tin nhắn</translation> </message> <message> + <source>Wallet</source> + <translation>Ví</translation> + </message> + <message> <source>Error encoding URI into QR Code.</source> <translation>Lỗi khi encode từ URI thành QR Code</translation> </message> @@ -1086,10 +1090,6 @@ Ví của bạn chưa được mã hóa.</translation> <translation>%1 đến %2</translation> </message> <message> - <source>Total Amount %1</source> - <translation>Tổng cộng %1</translation> - </message> - <message> <source>or</source> <translation>hoặc</translation> </message> @@ -1203,18 +1203,10 @@ Ví của bạn chưa được mã hóa.</translation> <context> <name>bitcoin-core</name> <message> - <source>Options:</source> - <translation>Lựa chọn:</translation> - </message> - <message> <source>Bitcoin Core</source> <translation>Bitcoin Core</translation> </message> <message> - <source>(default: %u)</source> - <translation>(mặc định: %u)</translation> - </message> - <message> <source>Information</source> <translation>Thông tin</translation> </message> @@ -1227,10 +1219,6 @@ Ví của bạn chưa được mã hóa.</translation> <translation>Chú ý</translation> </message> <message> - <source>(default: %s)</source> - <translation>(mặc định: %s)</translation> - </message> - <message> <source>Insufficient funds</source> <translation>Không đủ tiền</translation> </message> diff --git a/src/qt/locale/bitcoin_zh.ts b/src/qt/locale/bitcoin_zh.ts index f1d9be62a2..7edb8e038d 100644 --- a/src/qt/locale/bitcoin_zh.ts +++ b/src/qt/locale/bitcoin_zh.ts @@ -1,6 +1,30 @@ <TS language="zh" version="2.1"> <context> <name>AddressBookPage</name> + <message> + <source>Right-click to edit address or label</source> + <translation>右键单击来编辑地址或者标签</translation> + </message> + <message> + <source>Create a new address</source> + <translation>创建一个新地址</translation> + </message> + <message> + <source>Copy the currently selected address to the system clipboard</source> + <translation>复制当前已选地址到系统剪切板</translation> + </message> + <message> + <source>Delete the currently selected address from the list</source> + <translation>从列表中删除当前已选地址</translation> + </message> + <message> + <source>Export the data in the current tab to a file</source> + <translation>将当前选项卡中的数据导出到文件</translation> + </message> + <message> + <source>Choose the address to send coins to</source> + <translation>选择想要发送币的地址</translation> + </message> </context> <context> <name>AddressTableModel</name> @@ -168,6 +192,10 @@ </context> <context> <name>WalletView</name> + <message> + <source>Export the data in the current tab to a file</source> + <translation>将当前选项卡中的数据导出到文件</translation> + </message> </context> <context> <name>bitcoin-core</name> diff --git a/src/qt/locale/bitcoin_zh_CN.ts b/src/qt/locale/bitcoin_zh_CN.ts index 9c19fac0c8..6678641ad3 100644 --- a/src/qt/locale/bitcoin_zh_CN.ts +++ b/src/qt/locale/bitcoin_zh_CN.ts @@ -30,6 +30,10 @@ <translation>从列表中删除选中的地址</translation> </message> <message> + <source>Enter address or label to search</source> + <translation>输入地址或标签来搜索</translation> + </message> + <message> <source>Export the data in the current tab to a file</source> <translation>将当前标签页数据导出到文件</translation> </message> @@ -132,6 +136,10 @@ <translation>重复新密码</translation> </message> <message> + <source>Show password</source> + <translation>显示密码</translation> + </message> + <message> <source>Enter the new passphrase to the wallet.<br/>Please use a passphrase of <b>ten or more random characters</b>, or <b>eight or more words</b>.</source> <translation>输入钱包的新密码。<br/>密码请用<b>10 个以上的随机字符</b>，或是<b>8 个以上的字词</b>。</translation> </message> @@ -718,10 +726,6 @@ <translation>地址(&A)</translation> </message> <message> - <source>New receiving address</source> - <translation>新建收款地址</translation> - </message> - <message> <source>New sending address</source> <translation>新建付款地址</translation> </message> @@ -738,10 +742,6 @@ <translation>输入的地址 %1 并不是有效的比特币地址。</translation> </message> <message> - <source>The entered address "%1" is already in the address book.</source> - <translation>输入的地址 %1 已经存在地址簿。</translation> - </message> - <message> <source>Could not unlock wallet.</source> <translation>无法将钱包解锁。</translation> </message> @@ -791,42 +791,6 @@ <source>Command-line options</source> <translation>命令行选项</translation> </message> - <message> - <source>Usage:</source> - <translation>使用：</translation> - </message> - <message> - <source>command-line options</source> - <translation>命令行选项</translation> - </message> - <message> - <source>UI Options:</source> - <translation>界面选项：</translation> - </message> - <message> - <source>Choose data directory on startup (default: %u)</source> - <translation>在启动时选择目录（默认%u）</translation> - </message> - <message> - <source>Set language, for example "de_DE" (default: system locale)</source> - <translation>设置语言, 例如“zh-CN”（默认：系统语言）</translation> - </message> - <message> - <source>Start minimized</source> - <translation>启动时最小化</translation> - </message> - <message> - <source>Set SSL root certificates for payment request (default: -system-)</source> - <translation>设置付款请求的SSL根证书（默认：-系统-）</translation> - </message> - <message> - <source>Show splash screen on startup (default: %u)</source> - <translation>显示启动画面（默认：%u）</translation> - </message> - <message> - <source>Reset all settings changed in the GUI</source> - <translation>重置图形界面所有的变更设置</translation> - </message> </context> <context> <name>Intro</name> @@ -1000,6 +964,18 @@ <translation>显示默认的SOCKS5代理是否被用于在该类型的网络下连接同伴</translation> </message> <message> + <source>Use separate SOCKS&5 proxy to reach peers via Tor hidden services:</source> + <translation>通过Tor隐藏服务连接节点时使用不同的SOCKS&5代理：</translation> + </message> + <message> + <source>Hide the icon from the system tray.</source> + <translation>隐藏系统通知区图标</translation> + </message> + <message> + <source>&Hide tray icon</source> + <translation>隐藏通知区图标(&H)</translation> + </message> + <message> <source>Minimize instead of exit the application when the window is closed. When this option is enabled, the application will be closed only after selecting Exit in the menu.</source> <translation>窗口被关闭时最小化而不是退出应用程序。当此选项启用时，应用程序只会在菜单中选择退出时退出。</translation> </message> @@ -1064,6 +1040,14 @@ <translation>使用 &UPnP 映射端口</translation> </message> <message> + <source>Accept connections from outside.</source> + <translation>接收外部连接。</translation> + </message> + <message> + <source>Allow incomin&g connections</source> + <translation>允许流入连接(&G)</translation> + </message> + <message> <source>Connect to the Bitcoin network through a SOCKS5 proxy.</source> <translation>通过 SOCKS5 代理连接比特币网络。</translation> </message> @@ -1144,6 +1128,10 @@ <translation>是否需要交易源地址控制功能。</translation> </message> <message> + <source>&Third party transaction URLs</source> + <translation>第三方交易网址(&T)</translation> + </message> + <message> <source>&OK</source> <translation>确定(&O)</translation> </message> @@ -1460,10 +1448,6 @@ <translation>错误：指定的数据目录“%1”不存在。</translation> </message> <message> - <source>Error: Cannot parse configuration file: %1. Only use key=value syntax.</source> - <translation>错误：无法解析配置文件：%1。只接受 key=value语法。</translation> - </message> - <message> <source>Error: %1</source> <translation>错误：%1</translation> </message> @@ -1726,6 +1710,14 @@ <translation>使用上下方向键浏览历史, 以及 %1 清除屏幕。</translation> </message> <message> + <source>Type %1 for an overview of available commands.</source> + <translation>输入%1命令显示可用命令信息。</translation> + </message> + <message> + <source>For more information on using this console type %1.</source> + <translation>输入%1来取得使用这个控制台的更多信息。</translation> + </message> + <message> <source>WARNING: Scammers have been active, telling users to type commands here, stealing their wallet contents. Do not use this console without fully understanding the ramifications of a command.</source> <translation>警告： 已有骗子通过要求用户在此输入指令以盗取钱包。不要在没有完全理解命令规范时使用控制台。</translation> </message> @@ -1805,6 +1797,10 @@ <translation>清除</translation> </message> <message> + <source>Generate native segwit (Bech32) address</source> + <translation>生成本地分离见证 (Bech32)地址</translation> + </message> + <message> <source>Requested payments history</source> <translation>请求付款的历史</translation> </message> @@ -1892,6 +1888,10 @@ <translation>消息</translation> </message> <message> + <source>Wallet</source> + <translation>钱包</translation> + </message> + <message> <source>Resulting URI too long, try to reduce the text for label / message.</source> <translation>URI 太长，请试着精简标签或消息文本。</translation> </message> @@ -2010,10 +2010,6 @@ <translation>每kb</translation> </message> <message> - <source>If the custom fee is set to 1000 satoshis and the transaction is only 250 bytes, then "per kilobyte" only pays 250 satoshis in fee, while "total at least" pays 1000 satoshis. For transactions bigger than a kilobyte both pay by kilobyte.</source> - <translation>如果自定义交易费设置为 1000聪而交易大小只有250字节，则“每千字节" 模式只支付250聪交易费， 而"最少"模式则支付1000聪。 大于1000字节的交易按每千字节付费。</translation> - </message> - <message> <source>Hide</source> <translation>隐藏</translation> </message> @@ -2058,6 +2054,14 @@ <translation>确认时间目标：</translation> </message> <message> + <source>Enable Replace-By-Fee</source> + <translation>启用手续费追加</translation> + </message> + <message> + <source>With Replace-By-Fee (BIP-125) you can increase a transaction's fee after it is sent. Without this, a higher fee may be recommended to compensate for increased transaction delay risk.</source> + <translation>手续费追加（Replace-By-Fee，BIP-125）可以让你在送出交易后才来提高手续费。不用这个功能的话，建议付比较高的手续费来降低交易延迟的风险。</translation> + </message> + <message> <source>Clear &All</source> <translation>清除所有(&A)</translation> </message> @@ -2114,16 +2118,20 @@ <translation>您确定要发出吗？</translation> </message> <message> - <source>added as transaction fee</source> - <translation>已添加交易费</translation> + <source>or</source> + <translation>或</translation> </message> <message> - <source>Total Amount %1</source> - <translation>总金额 %1</translation> + <source>You can increase the fee later (signals Replace-By-Fee, BIP-125).</source> + <translation>你可以之后再提高手续费（有BIP-125手续费追加的标记）</translation> </message> <message> - <source>or</source> - <translation>或</translation> + <source>Transaction fee</source> + <translation>交易费用</translation> + </message> + <message> + <source>Not signalling Replace-By-Fee, BIP-125.</source> + <translation>没有BIP-125手续费追加的标记。</translation> </message> <message> <source>Confirm send coins</source> @@ -2241,6 +2249,10 @@ <translation>从金额中减去交易费(&U)</translation> </message> <message> + <source>Use available balance</source> + <translation>使用全部可用余额</translation> + </message> + <message> <source>Message:</source> <translation>消息：</translation> </message> @@ -2455,10 +2467,6 @@ <translation>与一个有 %1 个确认的交易冲突</translation> </message> <message> - <source>%1/offline</source> - <translation>%1 / 离线</translation> - </message> - <message> <source>0/unconfirmed, %1</source> <translation>0/未确认，%1</translation> </message> @@ -2487,10 +2495,6 @@ <translation>状态</translation> </message> <message> - <source>, has not been successfully broadcast yet</source> - <translation>，未被成功广播</translation> - </message> - <message> <source>Date</source> <translation>日期</translation> </message> @@ -2637,10 +2641,6 @@ <translation>至 %1 个数据块时开启</translation> </message> <message> - <source>Offline</source> - <translation>离线</translation> - </message> - <message> <source>Unconfirmed</source> <translation>未确认</translation> </message> @@ -2665,10 +2665,6 @@ <translation>未成熟 (%1 个确认，将在 %2 个后可用)</translation> </message> <message> - <source>This block was not received by any other nodes and will probably not be accepted!</source> - <translation>此数据块未被任何其他节点接收，可能不被接受！</translation> - </message> - <message> <source>Generated but not accepted</source> <translation>已生成但未被接受</translation> </message> @@ -2780,6 +2776,10 @@ <translation>其它</translation> </message> <message> + <source>Enter address, transaction id, or label to search</source> + <translation>输入地址、交易识别码或标签进行搜索</translation> + </message> + <message> <source>Min amount</source> <translation>最小金额</translation> </message> @@ -2905,6 +2905,10 @@ <translation>发送</translation> </message> <message> + <source>Fee bump error</source> + <translation>手续费提升失败</translation> + </message> + <message> <source>Increasing transaction fee failed</source> <translation>增加交易费失败</translation> </message> @@ -2925,6 +2929,10 @@ <translation>新交易费:</translation> </message> <message> + <source>Confirm fee bump</source> + <translation>确认手续费提升</translation> + </message> + <message> <source>Can't sign transaction.</source> <translation>无法签署交易。</translation> </message> @@ -2967,41 +2975,14 @@ <source>The wallet data was successfully saved to %1.</source> <translation>钱包数据成功保存至 %1。</translation> </message> -</context> + </context> <context> <name>bitcoin-core</name> <message> - <source>Options:</source> - <translation>选项： -</translation> - </message> - <message> - <source>Specify data directory</source> - <translation>指定数据目录 -</translation> - </message> - <message> - <source>Connect to a node to retrieve peer addresses, and disconnect</source> - <translation>连接一个节点并获取对端地址，然后断开连接</translation> - </message> - <message> - <source>Specify your own public address</source> - <translation>指定您的公共地址</translation> - </message> - <message> - <source>Accept command line and JSON-RPC commands</source> - <translation>接受命令行和 JSON-RPC 命令 -</translation> - </message> - <message> <source>Distributed under the MIT software license, see the accompanying file %s or %s</source> <translation>在MIT协议下分发，参见附带的 %s 文件或 %s</translation> </message> <message> - <source>If <category> is not supplied or if <category> = 1, output all debugging information.</source> - <translation>如果<category>未提供或<category> = 1，输出所有调试信息。</translation> - </message> - <message> <source>Prune configured below the minimum of %d MiB. Please use a higher number.</source> <translation>修剪值被设置为低于最小值%d MiB，请使用更大的数值。</translation> </message> @@ -3018,20 +2999,10 @@ <translation>错误：发生了致命的内部错误，详情见 debug.log 文件</translation> </message> <message> - <source>Fee (in %s/kB) to add to transactions you send (default: %s)</source> - <translation>为付款交易添加交易费 (%s/kB) (默认: %s) </translation> - </message> - <message> <source>Pruning blockstore...</source> <translation>正在修剪区块存储...</translation> </message> <message> - <source>Run in the background as a daemon and accept commands</source> - <translation>在后台运行并接受命令 - -</translation> - </message> - <message> <source>Unable to start HTTP server. See debug log for details.</source> <translation>无法启动HTTP服务，查看日志获取更多信息</translation> </message> @@ -3044,42 +3015,18 @@ <translation>%s 开发人员</translation> </message> <message> - <source>A fee rate (in %s/kB) that will be used when fee estimation has insufficient data (default: %s)</source> - <translation>当费用估计数据(default: %s)不足时将会启用的费率 (in %s/kB) </translation> - </message> - <message> - <source>Accept relayed transactions received from whitelisted peers even when not relaying transactions (default: %d)</source> - <translation>即使在无关联交易(默认: %d)时也接受来自白名单同行的关联交易</translation> - </message> - <message> - <source>Bind to given address and always listen on it. Use [host]:port notation for IPv6</source> - <translation>绑定指定的IP地址开始监听。IPv6地址请使用[host]:port 格式</translation> - </message> - <message> <source>Cannot obtain a lock on data directory %s. %s is probably already running.</source> <translation>无法锁定数据目录 %s。%s 可能已经在运行。</translation> </message> <message> - <source>Delete all wallet transactions and only recover those parts of the blockchain through -rescan on startup</source> - <translation>删除钱包的所有交易记录，且只有用 -rescan参数启动客户端才能重新取回交易记录 </translation> + <source>Cannot provide specific connections and have addrman find outgoing connections at the same.</source> + <translation>无法同时指定特定连接地址以及自动寻找连接。</translation> </message> <message> <source>Error reading %s! All keys read correctly, but transaction data or address book entries might be missing or incorrect.</source> <translation>读取 %s 时发生错误！所有的密钥都可以正确读取，但是交易记录或地址簿数据可能已经丢失或出错。</translation> </message> <message> - <source>Exclude debugging information for a category. Can be used in conjunction with -debug=1 to output debug logs for all categories except one or more specified categories.</source> - <translation>排除某一类Debug信息。可以与 -debug=1 一起使用，以输出除了指定类别以外的Debug日志。</translation> - </message> - <message> - <source>Execute command when a wallet transaction changes (%s in cmd is replaced by TxID)</source> - <translation>当最佳区块变化时执行命令 (命令行中的 %s 会被替换成区块哈希值)</translation> - </message> - <message> - <source>Maximum total fees (in %s) to use in a single wallet transaction or raw transaction; setting this too low may abort large transactions (default: %s)</source> - <translation>最大的单次钱包或原始转账费用(%s)，设置太低可能导致大尺寸交易失败(默认：%s)</translation> - </message> - <message> <source>Please check that your computer's date and time are correct! If your clock is wrong, %s will not work properly.</source> <translation>请检查电脑的日期时间设置是否正确！时间错误可能会导致 %s 运行异常。</translation> </message> @@ -3088,10 +3035,6 @@ <translation>如果你认为%s对你比较有用的话，请对我们进行一些捐赠支持。请访问%s网站来获取有关这个软件的更多信息。</translation> </message> <message> - <source>Set the number of script verification threads (%u to %d, 0 = auto, <0 = leave that many cores free, default: %d)</source> - <translation>设置脚本验证的程序 (%u 到 %d, 0 = 自动, <0 = 保留自由的核心, 默认值: %d)</translation> - </message> - <message> <source>The block database contains a block which appears to be from the future. This may be due to your computer's date and time being set incorrectly. Only rebuild the block database if you are sure that your computer's date and time are correct</source> <translation>区块数据库包含未来的交易，这可能是由本机错误的日期时间引起。若确认本机日期时间正确，请重新建立区块数据库。</translation> </message> @@ -3104,8 +3047,12 @@ <translation>如果对你的交易量来说，消耗的手续费微乎其微，那么这笔手续费你或许可以忽略它。</translation> </message> <message> - <source>Use UPnP to map the listening port (default: 1 when listening and no -proxy)</source> - <translation>使用UPnP暴露本机监听端口（默认：1 当正在监听且不使用代理）</translation> + <source>Unable to replay blocks. You will need to rebuild the database using -reindex-chainstate.</source> + <translation>没办法重算区块。你需要先用-reindex-chainstate参数来重建数据库。</translation> + </message> + <message> + <source>Unable to rewind the database to a pre-fork state. You will need to redownload the blockchain</source> + <translation>没办法将数据库倒转回分叉前的状态。必须要重新下载区块链。</translation> </message> <message> <source>Warning: The network does not appear to fully agree! Some miners appear to be experiencing issues.</source> @@ -3116,10 +3063,6 @@ <translation>警告：我们的同行似乎不完全同意！您可能需要升级，或者其他节点可能需要升级。</translation> </message> <message> - <source>Whether to save the mempool on shutdown and load on restart (default: %u)</source> - <translation>是否在退出时保存内存池，并在启动时重新载入(默认值: %u)</translation> - </message> - <message> <source>%d of last 100 blocks have unexpected version</source> <translation>最后100个区块中的%d个包含未知的版本号</translation> </message> @@ -3132,42 +3075,14 @@ <translation>-maxmempool 最小为%d MB</translation> </message> <message> - <source><category> can be:</source> - <translation><category> 可能是：</translation> - </message> - <message> - <source>Accept connections from outside (default: 1 if no -proxy or -connect)</source> - <translation>接受来自外部的连接 (缺省: 如果不带 -proxy or -connect 参数设置为1)</translation> - </message> - <message> - <source>Append comment to the user agent string</source> - <translation>为用户代理字符串附加说明</translation> - </message> - <message> - <source>Attempt to recover private keys from a corrupt wallet on startup</source> - <translation>启动时尝试从已损坏的钱包文件中恢复私钥</translation> - </message> - <message> - <source>Block creation options:</source> - <translation>数据块创建选项：</translation> - </message> - <message> <source>Cannot resolve -%s address: '%s'</source> <translation>无法解析 - %s 地址： '%s'</translation> </message> <message> - <source>Chain selection options:</source> - <translation>区块链选择选项:</translation> - </message> - <message> <source>Change index out of range</source> <translation>修改索引超过范围</translation> </message> <message> - <source>Connection options:</source> - <translation>连接选项：</translation> - </message> - <message> <source>Copyright (C) %i-%i</source> <translation>版权所有 (C) %i-%i</translation> </message> @@ -3176,36 +3091,12 @@ <translation>检测发现数据块数据库损坏。请使用 -reindex参数重启客户端。</translation> </message> <message> - <source>Debugging/Testing options:</source> - <translation>调试/测试选项：</translation> - </message> - <message> - <source>Do not load the wallet and disable wallet RPC calls</source> - <translation>不要加载钱包和禁用钱包的 RPC 调用</translation> - </message> - <message> <source>Do you want to rebuild the block database now?</source> <translation>你想现在就重建块数据库吗？</translation> </message> <message> - <source>Enable publish hash block in <address></source> - <translation>允许在<address>广播哈希区块</translation> - </message> - <message> - <source>Enable publish hash transaction in <address></source> - <translation>允许在<address>广播哈希交易</translation> - </message> - <message> - <source>Enable publish raw block in <address></source> - <translation>允许在<address>广播原始区块</translation> - </message> - <message> - <source>Enable publish raw transaction in <address></source> - <translation>允许在<address>广播原始交易</translation> - </message> - <message> - <source>Enable transaction replacement in the memory pool (default: %u)</source> - <translation>保证内存池中的交易更换(默认：%u)</translation> + <source>Error creating %s: You can't create non-HD wallets with this version.</source> + <translation>生成%s发生错误：这个版本不能用来产生非HD钱包。</translation> </message> <message> <source>Error initializing block database</source> @@ -3244,6 +3135,10 @@ <translation>监听端口失败。请使用 -listen=0 参数。</translation> </message> <message> + <source>Failed to rescan the wallet during initialization</source> + <translation>初始化时重新扫描钱包失败了</translation> + </message> + <message> <source>Importing...</source> <translation>导入中...</translation> </message> @@ -3264,10 +3159,6 @@ <translation>-fallbackfee 的无效数额=<amount>: '%s'</translation> </message> <message> - <source>Keep the transaction memory pool below <n> megabytes (default: %u)</source> - <translation>保持交易内存池大小低于<n>MB（默认：%u）</translation> - </message> - <message> <source>Loading P2P addresses...</source> <translation>正在加载P2P地址...</translation> </message> @@ -3276,26 +3167,10 @@ <translation>正在加载黑名单...</translation> </message> <message> - <source>Location of the auth cookie (default: data dir)</source> - <translation>认证Cookie的位置 (默认: data目录)</translation> - </message> - <message> <source>Not enough file descriptors available.</source> <translation>没有足够的文件描述符可用。</translation> </message> <message> - <source>Only connect to nodes in network <net> (ipv4, ipv6 or onion)</source> - <translation>只连接 <net>网络中的节点 (ipv4, ipv6 或 onion) </translation> - </message> - <message> - <source>Print this help message and exit</source> - <translation>打印出这段帮助信息并退出</translation> - </message> - <message> - <source>Print version and exit</source> - <translation>打印版本信息并退出</translation> - </message> - <message> <source>Prune cannot be configured with a negative value.</source> <translation>修剪不能配置一个负数。</translation> </message> @@ -3304,26 +3179,22 @@ <translation>修剪模式与 -txindex 不兼容。</translation> </message> <message> - <source>Rebuild chain state from the currently indexed blocks</source> - <translation>从当前索引的区块中重建链状态</translation> + <source>Replaying blocks...</source> + <translation>正在对区块进行重算…</translation> </message> <message> <source>Rewinding blocks...</source> <translation>回退区块</translation> </message> <message> - <source>Set database cache size in megabytes (%d to %d, default: %d)</source> - <translation>设置以MB为单位的数据库缓存大小(%d 到 %d, 默认值: %d)</translation> - </message> - <message> - <source>Specify wallet file (within data directory)</source> - <translation>指定钱包文件（数据目录内）</translation> - </message> - <message> <source>The source code is available from %s.</source> <translation>源代码可以在 %s 获得。</translation> </message> <message> + <source>Transaction fee and change calculation failed</source> + <translation>计算交易手续费和找零失败了</translation> + </message> + <message> <source>Unable to bind to %s on this computer. %s is probably already running.</source> <translation>无法在本机绑定 %s 端口。%s 可能已经在运行。</translation> </message> @@ -3348,14 +3219,6 @@ <translation>升级UTXO数据库</translation> </message> <message> - <source>Use UPnP to map the listening port (default: %u)</source> - <translation>使用UPnp映射监听端口 (默认: %u) </translation> - </message> - <message> - <source>Use the test chain</source> - <translation>使用测试链</translation> - </message> - <message> <source>User Agent comment (%s) contains unsafe characters.</source> <translation>用户代理评论(%s)包含不安全的字符。</translation> </message> @@ -3364,84 +3227,28 @@ <translation>正在验证区块...</translation> </message> <message> - <source>Wallet debugging/testing options:</source> - <translation>钱包调试/测试选项：</translation> - </message> - <message> - <source>Wallet options:</source> - <translation>钱包选项:</translation> - </message> - <message> - <source>Allow JSON-RPC connections from specified source. Valid for <ip> are a single IP (e.g. 1.2.3.4), a network/netmask (e.g. 1.2.3.4/255.255.255.0) or a network/CIDR (e.g. 1.2.3.4/24). This option can be specified multiple times</source> - <translation>允许来自指定地址的 JSON-RPC 连接。 <ip>为单一IP (如: 1.2.3.4), 网络/掩码 (如: 1.2.3.4/255.255.255.0), 网络/CIDR (如: 1.2.3.4/24)。该选项可多次指定。</translation> - </message> - <message> - <source>Bind to given address and whitelist peers connecting to it. Use [host]:port notation for IPv6</source> - <translation>绑定到指定地址和连接的白名单节点。 IPv6使用 [主机]:端口 格式 </translation> - </message> - <message> - <source>Create new files with system default permissions, instead of umask 077 (only effective with disabled wallet functionality)</source> - <translation>创建系统默认权限的文件，而不是 umask 077 (只在关闭钱包功能时有效) </translation> - </message> - <message> - <source>Discover own IP addresses (default: 1 when listening and no -externalip or -proxy)</source> - <translation>发现自己的 IP 地址（默认: 监听并且无 -externalip 或 -proxy 时为 1）</translation> + <source>Wallet needed to be rewritten: restart %s to complete</source> + <translation>钱包需要被重写：请重新启动%s来完成</translation> </message> <message> <source>Error: Listening for incoming connections failed (listen returned error %s)</source> <translation>错误：监听外部连接失败 (监听返回错误 %s) </translation> </message> <message> - <source>Execute command when a relevant alert is received or we see a really long fork (%s in cmd is replaced by message)</source> - <translation>当收到相关提醒或者我们看到一个长分叉时执行命令（%s 将替换为消息）</translation> - </message> - <message> - <source>Fees (in %s/kB) smaller than this are considered zero fee for relaying, mining and transaction creation (default: %s)</source> - <translation>交易费(in %s/kB)比这更小的在关联、挖掘和生成交易时将被视为零费交易 (默认: %s)</translation> - </message> - <message> - <source>If paytxfee is not set, include enough fee so transactions begin confirmation on average within n blocks (default: %u)</source> - <translation>如果未设置交易费用，自动添加足够的交易费以确保交易在平均n个数据块内被确认 (默认: %u) </translation> - </message> - <message> <source>Invalid amount for -maxtxfee=<amount>: '%s' (must be at least the minrelay fee of %s to prevent stuck transactions)</source> <translation>-maxtxfee=<amount>: '%s' 的金额无效（交易费至少为 %s，以免交易滞留过久）</translation> </message> <message> - <source>Maximum size of data in data carrier transactions we relay and mine (default: %u)</source> - <translation>Maximum size of data in data carrier transactions we relay and mine (default: %u)</translation> - </message> - <message> - <source>Randomize credentials for every proxy connection. This enables Tor stream isolation (default: %u)</source> - <translation>为每个代理连接随机化凭据。这将启用 Tor 流隔离 (默认: %u)</translation> - </message> - <message> <source>The transaction amount is too small to send after the fee has been deducted</source> <translation>在交易费被扣除后发送的交易金额太小</translation> </message> <message> - <source>Whitelisted peers cannot be DoS banned and their transactions are always relayed, even if they are already in the mempool, useful e.g. for a gateway</source> - <translation>白名单节点不能被DoS banned ，且转发所有来自他们的交易(即便这些交易已经存在于mempool中)，常用于网关 </translation> - </message> - <message> <source>You need to rebuild the database using -reindex to go back to unpruned mode. This will redownload the entire blockchain</source> <translation>您需要使用 -reindex 重新构建数据库以返回未修剪的模式。这将重新下载整个区块链</translation> </message> <message> - <source>(default: %u)</source> - <translation>(默认: %u)</translation> - </message> - <message> - <source>Accept public REST requests (default: %u)</source> - <translation>接受公共 REST 请求 (默认: %u)</translation> - </message> - <message> - <source>Automatically create Tor hidden service (default: %d)</source> - <translation>自动建立Tor隐藏服务 (默认:%d)</translation> - </message> - <message> - <source>Connect through SOCKS5 proxy</source> - <translation>通过 SOCKS5 代理连接</translation> + <source>Error loading %s: You can't disable HD on an already existing HD wallet</source> + <translation>加载%s发生错误：不能对已存在的HD钱包停用HD功能。</translation> </message> <message> <source>Error reading from database, shutting down.</source> @@ -3452,10 +3259,6 @@ <translation>升级链状态数据库出错</translation> </message> <message> - <source>Imports blocks from external blk000??.dat file on startup</source> - <translation>启动时从其他来源的 blk000??.dat 文件导入区块</translation> - </message> - <message> <source>Information</source> <translation>信息</translation> </message> @@ -3476,44 +3279,28 @@ <translation>-whitelist: '%s' 指定的网络掩码无效</translation> </message> <message> - <source>Keep at most <n> unconnectable transactions in memory (default: %u)</source> - <translation>内存中最多保留 <n> 笔孤立的交易 (默认: %u) </translation> - </message> - <message> <source>Need to specify a port with -whitebind: '%s'</source> <translation>-whitebind: '%s' 需要指定一个端口</translation> </message> <message> - <source>Node relay options:</source> - <translation>节点中继选项:</translation> - </message> - <message> - <source>RPC server options:</source> - <translation>RPC 服务器选项：</translation> - </message> - <message> <source>Reducing -maxconnections from %d to %d, because of system limitations.</source> <translation>因为系统的限制，将 -maxconnections 参数从 %d 降到了 %d</translation> </message> <message> - <source>Rescan the block chain for missing wallet transactions on startup</source> - <translation>重新扫描区块链以查找遗漏的钱包交易</translation> - </message> - <message> - <source>Send trace/debug info to console instead of debug.log file</source> - <translation>跟踪/调试信息输出到控制台，不输出到 debug.log 文件</translation> + <source>Signing transaction failed</source> + <translation>签署交易失败</translation> </message> <message> - <source>Show all debugging options (usage: --help -help-debug)</source> - <translation>显示所有调试选项 (用法: --帮助 -帮助调试)</translation> + <source>Specified -walletdir "%s" does not exist</source> + <translation>以-walletdir指定的路径“%s”不存在</translation> </message> <message> - <source>Shrink debug.log file on client startup (default: 1 when no -debug)</source> - <translation>客户端启动时压缩debug.log文件(缺省：no-debug模式时为1)</translation> + <source>Specified -walletdir "%s" is a relative path</source> + <translation>以-walletdir指定的路径“%s”是相对路径</translation> </message> <message> - <source>Signing transaction failed</source> - <translation>签署交易失败</translation> + <source>Specified -walletdir "%s" is not a directory</source> + <translation>以-walletdir指定的路径“%s”不是个目录</translation> </message> <message> <source>The transaction amount is too small to pay the fee</source> @@ -3524,14 +3311,6 @@ <translation>这是实验性的软件。</translation> </message> <message> - <source>Tor control port password (default: empty)</source> - <translation>Tor 控制端口密码 (默认值: 空白)</translation> - </message> - <message> - <source>Tor control port to use if onion listening enabled (default: %s)</source> - <translation>开启监听 onion 连接时的 Tor 控制端口号 (默认值: %s)</translation> - </message> - <message> <source>Transaction amount too small</source> <translation>交易量太小</translation> </message> @@ -3548,18 +3327,18 @@ <translation>无法在此计算机上绑定 %s (绑定返回错误 %s)</translation> </message> <message> - <source>Upgrade wallet to latest format on startup</source> - <translation>程序启动时升级钱包到最新格式</translation> - </message> - <message> - <source>Username for JSON-RPC connections</source> - <translation>JSON-RPC 连接用户名</translation> + <source>Unable to generate initial keys</source> + <translation>无法产生初始的密钥</translation> </message> <message> <source>Verifying wallet(s)...</source> <translation>正在检测钱包的完整性...</translation> </message> <message> + <source>Wallet %s resides outside wallet directory %s</source> + <translation>钱包文件%s没有在钱包目录%s里面</translation> + </message> + <message> <source>Warning</source> <translation>警告</translation> </message> @@ -3568,85 +3347,28 @@ <translation>警告: 不明的交易规则被启用了(versionbit %i)</translation> </message> <message> - <source>Whether to operate in a blocks only mode (default: %u)</source> - <translation>是否用块方进行 (%u)</translation> - </message> - <message> - <source>You need to rebuild the database using -reindex to change -txindex</source> - <translation>您需要用 -reindex 重建数据库，从而令 -txindex 的变动生效</translation> - </message> - <message> <source>Zapping all transactions from wallet...</source> <translation>正在消除錢包中的所有交易...</translation> </message> <message> - <source>ZeroMQ notification options:</source> - <translation>ZeroMQ 通知选项：</translation> - </message> - <message> - <source>Password for JSON-RPC connections</source> - <translation>JSON-RPC 连接密码 -</translation> - </message> - <message> - <source>Execute command when the best block changes (%s in cmd is replaced by block hash)</source> - <translation>当最佳数据块变化时执行命令 (命令行中的 %s 会被替换成数据块哈希值)</translation> - </message> - <message> - <source>Allow DNS lookups for -addnode, -seednode and -connect</source> - <translation>使用 -addnode, -seednode 和 -connect 选项时允许查询DNS</translation> - </message> - <message> - <source>(1 = keep tx meta data e.g. account owner and payment request information, 2 = drop tx meta data)</source> - <translation>(1 = 保留 tx meta data , 如 account owner 和 payment request information, 2 = 不保留 tx meta data) </translation> - </message> - <message> <source>-maxtxfee is set very high! Fees this large could be paid on a single transaction.</source> <translation>参数 -maxtxfee 设定了很高的金额！这是你一次交易就有可能付出的最高手续费。</translation> </message> <message> - <source>Do not keep transactions in the mempool longer than <n> hours (default: %u)</source> - <translation>不要让交易留在内存池中超过 <n> 个小时 (默认值: %u)</translation> - </message> - <message> - <source>Error loading wallet %s. -wallet parameter must only specify a filename (not a path).</source> - <translation>加载钱包出错 %s. -wallet参数必需指定为文件名(而不是目录路径)。</translation> - </message> - <message> - <source>Fees (in %s/kB) smaller than this are considered zero fee for transaction creation (default: %s)</source> - <translation>当产生交易时，如果每千字节 (kB) 的手续费比这个值 (单位是 %s) 低，就视为没支付手续费 (默认值: %s)</translation> - </message> - <message> - <source>How thorough the block verification of -checkblocks is (0-4, default: %u)</source> - <translation>数据块验证 严密级别 -checkblocks (0-4, 默认: %u) </translation> - </message> - <message> - <source>Maintain a full transaction index, used by the getrawtransaction rpc call (default: %u)</source> - <translation>维护一份完整的交易索引, 用于 getrawtransaction RPC调用 (默认: %u)</translation> - </message> - <message> - <source>Number of seconds to keep misbehaving peers from reconnecting (default: %u)</source> - <translation>限制 非礼节点 若干秒内不能连接 (默认: %u) </translation> - </message> - <message> - <source>Output debugging information (default: %u, supplying <category> is optional)</source> - <translation>输出调试信息 (默认: %u, 提供 <category> 是可选项)</translation> - </message> - <message> - <source>Support filtering of blocks and transaction with bloom filters (default: %u)</source> - <translation>支持用 Bloom 过滤器来过滤区块和交易(默认值: %u)</translation> + <source>Error loading %s: You can't enable HD on an already existing non-HD wallet</source> + <translation>加载%s发生错误：不能对已存在的非HD钱包启用HD功能</translation> </message> <message> <source>This is the transaction fee you may pay when fee estimates are not available.</source> <translation>这是在费用估计不可用时你可能会支付的交易费。</translation> </message> <message> - <source>Total length of network version string (%i) exceeds maximum length (%i). Reduce the number or size of uacomments.</source> - <translation>网络版本字符串的总长度 (%i) 超过最大长度 (%i) 了。请减少 uacomment 参数的数目或长度。</translation> + <source>This product includes software developed by the OpenSSL Project for use in the OpenSSL Toolkit %s and cryptographic software written by Eric Young and UPnP software written by Thomas Bernard.</source> + <translation>此产品包含了由OpenSSL Project所开发的OpenSSL Toolkit软件%s，由Eric Young撰写的加解密软件，以及由Thomas Bernard所撰写的UPnP软件。</translation> </message> <message> - <source>Tries to keep outbound traffic under the given target (in MiB per 24h), 0 = no limit (default: %d)</source> - <translation>尝试保持上传带宽低于（MiB/24h），0=无限制（默认：%d）</translation> + <source>Total length of network version string (%i) exceeds maximum length (%i). Reduce the number or size of uacomments.</source> + <translation>网络版本字符串的总长度 (%i) 超过最大长度 (%i) 了。请减少 uacomment 参数的数目或长度。</translation> </message> <message> <source>Unsupported argument -socks found. Setting SOCKS version isn't possible anymore, only SOCKS5 proxies are supported.</source> @@ -3657,108 +3379,24 @@ <translation>一个不被支持的参数 -whitelistalwaysrelay 被忽略了。请使用 -whitelistrelay 或者 -whitelistforcerelay.</translation> </message> <message> - <source>Use separate SOCKS5 proxy to reach peers via Tor hidden services (default: %s)</source> - <translation>通过 Tor 隐藏服务连接节点时使用不同的 SOCKS5 代理 (默认: %s)</translation> - </message> - <message> <source>Warning: Unknown block versions being mined! It's possible unknown rules are in effect</source> <translation>警告: 未知的区块版本被挖掘！未知规则可能已生效</translation> </message> <message> - <source>%s is set very high!</source> - <translation>%s非常高！</translation> + <source>Warning: Wallet file corrupt, data salvaged! Original %s saved as %s in %s; if your balance or transactions are incorrect you should restore from a backup.</source> + <translation>警告：钱包文件损坏，但数据被救回！原始的钱包文件%s已经重命名为%s并存储到%s目录下 。如果您的账户余额或者交易记录不正确，请使用您的钱包备份文件恢复。</translation> </message> <message> - <source>(default: %s)</source> - <translation>(默认: %s) </translation> - </message> - <message> - <source>Always query for peer addresses via DNS lookup (default: %u)</source> - <translation>始终通过 DNS 查询节点地址 (默认: %u)</translation> - </message> - <message> - <source>Error loading wallet %s. -wallet filename must be a regular file.</source> - <translation>加载钱包 %s 出错。 -wallet 必须是正规文件名。</translation> + <source>%s is set very high!</source> + <translation>%s非常高！</translation> </message> <message> <source>Error loading wallet %s. Duplicate -wallet filename specified.</source> <translation>加载钱包 %s 出错。 重复的 -wallet 文件名。</translation> </message> <message> - <source>Error loading wallet %s. Invalid characters in -wallet filename.</source> - <translation>加载钱包 %s 出错。 -wallet 文件名中包含无效字符。</translation> - </message> - <message> - <source>How many blocks to check at startup (default: %u, 0 = all)</source> - <translation>启动时检测多少个数据块(默认: %u, 0=所有)</translation> - </message> - <message> - <source>Include IP addresses in debug output (default: %u)</source> - <translation>在调试输出中包含IP地址 (默认: %u)</translation> - </message> - <message> - <source>Listen for JSON-RPC connections on <port> (default: %u or testnet: %u)</source> - <translation>使用 <port>端口监听 JSON-RPC 连接 (默认: %u ; testnet: %u) </translation> - </message> - <message> - <source>Listen for connections on <port> (default: %u or testnet: %u)</source> - <translation>使用端口 <port> 监听连接 (默认: %u ; testnet: %u) </translation> - </message> - <message> - <source>Maintain at most <n> connections to peers (default: %u)</source> - <translation>保留最多 <n> 条节点连接 (默认: %u) </translation> - </message> - <message> - <source>Make the wallet broadcast transactions</source> - <translation>钱包广播事务处理</translation> - </message> - <message> - <source>Maximum per-connection receive buffer, <n>*1000 bytes (default: %u)</source> - <translation>每个连接的最大接收缓存，<n>*1000 字节 (默认: %u)</translation> - </message> - <message> - <source>Maximum per-connection send buffer, <n>*1000 bytes (default: %u)</source> - <translation>每个连接的最大发送缓存，<n>*1000 字节 (默认: %u)</translation> - </message> - <message> - <source>Prepend debug output with timestamp (default: %u)</source> - <translation>输出调试信息时，前面加上时间戳 (默认: %u)</translation> - </message> - <message> - <source>Relay and mine data carrier transactions (default: %u)</source> - <translation>Relay and mine data carrier transactions (default: %u)</translation> - </message> - <message> - <source>Relay non-P2SH multisig (default: %u)</source> - <translation>是否转发 非P2SH格式的多签名交易 (默认: %u) </translation> - </message> - <message> - <source>Set key pool size to <n> (default: %u)</source> - <translation>设置私钥池大小为 <n> (默认：%u) </translation> - </message> - <message> - <source>Set maximum BIP141 block weight (default: %d)</source> - <translation>设置BIP141最大区块权重 (默认: %d)</translation> - </message> - <message> - <source>Set the number of threads to service RPC calls (default: %d)</source> - <translation>设置RPC服务线程数 (默认: %d) </translation> - </message> - <message> - <source>Specify configuration file (default: %s)</source> - <translation>指定配置文件 (默认: %s) </translation> - </message> - <message> - <source>Specify connection timeout in milliseconds (minimum: 1, default: %d)</source> - <translation>指定连接超时毫秒数 (最小: 1, 默认: %d) </translation> - </message> - <message> - <source>Specify pid file (default: %s)</source> - <translation>指定 pid 文件 (默认: %s) </translation> - </message> - <message> - <source>Spend unconfirmed change when sending transactions (default: %u)</source> - <translation>付款时允许使用未确认的零钱 (默认: %u) </translation> + <source>Keypool ran out, please call keypoolrefill first</source> + <translation>密钥池已经耗尽，请先执行keypoolrefill</translation> </message> <message> <source>Starting network threads...</source> @@ -3769,18 +3407,22 @@ <translation>钱包避免低于最小交易费的支付</translation> </message> <message> - <source>This is the transaction fee you will pay if you send a transaction.</source> - <translation>如果发送交易，这将是你要支付的交易费。</translation> + <source>This is the minimum transaction fee you pay on every transaction.</source> + <translation>这是你每次交易付款时最少要付的手续费。</translation> </message> <message> - <source>Threshold for disconnecting misbehaving peers (default: %u)</source> - <translation>断开 非礼节点的阀值 (默认: %u) </translation> + <source>This is the transaction fee you will pay if you send a transaction.</source> + <translation>如果发送交易，这将是你要支付的交易费。</translation> </message> <message> <source>Transaction amounts must not be negative</source> <translation>交易金额不不可为负数</translation> </message> <message> + <source>Transaction has too long of a mempool chain</source> + <translation>交易造成内存池中的交易链太长</translation> + </message> + <message> <source>Transaction must have at least one recipient</source> <translation>交易必须包含至少一个接收人</translation> </message> diff --git a/src/qt/locale/bitcoin_zh_HK.ts b/src/qt/locale/bitcoin_zh_HK.ts index 7d2cc69360..df77762c6c 100644 --- a/src/qt/locale/bitcoin_zh_HK.ts +++ b/src/qt/locale/bitcoin_zh_HK.ts @@ -586,6 +586,10 @@ <source>Label</source> <translation>標記</translation> </message> + <message> + <source>Wallet</source> + <translation>錢包</translation> + </message> </context> <context> <name>RecentRequestsTableModel</name> diff --git a/src/qt/locale/bitcoin_zh_TW.ts b/src/qt/locale/bitcoin_zh_TW.ts index 63658b7d84..896dd58246 100644 --- a/src/qt/locale/bitcoin_zh_TW.ts +++ b/src/qt/locale/bitcoin_zh_TW.ts @@ -11,7 +11,7 @@ </message> <message> <source>&New</source> - <translation>新增</translation> + <translation>新增(&N)</translation> </message> <message> <source>Copy the currently selected address to the system clipboard</source> @@ -19,27 +19,31 @@ </message> <message> <source>&Copy</source> - <translation>複製</translation> + <translation>複製(&C)</translation> </message> <message> <source>C&lose</source> - <translation>關閉</translation> + <translation>關閉(&L)</translation> </message> <message> <source>Delete the currently selected address from the list</source> <translation>把目前選擇的位址從列表中刪掉</translation> </message> <message> + <source>Enter address or label to search</source> + <translation>請輸入要搜尋的位址或標記</translation> + </message> + <message> <source>Export the data in the current tab to a file</source> <translation>把目前分頁的資料匯出存成檔案</translation> </message> <message> <source>&Export</source> - <translation>匯出</translation> + <translation>匯出(&E)</translation> </message> <message> <source>&Delete</source> - <translation>刪掉</translation> + <translation>刪掉(&D)</translation> </message> <message> <source>Choose the address to send coins to</source> @@ -51,7 +55,7 @@ </message> <message> <source>C&hoose</source> - <translation>選取</translation> + <translation>選取(&H)</translation> </message> <message> <source>Sending addresses</source> @@ -71,15 +75,15 @@ </message> <message> <source>&Copy Address</source> - <translation>複製位址</translation> + <translation>複製位址(&C)</translation> </message> <message> <source>Copy &Label</source> - <translation>複製標記</translation> + <translation>複製標記(&L)</translation> </message> <message> <source>&Edit</source> - <translation>編輯</translation> + <translation>編輯(&E)</translation> </message> <message> <source>Export Address List</source> @@ -189,7 +193,7 @@ </message> <message> <source>IMPORTANT: Any previous backups you have made of your wallet file should be replaced with the newly generated, encrypted wallet file. For security reasons, previous backups of the unencrypted wallet file will become useless as soon as you start using the new, encrypted wallet.</source> - <translation>重要: 請改用新產生有加密的錢包檔，來取代舊錢包檔的備份。為了安全性的理由，當你開始使用新的有加密的錢包後，舊錢包檔的備份就不能再使用了。</translation> + <translation>重要須知: 請改用新造出來、有加密的錢包檔，來取代舊錢包檔的備份。為了安全起見，當你開始使用新的有加密的錢包後，舊錢包檔的備份就沒有用了。</translation> </message> <message> <source>Wallet encryption failed</source> @@ -239,7 +243,7 @@ <name>BitcoinGUI</name> <message> <source>Sign &message...</source> - <translation>簽署訊息...</translation> + <translation>簽署訊息(&M)...</translation> </message> <message> <source>Synchronizing with network...</source> @@ -247,7 +251,7 @@ </message> <message> <source>&Overview</source> - <translation>總覽</translation> + <translation>總覽(&O)</translation> </message> <message> <source>Node</source> @@ -259,7 +263,7 @@ </message> <message> <source>&Transactions</source> - <translation>交易</translation> + <translation>交易(&T)</translation> </message> <message> <source>Browse transaction history</source> @@ -267,7 +271,7 @@ </message> <message> <source>E&xit</source> - <translation>結束</translation> + <translation>結束(&X)</translation> </message> <message> <source>Quit application</source> @@ -275,7 +279,7 @@ </message> <message> <source>&About %1</source> - <translation>關於%1</translation> + <translation>關於%1(&A)</translation> </message> <message> <source>Show information about %1</source> @@ -291,7 +295,7 @@ </message> <message> <source>&Options...</source> - <translation>選項...</translation> + <translation>選項(&O)...</translation> </message> <message> <source>Modify configuration options for %1</source> @@ -299,27 +303,35 @@ </message> <message> <source>&Encrypt Wallet...</source> - <translation>加密錢包...</translation> + <translation>加密錢包(&E)...</translation> </message> <message> <source>&Backup Wallet...</source> - <translation>備份錢包...</translation> + <translation>備份錢包(&B)...</translation> </message> <message> <source>&Change Passphrase...</source> - <translation>改變密碼...</translation> + <translation>改變密碼(&C)...</translation> </message> <message> <source>&Sending addresses...</source> - <translation>付款位址...</translation> + <translation>付款位址(&S)...</translation> </message> <message> <source>&Receiving addresses...</source> - <translation>收款位址...</translation> + <translation>收款位址(&R)...</translation> </message> <message> <source>Open &URI...</source> - <translation>開啓 URI...</translation> + <translation>開啓 &URI...</translation> + </message> + <message> + <source>Wallet:</source> + <translation>錢包:</translation> + </message> + <message> + <source>default wallet</source> + <translation>預設錢包</translation> </message> <message> <source>Click to disable network activity.</source> @@ -342,6 +354,10 @@ <translation>正在為磁碟裡的區塊重建索引...</translation> </message> <message> + <source>Proxy is <b>enabled</b>: %1</source> + <translation>代理伺服器<b>已經啟用</b>: %1</translation> + </message> + <message> <source>Send coins to a Bitcoin address</source> <translation>付錢給一個 Bitcoin 位址</translation> </message> @@ -355,7 +371,7 @@ </message> <message> <source>&Debug window</source> - <translation>除錯視窗</translation> + <translation>除錯視窗(&D)</translation> </message> <message> <source>Open debugging and diagnostic console</source> @@ -363,7 +379,7 @@ </message> <message> <source>&Verify message...</source> - <translation>驗證訊息...</translation> + <translation>驗證訊息(&V)...</translation> </message> <message> <source>Bitcoin</source> @@ -375,15 +391,15 @@ </message> <message> <source>&Send</source> - <translation>付款</translation> + <translation>付款(&S)</translation> </message> <message> <source>&Receive</source> - <translation>收款</translation> + <translation>收款(&R)</translation> </message> <message> <source>&Show / Hide</source> - <translation>顯示或隱藏</translation> + <translation>顯示或隱藏(&S)</translation> </message> <message> <source>Show or hide the main Window</source> @@ -403,15 +419,15 @@ </message> <message> <source>&File</source> - <translation>檔案</translation> + <translation>檔案(&F)</translation> </message> <message> <source>&Settings</source> - <translation>設定</translation> + <translation>設定(&S)</translation> </message> <message> <source>&Help</source> - <translation>說明</translation> + <translation>說明(&H)</translation> </message> <message> <source>Tabs toolbar</source> @@ -435,7 +451,7 @@ </message> <message> <source>&Command-line options</source> - <translation>命令列選項</translation> + <translation>命令列選項(&C)</translation> </message> <message numerus="yes"> <source>%n active connection(s) to Bitcoin network</source> @@ -510,6 +526,12 @@ </translation> </message> <message> + <source>Wallet: %1 +</source> + <translation>錢包: %1 +</translation> + </message> + <message> <source>Type: %1 </source> <translation>種類: %1 @@ -715,7 +737,7 @@ </message> <message> <source>&Label</source> - <translation>標記</translation> + <translation>標記(&L)</translation> </message> <message> <source>The label associated with this address list entry</source> @@ -727,11 +749,7 @@ </message> <message> <source>&Address</source> - <translation>位址</translation> - </message> - <message> - <source>New receiving address</source> - <translation>造新的收款位址</translation> + <translation>位址(&A)</translation> </message> <message> <source>New sending address</source> @@ -750,8 +768,12 @@ <translation>輸入的位址 %1 並不是有效的 Bitcoin 位址。</translation> </message> <message> - <source>The entered address "%1" is already in the address book.</source> - <translation>輸入的位址 %1 在位址簿中已經有了。</translation> + <source>Address "%1" already exists as a receiving address with label "%2" and so cannot be added as a sending address.</source> + <translation>%1 已經是標記為 %2 的收款位址了，不可以又是付款位址。</translation> + </message> + <message> + <source>The entered address "%1" is already in the address book with label "%2".</source> + <translation>輸入的位址 %1 本來就在位址簿中了，標記為 %2。</translation> </message> <message> <source>Could not unlock wallet.</source> @@ -803,42 +825,6 @@ <source>Command-line options</source> <translation>命令列選項</translation> </message> - <message> - <source>Usage:</source> - <translation>用法:</translation> - </message> - <message> - <source>command-line options</source> - <translation>命令列選項</translation> - </message> - <message> - <source>UI Options:</source> - <translation>使用介面選項:</translation> - </message> - <message> - <source>Choose data directory on startup (default: %u)</source> - <translation>啓動時選擇資料目錄(預設值: %u)</translation> - </message> - <message> - <source>Set language, for example "de_DE" (default: system locale)</source> - <translation>設定語言，比如說 de_DE (預設值: 系統語系)</translation> - </message> - <message> - <source>Start minimized</source> - <translation>啓動時縮到最小</translation> - </message> - <message> - <source>Set SSL root certificates for payment request (default: -system-)</source> - <translation>設定付款請求時所使用的 SSL 根憑證(預設值: 系統憑證庫)</translation> - </message> - <message> - <source>Show splash screen on startup (default: %u)</source> - <translation>顯示啓動畫面(預設值: %u)</translation> - </message> - <message> - <source>Reset all settings changed in the GUI</source> - <translation>重置所有在使用界面更改的設定</translation> - </message> </context> <context> <name>Intro</name> @@ -993,7 +979,7 @@ </message> <message> <source>&Main</source> - <translation>主要</translation> + <translation>主要(&M)</translation> </message> <message> <source>Automatically start %1 after logging in to the system.</source> @@ -1001,11 +987,11 @@ </message> <message> <source>&Start %1 on system login</source> - <translation>系統登入時啟動 %1</translation> + <translation>系統登入時啟動 %1 (&S)</translation> </message> <message> <source>Size of &database cache</source> - <translation>資料庫快取大小</translation> + <translation>資料庫快取大小(&D)</translation> </message> <message> <source>MB</source> @@ -1013,7 +999,7 @@ </message> <message> <source>Number of script &verification threads</source> - <translation>指令碼驗證執行緒數目</translation> + <translation>指令碼驗證執行緒數目(&V)</translation> </message> <message> <source>IP address of the proxy (e.g. IPv4: 127.0.0.1 / IPv6: ::1)</source> @@ -1025,7 +1011,7 @@ </message> <message> <source>Use separate SOCKS&5 proxy to reach peers via Tor hidden services:</source> - <translation>透過另外的 SOCKS5 代理伺服器來連線到 Bitcoin 網路中的 Tor 隱藏服務。</translation> + <translation>透過另外的 SOCKS&5 代理伺服器來連線到 Bitcoin 網路中的 Tor 隱藏服務:</translation> </message> <message> <source>Hide the icon from the system tray.</source> @@ -1033,7 +1019,7 @@ </message> <message> <source>&Hide tray icon</source> - <translation>隱藏通知區圖示</translation> + <translation>隱藏通知區圖示(&H)</translation> </message> <message> <source>Minimize instead of exit the application when the window is closed. When this option is enabled, the application will be closed only after selecting Exit in the menu.</source> @@ -1061,11 +1047,27 @@ </message> <message> <source>&Reset Options</source> - <translation>重設選項</translation> + <translation>重設選項(&R)</translation> </message> <message> <source>&Network</source> - <translation>網路</translation> + <translation>網路(&N)</translation> + </message> + <message> + <source>Disables some advanced features but all blocks will still be fully validated. Reverting this setting requires re-downloading the entire blockchain. Actual disk usage may be somewhat higher.</source> + <translation>啟用時有些進階功能會不能使用，不過區塊資料還是會被完全驗證。如果把這個設定改回來，會需要重新下載整個區塊鏈。區塊資料實際使用的磁碟空間會比設定值稍微大一點。</translation> + </message> + <message> + <source>Prune &block storage to</source> + <translation>修剪區塊資料大小到</translation> + </message> + <message> + <source>GB</source> + <translation>GB (十億位元組)</translation> + </message> + <message> + <source>Reverting this setting requires re-downloading the entire blockchain.</source> + <translation>把這個設定改回來會需要重新下載整個區塊鏈。</translation> </message> <message> <source>(0 = auto, <0 = leave that many cores free)</source> @@ -1073,7 +1075,7 @@ </message> <message> <source>W&allet</source> - <translation>錢包</translation> + <translation>錢包(&A)</translation> </message> <message> <source>Expert</source> @@ -1081,7 +1083,7 @@ </message> <message> <source>Enable coin &control features</source> - <translation>開啟錢幣控制功能</translation> + <translation>開啟錢幣控制功能(&C)</translation> </message> <message> <source>If you disable the spending of unconfirmed change, the change from a transaction cannot be used until that transaction has at least one confirmation. This also affects how your balance is computed.</source> @@ -1089,7 +1091,7 @@ </message> <message> <source>&Spend unconfirmed change</source> - <translation>可以花還沒確認的零錢</translation> + <translation>可以花還沒確認的零錢(&S)</translation> </message> <message> <source>Automatically open the Bitcoin client port on the router. This only works when your router supports UPnP and it is enabled.</source> @@ -1105,7 +1107,7 @@ </message> <message> <source>Allow incomin&g connections</source> - <translation>接受外來連線</translation> + <translation>接受外來連線(&G)</translation> </message> <message> <source>Connect to the Bitcoin network through a SOCKS5 proxy.</source> @@ -1113,15 +1115,15 @@ </message> <message> <source>&Connect through SOCKS5 proxy (default proxy):</source> - <translation>透過 SOCKS5 代理伺服器連線(預設代理伺服器):</translation> + <translation>透過 SOCKS5 代理伺服器連線(預設代理伺服器 &C):</translation> </message> <message> <source>Proxy &IP:</source> - <translation>代理位址:</translation> + <translation>代理位址(&I):</translation> </message> <message> <source>&Port:</source> - <translation>埠號:</translation> + <translation>埠號(&P):</translation> </message> <message> <source>Port of the proxy (e.g. 9050)</source> @@ -1149,7 +1151,7 @@ </message> <message> <source>&Window</source> - <translation>視窗</translation> + <translation>視窗(&W)</translation> </message> <message> <source>Show only a tray icon after minimizing the window.</source> @@ -1157,19 +1159,19 @@ </message> <message> <source>&Minimize to the tray instead of the taskbar</source> - <translation>縮到最小到通知區而不是工作列</translation> + <translation>縮到最小到通知區而不是工作列(&M)</translation> </message> <message> <source>M&inimize on close</source> - <translation>關閉時縮到最小</translation> + <translation>關閉時縮到最小(&I)</translation> </message> <message> <source>&Display</source> - <translation>顯示</translation> + <translation>顯示(&D)</translation> </message> <message> <source>User Interface &language:</source> - <translation>使用界面語言:</translation> + <translation>使用界面語言(&L):</translation> </message> <message> <source>The user interface language can be set here. This setting will take effect after restarting %1.</source> @@ -1177,7 +1179,7 @@ </message> <message> <source>&Unit to show amounts in:</source> - <translation>金額顯示單位:</translation> + <translation>金額顯示單位(&U):</translation> </message> <message> <source>Choose the default subdivision unit to show in the interface and when sending coins.</source> @@ -1189,15 +1191,15 @@ </message> <message> <source>&Third party transaction URLs</source> - <translation>第三方交易網址連結</translation> + <translation>第三方交易網址連結(&T)</translation> </message> <message> <source>&OK</source> - <translation>好</translation> + <translation>好(&O)</translation> </message> <message> <source>&Cancel</source> - <translation>取消</translation> + <translation>取消(&C)</translation> </message> <message> <source>default</source> @@ -1334,6 +1336,10 @@ <translation>URI 處理</translation> </message> <message> + <source>'bitcoin://' is not a valid URI. Use 'bitcoin:' instead.</source> + <translation>字首為 bitcoin:// 不是有效的 URI，請改用 bitcoin: 開頭。</translation> + </message> + <message> <source>Payment request fetch URL is invalid: %1</source> <translation>取得付款要求的 URL 無效: %1</translation> </message> @@ -1531,12 +1537,16 @@ <context> <name>QObject::QObject</name> <message> + <source>Error parsing command line arguments: %1.</source> + <translation>解析命令列參數 %1 時發生錯誤。</translation> + </message> + <message> <source>Error: Specified data directory "%1" does not exist.</source> <translation>錯誤: 不存在指定的資料目錄 "%1" 。</translation> </message> <message> - <source>Error: Cannot parse configuration file: %1. Only use key=value syntax.</source> - <translation>錯誤: 沒辦法解析設定檔: %1。只能用「名稱=設定值」這種語法。</translation> + <source>Error: Cannot parse configuration file: %1.</source> + <translation>錯誤: 沒辦法解析設定檔: %1。</translation> </message> <message> <source>Error: %1</source> @@ -1547,11 +1557,11 @@ <name>QRImageWidget</name> <message> <source>&Save Image...</source> - <translation>儲存圖片...</translation> + <translation>儲存圖片(&S)...</translation> </message> <message> <source>&Copy Image</source> - <translation>複製圖片</translation> + <translation>複製圖片(&C)</translation> </message> <message> <source>Save QR Code</source> @@ -1574,7 +1584,7 @@ </message> <message> <source>&Information</source> - <translation>資訊</translation> + <translation>資訊(&I)</translation> </message> <message> <source>Debug window</source> @@ -1629,8 +1639,16 @@ <translation>記憶體使用量</translation> </message> <message> + <source>Wallet: </source> + <translation>錢包:</translation> + </message> + <message> + <source>(none)</source> + <translation>(無)</translation> + </message> + <message> <source>&Reset</source> - <translation>重置</translation> + <translation>重置(&R)</translation> </message> <message> <source>Received</source> @@ -1642,7 +1660,7 @@ </message> <message> <source>&Peers</source> - <translation>節點</translation> + <translation>節點(&P)</translation> </message> <message> <source>Banned peers</source> @@ -1738,15 +1756,15 @@ </message> <message> <source>&Open</source> - <translation>開啓</translation> + <translation>開啓(&O)</translation> </message> <message> <source>&Console</source> - <translation>主控台</translation> + <translation>主控台(&C)</translation> </message> <message> <source>&Network Traffic</source> - <translation>網路流量</translation> + <translation>網路流量(&N)</translation> </message> <message> <source>Totals</source> @@ -1770,23 +1788,23 @@ </message> <message> <source>1 &hour</source> - <translation>1 小時</translation> + <translation>1 小時(&H)</translation> </message> <message> <source>1 &day</source> - <translation>1 天</translation> + <translation>1 天(&D)</translation> </message> <message> <source>1 &week</source> - <translation>1 星期</translation> + <translation>1 星期(&W)</translation> </message> <message> <source>1 &year</source> - <translation>1 年</translation> + <translation>1 年(&Y)</translation> </message> <message> <source>&Disconnect</source> - <translation>斷線</translation> + <translation>斷線(&D)</translation> </message> <message> <source>Ban for</source> @@ -1794,7 +1812,11 @@ </message> <message> <source>&Unban</source> - <translation>連線解禁</translation> + <translation>連線解禁(&U)</translation> + </message> + <message> + <source>default wallet</source> + <translation>預設錢包</translation> </message> <message> <source>Welcome to the %1 RPC console.</source> @@ -1821,6 +1843,14 @@ <translation>網路活動已關閉</translation> </message> <message> + <source>Executing command without any wallet</source> + <translation>不使用任何錢包來執行指令</translation> + </message> + <message> + <source>Executing command using "%1" wallet</source> + <translation>使用 %1 錢包來執行指令</translation> + </message> + <message> <source>(node id: %1)</source> <translation>(節點識別碼: %1)</translation> </message> @@ -1857,15 +1887,15 @@ <name>ReceiveCoinsDialog</name> <message> <source>&Amount:</source> - <translation>金額:</translation> + <translation>金額(&A):</translation> </message> <message> <source>&Label:</source> - <translation>標記:</translation> + <translation>標記(&L):</translation> </message> <message> <source>&Message:</source> - <translation>訊息:</translation> + <translation>訊息(&M):</translation> </message> <message> <source>An optional message to attach to the payment request, which will be displayed when the request is opened. Note: The message will not be sent with the payment over the Bitcoin network.</source> @@ -1892,20 +1922,20 @@ <translation>清空</translation> </message> <message> - <source>Requested payments history</source> - <translation>先前要求付款的記錄</translation> + <source>Native segwit addresses (aka Bech32 or BIP-173) reduce your transaction fees later on and offer better protection against typos, but old wallets don't support them. When unchecked, an address compatible with older wallets will be created instead.</source> + <translation>使用 segwit 原生位址(也叫做 Bech32 或 BIP-173)可以減少日後的交易手續費，也比較不容易打錯字，不過會跟舊版的錢包軟體不相容。如果沒有勾選的話，會改產生與舊版錢包軟體相容的位址。</translation> </message> <message> - <source>&Request payment</source> - <translation>要求付款</translation> + <source>Generate native segwit (Bech32) address</source> + <translation>產生 segwit 原生位址(Bech32)</translation> </message> <message> - <source>Bech32 addresses (BIP-173) are cheaper to spend from and offer better protection against typos. When unchecked a P2SH wrapped SegWit address will be created, compatible with older wallets.</source> - <translation>Bech32 位址(BIP-173)是一種花費成本較小，且較不容易打錯的位址類型。如果沒有勾選的話，會使用以 P2SH 包裝的 SegWit 位址，這種位址類型跟舊版錢包相容。</translation> + <source>Requested payments history</source> + <translation>先前要求付款的記錄</translation> </message> <message> - <source>Generate Bech32 address</source> - <translation>產生 Bech32 位址</translation> + <source>&Request payment</source> + <translation>要求付款(&R)</translation> </message> <message> <source>Show the selected request (does the same as double clicking an entry)</source> @@ -1948,15 +1978,15 @@ </message> <message> <source>Copy &URI</source> - <translation>複製 URI</translation> + <translation>複製 &URI</translation> </message> <message> <source>Copy &Address</source> - <translation>複製位址</translation> + <translation>複製位址(&A)</translation> </message> <message> <source>&Save Image...</source> - <translation>儲存圖片...</translation> + <translation>儲存圖片(&S)...</translation> </message> <message> <source>Request payment to %1</source> @@ -1987,6 +2017,10 @@ <translation>訊息</translation> </message> <message> + <source>Wallet</source> + <translation>錢包</translation> + </message> + <message> <source>Resulting URI too long, try to reduce the text for label / message.</source> <translation>產生的 URI 過長，請試著縮短標記或訊息的文字內容。</translation> </message> @@ -2074,7 +2108,7 @@ </message> <message> <source>If this is activated, but the change address is empty or invalid, change will be sent to a newly generated address.</source> - <translation>如果這項有打開，但是找零位址是空的或無效，那麼找零的錢會送到一個新產生的位址去。</translation> + <translation>如果這項有打開，但是找零位址是空的或無效，那麼找零的錢會送到一個新造出來的位址去。</translation> </message> <message> <source>Custom change address</source> @@ -2101,12 +2135,16 @@ <translation>展開手續費設定</translation> </message> <message> - <source>per kilobyte</source> - <translation>每千位元組</translation> + <source>Specify a custom fee per kB (1,000 bytes) of the transaction's virtual size. + +Note: Since the fee is calculated on a per-byte basis, a fee of "100 satoshis per kB" for a transaction size of 500 bytes (half of 1 kB) would ultimately yield a fee of only 50 satoshis.</source> + <translation>指定每一千位元祖(kB)擬真大小的交易所要付出的手續費。 + +注意: 交易手續費是以位元組為單位來計算。因此當指定手續費為每千位元組 100 個 satoshi 時，對於一筆大小為 500 位元組(一千位元組的一半)的交易，其手續費會只有 50 個 satoshi。</translation> </message> <message> - <source>If the custom fee is set to 1000 satoshis and the transaction is only 250 bytes, then "per kilobyte" only pays 250 satoshis in fee, while "total at least" pays 1000 satoshis. For transactions bigger than a kilobyte both pay by kilobyte.</source> - <translation>如果自訂手續費設定為 1000 satoshi, 而交易資料大小只有 250 個位元組的話，那麽選擇「每千位元組」就只會付 250 satoshi 的手續費，換做選「總共至少」就會付 1000 satoshi. 但是如果交易資料大小超過一千個位元組，那麽兩者都是每千位元組的費用。</translation> + <source>per kilobyte</source> + <translation>每千位元組</translation> </message> <message> <source>Hide</source> @@ -2138,7 +2176,7 @@ </message> <message> <source>Add &Recipient</source> - <translation>增加收款人</translation> + <translation>增加收款人(&R)</translation> </message> <message> <source>Clear all fields of the form.</source> @@ -2162,7 +2200,7 @@ </message> <message> <source>Clear &All</source> - <translation>全部清掉</translation> + <translation>全部清掉(&A)</translation> </message> <message> <source>Balance:</source> @@ -2174,7 +2212,7 @@ </message> <message> <source>S&end</source> - <translation>付款</translation> + <translation>付款(&E)</translation> </message> <message> <source>Copy quantity</source> @@ -2217,14 +2255,6 @@ <translation>你確定要付錢出去嗎？</translation> </message> <message> - <source>added as transaction fee</source> - <translation>加做交易手續費</translation> - </message> - <message> - <source>Total Amount %1</source> - <translation>總金額 %1</translation> - </message> - <message> <source>or</source> <translation>或</translation> </message> @@ -2233,10 +2263,26 @@ <translation>你可以之後再提高手續費(有 BIP-125 手續費追加的標記)</translation> </message> <message> + <source>from wallet %1</source> + <translation>從錢包 %1</translation> + </message> + <message> + <source>Please, review your transaction.</source> + <translation>請再次確認交易內容。</translation> + </message> + <message> + <source>Transaction fee</source> + <translation>交易手續費</translation> + </message> + <message> <source>Not signalling Replace-By-Fee, BIP-125.</source> <translation>沒有 BIP-125 手續費追加的標記。</translation> </message> <message> + <source>Total Amount</source> + <translation>總金額</translation> + </message> + <message> <source>Confirm send coins</source> <translation>確認付款金額</translation> </message> @@ -2305,15 +2351,15 @@ <name>SendCoinsEntry</name> <message> <source>A&mount:</source> - <translation>金額:</translation> + <translation>金額(&M):</translation> </message> <message> <source>Pay &To:</source> - <translation>付給:</translation> + <translation>付給(&T):</translation> </message> <message> <source>&Label:</source> - <translation>標記:</translation> + <translation>標記(&L):</translation> </message> <message> <source>Choose previously used address</source> @@ -2349,7 +2395,7 @@ </message> <message> <source>S&ubtract fee from amount</source> - <translation>從付款金額減去手續費</translation> + <translation>從付款金額減去手續費(&U)</translation> </message> <message> <source>Use available balance</source> @@ -2414,7 +2460,7 @@ </message> <message> <source>&Sign Message</source> - <translation>簽署訊息</translation> + <translation>簽署訊息(&S)</translation> </message> <message> <source>You can sign messages/agreements with your addresses to prove you can receive bitcoins sent to them. Be careful not to sign anything vague or random, as phishing attacks may try to trick you into signing your identity over to them. Only sign fully-detailed statements you agree to.</source> @@ -2458,7 +2504,7 @@ </message> <message> <source>Sign &Message</source> - <translation>簽署訊息</translation> + <translation>簽署訊息(&M)</translation> </message> <message> <source>Reset all sign message fields</source> @@ -2466,11 +2512,11 @@ </message> <message> <source>Clear &All</source> - <translation>全部清掉</translation> + <translation>全部清掉(&A)</translation> </message> <message> <source>&Verify Message</source> - <translation>驗證訊息</translation> + <translation>驗證訊息(&V)</translation> </message> <message> <source>Enter the receiver's address, message (ensure you copy line breaks, spaces, tabs, etc. exactly) and signature below to verify the message. Be careful not to read more into the signature than what is in the signed message itself, to avoid being tricked by a man-in-the-middle attack. Note that this only proves the signing party receives with the address, it cannot prove sendership of any transaction!</source> @@ -2486,7 +2532,7 @@ </message> <message> <source>Verify &Message</source> - <translation>驗證訊息</translation> + <translation>驗證訊息(&M)</translation> </message> <message> <source>Reset all verify message fields</source> @@ -2574,10 +2620,6 @@ <translation>跟一個目前確認 %1 次的交易互相衝突</translation> </message> <message> - <source>%1/offline</source> - <translation>%1 次/離線中</translation> - </message> - <message> <source>0/unconfirmed, %1</source> <translation>0 次/未確認，%1</translation> </message> @@ -2606,14 +2648,6 @@ <translation>狀態</translation> </message> <message> - <source>, has not been successfully broadcast yet</source> - <translation>，還沒成功公告出去</translation> - </message> - <message numerus="yes"> - <source>, broadcast through %n node(s)</source> - <translation><numerusform>，已公告給 %n 個節點</numerusform></translation> - </message> - <message> <source>Date</source> <translation>日期</translation> </message> @@ -2698,6 +2732,10 @@ <translation>交易總大小</translation> </message> <message> + <source>Transaction virtual size</source> + <translation>交易擬真大小</translation> + </message> + <message> <source>Output index</source> <translation>輸出索引</translation> </message> @@ -2768,10 +2806,6 @@ <translation>到 %1 前可修改</translation> </message> <message> - <source>Offline</source> - <translation>離線中</translation> - </message> - <message> <source>Unconfirmed</source> <translation>未確認</translation> </message> @@ -2796,10 +2830,6 @@ <translation>未成熟(確認 %1 次，會在 %2 次後可用)</translation> </message> <message> - <source>This block was not received by any other nodes and will probably not be accepted!</source> - <translation>沒有其他節點收到這個區塊，也許它不會被接受！</translation> - </message> - <message> <source>Generated but not accepted</source> <translation>生產出來但是不被接受</translation> </message> @@ -3080,7 +3110,7 @@ <name>WalletView</name> <message> <source>&Export</source> - <translation>匯出</translation> + <translation>匯出(&E)</translation> </message> <message> <source>Export the data in the current tab to a file</source> @@ -3110,39 +3140,18 @@ <source>The wallet data was successfully saved to %1.</source> <translation>錢包的資料已經成功儲存到 %1 了。</translation> </message> + <message> + <source>Cancel</source> + <translation>取消</translation> + </message> </context> <context> <name>bitcoin-core</name> <message> - <source>Options:</source> - <translation>選項:</translation> - </message> - <message> - <source>Specify data directory</source> - <translation>指定資料目錄</translation> - </message> - <message> - <source>Connect to a node to retrieve peer addresses, and disconnect</source> - <translation>連線到某個節點來取得其它節點的位址，然後斷線</translation> - </message> - <message> - <source>Specify your own public address</source> - <translation>指定自己的公開位址</translation> - </message> - <message> - <source>Accept command line and JSON-RPC commands</source> - <translation>接受指令列和 JSON-RPC 指令 -</translation> - </message> - <message> <source>Distributed under the MIT software license, see the accompanying file %s or %s</source> <translation>依據 MIT 軟體授權條款散布，詳情請見附帶的 %s 檔案或是 %s</translation> </message> <message> - <source>If <category> is not supplied or if <category> = 1, output all debugging information.</source> - <translation>如果沒有提供 <category> 或是值為 1 就會輸出所有的除錯資訊。</translation> - </message> - <message> <source>Prune configured below the minimum of %d MiB. Please use a higher number.</source> <translation>設定的修剪值小於最小需求的 %d 百萬位元組(MiB)。請指定大一點的數字。</translation> </message> @@ -3159,18 +3168,10 @@ <translation>錯誤: 發生了致命的內部錯誤，詳情請看 debug.log</translation> </message> <message> - <source>Fee (in %s/kB) to add to transactions you send (default: %s)</source> - <translation>交易付款時每千位元組(kB)的交易手續費(單位是 %s，預設值: %s)</translation> - </message> - <message> <source>Pruning blockstore...</source> <translation>正在修剪區塊資料庫中...</translation> </message> <message> - <source>Run in the background as a daemon and accept commands</source> - <translation>用護靈模式在背景執行並接受指令</translation> - </message> - <message> <source>Unable to start HTTP server. See debug log for details.</source> <translation>無法啟動 HTTP 伺服器。詳情請看除錯紀錄。</translation> </message> @@ -3183,22 +3184,6 @@ <translation>%s 開發人員</translation> </message> <message> - <source>A fee rate (in %s/kB) that will be used when fee estimation has insufficient data (default: %s)</source> - <translation>當沒有足夠的資料計算預估手續費時，所使用的手續費費率(單位是 %s/kB, 預設值: %s)</translation> - </message> - <message> - <source>Accept relayed transactions received from whitelisted peers even when not relaying transactions (default: %d)</source> - <translation>接受從白名點節點收到的轉發交易，即使沒有(符合準則)轉發出去(預設值: %d)</translation> - </message> - <message> - <source>Add a node to connect to and attempt to keep the connection open (see the `addnode` RPC command help for more info)</source> - <translation>增加一個要連線的節線，並試著保持對它的連線不斷(詳情請見 RPC 指令 addnode 的說明)</translation> - </message> - <message> - <source>Bind to given address and always listen on it. Use [host]:port notation for IPv6</source> - <translation>和指定的位址繫結，並且一直在指定位址聽候連線。IPv6 請用 [主機]:通訊埠 這種格式</translation> - </message> - <message> <source>Cannot obtain a lock on data directory %s. %s is probably already running.</source> <translation>沒辦法鎖定資料目錄 %s。%s 可能已經在執行了。</translation> </message> @@ -3207,42 +3192,10 @@ <translation>無法同時指定特定連線位址以及自動尋找連線。</translation> </message> <message> - <source>Connect only to the specified node(s); -connect=0 disables automatic connections (the rules for this peer are the same as for -addnode)</source> - <translation>只連線到指定的節點。用 -connect=0 可以關閉自動連線。(套用於這個節點的規則與 -addnode 相同)</translation> - </message> - <message> - <source>Delete all wallet transactions and only recover those parts of the blockchain through -rescan on startup</source> - <translation>清掉錢包裡的所有交易，並且在下次啟動時，使用 -rescan 來從區塊鏈中復原回來。</translation> - </message> - <message> <source>Error reading %s! All keys read correctly, but transaction data or address book entries might be missing or incorrect.</source> <translation>讀取錢包檔 %s 時發生錯誤！所有的密鑰都正確讀取了，但是交易資料或位址簿資料可能會缺少或不正確。</translation> </message> <message> - <source>Exclude debugging information for a category. Can be used in conjunction with -debug=1 to output debug logs for all categories except one or more specified categories.</source> - <translation>不要對一種類別紀錄除錯資訊。可以和 -debug=1 配合，用來輸入除了指定的一種或多種類別外的所有除錯紀錄。</translation> - </message> - <message> - <source>Execute command when a wallet transaction changes (%s in cmd is replaced by TxID)</source> - <translation>當錢包有交易改變時要執行的指令(指令中的 %s 會被取代成交易識別碼)</translation> - </message> - <message> - <source>Extra transactions to keep in memory for compact block reconstructions (default: %u)</source> - <translation>為了將摘要區塊完整回組而額外保留在記憶體中的交易數量(預設值: %u)</translation> - </message> - <message> - <source>If this block is in the chain assume that it and its ancestors are valid and potentially skip their script verification (0 to verify all, default: %s, testnet: %s)</source> - <translation>假設已經在區塊鏈中的區塊以及其先前的區塊都合法，因此對它們略過指令碼驗證(0 表示一律要驗證，預設值: %s, 測試網路: %s)</translation> - </message> - <message> - <source>Maximum allowed median peer time offset adjustment. Local perspective of time may be influenced by peers forward or backward by this amount. (default: %u seconds)</source> - <translation>跟其他節點的時間差最高可接受的中位數值。本機所認為的時間可能會被其他節點影響，往前或往後在這個值之內。(預設值: %u 秒)</translation> - </message> - <message> - <source>Maximum total fees (in %s) to use in a single wallet transaction or raw transaction; setting this too low may abort large transactions (default: %s)</source> - <translation>允許一次錢包交易或未加工交易付出的最高總手續費(單位是 %s)；設定太低的話，可能會無法進行資料量大的交易(預設值: %s)</translation> - </message> - <message> <source>Please check that your computer's date and time are correct! If your clock is wrong, %s will not work properly.</source> <translation>請檢查電腦日期和時間是否正確！%s 沒辦法在時鐘不準的情況下正常運作。</translation> </message> @@ -3251,22 +3204,6 @@ <translation>如果你覺得 %s 有用，可以幫助我們。關於這個軟體的更多資訊請見 %s。</translation> </message> <message> - <source>Query for peer addresses via DNS lookup, if low on addresses (default: 1 unless -connect used)</source> - <translation>是否允許在節點位址數目不足時，使用域名查詢來搜尋節點 (預設值: 當沒用 -connect 時為 1)</translation> - </message> - <message> - <source>Reduce storage requirements by enabling pruning (deleting) of old blocks. This allows the pruneblockchain RPC to be called to delete specific blocks, and enables automatic pruning of old blocks if a target size in MiB is provided. This mode is incompatible with -txindex and -rescan. Warning: Reverting this setting requires re-downloading the entire blockchain. (default: 0 = disable pruning blocks, 1 = allow manual pruning via RPC, >%u = automatically prune block files to stay under the specified target size in MiB)</source> - <translation>修剪(刪除)掉老舊區塊以降低需要的儲存空間。這樣會增加一個 RPC 指令 pruneblockchain，可以使用它來刪除指定的區塊；也可以指定目標儲存空間大小，以啟用對老舊區塊的自動修剪功能。這個模式跟 -txindex 和 -rescan 參數不相容。警告: 還原回不修剪模式會需要重新下載一整個區塊鏈。(預設值: 0 表示不修剪區塊，1 表示允許使用 RPC 指令做修剪，>%u 的值表示為區塊資料的目標大小，單位是百萬位元組，MiB)</translation> - </message> - <message> - <source>Set lowest fee rate (in %s/kB) for transactions to be included in block creation. (default: %s)</source> - <translation>設定製造區塊時，所要包含交易每千位元組的最低手續費(單位是 %s)。(預設值: %s)</translation> - </message> - <message> - <source>Set the number of script verification threads (%u to %d, 0 = auto, <0 = leave that many cores free, default: %d)</source> - <translation>設定指令碼驗證的執行緒數目 (%u 到 %d，0 表示程式自動決定，小於 0 表示保留處理器核心不用的數目，預設值: %d)</translation> - </message> - <message> <source>The block database contains a block which appears to be from the future. This may be due to your computer's date and time being set incorrectly. Only rebuild the block database if you are sure that your computer's date and time are correct</source> <translation>區塊資料庫中有來自未來的區塊。可能是你電腦的日期時間不對。如果確定電腦日期時間沒錯的話，就重建區塊資料庫看看。</translation> </message> @@ -3287,18 +3224,6 @@ <translation>沒辦法將資料庫倒轉回分岔前的狀態。必須要重新下載區塊鍊。</translation> </message> <message> - <source>Use UPnP to map the listening port (default: 1 when listening and no -proxy)</source> - <translation>是否要使用「通用即插即用」協定(UPnP)，來設定聽候連線的通訊埠的對應(預設值: 當有聽候連線且沒有指定 -proxy 參數時為 1)</translation> - </message> - <message> - <source>Username and hashed password for JSON-RPC connections. The field <userpw> comes in the format: <USERNAME>:<SALT>$<HASH>. A canonical python script is included in share/rpcuser. The client then connects normally using the rpcuser=<USERNAME>/rpcpassword=<PASSWORD> pair of arguments. This option can be specified multiple times</source> - <translation>JSON-RPC 連線要用的使用者名稱和雜湊密碼。<userpw> 的格式是：<使用者名稱>:<調味值>$<雜湊值>。在 share/rpcuser 目錄下有一個示範的 python 程式。之後客戶端程式就可以用這對參數正常連線：rpcuser=<使用者名稱> 和 rpcpassword=<密碼>。這個選項可以給很多次。</translation> - </message> - <message> - <source>Wallet will not create transactions that violate mempool chain limits (default: %u)</source> - <translation>錢包軟體不會產生違反記憶池交易鏈限制的交易(預設值: %u)</translation> - </message> - <message> <source>Warning: The network does not appear to fully agree! Some miners appear to be experiencing issues.</source> <translation>警告: 位元幣網路對於區塊鏈結的決定目前有分歧！有些礦工看來會有問題。</translation> </message> @@ -3307,10 +3232,6 @@ <translation>警告: 我們和某些連線的節點對於區塊鏈結的決定不同！你可能需要升級，或是需要等其它的節點升級。</translation> </message> <message> - <source>Whether to save the mempool on shutdown and load on restart (default: %u)</source> - <translation>是否要在結束時儲存記憶池，並在下次重起時載入(預設值: %u)</translation> - </message> - <message> <source>%d of last 100 blocks have unexpected version</source> <translation>最近的 100 個區塊中有 %d 個意料之外的區塊版本</translation> </message> @@ -3323,42 +3244,14 @@ <translation>參數 -maxmempool 至少要給 %d 百萬位元組(MB)</translation> </message> <message> - <source><category> can be:</source> - <translation><category> 可以是:</translation> - </message> - <message> - <source>Accept connections from outside (default: 1 if no -proxy or -connect)</source> - <translation>是否接受外來連線(預設值: 當沒有 -proxy 或 -connect 時為 1)</translation> - </message> - <message> - <source>Append comment to the user agent string</source> - <translation>對使用者代理字串添加註解</translation> - </message> - <message> - <source>Attempt to recover private keys from a corrupt wallet on startup</source> - <translation>啟動時嘗試從壞掉的錢包檔復原密鑰</translation> - </message> - <message> - <source>Block creation options:</source> - <translation>區塊製造選項:</translation> - </message> - <message> <source>Cannot resolve -%s address: '%s'</source> <translation>沒辦法解析 -%s 參數指定的位址: '%s'</translation> </message> <message> - <source>Chain selection options:</source> - <translation>區塊鏈選項:</translation> - </message> - <message> <source>Change index out of range</source> <translation>找零的索引值超出範圍</translation> </message> <message> - <source>Connection options:</source> - <translation>連線選項:</translation> - </message> - <message> <source>Copyright (C) %i-%i</source> <translation>版權所有 (C) %i-%i</translation> </message> @@ -3367,38 +3260,10 @@ <translation>發現區塊資料庫壞掉了</translation> </message> <message> - <source>Debugging/Testing options:</source> - <translation>除錯與測試選項</translation> - </message> - <message> - <source>Do not load the wallet and disable wallet RPC calls</source> - <translation>不要載入錢包，並且拿掉錢包相關的 RPC 功能請求。</translation> - </message> - <message> <source>Do you want to rebuild the block database now?</source> <translation>你想要現在重建區塊資料庫嗎？</translation> </message> <message> - <source>Enable publish hash block in <address></source> - <translation>開啟傳送區塊雜湊值到目標 ZeroMQ 位址 <address> 去</translation> - </message> - <message> - <source>Enable publish hash transaction in <address></source> - <translation>開啟傳送交易雜湊值到目標 ZeroMQ 位址 <address> 去</translation> - </message> - <message> - <source>Enable publish raw block in <address></source> - <translation>開啟傳送區塊原始資料到目標 ZeroMQ 位址 <address> 去</translation> - </message> - <message> - <source>Enable publish raw transaction in <address></source> - <translation>開啟傳送交易原始資料到目標 ZeroMQ 位址 <address> 去</translation> - </message> - <message> - <source>Enable transaction replacement in the memory pool (default: %u)</source> - <translation>對交易暫存池啟用替代交易(預設值: %u)</translation> - </message> - <message> <source>Error creating %s: You can't create non-HD wallets with this version.</source> <translation>產生 %s 發生錯誤：這個版本不能用來產生非 HD 錢包。</translation> </message> @@ -3415,6 +3280,10 @@ <translation>載入檔案 %s 時發生錯誤</translation> </message> <message> + <source>Error loading %s: Private keys can only be disabled during creation</source> + <translation>載入 %s 時發生錯誤: 只有在造新錢包時能夠指定不允許私鑰</translation> + </message> + <message> <source>Error loading %s: Wallet corrupted</source> <translation>載入檔案 %s 時發生錯誤: 錢包損毀了</translation> </message> @@ -3467,8 +3336,8 @@ <translation>設定 -fallbackfee=<金額> 的金額無效: '%s'</translation> </message> <message> - <source>Keep the transaction memory pool below <n> megabytes (default: %u)</source> - <translation>在記憶體暫存池中保持最多 <n> 個百萬位元組的交易(預設值: %u)</translation> + <source>Upgrading txindex database</source> + <translation>正在升級 txindex 資料庫</translation> </message> <message> <source>Loading P2P addresses...</source> @@ -3479,26 +3348,10 @@ <translation>正在載入禁止連線名單中...</translation> </message> <message> - <source>Location of the auth cookie (default: data dir)</source> - <translation>認證 cookie 資料的位置(預設值: 同資料目錄)</translation> - </message> - <message> <source>Not enough file descriptors available.</source> <translation>檔案描述元不足。</translation> </message> <message> - <source>Only connect to nodes in network <net> (ipv4, ipv6 or onion)</source> - <translation>只和 <net> 網路上的節點連線(ipv4, ipv6, 或 onion)</translation> - </message> - <message> - <source>Print this help message and exit</source> - <translation>顯示說明訊息後結束</translation> - </message> - <message> - <source>Print version and exit</source> - <translation>顯示版本後結束</translation> - </message> - <message> <source>Prune cannot be configured with a negative value.</source> <translation>修剪值不能設定為負的。</translation> </message> @@ -3507,14 +3360,6 @@ <translation>修剪模式和 -txindex 參數不相容。</translation> </message> <message> - <source>Rebuild chain state and block index from the blk*.dat files on disk</source> - <translation>從磁碟裡的區塊檔 blk*.dat 重建區塊鏈狀態和區塊索引</translation> - </message> - <message> - <source>Rebuild chain state from the currently indexed blocks</source> - <translation>從目前已編索引的區塊資料重建區塊鏈狀態</translation> - </message> - <message> <source>Replaying blocks...</source> <translation>正在對區塊進行重算...</translation> </message> @@ -3523,18 +3368,6 @@ <translation>正在倒轉回區塊鏈之前的狀態...</translation> </message> <message> - <source>Send transactions with full-RBF opt-in enabled (RPC only, default: %u)</source> - <translation>送出允許提高手續費(full-RBF)的交易(僅適用於 RPC 指令，預設值: %u)</translation> - </message> - <message> - <source>Set database cache size in megabytes (%d to %d, default: %d)</source> - <translation>設定資料庫快取大小是多少百萬位元組(MB，範圍: %d 到 %d，預設值: %d)</translation> - </message> - <message> - <source>Specify wallet file (within data directory)</source> - <translation>指定錢包檔(會在資料目錄中)</translation> - </message> - <message> <source>The source code is available from %s.</source> <translation>原始碼可以在 %s 取得。</translation> </message> @@ -3547,6 +3380,10 @@ <translation>沒辦法繫結在這台電腦上的 %s 。%s 可能已經在執行了。</translation> </message> <message> + <source>Unable to generate keys</source> + <translation>沒辦法產生密鑰</translation> + </message> + <message> <source>Unsupported argument -benchmark ignored, use -debug=bench.</source> <translation>忽略了不再支援的 -benchmark 參數，請改用 -debug=bench</translation> </message> @@ -3567,14 +3404,6 @@ <translation>正在升級 UTXO 資料庫</translation> </message> <message> - <source>Use UPnP to map the listening port (default: %u)</source> - <translation>使用通用隨插即用 (UPnP) 協定來設定對應的服務連接埠(預設值: %u)</translation> - </message> - <message> - <source>Use the test chain</source> - <translation>使用測試區塊鏈</translation> - </message> - <message> <source>User Agent comment (%s) contains unsafe characters.</source> <translation>使用者代理註解(%s)中含有不安全的字元。</translation> </message> @@ -3583,90 +3412,26 @@ <translation>正在驗證區塊資料...</translation> </message> <message> - <source>Wallet debugging/testing options:</source> - <translation>錢包除錯與測試選項:</translation> - </message> - <message> <source>Wallet needed to be rewritten: restart %s to complete</source> <translation>錢包需要重寫: 請重新啓動 %s 來完成</translation> </message> <message> - <source>Wallet options:</source> - <translation>錢包選項:</translation> - </message> - <message> - <source>Allow JSON-RPC connections from specified source. Valid for <ip> are a single IP (e.g. 1.2.3.4), a network/netmask (e.g. 1.2.3.4/255.255.255.0) or a network/CIDR (e.g. 1.2.3.4/24). This option can be specified multiple times</source> - <translation>允許指定的來源建立 JSON-RPC 連線。<ip> 的有效值可以是一個單獨位址(像是 1.2.3.4)，一個網段/網段罩遮值(像是 1.2.3.4/255.255.255.0)，或是網段/CIDR值(像是 1.2.3.4/24)。這個選項可以設定多次。</translation> - </message> - <message> - <source>Bind to given address and whitelist peers connecting to it. Use [host]:port notation for IPv6</source> - <translation>和指定的位址繫結，並且把連線過來的節點放進白名單。IPv6 請用 [主機]:通訊埠 這種格式</translation> - </message> - <message> - <source>Create new files with system default permissions, instead of umask 077 (only effective with disabled wallet functionality)</source> - <translation>用系統預設權限來造出新的檔案，而不是用使用者權限罩遮(umask)值 077 (只有在關掉錢包功能時才有作用)。</translation> - </message> - <message> - <source>Discover own IP addresses (default: 1 when listening and no -externalip or -proxy)</source> - <translation>找出自己的網際網路位址(預設值: 當有聽候連線且沒有指定 -externalip 或 -proxy 時為 1)</translation> - </message> - <message> <source>Error: Listening for incoming connections failed (listen returned error %s)</source> <translation>錯誤: 聽候外來連線失敗(回傳錯誤 %s)</translation> </message> <message> - <source>Execute command when a relevant alert is received or we see a really long fork (%s in cmd is replaced by message)</source> - <translation>當收到相關警示，或發現相當長的分支時，所要執行的指令(指令中的 %s 會被取代成警示訊息)</translation> - </message> - <message> - <source>Fees (in %s/kB) smaller than this are considered zero fee for relaying, mining and transaction creation (default: %s)</source> - <translation>當處理轉發的交易、挖礦、或製造交易時，如果每千位元組(kB)的手續費比這個值(單位是 %s)低，就視為沒付手續費(預設值: %s)</translation> - </message> - <message> - <source>If paytxfee is not set, include enough fee so transactions begin confirmation on average within n blocks (default: %u)</source> - <translation>當沒有設定 paytxfee 時，自動包含可以讓交易能在平均 n 個區塊內開始確認的手續費(預設值: %u)</translation> - </message> - <message> <source>Invalid amount for -maxtxfee=<amount>: '%s' (must be at least the minrelay fee of %s to prevent stuck transactions)</source> <translation>-maxtxfee=<amount>: '%s' 的金額無效 (必須大於最低轉發手續費 %s 以避免交易無法確認)</translation> </message> <message> - <source>Maximum size of data in data carrier transactions we relay and mine (default: %u)</source> - <translation>轉發和開採時，對只帶資料的交易的大小上限(預設值: %u)</translation> - </message> - <message> - <source>Randomize credentials for every proxy connection. This enables Tor stream isolation (default: %u)</source> - <translation>對每個代理連線使用隨機產生的憑證。這個選項會開啟 Tor 的串流隔離(預設值: %u)</translation> - </message> - <message> <source>The transaction amount is too small to send after the fee has been deducted</source> <translation>扣除手續費後的交易金額太少而不能傳送</translation> </message> <message> - <source>Whitelisted peers cannot be DoS banned and their transactions are always relayed, even if they are already in the mempool, useful e.g. for a gateway</source> - <translation>在白名單中的節點不會因為偵測到阻斷服務攻擊(DoS)而被停用。來自這些節點的交易也一定會被轉發，即使說交易本來就在記憶池裡了也一樣。適用於像是閘道伺服器。</translation> - </message> - <message> <source>You need to rebuild the database using -reindex to go back to unpruned mode. This will redownload the entire blockchain</source> <translation>回到非修剪的模式需要用 -reindex 參數來重建資料庫。這會導致重新下載整個區塊鏈。</translation> </message> <message> - <source>(default: %u)</source> - <translation>(預設值: %u)</translation> - </message> - <message> - <source>Accept public REST requests (default: %u)</source> - <translation>接受公開的REST請求 (預設值: %u)</translation> - </message> - <message> - <source>Automatically create Tor hidden service (default: %d)</source> - <translation>自動產生 Tor 隱藏服務(預設值: %d)</translation> - </message> - <message> - <source>Connect through SOCKS5 proxy</source> - <translation>透過 SOCKS5 代理伺服器連線</translation> - </message> - <message> <source>Error loading %s: You can't disable HD on an already existing HD wallet</source> <translation>載入 %s 發生錯誤：不能對已存在的 HD 錢包停用 HD 功能。</translation> </message> @@ -3679,10 +3444,6 @@ <translation>升級區塊鏈狀態資料庫時發生錯誤</translation> </message> <message> - <source>Imports blocks from external blk000??.dat file on startup</source> - <translation>啟動時從其它來源的 blk000??.dat 檔匯入區塊</translation> - </message> - <message> <source>Information</source> <translation>資訊</translation> </message> @@ -3703,42 +3464,14 @@ <translation>指定在 -whitelist 的網段無效: '%s'</translation> </message> <message> - <source>Keep at most <n> unconnectable transactions in memory (default: %u)</source> - <translation>保持最多 <n> 無法連結的交易在記憶體 (預設: %u)</translation> - </message> - <message> <source>Need to specify a port with -whitebind: '%s'</source> <translation>指定 -whitebind 時必須包含通訊埠: '%s'</translation> </message> <message> - <source>Node relay options:</source> - <translation>節點轉發選項:</translation> - </message> - <message> - <source>RPC server options:</source> - <translation>RPC 伺服器選項:</translation> - </message> - <message> <source>Reducing -maxconnections from %d to %d, because of system limitations.</source> <translation>因為系統的限制，將 -maxconnections 參數從 %d 降到了 %d</translation> </message> <message> - <source>Rescan the block chain for missing wallet transactions on startup</source> - <translation>啟動時重新掃描區塊鏈，來尋找錢包可能漏掉的交易。</translation> - </message> - <message> - <source>Send trace/debug info to console instead of debug.log file</source> - <translation>在終端機顯示追蹤或除錯資訊，而不是寫到檔案 debug.log 中</translation> - </message> - <message> - <source>Show all debugging options (usage: --help -help-debug)</source> - <translation>顯示所有的除錯選項 (用法: --help --help-debug)</translation> - </message> - <message> - <source>Shrink debug.log file on client startup (default: 1 when no -debug)</source> - <translation>客戶端軟體啓動時把 debug.log 檔縮小(預設值: 當沒有 -debug 時為 1)</translation> - </message> - <message> <source>Signing transaction failed</source> <translation>簽署交易失敗</translation> </message> @@ -3755,6 +3488,12 @@ <translation>以 -walletdir 指定的路徑 "%s" 不是個目錄</translation> </message> <message> + <source>Specified blocks directory "%s" does not exist. +</source> + <translation>指定的區塊目錄 "%s" 不存在。 +</translation> + </message> + <message> <source>The transaction amount is too small to pay the fee</source> <translation>交易金額太少而付不起手續費</translation> </message> @@ -3763,14 +3502,6 @@ <translation>這套軟體屬於實驗性質。</translation> </message> <message> - <source>Tor control port password (default: empty)</source> - <translation>Tor 控制埠密碼(預設值: 空白)</translation> - </message> - <message> - <source>Tor control port to use if onion listening enabled (default: %s)</source> - <translation>開啟聽候 onion 連線時的 Tor 控制埠號碼(預設值: %s)</translation> - </message> - <message> <source>Transaction amount too small</source> <translation>交易金額太小</translation> </message> @@ -3788,15 +3519,7 @@ </message> <message> <source>Unable to generate initial keys</source> - <translation>無法產生初始的金鑰</translation> - </message> - <message> - <source>Upgrade wallet to latest format on startup</source> - <translation>啟動時把錢包檔案升級成最新的格式</translation> - </message> - <message> - <source>Username for JSON-RPC connections</source> - <translation>JSON-RPC 連線使用者名稱</translation> + <translation>無法產生初始的密鑰</translation> </message> <message> <source>Verifying wallet(s)...</source> @@ -3815,110 +3538,18 @@ <translation>警告: 不明的交易規則被啟用了(versionbit %i)</translation> </message> <message> - <source>Whether to operate in a blocks only mode (default: %u)</source> - <translation>是否要用只要區塊模式運作(預設值: %u)</translation> - </message> - <message> - <source>You need to rebuild the database using -reindex to change -txindex</source> - <translation>改變 -txindex 參數後，必須要用 -reindex 參數來重建資料庫</translation> - </message> - <message> <source>Zapping all transactions from wallet...</source> <translation>正在砍掉錢包中的所有交易...</translation> </message> <message> - <source>ZeroMQ notification options:</source> - <translation>ZeroMQ 通知選項:</translation> - </message> - <message> - <source>Password for JSON-RPC connections</source> - <translation>JSON-RPC 連線密碼</translation> - </message> - <message> - <source>Execute command when the best block changes (%s in cmd is replaced by block hash)</source> - <translation>當最新區塊改變時要執行的指令(指令中的 %s 會被取代成區塊雜湊值)</translation> - </message> - <message> - <source>Allow DNS lookups for -addnode, -seednode and -connect</source> - <translation>允許對 -addnode, -seednode, -connect 的參數使用域名查詢 </translation> - </message> - <message> - <source>(1 = keep tx meta data e.g. account owner and payment request information, 2 = drop tx meta data)</source> - <translation>(1 表示保留交易描述資料，像是帳戶使用者和付款請求資訊；2 表示丟掉交易描述資料)</translation> - </message> - <message> <source>-maxtxfee is set very high! Fees this large could be paid on a single transaction.</source> <translation>參數 -maxtxfee 設定了很高的金額！這可是你一次交易就有可能付出的最高手續費。</translation> </message> <message> - <source>Bind to given address to listen for JSON-RPC connections. This option is ignored unless -rpcallowip is also passed. Port is optional and overrides -rpcport. Use [host]:port notation for IPv6. This option can be specified multiple times (default: 127.0.0.1 and ::1 i.e., localhost, or if -rpcallowip has been specified, 0.0.0.0 and :: i.e., all addresses)</source> - <translation>和指定的位址繫結以聽候 JSON-RPC 連線。必須同時指定 -rpcallowip 這項設定才有作用。不一定要指定埠號，指定的話會覆蓋掉 -rpcport 設定。IPv6 請用 [主機]:通訊埠 這種格式。這個選項可以設定多次。(預設值: 127.0.0.1 和 ::1，也就是 localhost。當有指定 -rpcallowip 時，預設值為 0.0.0.0 和 ::，也就是所有位址)</translation> - </message> - <message> - <source>Do not keep transactions in the mempool longer than <n> hours (default: %u)</source> - <translation>不要讓交易留在記憶池中超過 <n> 個小時(預設值: %u)</translation> - </message> - <message> - <source>Equivalent bytes per sigop in transactions for relay and mining (default: %u)</source> - <translation>轉發和開採時，交易資料中每個 sigop 的等同位元組數(預設值: %u)</translation> - </message> - <message> <source>Error loading %s: You can't enable HD on an already existing non-HD wallet</source> <translation>載入 %s 發生錯誤：不能對已存在的非 HD 錢包啟用 HD 功能。</translation> </message> <message> - <source>Error loading wallet %s. -wallet parameter must only specify a filename (not a path).</source> - <translation>載入錢包檔 %s 失敗。-wallet 參數只能指定檔案名稱(不包含路徑)。</translation> - </message> - <message> - <source>Fees (in %s/kB) smaller than this are considered zero fee for transaction creation (default: %s)</source> - <translation>當製造交易時，如果每千位元組(kB)的手續費比這個值(單位是 %s)低，就視為沒付手續費(預設值: %s)</translation> - </message> - <message> - <source>Force relay of transactions from whitelisted peers even if they violate local relay policy (default: %d)</source> - <translation>強制轉發從白名點節點收到的交易，即使它們違反了本機的轉發準則(預設值: %d)</translation> - </message> - <message> - <source>How thorough the block verification of -checkblocks is (0-4, default: %u)</source> - <translation>使用 -checkblocks 檢查區塊的仔細程度(0 到 4，預設值: %u)</translation> - </message> - <message> - <source>Maintain a full transaction index, used by the getrawtransaction rpc call (default: %u)</source> - <translation>維護全部交易的索引，用在 getrawtransaction 這個 RPC 請求(預設值: %u)</translation> - </message> - <message> - <source>Number of seconds to keep misbehaving peers from reconnecting (default: %u)</source> - <translation>避免與亂搞的節點連線的秒數(預設: %u)</translation> - </message> - <message> - <source>Output debugging information (default: %u, supplying <category> is optional)</source> - <translation>輸出除錯資訊(預設值: %u, 不一定要指定 <category>)</translation> - </message> - <message> - <source>Set maximum BIP141 block weight to this * 4. Deprecated, use blockmaxweight</source> - <translation>設定 BIP141 區塊重量的最大值為指定值乘以 4。此設定即將淘汰，請改用 blockmaxweight</translation> - </message> - <message> - <source>Sets the serialization of raw transaction or block hex returned in non-verbose mode, non-segwit(0) or segwit(1) (default: %d)</source> - <translation>設定非冗長模式時，回傳的交易原始資料或區塊位元值的序列化形式：無 segwit 為 0，或是有 segwit 為 1 (預設值: %d)</translation> - </message> - <message> - <source>Specify directory to hold wallets (default: <datadir>/wallets if it exists, otherwise <datadir>)</source> - <translation>指定用來放錢包檔的目錄(預設值: 如果存在的話就用 <datadir>/wallets, 否則為 <datadir>)</translation> - </message> - <message> - <source>Specify location of debug log file: this can be an absolute path or a path relative to the data directory (default: %s)</source> - <translation>指定除錯紀錄檔的位址: 可以用絕對路徑，也可以用相對於資料路徑的相對路徑(預設值: %s)</translation> - </message> - <message> - <source>Support filtering of blocks and transaction with bloom filters (default: %u)</source> - <translation>支援用布倫過濾器來過濾區塊和交易(預設值: %u)</translation> - </message> - <message> - <source>The fee rate (in %s/kB) that indicates your tolerance for discarding change by adding it to the fee (default: %s). Note: An output is discarded if it is dust at this rate, but we will always discard up to the dust relay fee and a discard fee above that is limited by the fee estimate for the longest target</source> - <translation>容許自動免找零成為手續費的交易手續費率(單位: %s/kB, 預設值: %s)。注意: 如果在該費率下，找零的零錢會成為零散錢，則自動棄掉成為手續費。但棄掉的零錢費率永遠不會大於零散錢的轉發費率，金額也不會大於最長預估確認時間所需的手續費</translation> - </message> - <message> <source>This is the transaction fee you may pay when fee estimates are not available.</source> <translation>這是當預估手續費還沒計算出來時，付款交易預設會付的手續費。</translation> </message> @@ -3931,10 +3562,6 @@ <translation>網路版本字串的總長度(%i)超過最大長度(%i)了。請減少 uacomment 參數的數目或長度。</translation> </message> <message> - <source>Tries to keep outbound traffic under the given target (in MiB per 24h), 0 = no limit (default: %d)</source> - <translation>試著保持輸出流量在目標值以下，單位是每 24 小時的百萬位元組(MiB)數，0 表示沒有限制(預設值: %d)</translation> - </message> - <message> <source>Unsupported argument -socks found. Setting SOCKS version isn't possible anymore, only SOCKS5 proxies are supported.</source> <translation>找到不再支援的 -socks 參數。現在只支援 SOCKS5 協定的代理伺服器，因此不可以指定 SOCKS 協定版本了。</translation> </message> @@ -3943,10 +3570,6 @@ <translation>忽略不支援的參數 -whitelistalwaysrelay，請改用 -whitelistrelay 和 -whitelistforcerelay 的組合。</translation> </message> <message> - <source>Use separate SOCKS5 proxy to reach peers via Tor hidden services (default: %s)</source> - <translation>使用另外的 SOCK5 代理伺服器，來透過 Tor 隱藏服務跟其他節點聯絡(預設值: %s)</translation> - </message> - <message> <source>Warning: Unknown block versions being mined! It's possible unknown rules are in effect</source> <translation>警告: 有礦工正在開採不明版本的區塊！這表示有不明的交易規則正在作用中</translation> </message> @@ -3955,110 +3578,18 @@ <translation>警告: 錢包檔壞掉，但資料被救回來了！原來的檔案 %s 改儲存為 %s，在目錄 %s 下。 如果餘額或交易資料有誤的話，你應該要從備份資料復原回來。</translation> </message> <message> - <source>Whitelist peers connecting from the given IP address (e.g. 1.2.3.4) or CIDR notated network (e.g. 1.2.3.0/24). Can be specified multiple times.</source> - <translation>把來自指定位址(例如：1.2.3.4)或 CIDR 格式網段(例如：1.2.3.0/24)的節點放進白名單。這個選項可以設定多次。</translation> - </message> - <message> <source>%s is set very high!</source> <translation>%s 的設定值異常大！</translation> </message> <message> - <source>(default: %s)</source> - <translation>(預設值: %s)</translation> - </message> - <message> - <source>Always query for peer addresses via DNS lookup (default: %u)</source> - <translation>是否一定要用域名查詢來搜尋節點(預設值: %u)</translation> - </message> - <message> - <source>Error loading wallet %s. -wallet filename must be a regular file.</source> - <translation>載入錢包檔 %s 失敗。-wallet 參數檔名的檔案必須是一般檔案。</translation> - </message> - <message> <source>Error loading wallet %s. Duplicate -wallet filename specified.</source> <translation>載入錢包檔 %s 失敗。-wallet 參數指定了重複的檔名。</translation> </message> <message> - <source>Error loading wallet %s. Invalid characters in -wallet filename.</source> - <translation>載入錢包檔 %s 失敗。-wallet 參數檔名含有無效的字元。</translation> - </message> - <message> - <source>How many blocks to check at startup (default: %u, 0 = all)</source> - <translation>啓動時檢查的區塊數(預設值: %u, 指定 0 表示全部)</translation> - </message> - <message> - <source>Include IP addresses in debug output (default: %u)</source> - <translation>在除錯輸出內容中包含網際網路位址(預設值: %u)</translation> - </message> - <message> <source>Keypool ran out, please call keypoolrefill first</source> <translation>密鑰池已經乾了，請先執行 keypoolrefill</translation> </message> <message> - <source>Listen for JSON-RPC connections on <port> (default: %u or testnet: %u)</source> - <translation>在通訊埠 <port> 聽候 JSON-RPC 連線(預設值: %u, 或若為測試網路: %u)</translation> - </message> - <message> - <source>Listen for connections on <port> (default: %u or testnet: %u)</source> - <translation>在通訊埠 <port> 聽候連線(預設值: %u, 或若為測試網路: %u)</translation> - </message> - <message> - <source>Maintain at most <n> connections to peers (default: %u)</source> - <translation>維持與節點連線數的上限為 <n> 個(預設值: %u)</translation> - </message> - <message> - <source>Make the wallet broadcast transactions</source> - <translation>讓錢包能公告交易</translation> - </message> - <message> - <source>Maximum per-connection receive buffer, <n>*1000 bytes (default: %u)</source> - <translation>每個連線的接收緩衝區大小上限為 <n>*1000 個位元組(預設值: %u)</translation> - </message> - <message> - <source>Maximum per-connection send buffer, <n>*1000 bytes (default: %u)</source> - <translation>每個連線的傳送緩衝區大小上限為 <n>*1000 個位元組(預設值: %u)</translation> - </message> - <message> - <source>Prepend debug output with timestamp (default: %u)</source> - <translation>在除錯輸出內容前附加時間(預設值: %u)</translation> - </message> - <message> - <source>Relay and mine data carrier transactions (default: %u)</source> - <translation>允許轉發和開採只帶資料的交易(預設值: %u)</translation> - </message> - <message> - <source>Relay non-P2SH multisig (default: %u)</source> - <translation>允許轉發非 P2SH 的多簽章交易(預設值: %u)</translation> - </message> - <message> - <source>Set key pool size to <n> (default: %u)</source> - <translation>設定密鑰池大小為 <n> (預設值: %u)</translation> - </message> - <message> - <source>Set maximum BIP141 block weight (default: %d)</source> - <translation>設定 BIP141 區塊重量的最大值(預設值: %d)</translation> - </message> - <message> - <source>Set the number of threads to service RPC calls (default: %d)</source> - <translation>設定處理 RPC 服務請求的執行緒數目(預設值: %d)</translation> - </message> - <message> - <source>Specify configuration file (default: %s)</source> - <translation>指定設定檔(預設值: %s)</translation> - </message> - <message> - <source>Specify connection timeout in milliseconds (minimum: 1, default: %d)</source> - <translation>指定連線在幾毫秒後逾時 (最少值: 1, 預設值: %d)</translation> - </message> - <message> - <source>Specify pid file (default: %s)</source> - <translation>指定行程識別碼檔案(預設值: %s)</translation> - </message> - <message> - <source>Spend unconfirmed change when sending transactions (default: %u)</source> - <translation>傳送交易時可以花還沒確認的零錢(預設值: %u)</translation> - </message> - <message> <source>Starting network threads...</source> <translation>正在啟動網路執行緒...</translation> </message> @@ -4075,10 +3606,6 @@ <translation>這是你交易付款時所要付的手續費。</translation> </message> <message> - <source>Threshold for disconnecting misbehaving peers (default: %u)</source> - <translation>與亂搞的節點斷線的臨界值 (預設: %u)</translation> - </message> - <message> <source>Transaction amounts must not be negative</source> <translation>交易金額不能是負的</translation> </message> @@ -4099,6 +3626,26 @@ <translation>累積金額不足</translation> </message> <message> + <source>Can't generate a change-address key. Private keys are disabled for this wallet.</source> + <translation>沒辦法造出密鑰給找零位址使用，因為目前這個錢包不允許有私鑰。</translation> + </message> + <message> + <source>Cannot upgrade a non HD split wallet without upgrading to support pre split keypool. Please use -upgradewallet=169900 or -upgradewallet with no version specified.</source> + <translation>無法將一個非 HD 分支錢包升級成不支援預先分支密鑰池的 HD 分支錢包版本。請用 -upgradewallet=169900 參數或是不指定版本的 -upgradewallet 參數來升級錢包。</translation> + </message> + <message> + <source>Fee estimation failed. Fallbackfee is disabled. Wait a few blocks or enable -fallbackfee.</source> + <translation>計算預估手續費失敗了，也沒有備用手續費(fallbackfee)可用。請再多等待幾個區塊，或是啟用 -fallbackfee 參數。</translation> + </message> + <message> + <source>Warning: Private keys detected in wallet {%s} with disabled private keys</source> + <translation>警告: 在不允許私鑰的錢包 {%s} 中發現有私鑰</translation> + </message> + <message> + <source>Cannot write to data directory '%s'; check permissions.</source> + <translation>沒辦法寫入資料目錄 '%s'，請檢查是否有權限。</translation> + </message> + <message> <source>Loading block index...</source> <translation>正在載入區塊索引...</translation> </message> diff --git a/src/qt/macnotificationhandler.h b/src/qt/macnotificationhandler.h index 1e25d3e7a4..23993adc2e 100644 --- a/src/qt/macnotificationhandler.h +++ b/src/qt/macnotificationhandler.h @@ -1,4 +1,4 @@ -// Copyright (c) 2011-2017 The Bitcoin Core developers +// Copyright (c) 2011-2018 The Bitcoin Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/qt/modaloverlay.cpp b/src/qt/modaloverlay.cpp index e9d03c5828..dec9d78326 100644 --- a/src/qt/modaloverlay.cpp +++ b/src/qt/modaloverlay.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2016-2017 The Bitcoin Core developers +// Copyright (c) 2016-2018 The Bitcoin Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/qt/modaloverlay.h b/src/qt/modaloverlay.h index 63465ab66e..66a6ad1e02 100644 --- a/src/qt/modaloverlay.h +++ b/src/qt/modaloverlay.h @@ -1,4 +1,4 @@ -// Copyright (c) 2016-2017 The Bitcoin Core developers +// Copyright (c) 2016-2018 The Bitcoin Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/qt/networkstyle.cpp b/src/qt/networkstyle.cpp index c4b732e3e0..b134a139b0 100644 --- a/src/qt/networkstyle.cpp +++ b/src/qt/networkstyle.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2014-2017 The Bitcoin Core developers +// Copyright (c) 2014-2018 The Bitcoin Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/qt/notificator.cpp b/src/qt/notificator.cpp index 64a8e5d989..94505043dc 100644 --- a/src/qt/notificator.cpp +++ b/src/qt/notificator.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2011-2017 The Bitcoin Core developers +// Copyright (c) 2011-2018 The Bitcoin Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/qt/notificator.h b/src/qt/notificator.h index 3da24cd1a1..10b7b6c50a 100644 --- a/src/qt/notificator.h +++ b/src/qt/notificator.h @@ -1,4 +1,4 @@ -// Copyright (c) 2011-2017 The Bitcoin Core developers +// Copyright (c) 2011-2018 The Bitcoin Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/qt/openuridialog.cpp b/src/qt/openuridialog.cpp index d211f908c8..48db95679f 100644 --- a/src/qt/openuridialog.cpp +++ b/src/qt/openuridialog.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2011-2017 The Bitcoin Core developers +// Copyright (c) 2011-2018 The Bitcoin Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/qt/optionsdialog.cpp b/src/qt/optionsdialog.cpp index a57343f036..d1477d362d 100644 --- a/src/qt/optionsdialog.cpp +++ b/src/qt/optionsdialog.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2011-2017 The Bitcoin Core developers +// Copyright (c) 2011-2018 The Bitcoin Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. @@ -115,6 +115,10 @@ OptionsDialog::OptionsDialog(QWidget *parent, bool enableWallet) : mapper->setSubmitPolicy(QDataWidgetMapper::ManualSubmit); mapper->setOrientation(Qt::Vertical); + GUIUtil::ItemDelegate* delegate = new GUIUtil::ItemDelegate(mapper); + connect(delegate, &GUIUtil::ItemDelegate::keyEscapePressed, this, &OptionsDialog::reject); + mapper->setItemDelegate(delegate); + /* setup/change UI elements when proxy IPs are invalid/valid */ ui->proxyIp->setCheckValidator(new ProxyAddressValidator(parent)); ui->proxyIpTor->setCheckValidator(new ProxyAddressValidator(parent)); @@ -170,6 +174,16 @@ void OptionsDialog::setModel(OptionsModel *_model) connect(ui->thirdPartyTxUrls, SIGNAL(textChanged(const QString &)), this, SLOT(showRestartWarning())); } +void OptionsDialog::setCurrentTab(OptionsDialog::Tab tab) +{ + QWidget *tab_widget = nullptr; + if (tab == OptionsDialog::Tab::TAB_NETWORK) tab_widget = ui->tabNetwork; + if (tab == OptionsDialog::Tab::TAB_MAIN) tab_widget = ui->tabMain; + if (tab_widget && ui->tabWidget->currentWidget() != tab_widget) { + ui->tabWidget->setCurrentWidget(tab_widget); + } +} + void OptionsDialog::setMapper() { /* Main */ diff --git a/src/qt/optionsdialog.h b/src/qt/optionsdialog.h index 54e1a8a9b1..9bc1c8ae4f 100644 --- a/src/qt/optionsdialog.h +++ b/src/qt/optionsdialog.h @@ -1,4 +1,4 @@ -// Copyright (c) 2011-2017 The Bitcoin Core developers +// Copyright (c) 2011-2018 The Bitcoin Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. @@ -40,8 +40,14 @@ public: explicit OptionsDialog(QWidget *parent, bool enableWallet); ~OptionsDialog(); + enum Tab { + TAB_MAIN, + TAB_NETWORK, + }; + void setModel(OptionsModel *model); void setMapper(); + void setCurrentTab(OptionsDialog::Tab tab); private Q_SLOTS: /* set OK button state (enabled / disabled) */ diff --git a/src/qt/optionsmodel.cpp b/src/qt/optionsmodel.cpp index 834ff7633c..d04a2cf862 100644 --- a/src/qt/optionsmodel.cpp +++ b/src/qt/optionsmodel.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2011-2017 The Bitcoin Core developers +// Copyright (c) 2011-2018 The Bitcoin Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/qt/optionsmodel.h b/src/qt/optionsmodel.h index 2777cbeaf2..2421734527 100644 --- a/src/qt/optionsmodel.h +++ b/src/qt/optionsmodel.h @@ -1,4 +1,4 @@ -// Copyright (c) 2011-2017 The Bitcoin Core developers +// Copyright (c) 2011-2018 The Bitcoin Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/qt/overviewpage.cpp b/src/qt/overviewpage.cpp index 8e8788dad3..ba47935196 100644 --- a/src/qt/overviewpage.cpp +++ b/src/qt/overviewpage.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2011-2017 The Bitcoin Core developers +// Copyright (c) 2011-2018 The Bitcoin Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/qt/overviewpage.h b/src/qt/overviewpage.h index d519eca43a..75100ae6f7 100644 --- a/src/qt/overviewpage.h +++ b/src/qt/overviewpage.h @@ -1,4 +1,4 @@ -// Copyright (c) 2011-2017 The Bitcoin Core developers +// Copyright (c) 2011-2018 The Bitcoin Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/qt/paymentrequestplus.cpp b/src/qt/paymentrequestplus.cpp index dfeb70d669..944bcc8ad0 100644 --- a/src/qt/paymentrequestplus.cpp +++ b/src/qt/paymentrequestplus.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2011-2017 The Bitcoin Core developers +// Copyright (c) 2011-2018 The Bitcoin Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/qt/paymentrequestplus.h b/src/qt/paymentrequestplus.h index b1b60cf582..3014628807 100644 --- a/src/qt/paymentrequestplus.h +++ b/src/qt/paymentrequestplus.h @@ -1,4 +1,4 @@ -// Copyright (c) 2011-2017 The Bitcoin Core developers +// Copyright (c) 2011-2018 The Bitcoin Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/qt/paymentserver.cpp b/src/qt/paymentserver.cpp index e5e6430959..5bf2bb8a0e 100644 --- a/src/qt/paymentserver.cpp +++ b/src/qt/paymentserver.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2011-2017 The Bitcoin Core developers +// Copyright (c) 2011-2018 The Bitcoin Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/qt/paymentserver.h b/src/qt/paymentserver.h index 511fc5bd6e..d335db9c85 100644 --- a/src/qt/paymentserver.h +++ b/src/qt/paymentserver.h @@ -1,4 +1,4 @@ -// Copyright (c) 2011-2017 The Bitcoin Core developers +// Copyright (c) 2011-2018 The Bitcoin Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/qt/peertablemodel.cpp b/src/qt/peertablemodel.cpp index 1c90504e9e..715fc8b5e0 100644 --- a/src/qt/peertablemodel.cpp +++ b/src/qt/peertablemodel.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2011-2017 The Bitcoin Core developers +// Copyright (c) 2011-2018 The Bitcoin Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/qt/peertablemodel.h b/src/qt/peertablemodel.h index 69c9744c8f..738a06496f 100644 --- a/src/qt/peertablemodel.h +++ b/src/qt/peertablemodel.h @@ -1,4 +1,4 @@ -// Copyright (c) 2011-2017 The Bitcoin Core developers +// Copyright (c) 2011-2018 The Bitcoin Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/qt/platformstyle.cpp b/src/qt/platformstyle.cpp index a3a10aac18..56e0830cdc 100644 --- a/src/qt/platformstyle.cpp +++ b/src/qt/platformstyle.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2015-2017 The Bitcoin Core developers +// Copyright (c) 2015-2018 The Bitcoin Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/qt/qvalidatedlineedit.cpp b/src/qt/qvalidatedlineedit.cpp index 8a13cd340f..de42490361 100644 --- a/src/qt/qvalidatedlineedit.cpp +++ b/src/qt/qvalidatedlineedit.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2011-2017 The Bitcoin Core developers +// Copyright (c) 2011-2018 The Bitcoin Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/qt/qvalidatedlineedit.h b/src/qt/qvalidatedlineedit.h index 9ad9e66ae2..815d5e0040 100644 --- a/src/qt/qvalidatedlineedit.h +++ b/src/qt/qvalidatedlineedit.h @@ -1,4 +1,4 @@ -// Copyright (c) 2011-2015 The Bitcoin Core developers +// Copyright (c) 2011-2018 The Bitcoin Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/qt/qvaluecombobox.cpp b/src/qt/qvaluecombobox.cpp index 72c3a9d835..c2c0e84d65 100644 --- a/src/qt/qvaluecombobox.cpp +++ b/src/qt/qvaluecombobox.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2011-2017 The Bitcoin Core developers +// Copyright (c) 2011-2018 The Bitcoin Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/qt/receivecoinsdialog.cpp b/src/qt/receivecoinsdialog.cpp index 8c430e0af1..12de189229 100644 --- a/src/qt/receivecoinsdialog.cpp +++ b/src/qt/receivecoinsdialog.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2011-2017 The Bitcoin Core developers +// Copyright (c) 2011-2018 The Bitcoin Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/qt/receivecoinsdialog.h b/src/qt/receivecoinsdialog.h index 931f5aa101..bc0f6248f0 100644 --- a/src/qt/receivecoinsdialog.h +++ b/src/qt/receivecoinsdialog.h @@ -1,4 +1,4 @@ -// Copyright (c) 2011-2017 The Bitcoin Core developers +// Copyright (c) 2011-2018 The Bitcoin Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/qt/receiverequestdialog.cpp b/src/qt/receiverequestdialog.cpp index f9610f2d3b..5bc5568e9a 100644 --- a/src/qt/receiverequestdialog.cpp +++ b/src/qt/receiverequestdialog.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2011-2017 The Bitcoin Core developers +// Copyright (c) 2011-2018 The Bitcoin Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/qt/receiverequestdialog.h b/src/qt/receiverequestdialog.h index 23c5529535..5662af18b7 100644 --- a/src/qt/receiverequestdialog.h +++ b/src/qt/receiverequestdialog.h @@ -1,4 +1,4 @@ -// Copyright (c) 2011-2017 The Bitcoin Core developers +// Copyright (c) 2011-2018 The Bitcoin Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/qt/recentrequeststablemodel.cpp b/src/qt/recentrequeststablemodel.cpp index 1c910926d4..f0d2aba370 100644 --- a/src/qt/recentrequeststablemodel.cpp +++ b/src/qt/recentrequeststablemodel.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2011-2017 The Bitcoin Core developers +// Copyright (c) 2011-2018 The Bitcoin Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/qt/recentrequeststablemodel.h b/src/qt/recentrequeststablemodel.h index 80c7834a19..ff2c0c8098 100644 --- a/src/qt/recentrequeststablemodel.h +++ b/src/qt/recentrequeststablemodel.h @@ -1,4 +1,4 @@ -// Copyright (c) 2011-2017 The Bitcoin Core developers +// Copyright (c) 2011-2018 The Bitcoin Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/qt/rpcconsole.cpp b/src/qt/rpcconsole.cpp index f222357f27..2b0307d286 100644 --- a/src/qt/rpcconsole.cpp +++ b/src/qt/rpcconsole.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2011-2017 The Bitcoin Core developers +// Copyright (c) 2011-2018 The Bitcoin Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/qt/rpcconsole.h b/src/qt/rpcconsole.h index 0a1a469934..0671b47782 100644 --- a/src/qt/rpcconsole.h +++ b/src/qt/rpcconsole.h @@ -1,4 +1,4 @@ -// Copyright (c) 2011-2017 The Bitcoin Core developers +// Copyright (c) 2011-2018 The Bitcoin Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/qt/sendcoinsdialog.cpp b/src/qt/sendcoinsdialog.cpp index 5c946f7c77..da155f872c 100644 --- a/src/qt/sendcoinsdialog.cpp +++ b/src/qt/sendcoinsdialog.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2011-2017 The Bitcoin Core developers +// Copyright (c) 2011-2018 The Bitcoin Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/qt/sendcoinsdialog.h b/src/qt/sendcoinsdialog.h index 40a1d10c2b..7009855f17 100644 --- a/src/qt/sendcoinsdialog.h +++ b/src/qt/sendcoinsdialog.h @@ -1,4 +1,4 @@ -// Copyright (c) 2011-2017 The Bitcoin Core developers +// Copyright (c) 2011-2018 The Bitcoin Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/qt/sendcoinsentry.cpp b/src/qt/sendcoinsentry.cpp index e8c85bc2a1..d53f91dffa 100644 --- a/src/qt/sendcoinsentry.cpp +++ b/src/qt/sendcoinsentry.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2011-2017 The Bitcoin Core developers +// Copyright (c) 2011-2018 The Bitcoin Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/qt/sendcoinsentry.h b/src/qt/sendcoinsentry.h index 76f96c61e0..48ecd598d6 100644 --- a/src/qt/sendcoinsentry.h +++ b/src/qt/sendcoinsentry.h @@ -1,4 +1,4 @@ -// Copyright (c) 2011-2017 The Bitcoin Core developers +// Copyright (c) 2011-2018 The Bitcoin Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/qt/signverifymessagedialog.cpp b/src/qt/signverifymessagedialog.cpp index 223b39dc86..487fc9ee1e 100644 --- a/src/qt/signverifymessagedialog.cpp +++ b/src/qt/signverifymessagedialog.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2011-2017 The Bitcoin Core developers +// Copyright (c) 2011-2018 The Bitcoin Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/qt/splashscreen.cpp b/src/qt/splashscreen.cpp index 831ef68cab..e438d22919 100644 --- a/src/qt/splashscreen.cpp +++ b/src/qt/splashscreen.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2011-2017 The Bitcoin Core developers +// Copyright (c) 2011-2018 The Bitcoin Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/qt/splashscreen.h b/src/qt/splashscreen.h index 9ef19675d8..c28b6e5660 100644 --- a/src/qt/splashscreen.h +++ b/src/qt/splashscreen.h @@ -1,4 +1,4 @@ -// Copyright (c) 2011-2017 The Bitcoin Core developers +// Copyright (c) 2011-2018 The Bitcoin Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/qt/test/compattests.cpp b/src/qt/test/compattests.cpp index 3e601583c3..af5c69ea9a 100644 --- a/src/qt/test/compattests.cpp +++ b/src/qt/test/compattests.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2016-2017 The Bitcoin Core developers +// Copyright (c) 2016-2018 The Bitcoin Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/qt/test/paymentrequestdata.h b/src/qt/test/paymentrequestdata.h index 8e5a259f68..7f45d30973 100644 --- a/src/qt/test/paymentrequestdata.h +++ b/src/qt/test/paymentrequestdata.h @@ -1,4 +1,4 @@ -// Copyright (c) 2009-2015 The Bitcoin Core developers +// Copyright (c) 2009-2018 The Bitcoin Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/qt/test/paymentservertests.cpp b/src/qt/test/paymentservertests.cpp index 83484b5ce7..e92f9d7a5b 100644 --- a/src/qt/test/paymentservertests.cpp +++ b/src/qt/test/paymentservertests.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2009-2017 The Bitcoin Core developers +// Copyright (c) 2009-2018 The Bitcoin Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/qt/test/paymentservertests.h b/src/qt/test/paymentservertests.h index f022d2687b..7ef7a0a641 100644 --- a/src/qt/test/paymentservertests.h +++ b/src/qt/test/paymentservertests.h @@ -1,4 +1,4 @@ -// Copyright (c) 2009-2017 The Bitcoin Core developers +// Copyright (c) 2009-2018 The Bitcoin Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/qt/test/rpcnestedtests.cpp b/src/qt/test/rpcnestedtests.cpp index 974e7831c4..2e321c1ba1 100644 --- a/src/qt/test/rpcnestedtests.cpp +++ b/src/qt/test/rpcnestedtests.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2016-2017 The Bitcoin Core developers +// Copyright (c) 2016-2018 The Bitcoin Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/qt/test/rpcnestedtests.h b/src/qt/test/rpcnestedtests.h index 7b3b38f62e..e33f4e3da1 100644 --- a/src/qt/test/rpcnestedtests.h +++ b/src/qt/test/rpcnestedtests.h @@ -1,4 +1,4 @@ -// Copyright (c) 2016-2017 The Bitcoin Core developers +// Copyright (c) 2016-2018 The Bitcoin Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/qt/test/test_main.cpp b/src/qt/test/test_main.cpp index f0ac43a58c..df65a85fb5 100644 --- a/src/qt/test/test_main.cpp +++ b/src/qt/test/test_main.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2009-2017 The Bitcoin Core developers +// Copyright (c) 2009-2018 The Bitcoin Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/qt/test/uritests.cpp b/src/qt/test/uritests.cpp index 59938f704a..b87d3b21ca 100644 --- a/src/qt/test/uritests.cpp +++ b/src/qt/test/uritests.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2009-2017 The Bitcoin Core developers +// Copyright (c) 2009-2018 The Bitcoin Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/qt/trafficgraphwidget.cpp b/src/qt/trafficgraphwidget.cpp index a5551ec014..35569149fc 100644 --- a/src/qt/trafficgraphwidget.cpp +++ b/src/qt/trafficgraphwidget.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2011-2017 The Bitcoin Core developers +// Copyright (c) 2011-2018 The Bitcoin Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/qt/transactiondesc.cpp b/src/qt/transactiondesc.cpp index 8297f75799..6286ddc0e0 100644 --- a/src/qt/transactiondesc.cpp +++ b/src/qt/transactiondesc.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2011-2017 The Bitcoin Core developers +// Copyright (c) 2011-2018 The Bitcoin Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/qt/transactiondesc.h b/src/qt/transactiondesc.h index cb8453cb81..80eca7b97c 100644 --- a/src/qt/transactiondesc.h +++ b/src/qt/transactiondesc.h @@ -1,4 +1,4 @@ -// Copyright (c) 2011-2014 The Bitcoin Core developers +// Copyright (c) 2011-2018 The Bitcoin Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/qt/transactiondescdialog.cpp b/src/qt/transactiondescdialog.cpp index 7bf4d3351c..ca72720e00 100644 --- a/src/qt/transactiondescdialog.cpp +++ b/src/qt/transactiondescdialog.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2011-2017 The Bitcoin Core developers +// Copyright (c) 2011-2018 The Bitcoin Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/qt/transactionfilterproxy.cpp b/src/qt/transactionfilterproxy.cpp index 6301af7553..a631f497af 100644 --- a/src/qt/transactionfilterproxy.cpp +++ b/src/qt/transactionfilterproxy.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2011-2017 The Bitcoin Core developers +// Copyright (c) 2011-2018 The Bitcoin Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/qt/transactionfilterproxy.h b/src/qt/transactionfilterproxy.h index 226cf3f3b5..9febd59820 100644 --- a/src/qt/transactionfilterproxy.h +++ b/src/qt/transactionfilterproxy.h @@ -1,4 +1,4 @@ -// Copyright (c) 2011-2017 The Bitcoin Core developers +// Copyright (c) 2011-2018 The Bitcoin Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/qt/transactionrecord.cpp b/src/qt/transactionrecord.cpp index 65f5e87d15..c767de5eda 100644 --- a/src/qt/transactionrecord.cpp +++ b/src/qt/transactionrecord.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2011-2017 The Bitcoin Core developers +// Copyright (c) 2011-2018 The Bitcoin Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/qt/transactionrecord.h b/src/qt/transactionrecord.h index a6424e74fa..e187309d3f 100644 --- a/src/qt/transactionrecord.h +++ b/src/qt/transactionrecord.h @@ -1,4 +1,4 @@ -// Copyright (c) 2011-2017 The Bitcoin Core developers +// Copyright (c) 2011-2018 The Bitcoin Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/qt/transactiontablemodel.cpp b/src/qt/transactiontablemodel.cpp index 63a4afe191..e100cac533 100644 --- a/src/qt/transactiontablemodel.cpp +++ b/src/qt/transactiontablemodel.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2011-2017 The Bitcoin Core developers +// Copyright (c) 2011-2018 The Bitcoin Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/qt/transactiontablemodel.h b/src/qt/transactiontablemodel.h index 8b029be5f5..8be3a7ab2e 100644 --- a/src/qt/transactiontablemodel.h +++ b/src/qt/transactiontablemodel.h @@ -1,4 +1,4 @@ -// Copyright (c) 2011-2017 The Bitcoin Core developers +// Copyright (c) 2011-2018 The Bitcoin Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/qt/transactionview.cpp b/src/qt/transactionview.cpp index 2fd2b815aa..23c50f55ba 100644 --- a/src/qt/transactionview.cpp +++ b/src/qt/transactionview.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2011-2017 The Bitcoin Core developers +// Copyright (c) 2011-2018 The Bitcoin Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/qt/transactionview.h b/src/qt/transactionview.h index 9819fb4325..fdd8b069c7 100644 --- a/src/qt/transactionview.h +++ b/src/qt/transactionview.h @@ -1,4 +1,4 @@ -// Copyright (c) 2011-2017 The Bitcoin Core developers +// Copyright (c) 2011-2018 The Bitcoin Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/qt/utilitydialog.cpp b/src/qt/utilitydialog.cpp index 1da25b0761..7d903b3b1c 100644 --- a/src/qt/utilitydialog.cpp +++ b/src/qt/utilitydialog.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2011-2017 The Bitcoin Core developers +// Copyright (c) 2011-2018 The Bitcoin Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. @@ -70,8 +70,7 @@ HelpMessageDialog::HelpMessageDialog(interfaces::Node& node, QWidget *parent, bo ui->helpMessage->setVisible(false); } else { setWindowTitle(tr("Command-line options")); - QString header = "Usage:\n" - " bitcoin-qt [command-line options] \n"; + QString header = "Usage: bitcoin-qt [command-line options] \n"; QTextCursor cursor(ui->helpMessage->document()); cursor.insertText(version); cursor.insertBlock(); @@ -80,7 +79,7 @@ HelpMessageDialog::HelpMessageDialog(interfaces::Node& node, QWidget *parent, bo std::string strUsage = gArgs.GetHelpMessage(); QString coreOptions = QString::fromStdString(strUsage); - text = version + "\n" + header + "\n" + coreOptions; + text = version + "\n\n" + header + "\n" + coreOptions; QTextTableFormat tf; tf.setBorderStyle(QTextFrameFormat::BorderStyle_None); diff --git a/src/qt/utilitydialog.h b/src/qt/utilitydialog.h index f5c8af4362..ad1fda4573 100644 --- a/src/qt/utilitydialog.h +++ b/src/qt/utilitydialog.h @@ -1,4 +1,4 @@ -// Copyright (c) 2011-2017 The Bitcoin Core developers +// Copyright (c) 2011-2018 The Bitcoin Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/qt/walletframe.cpp b/src/qt/walletframe.cpp index c5a13f61f4..e8fd83d427 100644 --- a/src/qt/walletframe.cpp +++ b/src/qt/walletframe.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2011-2017 The Bitcoin Core developers +// Copyright (c) 2011-2018 The Bitcoin Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/qt/walletframe.h b/src/qt/walletframe.h index 6eedcf370c..05ca569d7a 100644 --- a/src/qt/walletframe.h +++ b/src/qt/walletframe.h @@ -1,4 +1,4 @@ -// Copyright (c) 2011-2016 The Bitcoin Core developers +// Copyright (c) 2011-2017 The Bitcoin Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/qt/walletmodel.cpp b/src/qt/walletmodel.cpp index 17df1bd4d1..d91cdcdc1f 100644 --- a/src/qt/walletmodel.cpp +++ b/src/qt/walletmodel.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2011-2017 The Bitcoin Core developers +// Copyright (c) 2011-2018 The Bitcoin Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/qt/walletmodel.h b/src/qt/walletmodel.h index 2d53a7dc4d..b22728c69b 100644 --- a/src/qt/walletmodel.h +++ b/src/qt/walletmodel.h @@ -1,4 +1,4 @@ -// Copyright (c) 2011-2017 The Bitcoin Core developers +// Copyright (c) 2011-2018 The Bitcoin Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/qt/walletmodeltransaction.cpp b/src/qt/walletmodeltransaction.cpp index d5187d6634..de50616499 100644 --- a/src/qt/walletmodeltransaction.cpp +++ b/src/qt/walletmodeltransaction.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2011-2017 The Bitcoin Core developers +// Copyright (c) 2011-2018 The Bitcoin Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/qt/walletmodeltransaction.h b/src/qt/walletmodeltransaction.h index 9f91326109..75ede2e2a1 100644 --- a/src/qt/walletmodeltransaction.h +++ b/src/qt/walletmodeltransaction.h @@ -1,4 +1,4 @@ -// Copyright (c) 2011-2017 The Bitcoin Core developers +// Copyright (c) 2011-2018 The Bitcoin Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/qt/walletview.cpp b/src/qt/walletview.cpp index c53a2910e5..9af29b5d60 100644 --- a/src/qt/walletview.cpp +++ b/src/qt/walletview.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2011-2017 The Bitcoin Core developers +// Copyright (c) 2011-2018 The Bitcoin Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/qt/walletview.h b/src/qt/walletview.h index 878a5966d6..e29c4c52f5 100644 --- a/src/qt/walletview.h +++ b/src/qt/walletview.h @@ -1,4 +1,4 @@ -// Copyright (c) 2011-2017 The Bitcoin Core developers +// Copyright (c) 2011-2018 The Bitcoin Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/qt/winshutdownmonitor.cpp b/src/qt/winshutdownmonitor.cpp index 122d6f0b12..d732326b33 100644 --- a/src/qt/winshutdownmonitor.cpp +++ b/src/qt/winshutdownmonitor.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2014-2017 The Bitcoin Core developers +// Copyright (c) 2014-2018 The Bitcoin Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/qt/winshutdownmonitor.h b/src/qt/winshutdownmonitor.h index c8a523a538..8edb98c744 100644 --- a/src/qt/winshutdownmonitor.h +++ b/src/qt/winshutdownmonitor.h @@ -1,4 +1,4 @@ -// Copyright (c) 2014 The Bitcoin Core developers +// Copyright (c) 2014-2018 The Bitcoin Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/random.cpp b/src/random.cpp index fee6c2d92a..6c5ad5ac96 100644 --- a/src/random.cpp +++ b/src/random.cpp @@ -1,5 +1,5 @@ // Copyright (c) 2009-2010 Satoshi Nakamoto -// Copyright (c) 2009-2017 The Bitcoin Core developers +// Copyright (c) 2009-2018 The Bitcoin Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/random.h b/src/random.h index 1d6b13a537..3d5421eb3e 100644 --- a/src/random.h +++ b/src/random.h @@ -1,5 +1,5 @@ // Copyright (c) 2009-2010 Satoshi Nakamoto -// Copyright (c) 2009-2017 The Bitcoin Core developers +// Copyright (c) 2009-2018 The Bitcoin Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/rest.cpp b/src/rest.cpp index a5f164497d..12358cf50d 100644 --- a/src/rest.cpp +++ b/src/rest.cpp @@ -1,5 +1,5 @@ // Copyright (c) 2009-2010 Satoshi Nakamoto -// Copyright (c) 2009-2017 The Bitcoin Core developers +// Copyright (c) 2009-2018 The Bitcoin Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. @@ -591,11 +591,10 @@ static const struct { {"/rest/getutxos", rest_getutxos}, }; -bool StartREST() +void StartREST() { for (unsigned int i = 0; i < ARRAYLEN(uri_prefixes); i++) RegisterHTTPHandler(uri_prefixes[i].prefix, false, uri_prefixes[i].handler); - return true; } void InterruptREST() diff --git a/src/rpc/blockchain.cpp b/src/rpc/blockchain.cpp index 012e3e3ac1..51bc218d39 100644 --- a/src/rpc/blockchain.cpp +++ b/src/rpc/blockchain.cpp @@ -1,5 +1,5 @@ // Copyright (c) 2010 Satoshi Nakamoto -// Copyright (c) 2009-2017 The Bitcoin Core developers +// Copyright (c) 2009-2018 The Bitcoin Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. @@ -20,6 +20,7 @@ #include <policy/policy.h> #include <primitives/transaction.h> #include <rpc/server.h> +#include <script/descriptor.h> #include <streams.h> #include <sync.h> #include <txdb.h> @@ -1639,6 +1640,35 @@ static T CalculateTruncatedMedian(std::vector<T>& scores) } } +void CalculatePercentilesByWeight(CAmount result[NUM_GETBLOCKSTATS_PERCENTILES], std::vector<std::pair<CAmount, int64_t>>& scores, int64_t total_weight) +{ + if (scores.empty()) { + return; + } + + std::sort(scores.begin(), scores.end()); + + // 10th, 25th, 50th, 75th, and 90th percentile weight units. + const double weights[NUM_GETBLOCKSTATS_PERCENTILES] = { + total_weight / 10.0, total_weight / 4.0, total_weight / 2.0, (total_weight * 3.0) / 4.0, (total_weight * 9.0) / 10.0 + }; + + int64_t next_percentile_index = 0; + int64_t cumulative_weight = 0; + for (const auto& element : scores) { + cumulative_weight += element.second; + while (next_percentile_index < NUM_GETBLOCKSTATS_PERCENTILES && cumulative_weight >= weights[next_percentile_index]) { + result[next_percentile_index] = element.first; + ++next_percentile_index; + } + } + + // Fill any remaining percentiles with the last value. + for (int64_t i = next_percentile_index; i < NUM_GETBLOCKSTATS_PERCENTILES; i++) { + result[i] = scores.back().first; + } +} + template<typename T> static inline bool SetHasKeys(const std::set<T>& set) {return false;} template<typename T, typename Tk, typename... Args> @@ -1672,13 +1702,19 @@ static UniValue getblockstats(const JSONRPCRequest& request) " \"avgfeerate\": xxxxx, (numeric) Average feerate (in satoshis per virtual byte)\n" " \"avgtxsize\": xxxxx, (numeric) Average transaction size\n" " \"blockhash\": xxxxx, (string) The block hash (to check for potential reorgs)\n" + " \"feerate_percentiles\": [ (array of numeric) Feerates at the 10th, 25th, 50th, 75th, and 90th percentile weight unit (in satoshis per virtual byte)\n" + " \"10th_percentile_feerate\", (numeric) The 10th percentile feerate\n" + " \"25th_percentile_feerate\", (numeric) The 25th percentile feerate\n" + " \"50th_percentile_feerate\", (numeric) The 50th percentile feerate\n" + " \"75th_percentile_feerate\", (numeric) The 75th percentile feerate\n" + " \"90th_percentile_feerate\", (numeric) The 90th percentile feerate\n" + " ],\n" " \"height\": xxxxx, (numeric) The height of the block\n" " \"ins\": xxxxx, (numeric) The number of inputs (excluding coinbase)\n" " \"maxfee\": xxxxx, (numeric) Maximum fee in the block\n" " \"maxfeerate\": xxxxx, (numeric) Maximum feerate (in satoshis per virtual byte)\n" " \"maxtxsize\": xxxxx, (numeric) Maximum transaction size\n" " \"medianfee\": xxxxx, (numeric) Truncated median fee in the block\n" - " \"medianfeerate\": xxxxx, (numeric) Truncated median feerate (in satoshis per virtual byte)\n" " \"mediantime\": xxxxx, (numeric) The block median time past\n" " \"mediantxsize\": xxxxx, (numeric) Truncated median transaction size\n" " \"minfee\": xxxxx, (numeric) Minimum fee in the block\n" @@ -1746,13 +1782,13 @@ static UniValue getblockstats(const JSONRPCRequest& request) const bool do_all = stats.size() == 0; // Calculate everything if nothing selected (default) const bool do_mediantxsize = do_all || stats.count("mediantxsize") != 0; const bool do_medianfee = do_all || stats.count("medianfee") != 0; - const bool do_medianfeerate = do_all || stats.count("medianfeerate") != 0; - const bool loop_inputs = do_all || do_medianfee || do_medianfeerate || + const bool do_feerate_percentiles = do_all || stats.count("feerate_percentiles") != 0; + const bool loop_inputs = do_all || do_medianfee || do_feerate_percentiles || SetHasKeys(stats, "utxo_size_inc", "totalfee", "avgfee", "avgfeerate", "minfee", "maxfee", "minfeerate", "maxfeerate"); const bool loop_outputs = do_all || loop_inputs || stats.count("total_out"); const bool do_calculate_size = do_mediantxsize || SetHasKeys(stats, "total_size", "avgtxsize", "mintxsize", "maxtxsize", "swtotal_size"); - const bool do_calculate_weight = do_all || SetHasKeys(stats, "total_weight", "avgfeerate", "swtotal_weight", "avgfeerate", "medianfeerate", "minfeerate", "maxfeerate"); + const bool do_calculate_weight = do_all || SetHasKeys(stats, "total_weight", "avgfeerate", "swtotal_weight", "avgfeerate", "feerate_percentiles", "minfeerate", "maxfeerate"); const bool do_calculate_sw = do_all || SetHasKeys(stats, "swtxs", "swtotal_size", "swtotal_weight"); CAmount maxfee = 0; @@ -1772,7 +1808,7 @@ static UniValue getblockstats(const JSONRPCRequest& request) int64_t total_weight = 0; int64_t utxo_size_inc = 0; std::vector<CAmount> fee_array; - std::vector<CAmount> feerate_array; + std::vector<std::pair<CAmount, int64_t>> feerate_array; std::vector<int64_t> txsize_array; for (const auto& tx : block.vtx) { @@ -1847,26 +1883,34 @@ static UniValue getblockstats(const JSONRPCRequest& request) // New feerate uses satoshis per virtual byte instead of per serialized byte CAmount feerate = weight ? (txfee * WITNESS_SCALE_FACTOR) / weight : 0; - if (do_medianfeerate) { - feerate_array.push_back(feerate); + if (do_feerate_percentiles) { + feerate_array.emplace_back(std::make_pair(feerate, weight)); } maxfeerate = std::max(maxfeerate, feerate); minfeerate = std::min(minfeerate, feerate); } } + CAmount feerate_percentiles[NUM_GETBLOCKSTATS_PERCENTILES] = { 0 }; + CalculatePercentilesByWeight(feerate_percentiles, feerate_array, total_weight); + + UniValue feerates_res(UniValue::VARR); + for (int64_t i = 0; i < NUM_GETBLOCKSTATS_PERCENTILES; i++) { + feerates_res.push_back(feerate_percentiles[i]); + } + UniValue ret_all(UniValue::VOBJ); ret_all.pushKV("avgfee", (block.vtx.size() > 1) ? totalfee / (block.vtx.size() - 1) : 0); ret_all.pushKV("avgfeerate", total_weight ? (totalfee * WITNESS_SCALE_FACTOR) / total_weight : 0); // Unit: sat/vbyte ret_all.pushKV("avgtxsize", (block.vtx.size() > 1) ? total_size / (block.vtx.size() - 1) : 0); ret_all.pushKV("blockhash", pindex->GetBlockHash().GetHex()); + ret_all.pushKV("feerate_percentiles", feerates_res); ret_all.pushKV("height", (int64_t)pindex->nHeight); ret_all.pushKV("ins", inputs); ret_all.pushKV("maxfee", maxfee); ret_all.pushKV("maxfeerate", maxfeerate); ret_all.pushKV("maxtxsize", maxtxsize); ret_all.pushKV("medianfee", CalculateTruncatedMedian(fee_array)); - ret_all.pushKV("medianfeerate", CalculateTruncatedMedian(feerate_array)); ret_all.pushKV("mediantime", pindex->GetMedianTimePast()); ret_all.pushKV("mediantxsize", CalculateTruncatedMedian(txsize_array)); ret_all.pushKV("minfee", (minfee == MAX_MONEY) ? 0 : minfee); @@ -1984,67 +2028,38 @@ public: } }; -static const char *g_default_scantxoutset_script_types[] = { "P2PKH", "P2SH_P2WPKH", "P2WPKH" }; - -enum class OutputScriptType { - UNKNOWN, - P2PK, - P2PKH, - P2SH_P2WPKH, - P2WPKH -}; - -static inline OutputScriptType GetOutputScriptTypeFromString(const std::string& outputtype) -{ - if (outputtype == "P2PK") return OutputScriptType::P2PK; - else if (outputtype == "P2PKH") return OutputScriptType::P2PKH; - else if (outputtype == "P2SH_P2WPKH") return OutputScriptType::P2SH_P2WPKH; - else if (outputtype == "P2WPKH") return OutputScriptType::P2WPKH; - else return OutputScriptType::UNKNOWN; -} - -CTxDestination GetDestinationForKey(const CPubKey& key, OutputScriptType type) -{ - switch (type) { - case OutputScriptType::P2PKH: return key.GetID(); - case OutputScriptType::P2SH_P2WPKH: - case OutputScriptType::P2WPKH: { - if (!key.IsCompressed()) return key.GetID(); - CTxDestination witdest = WitnessV0KeyHash(key.GetID()); - if (type == OutputScriptType::P2SH_P2WPKH) { - CScript witprog = GetScriptForDestination(witdest); - return CScriptID(witprog); - } else { - return witdest; - } - } - default: assert(false); - } -} - UniValue scantxoutset(const JSONRPCRequest& request) { if (request.fHelp || request.params.size() < 1 || request.params.size() > 2) throw std::runtime_error( "scantxoutset <action> ( <scanobjects> )\n" - "\nScans the unspent transaction output set for possible entries that matches common scripts of given public keys.\n" - "Using addresses as scanobjects will _not_ detect unspent P2PK txouts\n" + "\nEXPERIMENTAL warning: this call may be removed or changed in future releases.\n" + "\nScans the unspent transaction output set for entries that match certain output descriptors.\n" + "Examples of output descriptors are:\n" + " addr(<address>) Outputs whose scriptPubKey corresponds to the specified address (does not include P2PK)\n" + " raw(<hex script>) Outputs whose scriptPubKey equals the specified hex scripts\n" + " combo(<pubkey>) P2PK, P2PKH, P2WPKH, and P2SH-P2WPKH outputs for the given pubkey\n" + " pkh(<pubkey>) P2PKH outputs for the given pubkey\n" + " sh(multi(<n>,<pubkey>,<pubkey>,...)) P2SH-multisig outputs for the given threshold and pubkeys\n" + "\nIn the above, <pubkey> either refers to a fixed public key in hexadecimal notation, or to an xpub/xprv optionally followed by one\n" + "or more path elements separated by \"/\", and optionally ending in \"/*\" (unhardened), or \"/*'\" or \"/*h\" (hardened) to specify all\n" + "unhardened or hardened child keys.\n" + "In the latter case, a range needs to be specified by below if different from 1000.\n" + "For more information on output descriptors, see the documentation at TODO\n" "\nArguments:\n" "1. \"action\" (string, required) The action to execute\n" " \"start\" for starting a scan\n" " \"abort\" for aborting the current scan (returns true when abort was successful)\n" " \"status\" for progress report (in %) of the current scan\n" - "2. \"scanobjects\" (array, optional) Array of scan objects (only one object type per scan object allowed)\n" - " [\n" - " { \"address\" : \"<address>\" }, (string, optional) Bitcoin address\n" - " { \"script\" : \"<scriptPubKey>\" }, (string, optional) HEX encoded script (scriptPubKey)\n" - " { \"pubkey\" : (object, optional) Public key\n" - " {\n" - " \"pubkey\" : \"<pubkey\">, (string, required) HEX encoded public key\n" - " \"script_types\" : [ ... ], (array, optional) Array of script-types to derive from the pubkey (possible values: \"P2PK\", \"P2PKH\", \"P2SH-P2WPKH\", \"P2WPKH\")\n" - " }\n" + "2. \"scanobjects\" (array, required) Array of scan objects\n" + " [ Every scan object is either a string descriptor or an object:\n" + " \"descriptor\", (string, optional) An output descriptor\n" + " { (object, optional) An object with output descriptor and metadata\n" + " \"desc\": \"descriptor\", (string, required) An output descriptor\n" + " \"range\": n, (numeric, optional) Up to what child index HD chains should be explored (default: 1000)\n" " },\n" - " ]\n" + " ...\n" + " ]\n" "\nResult:\n" "{\n" " \"unspents\": [\n" @@ -2090,79 +2105,35 @@ UniValue scantxoutset(const JSONRPCRequest& request) // loop through the scan objects for (const UniValue& scanobject : request.params[1].get_array().getValues()) { - if (!scanobject.isObject()) { - throw JSONRPCError(RPC_INVALID_PARAMETER, "Invalid scan object"); - } - UniValue address_uni = find_value(scanobject, "address"); - UniValue pubkey_uni = find_value(scanobject, "pubkey"); - UniValue script_uni = find_value(scanobject, "script"); - - // make sure only one object type is present - if (1 != !address_uni.isNull() + !pubkey_uni.isNull() + !script_uni.isNull()) { - throw JSONRPCError(RPC_INVALID_PARAMETER, "Only one object type is allowed per scan object"); - } else if (!address_uni.isNull() && !address_uni.isStr()) { - throw JSONRPCError(RPC_INVALID_PARAMETER, "Scanobject \"address\" must contain a single string as value"); - } else if (!pubkey_uni.isNull() && !pubkey_uni.isObject()) { - throw JSONRPCError(RPC_INVALID_PARAMETER, "Scanobject \"pubkey\" must contain an object as value"); - } else if (!script_uni.isNull() && !script_uni.isStr()) { - throw JSONRPCError(RPC_INVALID_PARAMETER, "Scanobject \"script\" must contain a single string as value"); - } else if (address_uni.isStr()) { - // type: address - // decode destination and derive the scriptPubKey - // add the script to the scan containers - CTxDestination dest = DecodeDestination(address_uni.get_str()); - if (!IsValidDestination(dest)) { - throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, "Invalid address"); - } - CScript script = GetScriptForDestination(dest); - assert(!script.empty()); - needles.insert(script); - } else if (pubkey_uni.isObject()) { - // type: pubkey - // derive script(s) according to the script_type parameter - UniValue script_types_uni = find_value(pubkey_uni, "script_types"); - UniValue pubkeydata_uni = find_value(pubkey_uni, "pubkey"); - - // check the script types and use the default if not provided - if (!script_types_uni.isNull() && !script_types_uni.isArray()) { - throw JSONRPCError(RPC_INVALID_PARAMETER, "script_types must be an array"); - } else if (script_types_uni.isNull()) { - // use the default script types - script_types_uni = UniValue(UniValue::VARR); - for (const char *t : g_default_scantxoutset_script_types) { - script_types_uni.push_back(t); - } - } - - // check the acctual pubkey - if (!pubkeydata_uni.isStr() || !IsHex(pubkeydata_uni.get_str())) { - throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, "Public key must be hex encoded"); - } - CPubKey pubkey(ParseHexV(pubkeydata_uni, "pubkey")); - if (!pubkey.IsFullyValid()) { - throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, "Invalid public key"); + std::string desc_str; + int range = 1000; + if (scanobject.isStr()) { + desc_str = scanobject.get_str(); + } else if (scanobject.isObject()) { + UniValue desc_uni = find_value(scanobject, "desc"); + if (desc_uni.isNull()) throw JSONRPCError(RPC_INVALID_PARAMETER, "Descriptor needs to be provided in scan object"); + desc_str = desc_uni.get_str(); + UniValue range_uni = find_value(scanobject, "range"); + if (!range_uni.isNull()) { + range = range_uni.get_int(); + if (range < 0 || range > 1000000) throw JSONRPCError(RPC_INVALID_PARAMETER, "range out of range"); } + } else { + throw JSONRPCError(RPC_INVALID_PARAMETER, "Scan object needs to be either a string or an object"); + } - // loop through the script types and derive the script - for (const UniValue& script_type_uni : script_types_uni.get_array().getValues()) { - OutputScriptType script_type = GetOutputScriptTypeFromString(script_type_uni.get_str()); - if (script_type == OutputScriptType::UNKNOWN) throw JSONRPCError(RPC_INVALID_PARAMETER, "Invalid script type"); - CScript script; - if (script_type == OutputScriptType::P2PK) { - // support legacy P2PK scripts - script << ToByteVector(pubkey) << OP_CHECKSIG; - } else { - script = GetScriptForDestination(GetDestinationForKey(pubkey, script_type)); - } - assert(!script.empty()); - needles.insert(script); + FlatSigningProvider provider; + auto desc = Parse(desc_str, provider); + if (!desc) { + throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, strprintf("Invalid descriptor '%s'", desc_str)); + } + if (!desc->IsRange()) range = 0; + for (int i = 0; i <= range; ++i) { + std::vector<CScript> scripts; + if (!desc->Expand(i, provider, scripts, provider)) { + throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, strprintf("Cannot derive script without private keys: '%s'", desc_str)); } - } else if (script_uni.isStr()) { - // type: script - // check and add the script to the scan containers (needles array) - CScript script(ParseHexV(script_uni, "script")); - // TODO: check script: max length, has OP, is unspenable etc. - needles.insert(script); + needles.insert(scripts.begin(), scripts.end()); } } diff --git a/src/rpc/blockchain.h b/src/rpc/blockchain.h index 3aa8de2d2b..544bc62c36 100644 --- a/src/rpc/blockchain.h +++ b/src/rpc/blockchain.h @@ -1,14 +1,20 @@ -// Copyright (c) 2017 The Bitcoin Core developers +// Copyright (c) 2017-2018 The Bitcoin Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. #ifndef BITCOIN_RPC_BLOCKCHAIN_H #define BITCOIN_RPC_BLOCKCHAIN_H +#include <vector> +#include <stdint.h> +#include <amount.h> + class CBlock; class CBlockIndex; class UniValue; +static constexpr int NUM_GETBLOCKSTATS_PERCENTILES = 5; + /** * Get the difficulty of the net wrt to the given block index, or the chain tip if * not provided. @@ -33,4 +39,7 @@ UniValue mempoolToJSON(bool fVerbose = false); /** Block header to JSON */ UniValue blockheaderToJSON(const CBlockIndex* blockindex); +/** Used by getblockstats to get feerates at different percentiles by weight */ +void CalculatePercentilesByWeight(CAmount result[NUM_GETBLOCKSTATS_PERCENTILES], std::vector<std::pair<CAmount, int64_t>>& scores, int64_t total_weight); + #endif diff --git a/src/rpc/client.cpp b/src/rpc/client.cpp index eb6b164075..6738b206c9 100644 --- a/src/rpc/client.cpp +++ b/src/rpc/client.cpp @@ -1,5 +1,5 @@ // Copyright (c) 2010 Satoshi Nakamoto -// Copyright (c) 2009-2017 The Bitcoin Core developers +// Copyright (c) 2009-2018 The Bitcoin Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/rpc/client.h b/src/rpc/client.h index e09e1dedf3..b9fee5bbb3 100644 --- a/src/rpc/client.h +++ b/src/rpc/client.h @@ -1,5 +1,5 @@ // Copyright (c) 2010 Satoshi Nakamoto -// Copyright (c) 2009-2016 The Bitcoin Core developers +// Copyright (c) 2009-2018 The Bitcoin Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/rpc/mining.cpp b/src/rpc/mining.cpp index e751587dc7..623b0bd86a 100644 --- a/src/rpc/mining.cpp +++ b/src/rpc/mining.cpp @@ -10,7 +10,6 @@ #include <consensus/params.h> #include <consensus/validation.h> #include <core_io.h> -#include <validation.h> #include <key_io.h> #include <miner.h> #include <net.h> @@ -23,6 +22,7 @@ #include <txmempool.h> #include <util.h> #include <utilstrencodings.h> +#include <validation.h> #include <validationinterface.h> #include <warnings.h> @@ -763,6 +763,42 @@ static UniValue submitblock(const JSONRPCRequest& request) return BIP22ValidationResult(sc.state); } +static UniValue submitheader(const JSONRPCRequest& request) +{ + if (request.fHelp || request.params.size() != 1) { + throw std::runtime_error( + "submitheader \"hexdata\"\n" + "\nDecode the given hexdata as a header and submit it as a candidate chain tip if valid." + "\nThrows when the header is invalid.\n" + "\nArguments\n" + "1. \"hexdata\" (string, required) the hex-encoded block header data\n" + "\nResult:\n" + "None" + "\nExamples:\n" + + HelpExampleCli("submitheader", "\"aabbcc\"") + + HelpExampleRpc("submitheader", "\"aabbcc\"")); + } + + CBlockHeader h; + if (!DecodeHexBlockHeader(h, request.params[0].get_str())) { + throw JSONRPCError(RPC_DESERIALIZATION_ERROR, "Block header decode failed"); + } + { + LOCK(cs_main); + if (!LookupBlockIndex(h.hashPrevBlock)) { + throw JSONRPCError(RPC_VERIFY_ERROR, "Must submit previous header (" + h.hashPrevBlock.GetHex() + ") first"); + } + } + + CValidationState state; + ProcessNewBlockHeaders({h}, state, Params(), /* ppindex */ nullptr, /* first_invalid */ nullptr); + if (state.IsValid()) return NullUniValue; + if (state.IsError()) { + throw JSONRPCError(RPC_VERIFY_ERROR, FormatStateMessage(state)); + } + throw JSONRPCError(RPC_VERIFY_ERROR, state.GetRejectReason()); +} + static UniValue estimatefee(const JSONRPCRequest& request) { throw JSONRPCError(RPC_METHOD_DEPRECATED, "estimatefee was removed in v0.17.\n" @@ -940,6 +976,7 @@ static const CRPCCommand commands[] = { "mining", "prioritisetransaction", &prioritisetransaction, {"txid","dummy","fee_delta"} }, { "mining", "getblocktemplate", &getblocktemplate, {"template_request"} }, { "mining", "submitblock", &submitblock, {"hexdata","dummy"} }, + { "mining", "submitheader", &submitheader, {"hexdata"} }, { "generating", "generatetoaddress", &generatetoaddress, {"nblocks","address","maxtries"} }, diff --git a/src/rpc/misc.cpp b/src/rpc/misc.cpp index 09812bb980..40418545c1 100644 --- a/src/rpc/misc.cpp +++ b/src/rpc/misc.cpp @@ -1,5 +1,5 @@ // Copyright (c) 2010 Satoshi Nakamoto -// Copyright (c) 2009-2017 The Bitcoin Core developers +// Copyright (c) 2009-2018 The Bitcoin Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. @@ -456,18 +456,6 @@ static UniValue echo(const JSONRPCRequest& request) return request.params; } -static UniValue getinfo_deprecated(const JSONRPCRequest& request) -{ - throw JSONRPCError(RPC_METHOD_NOT_FOUND, - "getinfo\n" - "\nThis call was removed in version 0.16.0. Use the appropriate fields from:\n" - "- getblockchaininfo: blocks, difficulty, chain\n" - "- getnetworkinfo: version, protocolversion, timeoffset, connections, proxy, relayfee, warnings\n" - "- getwalletinfo: balance, keypoololdest, keypoolsize, paytxfee, unlocked_until, walletversion\n" - "\nbitcoin-cli has the option -getinfo to collect and format these in the old format." - ); -} - static const CRPCCommand commands[] = { // category name actor (function) argNames // --------------------- ------------------------ ----------------------- ---------- @@ -482,7 +470,6 @@ static const CRPCCommand commands[] = { "hidden", "setmocktime", &setmocktime, {"timestamp"}}, { "hidden", "echo", &echo, {"arg0","arg1","arg2","arg3","arg4","arg5","arg6","arg7","arg8","arg9"}}, { "hidden", "echojson", &echo, {"arg0","arg1","arg2","arg3","arg4","arg5","arg6","arg7","arg8","arg9"}}, - { "hidden", "getinfo", &getinfo_deprecated, {}}, }; void RegisterMiscRPCCommands(CRPCTable &t) diff --git a/src/rpc/net.cpp b/src/rpc/net.cpp index 8fa56e9335..610a1fee6f 100644 --- a/src/rpc/net.cpp +++ b/src/rpc/net.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2009-2017 The Bitcoin Core developers +// Copyright (c) 2009-2018 The Bitcoin Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/rpc/protocol.cpp b/src/rpc/protocol.cpp index 0635b757c6..dab63ab263 100644 --- a/src/rpc/protocol.cpp +++ b/src/rpc/protocol.cpp @@ -1,5 +1,5 @@ // Copyright (c) 2010 Satoshi Nakamoto -// Copyright (c) 2009-2017 The Bitcoin Core developers +// Copyright (c) 2009-2018 The Bitcoin Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/rpc/protocol.h b/src/rpc/protocol.h index 6954aed252..6bcbccbd4f 100644 --- a/src/rpc/protocol.h +++ b/src/rpc/protocol.h @@ -1,5 +1,5 @@ // Copyright (c) 2010 Satoshi Nakamoto -// Copyright (c) 2009-2017 The Bitcoin Core developers +// Copyright (c) 2009-2018 The Bitcoin Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/rpc/rawtransaction.cpp b/src/rpc/rawtransaction.cpp index bb94e11fea..608a1b5da2 100644 --- a/src/rpc/rawtransaction.cpp +++ b/src/rpc/rawtransaction.cpp @@ -1,5 +1,5 @@ // Copyright (c) 2010 Satoshi Nakamoto -// Copyright (c) 2009-2017 The Bitcoin Core developers +// Copyright (c) 2009-2018 The Bitcoin Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. @@ -1662,12 +1662,12 @@ UniValue finalizepsbt(const JSONRPCRequest& request) mtx.vin[i].scriptWitness = psbtx.inputs[i].final_script_witness; } ssTx << mtx; - result.push_back(Pair("hex", HexStr(ssTx.begin(), ssTx.end()))); + result.pushKV("hex", HexStr(ssTx.begin(), ssTx.end())); } else { ssTx << psbtx; - result.push_back(Pair("psbt", EncodeBase64((unsigned char*)ssTx.data(), ssTx.size()))); + result.pushKV("psbt", EncodeBase64((unsigned char*)ssTx.data(), ssTx.size())); } - result.push_back(Pair("complete", complete)); + result.pushKV("complete", complete); return result; } diff --git a/src/rpc/rawtransaction.h b/src/rpc/rawtransaction.h index 52dccc90e8..924611ed5a 100644 --- a/src/rpc/rawtransaction.h +++ b/src/rpc/rawtransaction.h @@ -1,4 +1,4 @@ -// Copyright (c) 2017 The Bitcoin Core developers +// Copyright (c) 2017-2018 The Bitcoin Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/rpc/register.h b/src/rpc/register.h index b689740681..374a1e3db8 100644 --- a/src/rpc/register.h +++ b/src/rpc/register.h @@ -1,4 +1,4 @@ -// Copyright (c) 2009-2016 The Bitcoin Core developers +// Copyright (c) 2009-2018 The Bitcoin Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/rpc/server.h b/src/rpc/server.h index a9dbfbd21f..15d0ec80f5 100644 --- a/src/rpc/server.h +++ b/src/rpc/server.h @@ -1,5 +1,5 @@ // Copyright (c) 2010 Satoshi Nakamoto -// Copyright (c) 2009-2017 The Bitcoin Core developers +// Copyright (c) 2009-2018 The Bitcoin Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/rpc/util.cpp b/src/rpc/util.cpp index e72b1c4840..ba414bf3f5 100644 --- a/src/rpc/util.cpp +++ b/src/rpc/util.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017 The Bitcoin Core developers +// Copyright (c) 2017-2018 The Bitcoin Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/rpc/util.h b/src/rpc/util.h index c6a79d5cf9..0a3a156e45 100644 --- a/src/rpc/util.h +++ b/src/rpc/util.h @@ -1,4 +1,4 @@ -// Copyright (c) 2017 The Bitcoin Core developers +// Copyright (c) 2017-2018 The Bitcoin Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/scheduler.cpp b/src/scheduler.cpp index a94f6b2a66..89dfc2b363 100644 --- a/src/scheduler.cpp +++ b/src/scheduler.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2015-2017 The Bitcoin Core developers +// Copyright (c) 2015-2018 The Bitcoin Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/scheduler.h b/src/scheduler.h index 421002ec17..0c2551cf4f 100644 --- a/src/scheduler.h +++ b/src/scheduler.h @@ -1,4 +1,4 @@ -// Copyright (c) 2015-2017 The Bitcoin Core developers +// Copyright (c) 2015-2018 The Bitcoin Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. @@ -110,7 +110,7 @@ public: /** * Add a callback to be executed. Callbacks are executed serially - * and memory is sequentially consistent between callback executions. + * and memory is release-acquire consistent between callback executions. * Practially, this means that callbacks can behave as if they are executed * in order by a single thread. */ diff --git a/src/script/bitcoinconsensus.cpp b/src/script/bitcoinconsensus.cpp index e2370c5e50..01cfeb23f1 100644 --- a/src/script/bitcoinconsensus.cpp +++ b/src/script/bitcoinconsensus.cpp @@ -1,5 +1,5 @@ // Copyright (c) 2009-2010 Satoshi Nakamoto -// Copyright (c) 2009-2017 The Bitcoin Core developers +// Copyright (c) 2009-2018 The Bitcoin Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/script/bitcoinconsensus.h b/src/script/bitcoinconsensus.h index 5973808fa5..c5dceac848 100644 --- a/src/script/bitcoinconsensus.h +++ b/src/script/bitcoinconsensus.h @@ -1,5 +1,5 @@ // Copyright (c) 2009-2010 Satoshi Nakamoto -// Copyright (c) 2009-2017 The Bitcoin Core developers +// Copyright (c) 2009-2018 The Bitcoin Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/script/descriptor.cpp b/src/script/descriptor.cpp new file mode 100644 index 0000000000..f366b99ec3 --- /dev/null +++ b/src/script/descriptor.cpp @@ -0,0 +1,566 @@ +// Copyright (c) 2018 The Bitcoin Core developers +// Distributed under the MIT software license, see the accompanying +// file COPYING or http://www.opensource.org/licenses/mit-license.php. + +#include <script/descriptor.h> + +#include <key_io.h> +#include <pubkey.h> +#include <script/script.h> +#include <script/standard.h> + +#include <span.h> +#include <util.h> +#include <utilstrencodings.h> + +#include <memory> +#include <string> +#include <vector> + +namespace { + +//////////////////////////////////////////////////////////////////////////// +// Internal representation // +//////////////////////////////////////////////////////////////////////////// + +typedef std::vector<uint32_t> KeyPath; + +std::string FormatKeyPath(const KeyPath& path) +{ + std::string ret; + for (auto i : path) { + ret += strprintf("/%i", (i << 1) >> 1); + if (i >> 31) ret += '\''; + } + return ret; +} + +/** Interface for public key objects in descriptors. */ +struct PubkeyProvider +{ + virtual ~PubkeyProvider() = default; + + /** Derive a public key. */ + virtual bool GetPubKey(int pos, const SigningProvider& arg, CPubKey& out) const = 0; + + /** Whether this represent multiple public keys at different positions. */ + virtual bool IsRange() const = 0; + + /** Get the size of the generated public key(s) in bytes (33 or 65). */ + virtual size_t GetSize() const = 0; + + /** Get the descriptor string form. */ + virtual std::string ToString() const = 0; + + /** Get the descriptor string form including private data (if available in arg). */ + virtual bool ToPrivateString(const SigningProvider& arg, std::string& out) const = 0; +}; + +/** An object representing a parsed constant public key in a descriptor. */ +class ConstPubkeyProvider final : public PubkeyProvider +{ + CPubKey m_pubkey; + +public: + ConstPubkeyProvider(const CPubKey& pubkey) : m_pubkey(pubkey) {} + bool GetPubKey(int pos, const SigningProvider& arg, CPubKey& out) const override + { + out = m_pubkey; + return true; + } + bool IsRange() const override { return false; } + size_t GetSize() const override { return m_pubkey.size(); } + std::string ToString() const override { return HexStr(m_pubkey.begin(), m_pubkey.end()); } + bool ToPrivateString(const SigningProvider& arg, std::string& ret) const override + { + CKey key; + if (!arg.GetKey(m_pubkey.GetID(), key)) return false; + ret = EncodeSecret(key); + return true; + } +}; + +enum class DeriveType { + NO, + UNHARDENED, + HARDENED, +}; + +/** An object representing a parsed extended public key in a descriptor. */ +class BIP32PubkeyProvider final : public PubkeyProvider +{ + CExtPubKey m_extkey; + KeyPath m_path; + DeriveType m_derive; + + bool GetExtKey(const SigningProvider& arg, CExtKey& ret) const + { + CKey key; + if (!arg.GetKey(m_extkey.pubkey.GetID(), key)) return false; + ret.nDepth = m_extkey.nDepth; + std::copy(m_extkey.vchFingerprint, m_extkey.vchFingerprint + 4, ret.vchFingerprint); + ret.nChild = m_extkey.nChild; + ret.chaincode = m_extkey.chaincode; + ret.key = key; + return true; + } + + bool IsHardened() const + { + if (m_derive == DeriveType::HARDENED) return true; + for (auto entry : m_path) { + if (entry >> 31) return true; + } + return false; + } + +public: + BIP32PubkeyProvider(const CExtPubKey& extkey, KeyPath path, DeriveType derive) : m_extkey(extkey), m_path(std::move(path)), m_derive(derive) {} + bool IsRange() const override { return m_derive != DeriveType::NO; } + size_t GetSize() const override { return 33; } + bool GetPubKey(int pos, const SigningProvider& arg, CPubKey& out) const override + { + if (IsHardened()) { + CExtKey key; + if (!GetExtKey(arg, key)) return false; + for (auto entry : m_path) { + key.Derive(key, entry); + } + if (m_derive == DeriveType::UNHARDENED) key.Derive(key, pos); + if (m_derive == DeriveType::HARDENED) key.Derive(key, pos | 0x80000000UL); + out = key.Neuter().pubkey; + } else { + // TODO: optimize by caching + CExtPubKey key = m_extkey; + for (auto entry : m_path) { + key.Derive(key, entry); + } + if (m_derive == DeriveType::UNHARDENED) key.Derive(key, pos); + assert(m_derive != DeriveType::HARDENED); + out = key.pubkey; + } + return true; + } + std::string ToString() const override + { + std::string ret = EncodeExtPubKey(m_extkey) + FormatKeyPath(m_path); + if (IsRange()) { + ret += "/*"; + if (m_derive == DeriveType::HARDENED) ret += '\''; + } + return ret; + } + bool ToPrivateString(const SigningProvider& arg, std::string& out) const override + { + CExtKey key; + if (!GetExtKey(arg, key)) return false; + out = EncodeExtKey(key) + FormatKeyPath(m_path); + if (IsRange()) { + out += "/*"; + if (m_derive == DeriveType::HARDENED) out += '\''; + } + return true; + } +}; + +/** A parsed addr(A) descriptor. */ +class AddressDescriptor final : public Descriptor +{ + CTxDestination m_destination; + +public: + AddressDescriptor(CTxDestination destination) : m_destination(std::move(destination)) {} + + bool IsRange() const override { return false; } + std::string ToString() const override { return "addr(" + EncodeDestination(m_destination) + ")"; } + bool ToPrivateString(const SigningProvider& arg, std::string& out) const override { out = ToString(); return true; } + bool Expand(int pos, const SigningProvider& arg, std::vector<CScript>& output_scripts, FlatSigningProvider& out) const override + { + output_scripts = std::vector<CScript>{GetScriptForDestination(m_destination)}; + return true; + } +}; + +/** A parsed raw(H) descriptor. */ +class RawDescriptor final : public Descriptor +{ + CScript m_script; + +public: + RawDescriptor(CScript script) : m_script(std::move(script)) {} + + bool IsRange() const override { return false; } + std::string ToString() const override { return "raw(" + HexStr(m_script.begin(), m_script.end()) + ")"; } + bool ToPrivateString(const SigningProvider& arg, std::string& out) const override { out = ToString(); return true; } + bool Expand(int pos, const SigningProvider& arg, std::vector<CScript>& output_scripts, FlatSigningProvider& out) const override + { + output_scripts = std::vector<CScript>{m_script}; + return true; + } +}; + +/** A parsed pk(P), pkh(P), or wpkh(P) descriptor. */ +class SingleKeyDescriptor final : public Descriptor +{ + const std::function<CScript(const CPubKey&)> m_script_fn; + const std::string m_fn_name; + std::unique_ptr<PubkeyProvider> m_provider; + +public: + SingleKeyDescriptor(std::unique_ptr<PubkeyProvider> prov, const std::function<CScript(const CPubKey&)>& fn, const std::string& name) : m_script_fn(fn), m_fn_name(name), m_provider(std::move(prov)) {} + + bool IsRange() const override { return m_provider->IsRange(); } + std::string ToString() const override { return m_fn_name + "(" + m_provider->ToString() + ")"; } + bool ToPrivateString(const SigningProvider& arg, std::string& out) const override + { + std::string ret; + if (!m_provider->ToPrivateString(arg, ret)) return false; + out = m_fn_name + "(" + std::move(ret) + ")"; + return true; + } + bool Expand(int pos, const SigningProvider& arg, std::vector<CScript>& output_scripts, FlatSigningProvider& out) const override + { + CPubKey key; + if (!m_provider->GetPubKey(pos, arg, key)) return false; + output_scripts = std::vector<CScript>{m_script_fn(key)}; + out.pubkeys.emplace(key.GetID(), std::move(key)); + return true; + } +}; + +CScript P2PKHGetScript(const CPubKey& pubkey) { return GetScriptForDestination(pubkey.GetID()); } +CScript P2PKGetScript(const CPubKey& pubkey) { return GetScriptForRawPubKey(pubkey); } +CScript P2WPKHGetScript(const CPubKey& pubkey) { return GetScriptForDestination(WitnessV0KeyHash(pubkey.GetID())); } + +/** A parsed multi(...) descriptor. */ +class MultisigDescriptor : public Descriptor +{ + int m_threshold; + std::vector<std::unique_ptr<PubkeyProvider>> m_providers; + +public: + MultisigDescriptor(int threshold, std::vector<std::unique_ptr<PubkeyProvider>> providers) : m_threshold(threshold), m_providers(std::move(providers)) {} + + bool IsRange() const override + { + for (const auto& p : m_providers) { + if (p->IsRange()) return true; + } + return false; + } + + std::string ToString() const override + { + std::string ret = strprintf("multi(%i", m_threshold); + for (const auto& p : m_providers) { + ret += "," + p->ToString(); + } + return std::move(ret) + ")"; + } + + bool ToPrivateString(const SigningProvider& arg, std::string& out) const override + { + std::string ret = strprintf("multi(%i", m_threshold); + for (const auto& p : m_providers) { + std::string sub; + if (!p->ToPrivateString(arg, sub)) return false; + ret += "," + std::move(sub); + } + out = std::move(ret) + ")"; + return true; + } + + bool Expand(int pos, const SigningProvider& arg, std::vector<CScript>& output_scripts, FlatSigningProvider& out) const override + { + std::vector<CPubKey> pubkeys; + pubkeys.reserve(m_providers.size()); + for (const auto& p : m_providers) { + CPubKey key; + if (!p->GetPubKey(pos, arg, key)) return false; + pubkeys.push_back(key); + } + for (const CPubKey& key : pubkeys) { + out.pubkeys.emplace(key.GetID(), std::move(key)); + } + output_scripts = std::vector<CScript>{GetScriptForMultisig(m_threshold, pubkeys)}; + return true; + } +}; + +/** A parsed sh(S) or wsh(S) descriptor. */ +class ConvertorDescriptor : public Descriptor +{ + const std::function<CScript(const CScript&)> m_convert_fn; + const std::string m_fn_name; + std::unique_ptr<Descriptor> m_descriptor; + +public: + ConvertorDescriptor(std::unique_ptr<Descriptor> descriptor, const std::function<CScript(const CScript&)>& fn, const std::string& name) : m_convert_fn(fn), m_fn_name(name), m_descriptor(std::move(descriptor)) {} + + bool IsRange() const override { return m_descriptor->IsRange(); } + std::string ToString() const override { return m_fn_name + "(" + m_descriptor->ToString() + ")"; } + bool ToPrivateString(const SigningProvider& arg, std::string& out) const override + { + std::string ret; + if (!m_descriptor->ToPrivateString(arg, ret)) return false; + out = m_fn_name + "(" + std::move(ret) + ")"; + return true; + } + bool Expand(int pos, const SigningProvider& arg, std::vector<CScript>& output_scripts, FlatSigningProvider& out) const override + { + std::vector<CScript> sub; + if (!m_descriptor->Expand(pos, arg, sub, out)) return false; + output_scripts.clear(); + for (const auto& script : sub) { + CScriptID id(script); + out.scripts.emplace(CScriptID(script), script); + output_scripts.push_back(m_convert_fn(script)); + } + return true; + } +}; + +CScript ConvertP2SH(const CScript& script) { return GetScriptForDestination(CScriptID(script)); } +CScript ConvertP2WSH(const CScript& script) { return GetScriptForDestination(WitnessV0ScriptHash(script)); } + +/** A parsed combo(P) descriptor. */ +class ComboDescriptor final : public Descriptor +{ + std::unique_ptr<PubkeyProvider> m_provider; + +public: + ComboDescriptor(std::unique_ptr<PubkeyProvider> provider) : m_provider(std::move(provider)) {} + + bool IsRange() const override { return m_provider->IsRange(); } + std::string ToString() const override { return "combo(" + m_provider->ToString() + ")"; } + bool ToPrivateString(const SigningProvider& arg, std::string& out) const override + { + std::string ret; + if (!m_provider->ToPrivateString(arg, ret)) return false; + out = "combo(" + std::move(ret) + ")"; + return true; + } + bool Expand(int pos, const SigningProvider& arg, std::vector<CScript>& output_scripts, FlatSigningProvider& out) const override + { + CPubKey key; + if (!m_provider->GetPubKey(pos, arg, key)) return false; + CKeyID keyid = key.GetID(); + { + CScript p2pk = GetScriptForRawPubKey(key); + CScript p2pkh = GetScriptForDestination(keyid); + output_scripts = std::vector<CScript>{std::move(p2pk), std::move(p2pkh)}; + out.pubkeys.emplace(keyid, key); + } + if (key.IsCompressed()) { + CScript p2wpkh = GetScriptForDestination(WitnessV0KeyHash(keyid)); + CScriptID p2wpkh_id(p2wpkh); + CScript p2sh_p2wpkh = GetScriptForDestination(p2wpkh_id); + out.scripts.emplace(p2wpkh_id, p2wpkh); + output_scripts.push_back(std::move(p2wpkh)); + output_scripts.push_back(std::move(p2sh_p2wpkh)); + } + return true; + } +}; + +//////////////////////////////////////////////////////////////////////////// +// Parser // +//////////////////////////////////////////////////////////////////////////// + +enum class ParseScriptContext { + TOP, + P2SH, + P2WSH, +}; + +/** Parse a constant. If succesful, sp is updated to skip the constant and return true. */ +bool Const(const std::string& str, Span<const char>& sp) +{ + if ((size_t)sp.size() >= str.size() && std::equal(str.begin(), str.end(), sp.begin())) { + sp = sp.subspan(str.size()); + return true; + } + return false; +} + +/** Parse a function call. If succesful, sp is updated to be the function's argument(s). */ +bool Func(const std::string& str, Span<const char>& sp) +{ + if ((size_t)sp.size() >= str.size() + 2 && sp[str.size()] == '(' && sp[sp.size() - 1] == ')' && std::equal(str.begin(), str.end(), sp.begin())) { + sp = sp.subspan(str.size() + 1, sp.size() - str.size() - 2); + return true; + } + return false; +} + +/** Return the expression that sp begins with, and update sp to skip it. */ +Span<const char> Expr(Span<const char>& sp) +{ + int level = 0; + auto it = sp.begin(); + while (it != sp.end()) { + if (*it == '(') { + ++level; + } else if (level && *it == ')') { + --level; + } else if (level == 0 && (*it == ')' || *it == ',')) { + break; + } + ++it; + } + Span<const char> ret = sp.first(it - sp.begin()); + sp = sp.subspan(it - sp.begin()); + return ret; +} + +/** Split a string on every instance of sep, returning a vector. */ +std::vector<Span<const char>> Split(const Span<const char>& sp, char sep) +{ + std::vector<Span<const char>> ret; + auto it = sp.begin(); + auto start = it; + while (it != sp.end()) { + if (*it == sep) { + ret.emplace_back(start, it); + start = it + 1; + } + ++it; + } + ret.emplace_back(start, it); + return ret; +} + +/** Parse a key path, being passed a split list of elements (the first element is ignored). */ +bool ParseKeyPath(const std::vector<Span<const char>>& split, KeyPath& out) +{ + for (size_t i = 1; i < split.size(); ++i) { + Span<const char> elem = split[i]; + bool hardened = false; + if (elem.size() > 0 && (elem[elem.size() - 1] == '\'' || elem[elem.size() - 1] == 'h')) { + elem = elem.first(elem.size() - 1); + hardened = true; + } + uint32_t p; + if (!ParseUInt32(std::string(elem.begin(), elem.end()), &p) || p > 0x7FFFFFFFUL) return false; + out.push_back(p | (((uint32_t)hardened) << 31)); + } + return true; +} + +std::unique_ptr<PubkeyProvider> ParsePubkey(const Span<const char>& sp, bool permit_uncompressed, FlatSigningProvider& out) +{ + auto split = Split(sp, '/'); + std::string str(split[0].begin(), split[0].end()); + if (split.size() == 1) { + if (IsHex(str)) { + std::vector<unsigned char> data = ParseHex(str); + CPubKey pubkey(data); + if (pubkey.IsFullyValid() && (permit_uncompressed || pubkey.IsCompressed())) return MakeUnique<ConstPubkeyProvider>(pubkey); + } + CKey key = DecodeSecret(str); + if (key.IsValid() && (permit_uncompressed || key.IsCompressed())) { + CPubKey pubkey = key.GetPubKey(); + out.keys.emplace(pubkey.GetID(), key); + return MakeUnique<ConstPubkeyProvider>(pubkey); + } + } + CExtKey extkey = DecodeExtKey(str); + CExtPubKey extpubkey = DecodeExtPubKey(str); + if (!extkey.key.IsValid() && !extpubkey.pubkey.IsValid()) return nullptr; + KeyPath path; + DeriveType type = DeriveType::NO; + if (split.back() == MakeSpan("*").first(1)) { + split.pop_back(); + type = DeriveType::UNHARDENED; + } else if (split.back() == MakeSpan("*'").first(2) || split.back() == MakeSpan("*h").first(2)) { + split.pop_back(); + type = DeriveType::HARDENED; + } + if (!ParseKeyPath(split, path)) return nullptr; + if (extkey.key.IsValid()) { + extpubkey = extkey.Neuter(); + out.keys.emplace(extpubkey.pubkey.GetID(), extkey.key); + } + return MakeUnique<BIP32PubkeyProvider>(extpubkey, std::move(path), type); +} + +/** Parse a script in a particular context. */ +std::unique_ptr<Descriptor> ParseScript(Span<const char>& sp, ParseScriptContext ctx, FlatSigningProvider& out) +{ + auto expr = Expr(sp); + if (Func("pk", expr)) { + auto pubkey = ParsePubkey(expr, ctx != ParseScriptContext::P2WSH, out); + if (!pubkey) return nullptr; + return MakeUnique<SingleKeyDescriptor>(std::move(pubkey), P2PKGetScript, "pk"); + } + if (Func("pkh", expr)) { + auto pubkey = ParsePubkey(expr, ctx != ParseScriptContext::P2WSH, out); + if (!pubkey) return nullptr; + return MakeUnique<SingleKeyDescriptor>(std::move(pubkey), P2PKHGetScript, "pkh"); + } + if (ctx == ParseScriptContext::TOP && Func("combo", expr)) { + auto pubkey = ParsePubkey(expr, true, out); + if (!pubkey) return nullptr; + return MakeUnique<ComboDescriptor>(std::move(pubkey)); + } + if (Func("multi", expr)) { + auto threshold = Expr(expr); + uint32_t thres; + std::vector<std::unique_ptr<PubkeyProvider>> providers; + if (!ParseUInt32(std::string(threshold.begin(), threshold.end()), &thres)) return nullptr; + size_t script_size = 0; + while (expr.size()) { + if (!Const(",", expr)) return nullptr; + auto arg = Expr(expr); + auto pk = ParsePubkey(arg, ctx != ParseScriptContext::P2WSH, out); + if (!pk) return nullptr; + script_size += pk->GetSize() + 1; + providers.emplace_back(std::move(pk)); + } + if (providers.size() < 1 || providers.size() > 16 || thres < 1 || thres > providers.size()) return nullptr; + if (ctx == ParseScriptContext::TOP) { + if (providers.size() > 3) return nullptr; // Not more than 3 pubkeys for raw multisig + } + if (ctx == ParseScriptContext::P2SH) { + if (script_size + 3 > 520) return nullptr; // Enforce P2SH script size limit + } + return MakeUnique<MultisigDescriptor>(thres, std::move(providers)); + } + if (ctx != ParseScriptContext::P2WSH && Func("wpkh", expr)) { + auto pubkey = ParsePubkey(expr, false, out); + if (!pubkey) return nullptr; + return MakeUnique<SingleKeyDescriptor>(std::move(pubkey), P2WPKHGetScript, "wpkh"); + } + if (ctx == ParseScriptContext::TOP && Func("sh", expr)) { + auto desc = ParseScript(expr, ParseScriptContext::P2SH, out); + if (!desc || expr.size()) return nullptr; + return MakeUnique<ConvertorDescriptor>(std::move(desc), ConvertP2SH, "sh"); + } + if (ctx != ParseScriptContext::P2WSH && Func("wsh", expr)) { + auto desc = ParseScript(expr, ParseScriptContext::P2WSH, out); + if (!desc || expr.size()) return nullptr; + return MakeUnique<ConvertorDescriptor>(std::move(desc), ConvertP2WSH, "wsh"); + } + if (ctx == ParseScriptContext::TOP && Func("addr", expr)) { + CTxDestination dest = DecodeDestination(std::string(expr.begin(), expr.end())); + if (!IsValidDestination(dest)) return nullptr; + return MakeUnique<AddressDescriptor>(std::move(dest)); + } + if (ctx == ParseScriptContext::TOP && Func("raw", expr)) { + std::string str(expr.begin(), expr.end()); + if (!IsHex(str)) return nullptr; + auto bytes = ParseHex(str); + return MakeUnique<RawDescriptor>(CScript(bytes.begin(), bytes.end())); + } + return nullptr; +} + +} // namespace + +std::unique_ptr<Descriptor> Parse(const std::string& descriptor, FlatSigningProvider& out) +{ + Span<const char> sp(descriptor.data(), descriptor.size()); + auto ret = ParseScript(sp, ParseScriptContext::TOP, out); + if (sp.size() == 0 && ret) return ret; + return nullptr; +} diff --git a/src/script/descriptor.h b/src/script/descriptor.h new file mode 100644 index 0000000000..e079c72e92 --- /dev/null +++ b/src/script/descriptor.h @@ -0,0 +1,102 @@ +// Copyright (c) 2018 The Bitcoin Core developers +// Distributed under the MIT software license, see the accompanying +// file COPYING or http://www.opensource.org/licenses/mit-license.php. + +#ifndef BITCOIN_SCRIPT_DESCRIPTOR_H +#define BITCOIN_SCRIPT_DESCRIPTOR_H + +#include <script/script.h> +#include <script/sign.h> + +#include <vector> + +// Descriptors are strings that describe a set of scriptPubKeys, together with +// all information necessary to solve them. By combining all information into +// one, they avoid the need to separately import keys and scripts. +// +// Descriptors may be ranged, which occurs when the public keys inside are +// specified in the form of HD chains (xpubs). +// +// Descriptors always represent public information - public keys and scripts - +// but in cases where private keys need to be conveyed along with a descriptor, +// they can be included inside by changing public keys to private keys (WIF +// format), and changing xpubs by xprvs. +// +// 1. Examples +// +// A P2PK descriptor with a fixed public key: +// - pk(0279be667ef9dcbbac55a06295ce870b07029bfcdb2dce28d959f2815b16f81798) +// +// A P2SH-P2WSH-P2PKH descriptor with a fixed public key: +// - sh(wsh(pkh(02e493dbf1c10d80f3581e4904930b1404cc6c13900ee0758474fa94abe8c4cd13))) +// +// A bare 1-of-2 multisig descriptor: +// - multi(1,022f8bde4d1a07209355b4a7250a5c5128e88b84bddc619ab7cba8d569b240efe4,025cbdf0646e5db4eaa398f365f2ea7a0e3d419b7e0330e39ce92bddedcac4f9bc) +// +// A chain of P2PKH outputs (this needs the corresponding private key to derive): +// - pkh(xpub68Gmy5EdvgibQVfPdqkBBCHxA5htiqg55crXYuXoQRKfDBFA1WEjWgP6LHhwBZeNK1VTsfTFUHCdrfp1bgwQ9xv5ski8PX9rL2dZXvgGDnw/1'/2/*) +// +// 2. Grammar description: +// +// X: xpub or xprv encoded extended key +// I: decimal encoded integer +// H: Hex encoded byte array +// A: Address in P2PKH, P2SH, or Bech32 encoding +// +// S (Scripts): +// * pk(P): Pay-to-pubkey (P2PK) output for public key P. +// * pkh(P): Pay-to-pubkey-hash (P2PKH) output for public key P. +// * wpkh(P): Pay-to-witness-pubkey-hash (P2WPKH) output for public key P. +// * sh(S): Pay-to-script-hash (P2SH) output for script S +// * wsh(S): Pay-to-witness-script-hash (P2WSH) output for script S +// * combo(P): combination of P2PK, P2PKH, P2WPKH, and P2SH-P2WPKH for public key P. +// * multi(I,L): k-of-n multisig for given public keys +// * addr(A): Output to address +// * raw(H): scriptPubKey with raw bytes +// +// P (Public keys): +// * H: fixed public key (or WIF-encoded private key) +// * E: extended public key +// * E/*: (ranged) all unhardened direct children of an extended public key +// * E/*': (ranged) all hardened direct children of an extended public key +// +// L (Comma-separated lists of public keys): +// * P +// * L,P +// +// E (Extended public keys): +// * X +// * E/I: unhardened child +// * E/I': hardened child +// * E/Ih: hardened child (alternative notation) +// +// The top level is S. + +/** Interface for parsed descriptor objects. */ +struct Descriptor { + virtual ~Descriptor() = default; + + /** Whether the expansion of this descriptor depends on the position. */ + virtual bool IsRange() const = 0; + + /** Convert the descriptor back to a string, undoing parsing. */ + virtual std::string ToString() const = 0; + + /** Convert the descriptor to a private string. This fails if the provided provider does not have the relevant private keys. */ + virtual bool ToPrivateString(const SigningProvider& provider, std::string& out) const = 0; + + /** Expand a descriptor at a specified position. + * + * pos: the position at which to expand the descriptor. If IsRange() is false, this is ignored. + * provider: the provider to query for private keys in case of hardened derivation. + * output_script: the expanded scriptPubKeys will be put here. + * out: scripts and public keys necessary for solving the expanded scriptPubKeys will be put here (may be equal to provider). + */ + virtual bool Expand(int pos, const SigningProvider& provider, std::vector<CScript>& output_scripts, FlatSigningProvider& out) const = 0; +}; + +/** Parse a descriptor string. Included private keys are put in out. Returns nullptr if parsing fails. */ +std::unique_ptr<Descriptor> Parse(const std::string& descriptor, FlatSigningProvider& out); + +#endif // BITCOIN_SCRIPT_DESCRIPTOR_H + diff --git a/src/script/interpreter.cpp b/src/script/interpreter.cpp index be2138d502..95b25b4911 100644 --- a/src/script/interpreter.cpp +++ b/src/script/interpreter.cpp @@ -1,5 +1,5 @@ // Copyright (c) 2009-2010 Satoshi Nakamoto -// Copyright (c) 2009-2017 The Bitcoin Core developers +// Copyright (c) 2009-2018 The Bitcoin Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/script/interpreter.h b/src/script/interpreter.h index 2d21aa81df..276ff9a58a 100644 --- a/src/script/interpreter.h +++ b/src/script/interpreter.h @@ -1,5 +1,5 @@ // Copyright (c) 2009-2010 Satoshi Nakamoto -// Copyright (c) 2009-2017 The Bitcoin Core developers +// Copyright (c) 2009-2018 The Bitcoin Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/script/ismine.cpp b/src/script/ismine.cpp index 8c26866483..e3a6278c75 100644 --- a/src/script/ismine.cpp +++ b/src/script/ismine.cpp @@ -1,5 +1,5 @@ // Copyright (c) 2009-2010 Satoshi Nakamoto -// Copyright (c) 2009-2017 The Bitcoin Core developers +// Copyright (c) 2009-2018 The Bitcoin Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/script/ismine.h b/src/script/ismine.h index 4246da49fe..601e70f709 100644 --- a/src/script/ismine.h +++ b/src/script/ismine.h @@ -1,5 +1,5 @@ // Copyright (c) 2009-2010 Satoshi Nakamoto -// Copyright (c) 2009-2017 The Bitcoin Core developers +// Copyright (c) 2009-2018 The Bitcoin Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/script/script.cpp b/src/script/script.cpp index c84c7b8ec1..9bdf3ed808 100644 --- a/src/script/script.cpp +++ b/src/script/script.cpp @@ -1,5 +1,5 @@ // Copyright (c) 2009-2010 Satoshi Nakamoto -// Copyright (c) 2009-2017 The Bitcoin Core developers +// Copyright (c) 2009-2018 The Bitcoin Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/script/script.h b/src/script/script.h index a4f377dd94..00065a24be 100644 --- a/src/script/script.h +++ b/src/script/script.h @@ -1,5 +1,5 @@ // Copyright (c) 2009-2010 Satoshi Nakamoto -// Copyright (c) 2009-2017 The Bitcoin Core developers +// Copyright (c) 2009-2018 The Bitcoin Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/script/script_error.cpp b/src/script/script_error.cpp index ceda740580..9d7deffc78 100644 --- a/src/script/script_error.cpp +++ b/src/script/script_error.cpp @@ -1,5 +1,5 @@ // Copyright (c) 2009-2010 Satoshi Nakamoto -// Copyright (c) 2009-2017 The Bitcoin Core developers +// Copyright (c) 2009-2018 The Bitcoin Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/script/script_error.h b/src/script/script_error.h index 6982a087f4..400f63ff0f 100644 --- a/src/script/script_error.h +++ b/src/script/script_error.h @@ -1,5 +1,5 @@ // Copyright (c) 2009-2010 Satoshi Nakamoto -// Copyright (c) 2009-2016 The Bitcoin Core developers +// Copyright (c) 2009-2018 The Bitcoin Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/script/sigcache.cpp b/src/script/sigcache.cpp index 9638b12f99..68f0542294 100644 --- a/src/script/sigcache.cpp +++ b/src/script/sigcache.cpp @@ -1,5 +1,5 @@ // Copyright (c) 2009-2010 Satoshi Nakamoto -// Copyright (c) 2009-2017 The Bitcoin Core developers +// Copyright (c) 2009-2018 The Bitcoin Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/script/sigcache.h b/src/script/sigcache.h index 1309d57cc6..807b61b542 100644 --- a/src/script/sigcache.h +++ b/src/script/sigcache.h @@ -1,5 +1,5 @@ // Copyright (c) 2009-2010 Satoshi Nakamoto -// Copyright (c) 2009-2017 The Bitcoin Core developers +// Copyright (c) 2009-2018 The Bitcoin Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/script/sign.cpp b/src/script/sign.cpp index d10b1c4fd7..1982e8a832 100644 --- a/src/script/sign.cpp +++ b/src/script/sign.cpp @@ -1,5 +1,5 @@ // Copyright (c) 2009-2010 Satoshi Nakamoto -// Copyright (c) 2009-2017 The Bitcoin Core developers +// Copyright (c) 2009-2018 The Bitcoin Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. @@ -11,7 +11,6 @@ #include <script/standard.h> #include <uint256.h> - typedef std::vector<unsigned char> valtype; MutableTransactionSignatureCreator::MutableTransactionSignatureCreator(const CMutableTransaction* txToIn, unsigned int nInIn, const CAmount& amountIn, int nHashTypeIn) : txTo(txToIn), nIn(nInIn), nHashType(nHashTypeIn), amount(amountIn), checker(txTo, nIn, amountIn) {} @@ -245,17 +244,33 @@ bool SignPSBTInput(const SigningProvider& provider, const CMutableTransaction& t input.FillSignatureData(sigdata); // Get UTXO + bool require_witness_sig = false; CTxOut utxo; if (input.non_witness_utxo) { + // If we're taking our information from a non-witness UTXO, verify that it matches the prevout. + if (input.non_witness_utxo->GetHash() != tx.vin[index].prevout.hash) return false; + // If both witness and non-witness UTXO are provided, verify that they match. This check shouldn't + // matter, as the PSBT deserializer enforces only one of both is provided, and the only way both + // can be present is when they're added simultaneously by FillPSBT (in which case they always match). + // Still, check in order to not rely on callers to enforce this. + if (!input.witness_utxo.IsNull() && input.non_witness_utxo->vout[tx.vin[index].prevout.n] != input.witness_utxo) return false; utxo = input.non_witness_utxo->vout[tx.vin[index].prevout.n]; } else if (!input.witness_utxo.IsNull()) { utxo = input.witness_utxo; + // When we're taking our information from a witness UTXO, we can't verify it is actually data from + // the output being spent. This is safe in case a witness signature is produced (which includes this + // information directly in the hash), but not for non-witness signatures. Remember that we require + // a witness signature in this situation. + require_witness_sig = true; } else { return false; } MutableTransactionSignatureCreator creator(&tx, index, utxo.nValue, sighash); + sigdata.witness = false; bool sig_complete = ProduceSignature(provider, creator, utxo.scriptPubKey, sigdata); + // Verify that a witness signature was produced in case one was required. + if (require_witness_sig && !sigdata.witness) return false; input.FromSignatureData(sigdata); return sig_complete; } @@ -418,28 +433,44 @@ public: const DummySignatureChecker DUMMY_CHECKER; class DummySignatureCreator final : public BaseSignatureCreator { +private: + char m_r_len = 32; + char m_s_len = 32; public: - DummySignatureCreator() {} + DummySignatureCreator(char r_len, char s_len) : m_r_len(r_len), m_s_len(s_len) {} const BaseSignatureChecker& Checker() const override { return DUMMY_CHECKER; } bool CreateSig(const SigningProvider& provider, std::vector<unsigned char>& vchSig, const CKeyID& keyid, const CScript& scriptCode, SigVersion sigversion) const override { // Create a dummy signature that is a valid DER-encoding - vchSig.assign(72, '\000'); + vchSig.assign(m_r_len + m_s_len + 7, '\000'); vchSig[0] = 0x30; - vchSig[1] = 69; + vchSig[1] = m_r_len + m_s_len + 4; vchSig[2] = 0x02; - vchSig[3] = 33; + vchSig[3] = m_r_len; vchSig[4] = 0x01; - vchSig[4 + 33] = 0x02; - vchSig[5 + 33] = 32; - vchSig[6 + 33] = 0x01; - vchSig[6 + 33 + 32] = SIGHASH_ALL; + vchSig[4 + m_r_len] = 0x02; + vchSig[5 + m_r_len] = m_s_len; + vchSig[6 + m_r_len] = 0x01; + vchSig[6 + m_r_len + m_s_len] = SIGHASH_ALL; return true; } }; + +template<typename M, typename K, typename V> +bool LookupHelper(const M& map, const K& key, V& value) +{ + auto it = map.find(key); + if (it != map.end()) { + value = it->second; + return true; + } + return false; } -const BaseSignatureCreator& DUMMY_SIGNATURE_CREATOR = DummySignatureCreator(); +} + +const BaseSignatureCreator& DUMMY_SIGNATURE_CREATOR = DummySignatureCreator(32, 32); +const BaseSignatureCreator& DUMMY_MAXIMUM_SIGNATURE_CREATOR = DummySignatureCreator(33, 32); const SigningProvider& DUMMY_SIGNING_PROVIDER = SigningProvider(); bool IsSolvable(const SigningProvider& provider, const CScript& script) @@ -454,13 +485,13 @@ bool IsSolvable(const SigningProvider& provider, const CScript& script) static_assert(STANDARD_SCRIPT_VERIFY_FLAGS & SCRIPT_VERIFY_WITNESS_PUBKEYTYPE, "IsSolvable requires standard script flags to include WITNESS_PUBKEYTYPE"); if (ProduceSignature(provider, DUMMY_SIGNATURE_CREATOR, script, sigs)) { // VerifyScript check is just defensive, and should never fail. - assert(VerifyScript(sigs.scriptSig, script, &sigs.scriptWitness, STANDARD_SCRIPT_VERIFY_FLAGS, DUMMY_CHECKER)); + bool verified = VerifyScript(sigs.scriptSig, script, &sigs.scriptWitness, STANDARD_SCRIPT_VERIFY_FLAGS, DUMMY_CHECKER); + assert(verified); return true; } return false; } - bool PartiallySignedTransaction::IsNull() const { return !tx && inputs.empty() && outputs.empty() && unknown.empty(); @@ -618,3 +649,19 @@ bool PublicOnlySigningProvider::GetPubKey(const CKeyID &address, CPubKey& pubkey { return m_provider->GetPubKey(address, pubkey); } + +bool FlatSigningProvider::GetCScript(const CScriptID& scriptid, CScript& script) const { return LookupHelper(scripts, scriptid, script); } +bool FlatSigningProvider::GetPubKey(const CKeyID& keyid, CPubKey& pubkey) const { return LookupHelper(pubkeys, keyid, pubkey); } +bool FlatSigningProvider::GetKey(const CKeyID& keyid, CKey& key) const { return LookupHelper(keys, keyid, key); } + +FlatSigningProvider Merge(const FlatSigningProvider& a, const FlatSigningProvider& b) +{ + FlatSigningProvider ret; + ret.scripts = a.scripts; + ret.scripts.insert(b.scripts.begin(), b.scripts.end()); + ret.pubkeys = a.pubkeys; + ret.pubkeys.insert(b.pubkeys.begin(), b.pubkeys.end()); + ret.keys = a.keys; + ret.keys.insert(b.keys.begin(), b.keys.end()); + return ret; +} diff --git a/src/script/sign.h b/src/script/sign.h index d12d0b5874..7ade715ee2 100644 --- a/src/script/sign.h +++ b/src/script/sign.h @@ -1,5 +1,5 @@ // Copyright (c) 2009-2010 Satoshi Nakamoto -// Copyright (c) 2009-2017 The Bitcoin Core developers +// Copyright (c) 2009-2018 The Bitcoin Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. @@ -43,6 +43,19 @@ public: bool GetPubKey(const CKeyID &address, CPubKey& pubkey) const; }; +struct FlatSigningProvider final : public SigningProvider +{ + std::map<CScriptID, CScript> scripts; + std::map<CKeyID, CPubKey> pubkeys; + std::map<CKeyID, CKey> keys; + + bool GetCScript(const CScriptID& scriptid, CScript& script) const override; + bool GetPubKey(const CKeyID& keyid, CPubKey& pubkey) const override; + bool GetKey(const CKeyID& keyid, CKey& key) const override; +}; + +FlatSigningProvider Merge(const FlatSigningProvider& a, const FlatSigningProvider& b); + /** Interface for signature creators. */ class BaseSignatureCreator { public: @@ -67,8 +80,10 @@ public: bool CreateSig(const SigningProvider& provider, std::vector<unsigned char>& vchSig, const CKeyID& keyid, const CScript& scriptCode, SigVersion sigversion) const override; }; -/** A signature creator that just produces 72-byte empty signatures. */ +/** A signature creator that just produces 71-byte empty signatures. */ extern const BaseSignatureCreator& DUMMY_SIGNATURE_CREATOR; +/** A signature creator that just produces 72-byte empty signatures. */ +extern const BaseSignatureCreator& DUMMY_MAXIMUM_SIGNATURE_CREATOR; typedef std::pair<CPubKey, std::vector<unsigned char>> SigPair; @@ -208,7 +223,8 @@ struct PSBTInput // If there is a non-witness utxo, then don't add the witness one. if (non_witness_utxo) { SerializeToVector(s, PSBT_IN_NON_WITNESS_UTXO); - SerializeToVector(s, non_witness_utxo); + OverrideStream<Stream> os(&s, s.GetType(), s.GetVersion() | SERIALIZE_TRANSACTION_NO_WITNESS); + SerializeToVector(os, non_witness_utxo); } else if (!witness_utxo.IsNull()) { SerializeToVector(s, PSBT_IN_WITNESS_UTXO); SerializeToVector(s, witness_utxo); @@ -282,13 +298,17 @@ struct PSBTInput // Do stuff based on type switch(type) { case PSBT_IN_NON_WITNESS_UTXO: + { if (non_witness_utxo) { throw std::ios_base::failure("Duplicate Key, input non-witness utxo already provided"); } else if (key.size() != 1) { throw std::ios_base::failure("Non-witness utxo key is more than one byte type"); } - UnserializeFromVector(s, non_witness_utxo); + // Set the stream to unserialize with witness since this is always a valid network transaction + OverrideStream<Stream> os(&s, s.GetType(), s.GetVersion() & ~SERIALIZE_TRANSACTION_NO_WITNESS); + UnserializeFromVector(os, non_witness_utxo); break; + } case PSBT_IN_WITNESS_UTXO: if (!witness_utxo.IsNull()) { throw std::ios_base::failure("Duplicate Key, input witness utxo already provided"); @@ -532,7 +552,8 @@ struct PartiallySignedTransaction SerializeToVector(s, PSBT_GLOBAL_UNSIGNED_TX); // Write serialized tx to a stream - SerializeToVector(s, *tx); + OverrideStream<Stream> os(&s, s.GetType(), s.GetVersion() | SERIALIZE_TRANSACTION_NO_WITNESS); + SerializeToVector(os, *tx); // Write the unknown things for (auto& entry : unknown) { @@ -586,7 +607,9 @@ struct PartiallySignedTransaction throw std::ios_base::failure("Global unsigned tx key is more than one byte type"); } CMutableTransaction mtx; - UnserializeFromVector(s, mtx); + // Set the stream to serialize with non-witness since this should always be non-witness + OverrideStream<Stream> os(&s, s.GetType(), s.GetVersion() | SERIALIZE_TRANSACTION_NO_WITNESS); + UnserializeFromVector(os, mtx); tx = std::move(mtx); // Make sure that all scriptSigs and scriptWitnesses are empty for (const CTxIn& txin : tx->vin) { @@ -663,7 +686,7 @@ bool ProduceSignature(const SigningProvider& provider, const BaseSignatureCreato bool SignSignature(const SigningProvider &provider, const CScript& fromPubKey, CMutableTransaction& txTo, unsigned int nIn, const CAmount& amount, int nHashType); bool SignSignature(const SigningProvider &provider, const CTransaction& txFrom, CMutableTransaction& txTo, unsigned int nIn, int nHashType); -/** Signs a PSBTInput */ +/** Signs a PSBTInput, verifying that all provided data matches what is being signed. */ bool SignPSBTInput(const SigningProvider& provider, const CMutableTransaction& tx, PSBTInput& input, SignatureData& sigdata, int index, int sighash = 1); /** Extract signature data from a transaction input, and insert it. */ diff --git a/src/script/standard.cpp b/src/script/standard.cpp index d7b1724790..bfbf9f13db 100644 --- a/src/script/standard.cpp +++ b/src/script/standard.cpp @@ -1,5 +1,5 @@ // Copyright (c) 2009-2010 Satoshi Nakamoto -// Copyright (c) 2009-2017 The Bitcoin Core developers +// Copyright (c) 2009-2018 The Bitcoin Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/script/standard.h b/src/script/standard.h index 1380030871..b16ac83e77 100644 --- a/src/script/standard.h +++ b/src/script/standard.h @@ -1,5 +1,5 @@ // Copyright (c) 2009-2010 Satoshi Nakamoto -// Copyright (c) 2009-2017 The Bitcoin Core developers +// Copyright (c) 2009-2018 The Bitcoin Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/serialize.h b/src/serialize.h index 99d4c893f2..8bd3ef5d76 100644 --- a/src/serialize.h +++ b/src/serialize.h @@ -1,5 +1,5 @@ // Copyright (c) 2009-2010 Satoshi Nakamoto -// Copyright (c) 2009-2017 The Bitcoin Core developers +// Copyright (c) 2009-2018 The Bitcoin Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/span.h b/src/span.h index 707fc21918..77de059fa6 100644 --- a/src/span.h +++ b/src/span.h @@ -7,6 +7,7 @@ #include <type_traits> #include <cstddef> +#include <algorithm> /** A Span is an object that can refer to a contiguous sequence of objects. * @@ -21,9 +22,25 @@ class Span public: constexpr Span() noexcept : m_data(nullptr), m_size(0) {} constexpr Span(C* data, std::ptrdiff_t size) noexcept : m_data(data), m_size(size) {} + constexpr Span(C* data, C* end) noexcept : m_data(data), m_size(end - data) {} constexpr C* data() const noexcept { return m_data; } + constexpr C* begin() const noexcept { return m_data; } + constexpr C* end() const noexcept { return m_data + m_size; } constexpr std::ptrdiff_t size() const noexcept { return m_size; } + constexpr C& operator[](std::ptrdiff_t pos) const noexcept { return m_data[pos]; } + + constexpr Span<C> subspan(std::ptrdiff_t offset) const noexcept { return Span<C>(m_data + offset, m_size - offset); } + constexpr Span<C> subspan(std::ptrdiff_t offset, std::ptrdiff_t count) const noexcept { return Span<C>(m_data + offset, count); } + constexpr Span<C> first(std::ptrdiff_t count) const noexcept { return Span<C>(m_data, count); } + constexpr Span<C> last(std::ptrdiff_t count) const noexcept { return Span<C>(m_data + m_size - count, count); } + + friend constexpr bool operator==(const Span& a, const Span& b) noexcept { return a.size() == b.size() && std::equal(a.begin(), a.end(), b.begin()); } + friend constexpr bool operator!=(const Span& a, const Span& b) noexcept { return !(a == b); } + friend constexpr bool operator<(const Span& a, const Span& b) noexcept { return std::lexicographical_compare(a.begin(), a.end(), b.begin(), b.end()); } + friend constexpr bool operator<=(const Span& a, const Span& b) noexcept { return !(b < a); } + friend constexpr bool operator>(const Span& a, const Span& b) noexcept { return (b < a); } + friend constexpr bool operator>=(const Span& a, const Span& b) noexcept { return !(a < b); } }; /** Create a span to a container exposing data() and size(). @@ -34,6 +51,9 @@ public: * * std::span will have a constructor that implements this functionality directly. */ +template<typename A, int N> +constexpr Span<A> MakeSpan(A (&a)[N]) { return Span<A>(a, N); } + template<typename V> constexpr Span<typename std::remove_pointer<decltype(std::declval<V>().data())>::type> MakeSpan(V& v) { return Span<typename std::remove_pointer<decltype(std::declval<V>().data())>::type>(v.data(), v.size()); } diff --git a/src/streams.h b/src/streams.h index ed2e985d76..096ebfc9c2 100644 --- a/src/streams.h +++ b/src/streams.h @@ -1,5 +1,5 @@ // Copyright (c) 2009-2010 Satoshi Nakamoto -// Copyright (c) 2009-2017 The Bitcoin Core developers +// Copyright (c) 2009-2018 The Bitcoin Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. @@ -61,6 +61,7 @@ public: int GetVersion() const { return nVersion; } int GetType() const { return nType; } + size_t size() const { return stream->size(); } }; template<typename S> diff --git a/src/support/allocators/secure.h b/src/support/allocators/secure.h index 0249afa499..7cd0df135d 100644 --- a/src/support/allocators/secure.h +++ b/src/support/allocators/secure.h @@ -1,5 +1,5 @@ // Copyright (c) 2009-2010 Satoshi Nakamoto -// Copyright (c) 2009-2017 The Bitcoin Core developers +// Copyright (c) 2009-2018 The Bitcoin Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/support/allocators/zeroafterfree.h b/src/support/allocators/zeroafterfree.h index 78ff1ad024..c7ed5ef308 100644 --- a/src/support/allocators/zeroafterfree.h +++ b/src/support/allocators/zeroafterfree.h @@ -1,5 +1,5 @@ // Copyright (c) 2009-2010 Satoshi Nakamoto -// Copyright (c) 2009-2017 The Bitcoin Core developers +// Copyright (c) 2009-2018 The Bitcoin Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/support/cleanse.cpp b/src/support/cleanse.cpp index 9bf7eda785..17a4a4c2b2 100644 --- a/src/support/cleanse.cpp +++ b/src/support/cleanse.cpp @@ -1,5 +1,5 @@ // Copyright (c) 2009-2010 Satoshi Nakamoto -// Copyright (c) 2009-2017 The Bitcoin Core developers +// Copyright (c) 2009-2018 The Bitcoin Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/support/cleanse.h b/src/support/cleanse.h index 69c27df519..5298214e44 100644 --- a/src/support/cleanse.h +++ b/src/support/cleanse.h @@ -1,5 +1,5 @@ // Copyright (c) 2009-2010 Satoshi Nakamoto -// Copyright (c) 2009-2017 The Bitcoin Core developers +// Copyright (c) 2009-2018 The Bitcoin Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/support/events.h b/src/support/events.h index 7ad51f319c..0a74d02368 100644 --- a/src/support/events.h +++ b/src/support/events.h @@ -1,4 +1,4 @@ -// Copyright (c) 2016-2017 The Bitcoin Core developers +// Copyright (c) 2016-2018 The Bitcoin Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/support/lockedpool.cpp b/src/support/lockedpool.cpp index a273424b51..070b3ed80e 100644 --- a/src/support/lockedpool.cpp +++ b/src/support/lockedpool.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2016-2017 The Bitcoin Core developers +// Copyright (c) 2016-2018 The Bitcoin Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/support/lockedpool.h b/src/support/lockedpool.h index ccfae16701..48ffd7b307 100644 --- a/src/support/lockedpool.h +++ b/src/support/lockedpool.h @@ -1,4 +1,4 @@ -// Copyright (c) 2016-2017 The Bitcoin Core developers +// Copyright (c) 2016-2018 The Bitcoin Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/sync.cpp b/src/sync.cpp index 28a4e37e68..255eb4f00b 100644 --- a/src/sync.cpp +++ b/src/sync.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2011-2017 The Bitcoin Core developers +// Copyright (c) 2011-2018 The Bitcoin Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/sync.h b/src/sync.h index 882ad5dc4c..11c1253757 100644 --- a/src/sync.h +++ b/src/sync.h @@ -1,5 +1,5 @@ // Copyright (c) 2009-2010 Satoshi Nakamoto -// Copyright (c) 2009-2017 The Bitcoin Core developers +// Copyright (c) 2009-2018 The Bitcoin Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/test/addrman_tests.cpp b/src/test/addrman_tests.cpp index ee3650d148..f57d0c6d79 100644 --- a/src/test/addrman_tests.cpp +++ b/src/test/addrman_tests.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2012-2017 The Bitcoin Core developers +// Copyright (c) 2012-2018 The Bitcoin Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. #include <addrman.h> diff --git a/src/test/allocator_tests.cpp b/src/test/allocator_tests.cpp index 67d1229c70..1052ada232 100644 --- a/src/test/allocator_tests.cpp +++ b/src/test/allocator_tests.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2012-2017 The Bitcoin Core developers +// Copyright (c) 2012-2018 The Bitcoin Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/test/amount_tests.cpp b/src/test/amount_tests.cpp index 854146102e..adffcfeef5 100644 --- a/src/test/amount_tests.cpp +++ b/src/test/amount_tests.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2016-2017 The Bitcoin Core developers +// Copyright (c) 2016-2018 The Bitcoin Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/test/arith_uint256_tests.cpp b/src/test/arith_uint256_tests.cpp index 8644aea371..77b6008fd0 100644 --- a/src/test/arith_uint256_tests.cpp +++ b/src/test/arith_uint256_tests.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2011-2017 The Bitcoin Core developers +// Copyright (c) 2011-2018 The Bitcoin Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/test/base32_tests.cpp b/src/test/base32_tests.cpp index 1210c7a7ee..6b06d2e1b6 100644 --- a/src/test/base32_tests.cpp +++ b/src/test/base32_tests.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2012-2017 The Bitcoin Core developers +// Copyright (c) 2012-2018 The Bitcoin Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/test/base58_tests.cpp b/src/test/base58_tests.cpp index f90d4f90cb..5fc4abaf3d 100644 --- a/src/test/base58_tests.cpp +++ b/src/test/base58_tests.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2011-2017 The Bitcoin Core developers +// Copyright (c) 2011-2018 The Bitcoin Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/test/base64_tests.cpp b/src/test/base64_tests.cpp index f785cede81..daceea262c 100644 --- a/src/test/base64_tests.cpp +++ b/src/test/base64_tests.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2011-2017 The Bitcoin Core developers +// Copyright (c) 2011-2018 The Bitcoin Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/test/bip32_tests.cpp b/src/test/bip32_tests.cpp index 2c625c089c..2cdbaca7ba 100644 --- a/src/test/bip32_tests.cpp +++ b/src/test/bip32_tests.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2013-2017 The Bitcoin Core developers +// Copyright (c) 2013-2018 The Bitcoin Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/test/blockencodings_tests.cpp b/src/test/blockencodings_tests.cpp index df839884fe..d2c7c8cb1d 100644 --- a/src/test/blockencodings_tests.cpp +++ b/src/test/blockencodings_tests.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2011-2017 The Bitcoin Core developers +// Copyright (c) 2011-2018 The Bitcoin Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/test/bloom_tests.cpp b/src/test/bloom_tests.cpp index 17f3004ef3..8a8e8bfdc3 100644 --- a/src/test/bloom_tests.cpp +++ b/src/test/bloom_tests.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2012-2017 The Bitcoin Core developers +// Copyright (c) 2012-2018 The Bitcoin Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/test/bswap_tests.cpp b/src/test/bswap_tests.cpp index f22f513e87..8572926193 100644 --- a/src/test/bswap_tests.cpp +++ b/src/test/bswap_tests.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2016-2017 The Bitcoin Core developers +// Copyright (c) 2016-2018 The Bitcoin Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/test/checkqueue_tests.cpp b/src/test/checkqueue_tests.cpp index c8de7f4a7c..39d0061c1c 100644 --- a/src/test/checkqueue_tests.cpp +++ b/src/test/checkqueue_tests.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2012-2017 The Bitcoin Core developers +// Copyright (c) 2012-2018 The Bitcoin Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/test/coins_tests.cpp b/src/test/coins_tests.cpp index b792ff8b45..63b91b74c0 100644 --- a/src/test/coins_tests.cpp +++ b/src/test/coins_tests.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2014-2017 The Bitcoin Core developers +// Copyright (c) 2014-2018 The Bitcoin Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/test/compress_tests.cpp b/src/test/compress_tests.cpp index 127cc154df..a4e99d438f 100644 --- a/src/test/compress_tests.cpp +++ b/src/test/compress_tests.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2012-2017 The Bitcoin Core developers +// Copyright (c) 2012-2018 The Bitcoin Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/test/crypto_tests.cpp b/src/test/crypto_tests.cpp index d701f3bc4e..19521027a9 100644 --- a/src/test/crypto_tests.cpp +++ b/src/test/crypto_tests.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2014-2017 The Bitcoin Core developers +// Copyright (c) 2014-2018 The Bitcoin Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/test/cuckoocache_tests.cpp b/src/test/cuckoocache_tests.cpp index 2edc7c16d4..ec7aba34ca 100644 --- a/src/test/cuckoocache_tests.cpp +++ b/src/test/cuckoocache_tests.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2012-2017 The Bitcoin Core developers +// Copyright (c) 2012-2018 The Bitcoin Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. #include <boost/test/unit_test.hpp> diff --git a/src/test/data/tx_invalid.json b/src/test/data/tx_invalid.json index 918df6d8d9..d22175d660 100644 --- a/src/test/data/tx_invalid.json +++ b/src/test/data/tx_invalid.json @@ -363,7 +363,7 @@ "010000000144490eda355be7480f2ec828dcc1b9903793a8008fad8cfe9b0c6b4d2f0355a9000000004a483045022100fa4a74ba9fd59c59f46c3960cf90cbe0d2b743c471d24a3d5d6db6002af5eebb02204d70ec490fd0f7055a7c45f86514336e3a7f03503dacecabb247fc23f15c83510151ffffffff010000000000000000016a00000000", "P2SH,CONST_SCRIPTCODE"], -["Using CHECKSIG with singatures in scriptSigs will trigger FindAndDelete, which is invalid"], +["Using CHECKSIG with signatures in scriptSigs will trigger FindAndDelete, which is invalid"], [[["ccf7f4053a02e653c36ac75c891b7496d0dc5ce5214f6c913d9cf8f1329ebee0", 0, "DUP HASH160 0x14 0xee5a6aa40facefb2655ac23c0c28c57c65c41f9b EQUALVERIFY CHECKSIG"]], "0100000001e0be9e32f1f89c3d916c4f21e55cdcd096741b895cc76ac353e6023a05f4f7cc00000000d86149304602210086e5f736a2c3622ebb62bd9d93d8e5d76508b98be922b97160edc3dcca6d8c47022100b23c312ac232a4473f19d2aeb95ab7bdf2b65518911a0d72d50e38b5dd31dc820121038479a0fa998cd35259a2ef0a7a5c68662c1474f88ccb6d08a7677bbec7f22041ac4730440220508fa761865c8abd81244a168392876ee1d94e8ed83897066b5e2df2400dad24022043f5ee7538e87e9c6aef7ef55133d3e51da7cc522830a9c4d736977a76ef755c0121038479a0fa998cd35259a2ef0a7a5c68662c1474f88ccb6d08a7677bbec7f22041ffffffff010000000000000000016a00000000", "P2SH,CONST_SCRIPTCODE"], diff --git a/src/test/dbwrapper_tests.cpp b/src/test/dbwrapper_tests.cpp index 5ba54ef9b0..4dff1e5c72 100644 --- a/src/test/dbwrapper_tests.cpp +++ b/src/test/dbwrapper_tests.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2012-2017 The Bitcoin Core developers +// Copyright (c) 2012-2018 The Bitcoin Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/test/denialofservice_tests.cpp b/src/test/denialofservice_tests.cpp index 49037adb9a..fdf7397bff 100644 --- a/src/test/denialofservice_tests.cpp +++ b/src/test/denialofservice_tests.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2011-2017 The Bitcoin Core developers +// Copyright (c) 2011-2018 The Bitcoin Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/test/descriptor_tests.cpp b/src/test/descriptor_tests.cpp new file mode 100644 index 0000000000..f189222be8 --- /dev/null +++ b/src/test/descriptor_tests.cpp @@ -0,0 +1,163 @@ +// Copyright (c) 2018 The Bitcoin Core developers +// Distributed under the MIT software license, see the accompanying +// file COPYING or http://www.opensource.org/licenses/mit-license.php. + +#include <vector> +#include <string> +#include <script/sign.h> +#include <script/standard.h> +#include <test/test_bitcoin.h> +#include <boost/test/unit_test.hpp> +#include <script/descriptor.h> +#include <utilstrencodings.h> + +namespace { + +void CheckUnparsable(const std::string& prv, const std::string& pub) +{ + FlatSigningProvider keys_priv, keys_pub; + auto parse_priv = Parse(prv, keys_priv); + auto parse_pub = Parse(pub, keys_pub); + BOOST_CHECK(!parse_priv); + BOOST_CHECK(!parse_pub); +} + +constexpr int DEFAULT = 0; +constexpr int RANGE = 1; // Expected to be ranged descriptor +constexpr int HARDENED = 2; // Derivation needs access to private keys +constexpr int UNSOLVABLE = 4; // This descriptor is not expected to be solvable +constexpr int SIGNABLE = 8; // We can sign with this descriptor (this is not true when actual BIP32 derivation is used, as that's not integrated in our signing code) + +std::string MaybeUseHInsteadOfApostrophy(std::string ret) +{ + if (InsecureRandBool()) { + while (true) { + auto it = ret.find("'"); + if (it != std::string::npos) { + ret[it] = 'h'; + } else { + break; + } + } + } + return ret; +} + +void Check(const std::string& prv, const std::string& pub, int flags, const std::vector<std::vector<std::string>>& scripts) +{ + FlatSigningProvider keys_priv, keys_pub; + + // Check that parsing succeeds. + auto parse_priv = Parse(MaybeUseHInsteadOfApostrophy(prv), keys_priv); + auto parse_pub = Parse(MaybeUseHInsteadOfApostrophy(pub), keys_pub); + BOOST_CHECK(parse_priv); + BOOST_CHECK(parse_pub); + + // Check private keys are extracted from the private version but not the public one. + BOOST_CHECK(keys_priv.keys.size()); + BOOST_CHECK(!keys_pub.keys.size()); + + // Check that both versions serialize back to the public version. + std::string pub1 = parse_priv->ToString(); + std::string pub2 = parse_priv->ToString(); + BOOST_CHECK_EQUAL(pub, pub1); + BOOST_CHECK_EQUAL(pub, pub2); + + // Check that both can be serialized with private key back to the private version, but not without private key. + std::string prv1, prv2; + BOOST_CHECK(parse_priv->ToPrivateString(keys_priv, prv1)); + BOOST_CHECK_EQUAL(prv, prv1); + BOOST_CHECK(!parse_priv->ToPrivateString(keys_pub, prv1)); + BOOST_CHECK(parse_pub->ToPrivateString(keys_priv, prv1)); + BOOST_CHECK_EQUAL(prv, prv1); + BOOST_CHECK(!parse_pub->ToPrivateString(keys_pub, prv1)); + + // Check whether IsRange on both returns the expected result + BOOST_CHECK_EQUAL(parse_pub->IsRange(), (flags & RANGE) != 0); + BOOST_CHECK_EQUAL(parse_priv->IsRange(), (flags & RANGE) != 0); + + + // Is not ranged descriptor, only a single result is expected. + if (!(flags & RANGE)) assert(scripts.size() == 1); + + size_t max = (flags & RANGE) ? scripts.size() : 3; + for (size_t i = 0; i < max; ++i) { + const auto& ref = scripts[(flags & RANGE) ? i : 0]; + for (int t = 0; t < 2; ++t) { + FlatSigningProvider key_provider = (flags & HARDENED) ? keys_priv : keys_pub; + FlatSigningProvider script_provider; + std::vector<CScript> spks; + BOOST_CHECK((t ? parse_priv : parse_pub)->Expand(i, key_provider, spks, script_provider)); + BOOST_CHECK_EQUAL(spks.size(), ref.size()); + for (size_t n = 0; n < spks.size(); ++n) { + BOOST_CHECK_EQUAL(ref[n], HexStr(spks[n].begin(), spks[n].end())); + BOOST_CHECK_EQUAL(IsSolvable(Merge(key_provider, script_provider), spks[n]), (flags & UNSOLVABLE) == 0); + + if (flags & SIGNABLE) { + CMutableTransaction spend; + spend.vin.resize(1); + spend.vout.resize(1); + BOOST_CHECK_MESSAGE(SignSignature(Merge(keys_priv, script_provider), spks[n], spend, 0, 1, SIGHASH_ALL), prv); + } + } + + } + } +} + +} + +BOOST_FIXTURE_TEST_SUITE(descriptor_tests, BasicTestingSetup) + +BOOST_AUTO_TEST_CASE(descriptor_test) +{ + // Basic single-key compressed + Check("combo(L4rK1yDtCWekvXuE6oXD9jCYfFNV2cWRpVuPLBcCU2z8TrisoyY1)", "combo(03a34b99f22c790c4e36b2b3c2c35a36db06226e41c692fc82b8b56ac1c540c5bd)", SIGNABLE, {{"2103a34b99f22c790c4e36b2b3c2c35a36db06226e41c692fc82b8b56ac1c540c5bdac","76a9149a1c78a507689f6f54b847ad1cef1e614ee23f1e88ac","00149a1c78a507689f6f54b847ad1cef1e614ee23f1e","a91484ab21b1b2fd065d4504ff693d832434b6108d7b87"}}); + Check("pk(L4rK1yDtCWekvXuE6oXD9jCYfFNV2cWRpVuPLBcCU2z8TrisoyY1)", "pk(03a34b99f22c790c4e36b2b3c2c35a36db06226e41c692fc82b8b56ac1c540c5bd)", SIGNABLE, {{"2103a34b99f22c790c4e36b2b3c2c35a36db06226e41c692fc82b8b56ac1c540c5bdac"}}); + Check("pkh(L4rK1yDtCWekvXuE6oXD9jCYfFNV2cWRpVuPLBcCU2z8TrisoyY1)", "pkh(03a34b99f22c790c4e36b2b3c2c35a36db06226e41c692fc82b8b56ac1c540c5bd)", SIGNABLE, {{"76a9149a1c78a507689f6f54b847ad1cef1e614ee23f1e88ac"}}); + Check("wpkh(L4rK1yDtCWekvXuE6oXD9jCYfFNV2cWRpVuPLBcCU2z8TrisoyY1)", "wpkh(03a34b99f22c790c4e36b2b3c2c35a36db06226e41c692fc82b8b56ac1c540c5bd)", SIGNABLE, {{"00149a1c78a507689f6f54b847ad1cef1e614ee23f1e"}}); + Check("sh(wpkh(L4rK1yDtCWekvXuE6oXD9jCYfFNV2cWRpVuPLBcCU2z8TrisoyY1))", "sh(wpkh(03a34b99f22c790c4e36b2b3c2c35a36db06226e41c692fc82b8b56ac1c540c5bd))", SIGNABLE, {{"a91484ab21b1b2fd065d4504ff693d832434b6108d7b87"}}); + + // Basic single-key uncompressed + Check("combo(5KYZdUEo39z3FPrtuX2QbbwGnNP5zTd7yyr2SC1j299sBCnWjss)", "combo(04a34b99f22c790c4e36b2b3c2c35a36db06226e41c692fc82b8b56ac1c540c5bd5b8dec5235a0fa8722476c7709c02559e3aa73aa03918ba2d492eea75abea235)", SIGNABLE, {{"4104a34b99f22c790c4e36b2b3c2c35a36db06226e41c692fc82b8b56ac1c540c5bd5b8dec5235a0fa8722476c7709c02559e3aa73aa03918ba2d492eea75abea235ac","76a914b5bd079c4d57cc7fc28ecf8213a6b791625b818388ac"}}); + Check("pk(5KYZdUEo39z3FPrtuX2QbbwGnNP5zTd7yyr2SC1j299sBCnWjss)", "pk(04a34b99f22c790c4e36b2b3c2c35a36db06226e41c692fc82b8b56ac1c540c5bd5b8dec5235a0fa8722476c7709c02559e3aa73aa03918ba2d492eea75abea235)", SIGNABLE, {{"4104a34b99f22c790c4e36b2b3c2c35a36db06226e41c692fc82b8b56ac1c540c5bd5b8dec5235a0fa8722476c7709c02559e3aa73aa03918ba2d492eea75abea235ac"}}); + Check("pkh(5KYZdUEo39z3FPrtuX2QbbwGnNP5zTd7yyr2SC1j299sBCnWjss)", "pkh(04a34b99f22c790c4e36b2b3c2c35a36db06226e41c692fc82b8b56ac1c540c5bd5b8dec5235a0fa8722476c7709c02559e3aa73aa03918ba2d492eea75abea235)", SIGNABLE, {{"76a914b5bd079c4d57cc7fc28ecf8213a6b791625b818388ac"}}); + CheckUnparsable("wpkh(5KYZdUEo39z3FPrtuX2QbbwGnNP5zTd7yyr2SC1j299sBCnWjss)", "wpkh(04a34b99f22c790c4e36b2b3c2c35a36db06226e41c692fc82b8b56ac1c540c5bd5b8dec5235a0fa8722476c7709c02559e3aa73aa03918ba2d492eea75abea235)"); // No uncompressed keys in witness + CheckUnparsable("wsh(pk(5KYZdUEo39z3FPrtuX2QbbwGnNP5zTd7yyr2SC1j299sBCnWjss))", "wsh(pk(04a34b99f22c790c4e36b2b3c2c35a36db06226e41c692fc82b8b56ac1c540c5bd5b8dec5235a0fa8722476c7709c02559e3aa73aa03918ba2d492eea75abea235))"); // No uncompressed keys in witness + CheckUnparsable("sh(wpkh(5KYZdUEo39z3FPrtuX2QbbwGnNP5zTd7yyr2SC1j299sBCnWjss))", "sh(wpkh(04a34b99f22c790c4e36b2b3c2c35a36db06226e41c692fc82b8b56ac1c540c5bd5b8dec5235a0fa8722476c7709c02559e3aa73aa03918ba2d492eea75abea235))"); // No uncompressed keys in witness + + // Some unconventional single-key constructions + Check("sh(pk(L4rK1yDtCWekvXuE6oXD9jCYfFNV2cWRpVuPLBcCU2z8TrisoyY1))", "sh(pk(03a34b99f22c790c4e36b2b3c2c35a36db06226e41c692fc82b8b56ac1c540c5bd))", SIGNABLE, {{"a9141857af51a5e516552b3086430fd8ce55f7c1a52487"}}); + Check("sh(pkh(L4rK1yDtCWekvXuE6oXD9jCYfFNV2cWRpVuPLBcCU2z8TrisoyY1))", "sh(pkh(03a34b99f22c790c4e36b2b3c2c35a36db06226e41c692fc82b8b56ac1c540c5bd))", SIGNABLE, {{"a9141a31ad23bf49c247dd531a623c2ef57da3c400c587"}}); + Check("wsh(pk(L4rK1yDtCWekvXuE6oXD9jCYfFNV2cWRpVuPLBcCU2z8TrisoyY1))", "wsh(pk(03a34b99f22c790c4e36b2b3c2c35a36db06226e41c692fc82b8b56ac1c540c5bd))", SIGNABLE, {{"00202e271faa2325c199d25d22e1ead982e45b64eeb4f31e73dbdf41bd4b5fec23fa"}}); + Check("wsh(pkh(L4rK1yDtCWekvXuE6oXD9jCYfFNV2cWRpVuPLBcCU2z8TrisoyY1))", "wsh(pkh(03a34b99f22c790c4e36b2b3c2c35a36db06226e41c692fc82b8b56ac1c540c5bd))", SIGNABLE, {{"0020338e023079b91c58571b20e602d7805fb808c22473cbc391a41b1bd3a192e75b"}}); + Check("sh(wsh(pk(L4rK1yDtCWekvXuE6oXD9jCYfFNV2cWRpVuPLBcCU2z8TrisoyY1)))", "sh(wsh(pk(03a34b99f22c790c4e36b2b3c2c35a36db06226e41c692fc82b8b56ac1c540c5bd)))", SIGNABLE, {{"a91472d0c5a3bfad8c3e7bd5303a72b94240e80b6f1787"}}); + Check("sh(wsh(pkh(L4rK1yDtCWekvXuE6oXD9jCYfFNV2cWRpVuPLBcCU2z8TrisoyY1)))", "sh(wsh(pkh(03a34b99f22c790c4e36b2b3c2c35a36db06226e41c692fc82b8b56ac1c540c5bd)))", SIGNABLE, {{"a914b61b92e2ca21bac1e72a3ab859a742982bea960a87"}}); + + // Versions with BIP32 derivations + Check("combo(xprvA1RpRA33e1JQ7ifknakTFpgNXPmW2YvmhqLQYMmrj4xJXXWYpDPS3xz7iAxn8L39njGVyuoseXzU6rcxFLJ8HFsTjSyQbLYnMpCqE2VbFWc)", "combo(xpub6ERApfZwUNrhLCkDtcHTcxd75RbzS1ed54G1LkBUHQVHQKqhMkhgbmJbZRkrgZw4koxb5JaHWkY4ALHY2grBGRjaDMzQLcgJvLJuZZvRcEL)", SIGNABLE, {{"2102d2b36900396c9282fa14628566582f206a5dd0bcc8d5e892611806cafb0301f0ac","76a91431a507b815593dfc51ffc7245ae7e5aee304246e88ac","001431a507b815593dfc51ffc7245ae7e5aee304246e","a9142aafb926eb247cb18240a7f4c07983ad1f37922687"}}); + Check("pk(xprv9uPDJpEQgRQfDcW7BkF7eTya6RPxXeJCqCJGHuCJ4GiRVLzkTXBAJMu2qaMWPrS7AANYqdq6vcBcBUdJCVVFceUvJFjaPdGZ2y9WACViL4L/0)", "pk(xpub68NZiKmJWnxxS6aaHmn81bvJeTESw724CRDs6HbuccFQN9Ku14VQrADWgqbhhTHBaohPX4CjNLf9fq9MYo6oDaPPLPxSb7gwQN3ih19Zm4Y/0)", DEFAULT, {{"210379e45b3cf75f9c5f9befd8e9506fb962f6a9d185ac87001ec44a8d3df8d4a9e3ac"}}); + Check("pkh(xprv9s21ZrQH143K31xYSDQpPDxsXRTUcvj2iNHm5NUtrGiGG5e2DtALGdso3pGz6ssrdK4PFmM8NSpSBHNqPqm55Qn3LqFtT2emdEXVYsCzC2U/2147483647'/0)", "pkh(xpub661MyMwAqRbcFW31YEwpkMuc5THy2PSt5bDMsktWQcFF8syAmRUapSCGu8ED9W6oDMSgv6Zz8idoc4a6mr8BDzTJY47LJhkJ8UB7WEGuduB/2147483647'/0)", HARDENED, {{"76a914ebdc90806a9c4356c1c88e42216611e1cb4c1c1788ac"}}); + Check("wpkh(xprv9vHkqa6EV4sPZHYqZznhT2NPtPCjKuDKGY38FBWLvgaDx45zo9WQRUT3dKYnjwih2yJD9mkrocEZXo1ex8G81dwSM1fwqWpWkeS3v86pgKt/1/2/*)", "wpkh(xpub69H7F5d8KSRgmmdJg2KhpAK8SR3DjMwAdkxj3ZuxV27CprR9LgpeyGmXUbC6wb7ERfvrnKZjXoUmmDznezpbZb7ap6r1D3tgFxHmwMkQTPH/1/2/*)", RANGE, {{"0014326b2249e3a25d5dc60935f044ee835d090ba859"},{"0014af0bd98abc2f2cae66e36896a39ffe2d32984fb7"},{"00141fa798efd1cbf95cebf912c031b8a4a6e9fb9f27"}}); + Check("sh(wpkh(xprv9s21ZrQH143K3QTDL4LXw2F7HEK3wJUD2nW2nRk4stbPy6cq3jPPqjiChkVvvNKmPGJxWUtg6LnF5kejMRNNU3TGtRBeJgk33yuGBxrMPHi/10/20/30/40/*'))", "sh(wpkh(xpub661MyMwAqRbcFtXgS5sYJABqqG9YLmC4Q1Rdap9gSE8NqtwybGhePY2gZ29ESFjqJoCu1Rupje8YtGqsefD265TMg7usUDFdp6W1EGMcet8/10/20/30/40/*'))", RANGE | HARDENED, {{"a9149a4d9901d6af519b2a23d4a2f51650fcba87ce7b87"},{"a914bed59fc0024fae941d6e20a3b44a109ae740129287"},{"a9148483aa1116eb9c05c482a72bada4b1db24af654387"}}); + Check("combo(xprvA2JDeKCSNNZky6uBCviVfJSKyQ1mDYahRjijr5idH2WwLsEd4Hsb2Tyh8RfQMuPh7f7RtyzTtdrbdqqsunu5Mm3wDvUAKRHSC34sJ7in334/*)", "combo(xpub6FHa3pjLCk84BayeJxFW2SP4XRrFd1JYnxeLeU8EqN3vDfZmbqBqaGJAyiLjTAwm6ZLRQUMv1ZACTj37sR62cfN7fe5JnJ7dh8zL4fiyLHV/*)", RANGE, {{"2102df12b7035bdac8e3bab862a3a83d06ea6b17b6753d52edecba9be46f5d09e076ac","76a914f90e3178ca25f2c808dc76624032d352fdbdfaf288ac","0014f90e3178ca25f2c808dc76624032d352fdbdfaf2","a91408f3ea8c68d4a7585bf9e8bda226723f70e445f087"},{"21032869a233c9adff9a994e4966e5b821fd5bac066da6c3112488dc52383b4a98ecac","76a914a8409d1b6dfb1ed2a3e8aa5e0ef2ff26b15b75b788ac","0014a8409d1b6dfb1ed2a3e8aa5e0ef2ff26b15b75b7","a91473e39884cb71ae4e5ac9739e9225026c99763e6687"}}); + CheckUnparsable("pkh(xprv9s21ZrQH143K31xYSDQpPDxsXRTUcvj2iNHm5NUtrGiGG5e2DtALGdso3pGz6ssrdK4PFmM8NSpSBHNqPqm55Qn3LqFtT2emdEXVYsCzC2U/2147483648)", "pkh(xpub661MyMwAqRbcFW31YEwpkMuc5THy2PSt5bDMsktWQcFF8syAmRUapSCGu8ED9W6oDMSgv6Zz8idoc4a6mr8BDzTJY47LJhkJ8UB7WEGuduB/2147483648)"); // BIP 32 path element overflow + + // Multisig constructions + Check("multi(1,L4rK1yDtCWekvXuE6oXD9jCYfFNV2cWRpVuPLBcCU2z8TrisoyY1,5KYZdUEo39z3FPrtuX2QbbwGnNP5zTd7yyr2SC1j299sBCnWjss)", "multi(1,03a34b99f22c790c4e36b2b3c2c35a36db06226e41c692fc82b8b56ac1c540c5bd,04a34b99f22c790c4e36b2b3c2c35a36db06226e41c692fc82b8b56ac1c540c5bd5b8dec5235a0fa8722476c7709c02559e3aa73aa03918ba2d492eea75abea235)", SIGNABLE, {{"512103a34b99f22c790c4e36b2b3c2c35a36db06226e41c692fc82b8b56ac1c540c5bd4104a34b99f22c790c4e36b2b3c2c35a36db06226e41c692fc82b8b56ac1c540c5bd5b8dec5235a0fa8722476c7709c02559e3aa73aa03918ba2d492eea75abea23552ae"}}); + Check("sh(multi(2,xprvA1RpRA33e1JQ7ifknakTFpgNXPmW2YvmhqLQYMmrj4xJXXWYpDPS3xz7iAxn8L39njGVyuoseXzU6rcxFLJ8HFsTjSyQbLYnMpCqE2VbFWc,xprv9uPDJpEQgRQfDcW7BkF7eTya6RPxXeJCqCJGHuCJ4GiRVLzkTXBAJMu2qaMWPrS7AANYqdq6vcBcBUdJCVVFceUvJFjaPdGZ2y9WACViL4L/0))", "sh(multi(2,xpub6ERApfZwUNrhLCkDtcHTcxd75RbzS1ed54G1LkBUHQVHQKqhMkhgbmJbZRkrgZw4koxb5JaHWkY4ALHY2grBGRjaDMzQLcgJvLJuZZvRcEL,xpub68NZiKmJWnxxS6aaHmn81bvJeTESw724CRDs6HbuccFQN9Ku14VQrADWgqbhhTHBaohPX4CjNLf9fq9MYo6oDaPPLPxSb7gwQN3ih19Zm4Y/0))", DEFAULT, {{"a91445a9a622a8b0a1269944be477640eedc447bbd8487"}}); + Check("wsh(multi(2,xprv9s21ZrQH143K31xYSDQpPDxsXRTUcvj2iNHm5NUtrGiGG5e2DtALGdso3pGz6ssrdK4PFmM8NSpSBHNqPqm55Qn3LqFtT2emdEXVYsCzC2U/2147483647'/0,xprv9vHkqa6EV4sPZHYqZznhT2NPtPCjKuDKGY38FBWLvgaDx45zo9WQRUT3dKYnjwih2yJD9mkrocEZXo1ex8G81dwSM1fwqWpWkeS3v86pgKt/1/2/*,xprv9s21ZrQH143K3QTDL4LXw2F7HEK3wJUD2nW2nRk4stbPy6cq3jPPqjiChkVvvNKmPGJxWUtg6LnF5kejMRNNU3TGtRBeJgk33yuGBxrMPHi/10/20/30/40/*'))", "wsh(multi(2,xpub661MyMwAqRbcFW31YEwpkMuc5THy2PSt5bDMsktWQcFF8syAmRUapSCGu8ED9W6oDMSgv6Zz8idoc4a6mr8BDzTJY47LJhkJ8UB7WEGuduB/2147483647'/0,xpub69H7F5d8KSRgmmdJg2KhpAK8SR3DjMwAdkxj3ZuxV27CprR9LgpeyGmXUbC6wb7ERfvrnKZjXoUmmDznezpbZb7ap6r1D3tgFxHmwMkQTPH/1/2/*,xpub661MyMwAqRbcFtXgS5sYJABqqG9YLmC4Q1Rdap9gSE8NqtwybGhePY2gZ29ESFjqJoCu1Rupje8YtGqsefD265TMg7usUDFdp6W1EGMcet8/10/20/30/40/*'))", HARDENED | RANGE, {{"0020b92623201f3bb7c3771d45b2ad1d0351ea8fbf8cfe0a0e570264e1075fa1948f"},{"002036a08bbe4923af41cf4316817c93b8d37e2f635dd25cfff06bd50df6ae7ea203"},{"0020a96e7ab4607ca6b261bfe3245ffda9c746b28d3f59e83d34820ec0e2b36c139c"}}); + Check("sh(wsh(multi(16,KzoAz5CanayRKex3fSLQ2BwJpN7U52gZvxMyk78nDMHuqrUxuSJy,KwGNz6YCCQtYvFzMtrC6D3tKTKdBBboMrLTsjr2NYVBwapCkn7Mr,KxogYhiNfwxuswvXV66eFyKcCpm7dZ7TqHVqujHAVUjJxyivxQ9X,L2BUNduTSyZwZjwNHynQTF14mv2uz2NRq5n5sYWTb4FkkmqgEE9f,L1okJGHGn1kFjdXHKxXjwVVtmCMR2JA5QsbKCSpSb7ReQjezKeoD,KxDCNSST75HFPaW5QKpzHtAyaCQC7p9Vo3FYfi2u4dXD1vgMiboK,L5edQjFtnkcf5UWURn6UuuoFrabgDQUHdheKCziwN42aLwS3KizU,KzF8UWFcEC7BYTq8Go1xVimMkDmyNYVmXV5PV7RuDicvAocoPB8i,L3nHUboKG2w4VSJ5jYZ5CBM97oeK6YuKvfZxrefdShECcjEYKMWZ,KyjHo36dWkYhimKmVVmQTq3gERv3pnqA4xFCpvUgbGDJad7eS8WE,KwsfyHKRUTZPQtysN7M3tZ4GXTnuov5XRgjdF2XCG8faAPmFruRF,KzCUbGhN9LJhdeFfL9zQgTJMjqxdBKEekRGZX24hXdgCNCijkkap,KzgpMBwwsDLwkaC5UrmBgCYaBD2WgZ7PBoGYXR8KT7gCA9UTN5a3,KyBXTPy4T7YG4q9tcAM3LkvfRpD1ybHMvcJ2ehaWXaSqeGUxEdkP,KzJDe9iwJRPtKP2F2AoN6zBgzS7uiuAwhWCfGdNeYJ3PC1HNJ8M8,L1xbHrxynrqLKkoYc4qtoQPx6uy5qYXR5ZDYVYBSRmCV5piU3JG9)))","sh(wsh(multi(16,03669b8afcec803a0d323e9a17f3ea8e68e8abe5a278020a929adbec52421adbd0,0260b2003c386519fc9eadf2b5cf124dd8eea4c4e68d5e154050a9346ea98ce600,0362a74e399c39ed5593852a30147f2959b56bb827dfa3e60e464b02ccf87dc5e8,0261345b53de74a4d721ef877c255429961b7e43714171ac06168d7e08c542a8b8,02da72e8b46901a65d4374fe6315538d8f368557dda3a1dcf9ea903f3afe7314c8,0318c82dd0b53fd3a932d16e0ba9e278fcc937c582d5781be626ff16e201f72286,0297ccef1ef99f9d73dec9ad37476ddb232f1238aff877af19e72ba04493361009,02e502cfd5c3f972fe9a3e2a18827820638f96b6f347e54d63deb839011fd5765d,03e687710f0e3ebe81c1037074da939d409c0025f17eb86adb9427d28f0f7ae0e9,02c04d3a5274952acdbc76987f3184b346a483d43be40874624b29e3692c1df5af,02ed06e0f418b5b43a7ec01d1d7d27290fa15f75771cb69b642a51471c29c84acd,036d46073cbb9ffee90473f3da429abc8de7f8751199da44485682a989a4bebb24,02f5d1ff7c9029a80a4e36b9a5497027ef7f3e73384a4a94fbfe7c4e9164eec8bc,02e41deffd1b7cce11cde209a781adcffdabd1b91c0ba0375857a2bfd9302419f3,02d76625f7956a7fc505ab02556c23ee72d832f1bac391bcd2d3abce5710a13d06,0399eb0a5487515802dc14544cf10b3666623762fbed2ec38a3975716e2c29c232)))", SIGNABLE, {{"a9147fc63e13dc25e8a95a3cee3d9a714ac3afd96f1e87"}}); + CheckUnparsable("sh(multi(16,KzoAz5CanayRKex3fSLQ2BwJpN7U52gZvxMyk78nDMHuqrUxuSJy,KwGNz6YCCQtYvFzMtrC6D3tKTKdBBboMrLTsjr2NYVBwapCkn7Mr,KxogYhiNfwxuswvXV66eFyKcCpm7dZ7TqHVqujHAVUjJxyivxQ9X,L2BUNduTSyZwZjwNHynQTF14mv2uz2NRq5n5sYWTb4FkkmqgEE9f,L1okJGHGn1kFjdXHKxXjwVVtmCMR2JA5QsbKCSpSb7ReQjezKeoD,KxDCNSST75HFPaW5QKpzHtAyaCQC7p9Vo3FYfi2u4dXD1vgMiboK,L5edQjFtnkcf5UWURn6UuuoFrabgDQUHdheKCziwN42aLwS3KizU,KzF8UWFcEC7BYTq8Go1xVimMkDmyNYVmXV5PV7RuDicvAocoPB8i,L3nHUboKG2w4VSJ5jYZ5CBM97oeK6YuKvfZxrefdShECcjEYKMWZ,KyjHo36dWkYhimKmVVmQTq3gERv3pnqA4xFCpvUgbGDJad7eS8WE,KwsfyHKRUTZPQtysN7M3tZ4GXTnuov5XRgjdF2XCG8faAPmFruRF,KzCUbGhN9LJhdeFfL9zQgTJMjqxdBKEekRGZX24hXdgCNCijkkap,KzgpMBwwsDLwkaC5UrmBgCYaBD2WgZ7PBoGYXR8KT7gCA9UTN5a3,KyBXTPy4T7YG4q9tcAM3LkvfRpD1ybHMvcJ2ehaWXaSqeGUxEdkP,KzJDe9iwJRPtKP2F2AoN6zBgzS7uiuAwhWCfGdNeYJ3PC1HNJ8M8,L1xbHrxynrqLKkoYc4qtoQPx6uy5qYXR5ZDYVYBSRmCV5piU3JG9))","sh(multi(16,03669b8afcec803a0d323e9a17f3ea8e68e8abe5a278020a929adbec52421adbd0,0260b2003c386519fc9eadf2b5cf124dd8eea4c4e68d5e154050a9346ea98ce600,0362a74e399c39ed5593852a30147f2959b56bb827dfa3e60e464b02ccf87dc5e8,0261345b53de74a4d721ef877c255429961b7e43714171ac06168d7e08c542a8b8,02da72e8b46901a65d4374fe6315538d8f368557dda3a1dcf9ea903f3afe7314c8,0318c82dd0b53fd3a932d16e0ba9e278fcc937c582d5781be626ff16e201f72286,0297ccef1ef99f9d73dec9ad37476ddb232f1238aff877af19e72ba04493361009,02e502cfd5c3f972fe9a3e2a18827820638f96b6f347e54d63deb839011fd5765d,03e687710f0e3ebe81c1037074da939d409c0025f17eb86adb9427d28f0f7ae0e9,02c04d3a5274952acdbc76987f3184b346a483d43be40874624b29e3692c1df5af,02ed06e0f418b5b43a7ec01d1d7d27290fa15f75771cb69b642a51471c29c84acd,036d46073cbb9ffee90473f3da429abc8de7f8751199da44485682a989a4bebb24,02f5d1ff7c9029a80a4e36b9a5497027ef7f3e73384a4a94fbfe7c4e9164eec8bc,02e41deffd1b7cce11cde209a781adcffdabd1b91c0ba0375857a2bfd9302419f3,02d76625f7956a7fc505ab02556c23ee72d832f1bac391bcd2d3abce5710a13d06,0399eb0a5487515802dc14544cf10b3666623762fbed2ec38a3975716e2c29c232))"); // P2SH does not fit 16 compressed pubkeys in a redeemscript + + // Check for invalid nesting of structures + CheckUnparsable("sh(L4rK1yDtCWekvXuE6oXD9jCYfFNV2cWRpVuPLBcCU2z8TrisoyY1)", "sh(03a34b99f22c790c4e36b2b3c2c35a36db06226e41c692fc82b8b56ac1c540c5bd)"); // P2SH needs a script, not a key + CheckUnparsable("sh(combo(L4rK1yDtCWekvXuE6oXD9jCYfFNV2cWRpVuPLBcCU2z8TrisoyY1))", "sh(combo(03a34b99f22c790c4e36b2b3c2c35a36db06226e41c692fc82b8b56ac1c540c5bd))"); // Old must be top level + CheckUnparsable("wsh(L4rK1yDtCWekvXuE6oXD9jCYfFNV2cWRpVuPLBcCU2z8TrisoyY1)", "wsh(03a34b99f22c790c4e36b2b3c2c35a36db06226e41c692fc82b8b56ac1c540c5bd)"); // P2WSH needs a script, not a key + CheckUnparsable("wsh(wpkh(L4rK1yDtCWekvXuE6oXD9jCYfFNV2cWRpVuPLBcCU2z8TrisoyY1))", "wsh(wpkh(03a34b99f22c790c4e36b2b3c2c35a36db06226e41c692fc82b8b56ac1c540c5bd))"); // Cannot embed witness inside witness + CheckUnparsable("wsh(sh(pk(L4rK1yDtCWekvXuE6oXD9jCYfFNV2cWRpVuPLBcCU2z8TrisoyY1)))", "wsh(sh(pk(03a34b99f22c790c4e36b2b3c2c35a36db06226e41c692fc82b8b56ac1c540c5bd)))"); // Cannot embed P2SH inside P2WSH + CheckUnparsable("sh(sh(pk(L4rK1yDtCWekvXuE6oXD9jCYfFNV2cWRpVuPLBcCU2z8TrisoyY1)))", "sh(sh(pk(03a34b99f22c790c4e36b2b3c2c35a36db06226e41c692fc82b8b56ac1c540c5bd)))"); // Cannot embed P2SH inside P2SH + CheckUnparsable("wsh(wsh(pk(L4rK1yDtCWekvXuE6oXD9jCYfFNV2cWRpVuPLBcCU2z8TrisoyY1)))", "wsh(wsh(pk(03a34b99f22c790c4e36b2b3c2c35a36db06226e41c692fc82b8b56ac1c540c5bd)))"); // Cannot embed P2WSH inside P2WSH +} + +BOOST_AUTO_TEST_SUITE_END() diff --git a/src/test/getarg_tests.cpp b/src/test/getarg_tests.cpp index c065e25676..eec7b38af7 100644 --- a/src/test/getarg_tests.cpp +++ b/src/test/getarg_tests.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2012-2017 The Bitcoin Core developers +// Copyright (c) 2012-2018 The Bitcoin Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/test/hash_tests.cpp b/src/test/hash_tests.cpp index d7d6c9b5a3..6ed0209895 100644 --- a/src/test/hash_tests.cpp +++ b/src/test/hash_tests.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2013-2017 The Bitcoin Core developers +// Copyright (c) 2013-2018 The Bitcoin Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/test/key_io_tests.cpp b/src/test/key_io_tests.cpp index 1ac1e0015b..7e475ac610 100644 --- a/src/test/key_io_tests.cpp +++ b/src/test/key_io_tests.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2011-2016 The Bitcoin Core developers +// Copyright (c) 2011-2017 The Bitcoin Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/test/key_tests.cpp b/src/test/key_tests.cpp index 64c57f0705..61db70decb 100644 --- a/src/test/key_tests.cpp +++ b/src/test/key_tests.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2012-2017 The Bitcoin Core developers +// Copyright (c) 2012-2018 The Bitcoin Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. @@ -152,4 +152,40 @@ BOOST_AUTO_TEST_CASE(key_test1) BOOST_CHECK(detsigc == ParseHex("2052d8a32079c11e79db95af63bb9600c5b04f21a9ca33dc129c2bfa8ac9dc1cd561d8ae5e0f6c1a16bde3719c64c2fd70e404b6428ab9a69566962e8771b5944d")); } +BOOST_AUTO_TEST_CASE(key_signature_tests) +{ + // When entropy is specified, we should see at least one high R signature within 20 signatures + CKey key = DecodeSecret(strSecret1); + std::string msg = "A message to be signed"; + uint256 msg_hash = Hash(msg.begin(), msg.end()); + std::vector<unsigned char> sig; + bool found = false; + + for (int i = 1; i <=20; ++i) { + sig.clear(); + key.Sign(msg_hash, sig, false, i); + found = sig[3] == 0x21 && sig[4] == 0x00; + if (found) { + break; + } + } + BOOST_CHECK(found); + + // When entropy is not specified, we should always see low R signatures that are less than 70 bytes in 256 tries + // We should see at least one signature that is less than 70 bytes. + found = true; + bool found_small = false; + for (int i = 0; i < 256; ++i) { + sig.clear(); + std::string msg = "A message to be signed" + std::to_string(i); + msg_hash = Hash(msg.begin(), msg.end()); + key.Sign(msg_hash, sig); + found = sig[3] == 0x20; + BOOST_CHECK(sig.size() <= 70); + found_small |= sig.size() < 70; + } + BOOST_CHECK(found); + BOOST_CHECK(found_small); +} + BOOST_AUTO_TEST_SUITE_END() diff --git a/src/test/limitedmap_tests.cpp b/src/test/limitedmap_tests.cpp index 7871ff6f74..0788f75b04 100644 --- a/src/test/limitedmap_tests.cpp +++ b/src/test/limitedmap_tests.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2012-2017 The Bitcoin Core developers +// Copyright (c) 2012-2018 The Bitcoin Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/test/main_tests.cpp b/src/test/main_tests.cpp index 8676a099da..5b3f2bc578 100644 --- a/src/test/main_tests.cpp +++ b/src/test/main_tests.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2014-2017 The Bitcoin Core developers +// Copyright (c) 2014-2018 The Bitcoin Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/test/mempool_tests.cpp b/src/test/mempool_tests.cpp index fb80599af7..e416de098e 100644 --- a/src/test/mempool_tests.cpp +++ b/src/test/mempool_tests.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2011-2017 The Bitcoin Core developers +// Copyright (c) 2011-2018 The Bitcoin Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/test/merkle_tests.cpp b/src/test/merkle_tests.cpp index 259e45dacf..5e55ad6622 100644 --- a/src/test/merkle_tests.cpp +++ b/src/test/merkle_tests.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2015-2017 The Bitcoin Core developers +// Copyright (c) 2015-2018 The Bitcoin Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/test/merkleblock_tests.cpp b/src/test/merkleblock_tests.cpp index 2472ea9950..4978593285 100644 --- a/src/test/merkleblock_tests.cpp +++ b/src/test/merkleblock_tests.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2012-2017 The Bitcoin Core developers +// Copyright (c) 2012-2018 The Bitcoin Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/test/miner_tests.cpp b/src/test/miner_tests.cpp index e2424f012d..2da06b8d31 100644 --- a/src/test/miner_tests.cpp +++ b/src/test/miner_tests.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2011-2017 The Bitcoin Core developers +// Copyright (c) 2011-2018 The Bitcoin Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/test/multisig_tests.cpp b/src/test/multisig_tests.cpp index 77db9f5c57..61e579ed38 100644 --- a/src/test/multisig_tests.cpp +++ b/src/test/multisig_tests.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2011-2017 The Bitcoin Core developers +// Copyright (c) 2011-2018 The Bitcoin Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/test/net_tests.cpp b/src/test/net_tests.cpp index f7861d9b8a..4c56938ec9 100644 --- a/src/test/net_tests.cpp +++ b/src/test/net_tests.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2012-2017 The Bitcoin Core developers +// Copyright (c) 2012-2018 The Bitcoin Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. #include <addrman.h> diff --git a/src/test/netbase_tests.cpp b/src/test/netbase_tests.cpp index 67f7c37f3b..9c1af6bdf6 100644 --- a/src/test/netbase_tests.cpp +++ b/src/test/netbase_tests.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2012-2017 The Bitcoin Core developers +// Copyright (c) 2012-2018 The Bitcoin Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/test/pmt_tests.cpp b/src/test/pmt_tests.cpp index 4825c92296..5020192804 100644 --- a/src/test/pmt_tests.cpp +++ b/src/test/pmt_tests.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2012-2017 The Bitcoin Core developers +// Copyright (c) 2012-2018 The Bitcoin Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/test/policyestimator_tests.cpp b/src/test/policyestimator_tests.cpp index e45fb6d17e..26a0b495d9 100644 --- a/src/test/policyestimator_tests.cpp +++ b/src/test/policyestimator_tests.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2011-2017 The Bitcoin Core developers +// Copyright (c) 2011-2018 The Bitcoin Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/test/pow_tests.cpp b/src/test/pow_tests.cpp index 9abfd5ebd8..1ac9adc740 100644 --- a/src/test/pow_tests.cpp +++ b/src/test/pow_tests.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2015-2017 The Bitcoin Core developers +// Copyright (c) 2015-2018 The Bitcoin Core developers // Distributed under the MIT/X11 software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/test/prevector_tests.cpp b/src/test/prevector_tests.cpp index 5f00009354..c488d3edcf 100644 --- a/src/test/prevector_tests.cpp +++ b/src/test/prevector_tests.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2015-2017 The Bitcoin Core developers +// Copyright (c) 2015-2018 The Bitcoin Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/test/raii_event_tests.cpp b/src/test/raii_event_tests.cpp index 3dfa09e09e..bdb411d53f 100644 --- a/src/test/raii_event_tests.cpp +++ b/src/test/raii_event_tests.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2016-2017 The Bitcoin Core developers +// Copyright (c) 2016-2018 The Bitcoin Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/test/random_tests.cpp b/src/test/random_tests.cpp index 80a294d129..679e857ce6 100644 --- a/src/test/random_tests.cpp +++ b/src/test/random_tests.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017 The Bitcoin Core developers +// Copyright (c) 2017-2018 The Bitcoin Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/test/reverselock_tests.cpp b/src/test/reverselock_tests.cpp index 0a91c65afa..91c76fda88 100644 --- a/src/test/reverselock_tests.cpp +++ b/src/test/reverselock_tests.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2015-2017 The Bitcoin Core developers +// Copyright (c) 2015-2018 The Bitcoin Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/test/rpc_tests.cpp b/src/test/rpc_tests.cpp index da591547d7..a49796d6f4 100644 --- a/src/test/rpc_tests.cpp +++ b/src/test/rpc_tests.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2012-2017 The Bitcoin Core developers +// Copyright (c) 2012-2018 The Bitcoin Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. @@ -16,6 +16,8 @@ #include <univalue.h> +#include <rpc/blockchain.h> + UniValue CallRPC(std::string args) { std::vector<std::string> vArgs; @@ -336,4 +338,82 @@ BOOST_AUTO_TEST_CASE(rpc_convert_values_generatetoaddress) BOOST_CHECK_EQUAL(result[2].get_int(), 9); } +BOOST_AUTO_TEST_CASE(rpc_getblockstats_calculate_percentiles_by_weight) +{ + int64_t total_weight = 200; + std::vector<std::pair<CAmount, int64_t>> feerates; + CAmount result[NUM_GETBLOCKSTATS_PERCENTILES] = { 0 }; + + for (int64_t i = 0; i < 100; i++) { + feerates.emplace_back(std::make_pair(1 ,1)); + } + + for (int64_t i = 0; i < 100; i++) { + feerates.emplace_back(std::make_pair(2 ,1)); + } + + CalculatePercentilesByWeight(result, feerates, total_weight); + BOOST_CHECK_EQUAL(result[0], 1); + BOOST_CHECK_EQUAL(result[1], 1); + BOOST_CHECK_EQUAL(result[2], 1); + BOOST_CHECK_EQUAL(result[3], 2); + BOOST_CHECK_EQUAL(result[4], 2); + + // Test with more pairs, and two pairs overlapping 2 percentiles. + total_weight = 100; + CAmount result2[NUM_GETBLOCKSTATS_PERCENTILES] = { 0 }; + feerates.clear(); + + feerates.emplace_back(std::make_pair(1, 9)); + feerates.emplace_back(std::make_pair(2 , 16)); //10th + 25th percentile + feerates.emplace_back(std::make_pair(4 ,50)); //50th + 75th percentile + feerates.emplace_back(std::make_pair(5 ,10)); + feerates.emplace_back(std::make_pair(9 ,15)); // 90th percentile + + CalculatePercentilesByWeight(result2, feerates, total_weight); + + BOOST_CHECK_EQUAL(result2[0], 2); + BOOST_CHECK_EQUAL(result2[1], 2); + BOOST_CHECK_EQUAL(result2[2], 4); + BOOST_CHECK_EQUAL(result2[3], 4); + BOOST_CHECK_EQUAL(result2[4], 9); + + // Same test as above, but one of the percentile-overlapping pairs is split in 2. + total_weight = 100; + CAmount result3[NUM_GETBLOCKSTATS_PERCENTILES] = { 0 }; + feerates.clear(); + + feerates.emplace_back(std::make_pair(1, 9)); + feerates.emplace_back(std::make_pair(2 , 11)); // 10th percentile + feerates.emplace_back(std::make_pair(2 , 5)); // 25th percentile + feerates.emplace_back(std::make_pair(4 ,50)); //50th + 75th percentile + feerates.emplace_back(std::make_pair(5 ,10)); + feerates.emplace_back(std::make_pair(9 ,15)); // 90th percentile + + CalculatePercentilesByWeight(result3, feerates, total_weight); + + BOOST_CHECK_EQUAL(result3[0], 2); + BOOST_CHECK_EQUAL(result3[1], 2); + BOOST_CHECK_EQUAL(result3[2], 4); + BOOST_CHECK_EQUAL(result3[3], 4); + BOOST_CHECK_EQUAL(result3[4], 9); + + // Test with one transaction spanning all percentiles. + total_weight = 104; + CAmount result4[NUM_GETBLOCKSTATS_PERCENTILES] = { 0 }; + feerates.clear(); + + feerates.emplace_back(std::make_pair(1, 100)); + feerates.emplace_back(std::make_pair(2, 1)); + feerates.emplace_back(std::make_pair(3, 1)); + feerates.emplace_back(std::make_pair(3, 1)); + feerates.emplace_back(std::make_pair(999999, 1)); + + CalculatePercentilesByWeight(result4, feerates, total_weight); + + for (int64_t i = 0; i < NUM_GETBLOCKSTATS_PERCENTILES; i++) { + BOOST_CHECK_EQUAL(result4[i], 1); + } +} + BOOST_AUTO_TEST_SUITE_END() diff --git a/src/test/sanity_tests.cpp b/src/test/sanity_tests.cpp index e97ad2ee6a..8085a21928 100644 --- a/src/test/sanity_tests.cpp +++ b/src/test/sanity_tests.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2012-2017 The Bitcoin Core developers +// Copyright (c) 2012-2018 The Bitcoin Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/test/scheduler_tests.cpp b/src/test/scheduler_tests.cpp index b1ea4b6fab..001d8eb64b 100644 --- a/src/test/scheduler_tests.cpp +++ b/src/test/scheduler_tests.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2012-2017 The Bitcoin Core developers +// Copyright (c) 2012-2018 The Bitcoin Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/test/script_p2sh_tests.cpp b/src/test/script_p2sh_tests.cpp index e224df6704..5b10935302 100644 --- a/src/test/script_p2sh_tests.cpp +++ b/src/test/script_p2sh_tests.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2012-2017 The Bitcoin Core developers +// Copyright (c) 2012-2018 The Bitcoin Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/test/script_standard_tests.cpp b/src/test/script_standard_tests.cpp index 7d4734986a..bf57272ab2 100644 --- a/src/test/script_standard_tests.cpp +++ b/src/test/script_standard_tests.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017 The Bitcoin Core developers +// Copyright (c) 2017-2018 The Bitcoin Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/test/script_tests.cpp b/src/test/script_tests.cpp index 510910e149..bc671394c0 100644 --- a/src/test/script_tests.cpp +++ b/src/test/script_tests.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2011-2017 The Bitcoin Core developers +// Copyright (c) 2011-2018 The Bitcoin Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. @@ -369,7 +369,7 @@ public: std::vector<unsigned char> vchSig, r, s; uint32_t iter = 0; do { - key.Sign(hash, vchSig, iter++); + key.Sign(hash, vchSig, false, iter++); if ((lenS == 33) != (vchSig[5 + vchSig[3]] == 33)) { NegateSignatureS(vchSig); } diff --git a/src/test/scriptnum10.h b/src/test/scriptnum10.h index 9e88866cb0..e763b64275 100644 --- a/src/test/scriptnum10.h +++ b/src/test/scriptnum10.h @@ -1,5 +1,5 @@ // Copyright (c) 2009-2010 Satoshi Nakamoto -// Copyright (c) 2009-2017 The Bitcoin Core developers +// Copyright (c) 2009-2018 The Bitcoin Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/test/scriptnum_tests.cpp b/src/test/scriptnum_tests.cpp index cd6e27d248..f9b407ce3e 100644 --- a/src/test/scriptnum_tests.cpp +++ b/src/test/scriptnum_tests.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2012-2017 The Bitcoin Core developers +// Copyright (c) 2012-2018 The Bitcoin Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/test/serialize_tests.cpp b/src/test/serialize_tests.cpp index a0dafaaf5c..3a06145861 100644 --- a/src/test/serialize_tests.cpp +++ b/src/test/serialize_tests.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2012-2017 The Bitcoin Core developers +// Copyright (c) 2012-2018 The Bitcoin Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/test/sighash_tests.cpp b/src/test/sighash_tests.cpp index 6b8856ef47..e6905457bb 100644 --- a/src/test/sighash_tests.cpp +++ b/src/test/sighash_tests.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2013-2017 The Bitcoin Core developers +// Copyright (c) 2013-2018 The Bitcoin Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/test/sigopcount_tests.cpp b/src/test/sigopcount_tests.cpp index 86647e72eb..5462fea777 100644 --- a/src/test/sigopcount_tests.cpp +++ b/src/test/sigopcount_tests.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2012-2017 The Bitcoin Core developers +// Copyright (c) 2012-2018 The Bitcoin Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/test/skiplist_tests.cpp b/src/test/skiplist_tests.cpp index 25c7e54808..bcd2a9c7b6 100644 --- a/src/test/skiplist_tests.cpp +++ b/src/test/skiplist_tests.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2014-2017 The Bitcoin Core developers +// Copyright (c) 2014-2018 The Bitcoin Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/test/streams_tests.cpp b/src/test/streams_tests.cpp index 8ca668ba01..6a0aa864d9 100644 --- a/src/test/streams_tests.cpp +++ b/src/test/streams_tests.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2012-2017 The Bitcoin Core developers +// Copyright (c) 2012-2018 The Bitcoin Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/test/test_bitcoin.cpp b/src/test/test_bitcoin.cpp index b35b21335e..9c3285fb0c 100644 --- a/src/test/test_bitcoin.cpp +++ b/src/test/test_bitcoin.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2011-2017 The Bitcoin Core developers +// Copyright (c) 2011-2018 The Bitcoin Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/test/test_bitcoin.h b/src/test/test_bitcoin.h index 88b2d37e87..b87d9bea5d 100644 --- a/src/test/test_bitcoin.h +++ b/src/test/test_bitcoin.h @@ -1,4 +1,4 @@ -// Copyright (c) 2015-2017 The Bitcoin Core developers +// Copyright (c) 2015-2018 The Bitcoin Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/test/test_bitcoin_fuzzy.cpp b/src/test/test_bitcoin_fuzzy.cpp index b2daa2adb5..4d835db7be 100644 --- a/src/test/test_bitcoin_fuzzy.cpp +++ b/src/test/test_bitcoin_fuzzy.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2009-2017 The Bitcoin Core developers +// Copyright (c) 2009-2018 The Bitcoin Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/test/test_bitcoin_main.cpp b/src/test/test_bitcoin_main.cpp index e48c685b6b..6c066d3fea 100644 --- a/src/test/test_bitcoin_main.cpp +++ b/src/test/test_bitcoin_main.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2011-2017 The Bitcoin Core developers +// Copyright (c) 2011-2018 The Bitcoin Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/test/timedata_tests.cpp b/src/test/timedata_tests.cpp index 5d93bc1efe..474a67497f 100644 --- a/src/test/timedata_tests.cpp +++ b/src/test/timedata_tests.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2011-2017 The Bitcoin Core developers +// Copyright (c) 2011-2018 The Bitcoin Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. // diff --git a/src/test/transaction_tests.cpp b/src/test/transaction_tests.cpp index aff270942e..33f0a83b7e 100644 --- a/src/test/transaction_tests.cpp +++ b/src/test/transaction_tests.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2011-2017 The Bitcoin Core developers +// Copyright (c) 2011-2018 The Bitcoin Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/test/txvalidation_tests.cpp b/src/test/txvalidation_tests.cpp index 2d1eb7b772..473ec5addf 100644 --- a/src/test/txvalidation_tests.cpp +++ b/src/test/txvalidation_tests.cpp @@ -30,7 +30,7 @@ BOOST_FIXTURE_TEST_CASE(tx_mempool_reject_coinbase, TestChain100Setup) coinbaseTx.vout[0].nValue = 1 * CENT; coinbaseTx.vout[0].scriptPubKey = scriptPubKey; - assert(CTransaction(coinbaseTx).IsCoinBase()); + BOOST_CHECK(CTransaction(coinbaseTx).IsCoinBase()); CValidationState state; diff --git a/src/test/txvalidationcache_tests.cpp b/src/test/txvalidationcache_tests.cpp index d32d4b267c..2bf835a756 100644 --- a/src/test/txvalidationcache_tests.cpp +++ b/src/test/txvalidationcache_tests.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2011-2017 The Bitcoin Core developers +// Copyright (c) 2011-2018 The Bitcoin Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/test/uint256_tests.cpp b/src/test/uint256_tests.cpp index 79217fa430..f91b633b83 100644 --- a/src/test/uint256_tests.cpp +++ b/src/test/uint256_tests.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2011-2017 The Bitcoin Core developers +// Copyright (c) 2011-2018 The Bitcoin Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. #include <arith_uint256.h> diff --git a/src/test/util_tests.cpp b/src/test/util_tests.cpp index 3661c762fc..b2960446eb 100644 --- a/src/test/util_tests.cpp +++ b/src/test/util_tests.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2011-2017 The Bitcoin Core developers +// Copyright (c) 2011-2018 The Bitcoin Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/test/versionbits_tests.cpp b/src/test/versionbits_tests.cpp index 7442825300..ca3196454a 100644 --- a/src/test/versionbits_tests.cpp +++ b/src/test/versionbits_tests.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2014-2017 The Bitcoin Core developers +// Copyright (c) 2014-2018 The Bitcoin Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/threadinterrupt.cpp b/src/threadinterrupt.cpp index 7da4e136ef..d08d52e4a9 100644 --- a/src/threadinterrupt.cpp +++ b/src/threadinterrupt.cpp @@ -1,5 +1,5 @@ // Copyright (c) 2009-2010 Satoshi Nakamoto -// Copyright (c) 2009-2017 The Bitcoin Core developers +// Copyright (c) 2009-2018 The Bitcoin Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/threadinterrupt.h b/src/threadinterrupt.h index d373e3c371..c30bd3d657 100644 --- a/src/threadinterrupt.h +++ b/src/threadinterrupt.h @@ -1,4 +1,4 @@ -// Copyright (c) 2016 The Bitcoin Core developers +// Copyright (c) 2016-2017 The Bitcoin Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/threadsafety.h b/src/threadsafety.h index d847269dff..a2f45e5fce 100644 --- a/src/threadsafety.h +++ b/src/threadsafety.h @@ -1,5 +1,5 @@ // Copyright (c) 2009-2010 Satoshi Nakamoto -// Copyright (c) 2009-2014 The Bitcoin Core developers +// Copyright (c) 2009-2018 The Bitcoin Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/timedata.cpp b/src/timedata.cpp index dfb8fe55af..1599508306 100644 --- a/src/timedata.cpp +++ b/src/timedata.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2014-2017 The Bitcoin Core developers +// Copyright (c) 2014-2018 The Bitcoin Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/timedata.h b/src/timedata.h index a4fefb5983..b165ecde26 100644 --- a/src/timedata.h +++ b/src/timedata.h @@ -1,4 +1,4 @@ -// Copyright (c) 2014-2017 The Bitcoin Core developers +// Copyright (c) 2014-2018 The Bitcoin Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/torcontrol.cpp b/src/torcontrol.cpp index fbc193c2cf..c88f61f1ec 100644 --- a/src/torcontrol.cpp +++ b/src/torcontrol.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2015-2017 The Bitcoin Core developers +// Copyright (c) 2015-2018 The Bitcoin Core developers // Copyright (c) 2017 The Zcash developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/torcontrol.h b/src/torcontrol.h index 2be6701fa5..079146b540 100644 --- a/src/torcontrol.h +++ b/src/torcontrol.h @@ -1,4 +1,4 @@ -// Copyright (c) 2015-2017 The Bitcoin Core developers +// Copyright (c) 2015-2018 The Bitcoin Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/txdb.h b/src/txdb.h index 84011097ce..d5a4bfaeb1 100644 --- a/src/txdb.h +++ b/src/txdb.h @@ -1,5 +1,5 @@ // Copyright (c) 2009-2010 Satoshi Nakamoto -// Copyright (c) 2009-2017 The Bitcoin Core developers +// Copyright (c) 2009-2018 The Bitcoin Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/txmempool.cpp b/src/txmempool.cpp index d68c38ad4e..8bada4dce8 100644 --- a/src/txmempool.cpp +++ b/src/txmempool.cpp @@ -1,5 +1,5 @@ // Copyright (c) 2009-2010 Satoshi Nakamoto -// Copyright (c) 2009-2017 The Bitcoin Core developers +// Copyright (c) 2009-2018 The Bitcoin Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/txmempool.h b/src/txmempool.h index 0feea08f0b..587d931d95 100644 --- a/src/txmempool.h +++ b/src/txmempool.h @@ -1,5 +1,5 @@ // Copyright (c) 2009-2010 Satoshi Nakamoto -// Copyright (c) 2009-2017 The Bitcoin Core developers +// Copyright (c) 2009-2018 The Bitcoin Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/ui_interface.cpp b/src/ui_interface.cpp index 72e04f488a..22b4768059 100644 --- a/src/ui_interface.cpp +++ b/src/ui_interface.cpp @@ -1,12 +1,64 @@ -// Copyright (c) 2010-2017 The Bitcoin Core developers +// Copyright (c) 2010-2018 The Bitcoin Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. #include <ui_interface.h> #include <util.h> +#include <boost/signals2/last_value.hpp> +#include <boost/signals2/signal.hpp> + CClientUIInterface uiInterface; +struct UISignals { + boost::signals2::signal<CClientUIInterface::ThreadSafeMessageBoxSig, boost::signals2::last_value<bool>> ThreadSafeMessageBox; + boost::signals2::signal<CClientUIInterface::ThreadSafeQuestionSig, boost::signals2::last_value<bool>> ThreadSafeQuestion; + boost::signals2::signal<CClientUIInterface::InitMessageSig> InitMessage; + boost::signals2::signal<CClientUIInterface::NotifyNumConnectionsChangedSig> NotifyNumConnectionsChanged; + boost::signals2::signal<CClientUIInterface::NotifyNetworkActiveChangedSig> NotifyNetworkActiveChanged; + boost::signals2::signal<CClientUIInterface::NotifyAlertChangedSig> NotifyAlertChanged; + boost::signals2::signal<CClientUIInterface::LoadWalletSig> LoadWallet; + boost::signals2::signal<CClientUIInterface::ShowProgressSig> ShowProgress; + boost::signals2::signal<CClientUIInterface::NotifyBlockTipSig> NotifyBlockTip; + boost::signals2::signal<CClientUIInterface::NotifyHeaderTipSig> NotifyHeaderTip; + boost::signals2::signal<CClientUIInterface::BannedListChangedSig> BannedListChanged; +} g_ui_signals; + +#define ADD_SIGNALS_IMPL_WRAPPER(signal_name) \ + boost::signals2::connection CClientUIInterface::signal_name##_connect(std::function<signal_name##Sig> fn) \ + { \ + return g_ui_signals.signal_name.connect(fn); \ + } \ + void CClientUIInterface::signal_name##_disconnect(std::function<signal_name##Sig> fn) \ + { \ + return g_ui_signals.signal_name.disconnect(&fn); \ + } + +ADD_SIGNALS_IMPL_WRAPPER(ThreadSafeMessageBox); +ADD_SIGNALS_IMPL_WRAPPER(ThreadSafeQuestion); +ADD_SIGNALS_IMPL_WRAPPER(InitMessage); +ADD_SIGNALS_IMPL_WRAPPER(NotifyNumConnectionsChanged); +ADD_SIGNALS_IMPL_WRAPPER(NotifyNetworkActiveChanged); +ADD_SIGNALS_IMPL_WRAPPER(NotifyAlertChanged); +ADD_SIGNALS_IMPL_WRAPPER(LoadWallet); +ADD_SIGNALS_IMPL_WRAPPER(ShowProgress); +ADD_SIGNALS_IMPL_WRAPPER(NotifyBlockTip); +ADD_SIGNALS_IMPL_WRAPPER(NotifyHeaderTip); +ADD_SIGNALS_IMPL_WRAPPER(BannedListChanged); + +bool CClientUIInterface::ThreadSafeMessageBox(const std::string& message, const std::string& caption, unsigned int style) { return g_ui_signals.ThreadSafeMessageBox(message, caption, style); } +bool CClientUIInterface::ThreadSafeQuestion(const std::string& message, const std::string& non_interactive_message, const std::string& caption, unsigned int style) { return g_ui_signals.ThreadSafeQuestion(message, non_interactive_message, caption, style); } +void CClientUIInterface::InitMessage(const std::string& message) { return g_ui_signals.InitMessage(message); } +void CClientUIInterface::NotifyNumConnectionsChanged(int newNumConnections) { return g_ui_signals.NotifyNumConnectionsChanged(newNumConnections); } +void CClientUIInterface::NotifyNetworkActiveChanged(bool networkActive) { return g_ui_signals.NotifyNetworkActiveChanged(networkActive); } +void CClientUIInterface::NotifyAlertChanged() { return g_ui_signals.NotifyAlertChanged(); } +void CClientUIInterface::LoadWallet(std::shared_ptr<CWallet> wallet) { return g_ui_signals.LoadWallet(wallet); } +void CClientUIInterface::ShowProgress(const std::string& title, int nProgress, bool resume_possible) { return g_ui_signals.ShowProgress(title, nProgress, resume_possible); } +void CClientUIInterface::NotifyBlockTip(bool b, const CBlockIndex* i) { return g_ui_signals.NotifyBlockTip(b, i); } +void CClientUIInterface::NotifyHeaderTip(bool b, const CBlockIndex* i) { return g_ui_signals.NotifyHeaderTip(b, i); } +void CClientUIInterface::BannedListChanged() { return g_ui_signals.BannedListChanged(); } + + bool InitError(const std::string& str) { uiInterface.ThreadSafeMessageBox(str, "", CClientUIInterface::MSG_ERROR); diff --git a/src/ui_interface.h b/src/ui_interface.h index 3add369df0..fe466b3ca4 100644 --- a/src/ui_interface.h +++ b/src/ui_interface.h @@ -1,20 +1,23 @@ // Copyright (c) 2010 Satoshi Nakamoto -// Copyright (c) 2012-2017 The Bitcoin Core developers +// Copyright (c) 2012-2018 The Bitcoin Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. #ifndef BITCOIN_UI_INTERFACE_H #define BITCOIN_UI_INTERFACE_H +#include <functional> #include <memory> #include <stdint.h> #include <string> -#include <boost/signals2/last_value.hpp> -#include <boost/signals2/signal.hpp> - class CWallet; class CBlockIndex; +namespace boost { +namespace signals2 { +class connection; +} +} // namespace boost /** General change type (added, updated, removed). */ enum ChangeType @@ -72,43 +75,49 @@ public: MSG_ERROR = (ICON_ERROR | BTN_OK | MODAL) }; +#define ADD_SIGNALS_DECL_WRAPPER(signal_name, rtype, ...) \ + rtype signal_name(__VA_ARGS__); \ + using signal_name##Sig = rtype(__VA_ARGS__); \ + boost::signals2::connection signal_name##_connect(std::function<signal_name##Sig> fn); \ + void signal_name##_disconnect(std::function<signal_name##Sig> fn); + /** Show message box. */ - boost::signals2::signal<bool (const std::string& message, const std::string& caption, unsigned int style), boost::signals2::last_value<bool> > ThreadSafeMessageBox; + ADD_SIGNALS_DECL_WRAPPER(ThreadSafeMessageBox, bool, const std::string& message, const std::string& caption, unsigned int style); /** If possible, ask the user a question. If not, falls back to ThreadSafeMessageBox(noninteractive_message, caption, style) and returns false. */ - boost::signals2::signal<bool (const std::string& message, const std::string& noninteractive_message, const std::string& caption, unsigned int style), boost::signals2::last_value<bool> > ThreadSafeQuestion; + ADD_SIGNALS_DECL_WRAPPER(ThreadSafeQuestion, bool, const std::string& message, const std::string& noninteractive_message, const std::string& caption, unsigned int style); /** Progress message during initialization. */ - boost::signals2::signal<void (const std::string &message)> InitMessage; + ADD_SIGNALS_DECL_WRAPPER(InitMessage, void, const std::string& message); /** Number of network connections changed. */ - boost::signals2::signal<void (int newNumConnections)> NotifyNumConnectionsChanged; + ADD_SIGNALS_DECL_WRAPPER(NotifyNumConnectionsChanged, void, int newNumConnections); /** Network activity state changed. */ - boost::signals2::signal<void (bool networkActive)> NotifyNetworkActiveChanged; + ADD_SIGNALS_DECL_WRAPPER(NotifyNetworkActiveChanged, void, bool networkActive); /** * Status bar alerts changed. */ - boost::signals2::signal<void ()> NotifyAlertChanged; + ADD_SIGNALS_DECL_WRAPPER(NotifyAlertChanged, void, ); /** A wallet has been loaded. */ - boost::signals2::signal<void (std::shared_ptr<CWallet> wallet)> LoadWallet; + ADD_SIGNALS_DECL_WRAPPER(LoadWallet, void, std::shared_ptr<CWallet> wallet); /** * Show progress e.g. for verifychain. * resume_possible indicates shutting down now will result in the current progress action resuming upon restart. */ - boost::signals2::signal<void (const std::string &title, int nProgress, bool resume_possible)> ShowProgress; + ADD_SIGNALS_DECL_WRAPPER(ShowProgress, void, const std::string& title, int nProgress, bool resume_possible); /** New block has been accepted */ - boost::signals2::signal<void (bool, const CBlockIndex *)> NotifyBlockTip; + ADD_SIGNALS_DECL_WRAPPER(NotifyBlockTip, void, bool, const CBlockIndex*); /** Best header has changed */ - boost::signals2::signal<void (bool, const CBlockIndex *)> NotifyHeaderTip; + ADD_SIGNALS_DECL_WRAPPER(NotifyHeaderTip, void, bool, const CBlockIndex*); /** Banlist did change. */ - boost::signals2::signal<void (void)> BannedListChanged; + ADD_SIGNALS_DECL_WRAPPER(BannedListChanged, void, void); }; /** Show warning message **/ diff --git a/src/uint256.cpp b/src/uint256.cpp index 82c2e01576..e513dc1de7 100644 --- a/src/uint256.cpp +++ b/src/uint256.cpp @@ -1,5 +1,5 @@ // Copyright (c) 2009-2010 Satoshi Nakamoto -// Copyright (c) 2009-2017 The Bitcoin Core developers +// Copyright (c) 2009-2018 The Bitcoin Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/uint256.h b/src/uint256.h index e090f10231..26a3331d92 100644 --- a/src/uint256.h +++ b/src/uint256.h @@ -1,5 +1,5 @@ // Copyright (c) 2009-2010 Satoshi Nakamoto -// Copyright (c) 2009-2017 The Bitcoin Core developers +// Copyright (c) 2009-2018 The Bitcoin Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/undo.h b/src/undo.h index f292924165..a1398b7624 100644 --- a/src/undo.h +++ b/src/undo.h @@ -1,5 +1,5 @@ // Copyright (c) 2009-2010 Satoshi Nakamoto -// Copyright (c) 2009-2017 The Bitcoin Core developers +// Copyright (c) 2009-2018 The Bitcoin Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/util.cpp b/src/util.cpp index 238554ee4a..95bc427bb2 100644 --- a/src/util.cpp +++ b/src/util.cpp @@ -1,5 +1,5 @@ // Copyright (c) 2009-2010 Satoshi Nakamoto -// Copyright (c) 2009-2017 The Bitcoin Core developers +// Copyright (c) 2009-2018 The Bitcoin Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/utilmoneystr.cpp b/src/utilmoneystr.cpp index ea8a817ac4..a9af59a11d 100644 --- a/src/utilmoneystr.cpp +++ b/src/utilmoneystr.cpp @@ -1,5 +1,5 @@ // Copyright (c) 2009-2010 Satoshi Nakamoto -// Copyright (c) 2009-2017 The Bitcoin Core developers +// Copyright (c) 2009-2018 The Bitcoin Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/utilmoneystr.h b/src/utilmoneystr.h index 1cbec49858..67579adb77 100644 --- a/src/utilmoneystr.h +++ b/src/utilmoneystr.h @@ -1,5 +1,5 @@ // Copyright (c) 2009-2010 Satoshi Nakamoto -// Copyright (c) 2009-2017 The Bitcoin Core developers +// Copyright (c) 2009-2018 The Bitcoin Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/utilstrencodings.cpp b/src/utilstrencodings.cpp index c6927021cb..a06d88cb19 100644 --- a/src/utilstrencodings.cpp +++ b/src/utilstrencodings.cpp @@ -1,5 +1,5 @@ // Copyright (c) 2009-2010 Satoshi Nakamoto -// Copyright (c) 2009-2017 The Bitcoin Core developers +// Copyright (c) 2009-2018 The Bitcoin Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/utilstrencodings.h b/src/utilstrencodings.h index 47f9afba1c..5f2211b5dc 100644 --- a/src/utilstrencodings.h +++ b/src/utilstrencodings.h @@ -1,5 +1,5 @@ // Copyright (c) 2009-2010 Satoshi Nakamoto -// Copyright (c) 2009-2017 The Bitcoin Core developers +// Copyright (c) 2009-2018 The Bitcoin Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/utiltime.cpp b/src/utiltime.cpp index e60996efe1..908791da48 100644 --- a/src/utiltime.cpp +++ b/src/utiltime.cpp @@ -1,5 +1,5 @@ // Copyright (c) 2009-2010 Satoshi Nakamoto -// Copyright (c) 2009-2017 The Bitcoin Core developers +// Copyright (c) 2009-2018 The Bitcoin Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/utiltime.h b/src/utiltime.h index 3bcbb00c16..c3e3da3014 100644 --- a/src/utiltime.h +++ b/src/utiltime.h @@ -1,5 +1,5 @@ // Copyright (c) 2009-2010 Satoshi Nakamoto -// Copyright (c) 2009-2017 The Bitcoin Core developers +// Copyright (c) 2009-2018 The Bitcoin Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/validation.cpp b/src/validation.cpp index 702a8d7e05..fceb135854 100644 --- a/src/validation.cpp +++ b/src/validation.cpp @@ -894,10 +894,7 @@ static bool AcceptToMemoryPoolWorker(const CChainParams& chainparams, CTxMemPool } } - unsigned int scriptVerifyFlags = STANDARD_SCRIPT_VERIFY_FLAGS; - if (!chainparams.RequireStandard()) { - scriptVerifyFlags = gArgs.GetArg("-promiscuousmempoolflags", scriptVerifyFlags); - } + constexpr unsigned int scriptVerifyFlags = STANDARD_SCRIPT_VERIFY_FLAGS; // Check against previous transactions // This is done last to help prevent CPU exhaustion denial-of-service attacks. @@ -932,20 +929,8 @@ static bool AcceptToMemoryPoolWorker(const CChainParams& chainparams, CTxMemPool // transactions into the mempool can be exploited as a DoS attack. unsigned int currentBlockScriptVerifyFlags = GetBlockScriptFlags(chainActive.Tip(), Params().GetConsensus()); if (!CheckInputsFromMempoolAndCache(tx, state, view, pool, currentBlockScriptVerifyFlags, true, txdata)) { - // If we're using promiscuousmempoolflags, we may hit this normally - // Check if current block has some flags that scriptVerifyFlags - // does not before printing an ominous warning - if (!(~scriptVerifyFlags & currentBlockScriptVerifyFlags)) { - return error("%s: BUG! PLEASE REPORT THIS! ConnectInputs failed against latest-block but not STANDARD flags %s, %s", + return error("%s: BUG! PLEASE REPORT THIS! CheckInputs failed against latest-block but not STANDARD flags %s, %s", __func__, hash.ToString(), FormatStateMessage(state)); - } else { - if (!CheckInputs(tx, state, view, true, MANDATORY_SCRIPT_VERIFY_FLAGS, true, false, txdata)) { - return error("%s: ConnectInputs failed against MANDATORY but not STANDARD flags due to promiscuous mempool %s, %s", - __func__, hash.ToString(), FormatStateMessage(state)); - } else { - LogPrintf("Warning: -promiscuousmempool flags set to not include currently enforced soft forks, this may break mining or otherwise cause instability!\n"); - } - } } if (test_accept) { diff --git a/src/validation.h b/src/validation.h index ce46a5a782..4965ff152a 100644 --- a/src/validation.h +++ b/src/validation.h @@ -1,5 +1,5 @@ // Copyright (c) 2009-2010 Satoshi Nakamoto -// Copyright (c) 2009-2017 The Bitcoin Core developers +// Copyright (c) 2009-2018 The Bitcoin Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/validationinterface.cpp b/src/validationinterface.cpp index aff4c44cea..248e774a8d 100644 --- a/src/validationinterface.cpp +++ b/src/validationinterface.cpp @@ -1,5 +1,5 @@ // Copyright (c) 2009-2010 Satoshi Nakamoto -// Copyright (c) 2009-2017 The Bitcoin Core developers +// Copyright (c) 2009-2018 The Bitcoin Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/validationinterface.h b/src/validationinterface.h index bddc28d24a..6e96755ea3 100644 --- a/src/validationinterface.h +++ b/src/validationinterface.h @@ -1,5 +1,5 @@ // Copyright (c) 2009-2010 Satoshi Nakamoto -// Copyright (c) 2009-2017 The Bitcoin Core developers +// Copyright (c) 2009-2018 The Bitcoin Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/version.h b/src/version.h index 4b38547f35..d932b512d4 100644 --- a/src/version.h +++ b/src/version.h @@ -1,4 +1,4 @@ -// Copyright (c) 2012-2017 The Bitcoin Core developers +// Copyright (c) 2012-2018 The Bitcoin Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/versionbits.cpp b/src/versionbits.cpp index e3ec078173..b0d2bc8a14 100644 --- a/src/versionbits.cpp +++ b/src/versionbits.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2016-2017 The Bitcoin Core developers +// Copyright (c) 2016-2018 The Bitcoin Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/versionbits.h b/src/versionbits.h index 8962a65057..e4bf9cb9be 100644 --- a/src/versionbits.h +++ b/src/versionbits.h @@ -1,4 +1,4 @@ -// Copyright (c) 2016-2017 The Bitcoin Core developers +// Copyright (c) 2016-2018 The Bitcoin Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/wallet/coincontrol.h b/src/wallet/coincontrol.h index fbe6c43e24..48a924abfb 100644 --- a/src/wallet/coincontrol.h +++ b/src/wallet/coincontrol.h @@ -1,4 +1,4 @@ -// Copyright (c) 2011-2017 The Bitcoin Core developers +// Copyright (c) 2011-2018 The Bitcoin Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/wallet/coinselection.cpp b/src/wallet/coinselection.cpp index 1a810e763f..3734ba66b6 100644 --- a/src/wallet/coinselection.cpp +++ b/src/wallet/coinselection.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017 The Bitcoin Core developers +// Copyright (c) 2017-2018 The Bitcoin Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. @@ -299,12 +299,12 @@ void OutputGroup::Insert(const CInputCoin& output, int depth, bool from_me, size m_from_me &= from_me; m_value += output.effective_value; m_depth = std::min(m_depth, depth); - // m_ancestors is currently the max ancestor count for all coins in the group; however, this is - // not ideal, as a wallet will consider e.g. thirty 2-ancestor coins as having two ancestors, - // when in reality it has 60 ancestors. - m_ancestors = std::max(m_ancestors, ancestors); - // m_descendants is the count as seen from the top ancestor, not the descendants as seen from the - // coin itself; thus, this value is accurate + // ancestors here express the number of ancestors the new coin will end up having, which is + // the sum, rather than the max; this will overestimate in the cases where multiple inputs + // have common ancestors + m_ancestors += ancestors; + // descendants is the count as seen from the top ancestor, not the descendants as seen from the + // coin itself; thus, this value is counted as the max, not the sum m_descendants = std::max(m_descendants, descendants); effective_value = m_value; } diff --git a/src/wallet/coinselection.h b/src/wallet/coinselection.h index 1be776e695..6d755d0969 100644 --- a/src/wallet/coinselection.h +++ b/src/wallet/coinselection.h @@ -1,4 +1,4 @@ -// Copyright (c) 2017 The Bitcoin Core developers +// Copyright (c) 2017-2018 The Bitcoin Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/wallet/crypter.cpp b/src/wallet/crypter.cpp index 6ad18721fd..4fa9603011 100644 --- a/src/wallet/crypter.cpp +++ b/src/wallet/crypter.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2009-2017 The Bitcoin Core developers +// Copyright (c) 2009-2018 The Bitcoin Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/wallet/crypter.h b/src/wallet/crypter.h index 52842cd978..418316c398 100644 --- a/src/wallet/crypter.h +++ b/src/wallet/crypter.h @@ -1,4 +1,4 @@ -// Copyright (c) 2009-2017 The Bitcoin Core developers +// Copyright (c) 2009-2018 The Bitcoin Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/wallet/db.cpp b/src/wallet/db.cpp index 01b8eacccb..d0fe51801e 100644 --- a/src/wallet/db.cpp +++ b/src/wallet/db.cpp @@ -1,5 +1,5 @@ // Copyright (c) 2009-2010 Satoshi Nakamoto -// Copyright (c) 2009-2017 The Bitcoin Core developers +// Copyright (c) 2009-2018 The Bitcoin Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. @@ -768,7 +768,7 @@ bool BerkeleyDatabase::Backup(const std::string& strDest) env->mapFileUseCount.erase(strFile); // Copy wallet file - fs::path pathSrc = GetWalletDir() / strFile; + fs::path pathSrc = env->Directory() / strFile; fs::path pathDest(strDest); if (fs::is_directory(pathDest)) pathDest /= strFile; diff --git a/src/wallet/db.h b/src/wallet/db.h index 5e61280f7a..b078edab7b 100644 --- a/src/wallet/db.h +++ b/src/wallet/db.h @@ -1,5 +1,5 @@ // Copyright (c) 2009-2010 Satoshi Nakamoto -// Copyright (c) 2009-2017 The Bitcoin Core developers +// Copyright (c) 2009-2018 The Bitcoin Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/wallet/feebumper.cpp b/src/wallet/feebumper.cpp index 0eb85a6e5c..d5d4021305 100644 --- a/src/wallet/feebumper.cpp +++ b/src/wallet/feebumper.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017 The Bitcoin Core developers +// Copyright (c) 2017-2018 The Bitcoin Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. @@ -195,7 +195,7 @@ Result CreateTransaction(const CWallet* wallet, const uint256& txid, const CCoin // If the output would become dust, discard it (converting the dust to fee) poutput->nValue -= nDelta; if (poutput->nValue <= GetDustThreshold(*poutput, GetDiscardRate(*wallet, ::feeEstimator))) { - LogPrint(BCLog::RPC, "Bumping fee and discarding dust output\n"); + wallet->WalletLogPrintf("Bumping fee and discarding dust output\n"); new_fee += poutput->nValue; mtx.vout.erase(mtx.vout.begin() + nOutput); } diff --git a/src/wallet/feebumper.h b/src/wallet/feebumper.h index 7e36a9766b..a1eb5d0e0d 100644 --- a/src/wallet/feebumper.h +++ b/src/wallet/feebumper.h @@ -1,4 +1,4 @@ -// Copyright (c) 2017 The Bitcoin Core developers +// Copyright (c) 2017-2018 The Bitcoin Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/wallet/fees.cpp b/src/wallet/fees.cpp index 8d576a6689..d620e25f2b 100644 --- a/src/wallet/fees.cpp +++ b/src/wallet/fees.cpp @@ -1,5 +1,5 @@ // Copyright (c) 2009-2010 Satoshi Nakamoto -// Copyright (c) 2009-2017 The Bitcoin Core developers +// Copyright (c) 2009-2018 The Bitcoin Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/wallet/fees.h b/src/wallet/fees.h index b3cd064abc..6bfee456c0 100644 --- a/src/wallet/fees.h +++ b/src/wallet/fees.h @@ -1,5 +1,5 @@ // Copyright (c) 2009-2010 Satoshi Nakamoto -// Copyright (c) 2009-2017 The Bitcoin Core developers +// Copyright (c) 2009-2018 The Bitcoin Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/wallet/init.cpp b/src/wallet/init.cpp index 52c7e6c70f..b9f267210e 100644 --- a/src/wallet/init.cpp +++ b/src/wallet/init.cpp @@ -1,5 +1,5 @@ // Copyright (c) 2009-2010 Satoshi Nakamoto -// Copyright (c) 2009-2017 The Bitcoin Core developers +// Copyright (c) 2009-2018 The Bitcoin Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/wallet/rpcdump.cpp b/src/wallet/rpcdump.cpp index 3cb4050f01..7cb41da39e 100644 --- a/src/wallet/rpcdump.cpp +++ b/src/wallet/rpcdump.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2009-2017 The Bitcoin Core developers +// Copyright (c) 2009-2018 The Bitcoin Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. @@ -115,7 +115,7 @@ UniValue importprivkey(const JSONRPCRequest& request) "1. \"privkey\" (string, required) The private key (see dumpprivkey)\n" "2. \"label\" (string, optional, default=\"\") An optional label\n" "3. rescan (boolean, optional, default=true) Rescan the wallet for transactions\n" - "\nNote: This call can take minutes to complete if rescan is true, during that time, other rpc calls\n" + "\nNote: This call can take over an hour to complete if rescan is true, during that time, other rpc calls\n" "may report that the imported key exists but related transactions are still missing, leading to temporarily incorrect/bogus balances and unspent outputs until rescan completes.\n" "\nExamples:\n" "\nDump a private key\n" @@ -268,7 +268,7 @@ UniValue importaddress(const JSONRPCRequest& request) "2. \"label\" (string, optional, default=\"\") An optional label\n" "3. rescan (boolean, optional, default=true) Rescan the wallet for transactions\n" "4. p2sh (boolean, optional, default=false) Add the P2SH version of the script as well\n" - "\nNote: This call can take minutes to complete if rescan is true, during that time, other rpc calls\n" + "\nNote: This call can take over an hour to complete if rescan is true, during that time, other rpc calls\n" "may report that the imported address exists but related transactions are still missing, leading to temporarily incorrect/bogus balances and unspent outputs until rescan completes.\n" "If you have the full public key, you should call importpubkey instead of this.\n" "\nNote: If you import a non-standard raw script in hex form, outputs sending to it will be treated\n" @@ -448,7 +448,7 @@ UniValue importpubkey(const JSONRPCRequest& request) "1. \"pubkey\" (string, required) The hex-encoded public key\n" "2. \"label\" (string, optional, default=\"\") An optional label\n" "3. rescan (boolean, optional, default=true) Rescan the wallet for transactions\n" - "\nNote: This call can take minutes to complete if rescan is true, during that time, other rpc calls\n" + "\nNote: This call can take over an hour to complete if rescan is true, during that time, other rpc calls\n" "may report that the imported pubkey exists but related transactions are still missing, leading to temporarily incorrect/bogus balances and unspent outputs until rescan completes.\n" "\nExamples:\n" "\nImport a public key with rescan\n" @@ -553,7 +553,7 @@ UniValue importwallet(const JSONRPCRequest& request) // Use uiInterface.ShowProgress instead of pwallet.ShowProgress because pwallet.ShowProgress has a cancel button tied to AbortRescan which // we don't want for this progress bar showing the import progress. uiInterface.ShowProgress does not have a cancel button. - uiInterface.ShowProgress(_("Importing..."), 0, false); // show progress dialog in GUI + uiInterface.ShowProgress(strprintf("%s " + _("Importing..."), pwallet->GetDisplayName()), 0, false); // show progress dialog in GUI while (file.good()) { uiInterface.ShowProgress("", std::max(1, std::min(99, (int)(((double)file.tellg() / (double)nFilesize) * 100))), false); std::string line; @@ -571,7 +571,7 @@ UniValue importwallet(const JSONRPCRequest& request) assert(key.VerifyPubKey(pubkey)); CKeyID keyid = pubkey.GetID(); if (pwallet->HaveKey(keyid)) { - LogPrintf("Skipping import of %s (key already present)\n", EncodeDestination(keyid)); + pwallet->WalletLogPrintf("Skipping import of %s (key already present)\n", EncodeDestination(keyid)); continue; } int64_t nTime = DecodeDumpTime(vstr[1]); @@ -589,7 +589,7 @@ UniValue importwallet(const JSONRPCRequest& request) fLabel = true; } } - LogPrintf("Importing %s...\n", EncodeDestination(keyid)); + pwallet->WalletLogPrintf("Importing %s...\n", EncodeDestination(keyid)); if (!pwallet->AddKeyPubKey(key, pubkey)) { fGood = false; continue; @@ -603,11 +603,11 @@ UniValue importwallet(const JSONRPCRequest& request) CScript script = CScript(vData.begin(), vData.end()); CScriptID id(script); if (pwallet->HaveCScript(id)) { - LogPrintf("Skipping import of %s (script already present)\n", vstr[0]); + pwallet->WalletLogPrintf("Skipping import of %s (script already present)\n", vstr[0]); continue; } if(!pwallet->AddCScript(script)) { - LogPrintf("Error importing script %s\n", vstr[0]); + pwallet->WalletLogPrintf("Error importing script %s\n", vstr[0]); fGood = false; continue; } @@ -706,15 +706,15 @@ UniValue dumpwallet(const JSONRPCRequest& request) EnsureWalletIsUnlocked(pwallet); - boost::filesystem::path filepath = request.params[0].get_str(); - filepath = boost::filesystem::absolute(filepath); + fs::path filepath = request.params[0].get_str(); + filepath = fs::absolute(filepath); /* Prevent arbitrary files from being overwritten. There have been reports * that users have overwritten wallet files this way: * https://github.com/bitcoin/bitcoin/issues/9934 * It may also avoid other security issues. */ - if (boost::filesystem::exists(filepath)) { + if (fs::exists(filepath)) { throw JSONRPCError(RPC_INVALID_PARAMETER, filepath.string() + " already exists. If you are sure this is what you want, move it out of the way first"); } @@ -1158,7 +1158,7 @@ UniValue importmulti(const JSONRPCRequest& mainRequest) " {\n" " \"rescan\": <false>, (boolean, optional, default: true) Stating if should rescan the blockchain after all imports\n" " }\n" - "\nNote: This call can take minutes to complete if rescan is true, during that time, other rpc calls\n" + "\nNote: This call can take over an hour to complete if rescan is true, during that time, other rpc calls\n" "may report that the imported keys, addresses or scripts exists but related transactions are still missing.\n" "\nExamples:\n" + HelpExampleCli("importmulti", "'[{ \"scriptPubKey\": { \"address\": \"<my address>\" }, \"timestamp\":1455191478 }, " diff --git a/src/wallet/rpcwallet.cpp b/src/wallet/rpcwallet.cpp index 73dfebf114..281fd46146 100644 --- a/src/wallet/rpcwallet.cpp +++ b/src/wallet/rpcwallet.cpp @@ -4504,10 +4504,11 @@ bool FillPSBT(const CWallet* pwallet, PartiallySignedTransaction& psbtx, const C // If we don't know about this input, skip it and let someone else deal with it const uint256& txhash = txin.prevout.hash; - const auto& it = pwallet->mapWallet.find(txhash); + const auto it = pwallet->mapWallet.find(txhash); if (it != pwallet->mapWallet.end()) { const CWalletTx& wtx = it->second; CTxOut utxo = wtx.tx->vout[txin.prevout.n]; + // Update both UTXOs from the wallet. input.non_witness_utxo = wtx.tx; input.witness_utxo = utxo; } @@ -4524,11 +4525,13 @@ bool FillPSBT(const CWallet* pwallet, PartiallySignedTransaction& psbtx, const C complete &= SignPSBTInput(PublicOnlySigningProvider(pwallet), *psbtx.tx, input, sigdata, i, sighash_type); } - // Drop the unnecessary UTXO - if (sigdata.witness) { - input.non_witness_utxo = nullptr; - } else { - input.witness_utxo.SetNull(); + if (it != pwallet->mapWallet.end()) { + // Drop the unnecessary UTXO if we added both from the wallet. + if (sigdata.witness) { + input.non_witness_utxo = nullptr; + } else { + input.witness_utxo.SetNull(); + } } // Get public key paths @@ -4544,11 +4547,6 @@ bool FillPSBT(const CWallet* pwallet, PartiallySignedTransaction& psbtx, const C const CTxOut& out = txConst->vout.at(i); PSBTOutput& psbt_out = psbtx.outputs.at(i); - // Dummy tx so we can use ProduceSignature to get stuff out - CMutableTransaction dummy_tx; - dummy_tx.vin.push_back(CTxIn()); - dummy_tx.vout.push_back(CTxOut()); - // Fill a SignatureData with output info SignatureData sigdata; psbt_out.FillSignatureData(sigdata); @@ -4630,8 +4628,8 @@ UniValue walletprocesspsbt(const JSONRPCRequest& request) UniValue result(UniValue::VOBJ); CDataStream ssTx(SER_NETWORK, PROTOCOL_VERSION); ssTx << psbtx; - result.push_back(Pair("psbt", EncodeBase64((unsigned char*)ssTx.data(), ssTx.size()))); - result.push_back(Pair("complete", complete)); + result.pushKV("psbt", EncodeBase64((unsigned char*)ssTx.data(), ssTx.size())); + result.pushKV("complete", complete); return result; } @@ -4751,17 +4749,16 @@ UniValue walletcreatefundedpsbt(const JSONRPCRequest& request) return result; } -extern UniValue abortrescan(const JSONRPCRequest& request); // in rpcdump.cpp -extern UniValue dumpprivkey(const JSONRPCRequest& request); // in rpcdump.cpp -extern UniValue importprivkey(const JSONRPCRequest& request); -extern UniValue importaddress(const JSONRPCRequest& request); -extern UniValue importpubkey(const JSONRPCRequest& request); -extern UniValue dumpwallet(const JSONRPCRequest& request); -extern UniValue importwallet(const JSONRPCRequest& request); -extern UniValue importprunedfunds(const JSONRPCRequest& request); -extern UniValue removeprunedfunds(const JSONRPCRequest& request); -extern UniValue importmulti(const JSONRPCRequest& request); -extern UniValue rescanblockchain(const JSONRPCRequest& request); +UniValue abortrescan(const JSONRPCRequest& request); // in rpcdump.cpp +UniValue dumpprivkey(const JSONRPCRequest& request); // in rpcdump.cpp +UniValue importprivkey(const JSONRPCRequest& request); +UniValue importaddress(const JSONRPCRequest& request); +UniValue importpubkey(const JSONRPCRequest& request); +UniValue dumpwallet(const JSONRPCRequest& request); +UniValue importwallet(const JSONRPCRequest& request); +UniValue importprunedfunds(const JSONRPCRequest& request); +UniValue removeprunedfunds(const JSONRPCRequest& request); +UniValue importmulti(const JSONRPCRequest& request); static const CRPCCommand commands[] = { // category name actor (function) argNames diff --git a/src/wallet/rpcwallet.h b/src/wallet/rpcwallet.h index 64556b5824..9b9a159b86 100644 --- a/src/wallet/rpcwallet.h +++ b/src/wallet/rpcwallet.h @@ -1,4 +1,4 @@ -// Copyright (c) 2016-2017 The Bitcoin Core developers +// Copyright (c) 2016-2018 The Bitcoin Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/wallet/test/accounting_tests.cpp b/src/wallet/test/accounting_tests.cpp index cc6e491f53..79060887be 100644 --- a/src/wallet/test/accounting_tests.cpp +++ b/src/wallet/test/accounting_tests.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2012-2017 The Bitcoin Core developers +// Copyright (c) 2012-2018 The Bitcoin Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/wallet/test/coinselector_tests.cpp b/src/wallet/test/coinselector_tests.cpp index 1561760577..0776ffda9c 100644 --- a/src/wallet/test/coinselector_tests.cpp +++ b/src/wallet/test/coinselector_tests.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017 The Bitcoin Core developers +// Copyright (c) 2017-2018 The Bitcoin Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/wallet/test/psbt_wallet_tests.cpp b/src/wallet/test/psbt_wallet_tests.cpp index 2cc995bf04..61c3fa94a6 100644 --- a/src/wallet/test/psbt_wallet_tests.cpp +++ b/src/wallet/test/psbt_wallet_tests.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017 The Bitcoin Core developers +// Copyright (c) 2017-2018 The Bitcoin Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/wallet/test/wallet_crypto_tests.cpp b/src/wallet/test/wallet_crypto_tests.cpp index e04c0af1dd..f193d5c41d 100644 --- a/src/wallet/test/wallet_crypto_tests.cpp +++ b/src/wallet/test/wallet_crypto_tests.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2014-2017 The Bitcoin Core developers +// Copyright (c) 2014-2018 The Bitcoin Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/wallet/test/wallet_test_fixture.cpp b/src/wallet/test/wallet_test_fixture.cpp index 6129e337ce..de59b60349 100644 --- a/src/wallet/test/wallet_test_fixture.cpp +++ b/src/wallet/test/wallet_test_fixture.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2016-2017 The Bitcoin Core developers +// Copyright (c) 2016-2018 The Bitcoin Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/wallet/test/wallet_test_fixture.h b/src/wallet/test/wallet_test_fixture.h index b328b3543b..ff8ec32b03 100644 --- a/src/wallet/test/wallet_test_fixture.h +++ b/src/wallet/test/wallet_test_fixture.h @@ -1,4 +1,4 @@ -// Copyright (c) 2016-2017 The Bitcoin Core developers +// Copyright (c) 2016-2018 The Bitcoin Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/wallet/test/wallet_tests.cpp b/src/wallet/test/wallet_tests.cpp index c89b8f252f..f44311b0be 100644 --- a/src/wallet/test/wallet_tests.cpp +++ b/src/wallet/test/wallet_tests.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2012-2017 The Bitcoin Core developers +// Copyright (c) 2012-2018 The Bitcoin Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/wallet/wallet.cpp b/src/wallet/wallet.cpp index 218684fdf1..5a7fdf9a85 100644 --- a/src/wallet/wallet.cpp +++ b/src/wallet/wallet.cpp @@ -1,5 +1,5 @@ // Copyright (c) 2009-2010 Satoshi Nakamoto -// Copyright (c) 2009-2017 The Bitcoin Core developers +// Copyright (c) 2009-2018 The Bitcoin Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. @@ -35,6 +35,8 @@ #include <boost/algorithm/string/replace.hpp> +static const size_t OUTPUT_GROUP_MAX_ENTRIES = 10; + static CCriticalSection cs_wallets; static std::vector<std::shared_ptr<CWallet>> vpwallets GUARDED_BY(cs_wallets); @@ -82,7 +84,7 @@ std::shared_ptr<CWallet> GetWallet(const std::string& name) // Custom deleter for shared_ptr<CWallet>. static void ReleaseWallet(CWallet* wallet) { - LogPrintf("Releasing wallet %s\n", wallet->GetName()); + wallet->WalletLogPrintf("Releasing wallet\n"); wallet->BlockUntilSyncedToCurrentChain(); wallet->Flush(); delete wallet; @@ -102,14 +104,25 @@ std::string COutput::ToString() const return strprintf("COutput(%s, %d, %d) [%s]", tx->GetHash().ToString(), i, nDepth, FormatMoney(tx->tx->vout[i].nValue)); } +/** A class to identify which pubkeys a script and a keystore have in common. */ class CAffectedKeysVisitor : public boost::static_visitor<void> { private: const CKeyStore &keystore; std::vector<CKeyID> &vKeys; public: + /** + * @param[in] keystoreIn The CKeyStore that is queried for the presence of a pubkey. + * @param[out] vKeysIn A vector to which a script's pubkey identifiers are appended if they are in the keystore. + */ CAffectedKeysVisitor(const CKeyStore &keystoreIn, std::vector<CKeyID> &vKeysIn) : keystore(keystoreIn), vKeys(vKeysIn) {} + /** + * Apply the visitor to each destination in a script, recursively to the redeemscript + * in the case of p2sh destinations. + * @param[in] script The CScript from which destinations are extracted. + * @post Any CKeyIDs that script and keystore have in common are appended to the visitor's vKeys. + */ void Process(const CScript &script) { txnouttype type; std::vector<CTxDestination> vDest; @@ -354,8 +367,7 @@ bool CWallet::LoadCScript(const CScript& redeemScript) if (redeemScript.size() > MAX_SCRIPT_ELEMENT_SIZE) { std::string strAddr = EncodeDestination(CScriptID(redeemScript)); - LogPrintf("%s: Warning: This wallet contains a redeemScript of size %i which exceeds maximum size %i thus can never be redeemed. Do not use address %s.\n", - __func__, redeemScript.size(), MAX_SCRIPT_ELEMENT_SIZE, strAddr); + WalletLogPrintf("%s: Warning: This wallet contains a redeemScript of size %i which exceeds maximum size %i thus can never be redeemed. Do not use address %s.\n", __func__, redeemScript.size(), MAX_SCRIPT_ELEMENT_SIZE, strAddr); return true; } @@ -445,7 +457,7 @@ bool CWallet::ChangeWalletPassphrase(const SecureString& strOldWalletPassphrase, if (pMasterKey.second.nDeriveIterations < 25000) pMasterKey.second.nDeriveIterations = 25000; - LogPrintf("Wallet passphrase changed to an nDeriveIterations of %i\n", pMasterKey.second.nDeriveIterations); + WalletLogPrintf("Wallet passphrase changed to an nDeriveIterations of %i\n", pMasterKey.second.nDeriveIterations); if (!crypter.SetKeyFromPassphrase(strNewWalletPassphrase, pMasterKey.second.vchSalt, pMasterKey.second.nDeriveIterations, pMasterKey.second.nDerivationMethod)) return false; @@ -653,7 +665,7 @@ bool CWallet::EncryptWallet(const SecureString& strWalletPassphrase) if (kMasterKey.nDeriveIterations < 25000) kMasterKey.nDeriveIterations = 25000; - LogPrintf("Encrypting Wallet with an nDeriveIterations of %i\n", kMasterKey.nDeriveIterations); + WalletLogPrintf("Encrypting Wallet with an nDeriveIterations of %i\n", kMasterKey.nDeriveIterations); if (!crypter.SetKeyFromPassphrase(strWalletPassphrase, kMasterKey.vchSalt, kMasterKey.nDeriveIterations, kMasterKey.nDerivationMethod)) return false; @@ -907,7 +919,7 @@ bool CWallet::MarkReplaced(const uint256& originalHash, const uint256& newHash) bool success = true; if (!batch.WriteTx(wtx)) { - LogPrintf("%s: Updating batch tx %s failed\n", __func__, wtx.GetHash().ToString()); + WalletLogPrintf("%s: Updating batch tx %s failed\n", __func__, wtx.GetHash().ToString()); success = false; } @@ -974,7 +986,7 @@ bool CWallet::AddToWallet(const CWalletTx& wtxIn, bool fFlushOnClose) } //// debug print - LogPrintf("AddToWallet %s %s%s\n", wtxIn.GetHash().ToString(), (fInsertedNew ? "new" : ""), (fUpdated ? "update" : "")); + WalletLogPrintf("AddToWallet %s %s%s\n", wtxIn.GetHash().ToString(), (fInsertedNew ? "new" : ""), (fUpdated ? "update" : "")); // Write to disk if (fInsertedNew || fUpdated) @@ -1032,7 +1044,7 @@ bool CWallet::AddToWalletIfInvolvingMe(const CTransactionRef& ptx, const CBlockI std::pair<TxSpends::const_iterator, TxSpends::const_iterator> range = mapTxSpends.equal_range(txin.prevout); while (range.first != range.second) { if (range.first->second != tx.GetHash()) { - LogPrintf("Transaction %s (in block %s) conflicts with wallet transaction %s (both spend %s:%i)\n", tx.GetHash().ToString(), pIndex->GetBlockHash().ToString(), range.first->second.ToString(), range.first->first.hash.ToString(), range.first->first.n); + WalletLogPrintf("Transaction %s (in block %s) conflicts with wallet transaction %s (both spend %s:%i)\n", tx.GetHash().ToString(), pIndex->GetBlockHash().ToString(), range.first->second.ToString(), range.first->first.hash.ToString(), range.first->first.n); MarkConflicted(pIndex->GetBlockHash(), range.first->second); } range.first++; @@ -1058,11 +1070,11 @@ bool CWallet::AddToWalletIfInvolvingMe(const CTransactionRef& ptx, const CBlockI for (const CKeyID &keyid : vAffected) { std::map<CKeyID, int64_t>::const_iterator mi = m_pool_key_to_index.find(keyid); if (mi != m_pool_key_to_index.end()) { - LogPrintf("%s: Detected a used keypool key, mark all keypool key up to this key as used\n", __func__); + WalletLogPrintf("%s: Detected a used keypool key, mark all keypool key up to this key as used\n", __func__); MarkReserveKeysAsUsed(mi->second); if (!TopUpKeyPool()) { - LogPrintf("%s: Topping up keypool failed (locked wallet)\n", __func__); + WalletLogPrintf("%s: Topping up keypool failed (locked wallet)\n", __func__); } } } @@ -1530,30 +1542,29 @@ int64_t CWalletTx::GetTxTime() const return n ? n : nTimeReceived; } -// Helper for producing a max-sized low-S signature (eg 72 bytes) -bool CWallet::DummySignInput(CTxIn &tx_in, const CTxOut &txout) const +// Helper for producing a max-sized low-S low-R signature (eg 71 bytes) +// or a max-sized low-S signature (e.g. 72 bytes) if use_max_sig is true +bool CWallet::DummySignInput(CTxIn &tx_in, const CTxOut &txout, bool use_max_sig) const { // Fill in dummy signatures for fee calculation. const CScript& scriptPubKey = txout.scriptPubKey; SignatureData sigdata; - if (!ProduceSignature(*this, DUMMY_SIGNATURE_CREATOR, scriptPubKey, sigdata)) - { + if (!ProduceSignature(*this, use_max_sig ? DUMMY_MAXIMUM_SIGNATURE_CREATOR : DUMMY_SIGNATURE_CREATOR, scriptPubKey, sigdata)) { return false; - } else { - UpdateInput(tx_in, sigdata); } + UpdateInput(tx_in, sigdata); return true; } -// Helper for producing a bunch of max-sized low-S signatures (eg 72 bytes) -bool CWallet::DummySignTx(CMutableTransaction &txNew, const std::vector<CTxOut> &txouts) const +// Helper for producing a bunch of max-sized low-S low-R signatures (eg 71 bytes) +bool CWallet::DummySignTx(CMutableTransaction &txNew, const std::vector<CTxOut> &txouts, bool use_max_sig) const { // Fill in dummy signatures for fee calculation. int nIn = 0; for (const auto& txout : txouts) { - if (!DummySignInput(txNew.vin[nIn], txout)) { + if (!DummySignInput(txNew.vin[nIn], txout, use_max_sig)) { return false; } @@ -1562,7 +1573,7 @@ bool CWallet::DummySignTx(CMutableTransaction &txNew, const std::vector<CTxOut> return true; } -int64_t CalculateMaximumSignedTxSize(const CTransaction &tx, const CWallet *wallet) +int64_t CalculateMaximumSignedTxSize(const CTransaction &tx, const CWallet *wallet, bool use_max_sig) { std::vector<CTxOut> txouts; // Look up the inputs. We should have already checked that this transaction @@ -1576,14 +1587,14 @@ int64_t CalculateMaximumSignedTxSize(const CTransaction &tx, const CWallet *wall assert(input.prevout.n < mi->second.tx->vout.size()); txouts.emplace_back(mi->second.tx->vout[input.prevout.n]); } - return CalculateMaximumSignedTxSize(tx, wallet, txouts); + return CalculateMaximumSignedTxSize(tx, wallet, txouts, use_max_sig); } // txouts needs to be in the order of tx.vin -int64_t CalculateMaximumSignedTxSize(const CTransaction &tx, const CWallet *wallet, const std::vector<CTxOut>& txouts) +int64_t CalculateMaximumSignedTxSize(const CTransaction &tx, const CWallet *wallet, const std::vector<CTxOut>& txouts, bool use_max_sig) { CMutableTransaction txNew(tx); - if (!wallet->DummySignTx(txNew, txouts)) { + if (!wallet->DummySignTx(txNew, txouts, use_max_sig)) { // This should never happen, because IsAllFromMe(ISMINE_SPENDABLE) // implies that we can sign for every input. return -1; @@ -1591,11 +1602,11 @@ int64_t CalculateMaximumSignedTxSize(const CTransaction &tx, const CWallet *wall return GetVirtualTransactionSize(txNew); } -int CalculateMaximumSignedInputSize(const CTxOut& txout, const CWallet* wallet) +int CalculateMaximumSignedInputSize(const CTxOut& txout, const CWallet* wallet, bool use_max_sig) { CMutableTransaction txn; txn.vin.push_back(CTxIn(COutPoint())); - if (!wallet->DummySignInput(txn.vin[0], txout)) { + if (!wallet->DummySignInput(txn.vin[0], txout, use_max_sig)) { // This should never happen, because IsAllFromMe(ISMINE_SPENDABLE) // implies that we can sign for every input. return -1; @@ -1641,8 +1652,8 @@ void CWalletTx::GetAmounts(std::list<COutputEntry>& listReceived, if (!ExtractDestination(txout.scriptPubKey, address) && !txout.scriptPubKey.IsUnspendable()) { - LogPrintf("CWalletTx::GetAmounts: Unknown transaction type found, txid %s\n", - this->GetHash().ToString()); + pwallet->WalletLogPrintf("CWalletTx::GetAmounts: Unknown transaction type found, txid %s\n", + this->GetHash().ToString()); address = CNoDestination(); } @@ -1676,7 +1687,7 @@ int64_t CWallet::RescanFromTime(int64_t startTime, const WalletRescanReserver& r { LOCK(cs_main); startBlock = chainActive.FindEarliestAtLeast(startTime - TIMESTAMP_WINDOW); - LogPrintf("%s: Rescanning last %i blocks\n", __func__, startBlock ? chainActive.Height() - startBlock->nHeight + 1 : 0); + WalletLogPrintf("%s: Rescanning last %i blocks\n", __func__, startBlock ? chainActive.Height() - startBlock->nHeight + 1 : 0); } if (startBlock) { @@ -1717,11 +1728,11 @@ CBlockIndex* CWallet::ScanForWalletTransactions(CBlockIndex* pindexStart, CBlock CBlockIndex* pindex = pindexStart; CBlockIndex* ret = nullptr; - if (pindex) LogPrintf("Rescan started from block %d...\n", pindex->nHeight); + if (pindex) WalletLogPrintf("Rescan started from block %d...\n", pindex->nHeight); { fAbortRescan = false; - ShowProgress(_("Rescanning..."), 0); // show rescan progress in GUI as dialog or on splashscreen, if -rescan on startup + ShowProgress(strprintf("%s " + _("Rescanning..."), GetDisplayName()), 0); // show rescan progress in GUI as dialog or on splashscreen, if -rescan on startup CBlockIndex* tip = nullptr; double progress_begin; double progress_end; @@ -1739,11 +1750,11 @@ CBlockIndex* CWallet::ScanForWalletTransactions(CBlockIndex* pindexStart, CBlock while (pindex && !fAbortRescan && !ShutdownRequested()) { if (pindex->nHeight % 100 == 0 && progress_end - progress_begin > 0.0) { - ShowProgress(_("Rescanning..."), std::max(1, std::min(99, (int)((progress_current - progress_begin) / (progress_end - progress_begin) * 100)))); + ShowProgress(strprintf("%s " + _("Rescanning..."), GetDisplayName()), std::max(1, std::min(99, (int)((progress_current - progress_begin) / (progress_end - progress_begin) * 100)))); } if (GetTime() >= nNow + 60) { nNow = GetTime(); - LogPrintf("Still rescanning. At block %d. Progress=%f\n", pindex->nHeight, progress_current); + WalletLogPrintf("Still rescanning. At block %d. Progress=%f\n", pindex->nHeight, progress_current); } CBlock block; @@ -1776,11 +1787,11 @@ CBlockIndex* CWallet::ScanForWalletTransactions(CBlockIndex* pindexStart, CBlock } } if (pindex && fAbortRescan) { - LogPrintf("Rescan aborted at block %d. Progress=%f\n", pindex->nHeight, progress_current); + WalletLogPrintf("Rescan aborted at block %d. Progress=%f\n", pindex->nHeight, progress_current); } else if (pindex && ShutdownRequested()) { - LogPrintf("Rescan interrupted by shutdown request at block %d. Progress=%f\n", pindex->nHeight, progress_current); + WalletLogPrintf("Rescan interrupted by shutdown request at block %d. Progress=%f\n", pindex->nHeight, progress_current); } - ShowProgress(_("Rescanning..."), 100); // hide progress dialog in GUI + ShowProgress(strprintf("%s " + _("Rescanning..."), GetDisplayName()), 100); // hide progress dialog in GUI } return ret; } @@ -1823,7 +1834,7 @@ bool CWalletTx::RelayWalletTransaction(CConnman* connman) CValidationState state; /* GetDepthInMainChain already catches known conflicts. */ if (InMempool() || AcceptToMemoryPool(maxTxFee, state)) { - LogPrintf("Relaying wtx %s\n", GetHash().ToString()); + pwallet->WalletLogPrintf("Relaying wtx %s\n", GetHash().ToString()); if (connman) { CInv inv(MSG_TX, GetHash()); connman->ForEachNode([&inv](CNode* pnode) @@ -2085,7 +2096,7 @@ void CWallet::ResendWalletTransactions(int64_t nBestBlockTime, CConnman* connman // block was found: std::vector<uint256> relayed = ResendWalletTransactionsBefore(nBestBlockTime-5*60, connman); if (!relayed.empty()) - LogPrintf("%s: rebroadcast %u unconfirmed transactions\n", __func__, relayed.size()); + WalletLogPrintf("%s: rebroadcast %u unconfirmed transactions\n", __func__, relayed.size()); } /** @} */ // end of mapWallet @@ -2322,7 +2333,7 @@ void CWallet::AvailableCoins(std::vector<COutput> &vCoins, bool fOnlySafe, const bool solvable = IsSolvable(*this, pcoin->tx->vout[i].scriptPubKey); bool spendable = ((mine & ISMINE_SPENDABLE) != ISMINE_NO) || (((mine & ISMINE_WATCH_ONLY) != ISMINE_NO) && (coinControl && coinControl->fAllowWatchOnly && solvable)); - vCoins.push_back(COutput(pcoin, i, nDepth, spendable, solvable, safeTx)); + vCoins.push_back(COutput(pcoin, i, nDepth, spendable, solvable, safeTx, (coinControl && coinControl->fAllowWatchOnly))); // Checks the sum amount of all UTXO's. if (nMinimumSumAmount != MAX_MONEY) { @@ -2515,6 +2526,12 @@ bool CWallet::SelectCoins(const std::vector<COutput>& vAvailableCoins, const CAm // form groups from remaining coins; note that preset coins will not // automatically have their associated (same address) coins included + if (coin_control.m_avoid_partial_spends && vCoins.size() > OUTPUT_GROUP_MAX_ENTRIES) { + // Cases where we have 11+ outputs all pointing to the same destination may result in + // privacy leaks as they will potentially be deterministically sorted. We solve that by + // explicitly shuffling the outputs before processing + std::shuffle(vCoins.begin(), vCoins.end(), FastRandomContext()); + } std::vector<OutputGroup> groups = GroupOutputs(vCoins, !coin_control.m_avoid_partial_spends); size_t max_ancestors = (size_t)std::max<int64_t>(1, gArgs.GetArg("-limitancestorcount", DEFAULT_ANCESTOR_LIMIT)); @@ -2871,7 +2888,7 @@ bool CWallet::CreateTransaction(const std::vector<CRecipient>& vecSend, CTransac txNew.vin.push_back(CTxIn(coin.outpoint,CScript())); } - nBytes = CalculateMaximumSignedTxSize(txNew, this); + nBytes = CalculateMaximumSignedTxSize(txNew, this, coin_control.fAllowWatchOnly); if (nBytes < 0) { strFailReason = _("Signing transaction failed"); return false; @@ -3025,7 +3042,7 @@ bool CWallet::CreateTransaction(const std::vector<CRecipient>& vecSend, CTransac } } - LogPrintf("Fee Calculation: Fee:%d Bytes:%u Needed:%d Tgt:%d (requested %d) Reason:\"%s\" Decay %.5f: Estimation: (%g - %g) %.2f%% %.1f/(%.1f %d mem %.1f out) Fail: (%g - %g) %.2f%% %.1f/(%.1f %d mem %.1f out)\n", + WalletLogPrintf("Fee Calculation: Fee:%d Bytes:%u Needed:%d Tgt:%d (requested %d) Reason:\"%s\" Decay %.5f: Estimation: (%g - %g) %.2f%% %.1f/(%.1f %d mem %.1f out) Fail: (%g - %g) %.2f%% %.1f/(%.1f %d mem %.1f out)\n", nFeeRet, nBytes, nFeeNeeded, feeCalc.returnedTarget, feeCalc.desiredTarget, StringForFeeReason(feeCalc.reason), feeCalc.est.decay, feeCalc.est.pass.start, feeCalc.est.pass.end, 100 * feeCalc.est.pass.withinTarget / (feeCalc.est.pass.totalConfirmed + feeCalc.est.pass.inMempool + feeCalc.est.pass.leftMempool), @@ -3051,7 +3068,7 @@ bool CWallet::CommitTransaction(CTransactionRef tx, mapValue_t mapValue, std::ve wtxNew.fTimeReceivedIsTxTime = true; wtxNew.fFromMe = true; - LogPrintf("CommitTransaction:\n%s", wtxNew.tx->ToString()); /* Continued */ + WalletLogPrintf("CommitTransaction:\n%s", wtxNew.tx->ToString()); /* Continued */ { // Take key pair from key pool so it won't be used again reservekey.KeepKey(); @@ -3077,7 +3094,7 @@ bool CWallet::CommitTransaction(CTransactionRef tx, mapValue_t mapValue, std::ve { // Broadcast if (!wtx.AcceptToMemoryPool(maxTxFee, state)) { - LogPrintf("CommitTransaction(): Transaction cannot be broadcast immediately, %s\n", FormatStateMessage(state)); + WalletLogPrintf("CommitTransaction(): Transaction cannot be broadcast immediately, %s\n", FormatStateMessage(state)); // TODO: if we expect the failure to be long term or permanent, instead delete wtx from the wallet and return failure. } else { wtx.RelayWalletTransaction(connman); @@ -3285,7 +3302,7 @@ bool CWallet::NewKeyPool() if (!TopUpKeyPool()) { return false; } - LogPrintf("CWallet::NewKeyPool rewrote keypool\n"); + WalletLogPrintf("CWallet::NewKeyPool rewrote keypool\n"); } return true; } @@ -3369,7 +3386,7 @@ bool CWallet::TopUpKeyPool(unsigned int kpSize) m_pool_key_to_index[pubkey.GetID()] = index; } if (missingInternal + missingExternal > 0) { - LogPrintf("keypool added %d keys (%d internal), size=%u (%u internal)\n", missingInternal + missingExternal, missingInternal, setInternalKeyPool.size() + setExternalKeyPool.size() + set_pre_split_keypool.size(), setInternalKeyPool.size()); + WalletLogPrintf("keypool added %d keys (%d internal), size=%u (%u internal)\n", missingInternal + missingExternal, missingInternal, setInternalKeyPool.size() + setExternalKeyPool.size() + set_pre_split_keypool.size(), setInternalKeyPool.size()); } } return true; @@ -3414,7 +3431,7 @@ bool CWallet::ReserveKeyFromKeyPool(int64_t& nIndex, CKeyPool& keypool, bool fRe } m_pool_key_to_index.erase(keypool.vchPubKey.GetID()); - LogPrintf("keypool reserve %d\n", nIndex); + WalletLogPrintf("keypool reserve %d\n", nIndex); } return true; } @@ -3424,7 +3441,7 @@ void CWallet::KeepKey(int64_t nIndex) // Remove from key pool WalletBatch batch(*database); batch.ErasePool(nIndex); - LogPrintf("keypool keep %d\n", nIndex); + WalletLogPrintf("keypool keep %d\n", nIndex); } void CWallet::ReturnKey(int64_t nIndex, bool fInternal, const CPubKey& pubkey) @@ -3441,7 +3458,7 @@ void CWallet::ReturnKey(int64_t nIndex, bool fInternal, const CPubKey& pubkey) } m_pool_key_to_index[pubkey.GetID()] = nIndex; } - LogPrintf("keypool return %d\n", nIndex); + WalletLogPrintf("keypool return %d\n", nIndex); } bool CWallet::GetKeyFromPool(CPubKey& result, bool internal) @@ -3703,7 +3720,7 @@ void CWallet::MarkReserveKeysAsUsed(int64_t keypool_id) } LearnAllRelatedScripts(keypool.vchPubKey); batch.ErasePool(index); - LogPrintf("keypool index %d removed\n", index); + WalletLogPrintf("keypool index %d removed\n", index); it = setKeyPool->erase(it); } } @@ -3867,7 +3884,7 @@ unsigned int CWallet::ComputeTimeSmart(const CWalletTx& wtx) const int64_t blocktime = pindex->GetBlockTime(); nTimeSmart = std::max(latestEntry, std::min(blocktime, latestNow)); } else { - LogPrintf("%s: found %s in block %s not in index\n", __func__, wtx.GetHash().ToString(), wtx.hashBlock.ToString()); + WalletLogPrintf("%s: found %s in block %s not in index\n", __func__, wtx.GetHash().ToString(), wtx.hashBlock.ToString()); } } return nTimeSmart; @@ -3972,7 +3989,12 @@ bool CWallet::Verify(std::string wallet_file, bool salvage_wallet, std::string& } } - if (!WalletBatch::VerifyEnvironment(wallet_path, error_string)) { + try { + if (!WalletBatch::VerifyEnvironment(wallet_path, error_string)) { + return false; + } + } catch (const fs::filesystem_error& e) { + error_string = strprintf("Error loading wallet %s. %s", wallet_file, e.what()); return false; } @@ -4047,12 +4069,12 @@ std::shared_ptr<CWallet> CWallet::CreateWalletFromFile(const std::string& name, int nMaxVersion = gArgs.GetArg("-upgradewallet", 0); if (nMaxVersion == 0) // the -upgradewallet without argument case { - LogPrintf("Performing wallet upgrade to %i\n", FEATURE_LATEST); + walletInstance->WalletLogPrintf("Performing wallet upgrade to %i\n", FEATURE_LATEST); nMaxVersion = FEATURE_LATEST; walletInstance->SetMinVersion(FEATURE_LATEST); // permanently upgrade the wallet immediately } else - LogPrintf("Allowing wallet upgrade up to %i\n", nMaxVersion); + walletInstance->WalletLogPrintf("Allowing wallet upgrade up to %i\n", nMaxVersion); if (nMaxVersion < walletInstance->GetVersion()) { InitError(_("Cannot downgrade wallet")); @@ -4075,7 +4097,7 @@ std::shared_ptr<CWallet> CWallet::CreateWalletFromFile(const std::string& name, bool hd_upgrade = false; bool split_upgrade = false; if (walletInstance->CanSupportFeature(FEATURE_HD) && !walletInstance->IsHDEnabled()) { - LogPrintf("Upgrading wallet to HD\n"); + walletInstance->WalletLogPrintf("Upgrading wallet to HD\n"); walletInstance->SetMinVersion(FEATURE_HD); // generate a new master key @@ -4085,7 +4107,7 @@ std::shared_ptr<CWallet> CWallet::CreateWalletFromFile(const std::string& name, } // Upgrade to HD chain split if necessary if (walletInstance->CanSupportFeature(FEATURE_HD_SPLIT)) { - LogPrintf("Upgrading wallet to use HD chain split\n"); + walletInstance->WalletLogPrintf("Upgrading wallet to use HD chain split\n"); walletInstance->SetMinVersion(FEATURE_PRE_SPLIT_KEYPOOL); split_upgrade = FEATURE_HD_SPLIT > prev_version; } @@ -4218,7 +4240,7 @@ std::shared_ptr<CWallet> CWallet::CreateWalletFromFile(const std::string& name, walletInstance->m_spend_zero_conf_change = gArgs.GetBoolArg("-spendzeroconfchange", DEFAULT_SPEND_ZEROCONF_CHANGE); walletInstance->m_signal_rbf = gArgs.GetBoolArg("-walletrbf", DEFAULT_WALLET_RBF); - LogPrintf(" wallet %15dms\n", GetTimeMillis() - nStart); + walletInstance->WalletLogPrintf("Wallet completed loading in %15dms\n", GetTimeMillis() - nStart); // Try to top up keypool. No-op if the wallet is locked. walletInstance->TopUpKeyPool(); @@ -4254,7 +4276,7 @@ std::shared_ptr<CWallet> CWallet::CreateWalletFromFile(const std::string& name, } uiInterface.InitMessage(_("Rescanning...")); - LogPrintf("Rescanning last %i blocks (from block %i)...\n", chainActive.Height() - pindexRescan->nHeight, pindexRescan->nHeight); + walletInstance->WalletLogPrintf("Rescanning last %i blocks (from block %i)...\n", chainActive.Height() - pindexRescan->nHeight, pindexRescan->nHeight); // No need to read and scan block if block was created before // our wallet birthday (as adjusted for block time variability) @@ -4271,7 +4293,7 @@ std::shared_ptr<CWallet> CWallet::CreateWalletFromFile(const std::string& name, } walletInstance->ScanForWalletTransactions(pindexRescan, nullptr, reserver, true); } - LogPrintf(" rescan %15dms\n", GetTimeMillis() - nStart); + walletInstance->WalletLogPrintf("Rescan completed in %15dms\n", GetTimeMillis() - nStart); walletInstance->ChainStateFlushed(chainActive.GetLocator()); walletInstance->database->IncrementUpdateCounter(); @@ -4310,9 +4332,9 @@ std::shared_ptr<CWallet> CWallet::CreateWalletFromFile(const std::string& name, { LOCK(walletInstance->cs_wallet); - LogPrintf("setKeyPool.size() = %u\n", walletInstance->GetKeyPoolSize()); - LogPrintf("mapWallet.size() = %u\n", walletInstance->mapWallet.size()); - LogPrintf("mapAddressBook.size() = %u\n", walletInstance->mapAddressBook.size()); + walletInstance->WalletLogPrintf("setKeyPool.size() = %u\n", walletInstance->GetKeyPoolSize()); + walletInstance->WalletLogPrintf("mapWallet.size() = %u\n", walletInstance->mapWallet.size()); + walletInstance->WalletLogPrintf("mapAddressBook.size() = %u\n", walletInstance->mapAddressBook.size()); } return walletInstance; @@ -4379,7 +4401,9 @@ int CMerkleTx::GetBlocksToMaturity() const { if (!IsCoinBase()) return 0; - return std::max(0, (COINBASE_MATURITY+1) - GetDepthInMainChain()); + int chain_depth = GetDepthInMainChain(); + assert(chain_depth >= 0); // coinbase tx should not be conflicted + return std::max(0, (COINBASE_MATURITY+1) - chain_depth); } @@ -4427,7 +4451,7 @@ std::vector<OutputGroup> CWallet::GroupOutputs(const std::vector<COutput>& outpu // Limit output groups to no more than 10 entries, to protect // against inadvertently creating a too-large transaction // when using -avoidpartialspends - if (gmap[dst].m_outputs.size() >= 10) { + if (gmap[dst].m_outputs.size() >= OUTPUT_GROUP_MAX_ENTRIES) { groups.push_back(gmap[dst]); gmap.erase(dst); } diff --git a/src/wallet/wallet.h b/src/wallet/wallet.h index 9f9501cf72..57b22c0e49 100644 --- a/src/wallet/wallet.h +++ b/src/wallet/wallet.h @@ -1,5 +1,5 @@ // Copyright (c) 2009-2010 Satoshi Nakamoto -// Copyright (c) 2009-2017 The Bitcoin Core developers +// Copyright (c) 2009-2018 The Bitcoin Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. @@ -102,7 +102,7 @@ constexpr OutputType DEFAULT_CHANGE_TYPE{OutputType::CHANGE_AUTO}; enum WalletFlags : uint64_t { // wallet flags in the upper section (> 1 << 31) will lead to not opening the wallet if flag is unknown - // unkown wallet flags in the lower section <= (1 << 31) will be tolerated + // unknown wallet flags in the lower section <= (1 << 31) will be tolerated // will enforce the rule that the wallet can't contain any private keys (only watch-only/pubkeys) WALLET_FLAG_DISABLE_PRIVATE_KEYS = (1ULL << 32), @@ -276,7 +276,7 @@ public: }; //Get the marginal bytes of spending the specified output -int CalculateMaximumSignedInputSize(const CTxOut& txout, const CWallet* pwallet); +int CalculateMaximumSignedInputSize(const CTxOut& txout, const CWallet* pwallet, bool use_max_sig = false); /** * A transaction with a bunch of additional info that only the owner cares about. @@ -461,9 +461,9 @@ public: CAmount GetChange() const; // Get the marginal bytes if spending the specified output from this transaction - int GetSpendSize(unsigned int out) const + int GetSpendSize(unsigned int out, bool use_max_sig = false) const { - return CalculateMaximumSignedInputSize(tx->vout[out], pwallet); + return CalculateMaximumSignedInputSize(tx->vout[out], pwallet, use_max_sig); } void GetAmounts(std::list<COutputEntry>& listReceived, @@ -507,6 +507,9 @@ public: /** Whether we know how to spend this output, ignoring the lack of keys */ bool fSolvable; + /** Whether to use the maximum sized, 72 byte signature when calculating the size of the input spend. This should only be set when watch-only outputs are allowed */ + bool use_max_sig; + /** * Whether this output is considered safe to spend. Unconfirmed transactions * from outside keys and unconfirmed replacement transactions are considered @@ -514,13 +517,13 @@ public: */ bool fSafe; - COutput(const CWalletTx *txIn, int iIn, int nDepthIn, bool fSpendableIn, bool fSolvableIn, bool fSafeIn) + COutput(const CWalletTx *txIn, int iIn, int nDepthIn, bool fSpendableIn, bool fSolvableIn, bool fSafeIn, bool use_max_sig_in = false) { - tx = txIn; i = iIn; nDepth = nDepthIn; fSpendable = fSpendableIn; fSolvable = fSolvableIn; fSafe = fSafeIn; nInputBytes = -1; + tx = txIn; i = iIn; nDepth = nDepthIn; fSpendable = fSpendableIn; fSolvable = fSolvableIn; fSafe = fSafeIn; nInputBytes = -1; use_max_sig = use_max_sig_in; // If known and signable by the given wallet, compute nInputBytes // Failure will keep this value -1 if (fSpendable && tx) { - nInputBytes = tx->GetSpendSize(i); + nInputBytes = tx->GetSpendSize(i, use_max_sig); } } @@ -976,14 +979,14 @@ public: void ListAccountCreditDebit(const std::string& strAccount, std::list<CAccountingEntry>& entries); bool AddAccountingEntry(const CAccountingEntry&); bool AddAccountingEntry(const CAccountingEntry&, WalletBatch *batch); - bool DummySignTx(CMutableTransaction &txNew, const std::set<CTxOut> &txouts) const + bool DummySignTx(CMutableTransaction &txNew, const std::set<CTxOut> &txouts, bool use_max_sig = false) const { std::vector<CTxOut> v_txouts(txouts.size()); std::copy(txouts.begin(), txouts.end(), v_txouts.begin()); - return DummySignTx(txNew, v_txouts); + return DummySignTx(txNew, v_txouts, use_max_sig); } - bool DummySignTx(CMutableTransaction &txNew, const std::vector<CTxOut> &txouts) const; - bool DummySignInput(CTxIn &tx_in, const CTxOut &txout) const; + bool DummySignTx(CMutableTransaction &txNew, const std::vector<CTxOut> &txouts, bool use_max_sig = false) const; + bool DummySignInput(CTxIn &tx_in, const CTxOut &txout, bool use_max_sig = false) const; CFeeRate m_pay_tx_fee{DEFAULT_PAY_TX_FEE}; unsigned int m_confirm_target{DEFAULT_TX_CONFIRM_TARGET}; @@ -1195,6 +1198,19 @@ public: /** overwrite all flags by the given uint64_t returns false if unknown, non-tolerable flags are present */ bool SetWalletFlags(uint64_t overwriteFlags, bool memOnly); + + /** Returns a bracketed wallet name for displaying in logs, will return [default wallet] if the wallet has no name */ + const std::string GetDisplayName() const { + std::string wallet_name = GetName().length() == 0 ? "default wallet" : GetName(); + return strprintf("[%s]", wallet_name); + }; + + /** Prepends the wallet name in logging output to ease debugging in multi-wallet use cases */ + template<typename... Params> + void WalletLogPrintf(std::string fmt, Params... parameters) const { + LogPrintf(("%s " + fmt).c_str(), GetDisplayName(), parameters...); + }; + }; /** A key allocated from the key pool. */ @@ -1295,9 +1311,9 @@ public: }; // Calculate the size of the transaction assuming all signatures are max size -// Use DummySignatureCreator, which inserts 72 byte signatures everywhere. +// Use DummySignatureCreator, which inserts 71 byte signatures everywhere. // NOTE: this requires that all inputs must be in mapWallet (eg the tx should // be IsAllFromMe). -int64_t CalculateMaximumSignedTxSize(const CTransaction &tx, const CWallet *wallet); -int64_t CalculateMaximumSignedTxSize(const CTransaction &tx, const CWallet *wallet, const std::vector<CTxOut>& txouts); +int64_t CalculateMaximumSignedTxSize(const CTransaction &tx, const CWallet *wallet, bool use_max_sig = false); +int64_t CalculateMaximumSignedTxSize(const CTransaction &tx, const CWallet *wallet, const std::vector<CTxOut>& txouts, bool use_max_sig = false); #endif // BITCOIN_WALLET_WALLET_H diff --git a/src/wallet/walletdb.cpp b/src/wallet/walletdb.cpp index 43e4747317..15c5b82c52 100644 --- a/src/wallet/walletdb.cpp +++ b/src/wallet/walletdb.cpp @@ -1,5 +1,5 @@ // Copyright (c) 2009-2010 Satoshi Nakamoto -// Copyright (c) 2009-2017 The Bitcoin Core developers +// Copyright (c) 2009-2018 The Bitcoin Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. @@ -545,7 +545,7 @@ DBErrors WalletBatch::LoadWallet(CWallet* pwallet) Dbc* pcursor = m_batch.GetCursor(); if (!pcursor) { - LogPrintf("Error getting wallet database cursor\n"); + pwallet->WalletLogPrintf("Error getting wallet database cursor\n"); return DBErrors::CORRUPT; } @@ -559,7 +559,7 @@ DBErrors WalletBatch::LoadWallet(CWallet* pwallet) break; else if (ret != 0) { - LogPrintf("Error reading next record from wallet database\n"); + pwallet->WalletLogPrintf("Error reading next record from wallet database\n"); return DBErrors::CORRUPT; } @@ -583,7 +583,7 @@ DBErrors WalletBatch::LoadWallet(CWallet* pwallet) } } if (!strErr.empty()) - LogPrintf("%s\n", strErr); + pwallet->WalletLogPrintf("%s\n", strErr); } pcursor->close(); } @@ -602,9 +602,9 @@ DBErrors WalletBatch::LoadWallet(CWallet* pwallet) if (result != DBErrors::LOAD_OK) return result; - LogPrintf("nFileVersion = %d\n", wss.nFileVersion); + pwallet->WalletLogPrintf("nFileVersion = %d\n", wss.nFileVersion); - LogPrintf("Keys: %u plaintext, %u encrypted, %u w/ metadata, %u total. Unknown wallet records: %u\n", + pwallet->WalletLogPrintf("Keys: %u plaintext, %u encrypted, %u w/ metadata, %u total. Unknown wallet records: %u\n", wss.nKeys, wss.nCKeys, wss.nKeyMeta, wss.nKeys + wss.nCKeys, wss.m_unknown_records); // nTimeFirstKey is only reliable if all keys have metadata diff --git a/src/wallet/walletdb.h b/src/wallet/walletdb.h index 674d1c2201..0e6cb1bba4 100644 --- a/src/wallet/walletdb.h +++ b/src/wallet/walletdb.h @@ -1,5 +1,5 @@ // Copyright (c) 2009-2010 Satoshi Nakamoto -// Copyright (c) 2009-2017 The Bitcoin Core developers +// Copyright (c) 2009-2018 The Bitcoin Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/wallet/walletutil.cpp b/src/wallet/walletutil.cpp index 7c97b668ae..34c76ec4c4 100644 --- a/src/wallet/walletutil.cpp +++ b/src/wallet/walletutil.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017 The Bitcoin Core developers +// Copyright (c) 2017-2018 The Bitcoin Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/wallet/walletutil.h b/src/wallet/walletutil.h index f12acacd00..7c42954616 100644 --- a/src/wallet/walletutil.h +++ b/src/wallet/walletutil.h @@ -1,4 +1,4 @@ -// Copyright (c) 2017 The Bitcoin Core developers +// Copyright (c) 2017-2018 The Bitcoin Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/walletinitinterface.h b/src/walletinitinterface.h index 020d8971cb..e955816162 100644 --- a/src/walletinitinterface.h +++ b/src/walletinitinterface.h @@ -1,4 +1,4 @@ -// Copyright (c) 2017 The Bitcoin Core developers +// Copyright (c) 2017-2018 The Bitcoin Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/warnings.cpp b/src/warnings.cpp index 534745f998..9f10c48eef 100644 --- a/src/warnings.cpp +++ b/src/warnings.cpp @@ -1,5 +1,5 @@ // Copyright (c) 2009-2010 Satoshi Nakamoto -// Copyright (c) 2009-2017 The Bitcoin Core developers +// Copyright (c) 2009-2018 The Bitcoin Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/warnings.h b/src/warnings.h index 904e8c0440..16c8f7b52e 100644 --- a/src/warnings.h +++ b/src/warnings.h @@ -1,5 +1,5 @@ // Copyright (c) 2009-2010 Satoshi Nakamoto -// Copyright (c) 2009-2017 The Bitcoin Core developers +// Copyright (c) 2009-2018 The Bitcoin Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. @@ -14,10 +14,10 @@ void SetfLargeWorkForkFound(bool flag); bool GetfLargeWorkForkFound(); void SetfLargeWorkInvalidChainFound(bool flag); /** Format a string that describes several potential problems detected by the core. - * strFor can have three values: - * - "statusbar": get all warnings - * - "gui": get all warnings, translated (where possible) for GUI - * This function only returns the highest priority warning of the set selected by strFor. + * @param[in] strFor can have the following values: + * - "statusbar": get the most important warning + * - "gui": get all warnings, translated (where possible) for GUI, separated by <hr /> + * @returns the warning string selected by strFor */ std::string GetWarnings(const std::string& strFor); diff --git a/src/zmq/zmqabstractnotifier.cpp b/src/zmq/zmqabstractnotifier.cpp index fc1ff6d031..39cc8968d2 100644 --- a/src/zmq/zmqabstractnotifier.cpp +++ b/src/zmq/zmqabstractnotifier.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2015-2017 The Bitcoin Core developers +// Copyright (c) 2015-2018 The Bitcoin Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/zmq/zmqabstractnotifier.h b/src/zmq/zmqabstractnotifier.h index 7270ae203b..5081c6cd02 100644 --- a/src/zmq/zmqabstractnotifier.h +++ b/src/zmq/zmqabstractnotifier.h @@ -1,4 +1,4 @@ -// Copyright (c) 2015-2017 The Bitcoin Core developers +// Copyright (c) 2015-2018 The Bitcoin Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/zmq/zmqconfig.h b/src/zmq/zmqconfig.h index 1ba1262a83..5219ffad40 100644 --- a/src/zmq/zmqconfig.h +++ b/src/zmq/zmqconfig.h @@ -1,4 +1,4 @@ -// Copyright (c) 2014-2017 The Bitcoin Core developers +// Copyright (c) 2014-2018 The Bitcoin Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/zmq/zmqpublishnotifier.cpp b/src/zmq/zmqpublishnotifier.cpp index 8c9acef257..36a6458f67 100644 --- a/src/zmq/zmqpublishnotifier.cpp +++ b/src/zmq/zmqpublishnotifier.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2015-2017 The Bitcoin Core developers +// Copyright (c) 2015-2018 The Bitcoin Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/zmq/zmqpublishnotifier.h b/src/zmq/zmqpublishnotifier.h index d53bba9971..0f5b43d726 100644 --- a/src/zmq/zmqpublishnotifier.h +++ b/src/zmq/zmqpublishnotifier.h @@ -1,4 +1,4 @@ -// Copyright (c) 2015-2017 The Bitcoin Core developers +// Copyright (c) 2015-2018 The Bitcoin Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/test/functional/create_cache.py b/test/functional/create_cache.py index 9665c50a92..edf16fa47e 100755 --- a/test/functional/create_cache.py +++ b/test/functional/create_cache.py @@ -1,5 +1,5 @@ #!/usr/bin/env python3 -# Copyright (c) 2016-2017 The Bitcoin Core developers +# Copyright (c) 2016-2018 The Bitcoin Core developers # Distributed under the MIT software license, see the accompanying # file COPYING or http://www.opensource.org/licenses/mit-license.php. """Create a blockchain cache. diff --git a/test/functional/data/rpc_getblockstats.json b/test/functional/data/rpc_getblockstats.json index 750abc5c42..b8cabe1e5e 100644 --- a/test/functional/data/rpc_getblockstats.json +++ b/test/functional/data/rpc_getblockstats.json @@ -112,13 +112,19 @@ "avgfeerate": 0, "avgtxsize": 0, "blockhash": "1d7fe80f19d28b8e712af0399ac84006db753441f3033111b3a8d610afab364f", + "feerate_percentiles": [ + 0, + 0, + 0, + 0, + 0 + ], "height": 101, "ins": 0, "maxfee": 0, "maxfeerate": 0, "maxtxsize": 0, "medianfee": 0, - "medianfeerate": 0, "mediantime": 1525107242, "mediantxsize": 0, "minfee": 0, @@ -144,12 +150,18 @@ "avgtxsize": 187, "blockhash": "4e21a43675d7a41cb6b944e068c5bcd0a677baf658d9ebe021ae2d2f99397ccc", "height": 102, + "feerate_percentiles": [ + 20, + 20, + 20, + 20, + 20 + ], "ins": 1, "maxfee": 3760, "maxfeerate": 20, "maxtxsize": 187, "medianfee": 3760, - "medianfeerate": 20, "mediantime": 1525107242, "mediantxsize": 187, "minfee": 3760, @@ -174,13 +186,19 @@ "avgfeerate": 109, "avgtxsize": 228, "blockhash": "22d9b8b9c2a37c81515f3fc84f7241f6c07dbcea85ef16b00bcc33ae400a030f", + "feerate_percentiles": [ + 20, + 20, + 20, + 300, + 300 + ], "height": 103, "ins": 3, "maxfee": 49800, "maxfeerate": 300, "maxtxsize": 248, "medianfee": 3760, - "medianfeerate": 20, "mediantime": 1525107243, "mediantxsize": 248, "minfee": 3320, diff --git a/test/functional/data/rpc_psbt.json b/test/functional/data/rpc_psbt.json index 4e2f08f274..9f970b4961 100644 --- a/test/functional/data/rpc_psbt.json +++ b/test/functional/data/rpc_psbt.json @@ -24,7 +24,8 @@ "cHNidP8BAKACAAAAAqsJSaCMWvfEm4IS9Bfi8Vqz9cM9zxU4IagTn4d6W3vkAAAAAAD+////qwlJoIxa98SbghL0F+LxWrP1wz3PFTghqBOfh3pbe+QBAAAAAP7///8CYDvqCwAAAAAZdqkUdopAu9dAy+gdmI5x3ipNXHE5ax2IrI4kAAAAAAAAGXapFG9GILVT+glechue4O/p+gOcykWXiKwAAAAAAAEHakcwRAIgR1lmF5fAGwNrJZKJSGhiGDR9iYZLcZ4ff89X0eURZYcCIFMJ6r9Wqk2Ikf/REf3xM286KdqGbX+EhtdVRs7tr5MZASEDXNxh/HupccC1AaZGoqg7ECy0OIEhfKaC3Ibi1z+ogpIAAQEgAOH1BQAAAAAXqRQ1RebjO4MsRwUPJNPuuTycA5SLx4cBBBYAFIXRNTfy4mVAWjTbr6nj3aAfuCMIAAAA", "cHNidP8BAHUCAAAAASaBcTce3/KF6Tet7qSze3gADAVmy7OtZGQXE8pCFxv2AAAAAAD+////AtPf9QUAAAAAGXapFNDFmQPFusKGh2DpD9UhpGZap2UgiKwA4fUFAAAAABepFDVF5uM7gyxHBQ8k0+65PJwDlIvHh7MuEwAAAQD9pQEBAAAAAAECiaPHHqtNIOA3G7ukzGmPopXJRjr6Ljl/hTPMti+VZ+UBAAAAFxYAFL4Y0VKpsBIDna89p95PUzSe7LmF/////4b4qkOnHf8USIk6UwpyN+9rRgi7st0tAXHmOuxqSJC0AQAAABcWABT+Pp7xp0XpdNkCxDVZQ6vLNL1TU/////8CAMLrCwAAAAAZdqkUhc/xCX/Z4Ai7NK9wnGIZeziXikiIrHL++E4sAAAAF6kUM5cluiHv1irHU6m80GfWx6ajnQWHAkcwRAIgJxK+IuAnDzlPVoMR3HyppolwuAJf3TskAinwf4pfOiQCIAGLONfc0xTnNMkna9b7QPZzMlvEuqFEyADS8vAtsnZcASED0uFWdJQbrUqZY3LLh+GFbTZSYG2YVi/jnF6efkE/IQUCSDBFAiEA0SuFLYXc2WHS9fSrZgZU327tzHlMDDPOXMMJ/7X85Y0CIGczio4OFyXBl/saiK9Z9R5E5CVbIBZ8hoQDHAXR8lkqASECI7cr7vCWXRC+B3jv7NYfysb3mk6haTkzgHNEZPhPKrMAAAAAAQMEAQAAAAAAAA==", "cHNidP8BAKACAAAAAqsJSaCMWvfEm4IS9Bfi8Vqz9cM9zxU4IagTn4d6W3vkAAAAAAD+////qwlJoIxa98SbghL0F+LxWrP1wz3PFTghqBOfh3pbe+QBAAAAAP7///8CYDvqCwAAAAAZdqkUdopAu9dAy+gdmI5x3ipNXHE5ax2IrI4kAAAAAAAAGXapFG9GILVT+glechue4O/p+gOcykWXiKwAAAAAAAEA3wIAAAABJoFxNx7f8oXpN63upLN7eAAMBWbLs61kZBcTykIXG/YAAAAAakcwRAIgcLIkUSPmv0dNYMW1DAQ9TGkaXSQ18Jo0p2YqncJReQoCIAEynKnazygL3zB0DsA5BCJCLIHLRYOUV663b8Eu3ZWzASECZX0RjTNXuOD0ws1G23s59tnDjZpwq8ubLeXcjb/kzjH+////AtPf9QUAAAAAGXapFNDFmQPFusKGh2DpD9UhpGZap2UgiKwA4fUFAAAAABepFDVF5uM7gyxHBQ8k0+65PJwDlIvHh7MuEwAAAQEgAOH1BQAAAAAXqRQ1RebjO4MsRwUPJNPuuTycA5SLx4cBBBYAFIXRNTfy4mVAWjTbr6nj3aAfuCMIACICAurVlmh8qAYEPtw94RbN8p1eklfBls0FXPaYyNAr8k6ZELSmumcAAACAAAAAgAIAAIAAIgIDlPYr6d8ZlSxVh3aK63aYBhrSxKJciU9H2MFitNchPQUQtKa6ZwAAAIABAACAAgAAgAA=", - "cHNidP8BAFUCAAAAASeaIyOl37UfxF8iD6WLD8E+HjNCeSqF1+Ns1jM7XLw5AAAAAAD/////AaBa6gsAAAAAGXapFP/pwAYQl8w7Y28ssEYPpPxCfStFiKwAAAAAAAEBIJVe6gsAAAAAF6kUY0UgD2jRieGtwN8cTRbqjxTA2+uHIgIDsTQcy6doO2r08SOM1ul+cWfVafrEfx5I1HVBhENVvUZGMEMCIAQktY7/qqaU4VWepck7v9SokGQiQFXN8HC2dxRpRC0HAh9cjrD+plFtYLisszrWTt5g6Hhb+zqpS5m9+GFR25qaAQEEIgAgdx/RitRZZm3Unz1WTj28QvTIR3TjYK2haBao7UiNVoEBBUdSIQOxNBzLp2g7avTxI4zW6X5xZ9Vp+sR/HkjUdUGEQ1W9RiED3lXR4drIBeP4pYwfv5uUwC89uq/hJ/78pJlfJvggg71SriIGA7E0HMunaDtq9PEjjNbpfnFn1Wn6xH8eSNR1QYRDVb1GELSmumcAAACAAAAAgAQAAIAiBgPeVdHh2sgF4/iljB+/m5TALz26r+En/vykmV8m+CCDvRC0prpnAAAAgAAAAIAFAACAAAA=" + "cHNidP8BAFUCAAAAASeaIyOl37UfxF8iD6WLD8E+HjNCeSqF1+Ns1jM7XLw5AAAAAAD/////AaBa6gsAAAAAGXapFP/pwAYQl8w7Y28ssEYPpPxCfStFiKwAAAAAAAEBIJVe6gsAAAAAF6kUY0UgD2jRieGtwN8cTRbqjxTA2+uHIgIDsTQcy6doO2r08SOM1ul+cWfVafrEfx5I1HVBhENVvUZGMEMCIAQktY7/qqaU4VWepck7v9SokGQiQFXN8HC2dxRpRC0HAh9cjrD+plFtYLisszrWTt5g6Hhb+zqpS5m9+GFR25qaAQEEIgAgdx/RitRZZm3Unz1WTj28QvTIR3TjYK2haBao7UiNVoEBBUdSIQOxNBzLp2g7avTxI4zW6X5xZ9Vp+sR/HkjUdUGEQ1W9RiED3lXR4drIBeP4pYwfv5uUwC89uq/hJ/78pJlfJvggg71SriIGA7E0HMunaDtq9PEjjNbpfnFn1Wn6xH8eSNR1QYRDVb1GELSmumcAAACAAAAAgAQAAIAiBgPeVdHh2sgF4/iljB+/m5TALz26r+En/vykmV8m+CCDvRC0prpnAAAAgAAAAIAFAACAAAA=", + "cHNidP8BACoCAAAAAAFAQg8AAAAAABepFG6Rty1Vk+fUOR4v9E6R6YXDFkHwhwAAAAAAAA==" ], "creator" : [ { @@ -64,16 +65,55 @@ "cNBc3SWUip9PPm1GjRoLEJT6T41iNzCYtD7qro84FMnM5zEqeJsE" ], "psbt" : "cHNidP8BAJoCAAAAAljoeiG1ba8MI76OcHBFbDNvfLqlyHV5JPVFiHuyq911AAAAAAD/////g40EJ9DsZQpoqka7CwmK6kQiwHGyyng1Kgd5WdB86h0BAAAAAP////8CcKrwCAAAAAAWABTYXCtx0AYLCcmIauuBXlCZHdoSTQDh9QUAAAAAFgAUAK6pouXw+HaliN9VRuh0LR2HAI8AAAAAAAEAuwIAAAABqtc5MQGL0l+ErkALaISL4J23BurCrBgpi6vucatlb4sAAAAASEcwRAIgWPb8fGoz4bMVSNSByCbAFb0wE1qtQs1neQ2rZtKtJDsCIEoc7SYExnNbY5PltBaR3XiwDwxZQvufdRhW+qk4FX26Af7///8CgPD6AgAAAAAXqRQPuUY0IWlrgsgzryQceMF9295JNIfQ8gonAQAAABepFCnKdPigj4GZlCgYXJe12FLkBj9hh2UAAAABBEdSIQKVg785rgpgl0etGZrd1jT6YQhVnWxc05tMIYPxq5bgfyEC2rYf9JoU22p9ArDNH7t4/EsYMStbTlTa5Nui+/71NtdSriIGApWDvzmuCmCXR60Zmt3WNPphCFWdbFzTm0whg/GrluB/ENkMak8AAACAAAAAgAAAAIAiBgLath/0mhTban0CsM0fu3j8SxgxK1tOVNrk26L7/vU21xDZDGpPAAAAgAAAAIABAACAAQMEAQAAAAABASAAwusLAAAAABepFLf1+vQOPUClpFmx2zU18rcvqSHohwEEIgAgjCNTFzdDtZXftKB7crqOQuN5fadOh/59nXSX47ICiQMBBUdSIQMIncEMesbbVPkTKa9hczPbOIzq0MIx9yM3nRuZAwsC3CECOt2QTz1tz1nduQaw3uI1Kbf/ue1Q5ehhUZJoYCIfDnNSriIGAjrdkE89bc9Z3bkGsN7iNSm3/7ntUOXoYVGSaGAiHw5zENkMak8AAACAAAAAgAMAAIAiBgMIncEMesbbVPkTKa9hczPbOIzq0MIx9yM3nRuZAwsC3BDZDGpPAAAAgAAAAIACAACAAQMEAQAAAAAiAgOppMN/WZbTqiXbrGtXCvBlA5RJKUJGCzVHU+2e7KWHcRDZDGpPAAAAgAAAAIAEAACAACICAn9jmXV9Lv9VoTatAsaEsYOLZVbl8bazQoKpS2tQBRCWENkMak8AAACAAAAAgAUAAIAA", - "result" : "cHNidP8BAJoCAAAAAljoeiG1ba8MI76OcHBFbDNvfLqlyHV5JPVFiHuyq911AAAAAAD/////g40EJ9DsZQpoqka7CwmK6kQiwHGyyng1Kgd5WdB86h0BAAAAAP////8CcKrwCAAAAAAWABTYXCtx0AYLCcmIauuBXlCZHdoSTQDh9QUAAAAAFgAUAK6pouXw+HaliN9VRuh0LR2HAI8AAAAAAAEAuwIAAAABqtc5MQGL0l+ErkALaISL4J23BurCrBgpi6vucatlb4sAAAAASEcwRAIgWPb8fGoz4bMVSNSByCbAFb0wE1qtQs1neQ2rZtKtJDsCIEoc7SYExnNbY5PltBaR3XiwDwxZQvufdRhW+qk4FX26Af7///8CgPD6AgAAAAAXqRQPuUY0IWlrgsgzryQceMF9295JNIfQ8gonAQAAABepFCnKdPigj4GZlCgYXJe12FLkBj9hh2UAAAAiAgLath/0mhTban0CsM0fu3j8SxgxK1tOVNrk26L7/vU210gwRQIhAPYQOLMI3B2oZaNIUnRvAVdyk0IIxtJEVDk82ZvfIhd3AiAFbmdaZ1ptCgK4WxTl4pB02KJam1dgvqKBb2YZEKAG6gEBAwQBAAAAAQRHUiEClYO/Oa4KYJdHrRma3dY0+mEIVZ1sXNObTCGD8auW4H8hAtq2H/SaFNtqfQKwzR+7ePxLGDErW05U2uTbovv+9TbXUq4iBgKVg785rgpgl0etGZrd1jT6YQhVnWxc05tMIYPxq5bgfxDZDGpPAAAAgAAAAIAAAACAIgYC2rYf9JoU22p9ArDNH7t4/EsYMStbTlTa5Nui+/71NtcQ2QxqTwAAAIAAAACAAQAAgAABASAAwusLAAAAABepFLf1+vQOPUClpFmx2zU18rcvqSHohyICAjrdkE89bc9Z3bkGsN7iNSm3/7ntUOXoYVGSaGAiHw5zRzBEAiBl9FulmYtZon/+GnvtAWrx8fkNVLOqj3RQql9WolEDvQIgf3JHA60e25ZoCyhLVtT/y4j3+3Weq74IqjDym4UTg9IBAQMEAQAAAAEEIgAgjCNTFzdDtZXftKB7crqOQuN5fadOh/59nXSX47ICiQMBBUdSIQMIncEMesbbVPkTKa9hczPbOIzq0MIx9yM3nRuZAwsC3CECOt2QTz1tz1nduQaw3uI1Kbf/ue1Q5ehhUZJoYCIfDnNSriIGAjrdkE89bc9Z3bkGsN7iNSm3/7ntUOXoYVGSaGAiHw5zENkMak8AAACAAAAAgAMAAIAiBgMIncEMesbbVPkTKa9hczPbOIzq0MIx9yM3nRuZAwsC3BDZDGpPAAAAgAAAAIACAACAACICA6mkw39ZltOqJdusa1cK8GUDlEkpQkYLNUdT7Z7spYdxENkMak8AAACAAAAAgAQAAIAAIgICf2OZdX0u/1WhNq0CxoSxg4tlVuXxtrNCgqlLa1AFEJYQ2QxqTwAAAIAAAACABQAAgAA=" + "result" : "cHNidP8BAJoCAAAAAljoeiG1ba8MI76OcHBFbDNvfLqlyHV5JPVFiHuyq911AAAAAAD/////g40EJ9DsZQpoqka7CwmK6kQiwHGyyng1Kgd5WdB86h0BAAAAAP////8CcKrwCAAAAAAWABTYXCtx0AYLCcmIauuBXlCZHdoSTQDh9QUAAAAAFgAUAK6pouXw+HaliN9VRuh0LR2HAI8AAAAAAAEAuwIAAAABqtc5MQGL0l+ErkALaISL4J23BurCrBgpi6vucatlb4sAAAAASEcwRAIgWPb8fGoz4bMVSNSByCbAFb0wE1qtQs1neQ2rZtKtJDsCIEoc7SYExnNbY5PltBaR3XiwDwxZQvufdRhW+qk4FX26Af7///8CgPD6AgAAAAAXqRQPuUY0IWlrgsgzryQceMF9295JNIfQ8gonAQAAABepFCnKdPigj4GZlCgYXJe12FLkBj9hh2UAAAAiAgLath/0mhTban0CsM0fu3j8SxgxK1tOVNrk26L7/vU210cwRAIgYxqYn+c4qSrQGYYCMxLBkhT+KAKznly8GsNniAbGksMCIDnbbDh70mdxbf2z1NjaULjoXSEzJrp8faqkwM5B65IjAQEDBAEAAAABBEdSIQKVg785rgpgl0etGZrd1jT6YQhVnWxc05tMIYPxq5bgfyEC2rYf9JoU22p9ArDNH7t4/EsYMStbTlTa5Nui+/71NtdSriIGApWDvzmuCmCXR60Zmt3WNPphCFWdbFzTm0whg/GrluB/ENkMak8AAACAAAAAgAAAAIAiBgLath/0mhTban0CsM0fu3j8SxgxK1tOVNrk26L7/vU21xDZDGpPAAAAgAAAAIABAACAAAEBIADC6wsAAAAAF6kUt/X69A49QKWkWbHbNTXyty+pIeiHIgICOt2QTz1tz1nduQaw3uI1Kbf/ue1Q5ehhUZJoYCIfDnNHMEQCIGX0W6WZi1mif/4ae+0BavHx+Q1Us6qPdFCqX1aiUQO9AiB/ckcDrR7blmgLKEtW1P/LiPf7dZ6rvgiqMPKbhROD0gEBAwQBAAAAAQQiACCMI1MXN0O1ld+0oHtyuo5C43l9p06H/n2ddJfjsgKJAwEFR1IhAwidwQx6xttU+RMpr2FzM9s4jOrQwjH3IzedG5kDCwLcIQI63ZBPPW3PWd25BrDe4jUpt/+57VDl6GFRkmhgIh8Oc1KuIgYCOt2QTz1tz1nduQaw3uI1Kbf/ue1Q5ehhUZJoYCIfDnMQ2QxqTwAAAIAAAACAAwAAgCIGAwidwQx6xttU+RMpr2FzM9s4jOrQwjH3IzedG5kDCwLcENkMak8AAACAAAAAgAIAAIAAIgIDqaTDf1mW06ol26xrVwrwZQOUSSlCRgs1R1Ptnuylh3EQ2QxqTwAAAIAAAACABAAAgAAiAgJ/Y5l1fS7/VaE2rQLGhLGDi2VW5fG2s0KCqUtrUAUQlhDZDGpPAAAAgAAAAIAFAACAAA==" + }, + { + "privkeys" : [ + "cT7J9YpCwY3AVRFSjN6ukeEeWY6mhpbJPxRaDaP5QTdygQRxP9Au", + "cNBc3SWUip9PPm1GjRoLEJT6T41iNzCYtD7qro84FMnM5zEqeJsE" + ], + "psbt" : "cHNidP8BAJoCAAAAAljoeiG1ba8MI76OcHBFbDNvfLqlyHV5JPVFiHuyq911AAAAAAD/////g40EJ9DsZQpoqka7CwmK6kQiwHGyyng1Kgd5WdB86h0BAAAAAP////8CcKrwCAAAAAAWABTYXCtx0AYLCcmIauuBXlCZHdoSTQDh9QUAAAAAFgAUAK6pouXw+HaliN9VRuh0LR2HAI8AAAAAAAEAuwIAAAABqtc5MQGL0l+ErkALaISL4J23BurCrBgpi6vucatlb4sAAAAASEcwRAIgWPb8fGoz4bMVSNSByCbAFb0wE1qtQs1neQ2rZtKtJDsCIEoc7SYExnNbY5PltBaR3XiwDwxZQvufdRhW+qk4FX26Af7///8CgPD6AgAAAAAXqRQPuUY0IWlrgsgzryQceMF9295JNIfQ8gonAQAAABepFCnKdPigj4GZlCgYXJe12FLkBj9hh2UAAAABBEdSIQKVg785rgpgl0etGZrd1jT6YQhVnWxc05tMIYPxq5bgfyEC2rYf9JoU22p9ArDNH7t4/EsYMStbTlTa5Nui+/71NtdSriIGApWDvzmuCmCXR60Zmt3WNPphCFWdbFzTm0whg/GrluB/ENkMak8AAACAAAAAgAAAAIAiBgLath/0mhTban0CsM0fu3j8SxgxK1tOVNrk26L7/vU21xDZDGpPAAAAgAAAAIABAACAAQMEAQAAAAABASAAwusLAAAAABepFLf1+vQOPUClpFmx2zU18rcvqSHohwEEIgAgjCNTFzdDtZXftKB7crqOQuN5fadOh/59nXSX47ICiQMBBUdSIQMIncEMesbbVPkTKa9hczPbOIzq0MIx9yM3nRuZAwsC3CECOt2QTz1tz1nduQaw3uI1Kbf/ue1Q5ehhUZJoYCIfDnNSriIGAjrdkE89bc9Z3bkGsN7iNSm3/7ntUOXoYVGSaGAiHw5zENkMak8AAACAAAAAgAMAAIAiBgMIncEMesbbVPkTKa9hczPbOIzq0MIx9yM3nRuZAwsC3BDZDGpPAAAAgAAAAIACAACAAQMEAQAAAAAiAgOppMN/WZbTqiXbrGtXCvBlA5RJKUJGCzVHU+2e7KWHcRDZDGpPAAAAgAAAAIAEAACAACICAn9jmXV9Lv9VoTatAsaEsYOLZVbl8bazQoKpS2tQBRCWENkMak8AAACAAAAAgAUAAIAA", + "result" : "cHNidP8BAJoCAAAAAljoeiG1ba8MI76OcHBFbDNvfLqlyHV5JPVFiHuyq911AAAAAAD/////g40EJ9DsZQpoqka7CwmK6kQiwHGyyng1Kgd5WdB86h0BAAAAAP////8CcKrwCAAAAAAWABTYXCtx0AYLCcmIauuBXlCZHdoSTQDh9QUAAAAAFgAUAK6pouXw+HaliN9VRuh0LR2HAI8AAAAAAAEAuwIAAAABqtc5MQGL0l+ErkALaISL4J23BurCrBgpi6vucatlb4sAAAAASEcwRAIgWPb8fGoz4bMVSNSByCbAFb0wE1qtQs1neQ2rZtKtJDsCIEoc7SYExnNbY5PltBaR3XiwDwxZQvufdRhW+qk4FX26Af7///8CgPD6AgAAAAAXqRQPuUY0IWlrgsgzryQceMF9295JNIfQ8gonAQAAABepFCnKdPigj4GZlCgYXJe12FLkBj9hh2UAAAAiAgLath/0mhTban0CsM0fu3j8SxgxK1tOVNrk26L7/vU210cwRAIgYxqYn+c4qSrQGYYCMxLBkhT+KAKznly8GsNniAbGksMCIDnbbDh70mdxbf2z1NjaULjoXSEzJrp8faqkwM5B65IjAQEDBAEAAAABBEdSIQKVg785rgpgl0etGZrd1jT6YQhVnWxc05tMIYPxq5bgfyEC2rYf9JoU22p9ArDNH7t4/EsYMStbTlTa5Nui+/71NtdSriIGApWDvzmuCmCXR60Zmt3WNPphCFWdbFzTm0whg/GrluB/ENkMak8AAACAAAAAgAAAAIAiBgLath/0mhTban0CsM0fu3j8SxgxK1tOVNrk26L7/vU21xDZDGpPAAAAgAAAAIABAACAAAEBIADC6wsAAAAAF6kUt/X69A49QKWkWbHbNTXyty+pIeiHIgICOt2QTz1tz1nduQaw3uI1Kbf/ue1Q5ehhUZJoYCIfDnNHMEQCIGX0W6WZi1mif/4ae+0BavHx+Q1Us6qPdFCqX1aiUQO9AiB/ckcDrR7blmgLKEtW1P/LiPf7dZ6rvgiqMPKbhROD0gEBAwQBAAAAAQQiACCMI1MXN0O1ld+0oHtyuo5C43l9p06H/n2ddJfjsgKJAwEFR1IhAwidwQx6xttU+RMpr2FzM9s4jOrQwjH3IzedG5kDCwLcIQI63ZBPPW3PWd25BrDe4jUpt/+57VDl6GFRkmhgIh8Oc1KuIgYCOt2QTz1tz1nduQaw3uI1Kbf/ue1Q5ehhUZJoYCIfDnMQ2QxqTwAAAIAAAACAAwAAgCIGAwidwQx6xttU+RMpr2FzM9s4jOrQwjH3IzedG5kDCwLcENkMak8AAACAAAAAgAIAAIAAIgIDqaTDf1mW06ol26xrVwrwZQOUSSlCRgs1R1Ptnuylh3EQ2QxqTwAAAIAAAACABAAAgAAiAgJ/Y5l1fS7/VaE2rQLGhLGDi2VW5fG2s0KCqUtrUAUQlhDZDGpPAAAAgAAAAIAFAACAAA==" + }, + { + "privkeys" : [ + "cNBc3SWUip9PPm1GjRoLEJT6T41iNzCYtD7qro84FMnM5zEqeJsE" + ], + "psbt" : "cHNidP8BAKACAAAAAqsJSaCMWvfEm4IS9Bfi8Vqz9cM9zxU4IagTn4d6W3vkAAAAAAD+////qwlJoIxa98SbghL0F+LxWrP1wz3PFTghqBOfh3pbe+QBAAAAAP7///8CYDvqCwAAAAAZdqkUdopAu9dAy+gdmI5x3ipNXHE5ax2IrI4kAAAAAAAAGXapFG9GILVT+glechue4O/p+gOcykWXiKwAAAAAAAEBItPf9QUAAAAAGXapFNSO0xELlAFMsRS9Mtb00GbcdCVriKwAAQEgAOH1BQAAAAAXqRQ1RebjO4MsRwUPJNPuuTycA5SLx4cBBBYAFIXRNTfy4mVAWjTbr6nj3aAfuCMIACICAurVlmh8qAYEPtw94RbN8p1eklfBls0FXPaYyNAr8k6ZELSmumcAAACAAAAAgAIAAIAAIgIDlPYr6d8ZlSxVh3aK63aYBhrSxKJciU9H2MFitNchPQUQtKa6ZwAAAIABAACAAgAAgAA=", + "result" : "cHNidP8BAKACAAAAAqsJSaCMWvfEm4IS9Bfi8Vqz9cM9zxU4IagTn4d6W3vkAAAAAAD+////qwlJoIxa98SbghL0F+LxWrP1wz3PFTghqBOfh3pbe+QBAAAAAP7///8CYDvqCwAAAAAZdqkUdopAu9dAy+gdmI5x3ipNXHE5ax2IrI4kAAAAAAAAGXapFG9GILVT+glechue4O/p+gOcykWXiKwAAAAAAAEBItPf9QUAAAAAGXapFNSO0xELlAFMsRS9Mtb00GbcdCVriKwAAQEgAOH1BQAAAAAXqRQ1RebjO4MsRwUPJNPuuTycA5SLx4cBBBYAFIXRNTfy4mVAWjTbr6nj3aAfuCMIACICAurVlmh8qAYEPtw94RbN8p1eklfBls0FXPaYyNAr8k6ZELSmumcAAACAAAAAgAIAAIAAIgIDlPYr6d8ZlSxVh3aK63aYBhrSxKJciU9H2MFitNchPQUQtKa6ZwAAAIABAACAAgAAgAA=" + }, + { + "privkeys" : [ + "cT7J9YpCwY3AVRFSjN6ukeEeWY6mhpbJPxRaDaP5QTdygQRxP9Au", + "cNBc3SWUip9PPm1GjRoLEJT6T41iNzCYtD7qro84FMnM5zEqeJsE" + ], + "psbt" : "cHNidP8BAJoCAAAAAljoeiG1ba8MI76OcHBFbDNvfLqlyHV5JPVFiHuyq911AAAAAAD/////g40EJ9DsZQpoqka7CwmK6kQiwHGyyng1Kgd5WdB86h0BAAAAAP////8CcKrwCAAAAAAWABTYXCtx0AYLCcmIauuBXlCZHdoSTQDh9QUAAAAAFgAUAK6pouXw+HaliN9VRuh0LR2HAI8AAAAAAAEAuwIAAAABqtc5MQGL0l+ErkALaISL4J23BurCrBgpi6vucatlb4sAAAAASEcwRAIgWPb8fGoz4bMVSNSByCbAFb0wE1qtQs1neQ2rZtKtJDsCIEoc7SYExnNbY5PltBaR3XiwDwxZQvufdRhW+qk4FX26Af7///8CgPD6AgAAAAAXqRQPuUY0IWlrgsgzryQceMF9295JNIfQ8gonAQAAABepFCnKdPigj4GZlCgYXJe12FLkBj9hh2UAAAAiAgLath/0mhTban0CsM0fu3j8SxgxK1tOVNrk26L7/vU210gwRQIhAPYQOLMI3B2oZaNIUnRvAVdyk0IIxtJEVDk82ZvfIhd3AiAFbmdaZ1ptCgK4WxTl4pB02KJam1dgvqKBb2YZEKAG6gEBAwQBAAAAAQRHUiEClYO/Oa4KYJdHrRma3dY0+mEIVZ1sXNObTCGD8auW4H8hAtq2H/SaFNtqfQKwzR+7ePxLGDErW05U2uTbovv+9TbXUq8iBgKVg785rgpgl0etGZrd1jT6YQhVnWxc05tMIYPxq5bgfxDZDGpPAAAAgAAAAIAAAACAIgYC2rYf9JoU22p9ArDNH7t4/EsYMStbTlTa5Nui+/71NtcQ2QxqTwAAAIAAAACAAQAAgAABASAAwusLAAAAABepFLf1+vQOPUClpFmx2zU18rcvqSHohyICAjrdkE89bc9Z3bkGsN7iNSm3/7ntUOXoYVGSaGAiHw5zRzBEAiBl9FulmYtZon/+GnvtAWrx8fkNVLOqj3RQql9WolEDvQIgf3JHA60e25ZoCyhLVtT/y4j3+3Weq74IqjDym4UTg9IBAQMEAQAAAAEEIgAgjCNTFzdDtZXftKB7crqOQuN5fadOh/59nXSX47ICiQMBBUdSIQMIncEMesbbVPkTKa9hczPbOIzq0MIx9yM3nRuZAwsC3CECOt2QTz1tz1nduQaw3uI1Kbf/ue1Q5ehhUZJoYCIfDnNSriIGAjrdkE89bc9Z3bkGsN7iNSm3/7ntUOXoYVGSaGAiHw5zENkMak8AAACAAAAAgAMAAIAiBgMIncEMesbbVPkTKa9hczPbOIzq0MIx9yM3nRuZAwsC3BDZDGpPAAAAgAAAAIACAACAACICA6mkw39ZltOqJdusa1cK8GUDlEkpQkYLNUdT7Z7spYdxENkMak8AAACAAAAAgAQAAIAAIgICf2OZdX0u/1WhNq0CxoSxg4tlVuXxtrNCgqlLa1AFEJYQ2QxqTwAAAIAAAACABQAAgAA=", + "result" : "cHNidP8BAJoCAAAAAljoeiG1ba8MI76OcHBFbDNvfLqlyHV5JPVFiHuyq911AAAAAAD/////g40EJ9DsZQpoqka7CwmK6kQiwHGyyng1Kgd5WdB86h0BAAAAAP////8CcKrwCAAAAAAWABTYXCtx0AYLCcmIauuBXlCZHdoSTQDh9QUAAAAAFgAUAK6pouXw+HaliN9VRuh0LR2HAI8AAAAAAAEAuwIAAAABqtc5MQGL0l+ErkALaISL4J23BurCrBgpi6vucatlb4sAAAAASEcwRAIgWPb8fGoz4bMVSNSByCbAFb0wE1qtQs1neQ2rZtKtJDsCIEoc7SYExnNbY5PltBaR3XiwDwxZQvufdRhW+qk4FX26Af7///8CgPD6AgAAAAAXqRQPuUY0IWlrgsgzryQceMF9295JNIfQ8gonAQAAABepFCnKdPigj4GZlCgYXJe12FLkBj9hh2UAAAAiAgLath/0mhTban0CsM0fu3j8SxgxK1tOVNrk26L7/vU210gwRQIhAPYQOLMI3B2oZaNIUnRvAVdyk0IIxtJEVDk82ZvfIhd3AiAFbmdaZ1ptCgK4WxTl4pB02KJam1dgvqKBb2YZEKAG6gEBAwQBAAAAAQRHUiEClYO/Oa4KYJdHrRma3dY0+mEIVZ1sXNObTCGD8auW4H8hAtq2H/SaFNtqfQKwzR+7ePxLGDErW05U2uTbovv+9TbXUq8iBgKVg785rgpgl0etGZrd1jT6YQhVnWxc05tMIYPxq5bgfxDZDGpPAAAAgAAAAIAAAACAIgYC2rYf9JoU22p9ArDNH7t4/EsYMStbTlTa5Nui+/71NtcQ2QxqTwAAAIAAAACAAQAAgAABASAAwusLAAAAABepFLf1+vQOPUClpFmx2zU18rcvqSHohyICAjrdkE89bc9Z3bkGsN7iNSm3/7ntUOXoYVGSaGAiHw5zRzBEAiBl9FulmYtZon/+GnvtAWrx8fkNVLOqj3RQql9WolEDvQIgf3JHA60e25ZoCyhLVtT/y4j3+3Weq74IqjDym4UTg9IBAQMEAQAAAAEEIgAgjCNTFzdDtZXftKB7crqOQuN5fadOh/59nXSX47ICiQMBBUdSIQMIncEMesbbVPkTKa9hczPbOIzq0MIx9yM3nRuZAwsC3CECOt2QTz1tz1nduQaw3uI1Kbf/ue1Q5ehhUZJoYCIfDnNSriIGAjrdkE89bc9Z3bkGsN7iNSm3/7ntUOXoYVGSaGAiHw5zENkMak8AAACAAAAAgAMAAIAiBgMIncEMesbbVPkTKa9hczPbOIzq0MIx9yM3nRuZAwsC3BDZDGpPAAAAgAAAAIACAACAACICA6mkw39ZltOqJdusa1cK8GUDlEkpQkYLNUdT7Z7spYdxENkMak8AAACAAAAAgAQAAIAAIgICf2OZdX0u/1WhNq0CxoSxg4tlVuXxtrNCgqlLa1AFEJYQ2QxqTwAAAIAAAACABQAAgAA=" + }, + { + "privkeys" : [ + "cT7J9YpCwY3AVRFSjN6ukeEeWY6mhpbJPxRaDaP5QTdygQRxP9Au", + "cNBc3SWUip9PPm1GjRoLEJT6T41iNzCYtD7qro84FMnM5zEqeJsE" + ], + "psbt" : "cHNidP8BAJoCAAAAAljoeiG1ba8MI76OcHBFbDNvfLqlyHV5JPVFiHuyq911AAAAAAD/////g40EJ9DsZQpoqka7CwmK6kQiwHGyyng1Kgd5WdB86h0BAAAAAP////8CcKrwCAAAAAAWABTYXCtx0AYLCcmIauuBXlCZHdoSTQDh9QUAAAAAFgAUAK6pouXw+HaliN9VRuh0LR2HAI8AAAAAAAEAuwIAAAABqtc5MQGL0l+ErkALaISL4J23BurCrBgpi6vucatlb4sAAAAASEcwRAIgWPb8fGoz4bMVSNSByCbAFb0wE1qtQs1neQ2rZtKtJDsCIEoc7SYExnNbY5PltBaR3XiwDwxZQvufdRhW+qk4FX26Af7///8CgPD6AgAAAAAXqRQPuUY0IWlrgsgzryQceMF9295JNIfQ8gonAQAAABepFCnKdPigj4GZlCgYXJe12FLkBj9hh2UAAAAiAgLath/0mhTban0CsM0fu3j8SxgxK1tOVNrk26L7/vU210gwRQIhAPYQOLMI3B2oZaNIUnRvAVdyk0IIxtJEVDk82ZvfIhd3AiAFbmdaZ1ptCgK4WxTl4pB02KJam1dgvqKBb2YZEKAG6gEBAwQBAAAAAQRHUiEClYO/Oa4KYJdHrRma3dY0+mEIVZ1sXNObTCGD8auW4H8hAtq2H/SaFNtqfQKwzR+7ePxLGDErW05U2uTbovv+9TbXUq4iBgKVg785rgpgl0etGZrd1jT6YQhVnWxc05tMIYPxq5bgfxDZDGpPAAAAgAAAAIAAAACAIgYC2rYf9JoU22p9ArDNH7t4/EsYMStbTlTa5Nui+/71NtcQ2QxqTwAAAIAAAACAAQAAgAABASAAwusLAAAAABepFLf1+vQOPUClpFmx2zU18rcvqSHohyICAjrdkE89bc9Z3bkGsN7iNSm3/7ntUOXoYVGSaGAiHw5zRzBEAiBl9FulmYtZon/+GnvtAWrx8fkNVLOqj3RQql9WolEDvQIgf3JHA60e25ZoCyhLVtT/y4j3+3Weq74IqjDym4UTg9IBAQMEAQAAAAEEIgAgjCNTFzdDtZXftKB7crqOQuN5fadOh/59nXSX47ICiQABBUdSIQMIncEMesbbVPkTKa9hczPbOIzq0MIx9yM3nRuZAwsC3CECOt2QTz1tz1nduQaw3uI1Kbf/ue1Q5ehhUZJoYCIfDnNSriIGAjrdkE89bc9Z3bkGsN7iNSm3/7ntUOXoYVGSaGAiHw5zENkMak8AAACAAAAAgAMAAIAiBgMIncEMesbbVPkTKa9hczPbOIzq0MIx9yM3nRuZAwsC3BDZDGpPAAAAgAAAAIACAACAACICA6mkw39ZltOqJdusa1cK8GUDlEkpQkYLNUdT7Z7spYdxENkMak8AAACAAAAAgAQAAIAAIgICf2OZdX0u/1WhNq0CxoSxg4tlVuXxtrNCgqlLa1AFEJYQ2QxqTwAAAIAAAACABQAAgAA=", + "result" : "cHNidP8BAJoCAAAAAljoeiG1ba8MI76OcHBFbDNvfLqlyHV5JPVFiHuyq911AAAAAAD/////g40EJ9DsZQpoqka7CwmK6kQiwHGyyng1Kgd5WdB86h0BAAAAAP////8CcKrwCAAAAAAWABTYXCtx0AYLCcmIauuBXlCZHdoSTQDh9QUAAAAAFgAUAK6pouXw+HaliN9VRuh0LR2HAI8AAAAAAAEAuwIAAAABqtc5MQGL0l+ErkALaISL4J23BurCrBgpi6vucatlb4sAAAAASEcwRAIgWPb8fGoz4bMVSNSByCbAFb0wE1qtQs1neQ2rZtKtJDsCIEoc7SYExnNbY5PltBaR3XiwDwxZQvufdRhW+qk4FX26Af7///8CgPD6AgAAAAAXqRQPuUY0IWlrgsgzryQceMF9295JNIfQ8gonAQAAABepFCnKdPigj4GZlCgYXJe12FLkBj9hh2UAAAAiAgLath/0mhTban0CsM0fu3j8SxgxK1tOVNrk26L7/vU210gwRQIhAPYQOLMI3B2oZaNIUnRvAVdyk0IIxtJEVDk82ZvfIhd3AiAFbmdaZ1ptCgK4WxTl4pB02KJam1dgvqKBb2YZEKAG6gEBAwQBAAAAAQRHUiEClYO/Oa4KYJdHrRma3dY0+mEIVZ1sXNObTCGD8auW4H8hAtq2H/SaFNtqfQKwzR+7ePxLGDErW05U2uTbovv+9TbXUq4iBgKVg785rgpgl0etGZrd1jT6YQhVnWxc05tMIYPxq5bgfxDZDGpPAAAAgAAAAIAAAACAIgYC2rYf9JoU22p9ArDNH7t4/EsYMStbTlTa5Nui+/71NtcQ2QxqTwAAAIAAAACAAQAAgAABASAAwusLAAAAABepFLf1+vQOPUClpFmx2zU18rcvqSHohyICAjrdkE89bc9Z3bkGsN7iNSm3/7ntUOXoYVGSaGAiHw5zRzBEAiBl9FulmYtZon/+GnvtAWrx8fkNVLOqj3RQql9WolEDvQIgf3JHA60e25ZoCyhLVtT/y4j3+3Weq74IqjDym4UTg9IBAQMEAQAAAAEEIgAgjCNTFzdDtZXftKB7crqOQuN5fadOh/59nXSX47ICiQABBUdSIQMIncEMesbbVPkTKa9hczPbOIzq0MIx9yM3nRuZAwsC3CECOt2QTz1tz1nduQaw3uI1Kbf/ue1Q5ehhUZJoYCIfDnNSriIGAjrdkE89bc9Z3bkGsN7iNSm3/7ntUOXoYVGSaGAiHw5zENkMak8AAACAAAAAgAMAAIAiBgMIncEMesbbVPkTKa9hczPbOIzq0MIx9yM3nRuZAwsC3BDZDGpPAAAAgAAAAIACAACAACICA6mkw39ZltOqJdusa1cK8GUDlEkpQkYLNUdT7Z7spYdxENkMak8AAACAAAAAgAQAAIAAIgICf2OZdX0u/1WhNq0CxoSxg4tlVuXxtrNCgqlLa1AFEJYQ2QxqTwAAAIAAAACABQAAgAA=" + }, + { + "privkeys" : [ + "cT7J9YpCwY3AVRFSjN6ukeEeWY6mhpbJPxRaDaP5QTdygQRxP9Au", + "cNBc3SWUip9PPm1GjRoLEJT6T41iNzCYtD7qro84FMnM5zEqeJsE" + ], + "psbt" : "cHNidP8BAJoCAAAAAljoeiG1ba8MI76OcHBFbDNvfLqlyHV5JPVFiHuyq911AAAAAAD/////g40EJ9DsZQpoqka7CwmK6kQiwHGyyng1Kgd5WdB86h0BAAAAAP////8CcKrwCAAAAAAWABTYXCtx0AYLCcmIauuBXlCZHdoSTQDh9QUAAAAAFgAUAK6pouXw+HaliN9VRuh0LR2HAI8AAAAAAAEAuwIAAAABqtc5MQGL0l+ErkALaISL4J23BurCrBgpi6vucatlb4sAAAAASEcwRAIgWPb8fGoz4bMVSNSByCbAFb0wE1qtQs1neQ2rZtKtJDsCIEoc7SYExnNbY5PltBaR3XiwDwxZQvufdRhW+qk4FX26Af7///8CgPD6AgAAAAAXqRQPuUY0IWlrgsgzryQceMF9295JNIfQ8gonAQAAABepFCnKdPigj4GZlCgYXJe12FLkBj9hh2UAAAAiAgLath/0mhTban0CsM0fu3j8SxgxK1tOVNrk26L7/vU210gwRQIhAPYQOLMI3B2oZaNIUnRvAVdyk0IIxtJEVDk82ZvfIhd3AiAFbmdaZ1ptCgK4WxTl4pB02KJam1dgvqKBb2YZEKAG6gEBAwQBAAAAAQRHUiEClYO/Oa4KYJdHrRma3dY0+mEIVZ1sXNObTCGD8auW4H8hAtq2H/SaFNtqfQKwzR+7ePxLGDErW05U2uTbovv+9TbXUq4iBgKVg785rgpgl0etGZrd1jT6YQhVnWxc05tMIYPxq5bgfxDZDGpPAAAAgAAAAIAAAACAIgYC2rYf9JoU22p9ArDNH7t4/EsYMStbTlTa5Nui+/71NtcQ2QxqTwAAAIAAAACAAQAAgAABASAAwusLAAAAABepFLf1+vQOPUClpFmx2zU18rcvqSHohyICAjrdkE89bc9Z3bkGsN7iNSm3/7ntUOXoYVGSaGAiHw5zRzBEAiBl9FulmYtZon/+GnvtAWrx8fkNVLOqj3RQql9WolEDvQIgf3JHA60e25ZoCyhLVtT/y4j3+3Weq74IqjDym4UTg9IBAQMEAQAAAAEEIgAgjCNTFzdDtZXftKB7crqOQuN5fadOh/59nXSX47ICiQMBBUdSIQMIncEMesbbVPkTKa9hczPbOIzq0MIx9yM3nRuZAwsC3CECOt2QTz1tz1nduQaw3uI1Kbf/ue1Q5ehhUZJoYCIfDnNSrSIGAjrdkE89bc9Z3bkGsN7iNSm3/7ntUOXoYVGSaGAiHw5zENkMak8AAACAAAAAgAMAAIAiBgMIncEMesbbVPkTKa9hczPbOIzq0MIx9yM3nRuZAwsC3BDZDGpPAAAAgAAAAIACAACAACICA6mkw39ZltOqJdusa1cK8GUDlEkpQkYLNUdT7Z7spYdxENkMak8AAACAAAAAgAQAAIAAIgICf2OZdX0u/1WhNq0CxoSxg4tlVuXxtrNCgqlLa1AFEJYQ2QxqTwAAAIAAAACABQAAgAA=", + "result" : "cHNidP8BAJoCAAAAAljoeiG1ba8MI76OcHBFbDNvfLqlyHV5JPVFiHuyq911AAAAAAD/////g40EJ9DsZQpoqka7CwmK6kQiwHGyyng1Kgd5WdB86h0BAAAAAP////8CcKrwCAAAAAAWABTYXCtx0AYLCcmIauuBXlCZHdoSTQDh9QUAAAAAFgAUAK6pouXw+HaliN9VRuh0LR2HAI8AAAAAAAEAuwIAAAABqtc5MQGL0l+ErkALaISL4J23BurCrBgpi6vucatlb4sAAAAASEcwRAIgWPb8fGoz4bMVSNSByCbAFb0wE1qtQs1neQ2rZtKtJDsCIEoc7SYExnNbY5PltBaR3XiwDwxZQvufdRhW+qk4FX26Af7///8CgPD6AgAAAAAXqRQPuUY0IWlrgsgzryQceMF9295JNIfQ8gonAQAAABepFCnKdPigj4GZlCgYXJe12FLkBj9hh2UAAAAiAgLath/0mhTban0CsM0fu3j8SxgxK1tOVNrk26L7/vU210gwRQIhAPYQOLMI3B2oZaNIUnRvAVdyk0IIxtJEVDk82ZvfIhd3AiAFbmdaZ1ptCgK4WxTl4pB02KJam1dgvqKBb2YZEKAG6gEBAwQBAAAAAQRHUiEClYO/Oa4KYJdHrRma3dY0+mEIVZ1sXNObTCGD8auW4H8hAtq2H/SaFNtqfQKwzR+7ePxLGDErW05U2uTbovv+9TbXUq4iBgKVg785rgpgl0etGZrd1jT6YQhVnWxc05tMIYPxq5bgfxDZDGpPAAAAgAAAAIAAAACAIgYC2rYf9JoU22p9ArDNH7t4/EsYMStbTlTa5Nui+/71NtcQ2QxqTwAAAIAAAACAAQAAgAABASAAwusLAAAAABepFLf1+vQOPUClpFmx2zU18rcvqSHohyICAjrdkE89bc9Z3bkGsN7iNSm3/7ntUOXoYVGSaGAiHw5zRzBEAiBl9FulmYtZon/+GnvtAWrx8fkNVLOqj3RQql9WolEDvQIgf3JHA60e25ZoCyhLVtT/y4j3+3Weq74IqjDym4UTg9IBAQMEAQAAAAEEIgAgjCNTFzdDtZXftKB7crqOQuN5fadOh/59nXSX47ICiQMBBUdSIQMIncEMesbbVPkTKa9hczPbOIzq0MIx9yM3nRuZAwsC3CECOt2QTz1tz1nduQaw3uI1Kbf/ue1Q5ehhUZJoYCIfDnNSrSIGAjrdkE89bc9Z3bkGsN7iNSm3/7ntUOXoYVGSaGAiHw5zENkMak8AAACAAAAAgAMAAIAiBgMIncEMesbbVPkTKa9hczPbOIzq0MIx9yM3nRuZAwsC3BDZDGpPAAAAgAAAAIACAACAACICA6mkw39ZltOqJdusa1cK8GUDlEkpQkYLNUdT7Z7spYdxENkMak8AAACAAAAAgAQAAIAAIgICf2OZdX0u/1WhNq0CxoSxg4tlVuXxtrNCgqlLa1AFEJYQ2QxqTwAAAIAAAACABQAAgAA=" } ], "combiner" : [ { "combine" : [ "cHNidP8BAJoCAAAAAljoeiG1ba8MI76OcHBFbDNvfLqlyHV5JPVFiHuyq911AAAAAAD/////g40EJ9DsZQpoqka7CwmK6kQiwHGyyng1Kgd5WdB86h0BAAAAAP////8CcKrwCAAAAAAWABTYXCtx0AYLCcmIauuBXlCZHdoSTQDh9QUAAAAAFgAUAK6pouXw+HaliN9VRuh0LR2HAI8AAAAAAAEAuwIAAAABqtc5MQGL0l+ErkALaISL4J23BurCrBgpi6vucatlb4sAAAAASEcwRAIgWPb8fGoz4bMVSNSByCbAFb0wE1qtQs1neQ2rZtKtJDsCIEoc7SYExnNbY5PltBaR3XiwDwxZQvufdRhW+qk4FX26Af7///8CgPD6AgAAAAAXqRQPuUY0IWlrgsgzryQceMF9295JNIfQ8gonAQAAABepFCnKdPigj4GZlCgYXJe12FLkBj9hh2UAAAAiAgKVg785rgpgl0etGZrd1jT6YQhVnWxc05tMIYPxq5bgf0cwRAIgdAGK1BgAl7hzMjwAFXILNoTMgSOJEEjn282bVa1nnJkCIHPTabdA4+tT3O+jOCPIBwUUylWn3ZVE8VfBZ5EyYRGMAQEDBAEAAAABBEdSIQKVg785rgpgl0etGZrd1jT6YQhVnWxc05tMIYPxq5bgfyEC2rYf9JoU22p9ArDNH7t4/EsYMStbTlTa5Nui+/71NtdSriIGApWDvzmuCmCXR60Zmt3WNPphCFWdbFzTm0whg/GrluB/ENkMak8AAACAAAAAgAAAAIAiBgLath/0mhTban0CsM0fu3j8SxgxK1tOVNrk26L7/vU21xDZDGpPAAAAgAAAAIABAACAAAEBIADC6wsAAAAAF6kUt/X69A49QKWkWbHbNTXyty+pIeiHIgIDCJ3BDHrG21T5EymvYXMz2ziM6tDCMfcjN50bmQMLAtxHMEQCIGLrelVhB6fHP0WsSrWh3d9vcHX7EnWWmn84Pv/3hLyyAiAMBdu3Rw2/LwhVfdNWxzJcHtMJE+mWzThAlF2xIijaXwEBAwQBAAAAAQQiACCMI1MXN0O1ld+0oHtyuo5C43l9p06H/n2ddJfjsgKJAwEFR1IhAwidwQx6xttU+RMpr2FzM9s4jOrQwjH3IzedG5kDCwLcIQI63ZBPPW3PWd25BrDe4jUpt/+57VDl6GFRkmhgIh8Oc1KuIgYCOt2QTz1tz1nduQaw3uI1Kbf/ue1Q5ehhUZJoYCIfDnMQ2QxqTwAAAIAAAACAAwAAgCIGAwidwQx6xttU+RMpr2FzM9s4jOrQwjH3IzedG5kDCwLcENkMak8AAACAAAAAgAIAAIAAIgIDqaTDf1mW06ol26xrVwrwZQOUSSlCRgs1R1Ptnuylh3EQ2QxqTwAAAIAAAACABAAAgAAiAgJ/Y5l1fS7/VaE2rQLGhLGDi2VW5fG2s0KCqUtrUAUQlhDZDGpPAAAAgAAAAIAFAACAAA==", - "cHNidP8BAJoCAAAAAljoeiG1ba8MI76OcHBFbDNvfLqlyHV5JPVFiHuyq911AAAAAAD/////g40EJ9DsZQpoqka7CwmK6kQiwHGyyng1Kgd5WdB86h0BAAAAAP////8CcKrwCAAAAAAWABTYXCtx0AYLCcmIauuBXlCZHdoSTQDh9QUAAAAAFgAUAK6pouXw+HaliN9VRuh0LR2HAI8AAAAAAAEAuwIAAAABqtc5MQGL0l+ErkALaISL4J23BurCrBgpi6vucatlb4sAAAAASEcwRAIgWPb8fGoz4bMVSNSByCbAFb0wE1qtQs1neQ2rZtKtJDsCIEoc7SYExnNbY5PltBaR3XiwDwxZQvufdRhW+qk4FX26Af7///8CgPD6AgAAAAAXqRQPuUY0IWlrgsgzryQceMF9295JNIfQ8gonAQAAABepFCnKdPigj4GZlCgYXJe12FLkBj9hh2UAAAAiAgLath/0mhTban0CsM0fu3j8SxgxK1tOVNrk26L7/vU210gwRQIhAPYQOLMI3B2oZaNIUnRvAVdyk0IIxtJEVDk82ZvfIhd3AiAFbmdaZ1ptCgK4WxTl4pB02KJam1dgvqKBb2YZEKAG6gEBAwQBAAAAAQRHUiEClYO/Oa4KYJdHrRma3dY0+mEIVZ1sXNObTCGD8auW4H8hAtq2H/SaFNtqfQKwzR+7ePxLGDErW05U2uTbovv+9TbXUq4iBgKVg785rgpgl0etGZrd1jT6YQhVnWxc05tMIYPxq5bgfxDZDGpPAAAAgAAAAIAAAACAIgYC2rYf9JoU22p9ArDNH7t4/EsYMStbTlTa5Nui+/71NtcQ2QxqTwAAAIAAAACAAQAAgAABASAAwusLAAAAABepFLf1+vQOPUClpFmx2zU18rcvqSHohyICAjrdkE89bc9Z3bkGsN7iNSm3/7ntUOXoYVGSaGAiHw5zRzBEAiBl9FulmYtZon/+GnvtAWrx8fkNVLOqj3RQql9WolEDvQIgf3JHA60e25ZoCyhLVtT/y4j3+3Weq74IqjDym4UTg9IBAQMEAQAAAAEEIgAgjCNTFzdDtZXftKB7crqOQuN5fadOh/59nXSX47ICiQMBBUdSIQMIncEMesbbVPkTKa9hczPbOIzq0MIx9yM3nRuZAwsC3CECOt2QTz1tz1nduQaw3uI1Kbf/ue1Q5ehhUZJoYCIfDnNSriIGAjrdkE89bc9Z3bkGsN7iNSm3/7ntUOXoYVGSaGAiHw5zENkMak8AAACAAAAAgAMAAIAiBgMIncEMesbbVPkTKa9hczPbOIzq0MIx9yM3nRuZAwsC3BDZDGpPAAAAgAAAAIACAACAACICA6mkw39ZltOqJdusa1cK8GUDlEkpQkYLNUdT7Z7spYdxENkMak8AAACAAAAAgAQAAIAAIgICf2OZdX0u/1WhNq0CxoSxg4tlVuXxtrNCgqlLa1AFEJYQ2QxqTwAAAIAAAACABQAAgAA=" + "cHNidP8BAJoCAAAAAljoeiG1ba8MI76OcHBFbDNvfLqlyHV5JPVFiHuyq911AAAAAAD/////g40EJ9DsZQpoqka7CwmK6kQiwHGyyng1Kgd5WdB86h0BAAAAAP////8CcKrwCAAAAAAWABTYXCtx0AYLCcmIauuBXlCZHdoSTQDh9QUAAAAAFgAUAK6pouXw+HaliN9VRuh0LR2HAI8AAAAAAAEAuwIAAAABqtc5MQGL0l+ErkALaISL4J23BurCrBgpi6vucatlb4sAAAAASEcwRAIgWPb8fGoz4bMVSNSByCbAFb0wE1qtQs1neQ2rZtKtJDsCIEoc7SYExnNbY5PltBaR3XiwDwxZQvufdRhW+qk4FX26Af7///8CgPD6AgAAAAAXqRQPuUY0IWlrgsgzryQceMF9295JNIfQ8gonAQAAABepFCnKdPigj4GZlCgYXJe12FLkBj9hh2UAAAAiAgLath/0mhTban0CsM0fu3j8SxgxK1tOVNrk26L7/vU210cwRAIgYxqYn+c4qSrQGYYCMxLBkhT+KAKznly8GsNniAbGksMCIDnbbDh70mdxbf2z1NjaULjoXSEzJrp8faqkwM5B65IjAQEDBAEAAAABBEdSIQKVg785rgpgl0etGZrd1jT6YQhVnWxc05tMIYPxq5bgfyEC2rYf9JoU22p9ArDNH7t4/EsYMStbTlTa5Nui+/71NtdSriIGApWDvzmuCmCXR60Zmt3WNPphCFWdbFzTm0whg/GrluB/ENkMak8AAACAAAAAgAAAAIAiBgLath/0mhTban0CsM0fu3j8SxgxK1tOVNrk26L7/vU21xDZDGpPAAAAgAAAAIABAACAAAEBIADC6wsAAAAAF6kUt/X69A49QKWkWbHbNTXyty+pIeiHIgICOt2QTz1tz1nduQaw3uI1Kbf/ue1Q5ehhUZJoYCIfDnNHMEQCIGX0W6WZi1mif/4ae+0BavHx+Q1Us6qPdFCqX1aiUQO9AiB/ckcDrR7blmgLKEtW1P/LiPf7dZ6rvgiqMPKbhROD0gEBAwQBAAAAAQQiACCMI1MXN0O1ld+0oHtyuo5C43l9p06H/n2ddJfjsgKJAwEFR1IhAwidwQx6xttU+RMpr2FzM9s4jOrQwjH3IzedG5kDCwLcIQI63ZBPPW3PWd25BrDe4jUpt/+57VDl6GFRkmhgIh8Oc1KuIgYCOt2QTz1tz1nduQaw3uI1Kbf/ue1Q5ehhUZJoYCIfDnMQ2QxqTwAAAIAAAACAAwAAgCIGAwidwQx6xttU+RMpr2FzM9s4jOrQwjH3IzedG5kDCwLcENkMak8AAACAAAAAgAIAAIAAIgIDqaTDf1mW06ol26xrVwrwZQOUSSlCRgs1R1Ptnuylh3EQ2QxqTwAAAIAAAACABAAAgAAiAgJ/Y5l1fS7/VaE2rQLGhLGDi2VW5fG2s0KCqUtrUAUQlhDZDGpPAAAAgAAAAIAFAACAAA==" ], - "result" : "cHNidP8BAJoCAAAAAljoeiG1ba8MI76OcHBFbDNvfLqlyHV5JPVFiHuyq911AAAAAAD/////g40EJ9DsZQpoqka7CwmK6kQiwHGyyng1Kgd5WdB86h0BAAAAAP////8CcKrwCAAAAAAWABTYXCtx0AYLCcmIauuBXlCZHdoSTQDh9QUAAAAAFgAUAK6pouXw+HaliN9VRuh0LR2HAI8AAAAAAAEAuwIAAAABqtc5MQGL0l+ErkALaISL4J23BurCrBgpi6vucatlb4sAAAAASEcwRAIgWPb8fGoz4bMVSNSByCbAFb0wE1qtQs1neQ2rZtKtJDsCIEoc7SYExnNbY5PltBaR3XiwDwxZQvufdRhW+qk4FX26Af7///8CgPD6AgAAAAAXqRQPuUY0IWlrgsgzryQceMF9295JNIfQ8gonAQAAABepFCnKdPigj4GZlCgYXJe12FLkBj9hh2UAAAAiAgKVg785rgpgl0etGZrd1jT6YQhVnWxc05tMIYPxq5bgf0cwRAIgdAGK1BgAl7hzMjwAFXILNoTMgSOJEEjn282bVa1nnJkCIHPTabdA4+tT3O+jOCPIBwUUylWn3ZVE8VfBZ5EyYRGMASICAtq2H/SaFNtqfQKwzR+7ePxLGDErW05U2uTbovv+9TbXSDBFAiEA9hA4swjcHahlo0hSdG8BV3KTQgjG0kRUOTzZm98iF3cCIAVuZ1pnWm0KArhbFOXikHTYolqbV2C+ooFvZhkQoAbqAQEDBAEAAAABBEdSIQKVg785rgpgl0etGZrd1jT6YQhVnWxc05tMIYPxq5bgfyEC2rYf9JoU22p9ArDNH7t4/EsYMStbTlTa5Nui+/71NtdSriIGApWDvzmuCmCXR60Zmt3WNPphCFWdbFzTm0whg/GrluB/ENkMak8AAACAAAAAgAAAAIAiBgLath/0mhTban0CsM0fu3j8SxgxK1tOVNrk26L7/vU21xDZDGpPAAAAgAAAAIABAACAAAEBIADC6wsAAAAAF6kUt/X69A49QKWkWbHbNTXyty+pIeiHIgIDCJ3BDHrG21T5EymvYXMz2ziM6tDCMfcjN50bmQMLAtxHMEQCIGLrelVhB6fHP0WsSrWh3d9vcHX7EnWWmn84Pv/3hLyyAiAMBdu3Rw2/LwhVfdNWxzJcHtMJE+mWzThAlF2xIijaXwEiAgI63ZBPPW3PWd25BrDe4jUpt/+57VDl6GFRkmhgIh8Oc0cwRAIgZfRbpZmLWaJ//hp77QFq8fH5DVSzqo90UKpfVqJRA70CIH9yRwOtHtuWaAsoS1bU/8uI9/t1nqu+CKow8puFE4PSAQEDBAEAAAABBCIAIIwjUxc3Q7WV37Sge3K6jkLjeX2nTof+fZ10l+OyAokDAQVHUiEDCJ3BDHrG21T5EymvYXMz2ziM6tDCMfcjN50bmQMLAtwhAjrdkE89bc9Z3bkGsN7iNSm3/7ntUOXoYVGSaGAiHw5zUq4iBgI63ZBPPW3PWd25BrDe4jUpt/+57VDl6GFRkmhgIh8OcxDZDGpPAAAAgAAAAIADAACAIgYDCJ3BDHrG21T5EymvYXMz2ziM6tDCMfcjN50bmQMLAtwQ2QxqTwAAAIAAAACAAgAAgAAiAgOppMN/WZbTqiXbrGtXCvBlA5RJKUJGCzVHU+2e7KWHcRDZDGpPAAAAgAAAAIAEAACAACICAn9jmXV9Lv9VoTatAsaEsYOLZVbl8bazQoKpS2tQBRCWENkMak8AAACAAAAAgAUAAIAA" + "result" : "cHNidP8BAJoCAAAAAljoeiG1ba8MI76OcHBFbDNvfLqlyHV5JPVFiHuyq911AAAAAAD/////g40EJ9DsZQpoqka7CwmK6kQiwHGyyng1Kgd5WdB86h0BAAAAAP////8CcKrwCAAAAAAWABTYXCtx0AYLCcmIauuBXlCZHdoSTQDh9QUAAAAAFgAUAK6pouXw+HaliN9VRuh0LR2HAI8AAAAAAAEAuwIAAAABqtc5MQGL0l+ErkALaISL4J23BurCrBgpi6vucatlb4sAAAAASEcwRAIgWPb8fGoz4bMVSNSByCbAFb0wE1qtQs1neQ2rZtKtJDsCIEoc7SYExnNbY5PltBaR3XiwDwxZQvufdRhW+qk4FX26Af7///8CgPD6AgAAAAAXqRQPuUY0IWlrgsgzryQceMF9295JNIfQ8gonAQAAABepFCnKdPigj4GZlCgYXJe12FLkBj9hh2UAAAAiAgKVg785rgpgl0etGZrd1jT6YQhVnWxc05tMIYPxq5bgf0cwRAIgdAGK1BgAl7hzMjwAFXILNoTMgSOJEEjn282bVa1nnJkCIHPTabdA4+tT3O+jOCPIBwUUylWn3ZVE8VfBZ5EyYRGMASICAtq2H/SaFNtqfQKwzR+7ePxLGDErW05U2uTbovv+9TbXRzBEAiBjGpif5zipKtAZhgIzEsGSFP4oArOeXLwaw2eIBsaSwwIgOdtsOHvSZ3Ft/bPU2NpQuOhdITMmunx9qqTAzkHrkiMBAQMEAQAAAAEER1IhApWDvzmuCmCXR60Zmt3WNPphCFWdbFzTm0whg/GrluB/IQLath/0mhTban0CsM0fu3j8SxgxK1tOVNrk26L7/vU211KuIgYClYO/Oa4KYJdHrRma3dY0+mEIVZ1sXNObTCGD8auW4H8Q2QxqTwAAAIAAAACAAAAAgCIGAtq2H/SaFNtqfQKwzR+7ePxLGDErW05U2uTbovv+9TbXENkMak8AAACAAAAAgAEAAIAAAQEgAMLrCwAAAAAXqRS39fr0Dj1ApaRZsds1NfK3L6kh6IciAgMIncEMesbbVPkTKa9hczPbOIzq0MIx9yM3nRuZAwsC3EcwRAIgYut6VWEHp8c/RaxKtaHd329wdfsSdZaafzg+//eEvLICIAwF27dHDb8vCFV901bHMlwe0wkT6ZbNOECUXbEiKNpfASICAjrdkE89bc9Z3bkGsN7iNSm3/7ntUOXoYVGSaGAiHw5zRzBEAiBl9FulmYtZon/+GnvtAWrx8fkNVLOqj3RQql9WolEDvQIgf3JHA60e25ZoCyhLVtT/y4j3+3Weq74IqjDym4UTg9IBAQMEAQAAAAEEIgAgjCNTFzdDtZXftKB7crqOQuN5fadOh/59nXSX47ICiQMBBUdSIQMIncEMesbbVPkTKa9hczPbOIzq0MIx9yM3nRuZAwsC3CECOt2QTz1tz1nduQaw3uI1Kbf/ue1Q5ehhUZJoYCIfDnNSriIGAjrdkE89bc9Z3bkGsN7iNSm3/7ntUOXoYVGSaGAiHw5zENkMak8AAACAAAAAgAMAAIAiBgMIncEMesbbVPkTKa9hczPbOIzq0MIx9yM3nRuZAwsC3BDZDGpPAAAAgAAAAIACAACAACICA6mkw39ZltOqJdusa1cK8GUDlEkpQkYLNUdT7Z7spYdxENkMak8AAACAAAAAgAQAAIAAIgICf2OZdX0u/1WhNq0CxoSxg4tlVuXxtrNCgqlLa1AFEJYQ2QxqTwAAAIAAAACABQAAgAA=" }, { "combine" : [ diff --git a/test/functional/example_test.py b/test/functional/example_test.py index e2f1cc05b3..a8c1474876 100755 --- a/test/functional/example_test.py +++ b/test/functional/example_test.py @@ -1,5 +1,5 @@ #!/usr/bin/env python3 -# Copyright (c) 2017 The Bitcoin Core developers +# Copyright (c) 2017-2018 The Bitcoin Core developers # Distributed under the MIT software license, see the accompanying # file COPYING or http://www.opensource.org/licenses/mit-license.php. """An example functional test @@ -15,8 +15,8 @@ from collections import defaultdict # Avoid wildcard * imports if possible from test_framework.blocktools import (create_block, create_coinbase) +from test_framework.messages import CInv from test_framework.mininode import ( - CInv, P2PInterface, mininode_lock, msg_block, @@ -130,12 +130,9 @@ class ExampleTest(BitcoinTestFramework): def run_test(self): """Main test logic""" - # Create P2P connections to two of the nodes + # Create P2P connections will wait for a verack to make sure the connection is fully up self.nodes[0].add_p2p_connection(BaseNode()) - # wait_for_verack ensures that the P2P connection is fully up. - self.nodes[0].p2p.wait_for_verack() - # Generating a block on one of the nodes will get us out of IBD blocks = [int(self.nodes[0].generate(nblocks=1)[0], 16)] self.sync_all([self.nodes[0:1]]) @@ -187,7 +184,6 @@ class ExampleTest(BitcoinTestFramework): self.nodes[0].disconnect_p2ps() self.nodes[2].add_p2p_connection(BaseNode()) - self.nodes[2].p2p.wait_for_verack() self.log.info("Wait for node2 reach current tip. Test that it has propagated all the blocks to us") diff --git a/test/functional/feature_assumevalid.py b/test/functional/feature_assumevalid.py index 933a4740dd..3d0467038d 100755 --- a/test/functional/feature_assumevalid.py +++ b/test/functional/feature_assumevalid.py @@ -1,5 +1,5 @@ #!/usr/bin/env python3 -# Copyright (c) 2014-2017 The Bitcoin Core developers +# Copyright (c) 2014-2018 The Bitcoin Core developers # Distributed under the MIT software license, see the accompanying # file COPYING or http://www.opensource.org/licenses/mit-license.php. """Test logic for skipping signature validation on old blocks. @@ -95,10 +95,7 @@ class AssumeValidTest(BitcoinTestFramework): break def run_test(self): - - # Connect to node0 p2p0 = self.nodes[0].add_p2p_connection(BaseNode()) - self.nodes[0].p2p.wait_for_verack() # Build the blockchain self.tip = int(self.nodes[0].getbestblockhash(), 16) @@ -168,10 +165,6 @@ class AssumeValidTest(BitcoinTestFramework): p2p1 = self.nodes[1].add_p2p_connection(BaseNode()) p2p2 = self.nodes[2].add_p2p_connection(BaseNode()) - p2p0.wait_for_verack() - p2p1.wait_for_verack() - p2p2.wait_for_verack() - # send header lists to all three nodes p2p0.send_header_for_blocks(self.blocks[0:2000]) p2p0.send_header_for_blocks(self.blocks[2000:]) diff --git a/test/functional/feature_bip68_sequence.py b/test/functional/feature_bip68_sequence.py index d8521550b5..4a9445f503 100755 --- a/test/functional/feature_bip68_sequence.py +++ b/test/functional/feature_bip68_sequence.py @@ -1,12 +1,16 @@ #!/usr/bin/env python3 -# Copyright (c) 2014-2017 The Bitcoin Core developers +# Copyright (c) 2014-2018 The Bitcoin Core developers # Distributed under the MIT software license, see the accompanying # file COPYING or http://www.opensource.org/licenses/mit-license.php. """Test BIP68 implementation.""" +import time + +from test_framework.blocktools import create_block, create_coinbase, add_witness_commitment +from test_framework.messages import COIN, COutPoint, CTransaction, CTxIn, CTxOut, FromHex, ToHex +from test_framework.script import CScript from test_framework.test_framework import BitcoinTestFramework -from test_framework.util import * -from test_framework.blocktools import * +from test_framework.util import assert_equal, assert_greater_than, assert_raises_rpc_error, bytes_to_hex_str, get_bip9_status, satoshi_round, sync_blocks SEQUENCE_LOCKTIME_DISABLE_FLAG = (1<<31) SEQUENCE_LOCKTIME_TYPE_FLAG = (1<<22) # this means use time (0 means height) diff --git a/test/functional/feature_block.py b/test/functional/feature_block.py index 62c0582381..79ed902871 100755 --- a/test/functional/feature_block.py +++ b/test/functional/feature_block.py @@ -1,5 +1,5 @@ #!/usr/bin/env python3 -# Copyright (c) 2015-2017 The Bitcoin Core developers +# Copyright (c) 2015-2018 The Bitcoin Core developers # Distributed under the MIT software license, see the accompanying # file COPYING or http://www.opensource.org/licenses/mit-license.php. """Test block processing.""" @@ -7,7 +7,7 @@ import copy import struct import time -from test_framework.blocktools import create_block, create_coinbase, create_transaction, get_legacy_sigopcount_block +from test_framework.blocktools import create_block, create_coinbase, create_tx_with_script, get_legacy_sigopcount_block from test_framework.key import CECKey from test_framework.messages import ( CBlock, @@ -48,11 +48,6 @@ from test_framework.util import assert_equal MAX_BLOCK_SIGOPS = 20000 -class PreviousSpendableOutput(): - def __init__(self, tx=CTransaction(), n=-1): - self.tx = tx - self.n = n # the output we're spending - # Use this class for tests that require behavior other than normal "mininode" behavior. # For now, it is used to serialize a bloated varint (b64). class CBrokenBlock(CBlock): @@ -132,7 +127,7 @@ class FullBlockTest(BitcoinTestFramework): self.log.info("Don't reorg to a chain of the same length") self.move_tip(1) b3 = self.next_block(3, spend=out[1]) - txout_b3 = PreviousSpendableOutput(b3.vtx[1], 0) + txout_b3 = b3.vtx[1] self.sync_blocks([b3], False) # Now we add another block to make the alternative chain longer. @@ -397,8 +392,8 @@ class FullBlockTest(BitcoinTestFramework): self.log.info("Reject a block spending transaction from a block which failed to connect") self.move_tip(35) b37 = self.next_block(37, spend=out[11]) - txout_b37 = PreviousSpendableOutput(b37.vtx[1], 0) - tx = self.create_and_sign_transaction(out[11].tx, out[11].n, 0) + txout_b37 = b37.vtx[1] + tx = self.create_and_sign_transaction(out[11], 0) b37 = self.update_block(37, [tx]) self.sync_blocks([b37], False, 16, b'bad-txns-inputs-missingorspent', reconnect=True) @@ -432,9 +427,9 @@ class FullBlockTest(BitcoinTestFramework): # Create a transaction that spends one satoshi to the p2sh_script, the rest to OP_TRUE # This must be signed because it is spending a coinbase spend = out[11] - tx = self.create_tx(spend.tx, spend.n, 1, p2sh_script) - tx.vout.append(CTxOut(spend.tx.vout[spend.n].nValue - 1, CScript([OP_TRUE]))) - self.sign_tx(tx, spend.tx, spend.n) + tx = self.create_tx(spend, 0, 1, p2sh_script) + tx.vout.append(CTxOut(spend.vout[0].nValue - 1, CScript([OP_TRUE]))) + self.sign_tx(tx, spend) tx.rehash() b39 = self.update_block(39, [tx]) b39_outputs += 1 @@ -548,7 +543,7 @@ class FullBlockTest(BitcoinTestFramework): self.sync_blocks([b44], True) self.log.info("Reject a block with a non-coinbase as the first tx") - non_coinbase = self.create_tx(out[15].tx, out[15].n, 1) + non_coinbase = self.create_tx(out[15], 0, 1) b45 = CBlock() b45.nTime = self.tip.nTime + 1 b45.hashPrevBlock = self.tip.sha256 @@ -675,7 +670,7 @@ class FullBlockTest(BitcoinTestFramework): # b57 - a good block with 2 txs, don't submit until end self.move_tip(55) b57 = self.next_block(57) - tx = self.create_and_sign_transaction(out[16].tx, out[16].n, 1) + tx = self.create_and_sign_transaction(out[16], 1) tx1 = self.create_tx(tx, 0, 1) b57 = self.update_block(57, [tx, tx1]) @@ -692,7 +687,7 @@ class FullBlockTest(BitcoinTestFramework): # b57p2 - a good block with 6 tx'es, don't submit until end self.move_tip(55) b57p2 = self.next_block("57p2") - tx = self.create_and_sign_transaction(out[16].tx, out[16].n, 1) + tx = self.create_and_sign_transaction(out[16], 1) tx1 = self.create_tx(tx, 0, 1) tx2 = self.create_tx(tx1, 0, 1) tx3 = self.create_tx(tx2, 0, 1) @@ -727,8 +722,8 @@ class FullBlockTest(BitcoinTestFramework): self.move_tip(57) b58 = self.next_block(58, spend=out[17]) tx = CTransaction() - assert(len(out[17].tx.vout) < 42) - tx.vin.append(CTxIn(COutPoint(out[17].tx.sha256, 42), CScript([OP_TRUE]), 0xffffffff)) + assert(len(out[17].vout) < 42) + tx.vin.append(CTxIn(COutPoint(out[17].sha256, 42), CScript([OP_TRUE]), 0xffffffff)) tx.vout.append(CTxOut(0, b"")) tx.calc_sha256() b58 = self.update_block(58, [tx]) @@ -738,7 +733,7 @@ class FullBlockTest(BitcoinTestFramework): self.log.info("Reject a block with a transaction with outputs > inputs") self.move_tip(57) b59 = self.next_block(59) - tx = self.create_and_sign_transaction(out[17].tx, out[17].n, 51 * COIN) + tx = self.create_and_sign_transaction(out[17], 51 * COIN) b59 = self.update_block(59, [tx]) self.sync_blocks([b59], False, 16, b'bad-txns-in-belowout', reconnect=True) @@ -776,8 +771,7 @@ class FullBlockTest(BitcoinTestFramework): b62 = self.next_block(62) tx = CTransaction() tx.nLockTime = 0xffffffff # this locktime is non-final - assert(out[18].n < len(out[18].tx.vout)) - tx.vin.append(CTxIn(COutPoint(out[18].tx.sha256, out[18].n))) # don't set nSequence + tx.vin.append(CTxIn(COutPoint(out[18].sha256, 0))) # don't set nSequence tx.vout.append(CTxOut(0, CScript([OP_TRUE]))) assert(tx.vin[0].nSequence < 0xffffffff) tx.calc_sha256() @@ -856,8 +850,8 @@ class FullBlockTest(BitcoinTestFramework): self.log.info("Accept a block with a transaction spending an output created in the same block") self.move_tip(64) b65 = self.next_block(65) - tx1 = self.create_and_sign_transaction(out[19].tx, out[19].n, out[19].tx.vout[0].nValue) - tx2 = self.create_and_sign_transaction(tx1, 0, 0) + tx1 = self.create_and_sign_transaction(out[19], out[19].vout[0].nValue) + tx2 = self.create_and_sign_transaction(tx1, 0) b65 = self.update_block(65, [tx1, tx2]) self.sync_blocks([b65], True) self.save_spendable_output() @@ -869,8 +863,8 @@ class FullBlockTest(BitcoinTestFramework): self.log.info("Reject a block with a transaction spending an output created later in the same block") self.move_tip(65) b66 = self.next_block(66) - tx1 = self.create_and_sign_transaction(out[20].tx, out[20].n, out[20].tx.vout[0].nValue) - tx2 = self.create_and_sign_transaction(tx1, 0, 1) + tx1 = self.create_and_sign_transaction(out[20], out[20].vout[0].nValue) + tx2 = self.create_and_sign_transaction(tx1, 1) b66 = self.update_block(66, [tx2, tx1]) self.sync_blocks([b66], False, 16, b'bad-txns-inputs-missingorspent', reconnect=True) @@ -883,9 +877,9 @@ class FullBlockTest(BitcoinTestFramework): self.log.info("Reject a block with a transaction double spending a transaction creted in the same block") self.move_tip(65) b67 = self.next_block(67) - tx1 = self.create_and_sign_transaction(out[20].tx, out[20].n, out[20].tx.vout[0].nValue) - tx2 = self.create_and_sign_transaction(tx1, 0, 1) - tx3 = self.create_and_sign_transaction(tx1, 0, 2) + tx1 = self.create_and_sign_transaction(out[20], out[20].vout[0].nValue) + tx2 = self.create_and_sign_transaction(tx1, 1) + tx3 = self.create_and_sign_transaction(tx1, 2) b67 = self.update_block(67, [tx1, tx2, tx3]) self.sync_blocks([b67], False, 16, b'bad-txns-inputs-missingorspent', reconnect=True) @@ -904,14 +898,14 @@ class FullBlockTest(BitcoinTestFramework): self.log.info("Reject a block trying to claim too much subsidy in the coinbase transaction") self.move_tip(65) b68 = self.next_block(68, additional_coinbase_value=10) - tx = self.create_and_sign_transaction(out[20].tx, out[20].n, out[20].tx.vout[0].nValue - 9) + tx = self.create_and_sign_transaction(out[20], out[20].vout[0].nValue - 9) b68 = self.update_block(68, [tx]) self.sync_blocks([b68], False, 16, b'bad-cb-amount', reconnect=True) self.log.info("Accept a block claiming the correct subsidy in the coinbase transaction") self.move_tip(65) b69 = self.next_block(69, additional_coinbase_value=10) - tx = self.create_and_sign_transaction(out[20].tx, out[20].n, out[20].tx.vout[0].nValue - 10) + tx = self.create_and_sign_transaction(out[20], out[20].vout[0].nValue - 10) self.update_block(69, [tx]) self.sync_blocks([b69], True) self.save_spendable_output() @@ -942,8 +936,8 @@ class FullBlockTest(BitcoinTestFramework): self.log.info("Reject a block containing a duplicate transaction but with the same Merkle root (Merkle tree malleability") self.move_tip(69) b72 = self.next_block(72) - tx1 = self.create_and_sign_transaction(out[21].tx, out[21].n, 2) - tx2 = self.create_and_sign_transaction(tx1, 0, 1) + tx1 = self.create_and_sign_transaction(out[21], 2) + tx2 = self.create_and_sign_transaction(tx1, 1) b72 = self.update_block(72, [tx1, tx2]) # now tip is 72 b71 = copy.deepcopy(b72) b71.vtx.append(tx2) # add duplicate tx2 @@ -990,7 +984,7 @@ class FullBlockTest(BitcoinTestFramework): a[MAX_BLOCK_SIGOPS + 2] = 0 a[MAX_BLOCK_SIGOPS + 3] = 0 - tx = self.create_and_sign_transaction(out[22].tx, 0, 1, CScript(a)) + tx = self.create_and_sign_transaction(out[22], 1, CScript(a)) b73 = self.update_block(73, [tx]) assert_equal(get_legacy_sigopcount_block(b73), MAX_BLOCK_SIGOPS + 1) self.sync_blocks([b73], False, 16, b'bad-blk-sigops', reconnect=True) @@ -1015,7 +1009,7 @@ class FullBlockTest(BitcoinTestFramework): a[MAX_BLOCK_SIGOPS + 2] = 0xff a[MAX_BLOCK_SIGOPS + 3] = 0xff a[MAX_BLOCK_SIGOPS + 4] = 0xff - tx = self.create_and_sign_transaction(out[22].tx, 0, 1, CScript(a)) + tx = self.create_and_sign_transaction(out[22], 1, CScript(a)) b74 = self.update_block(74, [tx]) self.sync_blocks([b74], False, 16, b'bad-blk-sigops', reconnect=True) @@ -1028,7 +1022,7 @@ class FullBlockTest(BitcoinTestFramework): a[MAX_BLOCK_SIGOPS + 1] = 0xff a[MAX_BLOCK_SIGOPS + 2] = 0xff a[MAX_BLOCK_SIGOPS + 3] = 0xff - tx = self.create_and_sign_transaction(out[22].tx, 0, 1, CScript(a)) + tx = self.create_and_sign_transaction(out[22], 1, CScript(a)) b75 = self.update_block(75, [tx]) self.sync_blocks([b75], True) self.save_spendable_output() @@ -1039,7 +1033,7 @@ class FullBlockTest(BitcoinTestFramework): size = MAX_BLOCK_SIGOPS - 1 + MAX_SCRIPT_ELEMENT_SIZE + 1 + 5 a = bytearray([OP_CHECKSIG] * size) a[MAX_BLOCK_SIGOPS - 1] = 0x4e # PUSHDATA4, but leave the following bytes as just checksigs - tx = self.create_and_sign_transaction(out[23].tx, 0, 1, CScript(a)) + tx = self.create_and_sign_transaction(out[23], 1, CScript(a)) b76 = self.update_block(76, [tx]) self.sync_blocks([b76], True) self.save_spendable_output() @@ -1064,7 +1058,7 @@ class FullBlockTest(BitcoinTestFramework): self.log.info("Test transaction resurrection during a re-org") self.move_tip(76) b77 = self.next_block(77) - tx77 = self.create_and_sign_transaction(out[24].tx, out[24].n, 10 * COIN) + tx77 = self.create_and_sign_transaction(out[24], 10 * COIN) b77 = self.update_block(77, [tx77]) self.sync_blocks([b77], True) self.save_spendable_output() @@ -1109,9 +1103,9 @@ class FullBlockTest(BitcoinTestFramework): b83 = self.next_block(83) op_codes = [OP_IF, OP_INVALIDOPCODE, OP_ELSE, OP_TRUE, OP_ENDIF] script = CScript(op_codes) - tx1 = self.create_and_sign_transaction(out[28].tx, out[28].n, out[28].tx.vout[0].nValue, script) + tx1 = self.create_and_sign_transaction(out[28], out[28].vout[0].nValue, script) - tx2 = self.create_and_sign_transaction(tx1, 0, 0, CScript([OP_TRUE])) + tx2 = self.create_and_sign_transaction(tx1, 0, CScript([OP_TRUE])) tx2.vin[0].scriptSig = CScript([OP_FALSE]) tx2.rehash() @@ -1126,13 +1120,13 @@ class FullBlockTest(BitcoinTestFramework): # self.log.info("Test re-orging blocks with OP_RETURN in them") b84 = self.next_block(84) - tx1 = self.create_tx(out[29].tx, out[29].n, 0, CScript([OP_RETURN])) + tx1 = self.create_tx(out[29], 0, 0, CScript([OP_RETURN])) tx1.vout.append(CTxOut(0, CScript([OP_TRUE]))) tx1.vout.append(CTxOut(0, CScript([OP_TRUE]))) tx1.vout.append(CTxOut(0, CScript([OP_TRUE]))) tx1.vout.append(CTxOut(0, CScript([OP_TRUE]))) tx1.calc_sha256() - self.sign_tx(tx1, out[29].tx, out[29].n) + self.sign_tx(tx1, out[29]) tx1.rehash() tx2 = self.create_tx(tx1, 1, 0, CScript([OP_RETURN])) tx2.vout.append(CTxOut(0, CScript([OP_RETURN]))) @@ -1217,21 +1211,21 @@ class FullBlockTest(BitcoinTestFramework): # this is a little handier to use than the version in blocktools.py def create_tx(self, spend_tx, n, value, script=CScript([OP_TRUE, OP_DROP] * 15 + [OP_TRUE])): - return create_transaction(spend_tx, n, b"", value, script) + return create_tx_with_script(spend_tx, n, amount=value, script_pub_key=script) # sign a transaction, using the key we know about # this signs input 0 in tx, which is assumed to be spending output n in spend_tx - def sign_tx(self, tx, spend_tx, n): - scriptPubKey = bytearray(spend_tx.vout[n].scriptPubKey) + def sign_tx(self, tx, spend_tx): + scriptPubKey = bytearray(spend_tx.vout[0].scriptPubKey) if (scriptPubKey[0] == OP_TRUE): # an anyone-can-spend tx.vin[0].scriptSig = CScript() return - (sighash, err) = SignatureHash(spend_tx.vout[n].scriptPubKey, tx, 0, SIGHASH_ALL) + (sighash, err) = SignatureHash(spend_tx.vout[0].scriptPubKey, tx, 0, SIGHASH_ALL) tx.vin[0].scriptSig = CScript([self.coinbase_key.sign(sighash) + bytes(bytearray([SIGHASH_ALL]))]) - def create_and_sign_transaction(self, spend_tx, n, value, script=CScript([OP_TRUE])): - tx = self.create_tx(spend_tx, n, value, script) - self.sign_tx(tx, spend_tx, n) + def create_and_sign_transaction(self, spend_tx, value, script=CScript([OP_TRUE])): + tx = self.create_tx(spend_tx, 0, value, script) + self.sign_tx(tx, spend_tx) tx.rehash() return tx @@ -1250,11 +1244,11 @@ class FullBlockTest(BitcoinTestFramework): if spend is None: block = create_block(base_block_hash, coinbase, block_time) else: - coinbase.vout[0].nValue += spend.tx.vout[spend.n].nValue - 1 # all but one satoshi to fees + coinbase.vout[0].nValue += spend.vout[0].nValue - 1 # all but one satoshi to fees coinbase.rehash() block = create_block(base_block_hash, coinbase, block_time) - tx = create_transaction(spend.tx, spend.n, b"", 1, script) # spend 1 satoshi - self.sign_tx(tx, spend.tx, spend.n) + tx = self.create_tx(spend, 0, 1, script) # spend 1 satoshi + self.sign_tx(tx, spend) self.add_transactions_to_block(block, [tx]) block.hashMerkleRoot = block.calc_merkle_root() if solve: @@ -1273,7 +1267,7 @@ class FullBlockTest(BitcoinTestFramework): # get an output that we previously marked as spendable def get_spendable_output(self): self.log.debug("getting spendable output %s" % self.spendable_outputs[0].vtx[0]) - return PreviousSpendableOutput(self.spendable_outputs.pop(0).vtx[0], 0) + return self.spendable_outputs.pop(0).vtx[0] # move the tip back to a previous block def move_tip(self, number): diff --git a/test/functional/feature_blocksdir.py b/test/functional/feature_blocksdir.py index 56f91651a8..784dc2865f 100755 --- a/test/functional/feature_blocksdir.py +++ b/test/functional/feature_blocksdir.py @@ -20,11 +20,11 @@ class BlocksdirTest(BitcoinTestFramework): self.stop_node(0) shutil.rmtree(self.nodes[0].datadir) initialize_datadir(self.options.tmpdir, 0) - self.log.info("Starting with non exiting blocksdir ...") + self.log.info("Starting with nonexistent blocksdir ...") blocksdir_path = os.path.join(self.options.tmpdir, 'blocksdir') self.nodes[0].assert_start_raises_init_error(["-blocksdir=" + blocksdir_path], 'Error: Specified blocks directory "{}" does not exist.'.format(blocksdir_path)) os.mkdir(blocksdir_path) - self.log.info("Starting with exiting blocksdir ...") + self.log.info("Starting with existing blocksdir ...") self.start_node(0, ["-blocksdir=" + blocksdir_path]) self.log.info("mining blocks..") self.nodes[0].generate(10) diff --git a/test/functional/feature_cltv.py b/test/functional/feature_cltv.py index b484bffe0d..8460291831 100755 --- a/test/functional/feature_cltv.py +++ b/test/functional/feature_cltv.py @@ -1,5 +1,5 @@ #!/usr/bin/env python3 -# Copyright (c) 2015-2017 The Bitcoin Core developers +# Copyright (c) 2015-2018 The Bitcoin Core developers # Distributed under the MIT software license, see the accompanying # file COPYING or http://www.opensource.org/licenses/mit-license.php. """Test BIP65 (CHECKLOCKTIMEVERIFY). @@ -8,11 +8,13 @@ Test that the CHECKLOCKTIMEVERIFY soft-fork activates at (regtest) block height 1351. """ -from test_framework.test_framework import BitcoinTestFramework -from test_framework.util import * -from test_framework.mininode import * -from test_framework.blocktools import create_coinbase, create_block +from test_framework.blocktools import create_coinbase, create_block, create_transaction +from test_framework.messages import CTransaction, msg_block, ToHex +from test_framework.mininode import mininode_lock, P2PInterface from test_framework.script import CScript, OP_1NEGATE, OP_CHECKLOCKTIMEVERIFY, OP_DROP, CScriptNum +from test_framework.test_framework import BitcoinTestFramework +from test_framework.util import assert_equal, bytes_to_hex_str, hex_str_to_bytes, wait_until + from io import BytesIO CLTV_HEIGHT = 1351 @@ -49,34 +51,23 @@ def cltv_validate(node, tx, height): list(CScript(new_tx.vin[0].scriptSig))) return new_tx -def create_transaction(node, coinbase, to_address, amount): - from_txid = node.getblock(coinbase)['tx'][0] - inputs = [{ "txid" : from_txid, "vout" : 0}] - outputs = { to_address : amount } - rawtx = node.createrawtransaction(inputs, outputs) - signresult = node.signrawtransactionwithwallet(rawtx) - tx = CTransaction() - tx.deserialize(BytesIO(hex_str_to_bytes(signresult['hex']))) - return tx - class BIP65Test(BitcoinTestFramework): def set_test_params(self): self.num_nodes = 1 - self.extra_args = [['-promiscuousmempoolflags=1', '-whitelist=127.0.0.1']] + self.extra_args = [['-whitelist=127.0.0.1']] self.setup_clean_chain = True def run_test(self): self.nodes[0].add_p2p_connection(P2PInterface()) - self.nodes[0].p2p.wait_for_verack() self.log.info("Mining %d blocks", CLTV_HEIGHT - 2) - self.coinbase_blocks = self.nodes[0].generate(CLTV_HEIGHT - 2) + self.coinbase_txids = [self.nodes[0].getblock(b)['tx'][0] for b in self.nodes[0].generate(CLTV_HEIGHT - 2)] self.nodeaddress = self.nodes[0].getnewaddress() self.log.info("Test that an invalid-according-to-CLTV transaction can still appear in a block") - spendtx = create_transaction(self.nodes[0], self.coinbase_blocks[0], - self.nodeaddress, 1.0) + spendtx = create_transaction(self.nodes[0], self.coinbase_txids[0], + self.nodeaddress, amount=1.0) cltv_invalidate(spendtx) spendtx.rehash() @@ -110,18 +101,19 @@ class BIP65Test(BitcoinTestFramework): self.log.info("Test that invalid-according-to-cltv transactions cannot appear in a block") block.nVersion = 4 - spendtx = create_transaction(self.nodes[0], self.coinbase_blocks[1], - self.nodeaddress, 1.0) + spendtx = create_transaction(self.nodes[0], self.coinbase_txids[1], + self.nodeaddress, amount=1.0) cltv_invalidate(spendtx) spendtx.rehash() # First we show that this tx is valid except for CLTV by getting it - # accepted to the mempool (which we can achieve with - # -promiscuousmempoolflags). - self.nodes[0].p2p.send_and_ping(msg_tx(spendtx)) - assert spendtx.hash in self.nodes[0].getrawmempool() + # rejected from the mempool for exactly that reason. + assert_equal( + [{'txid': spendtx.hash, 'allowed': False, 'reject-reason': '64: non-mandatory-script-verify-flag (Negative locktime)'}], + self.nodes[0].testmempoolaccept(rawtxs=[bytes_to_hex_str(spendtx.serialize())], allowhighfees=True) + ) - # Now we verify that a block with this transaction is invalid. + # Now we verify that a block with this transaction is also invalid. block.vtx.append(spendtx) block.hashMerkleRoot = block.calc_merkle_root() block.solve() diff --git a/test/functional/feature_config_args.py b/test/functional/feature_config_args.py index 3abc1f4c68..62091048f9 100755 --- a/test/functional/feature_config_args.py +++ b/test/functional/feature_config_args.py @@ -1,5 +1,5 @@ #!/usr/bin/env python3 -# Copyright (c) 2017 The Bitcoin Core developers +# Copyright (c) 2017-2018 The Bitcoin Core developers # Distributed under the MIT software license, see the accompanying # file COPYING or http://www.opensource.org/licenses/mit-license.php. """Test various command line arguments and configuration file parameters.""" diff --git a/test/functional/feature_csv_activation.py b/test/functional/feature_csv_activation.py index 2499214fbd..af14feb471 100755 --- a/test/functional/feature_csv_activation.py +++ b/test/functional/feature_csv_activation.py @@ -1,5 +1,5 @@ #!/usr/bin/env python3 -# Copyright (c) 2015-2017 The Bitcoin Core developers +# Copyright (c) 2015-2018 The Bitcoin Core developers # Distributed under the MIT software license, see the accompanying # file COPYING or http://www.opensource.org/licenses/mit-license.php. """Test activation of the first version bits soft fork. @@ -47,7 +47,7 @@ from itertools import product from io import BytesIO import time -from test_framework.blocktools import create_coinbase, create_block +from test_framework.blocktools import create_coinbase, create_block, create_transaction from test_framework.messages import ToHex, CTransaction from test_framework.mininode import P2PDataStore from test_framework.script import ( @@ -85,15 +85,6 @@ def relative_locktime(sdf, srhb, stf, srlb): def all_rlt_txs(txs): return [tx['tx'] for tx in txs] -def create_transaction(node, txid, to_address, amount): - inputs = [{"txid": txid, "vout": 0}] - outputs = {to_address: amount} - rawtx = node.createrawtransaction(inputs, outputs) - tx = CTransaction() - f = BytesIO(hex_str_to_bytes(rawtx)) - tx.deserialize(f) - return tx - def sign_transaction(node, unsignedtx): rawtx = ToHex(unsignedtx) signresult = node.signrawtransactionwithwallet(rawtx) @@ -103,15 +94,14 @@ def sign_transaction(node, unsignedtx): return tx def create_bip112special(node, input, txversion, address): - tx = create_transaction(node, input, address, Decimal("49.98")) + tx = create_transaction(node, input, address, amount=Decimal("49.98")) tx.nVersion = txversion signtx = sign_transaction(node, tx) signtx.vin[0].scriptSig = CScript([-1, OP_CHECKSEQUENCEVERIFY, OP_DROP] + list(CScript(signtx.vin[0].scriptSig))) return signtx def send_generic_input_tx(node, coinbases, address): - amount = Decimal("49.99") - return node.sendrawtransaction(ToHex(sign_transaction(node, create_transaction(node, node.getblock(coinbases.pop())['tx'][0], address, amount)))) + return node.sendrawtransaction(ToHex(sign_transaction(node, create_transaction(node, node.getblock(coinbases.pop())['tx'][0], address, amount=Decimal("49.99"))))) def create_bip68txs(node, bip68inputs, txversion, address, locktime_delta=0): """Returns a list of bip68 transactions with different bits set.""" @@ -119,7 +109,7 @@ def create_bip68txs(node, bip68inputs, txversion, address, locktime_delta=0): assert(len(bip68inputs) >= 16) for i, (sdf, srhb, stf, srlb) in enumerate(product(*[[True, False]] * 4)): locktime = relative_locktime(sdf, srhb, stf, srlb) - tx = create_transaction(node, bip68inputs[i], address, Decimal("49.98")) + tx = create_transaction(node, bip68inputs[i], address, amount=Decimal("49.98")) tx.nVersion = txversion tx.vin[0].nSequence = locktime + locktime_delta tx = sign_transaction(node, tx) @@ -134,7 +124,7 @@ def create_bip112txs(node, bip112inputs, varyOP_CSV, txversion, address, locktim assert(len(bip112inputs) >= 16) for i, (sdf, srhb, stf, srlb) in enumerate(product(*[[True, False]] * 4)): locktime = relative_locktime(sdf, srhb, stf, srlb) - tx = create_transaction(node, bip112inputs[i], address, Decimal("49.98")) + tx = create_transaction(node, bip112inputs[i], address, amount=Decimal("49.98")) if (varyOP_CSV): # if varying OP_CSV, nSequence is fixed tx.vin[0].nSequence = BASE_RELATIVE_LOCKTIME + locktime_delta else: # vary nSequence instead, OP_CSV is fixed @@ -183,7 +173,6 @@ class BIP68_112_113Test(BitcoinTestFramework): def run_test(self): self.nodes[0].add_p2p_connection(P2PDataStore()) - self.nodes[0].p2p.wait_for_verack() self.log.info("Generate blocks in the past for coinbase outputs.") long_past_time = int(time.time()) - 600 * 1000 # enough to build up to 1000 blocks 10 minutes apart without worrying about getting into the future @@ -279,10 +268,10 @@ class BIP68_112_113Test(BitcoinTestFramework): # Test both version 1 and version 2 transactions for all tests # BIP113 test transaction will be modified before each use to put in appropriate block time - bip113tx_v1 = create_transaction(self.nodes[0], bip113input, self.nodeaddress, Decimal("49.98")) + bip113tx_v1 = create_transaction(self.nodes[0], bip113input, self.nodeaddress, amount=Decimal("49.98")) bip113tx_v1.vin[0].nSequence = 0xFFFFFFFE bip113tx_v1.nVersion = 1 - bip113tx_v2 = create_transaction(self.nodes[0], bip113input, self.nodeaddress, Decimal("49.98")) + bip113tx_v2 = create_transaction(self.nodes[0], bip113input, self.nodeaddress, amount=Decimal("49.98")) bip113tx_v2.vin[0].nSequence = 0xFFFFFFFE bip113tx_v2.nVersion = 2 diff --git a/test/functional/feature_dbcrash.py b/test/functional/feature_dbcrash.py index cef257cf9b..d612dbe2bc 100755 --- a/test/functional/feature_dbcrash.py +++ b/test/functional/feature_dbcrash.py @@ -1,5 +1,5 @@ #!/usr/bin/env python3 -# Copyright (c) 2017 The Bitcoin Core developers +# Copyright (c) 2017-2018 The Bitcoin Core developers # Distributed under the MIT software license, see the accompanying # file COPYING or http://www.opensource.org/licenses/mit-license.php. """Test recovery from a crash during chainstate writing. @@ -31,10 +31,9 @@ import random import sys import time -from test_framework.mininode import * -from test_framework.script import * +from test_framework.messages import COIN, COutPoint, CTransaction, CTxIn, CTxOut, ToHex from test_framework.test_framework import BitcoinTestFramework -from test_framework.util import * +from test_framework.util import assert_equal, create_confirmed_utxos, hex_str_to_bytes HTTP_DISCONNECT_ERRORS = [http.client.CannotSendRequest] try: @@ -46,6 +45,8 @@ class ChainstateWriteCrashTest(BitcoinTestFramework): def set_test_params(self): self.num_nodes = 4 self.setup_clean_chain = False + # Need a bit of extra time for the nodes to start up for this test + self.rpc_timewait = 90 # Set -maxmempool=0 to turn off mempool memory sharing with dbcache # Set -rpcservertimeout=900 to reduce socket disconnects in this @@ -63,8 +64,7 @@ class ChainstateWriteCrashTest(BitcoinTestFramework): self.extra_args = [self.node0_args, self.node1_args, self.node2_args, self.node3_args] def setup_network(self): - # Need a bit of extra time for the nodes to start up for this test - self.add_nodes(self.num_nodes, extra_args=self.extra_args, timewait=90) + self.add_nodes(self.num_nodes, extra_args=self.extra_args) self.start_nodes() # Leave them unconnected, we'll use submitblock directly in this test diff --git a/test/functional/feature_dersig.py b/test/functional/feature_dersig.py index 13224466d3..53e94c436a 100755 --- a/test/functional/feature_dersig.py +++ b/test/functional/feature_dersig.py @@ -1,5 +1,5 @@ #!/usr/bin/env python3 -# Copyright (c) 2015-2017 The Bitcoin Core developers +# Copyright (c) 2015-2018 The Bitcoin Core developers # Distributed under the MIT software license, see the accompanying # file COPYING or http://www.opensource.org/licenses/mit-license.php. """Test BIP66 (DER SIG). @@ -7,12 +7,12 @@ Test that the DERSIG soft-fork activates at (regtest) height 1251. """ -from test_framework.test_framework import BitcoinTestFramework -from test_framework.util import * -from test_framework.mininode import * -from test_framework.blocktools import create_coinbase, create_block +from test_framework.blocktools import create_coinbase, create_block, create_transaction +from test_framework.messages import msg_block +from test_framework.mininode import mininode_lock, P2PInterface from test_framework.script import CScript -from io import BytesIO +from test_framework.test_framework import BitcoinTestFramework +from test_framework.util import assert_equal, bytes_to_hex_str, wait_until DERSIG_HEIGHT = 1251 @@ -37,36 +37,25 @@ def unDERify(tx): newscript.append(i) tx.vin[0].scriptSig = CScript(newscript) -def create_transaction(node, coinbase, to_address, amount): - from_txid = node.getblock(coinbase)['tx'][0] - inputs = [{ "txid" : from_txid, "vout" : 0}] - outputs = { to_address : amount } - rawtx = node.createrawtransaction(inputs, outputs) - signresult = node.signrawtransactionwithwallet(rawtx) - tx = CTransaction() - tx.deserialize(BytesIO(hex_str_to_bytes(signresult['hex']))) - return tx + class BIP66Test(BitcoinTestFramework): def set_test_params(self): self.num_nodes = 1 - self.extra_args = [['-promiscuousmempoolflags=1', '-whitelist=127.0.0.1']] + self.extra_args = [['-whitelist=127.0.0.1']] self.setup_clean_chain = True def run_test(self): self.nodes[0].add_p2p_connection(P2PInterface()) - # wait_for_verack ensures that the P2P connection is fully up. - self.nodes[0].p2p.wait_for_verack() - self.log.info("Mining %d blocks", DERSIG_HEIGHT - 2) - self.coinbase_blocks = self.nodes[0].generate(DERSIG_HEIGHT - 2) + self.coinbase_txids = [self.nodes[0].getblock(b)['tx'][0] for b in self.nodes[0].generate(DERSIG_HEIGHT - 2)] self.nodeaddress = self.nodes[0].getnewaddress() self.log.info("Test that a transaction with non-DER signature can still appear in a block") - spendtx = create_transaction(self.nodes[0], self.coinbase_blocks[0], - self.nodeaddress, 1.0) + spendtx = create_transaction(self.nodes[0], self.coinbase_txids[0], + self.nodeaddress, amount=1.0) unDERify(spendtx) spendtx.rehash() @@ -102,18 +91,19 @@ class BIP66Test(BitcoinTestFramework): self.log.info("Test that transactions with non-DER signatures cannot appear in a block") block.nVersion = 3 - spendtx = create_transaction(self.nodes[0], self.coinbase_blocks[1], - self.nodeaddress, 1.0) + spendtx = create_transaction(self.nodes[0], self.coinbase_txids[1], + self.nodeaddress, amount=1.0) unDERify(spendtx) spendtx.rehash() # First we show that this tx is valid except for DERSIG by getting it - # accepted to the mempool (which we can achieve with - # -promiscuousmempoolflags). - self.nodes[0].p2p.send_and_ping(msg_tx(spendtx)) - assert spendtx.hash in self.nodes[0].getrawmempool() + # rejected from the mempool for exactly that reason. + assert_equal( + [{'txid': spendtx.hash, 'allowed': False, 'reject-reason': '64: non-mandatory-script-verify-flag (Non-canonical DER signature)'}], + self.nodes[0].testmempoolaccept(rawtxs=[bytes_to_hex_str(spendtx.serialize())], allowhighfees=True) + ) - # Now we verify that a block with this transaction is invalid. + # Now we verify that a block with this transaction is also invalid. block.vtx.append(spendtx) block.hashMerkleRoot = block.calc_merkle_root() block.rehash() @@ -138,8 +128,7 @@ class BIP66Test(BitcoinTestFramework): assert b'Non-canonical DER signature' in self.nodes[0].p2p.last_message["reject"].reason self.log.info("Test that a version 3 block with a DERSIG-compliant transaction is accepted") - block.vtx[1] = create_transaction(self.nodes[0], - self.coinbase_blocks[1], self.nodeaddress, 1.0) + block.vtx[1] = create_transaction(self.nodes[0], self.coinbase_txids[1], self.nodeaddress, amount=1.0) block.hashMerkleRoot = block.calc_merkle_root() block.rehash() block.solve() diff --git a/test/functional/feature_fee_estimation.py b/test/functional/feature_fee_estimation.py index 32a6bd5d59..709910f2e4 100755 --- a/test/functional/feature_fee_estimation.py +++ b/test/functional/feature_fee_estimation.py @@ -1,12 +1,12 @@ #!/usr/bin/env python3 -# Copyright (c) 2014-2017 The Bitcoin Core developers +# Copyright (c) 2014-2018 The Bitcoin Core developers # Distributed under the MIT software license, see the accompanying # file COPYING or http://www.opensource.org/licenses/mit-license.php. """Test fee estimation code.""" from decimal import Decimal import random -from test_framework.mininode import CTransaction, CTxIn, CTxOut, COutPoint, ToHex, COIN +from test_framework.messages import CTransaction, CTxIn, CTxOut, COutPoint, ToHex, COIN from test_framework.script import CScript, OP_1, OP_DROP, OP_2, OP_HASH160, OP_EQUAL, hash160, OP_TRUE from test_framework.test_framework import BitcoinTestFramework from test_framework.util import ( diff --git a/test/functional/feature_help.py b/test/functional/feature_help.py index d38275a9ca..ed1d25c0d6 100755 --- a/test/functional/feature_help.py +++ b/test/functional/feature_help.py @@ -3,7 +3,6 @@ # Distributed under the MIT software license, see the accompanying # file COPYING or http://www.opensource.org/licenses/mit-license.php. """Verify that starting bitcoin with -h works as expected.""" -import subprocess from test_framework.test_framework import BitcoinTestFramework from test_framework.util import assert_equal @@ -17,41 +16,47 @@ class HelpTest(BitcoinTestFramework): self.add_nodes(self.num_nodes) # Don't start the node + def get_node_output(self, *, ret_code_expected): + ret_code = self.nodes[0].process.wait(timeout=5) + assert_equal(ret_code, ret_code_expected) + self.nodes[0].stdout.seek(0) + self.nodes[0].stderr.seek(0) + out = self.nodes[0].stdout.read() + err = self.nodes[0].stderr.read() + self.nodes[0].stdout.close() + self.nodes[0].stderr.close() + + # Clean up TestNode state + self.nodes[0].running = False + self.nodes[0].process = None + self.nodes[0].rpc_connected = False + self.nodes[0].rpc = None + + return out, err + def run_test(self): self.log.info("Start bitcoin with -h for help text") - self.nodes[0].start(extra_args=['-h'], stderr=subprocess.PIPE, stdout=subprocess.PIPE) + self.nodes[0].start(extra_args=['-h']) # Node should exit immediately and output help to stdout. - ret_code = self.nodes[0].process.wait(timeout=1) - assert_equal(ret_code, 0) - output = self.nodes[0].process.stdout.read() + output, _ = self.get_node_output(ret_code_expected=0) assert b'Options' in output self.log.info("Help text received: {} (...)".format(output[0:60])) - self.nodes[0].running = False self.log.info("Start bitcoin with -version for version information") - self.nodes[0].start(extra_args=['-version'], stderr=subprocess.PIPE, stdout=subprocess.PIPE) + self.nodes[0].start(extra_args=['-version']) # Node should exit immediately and output version to stdout. - ret_code = self.nodes[0].process.wait(timeout=1) - assert_equal(ret_code, 0) - output = self.nodes[0].process.stdout.read() + output, _ = self.get_node_output(ret_code_expected=0) assert b'version' in output self.log.info("Version text received: {} (...)".format(output[0:60])) # Test that arguments not in the help results in an error self.log.info("Start bitcoind with -fakearg to make sure it does not start") - self.nodes[0].start(extra_args=['-fakearg'], stderr=subprocess.PIPE, stdout=subprocess.PIPE) + self.nodes[0].start(extra_args=['-fakearg']) # Node should exit immediately and output an error to stderr - ret_code = self.nodes[0].process.wait(timeout=1) - assert_equal(ret_code, 1) - output = self.nodes[0].process.stderr.read() + _, output = self.get_node_output(ret_code_expected=1) assert b'Error parsing command line arguments' in output self.log.info("Error message received: {} (...)".format(output[0:60])) - # Clean up TestNode state - self.nodes[0].running = False - self.nodes[0].process = None - self.nodes[0].rpc_connected = False - self.nodes[0].rpc = None if __name__ == '__main__': HelpTest().main() diff --git a/test/functional/feature_logging.py b/test/functional/feature_logging.py index 166f8f8694..8bb7e02695 100755 --- a/test/functional/feature_logging.py +++ b/test/functional/feature_logging.py @@ -1,5 +1,5 @@ #!/usr/bin/env python3 -# Copyright (c) 2017 The Bitcoin Core developers +# Copyright (c) 2017-2018 The Bitcoin Core developers # Distributed under the MIT software license, see the accompanying # file COPYING or http://www.opensource.org/licenses/mit-license.php. """Test debug logging.""" diff --git a/test/functional/feature_maxuploadtarget.py b/test/functional/feature_maxuploadtarget.py index c413ecf705..a81ebb4220 100755 --- a/test/functional/feature_maxuploadtarget.py +++ b/test/functional/feature_maxuploadtarget.py @@ -1,5 +1,5 @@ #!/usr/bin/env python3 -# Copyright (c) 2015-2017 The Bitcoin Core developers +# Copyright (c) 2015-2018 The Bitcoin Core developers # Distributed under the MIT software license, see the accompanying # file COPYING or http://www.opensource.org/licenses/mit-license.php. """Test behavior of -maxuploadtarget. @@ -13,9 +13,10 @@ if uploadtarget has been reached. from collections import defaultdict import time -from test_framework.mininode import * +from test_framework.messages import CInv, msg_getdata +from test_framework.mininode import P2PInterface from test_framework.test_framework import BitcoinTestFramework -from test_framework.util import * +from test_framework.util import assert_equal, mine_large_block class TestP2PConn(P2PInterface): def __init__(self): @@ -57,11 +58,6 @@ class MaxUploadTest(BitcoinTestFramework): for _ in range(3): p2p_conns.append(self.nodes[0].add_p2p_connection(TestP2PConn())) - for p2pc in p2p_conns: - p2pc.wait_for_verack() - - # Test logic begins here - # Now mine a big block mine_large_block(self.nodes[0], self.utxo_cache) @@ -147,7 +143,6 @@ class MaxUploadTest(BitcoinTestFramework): # Reconnect to self.nodes[0] self.nodes[0].add_p2p_connection(TestP2PConn()) - self.nodes[0].p2p.wait_for_verack() #retrieve 20 blocks which should be enough to break the 1MB limit getdata_request.inv = [CInv(2, big_new_block)] diff --git a/test/functional/feature_minchainwork.py b/test/functional/feature_minchainwork.py index 90a3de0e0d..a1cced0bc7 100755 --- a/test/functional/feature_minchainwork.py +++ b/test/functional/feature_minchainwork.py @@ -1,5 +1,5 @@ #!/usr/bin/env python3 -# Copyright (c) 2017 The Bitcoin Core developers +# Copyright (c) 2017-2018 The Bitcoin Core developers # Distributed under the MIT software license, see the accompanying # file COPYING or http://www.opensource.org/licenses/mit-license.php. """Test logic for setting nMinimumChainWork on command line. diff --git a/test/functional/feature_notifications.py b/test/functional/feature_notifications.py index 6d51f31e35..71e5e493aa 100755 --- a/test/functional/feature_notifications.py +++ b/test/functional/feature_notifications.py @@ -1,5 +1,5 @@ #!/usr/bin/env python3 -# Copyright (c) 2014-2017 The Bitcoin Core developers +# Copyright (c) 2014-2018 The Bitcoin Core developers # Distributed under the MIT software license, see the accompanying # file COPYING or http://www.opensource.org/licenses/mit-license.php. """Test the -alertnotify, -blocknotify and -walletnotify options.""" diff --git a/test/functional/feature_nulldummy.py b/test/functional/feature_nulldummy.py index 24659eac77..9d1805ec2d 100755 --- a/test/functional/feature_nulldummy.py +++ b/test/functional/feature_nulldummy.py @@ -1,5 +1,5 @@ #!/usr/bin/env python3 -# Copyright (c) 2016-2017 The Bitcoin Core developers +# Copyright (c) 2016-2018 The Bitcoin Core developers # Distributed under the MIT software license, see the accompanying # file COPYING or http://www.opensource.org/licenses/mit-license.php. """Test NULLDUMMY softfork. @@ -13,12 +13,12 @@ Generate 427 more blocks. [Policy/Consensus] Check that the new NULLDUMMY rules are enforced on the 432nd block. """ -from test_framework.test_framework import BitcoinTestFramework -from test_framework.util import * +from test_framework.blocktools import create_coinbase, create_block, create_transaction, add_witness_commitment from test_framework.messages import CTransaction -from test_framework.blocktools import create_coinbase, create_block, add_witness_commitment from test_framework.script import CScript -from io import BytesIO +from test_framework.test_framework import BitcoinTestFramework +from test_framework.util import assert_equal, assert_raises_rpc_error, bytes_to_hex_str + import time NULLDUMMY_ERROR = "non-mandatory-script-verify-flag (Dummy CHECKMULTISIG argument must be zero) (code 64)" @@ -61,16 +61,16 @@ class NULLDUMMYTest(BitcoinTestFramework): self.lastblocktime = int(time.time()) + 429 self.log.info("Test 1: NULLDUMMY compliant base transactions should be accepted to mempool and mined before activation [430]") - test1txs = [self.create_transaction(self.nodes[0], coinbase_txid[0], self.ms_address, 49)] + test1txs = [create_transaction(self.nodes[0], coinbase_txid[0], self.ms_address, amount=49)] txid1 = self.nodes[0].sendrawtransaction(bytes_to_hex_str(test1txs[0].serialize_with_witness()), True) - test1txs.append(self.create_transaction(self.nodes[0], txid1, self.ms_address, 48)) + test1txs.append(create_transaction(self.nodes[0], txid1, self.ms_address, amount=48)) txid2 = self.nodes[0].sendrawtransaction(bytes_to_hex_str(test1txs[1].serialize_with_witness()), True) - test1txs.append(self.create_transaction(self.nodes[0], coinbase_txid[1], self.wit_ms_address, 49)) + test1txs.append(create_transaction(self.nodes[0], coinbase_txid[1], self.wit_ms_address, amount=49)) txid3 = self.nodes[0].sendrawtransaction(bytes_to_hex_str(test1txs[2].serialize_with_witness()), True) self.block_submit(self.nodes[0], test1txs, False, True) self.log.info("Test 2: Non-NULLDUMMY base multisig transaction should not be accepted to mempool before activation") - test2tx = self.create_transaction(self.nodes[0], txid2, self.ms_address, 47) + test2tx = create_transaction(self.nodes[0], txid2, self.ms_address, amount=47) trueDummy(test2tx) assert_raises_rpc_error(-26, NULLDUMMY_ERROR, self.nodes[0].sendrawtransaction, bytes_to_hex_str(test2tx.serialize_with_witness()), True) @@ -78,14 +78,14 @@ class NULLDUMMYTest(BitcoinTestFramework): self.block_submit(self.nodes[0], [test2tx], False, True) self.log.info("Test 4: Non-NULLDUMMY base multisig transaction is invalid after activation") - test4tx = self.create_transaction(self.nodes[0], test2tx.hash, self.address, 46) + test4tx = create_transaction(self.nodes[0], test2tx.hash, self.address, amount=46) test6txs=[CTransaction(test4tx)] trueDummy(test4tx) assert_raises_rpc_error(-26, NULLDUMMY_ERROR, self.nodes[0].sendrawtransaction, bytes_to_hex_str(test4tx.serialize_with_witness()), True) self.block_submit(self.nodes[0], [test4tx]) self.log.info("Test 5: Non-NULLDUMMY P2WSH multisig transaction invalid after activation") - test5tx = self.create_transaction(self.nodes[0], txid3, self.wit_address, 48) + test5tx = create_transaction(self.nodes[0], txid3, self.wit_address, amount=48) test6txs.append(CTransaction(test5tx)) test5tx.wit.vtxinwit[0].scriptWitness.stack[0] = b'\x01' assert_raises_rpc_error(-26, NULLDUMMY_ERROR, self.nodes[0].sendrawtransaction, bytes_to_hex_str(test5tx.serialize_with_witness()), True) @@ -97,17 +97,6 @@ class NULLDUMMYTest(BitcoinTestFramework): self.block_submit(self.nodes[0], test6txs, True, True) - def create_transaction(self, node, txid, to_address, amount): - inputs = [{ "txid" : txid, "vout" : 0}] - outputs = { to_address : amount } - rawtx = node.createrawtransaction(inputs, outputs) - signresult = node.signrawtransactionwithwallet(rawtx) - tx = CTransaction() - f = BytesIO(hex_str_to_bytes(signresult['hex'])) - tx.deserialize(f) - return tx - - def block_submit(self, node, txs, witness = False, accept = False): block = create_block(self.tip, create_coinbase(self.lastblockheight + 1), self.lastblocktime + 1) block.nVersion = 4 diff --git a/test/functional/feature_proxy.py b/test/functional/feature_proxy.py index 2d10c547e2..31d2ee8e13 100755 --- a/test/functional/feature_proxy.py +++ b/test/functional/feature_proxy.py @@ -1,5 +1,5 @@ #!/usr/bin/env python3 -# Copyright (c) 2015-2017 The Bitcoin Core developers +# Copyright (c) 2015-2018 The Bitcoin Core developers # Distributed under the MIT software license, see the accompanying # file COPYING or http://www.opensource.org/licenses/mit-license.php. """Test bitcoind with different proxy configuration. diff --git a/test/functional/feature_pruning.py b/test/functional/feature_pruning.py index d400507a66..c8f4b7f8b5 100755 --- a/test/functional/feature_pruning.py +++ b/test/functional/feature_pruning.py @@ -1,5 +1,5 @@ #!/usr/bin/env python3 -# Copyright (c) 2014-2017 The Bitcoin Core developers +# Copyright (c) 2014-2018 The Bitcoin Core developers # Distributed under the MIT software license, see the accompanying # file COPYING or http://www.opensource.org/licenses/mit-license.php. """Test the pruning code. @@ -10,7 +10,8 @@ This test takes 30 mins or more (up to 2 hours) """ from test_framework.test_framework import BitcoinTestFramework -from test_framework.util import * +from test_framework.util import assert_equal, assert_greater_than, assert_raises_rpc_error, connect_nodes, mine_large_block, sync_blocks, wait_until + import os MIN_BLOCKS_TO_KEEP = 288 @@ -28,6 +29,7 @@ class PruneTest(BitcoinTestFramework): def set_test_params(self): self.setup_clean_chain = True self.num_nodes = 6 + self.rpc_timewait = 900 # Create nodes 0 and 1 to mine. # Create node 2 to test pruning. @@ -54,7 +56,7 @@ class PruneTest(BitcoinTestFramework): sync_blocks(self.nodes[0:5]) def setup_nodes(self): - self.add_nodes(self.num_nodes, self.extra_args, timewait=900) + self.add_nodes(self.num_nodes, self.extra_args) self.start_nodes() def create_big_chain(self): diff --git a/test/functional/feature_rbf.py b/test/functional/feature_rbf.py index c087960782..6105da810c 100755 --- a/test/functional/feature_rbf.py +++ b/test/functional/feature_rbf.py @@ -1,13 +1,15 @@ #!/usr/bin/env python3 -# Copyright (c) 2014-2017 The Bitcoin Core developers +# Copyright (c) 2014-2018 The Bitcoin Core developers # Distributed under the MIT software license, see the accompanying # file COPYING or http://www.opensource.org/licenses/mit-license.php. """Test the RBF code.""" +from decimal import Decimal + +from test_framework.messages import COIN, COutPoint, CTransaction, CTxIn, CTxOut +from test_framework.script import CScript, OP_DROP from test_framework.test_framework import BitcoinTestFramework -from test_framework.util import * -from test_framework.script import * -from test_framework.mininode import * +from test_framework.util import assert_equal, assert_raises_rpc_error, bytes_to_hex_str, satoshi_round MAX_REPLACEMENT_LIMIT = 100 diff --git a/test/functional/feature_reindex.py b/test/functional/feature_reindex.py index d1d3f1d7f1..f30e1191e3 100755 --- a/test/functional/feature_reindex.py +++ b/test/functional/feature_reindex.py @@ -1,5 +1,5 @@ #!/usr/bin/env python3 -# Copyright (c) 2014-2017 The Bitcoin Core developers +# Copyright (c) 2014-2018 The Bitcoin Core developers # Distributed under the MIT software license, see the accompanying # file COPYING or http://www.opensource.org/licenses/mit-license.php. """Test running bitcoind with -reindex and -reindex-chainstate options. @@ -22,7 +22,7 @@ class ReindexTest(BitcoinTestFramework): self.nodes[0].generate(3) blockcount = self.nodes[0].getblockcount() self.stop_nodes() - extra_args = [["-reindex-chainstate" if justchainstate else "-reindex", "-checkblockindex=1"]] + extra_args = [["-reindex-chainstate" if justchainstate else "-reindex"]] self.start_nodes(extra_args) wait_until(lambda: self.nodes[0].getblockcount() == blockcount) self.log.info("Success") diff --git a/test/functional/feature_segwit.py b/test/functional/feature_segwit.py index b10306b283..13d7758e13 100755 --- a/test/functional/feature_segwit.py +++ b/test/functional/feature_segwit.py @@ -1,22 +1,26 @@ #!/usr/bin/env python3 -# Copyright (c) 2016-2017 The Bitcoin Core developers +# Copyright (c) 2016-2018 The Bitcoin Core developers # Distributed under the MIT software license, see the accompanying # file COPYING or http://www.opensource.org/licenses/mit-license.php. """Test the SegWit changeover logic.""" +from decimal import Decimal + from test_framework.address import ( + key_to_p2pkh, key_to_p2sh_p2wpkh, key_to_p2wpkh, program_to_witness, + script_to_p2sh, script_to_p2sh_p2wsh, script_to_p2wsh, ) from test_framework.blocktools import witness_script, send_to_witness -from test_framework.test_framework import BitcoinTestFramework -from test_framework.util import * -from test_framework.mininode import sha256, CTransaction, CTxIn, COutPoint, CTxOut, COIN, ToHex, FromHex -from test_framework.address import script_to_p2sh, key_to_p2pkh +from test_framework.messages import COIN, COutPoint, CTransaction, CTxIn, CTxOut, FromHex, sha256, ToHex from test_framework.script import CScript, OP_HASH160, OP_CHECKSIG, OP_0, hash160, OP_EQUAL, OP_DUP, OP_EQUALVERIFY, OP_1, OP_2, OP_CHECKMULTISIG, OP_TRUE, OP_DROP +from test_framework.test_framework import BitcoinTestFramework +from test_framework.util import assert_equal, assert_raises_rpc_error, bytes_to_hex_str, connect_nodes, hex_str_to_bytes, sync_blocks, try_rpc + from io import BytesIO NODE_0 = 0 @@ -43,8 +47,8 @@ class SegWitTest(BitcoinTestFramework): self.num_nodes = 3 # This test tests SegWit both pre and post-activation, so use the normal BIP9 activation. self.extra_args = [["-rpcserialversion=0", "-vbparams=segwit:0:999999999999", "-addresstype=legacy", "-deprecatedrpc=addwitnessaddress"], - ["-blockversion=4", "-promiscuousmempoolflags=517", "-rpcserialversion=1", "-vbparams=segwit:0:999999999999", "-addresstype=legacy", "-deprecatedrpc=addwitnessaddress"], - ["-blockversion=536870915", "-promiscuousmempoolflags=517", "-vbparams=segwit:0:999999999999", "-addresstype=legacy", "-deprecatedrpc=addwitnessaddress"]] + ["-blockversion=4", "-rpcserialversion=1", "-vbparams=segwit:0:999999999999", "-addresstype=legacy", "-deprecatedrpc=addwitnessaddress"], + ["-blockversion=536870915", "-vbparams=segwit:0:999999999999", "-addresstype=legacy", "-deprecatedrpc=addwitnessaddress"]] def setup_network(self): super().setup_network() @@ -64,12 +68,8 @@ class SegWitTest(BitcoinTestFramework): sync_blocks(self.nodes) def fail_accept(self, node, error_msg, txid, sign, redeem_script=""): - assert_raises_rpc_error(-26, error_msg, send_to_witness, 1, node, getutxo(txid), self.pubkey[0], False, Decimal("49.998"), sign, redeem_script) + assert_raises_rpc_error(-26, error_msg, send_to_witness, use_p2wsh=1, node=node, utxo=getutxo(txid), pubkey=self.pubkey[0], encode_p2sh=False, amount=Decimal("49.998"), sign=sign, insert_redeem_script=redeem_script) - def fail_mine(self, node, txid, sign, redeem_script=""): - send_to_witness(1, node, getutxo(txid), self.pubkey[0], False, Decimal("49.998"), sign, redeem_script) - assert_raises_rpc_error(-1, "CreateNewBlock: TestBlockValidity failed", node.generate, 1) - sync_blocks(self.nodes) def run_test(self): self.nodes[0].generate(161) #block 161 @@ -171,10 +171,10 @@ class SegWitTest(BitcoinTestFramework): assert(self.nodes[0].getrawtransaction(segwit_tx_list[i]) == bytes_to_hex_str(tx.serialize_without_witness())) self.log.info("Verify witness txs without witness data are invalid after the fork") - self.fail_mine(self.nodes[2], wit_ids[NODE_2][WIT_V0][2], False) - self.fail_mine(self.nodes[2], wit_ids[NODE_2][WIT_V1][2], False) - self.fail_mine(self.nodes[2], p2sh_ids[NODE_2][WIT_V0][2], False, witness_script(False, self.pubkey[2])) - self.fail_mine(self.nodes[2], p2sh_ids[NODE_2][WIT_V1][2], False, witness_script(True, self.pubkey[2])) + self.fail_accept(self.nodes[2], 'non-mandatory-script-verify-flag (Witness program hash mismatch) (code 64)', wit_ids[NODE_2][WIT_V0][2], sign=False) + self.fail_accept(self.nodes[2], 'non-mandatory-script-verify-flag (Witness program was passed an empty witness) (code 64)', wit_ids[NODE_2][WIT_V1][2], sign=False) + self.fail_accept(self.nodes[2], 'non-mandatory-script-verify-flag (Witness program hash mismatch) (code 64)', p2sh_ids[NODE_2][WIT_V0][2], sign=False, redeem_script=witness_script(False, self.pubkey[2])) + self.fail_accept(self.nodes[2], 'non-mandatory-script-verify-flag (Witness program was passed an empty witness) (code 64)', p2sh_ids[NODE_2][WIT_V1][2], sign=False, redeem_script=witness_script(True, self.pubkey[2])) self.log.info("Verify default node can now use witness txs") self.success_mine(self.nodes[0], wit_ids[NODE_0][WIT_V0][0], True) #block 432 diff --git a/test/functional/feature_uacomment.py b/test/functional/feature_uacomment.py index 80bd7ff29f..691a39b825 100755 --- a/test/functional/feature_uacomment.py +++ b/test/functional/feature_uacomment.py @@ -1,5 +1,5 @@ #!/usr/bin/env python3 -# Copyright (c) 2017 The Bitcoin Core developers +# Copyright (c) 2017-2018 The Bitcoin Core developers # Distributed under the MIT software license, see the accompanying # file COPYING or http://www.opensource.org/licenses/mit-license.php. """Test the -uacomment option.""" diff --git a/test/functional/feature_versionbits_warning.py b/test/functional/feature_versionbits_warning.py index a03c20b088..896c36fa53 100755 --- a/test/functional/feature_versionbits_warning.py +++ b/test/functional/feature_versionbits_warning.py @@ -1,5 +1,5 @@ #!/usr/bin/env python3 -# Copyright (c) 2016-2017 The Bitcoin Core developers +# Copyright (c) 2016-2018 The Bitcoin Core developers # Distributed under the MIT software license, see the accompanying # file COPYING or http://www.opensource.org/licenses/mit-license.php. """Test version bits warning system. @@ -62,10 +62,8 @@ class VersionBitsWarningTest(BitcoinTestFramework): return VB_PATTERN.search(alert_text) is not None def run_test(self): - # Handy alias node = self.nodes[0] node.add_p2p_connection(P2PInterface()) - node.p2p.wait_for_verack() # Mine one period worth of blocks node.generate(VB_PERIOD) diff --git a/test/functional/interface_bitcoin_cli.py b/test/functional/interface_bitcoin_cli.py index b097c64b13..d3b85ce948 100755 --- a/test/functional/interface_bitcoin_cli.py +++ b/test/functional/interface_bitcoin_cli.py @@ -1,5 +1,5 @@ #!/usr/bin/env python3 -# Copyright (c) 2017 The Bitcoin Core developers +# Copyright (c) 2017-2018 The Bitcoin Core developers # Distributed under the MIT software license, see the accompanying # file COPYING or http://www.opensource.org/licenses/mit-license.php. """Test bitcoin-cli""" diff --git a/test/functional/interface_http.py b/test/functional/interface_http.py index cd6d744545..e4b86f9e1e 100755 --- a/test/functional/interface_http.py +++ b/test/functional/interface_http.py @@ -1,11 +1,11 @@ #!/usr/bin/env python3 -# Copyright (c) 2014-2017 The Bitcoin Core developers +# Copyright (c) 2014-2018 The Bitcoin Core developers # Distributed under the MIT software license, see the accompanying # file COPYING or http://www.opensource.org/licenses/mit-license.php. """Test the RPC HTTP basics.""" from test_framework.test_framework import BitcoinTestFramework -from test_framework.util import * +from test_framework.util import assert_equal, str_to_b64str import http.client import urllib.parse diff --git a/test/functional/interface_rest.py b/test/functional/interface_rest.py index a48939d2e0..41a1b4a35d 100755 --- a/test/functional/interface_rest.py +++ b/test/functional/interface_rest.py @@ -1,5 +1,5 @@ #!/usr/bin/env python3 -# Copyright (c) 2014-2017 The Bitcoin Core developers +# Copyright (c) 2014-2018 The Bitcoin Core developers # Distributed under the MIT software license, see the accompanying # file COPYING or http://www.opensource.org/licenses/mit-license.php. """Test the REST API.""" diff --git a/test/functional/interface_zmq.py b/test/functional/interface_zmq.py index def71c5f0f..72de696259 100755 --- a/test/functional/interface_zmq.py +++ b/test/functional/interface_zmq.py @@ -1,5 +1,5 @@ #!/usr/bin/env python3 -# Copyright (c) 2015-2017 The Bitcoin Core developers +# Copyright (c) 2015-2018 The Bitcoin Core developers # Distributed under the MIT software license, see the accompanying # file COPYING or http://www.opensource.org/licenses/mit-license.php. """Test the ZMQ notification interface.""" @@ -7,7 +7,7 @@ import struct from test_framework.test_framework import ( BitcoinTestFramework, skip_if_no_bitcoind_zmq, skip_if_no_py3_zmq) -from test_framework.mininode import CTransaction +from test_framework.messages import CTransaction from test_framework.util import (assert_equal, bytes_to_hex_str, hash256, diff --git a/test/functional/mempool_accept.py b/test/functional/mempool_accept.py index 7cdb24c6a5..44426a0ff7 100755 --- a/test/functional/mempool_accept.py +++ b/test/functional/mempool_accept.py @@ -35,7 +35,6 @@ class MempoolAcceptanceTest(BitcoinTestFramework): def set_test_params(self): self.num_nodes = 1 self.extra_args = [[ - '-checkmempool', '-txindex', '-reindex', # Need reindex for txindex '-acceptnonstdtxn=0', # Try to mimic main-net diff --git a/test/functional/mempool_limit.py b/test/functional/mempool_limit.py index 5382fe439e..55422b67df 100755 --- a/test/functional/mempool_limit.py +++ b/test/functional/mempool_limit.py @@ -1,11 +1,13 @@ #!/usr/bin/env python3 -# Copyright (c) 2014-2017 The Bitcoin Core developers +# Copyright (c) 2014-2018 The Bitcoin Core developers # Distributed under the MIT software license, see the accompanying # file COPYING or http://www.opensource.org/licenses/mit-license.php. """Test mempool limiting together/eviction with the wallet.""" +from decimal import Decimal + from test_framework.test_framework import BitcoinTestFramework -from test_framework.util import * +from test_framework.util import assert_equal, assert_greater_than, assert_raises_rpc_error, create_confirmed_utxos, create_lots_of_big_transactions, gen_return_txouts class MempoolLimitTest(BitcoinTestFramework): def set_test_params(self): diff --git a/test/functional/mempool_packages.py b/test/functional/mempool_packages.py index 79cf159f43..da254181fe 100755 --- a/test/functional/mempool_packages.py +++ b/test/functional/mempool_packages.py @@ -1,12 +1,14 @@ #!/usr/bin/env python3 -# Copyright (c) 2014-2017 The Bitcoin Core developers +# Copyright (c) 2014-2018 The Bitcoin Core developers # Distributed under the MIT software license, see the accompanying # file COPYING or http://www.opensource.org/licenses/mit-license.php. """Test descendant package tracking code.""" +from decimal import Decimal + +from test_framework.messages import COIN from test_framework.test_framework import BitcoinTestFramework -from test_framework.util import * -from test_framework.mininode import COIN +from test_framework.util import assert_equal, assert_raises_rpc_error, satoshi_round, sync_blocks, sync_mempools MAX_ANCESTORS = 25 MAX_DESCENDANTS = 25 diff --git a/test/functional/mempool_persist.py b/test/functional/mempool_persist.py index 83dffb0521..6e5f89efb8 100755 --- a/test/functional/mempool_persist.py +++ b/test/functional/mempool_persist.py @@ -1,5 +1,5 @@ #!/usr/bin/env python3 -# Copyright (c) 2014-2017 The Bitcoin Core developers +# Copyright (c) 2014-2018 The Bitcoin Core developers # Distributed under the MIT software license, see the accompanying # file COPYING or http://www.opensource.org/licenses/mit-license.php. """Test mempool persistence. @@ -35,11 +35,12 @@ Test is as follows: node1 can't write to disk. """ +from decimal import Decimal import os import time from test_framework.test_framework import BitcoinTestFramework -from test_framework.util import * +from test_framework.util import assert_equal, assert_raises_rpc_error, wait_until class MempoolPersistTest(BitcoinTestFramework): def set_test_params(self): diff --git a/test/functional/mempool_reorg.py b/test/functional/mempool_reorg.py index eabed5d633..faa00d56cf 100755 --- a/test/functional/mempool_reorg.py +++ b/test/functional/mempool_reorg.py @@ -1,5 +1,5 @@ #!/usr/bin/env python3 -# Copyright (c) 2014-2017 The Bitcoin Core developers +# Copyright (c) 2014-2018 The Bitcoin Core developers # Distributed under the MIT software license, see the accompanying # file COPYING or http://www.opensource.org/licenses/mit-license.php. """Test mempool re-org scenarios. @@ -8,14 +8,14 @@ Test re-org scenarios with a mempool that contains transactions that spend (directly or indirectly) coinbase transactions. """ +from test_framework.blocktools import create_raw_transaction from test_framework.test_framework import BitcoinTestFramework -from test_framework.util import * +from test_framework.util import assert_equal, assert_raises_rpc_error + -# Create one-input, one-output, no-fee transaction: class MempoolCoinbaseTest(BitcoinTestFramework): def set_test_params(self): self.num_nodes = 2 - self.extra_args = [["-checkmempool"]] * 2 alert_filename = None # Set by setup_network @@ -39,9 +39,9 @@ class MempoolCoinbaseTest(BitcoinTestFramework): # and make sure the mempool code behaves correctly. b = [ self.nodes[0].getblockhash(n) for n in range(101, 105) ] coinbase_txids = [ self.nodes[0].getblock(h)['tx'][0] for h in b ] - spend_101_raw = create_tx(self.nodes[0], coinbase_txids[1], node1_address, 49.99) - spend_102_raw = create_tx(self.nodes[0], coinbase_txids[2], node0_address, 49.99) - spend_103_raw = create_tx(self.nodes[0], coinbase_txids[3], node0_address, 49.99) + spend_101_raw = create_raw_transaction(self.nodes[0], coinbase_txids[1], node1_address, amount=49.99) + spend_102_raw = create_raw_transaction(self.nodes[0], coinbase_txids[2], node0_address, amount=49.99) + spend_103_raw = create_raw_transaction(self.nodes[0], coinbase_txids[3], node0_address, amount=49.99) # Create a transaction which is time-locked to two blocks in the future timelock_tx = self.nodes[0].createrawtransaction([{"txid": coinbase_txids[0], "vout": 0}], {node0_address: 49.99}) @@ -57,11 +57,11 @@ class MempoolCoinbaseTest(BitcoinTestFramework): spend_103_id = self.nodes[0].sendrawtransaction(spend_103_raw) self.nodes[0].generate(1) # Time-locked transaction is still too immature to spend - assert_raises_rpc_error(-26,'non-final', self.nodes[0].sendrawtransaction, timelock_tx) + assert_raises_rpc_error(-26, 'non-final', self.nodes[0].sendrawtransaction, timelock_tx) # Create 102_1 and 103_1: - spend_102_1_raw = create_tx(self.nodes[0], spend_102_id, node1_address, 49.98) - spend_103_1_raw = create_tx(self.nodes[0], spend_103_id, node1_address, 49.98) + spend_102_1_raw = create_raw_transaction(self.nodes[0], spend_102_id, node1_address, amount=49.98) + spend_103_1_raw = create_raw_transaction(self.nodes[0], spend_103_id, node1_address, amount=49.98) # Broadcast and mine 103_1: spend_103_1_id = self.nodes[0].sendrawtransaction(spend_103_1_raw) diff --git a/test/functional/mempool_resurrect.py b/test/functional/mempool_resurrect.py index 83e84da4bc..23939f0be5 100755 --- a/test/functional/mempool_resurrect.py +++ b/test/functional/mempool_resurrect.py @@ -1,17 +1,17 @@ #!/usr/bin/env python3 -# Copyright (c) 2014-2017 The Bitcoin Core developers +# Copyright (c) 2014-2018 The Bitcoin Core developers # Distributed under the MIT software license, see the accompanying # file COPYING or http://www.opensource.org/licenses/mit-license.php. """Test resurrection of mined transactions when the blockchain is re-organized.""" +from test_framework.blocktools import create_raw_transaction from test_framework.test_framework import BitcoinTestFramework -from test_framework.util import * +from test_framework.util import assert_equal + -# Create one-input, one-output, no-fee transaction: class MempoolCoinbaseTest(BitcoinTestFramework): def set_test_params(self): self.num_nodes = 1 - self.extra_args = [["-checkmempool"]] def run_test(self): node0_address = self.nodes[0].getnewaddress() @@ -25,16 +25,16 @@ class MempoolCoinbaseTest(BitcoinTestFramework): # Mine a new block # ... make sure all the transactions are confirmed again. - b = [ self.nodes[0].getblockhash(n) for n in range(1, 4) ] - coinbase_txids = [ self.nodes[0].getblock(h)['tx'][0] for h in b ] - spends1_raw = [ create_tx(self.nodes[0], txid, node0_address, 49.99) for txid in coinbase_txids ] - spends1_id = [ self.nodes[0].sendrawtransaction(tx) for tx in spends1_raw ] + b = [self.nodes[0].getblockhash(n) for n in range(1, 4)] + coinbase_txids = [self.nodes[0].getblock(h)['tx'][0] for h in b] + spends1_raw = [create_raw_transaction(self.nodes[0], txid, node0_address, amount=49.99) for txid in coinbase_txids] + spends1_id = [self.nodes[0].sendrawtransaction(tx) for tx in spends1_raw] blocks = [] blocks.extend(self.nodes[0].generate(1)) - spends2_raw = [ create_tx(self.nodes[0], txid, node0_address, 49.98) for txid in spends1_id ] - spends2_id = [ self.nodes[0].sendrawtransaction(tx) for tx in spends2_raw ] + spends2_raw = [create_raw_transaction(self.nodes[0], txid, node0_address, amount=49.98) for txid in spends1_id] + spends2_id = [self.nodes[0].sendrawtransaction(tx) for tx in spends2_raw] blocks.extend(self.nodes[0].generate(1)) diff --git a/test/functional/mempool_spend_coinbase.py b/test/functional/mempool_spend_coinbase.py index db0738c08a..ce3bc3b7e0 100755 --- a/test/functional/mempool_spend_coinbase.py +++ b/test/functional/mempool_spend_coinbase.py @@ -1,5 +1,5 @@ #!/usr/bin/env python3 -# Copyright (c) 2014-2017 The Bitcoin Core developers +# Copyright (c) 2014-2018 The Bitcoin Core developers # Distributed under the MIT software license, see the accompanying # file COPYING or http://www.opensource.org/licenses/mit-license.php. """Test spending coinbase transactions. @@ -13,13 +13,13 @@ but less mature coinbase spends are NOT. """ from test_framework.test_framework import BitcoinTestFramework -from test_framework.util import * +from test_framework.blocktools import create_raw_transaction +from test_framework.util import assert_equal, assert_raises_rpc_error + -# Create one-input, one-output, no-fee transaction: class MempoolSpendCoinbaseTest(BitcoinTestFramework): def set_test_params(self): self.num_nodes = 1 - self.extra_args = [["-checkmempool"]] def run_test(self): chain_height = self.nodes[0].getblockcount() @@ -29,9 +29,9 @@ class MempoolSpendCoinbaseTest(BitcoinTestFramework): # Coinbase at height chain_height-100+1 ok in mempool, should # get mined. Coinbase at height chain_height-100+2 is # is too immature to spend. - b = [ self.nodes[0].getblockhash(n) for n in range(101, 103) ] - coinbase_txids = [ self.nodes[0].getblock(h)['tx'][0] for h in b ] - spends_raw = [ create_tx(self.nodes[0], txid, node0_address, 49.99) for txid in coinbase_txids ] + b = [self.nodes[0].getblockhash(n) for n in range(101, 103)] + coinbase_txids = [self.nodes[0].getblock(h)['tx'][0] for h in b] + spends_raw = [create_raw_transaction(self.nodes[0], txid, node0_address, amount=49.99) for txid in coinbase_txids] spend_101_id = self.nodes[0].sendrawtransaction(spends_raw[0]) diff --git a/test/functional/mining_basic.py b/test/functional/mining_basic.py index 569bf71933..15b2d7f757 100755 --- a/test/functional/mining_basic.py +++ b/test/functional/mining_basic.py @@ -1,5 +1,5 @@ #!/usr/bin/env python3 -# Copyright (c) 2014-2017 The Bitcoin Core developers +# Copyright (c) 2014-2018 The Bitcoin Core developers # Distributed under the MIT software license, see the accompanying # file COPYING or http://www.opensource.org/licenses/mit-license.php. """Test mining RPCs @@ -9,16 +9,23 @@ - submitblock""" import copy -from binascii import b2a_hex from decimal import Decimal from test_framework.blocktools import create_coinbase -from test_framework.mininode import CBlock +from test_framework.messages import ( + CBlock, + CBlockHeader, +) +from test_framework.mininode import ( + P2PDataStore, +) from test_framework.test_framework import BitcoinTestFramework -from test_framework.util import assert_equal, assert_raises_rpc_error +from test_framework.util import ( + assert_equal, + assert_raises_rpc_error, + bytes_to_hex_str as b2x, +) -def b2x(b): - return b2a_hex(b).decode('ascii') def assert_template(node, block, expect, rehash=True): if rehash: @@ -131,5 +138,67 @@ class MiningTest(BitcoinTestFramework): bad_block.hashPrevBlock = 123 assert_template(node, bad_block, 'inconclusive-not-best-prevblk') + self.log.info('submitheader tests') + assert_raises_rpc_error(-22, 'Block header decode failed', lambda: node.submitheader(hexdata='xx' * 80)) + assert_raises_rpc_error(-22, 'Block header decode failed', lambda: node.submitheader(hexdata='ff' * 78)) + assert_raises_rpc_error(-25, 'Must submit previous header', lambda: node.submitheader(hexdata='ff' * 80)) + + block.solve() + + def chain_tip(b_hash, *, status='headers-only', branchlen=1): + return {'hash': b_hash, 'height': 202, 'branchlen': branchlen, 'status': status} + + assert chain_tip(block.hash) not in node.getchaintips() + node.submitheader(hexdata=b2x(block.serialize())) + assert chain_tip(block.hash) in node.getchaintips() + node.submitheader(hexdata=b2x(CBlockHeader(block).serialize())) # Noop + assert chain_tip(block.hash) in node.getchaintips() + + bad_block_root = copy.deepcopy(block) + bad_block_root.hashMerkleRoot += 2 + bad_block_root.solve() + assert chain_tip(bad_block_root.hash) not in node.getchaintips() + node.submitheader(hexdata=b2x(CBlockHeader(bad_block_root).serialize())) + assert chain_tip(bad_block_root.hash) in node.getchaintips() + # Should still reject invalid blocks, even if we have the header: + assert_equal(node.submitblock(hexdata=b2x(bad_block_root.serialize())), 'invalid') + assert chain_tip(bad_block_root.hash) in node.getchaintips() + # We know the header for this invalid block, so should just return early without error: + node.submitheader(hexdata=b2x(CBlockHeader(bad_block_root).serialize())) + assert chain_tip(bad_block_root.hash) in node.getchaintips() + + bad_block_lock = copy.deepcopy(block) + bad_block_lock.vtx[0].nLockTime = 2**32 - 1 + bad_block_lock.vtx[0].rehash() + bad_block_lock.hashMerkleRoot = bad_block_lock.calc_merkle_root() + bad_block_lock.solve() + assert_equal(node.submitblock(hexdata=b2x(bad_block_lock.serialize())), 'invalid') + # Build a "good" block on top of the submitted bad block + bad_block2 = copy.deepcopy(block) + bad_block2.hashPrevBlock = bad_block_lock.sha256 + bad_block2.solve() + assert_raises_rpc_error(-25, 'bad-prevblk', lambda: node.submitheader(hexdata=b2x(CBlockHeader(bad_block2).serialize()))) + + # Should reject invalid header right away + bad_block_time = copy.deepcopy(block) + bad_block_time.nTime = 1 + bad_block_time.solve() + assert_raises_rpc_error(-25, 'time-too-old', lambda: node.submitheader(hexdata=b2x(CBlockHeader(bad_block_time).serialize()))) + + # Should ask for the block from a p2p node, if they announce the header as well: + node.add_p2p_connection(P2PDataStore()) + node.p2p.wait_for_getheaders(timeout=5) # Drop the first getheaders + node.p2p.send_blocks_and_test(blocks=[block], rpc=node) + # Must be active now: + assert chain_tip(block.hash, status='active', branchlen=0) in node.getchaintips() + + # Building a few blocks should give the same results + node.generate(10) + assert_raises_rpc_error(-25, 'time-too-old', lambda: node.submitheader(hexdata=b2x(CBlockHeader(bad_block_time).serialize()))) + assert_raises_rpc_error(-25, 'bad-prevblk', lambda: node.submitheader(hexdata=b2x(CBlockHeader(bad_block2).serialize()))) + node.submitheader(hexdata=b2x(CBlockHeader(block).serialize())) + node.submitheader(hexdata=b2x(CBlockHeader(bad_block_root).serialize())) + + if __name__ == '__main__': MiningTest().main() diff --git a/test/functional/mining_getblocktemplate_longpoll.py b/test/functional/mining_getblocktemplate_longpoll.py index 252ff4dbff..2bcbe8db7b 100755 --- a/test/functional/mining_getblocktemplate_longpoll.py +++ b/test/functional/mining_getblocktemplate_longpoll.py @@ -1,11 +1,13 @@ #!/usr/bin/env python3 -# Copyright (c) 2014-2017 The Bitcoin Core developers +# Copyright (c) 2014-2018 The Bitcoin Core developers # Distributed under the MIT software license, see the accompanying # file COPYING or http://www.opensource.org/licenses/mit-license.php. """Test longpolling with getblocktemplate.""" +from decimal import Decimal + from test_framework.test_framework import BitcoinTestFramework -from test_framework.util import * +from test_framework.util import get_rpc_proxy, random_transaction import threading diff --git a/test/functional/mining_prioritisetransaction.py b/test/functional/mining_prioritisetransaction.py index 85f1af6682..bb0cc082ab 100755 --- a/test/functional/mining_prioritisetransaction.py +++ b/test/functional/mining_prioritisetransaction.py @@ -1,12 +1,14 @@ #!/usr/bin/env python3 -# Copyright (c) 2015-2017 The Bitcoin Core developers +# Copyright (c) 2015-2018 The Bitcoin Core developers # Distributed under the MIT software license, see the accompanying # file COPYING or http://www.opensource.org/licenses/mit-license.php. """Test the prioritisetransaction mining RPC.""" +import time + +from test_framework.messages import COIN, MAX_BLOCK_BASE_SIZE from test_framework.test_framework import BitcoinTestFramework -from test_framework.util import * -from test_framework.mininode import COIN, MAX_BLOCK_BASE_SIZE +from test_framework.util import assert_equal, assert_raises_rpc_error, create_confirmed_utxos, create_lots_of_big_transactions, gen_return_txouts class PrioritiseTransactionTest(BitcoinTestFramework): def set_test_params(self): diff --git a/test/functional/p2p_compactblocks.py b/test/functional/p2p_compactblocks.py index 17aacd8152..5cec5dc6f0 100755 --- a/test/functional/p2p_compactblocks.py +++ b/test/functional/p2p_compactblocks.py @@ -1,5 +1,5 @@ #!/usr/bin/env python3 -# Copyright (c) 2016-2017 The Bitcoin Core developers +# Copyright (c) 2016-2018 The Bitcoin Core developers # Distributed under the MIT software license, see the accompanying # file COPYING or http://www.opensource.org/licenses/mit-license.php. """Test compact blocks (BIP 152). @@ -8,12 +8,15 @@ Version 1 compact blocks are pre-segwit (txids) Version 2 compact blocks are post-segwit (wtxids) """ -from test_framework.mininode import * -from test_framework.test_framework import BitcoinTestFramework -from test_framework.util import * +from decimal import Decimal +import random + from test_framework.blocktools import create_block, create_coinbase, add_witness_commitment +from test_framework.messages import BlockTransactions, BlockTransactionsRequest, calculate_shortid, CBlock, CBlockHeader, CInv, COutPoint, CTransaction, CTxIn, CTxInWitness, CTxOut, FromHex, HeaderAndShortIDs, msg_block, msg_blocktxn, msg_cmpctblock, msg_getblocktxn, msg_getdata, msg_getheaders, msg_headers, msg_inv, msg_sendcmpct, msg_sendheaders, msg_tx, msg_witness_block, msg_witness_blocktxn, MSG_WITNESS_FLAG, NODE_NETWORK, NODE_WITNESS, P2PHeaderAndShortIDs, PrefilledTransaction, ser_uint256, ToHex +from test_framework.mininode import mininode_lock, P2PInterface from test_framework.script import CScript, OP_TRUE, OP_DROP - +from test_framework.test_framework import BitcoinTestFramework +from test_framework.util import assert_equal, get_bip9_status, satoshi_round, sync_blocks, wait_until # TestP2PConn: A peer we use to send messages to bitcoind, and store responses. class TestP2PConn(P2PInterface): @@ -790,11 +793,9 @@ class CompactBlocksTest(BitcoinTestFramework): def run_test(self): # Setup the p2p connections self.test_node = self.nodes[0].add_p2p_connection(TestP2PConn()) - self.segwit_node = self.nodes[1].add_p2p_connection(TestP2PConn(), services=NODE_NETWORK|NODE_WITNESS) + self.segwit_node = self.nodes[1].add_p2p_connection(TestP2PConn(), services=NODE_NETWORK | NODE_WITNESS) self.old_node = self.nodes[1].add_p2p_connection(TestP2PConn(), services=NODE_NETWORK) - self.test_node.wait_for_verack() - # We will need UTXOs to construct transactions in later tests. self.make_utxos() diff --git a/test/functional/p2p_disconnect_ban.py b/test/functional/p2p_disconnect_ban.py index c6067befb2..67f24d6bff 100755 --- a/test/functional/p2p_disconnect_ban.py +++ b/test/functional/p2p_disconnect_ban.py @@ -1,5 +1,5 @@ #!/usr/bin/env python3 -# Copyright (c) 2014-2017 The Bitcoin Core developers +# Copyright (c) 2014-2018 The Bitcoin Core developers # Distributed under the MIT software license, see the accompanying # file COPYING or http://www.opensource.org/licenses/mit-license.php. """Test node disconnect and ban behavior""" diff --git a/test/functional/p2p_feefilter.py b/test/functional/p2p_feefilter.py index 5b3fa0186a..3bc7734e75 100755 --- a/test/functional/p2p_feefilter.py +++ b/test/functional/p2p_feefilter.py @@ -1,14 +1,16 @@ #!/usr/bin/env python3 -# Copyright (c) 2016-2017 The Bitcoin Core developers +# Copyright (c) 2016-2018 The Bitcoin Core developers # Distributed under the MIT software license, see the accompanying # file COPYING or http://www.opensource.org/licenses/mit-license.php. """Test processing of feefilter messages.""" -from test_framework.mininode import * -from test_framework.test_framework import BitcoinTestFramework -from test_framework.util import * +from decimal import Decimal import time +from test_framework.messages import msg_feefilter +from test_framework.mininode import mininode_lock, P2PInterface +from test_framework.test_framework import BitcoinTestFramework +from test_framework.util import sync_blocks, sync_mempools def hashToHex(hash): return format(hash, '064x') @@ -47,9 +49,7 @@ class FeeFilterTest(BitcoinTestFramework): node1.generate(1) sync_blocks(self.nodes) - # Setup the p2p connections self.nodes[0].add_p2p_connection(TestP2PConn()) - self.nodes[0].p2p.wait_for_verack() # Test that invs are received for all txs at feerate of 20 sat/byte node1.settxfee(Decimal("0.00020000")) diff --git a/test/functional/p2p_fingerprint.py b/test/functional/p2p_fingerprint.py index 61f9ec014b..4a6ffced93 100755 --- a/test/functional/p2p_fingerprint.py +++ b/test/functional/p2p_fingerprint.py @@ -1,5 +1,5 @@ #!/usr/bin/env python3 -# Copyright (c) 2017 The Bitcoin Core developers +# Copyright (c) 2017-2018 The Bitcoin Core developers # Distributed under the MIT software license, see the accompanying # file COPYING or http://www.opensource.org/licenses/mit-license.php. """Test various fingerprinting protections. @@ -11,18 +11,18 @@ the node should pretend that it does not have it to avoid fingerprinting. import time from test_framework.blocktools import (create_block, create_coinbase) +from test_framework.messages import CInv from test_framework.mininode import ( - CInv, P2PInterface, msg_headers, msg_block, msg_getdata, msg_getheaders, - wait_until, ) from test_framework.test_framework import BitcoinTestFramework from test_framework.util import ( assert_equal, + wait_until, ) class P2PFingerprintTest(BitcoinTestFramework): @@ -75,7 +75,6 @@ class P2PFingerprintTest(BitcoinTestFramework): # last month but that have over a month's worth of work are also withheld. def run_test(self): node0 = self.nodes[0].add_p2p_connection(P2PInterface()) - node0.wait_for_verack() # Set node time to 60 days ago self.nodes[0].setmocktime(int(time.time()) - 60 * 24 * 60 * 60) diff --git a/test/functional/p2p_invalid_block.py b/test/functional/p2p_invalid_block.py index c981968026..e910bedd09 100755 --- a/test/functional/p2p_invalid_block.py +++ b/test/functional/p2p_invalid_block.py @@ -1,5 +1,5 @@ #!/usr/bin/env python3 -# Copyright (c) 2015-2017 The Bitcoin Core developers +# Copyright (c) 2015-2018 The Bitcoin Core developers # Distributed under the MIT software license, see the accompanying # file COPYING or http://www.opensource.org/licenses/mit-license.php. """Test node responses to invalid blocks. @@ -12,7 +12,7 @@ re-requested. """ import copy -from test_framework.blocktools import create_block, create_coinbase, create_transaction +from test_framework.blocktools import create_block, create_coinbase, create_tx_with_script from test_framework.messages import COIN from test_framework.mininode import P2PDataStore from test_framework.test_framework import BitcoinTestFramework @@ -28,7 +28,6 @@ class InvalidBlockRequestTest(BitcoinTestFramework): # Add p2p connection to node0 node = self.nodes[0] # convenience reference to the node node.add_p2p_connection(P2PDataStore()) - node.p2p.wait_for_verack() best_block = node.getblock(node.getbestblockhash()) tip = int(node.getbestblockhash(), 16) @@ -64,8 +63,8 @@ class InvalidBlockRequestTest(BitcoinTestFramework): block_time += 1 # b'0x51' is OP_TRUE - tx1 = create_transaction(block1.vtx[0], 0, b'\x51', 50 * COIN) - tx2 = create_transaction(tx1, 0, b'\x51', 50 * COIN) + tx1 = create_tx_with_script(block1.vtx[0], 0, script_sig=b'\x51', amount=50 * COIN) + tx2 = create_tx_with_script(tx1, 0, script_sig=b'\x51', amount=50 * COIN) block2.vtx.extend([tx1, tx2]) block2.hashMerkleRoot = block2.calc_merkle_root() diff --git a/test/functional/p2p_invalid_locator.py b/test/functional/p2p_invalid_locator.py new file mode 100755 index 0000000000..3b1654f920 --- /dev/null +++ b/test/functional/p2p_invalid_locator.py @@ -0,0 +1,43 @@ +#!/usr/bin/env python3 +# Copyright (c) 2015-2017 The Bitcoin Core developers +# Distributed under the MIT software license, see the accompanying +# file COPYING or http://www.opensource.org/licenses/mit-license.php. +"""Test node responses to invalid locators. +""" + +from test_framework.messages import msg_getheaders, msg_getblocks, MAX_LOCATOR_SZ +from test_framework.mininode import P2PInterface +from test_framework.test_framework import BitcoinTestFramework + + +class InvalidLocatorTest(BitcoinTestFramework): + def set_test_params(self): + self.num_nodes = 1 + self.setup_clean_chain = False + + def run_test(self): + node = self.nodes[0] # convenience reference to the node + node.generate(1) # Get node out of IBD + + self.log.info('Test max locator size') + block_count = node.getblockcount() + for msg in [msg_getheaders(), msg_getblocks()]: + self.log.info('Wait for disconnect when sending {} hashes in locator'.format(MAX_LOCATOR_SZ + 1)) + node.add_p2p_connection(P2PInterface()) + msg.locator.vHave = [int(node.getblockhash(i - 1), 16) for i in range(block_count, block_count - (MAX_LOCATOR_SZ + 1), -1)] + node.p2p.send_message(msg) + node.p2p.wait_for_disconnect() + node.disconnect_p2ps() + + self.log.info('Wait for response when sending {} hashes in locator'.format(MAX_LOCATOR_SZ)) + node.add_p2p_connection(P2PInterface()) + msg.locator.vHave = [int(node.getblockhash(i - 1), 16) for i in range(block_count, block_count - (MAX_LOCATOR_SZ), -1)] + node.p2p.send_message(msg) + if type(msg) == msg_getheaders: + node.p2p.wait_for_header(int(node.getbestblockhash(), 16)) + else: + node.p2p.wait_for_block(int(node.getbestblockhash(), 16)) + + +if __name__ == '__main__': + InvalidLocatorTest().main() diff --git a/test/functional/p2p_invalid_tx.py b/test/functional/p2p_invalid_tx.py index a7a86f89fd..0aa5e21103 100755 --- a/test/functional/p2p_invalid_tx.py +++ b/test/functional/p2p_invalid_tx.py @@ -1,11 +1,11 @@ #!/usr/bin/env python3 -# Copyright (c) 2015-2017 The Bitcoin Core developers +# Copyright (c) 2015-2018 The Bitcoin Core developers # Distributed under the MIT software license, see the accompanying # file COPYING or http://www.opensource.org/licenses/mit-license.php. """Test node responses to invalid transactions. In this test we connect to one node over p2p, and test tx requests.""" -from test_framework.blocktools import create_block, create_coinbase, create_transaction +from test_framework.blocktools import create_block, create_coinbase, create_tx_with_script from test_framework.messages import ( COIN, COutPoint, @@ -32,7 +32,6 @@ class InvalidTxRequestTest(BitcoinTestFramework): Helper to connect and wait for version handshake.""" for _ in range(num_connections): self.nodes[0].add_p2p_connection(P2PDataStore()) - self.nodes[0].p2p.wait_for_verack() def reconnect_p2p(self, **kwargs): """Tear down and bootstrap the P2P connection to the node. @@ -68,7 +67,7 @@ class InvalidTxRequestTest(BitcoinTestFramework): # Transaction will be rejected with code 16 (REJECT_INVALID) # and we get disconnected immediately self.log.info('Test a transaction that is rejected') - tx1 = create_transaction(block1.vtx[0], 0, b'\x64' * 35, 50 * COIN - 12000) + tx1 = create_tx_with_script(block1.vtx[0], 0, script_sig=b'\x64' * 35, amount=50 * COIN - 12000) node.p2p.send_txs_and_test([tx1], node, success=False, expect_disconnect=True) # Make two p2p connections to provide the node with orphans diff --git a/test/functional/p2p_leak.py b/test/functional/p2p_leak.py index 186c35e0e1..dcbf833e7c 100755 --- a/test/functional/p2p_leak.py +++ b/test/functional/p2p_leak.py @@ -1,5 +1,5 @@ #!/usr/bin/env python3 -# Copyright (c) 2017 The Bitcoin Core developers +# Copyright (c) 2017-2018 The Bitcoin Core developers # Distributed under the MIT software license, see the accompanying # file COPYING or http://www.opensource.org/licenses/mit-license.php. """Test message sending before handshake completion. @@ -10,9 +10,12 @@ received a VERACK. This test connects to a node and sends it a few messages, trying to entice it into sending us something it shouldn't.""" -from test_framework.mininode import * +import time + +from test_framework.messages import msg_getaddr, msg_ping, msg_verack +from test_framework.mininode import mininode_lock, P2PInterface from test_framework.test_framework import BitcoinTestFramework -from test_framework.util import * +from test_framework.util import wait_until banscore = 10 @@ -88,11 +91,11 @@ class CNodeNoVerackIdle(CLazyNode): class P2PLeakTest(BitcoinTestFramework): def set_test_params(self): self.num_nodes = 1 - self.extra_args = [['-banscore='+str(banscore)]] + self.extra_args = [['-banscore=' + str(banscore)]] def run_test(self): - no_version_bannode = self.nodes[0].add_p2p_connection(CNodeNoVersionBan(), send_version=False) - no_version_idlenode = self.nodes[0].add_p2p_connection(CNodeNoVersionIdle(), send_version=False) + no_version_bannode = self.nodes[0].add_p2p_connection(CNodeNoVersionBan(), send_version=False, wait_for_verack=False) + no_version_idlenode = self.nodes[0].add_p2p_connection(CNodeNoVersionIdle(), send_version=False, wait_for_verack=False) no_verack_idlenode = self.nodes[0].add_p2p_connection(CNodeNoVerackIdle()) wait_until(lambda: no_version_bannode.ever_connected, timeout=10, lock=mininode_lock) diff --git a/test/functional/p2p_mempool.py b/test/functional/p2p_mempool.py index 5a1fb60fb5..a8fcb181e6 100755 --- a/test/functional/p2p_mempool.py +++ b/test/functional/p2p_mempool.py @@ -1,5 +1,5 @@ #!/usr/bin/env python3 -# Copyright (c) 2015-2017 The Bitcoin Core developers +# Copyright (c) 2015-2018 The Bitcoin Core developers # Distributed under the MIT software license, see the accompanying # file COPYING or http://www.opensource.org/licenses/mit-license.php. """Test p2p mempool message. @@ -8,9 +8,10 @@ Test that nodes are disconnected if they send mempool messages when bloom filters are not enabled. """ -from test_framework.mininode import * +from test_framework.messages import msg_mempool +from test_framework.mininode import P2PInterface from test_framework.test_framework import BitcoinTestFramework -from test_framework.util import * +from test_framework.util import assert_equal class P2PMempoolTests(BitcoinTestFramework): def set_test_params(self): @@ -21,7 +22,6 @@ class P2PMempoolTests(BitcoinTestFramework): def run_test(self): # Add a p2p connection self.nodes[0].add_p2p_connection(P2PInterface()) - self.nodes[0].p2p.wait_for_verack() #request mempool self.nodes[0].p2p.send_message(msg_mempool()) diff --git a/test/functional/p2p_node_network_limited.py b/test/functional/p2p_node_network_limited.py index 4a24e24daf..c987bf4b05 100755 --- a/test/functional/p2p_node_network_limited.py +++ b/test/functional/p2p_node_network_limited.py @@ -1,5 +1,5 @@ #!/usr/bin/env python3 -# Copyright (c) 2017 The Bitcoin Core developers +# Copyright (c) 2017-2018 The Bitcoin Core developers # Distributed under the MIT software license, see the accompanying # file COPYING or http://www.opensource.org/licenses/mit-license.php. """Tests NODE_NETWORK_LIMITED. @@ -8,10 +8,10 @@ Tests that a node configured with -prune=550 signals NODE_NETWORK_LIMITED correc and that it responds to getdata requests for blocks correctly: - send a block within 288 + 2 of the tip - disconnect peers who request blocks older than that.""" -from test_framework.messages import CInv, msg_getdata, msg_verack -from test_framework.mininode import NODE_BLOOM, NODE_NETWORK_LIMITED, NODE_WITNESS, P2PInterface, wait_until, mininode_lock +from test_framework.messages import CInv, msg_getdata, msg_verack, NODE_BLOOM, NODE_NETWORK_LIMITED, NODE_WITNESS +from test_framework.mininode import P2PInterface, mininode_lock from test_framework.test_framework import BitcoinTestFramework -from test_framework.util import assert_equal, disconnect_nodes, connect_nodes_bi, sync_blocks +from test_framework.util import assert_equal, disconnect_nodes, connect_nodes_bi, sync_blocks, wait_until class P2PIgnoreInv(P2PInterface): firstAddrnServices = 0 @@ -48,7 +48,6 @@ class NodeNetworkLimitedTest(BitcoinTestFramework): def run_test(self): node = self.nodes[0].add_p2p_connection(P2PIgnoreInv()) - node.wait_for_verack() expected_services = NODE_BLOOM | NODE_WITNESS | NODE_NETWORK_LIMITED @@ -74,7 +73,6 @@ class NodeNetworkLimitedTest(BitcoinTestFramework): self.log.info("Check local address relay, do a fresh connection.") self.nodes[0].disconnect_p2ps() node1 = self.nodes[0].add_p2p_connection(P2PIgnoreInv()) - node1.wait_for_verack() node1.send_message(msg_verack()) node1.wait_for_addr() diff --git a/test/functional/p2p_segwit.py b/test/functional/p2p_segwit.py index 52f6482d56..be79a13237 100755 --- a/test/functional/p2p_segwit.py +++ b/test/functional/p2p_segwit.py @@ -1,5 +1,5 @@ #!/usr/bin/env python3 -# Copyright (c) 2016-2017 The Bitcoin Core developers +# Copyright (c) 2016-2018 The Bitcoin Core developers # Distributed under the MIT software license, see the accompanying # file COPYING or http://www.opensource.org/licenses/mit-license.php. """Test segwit transactions and blocks on P2P network.""" @@ -231,9 +231,6 @@ class SegWitTest(BitcoinTestFramework): # self.std_node is for testing node1 (fRequireStandard=true) self.std_node = self.nodes[1].add_p2p_connection(TestP2PConn(), services=NODE_NETWORK | NODE_WITNESS) - for conn in (self.test_node, self.old_node, self.std_node): - conn.wait_for_verack() - assert self.test_node.nServices & NODE_WITNESS != 0 # Keep a place to store utxo's that can be used in later tests diff --git a/test/functional/p2p_sendheaders.py b/test/functional/p2p_sendheaders.py index 2788d8995e..9cc496d510 100755 --- a/test/functional/p2p_sendheaders.py +++ b/test/functional/p2p_sendheaders.py @@ -1,5 +1,5 @@ #!/usr/bin/env python3 -# Copyright (c) 2014-2017 The Bitcoin Core developers +# Copyright (c) 2014-2018 The Bitcoin Core developers # Distributed under the MIT software license, see the accompanying # file COPYING or http://www.opensource.org/licenses/mit-license.php. """Test behavior of headers messages to announce blocks. @@ -86,9 +86,9 @@ e. Announce one more that doesn't connect. Expect: disconnect. """ from test_framework.blocktools import create_block, create_coinbase +from test_framework.messages import CInv from test_framework.mininode import ( CBlockHeader, - CInv, NODE_WITNESS, P2PInterface, mininode_lock, @@ -242,8 +242,6 @@ class SendHeadersTest(BitcoinTestFramework): # Make sure NODE_NETWORK is not set for test_node, so no block download # will occur outside of direct fetching test_node = self.nodes[0].add_p2p_connection(BaseNode(), services=NODE_WITNESS) - inv_node.wait_for_verack() - test_node.wait_for_verack() # Ensure verack's have been processed by our peer inv_node.sync_with_ping() diff --git a/test/functional/p2p_timeouts.py b/test/functional/p2p_timeouts.py index 7a4ef1c05c..2459a9f243 100755 --- a/test/functional/p2p_timeouts.py +++ b/test/functional/p2p_timeouts.py @@ -1,5 +1,5 @@ #!/usr/bin/env python3 -# Copyright (c) 2016-2017 The Bitcoin Core developers +# Copyright (c) 2016-2018 The Bitcoin Core developers # Distributed under the MIT software license, see the accompanying # file COPYING or http://www.opensource.org/licenses/mit-license.php. """Test various net timeouts. @@ -23,9 +23,9 @@ from time import sleep -from test_framework.mininode import * +from test_framework.messages import msg_ping +from test_framework.mininode import P2PInterface from test_framework.test_framework import BitcoinTestFramework -from test_framework.util import * class TestP2PConn(P2PInterface): def on_version(self, message): @@ -40,8 +40,8 @@ class TimeoutsTest(BitcoinTestFramework): def run_test(self): # Setup the p2p connections no_verack_node = self.nodes[0].add_p2p_connection(TestP2PConn()) - no_version_node = self.nodes[0].add_p2p_connection(TestP2PConn(), send_version=False) - no_send_node = self.nodes[0].add_p2p_connection(TestP2PConn(), send_version=False) + no_version_node = self.nodes[0].add_p2p_connection(TestP2PConn(), send_version=False, wait_for_verack=False) + no_send_node = self.nodes[0].add_p2p_connection(TestP2PConn(), send_version=False, wait_for_verack=False) sleep(1) diff --git a/test/functional/p2p_unrequested_blocks.py b/test/functional/p2p_unrequested_blocks.py index 5f2d65c3f5..2e86954aba 100755 --- a/test/functional/p2p_unrequested_blocks.py +++ b/test/functional/p2p_unrequested_blocks.py @@ -1,5 +1,5 @@ #!/usr/bin/env python3 -# Copyright (c) 2015-2017 The Bitcoin Core developers +# Copyright (c) 2015-2018 The Bitcoin Core developers # Distributed under the MIT software license, see the accompanying # file COPYING or http://www.opensource.org/licenses/mit-license.php. """Test processing of unrequested blocks. @@ -51,11 +51,13 @@ Node1 is unused in tests 3-7: work on its chain). """ -from test_framework.mininode import * -from test_framework.test_framework import BitcoinTestFramework -from test_framework.util import * import time -from test_framework.blocktools import create_block, create_coinbase, create_transaction + +from test_framework.blocktools import create_block, create_coinbase, create_tx_with_script +from test_framework.messages import CBlockHeader, CInv, msg_block, msg_headers, msg_inv +from test_framework.mininode import mininode_lock, P2PInterface +from test_framework.test_framework import BitcoinTestFramework +from test_framework.util import assert_equal, assert_raises_rpc_error, connect_nodes, sync_blocks class AcceptBlockTest(BitcoinTestFramework): @@ -78,8 +80,6 @@ class AcceptBlockTest(BitcoinTestFramework): test_node = self.nodes[0].add_p2p_connection(P2PInterface()) # min_work_node connects to node1 (whitelisted) min_work_node = self.nodes[1].add_p2p_connection(P2PInterface()) - test_node.wait_for_verack() - min_work_node.wait_for_verack() # 1. Have nodes mine a block (leave IBD) [ n.generate(1) for n in self.nodes ] @@ -202,7 +202,6 @@ class AcceptBlockTest(BitcoinTestFramework): self.nodes[1].disconnect_p2ps() test_node = self.nodes[0].add_p2p_connection(P2PInterface()) - test_node.wait_for_verack() test_node.send_message(msg_block(block_h1f)) @@ -244,7 +243,7 @@ class AcceptBlockTest(BitcoinTestFramework): block_290f.solve() block_291 = create_block(block_290f.sha256, create_coinbase(291), block_290f.nTime+1) # block_291 spends a coinbase below maturity! - block_291.vtx.append(create_transaction(block_290f.vtx[0], 0, b"42", 1)) + block_291.vtx.append(create_tx_with_script(block_290f.vtx[0], 0, script_sig=b"42", amount=1)) block_291.hashMerkleRoot = block_291.calc_merkle_root() block_291.solve() block_292 = create_block(block_291.sha256, create_coinbase(292), block_291.nTime+1) @@ -287,7 +286,6 @@ class AcceptBlockTest(BitcoinTestFramework): self.nodes[0].disconnect_p2ps() test_node = self.nodes[0].add_p2p_connection(P2PInterface()) - test_node.wait_for_verack() # We should have failed reorg and switched back to 290 (but have block 291) assert_equal(self.nodes[0].getblockcount(), 290) diff --git a/test/functional/rpc_bind.py b/test/functional/rpc_bind.py index 343e162058..53916d5290 100755 --- a/test/functional/rpc_bind.py +++ b/test/functional/rpc_bind.py @@ -1,14 +1,14 @@ #!/usr/bin/env python3 -# Copyright (c) 2014-2017 The Bitcoin Core developers +# Copyright (c) 2014-2018 The Bitcoin Core developers # Distributed under the MIT software license, see the accompanying # file COPYING or http://www.opensource.org/licenses/mit-license.php. """Test running bitcoind with the -rpcbind and -rpcallowip options.""" import sys +from test_framework.netutil import all_interfaces, addr_to_hex, get_bind_addrs, test_ipv6_local from test_framework.test_framework import BitcoinTestFramework, SkipTest -from test_framework.util import * -from test_framework.netutil import * +from test_framework.util import assert_equal, assert_raises_rpc_error, get_rpc_proxy, rpc_port, rpc_url class RPCBindTest(BitcoinTestFramework): def set_test_params(self): @@ -20,9 +20,9 @@ class RPCBindTest(BitcoinTestFramework): self.add_nodes(self.num_nodes, None) def add_options(self, parser): - parser.add_option("--ipv4", action='store_true', dest="run_ipv4", help="Run ipv4 tests only", default=False) - parser.add_option("--ipv6", action='store_true', dest="run_ipv6", help="Run ipv6 tests only", default=False) - parser.add_option("--nonloopback", action='store_true', dest="run_nonloopback", help="Run non-loopback tests only", default=False) + parser.add_argument("--ipv4", action='store_true', dest="run_ipv4", help="Run ipv4 tests only", default=False) + parser.add_argument("--ipv6", action='store_true', dest="run_ipv6", help="Run ipv6 tests only", default=False) + parser.add_argument("--nonloopback", action='store_true', dest="run_nonloopback", help="Run non-loopback tests only", default=False) def run_bind_test(self, allow_ips, connect_to, addresses, expected): ''' diff --git a/test/functional/rpc_blockchain.py b/test/functional/rpc_blockchain.py index 155d30317a..d681cdc8ab 100755 --- a/test/functional/rpc_blockchain.py +++ b/test/functional/rpc_blockchain.py @@ -1,5 +1,5 @@ #!/usr/bin/env python3 -# Copyright (c) 2014-2017 The Bitcoin Core developers +# Copyright (c) 2014-2018 The Bitcoin Core developers # Distributed under the MIT software license, see the accompanying # file COPYING or http://www.opensource.org/licenses/mit-license.php. """Test RPCs related to blockchainstate. @@ -194,13 +194,10 @@ class BlockchainTest(BitcoinTestFramework): node.reconsiderblock(b1hash) res3 = node.gettxoutsetinfo() - assert_equal(res['total_amount'], res3['total_amount']) - assert_equal(res['transactions'], res3['transactions']) - assert_equal(res['height'], res3['height']) - assert_equal(res['txouts'], res3['txouts']) - assert_equal(res['bogosize'], res3['bogosize']) - assert_equal(res['bestblock'], res3['bestblock']) - assert_equal(res['hash_serialized_2'], res3['hash_serialized_2']) + # The field 'disk_size' is non-deterministic and can thus not be + # compared between res and res3. Everything else should be the same. + del res['disk_size'], res3['disk_size'] + assert_equal(res, res3) def _test_getblockheader(self): node = self.nodes[0] @@ -256,12 +253,8 @@ class BlockchainTest(BitcoinTestFramework): def _test_waitforblockheight(self): self.log.info("Test waitforblockheight") - node = self.nodes[0] - - # Start a P2P connection since we'll need to create some blocks. node.add_p2p_connection(P2PInterface()) - node.p2p.wait_for_verack() current_height = node.getblock(node.getbestblockhash())['height'] diff --git a/test/functional/rpc_createmultisig.py b/test/functional/rpc_createmultisig.py index 97e614c888..f346e1ebfc 100755 --- a/test/functional/rpc_createmultisig.py +++ b/test/functional/rpc_createmultisig.py @@ -1,5 +1,5 @@ #!/usr/bin/env python3 -# Copyright (c) 2015-2017 The Bitcoin Core developers +# Copyright (c) 2015-2018 The Bitcoin Core developers # Distributed under the MIT software license, see the accompanying # file COPYING or http://www.opensource.org/licenses/mit-license.php. """Test transaction signing using the signrawtransaction* RPCs.""" diff --git a/test/functional/rpc_decodescript.py b/test/functional/rpc_decodescript.py index d588151768..940386eee7 100755 --- a/test/functional/rpc_decodescript.py +++ b/test/functional/rpc_decodescript.py @@ -1,12 +1,13 @@ #!/usr/bin/env python3 -# Copyright (c) 2015-2017 The Bitcoin Core developers +# Copyright (c) 2015-2018 The Bitcoin Core developers # Distributed under the MIT software license, see the accompanying # file COPYING or http://www.opensource.org/licenses/mit-license.php. """Test decoding scripts via decodescript RPC command.""" +from test_framework.messages import CTransaction, sha256 from test_framework.test_framework import BitcoinTestFramework -from test_framework.util import * -from test_framework.mininode import * +from test_framework.util import assert_equal, bytes_to_hex_str, hex_str_to_bytes + from io import BytesIO class DecodeScriptTest(BitcoinTestFramework): diff --git a/test/functional/rpc_deprecated.py b/test/functional/rpc_deprecated.py index bc27c183b1..deffe4e6bd 100755 --- a/test/functional/rpc_deprecated.py +++ b/test/functional/rpc_deprecated.py @@ -1,5 +1,5 @@ #!/usr/bin/env python3 -# Copyright (c) 2017 The Bitcoin Core developers +# Copyright (c) 2017-2018 The Bitcoin Core developers # Distributed under the MIT software license, see the accompanying # file COPYING or http://www.opensource.org/licenses/mit-license.php. """Test deprecation of RPC calls.""" diff --git a/test/functional/rpc_fundrawtransaction.py b/test/functional/rpc_fundrawtransaction.py index 1e91cf598c..a806de43b4 100755 --- a/test/functional/rpc_fundrawtransaction.py +++ b/test/functional/rpc_fundrawtransaction.py @@ -1,5 +1,5 @@ #!/usr/bin/env python3 -# Copyright (c) 2014-2017 The Bitcoin Core developers +# Copyright (c) 2014-2018 The Bitcoin Core developers # Distributed under the MIT software license, see the accompanying # file COPYING or http://www.opensource.org/licenses/mit-license.php. """Test the fundrawtransaction RPC.""" diff --git a/test/functional/rpc_getblockstats.py b/test/functional/rpc_getblockstats.py index f573faaf17..b24bed6adf 100755 --- a/test/functional/rpc_getblockstats.py +++ b/test/functional/rpc_getblockstats.py @@ -1,5 +1,5 @@ #!/usr/bin/env python3 -# Copyright (c) 2017-2017 The Bitcoin Core developers +# Copyright (c) 2017-2018 The Bitcoin Core developers # Distributed under the MIT software license, see the accompanying # file COPYING or http://www.opensource.org/licenses/mit-license.php. @@ -27,7 +27,7 @@ class GetblockstatsTest(BitcoinTestFramework): 'maxfee', 'maxfeerate', 'medianfee', - 'medianfeerate', + 'feerate_percentiles', 'minfee', 'minfeerate', 'totalfee', @@ -35,13 +35,13 @@ class GetblockstatsTest(BitcoinTestFramework): ] def add_options(self, parser): - parser.add_option('--gen-test-data', dest='gen_test_data', - default=False, action='store_true', - help='Generate test data') - parser.add_option('--test-data', dest='test_data', - default='data/rpc_getblockstats.json', - action='store', metavar='FILE', - help='Test data file') + parser.add_argument('--gen-test-data', dest='gen_test_data', + default=False, action='store_true', + help='Generate test data') + parser.add_argument('--test-data', dest='test_data', + default='data/rpc_getblockstats.json', + action='store', metavar='FILE', + help='Test data file') def set_test_params(self): self.num_nodes = 2 diff --git a/test/functional/rpc_getchaintips.py b/test/functional/rpc_getchaintips.py index 277930bb1a..07929ca0a1 100755 --- a/test/functional/rpc_getchaintips.py +++ b/test/functional/rpc_getchaintips.py @@ -1,5 +1,5 @@ #!/usr/bin/env python3 -# Copyright (c) 2014-2017 The Bitcoin Core developers +# Copyright (c) 2014-2018 The Bitcoin Core developers # Distributed under the MIT software license, see the accompanying # file COPYING or http://www.opensource.org/licenses/mit-license.php. """Test the getchaintips RPC. diff --git a/test/functional/rpc_invalidateblock.py b/test/functional/rpc_invalidateblock.py index b037c2431d..f40710ef74 100755 --- a/test/functional/rpc_invalidateblock.py +++ b/test/functional/rpc_invalidateblock.py @@ -1,11 +1,13 @@ #!/usr/bin/env python3 -# Copyright (c) 2014-2017 The Bitcoin Core developers +# Copyright (c) 2014-2018 The Bitcoin Core developers # Distributed under the MIT software license, see the accompanying # file COPYING or http://www.opensource.org/licenses/mit-license.php. """Test the invalidateblock RPC.""" +import time + from test_framework.test_framework import BitcoinTestFramework -from test_framework.util import * +from test_framework.util import assert_equal, connect_nodes_bi, sync_blocks class InvalidateTest(BitcoinTestFramework): def set_test_params(self): diff --git a/test/functional/rpc_named_arguments.py b/test/functional/rpc_named_arguments.py index 97bee39614..6c5c29dfdf 100755 --- a/test/functional/rpc_named_arguments.py +++ b/test/functional/rpc_named_arguments.py @@ -1,5 +1,5 @@ #!/usr/bin/env python3 -# Copyright (c) 2016-2017 The Bitcoin Core developers +# Copyright (c) 2016-2018 The Bitcoin Core developers # Distributed under the MIT software license, see the accompanying # file COPYING or http://www.opensource.org/licenses/mit-license.php. """Test using named arguments for RPCs.""" diff --git a/test/functional/rpc_net.py b/test/functional/rpc_net.py index 72b5f4748f..02114eca76 100755 --- a/test/functional/rpc_net.py +++ b/test/functional/rpc_net.py @@ -1,5 +1,5 @@ #!/usr/bin/env python3 -# Copyright (c) 2017 The Bitcoin Core developers +# Copyright (c) 2017-2018 The Bitcoin Core developers # Distributed under the MIT software license, see the accompanying # file COPYING or http://www.opensource.org/licenses/mit-license.php. """Test RPC calls related to net. diff --git a/test/functional/rpc_preciousblock.py b/test/functional/rpc_preciousblock.py index 796a2edbef..1e20d1a046 100755 --- a/test/functional/rpc_preciousblock.py +++ b/test/functional/rpc_preciousblock.py @@ -1,5 +1,5 @@ #!/usr/bin/env python3 -# Copyright (c) 2015-2017 The Bitcoin Core developers +# Copyright (c) 2015-2018 The Bitcoin Core developers # Distributed under the MIT software license, see the accompanying # file COPYING or http://www.opensource.org/licenses/mit-license.php. """Test the preciousblock RPC.""" diff --git a/test/functional/rpc_psbt.py b/test/functional/rpc_psbt.py index a68327496f..99c4131d61 100755 --- a/test/functional/rpc_psbt.py +++ b/test/functional/rpc_psbt.py @@ -6,7 +6,10 @@ """ from test_framework.test_framework import BitcoinTestFramework -from test_framework.util import * +from test_framework.util import assert_equal, assert_raises_rpc_error, find_output + +import json +import os # Create one-input, one-output, no-fee transaction: class PSBTTest(BitcoinTestFramework): @@ -165,9 +168,11 @@ class PSBTTest(BitcoinTestFramework): # Signer tests for i, signer in enumerate(signers): + self.nodes[2].createwallet("wallet{}".format(i)) + wrpc = self.nodes[2].get_wallet_rpc("wallet{}".format(i)) for key in signer['privkeys']: - self.nodes[i].importprivkey(key) - signed_tx = self.nodes[i].walletprocesspsbt(signer['psbt'])['psbt'] + wrpc.importprivkey(key) + signed_tx = wrpc.walletprocesspsbt(signer['psbt'])['psbt'] assert_equal(signed_tx, signer['result']) # Combiner test diff --git a/test/functional/rpc_rawtransaction.py b/test/functional/rpc_rawtransaction.py index 2485dcf6ec..1e3ada26f8 100755 --- a/test/functional/rpc_rawtransaction.py +++ b/test/functional/rpc_rawtransaction.py @@ -1,5 +1,5 @@ #!/usr/bin/env python3 -# Copyright (c) 2014-2017 The Bitcoin Core developers +# Copyright (c) 2014-2018 The Bitcoin Core developers # Distributed under the MIT software license, see the accompanying # file COPYING or http://www.opensource.org/licenses/mit-license.php. """Test the rawtransaction RPCs. @@ -13,10 +13,11 @@ Test the following RPCs: """ from collections import OrderedDict +from decimal import Decimal from io import BytesIO from test_framework.messages import CTransaction, ToHex from test_framework.test_framework import BitcoinTestFramework -from test_framework.util import * +from test_framework.util import assert_equal, assert_raises_rpc_error, bytes_to_hex_str, connect_nodes_bi, hex_str_to_bytes class multidict(dict): """Dictionary that allows duplicate keys. diff --git a/test/functional/rpc_scantxoutset.py b/test/functional/rpc_scantxoutset.py index ce5d4da9e7..ceb38e969a 100755 --- a/test/functional/rpc_scantxoutset.py +++ b/test/functional/rpc_scantxoutset.py @@ -4,8 +4,9 @@ # file COPYING or http://www.opensource.org/licenses/mit-license.php. """Test the scantxoutset rpc call.""" from test_framework.test_framework import BitcoinTestFramework -from test_framework.util import * +from test_framework.util import assert_equal +from decimal import Decimal import shutil import os @@ -23,9 +24,25 @@ class ScantxoutsetTest(BitcoinTestFramework): pubk2 = self.nodes[0].getaddressinfo(addr_LEGACY)['pubkey'] addr_BECH32 = self.nodes[0].getnewaddress("", "bech32") pubk3 = self.nodes[0].getaddressinfo(addr_BECH32)['pubkey'] - self.nodes[0].sendtoaddress(addr_P2SH_SEGWIT, 1) - self.nodes[0].sendtoaddress(addr_LEGACY, 2) - self.nodes[0].sendtoaddress(addr_BECH32, 3) + self.nodes[0].sendtoaddress(addr_P2SH_SEGWIT, 0.001) + self.nodes[0].sendtoaddress(addr_LEGACY, 0.002) + self.nodes[0].sendtoaddress(addr_BECH32, 0.004) + + #send to child keys of tprv8ZgxMBicQKsPd7Uf69XL1XwhmjHopUGep8GuEiJDZmbQz6o58LninorQAfcKZWARbtRtfnLcJ5MQ2AtHcQJCCRUcMRvmDUjyEmNUWwx8UbK + self.nodes[0].sendtoaddress("mkHV1C6JLheLoUSSZYk7x3FH5tnx9bu7yc", 0.008) # (m/0'/0'/0') + self.nodes[0].sendtoaddress("mipUSRmJAj2KrjSvsPQtnP8ynUon7FhpCR", 0.016) # (m/0'/0'/1') + self.nodes[0].sendtoaddress("n37dAGe6Mq1HGM9t4b6rFEEsDGq7Fcgfqg", 0.032) # (m/0'/0'/1500') + self.nodes[0].sendtoaddress("mqS9Rpg8nNLAzxFExsgFLCnzHBsoQ3PRM6", 0.064) # (m/0'/0'/0) + self.nodes[0].sendtoaddress("mnTg5gVWr3rbhHaKjJv7EEEc76ZqHgSj4S", 0.128) # (m/0'/0'/1) + self.nodes[0].sendtoaddress("mketCd6B9U9Uee1iCsppDJJBHfvi6U6ukC", 0.256) # (m/0'/0'/1500) + self.nodes[0].sendtoaddress("mj8zFzrbBcdaWXowCQ1oPZ4qioBVzLzAp7", 0.512) # (m/1/1/0') + self.nodes[0].sendtoaddress("mfnKpKQEftniaoE1iXuMMePQU3PUpcNisA", 1.024) # (m/1/1/1') + self.nodes[0].sendtoaddress("mou6cB1kaP1nNJM1sryW6YRwnd4shTbXYQ", 2.048) # (m/1/1/1500') + self.nodes[0].sendtoaddress("mtfUoUax9L4tzXARpw1oTGxWyoogp52KhJ", 4.096) # (m/1/1/0) + self.nodes[0].sendtoaddress("mxp7w7j8S1Aq6L8StS2PqVvtt4HGxXEvdy", 8.192) # (m/1/1/1) + self.nodes[0].sendtoaddress("mpQ8rokAhp1TAtJQR6F6TaUmjAWkAWYYBq", 16.384) # (m/1/1/1500) + + self.nodes[0].generate(1) self.log.info("Stop node, remove wallet, mine again some blocks...") @@ -36,13 +53,39 @@ class ScantxoutsetTest(BitcoinTestFramework): self.restart_node(0, ['-nowallet']) self.log.info("Test if we have found the non HD unspent outputs.") - assert_equal(self.nodes[0].scantxoutset("start", [ {"pubkey": {"pubkey": pubk1}}, {"pubkey": {"pubkey": pubk2}}, {"pubkey": {"pubkey": pubk3}}])['total_amount'], 6) - assert_equal(self.nodes[0].scantxoutset("start", [ {"address": addr_P2SH_SEGWIT}, {"address": addr_LEGACY}, {"address": addr_BECH32}])['total_amount'], 6) - assert_equal(self.nodes[0].scantxoutset("start", [ {"address": addr_P2SH_SEGWIT}, {"address": addr_LEGACY}, {"pubkey": {"pubkey": pubk3}} ])['total_amount'], 6) + assert_equal(self.nodes[0].scantxoutset("start", [ "pkh(" + pubk1 + ")", "pkh(" + pubk2 + ")", "pkh(" + pubk3 + ")"])['total_amount'], Decimal("0.002")) + assert_equal(self.nodes[0].scantxoutset("start", [ "wpkh(" + pubk1 + ")", "wpkh(" + pubk2 + ")", "wpkh(" + pubk3 + ")"])['total_amount'], Decimal("0.004")) + assert_equal(self.nodes[0].scantxoutset("start", [ "sh(wpkh(" + pubk1 + "))", "sh(wpkh(" + pubk2 + "))", "sh(wpkh(" + pubk3 + "))"])['total_amount'], Decimal("0.001")) + assert_equal(self.nodes[0].scantxoutset("start", [ "combo(" + pubk1 + ")", "combo(" + pubk2 + ")", "combo(" + pubk3 + ")"])['total_amount'], Decimal("0.007")) + assert_equal(self.nodes[0].scantxoutset("start", [ "addr(" + addr_P2SH_SEGWIT + ")", "addr(" + addr_LEGACY + ")", "addr(" + addr_BECH32 + ")"])['total_amount'], Decimal("0.007")) + assert_equal(self.nodes[0].scantxoutset("start", [ "addr(" + addr_P2SH_SEGWIT + ")", "addr(" + addr_LEGACY + ")", "combo(" + pubk3 + ")"])['total_amount'], Decimal("0.007")) - self.log.info("Test invalid parameters.") - assert_raises_rpc_error(-8, 'Scanobject "pubkey" must contain an object as value', self.nodes[0].scantxoutset, "start", [ {"pubkey": pubk1}]) #missing pubkey object - assert_raises_rpc_error(-8, 'Scanobject "address" must contain a single string as value', self.nodes[0].scantxoutset, "start", [ {"address": {"address": addr_P2SH_SEGWIT}}]) #invalid object for address object + self.log.info("Test extended key derivation.") + assert_equal(self.nodes[0].scantxoutset("start", [ "combo(tprv8ZgxMBicQKsPd7Uf69XL1XwhmjHopUGep8GuEiJDZmbQz6o58LninorQAfcKZWARbtRtfnLcJ5MQ2AtHcQJCCRUcMRvmDUjyEmNUWwx8UbK/0'/0h/0h)"])['total_amount'], Decimal("0.008")) + assert_equal(self.nodes[0].scantxoutset("start", [ "combo(tprv8ZgxMBicQKsPd7Uf69XL1XwhmjHopUGep8GuEiJDZmbQz6o58LninorQAfcKZWARbtRtfnLcJ5MQ2AtHcQJCCRUcMRvmDUjyEmNUWwx8UbK/0'/0'/1h)"])['total_amount'], Decimal("0.016")) + assert_equal(self.nodes[0].scantxoutset("start", [ "combo(tprv8ZgxMBicQKsPd7Uf69XL1XwhmjHopUGep8GuEiJDZmbQz6o58LninorQAfcKZWARbtRtfnLcJ5MQ2AtHcQJCCRUcMRvmDUjyEmNUWwx8UbK/0h/0'/1500')"])['total_amount'], Decimal("0.032")) + assert_equal(self.nodes[0].scantxoutset("start", [ "combo(tprv8ZgxMBicQKsPd7Uf69XL1XwhmjHopUGep8GuEiJDZmbQz6o58LninorQAfcKZWARbtRtfnLcJ5MQ2AtHcQJCCRUcMRvmDUjyEmNUWwx8UbK/0h/0h/0)"])['total_amount'], Decimal("0.064")) + assert_equal(self.nodes[0].scantxoutset("start", [ "combo(tprv8ZgxMBicQKsPd7Uf69XL1XwhmjHopUGep8GuEiJDZmbQz6o58LninorQAfcKZWARbtRtfnLcJ5MQ2AtHcQJCCRUcMRvmDUjyEmNUWwx8UbK/0'/0h/1)"])['total_amount'], Decimal("0.128")) + assert_equal(self.nodes[0].scantxoutset("start", [ "combo(tprv8ZgxMBicQKsPd7Uf69XL1XwhmjHopUGep8GuEiJDZmbQz6o58LninorQAfcKZWARbtRtfnLcJ5MQ2AtHcQJCCRUcMRvmDUjyEmNUWwx8UbK/0h/0'/1500)"])['total_amount'], Decimal("0.256")) + assert_equal(self.nodes[0].scantxoutset("start", [ {"desc": "combo(tprv8ZgxMBicQKsPd7Uf69XL1XwhmjHopUGep8GuEiJDZmbQz6o58LninorQAfcKZWARbtRtfnLcJ5MQ2AtHcQJCCRUcMRvmDUjyEmNUWwx8UbK/0'/0h/*h)", "range": 1499}])['total_amount'], Decimal("0.024")) + assert_equal(self.nodes[0].scantxoutset("start", [ {"desc": "combo(tprv8ZgxMBicQKsPd7Uf69XL1XwhmjHopUGep8GuEiJDZmbQz6o58LninorQAfcKZWARbtRtfnLcJ5MQ2AtHcQJCCRUcMRvmDUjyEmNUWwx8UbK/0'/0'/*h)", "range": 1500}])['total_amount'], Decimal("0.056")) + assert_equal(self.nodes[0].scantxoutset("start", [ {"desc": "combo(tprv8ZgxMBicQKsPd7Uf69XL1XwhmjHopUGep8GuEiJDZmbQz6o58LninorQAfcKZWARbtRtfnLcJ5MQ2AtHcQJCCRUcMRvmDUjyEmNUWwx8UbK/0h/0'/*)", "range": 1499}])['total_amount'], Decimal("0.192")) + assert_equal(self.nodes[0].scantxoutset("start", [ {"desc": "combo(tprv8ZgxMBicQKsPd7Uf69XL1XwhmjHopUGep8GuEiJDZmbQz6o58LninorQAfcKZWARbtRtfnLcJ5MQ2AtHcQJCCRUcMRvmDUjyEmNUWwx8UbK/0'/0h/*)", "range": 1500}])['total_amount'], Decimal("0.448")) + assert_equal(self.nodes[0].scantxoutset("start", [ "combo(tprv8ZgxMBicQKsPd7Uf69XL1XwhmjHopUGep8GuEiJDZmbQz6o58LninorQAfcKZWARbtRtfnLcJ5MQ2AtHcQJCCRUcMRvmDUjyEmNUWwx8UbK/1/1/0')"])['total_amount'], Decimal("0.512")) + assert_equal(self.nodes[0].scantxoutset("start", [ "combo(tprv8ZgxMBicQKsPd7Uf69XL1XwhmjHopUGep8GuEiJDZmbQz6o58LninorQAfcKZWARbtRtfnLcJ5MQ2AtHcQJCCRUcMRvmDUjyEmNUWwx8UbK/1/1/1')"])['total_amount'], Decimal("1.024")) + assert_equal(self.nodes[0].scantxoutset("start", [ "combo(tprv8ZgxMBicQKsPd7Uf69XL1XwhmjHopUGep8GuEiJDZmbQz6o58LninorQAfcKZWARbtRtfnLcJ5MQ2AtHcQJCCRUcMRvmDUjyEmNUWwx8UbK/1/1/1500h)"])['total_amount'], Decimal("2.048")) + assert_equal(self.nodes[0].scantxoutset("start", [ "combo(tprv8ZgxMBicQKsPd7Uf69XL1XwhmjHopUGep8GuEiJDZmbQz6o58LninorQAfcKZWARbtRtfnLcJ5MQ2AtHcQJCCRUcMRvmDUjyEmNUWwx8UbK/1/1/0)"])['total_amount'], Decimal("4.096")) + assert_equal(self.nodes[0].scantxoutset("start", [ "combo(tprv8ZgxMBicQKsPd7Uf69XL1XwhmjHopUGep8GuEiJDZmbQz6o58LninorQAfcKZWARbtRtfnLcJ5MQ2AtHcQJCCRUcMRvmDUjyEmNUWwx8UbK/1/1/1)"])['total_amount'], Decimal("8.192")) + assert_equal(self.nodes[0].scantxoutset("start", [ "combo(tprv8ZgxMBicQKsPd7Uf69XL1XwhmjHopUGep8GuEiJDZmbQz6o58LninorQAfcKZWARbtRtfnLcJ5MQ2AtHcQJCCRUcMRvmDUjyEmNUWwx8UbK/1/1/1500)"])['total_amount'], Decimal("16.384")) + assert_equal(self.nodes[0].scantxoutset("start", [ "combo(tpubD6NzVbkrYhZ4WaWSyoBvQwbpLkojyoTZPRsgXELWz3Popb3qkjcJyJUGLnL4qHHoQvao8ESaAstxYSnhyswJ76uZPStJRJCTKvosUCJZL5B/1/1/0)"])['total_amount'], Decimal("4.096")) + assert_equal(self.nodes[0].scantxoutset("start", [ "combo(tpubD6NzVbkrYhZ4WaWSyoBvQwbpLkojyoTZPRsgXELWz3Popb3qkjcJyJUGLnL4qHHoQvao8ESaAstxYSnhyswJ76uZPStJRJCTKvosUCJZL5B/1/1/1)"])['total_amount'], Decimal("8.192")) + assert_equal(self.nodes[0].scantxoutset("start", [ "combo(tpubD6NzVbkrYhZ4WaWSyoBvQwbpLkojyoTZPRsgXELWz3Popb3qkjcJyJUGLnL4qHHoQvao8ESaAstxYSnhyswJ76uZPStJRJCTKvosUCJZL5B/1/1/1500)"])['total_amount'], Decimal("16.384")) + assert_equal(self.nodes[0].scantxoutset("start", [ {"desc": "combo(tprv8ZgxMBicQKsPd7Uf69XL1XwhmjHopUGep8GuEiJDZmbQz6o58LninorQAfcKZWARbtRtfnLcJ5MQ2AtHcQJCCRUcMRvmDUjyEmNUWwx8UbK/1/1/*')", "range": 1499}])['total_amount'], Decimal("1.536")) + assert_equal(self.nodes[0].scantxoutset("start", [ {"desc": "combo(tprv8ZgxMBicQKsPd7Uf69XL1XwhmjHopUGep8GuEiJDZmbQz6o58LninorQAfcKZWARbtRtfnLcJ5MQ2AtHcQJCCRUcMRvmDUjyEmNUWwx8UbK/1/1/*')", "range": 1500}])['total_amount'], Decimal("3.584")) + assert_equal(self.nodes[0].scantxoutset("start", [ {"desc": "combo(tprv8ZgxMBicQKsPd7Uf69XL1XwhmjHopUGep8GuEiJDZmbQz6o58LninorQAfcKZWARbtRtfnLcJ5MQ2AtHcQJCCRUcMRvmDUjyEmNUWwx8UbK/1/1/*)", "range": 1499}])['total_amount'], Decimal("12.288")) + assert_equal(self.nodes[0].scantxoutset("start", [ {"desc": "combo(tprv8ZgxMBicQKsPd7Uf69XL1XwhmjHopUGep8GuEiJDZmbQz6o58LninorQAfcKZWARbtRtfnLcJ5MQ2AtHcQJCCRUcMRvmDUjyEmNUWwx8UbK/1/1/*)", "range": 1500}])['total_amount'], Decimal("28.672")) + assert_equal(self.nodes[0].scantxoutset("start", [ {"desc": "combo(tpubD6NzVbkrYhZ4WaWSyoBvQwbpLkojyoTZPRsgXELWz3Popb3qkjcJyJUGLnL4qHHoQvao8ESaAstxYSnhyswJ76uZPStJRJCTKvosUCJZL5B/1/1/*)", "range": 1499}])['total_amount'], Decimal("12.288")) + assert_equal(self.nodes[0].scantxoutset("start", [ {"desc": "combo(tpubD6NzVbkrYhZ4WaWSyoBvQwbpLkojyoTZPRsgXELWz3Popb3qkjcJyJUGLnL4qHHoQvao8ESaAstxYSnhyswJ76uZPStJRJCTKvosUCJZL5B/1/1/*)", "range": 1500}])['total_amount'], Decimal("28.672")) if __name__ == '__main__': ScantxoutsetTest().main() diff --git a/test/functional/rpc_signmessage.py b/test/functional/rpc_signmessage.py index 5b6935ceea..449c4075bd 100755 --- a/test/functional/rpc_signmessage.py +++ b/test/functional/rpc_signmessage.py @@ -1,5 +1,5 @@ #!/usr/bin/env python3 -# Copyright (c) 2016-2017 The Bitcoin Core developers +# Copyright (c) 2016-2018 The Bitcoin Core developers # Distributed under the MIT software license, see the accompanying # file COPYING or http://www.opensource.org/licenses/mit-license.php. """Test RPC commands for signing and verifying messages.""" diff --git a/test/functional/rpc_signrawtransaction.py b/test/functional/rpc_signrawtransaction.py index 18829ef4b8..32b099294f 100755 --- a/test/functional/rpc_signrawtransaction.py +++ b/test/functional/rpc_signrawtransaction.py @@ -1,11 +1,11 @@ #!/usr/bin/env python3 -# Copyright (c) 2015-2017 The Bitcoin Core developers +# Copyright (c) 2015-2018 The Bitcoin Core developers # Distributed under the MIT software license, see the accompanying # file COPYING or http://www.opensource.org/licenses/mit-license.php. """Test transaction signing using the signrawtransaction* RPCs.""" from test_framework.test_framework import BitcoinTestFramework -from test_framework.util import * +from test_framework.util import assert_equal, assert_raises_rpc_error class SignRawTransactionsTest(BitcoinTestFramework): diff --git a/test/functional/rpc_txoutproof.py b/test/functional/rpc_txoutproof.py index e5a63f0c46..f9f8574646 100755 --- a/test/functional/rpc_txoutproof.py +++ b/test/functional/rpc_txoutproof.py @@ -1,13 +1,12 @@ #!/usr/bin/env python3 -# Copyright (c) 2014-2017 The Bitcoin Core developers +# Copyright (c) 2014-2018 The Bitcoin Core developers # Distributed under the MIT software license, see the accompanying # file COPYING or http://www.opensource.org/licenses/mit-license.php. """Test gettxoutproof and verifytxoutproof RPCs.""" +from test_framework.messages import CMerkleBlock, FromHex, ToHex from test_framework.test_framework import BitcoinTestFramework -from test_framework.util import * -from test_framework.mininode import FromHex, ToHex -from test_framework.messages import CMerkleBlock +from test_framework.util import assert_equal, assert_raises_rpc_error, connect_nodes class MerkleBlockTest(BitcoinTestFramework): def set_test_params(self): diff --git a/test/functional/rpc_uptime.py b/test/functional/rpc_uptime.py index 78236b2393..20b6341550 100755 --- a/test/functional/rpc_uptime.py +++ b/test/functional/rpc_uptime.py @@ -1,5 +1,5 @@ #!/usr/bin/env python3 -# Copyright (c) 2017 The Bitcoin Core developers +# Copyright (c) 2017-2018 The Bitcoin Core developers # Distributed under the MIT software license, see the accompanying # file COPYING or http://www.opensource.org/licenses/mit-license.php. """Test the RPC call related to the uptime command. diff --git a/test/functional/rpc_users.py b/test/functional/rpc_users.py index 62d86467fc..102dd22594 100755 --- a/test/functional/rpc_users.py +++ b/test/functional/rpc_users.py @@ -1,5 +1,5 @@ #!/usr/bin/env python3 -# Copyright (c) 2015-2017 The Bitcoin Core developers +# Copyright (c) 2015-2018 The Bitcoin Core developers # Distributed under the MIT software license, see the accompanying # file COPYING or http://www.opensource.org/licenses/mit-license.php. """Test multiple RPC users.""" @@ -18,6 +18,7 @@ import subprocess from random import SystemRandom import string import configparser +import sys class HTTPBasicsTest(BitcoinTestFramework): @@ -36,7 +37,7 @@ class HTTPBasicsTest(BitcoinTestFramework): config = configparser.ConfigParser() config.read_file(open(self.options.configfile)) gen_rpcauth = config['environment']['RPCAUTH'] - p = subprocess.Popen([gen_rpcauth, self.user], stdout=subprocess.PIPE, universal_newlines=True) + p = subprocess.Popen([sys.executable, gen_rpcauth, self.user], stdout=subprocess.PIPE, universal_newlines=True) lines = p.stdout.read().splitlines() rpcauth3 = lines[1] self.password = lines[3] diff --git a/test/functional/test_framework/address.py b/test/functional/test_framework/address.py index b076c9dd43..d1fb97b024 100644 --- a/test/functional/test_framework/address.py +++ b/test/functional/test_framework/address.py @@ -1,5 +1,5 @@ #!/usr/bin/env python3 -# Copyright (c) 2016-2017 The Bitcoin Core developers +# Copyright (c) 2016-2018 The Bitcoin Core developers # Distributed under the MIT software license, see the accompanying # file COPYING or http://www.opensource.org/licenses/mit-license.php. """Encode and decode BASE58, P2PKH and P2SH addresses.""" diff --git a/test/functional/test_framework/blocktools.py b/test/functional/test_framework/blocktools.py index 5c2b1815e5..987ade4044 100644 --- a/test/functional/test_framework/blocktools.py +++ b/test/functional/test_framework/blocktools.py @@ -1,5 +1,5 @@ #!/usr/bin/env python3 -# Copyright (c) 2015-2017 The Bitcoin Core developers +# Copyright (c) 2015-2018 The Bitcoin Core developers # Distributed under the MIT software license, see the accompanying # file COPYING or http://www.opensource.org/licenses/mit-license.php. """Utilities for manipulating blocks and transactions.""" @@ -39,6 +39,7 @@ from .script import ( hash160, ) from .util import assert_equal +from io import BytesIO # From BIP141 WITNESS_COMMITMENT_HEADER = b"\xaa\x21\xa9\xed" @@ -117,17 +118,41 @@ def create_coinbase(height, pubkey=None): coinbase.calc_sha256() return coinbase -def create_transaction(prevtx, n, sig, value, script_pub_key=CScript()): - """Create a transaction. +def create_tx_with_script(prevtx, n, script_sig=b"", *, amount, script_pub_key=CScript()): + """Return one-input, one-output transaction object + spending the prevtx's n-th output with the given amount. - If the script_pub_key is not specified, make it anyone-can-spend.""" + Can optionally pass scriptPubKey and scriptSig, default is anyone-can-spend ouput. + """ tx = CTransaction() assert(n < len(prevtx.vout)) - tx.vin.append(CTxIn(COutPoint(prevtx.sha256, n), sig, 0xffffffff)) - tx.vout.append(CTxOut(value, script_pub_key)) + tx.vin.append(CTxIn(COutPoint(prevtx.sha256, n), script_sig, 0xffffffff)) + tx.vout.append(CTxOut(amount, script_pub_key)) tx.calc_sha256() return tx +def create_transaction(node, txid, to_address, *, amount): + """ Return signed transaction spending the first output of the + input txid. Note that the node must be able to sign for the + output that is being spent, and the node must not be running + multiple wallets. + """ + raw_tx = create_raw_transaction(node, txid, to_address, amount=amount) + tx = CTransaction() + tx.deserialize(BytesIO(hex_str_to_bytes(raw_tx))) + return tx + +def create_raw_transaction(node, txid, to_address, *, amount): + """ Return raw signed transaction spending the first output of the + input txid. Note that the node must be able to sign for the + output that is being spent, and the node must not be running + multiple wallets. + """ + rawtx = node.createrawtransaction(inputs=[{"txid": txid, "vout": 0}], outputs={to_address: amount}) + signresult = node.signrawtransactionwithwallet(rawtx) + assert_equal(signresult["complete"], True) + return signresult['hex'] + def get_legacy_sigopcount_block(block, accurate=True): count = 0 for tx in block.vtx: diff --git a/test/functional/test_framework/coverage.py b/test/functional/test_framework/coverage.py index f8761f2bb3..7705dd3e4d 100644 --- a/test/functional/test_framework/coverage.py +++ b/test/functional/test_framework/coverage.py @@ -1,5 +1,5 @@ #!/usr/bin/env python3 -# Copyright (c) 2015-2017 The Bitcoin Core developers +# Copyright (c) 2015-2018 The Bitcoin Core developers # Distributed under the MIT software license, see the accompanying # file COPYING or http://www.opensource.org/licenses/mit-license.php. """Utilities for doing coverage analysis on the RPC interface. diff --git a/test/functional/test_framework/messages.py b/test/functional/test_framework/messages.py index af57e61f2f..7276f6b450 100755 --- a/test/functional/test_framework/messages.py +++ b/test/functional/test_framework/messages.py @@ -1,7 +1,7 @@ #!/usr/bin/env python3 # Copyright (c) 2010 ArtForz -- public domain half-a-node # Copyright (c) 2012 Jeff Garzik -# Copyright (c) 2010-2017 The Bitcoin Core developers +# Copyright (c) 2010-2018 The Bitcoin Core developers # Distributed under the MIT software license, see the accompanying # file COPYING or http://www.opensource.org/licenses/mit-license.php. """Bitcoin test framework primitive and message structures @@ -32,6 +32,7 @@ MY_SUBVERSION = b"/python-mininode-tester:0.0.3/" MY_RELAY = 1 # from version 70001 onwards, fRelay should be appended to version messages (BIP37) MAX_INV_SZ = 50000 +MAX_LOCATOR_SZ = 101 MAX_BLOCK_BASE_SIZE = 1000000 COIN = 100000000 # 1 btc in satoshis diff --git a/test/functional/test_framework/mininode.py b/test/functional/test_framework/mininode.py index ccf767d357..d1ddbbe8ee 100755 --- a/test/functional/test_framework/mininode.py +++ b/test/functional/test_framework/mininode.py @@ -1,7 +1,7 @@ #!/usr/bin/env python3 # Copyright (c) 2010 ArtForz -- public domain half-a-node # Copyright (c) 2012 Jeff Garzik -# Copyright (c) 2010-2017 The Bitcoin Core developers +# Copyright (c) 2010-2018 The Bitcoin Core developers # Distributed under the MIT software license, see the accompanying # file COPYING or http://www.opensource.org/licenses/mit-license.php. """Bitcoin P2P network half-a-node. @@ -21,7 +21,7 @@ import struct import sys import threading -from test_framework.messages import * +from test_framework.messages import CBlockHeader, MIN_VERSION_SUPPORTED, msg_addr, msg_block, MSG_BLOCK, msg_blocktxn, msg_cmpctblock, msg_feefilter, msg_getaddr, msg_getblocks, msg_getblocktxn, msg_getdata, msg_getheaders, msg_headers, msg_inv, msg_mempool, msg_ping, msg_pong, msg_reject, msg_sendcmpct, msg_sendheaders, msg_tx, MSG_TX, MSG_TYPE_MASK, msg_verack, msg_version, NODE_NETWORK, NODE_WITNESS, sha256 from test_framework.util import wait_until logger = logging.getLogger("TestFramework.mininode") @@ -332,6 +332,15 @@ class P2PInterface(P2PConnection): test_function = lambda: self.last_message.get("block") and self.last_message["block"].block.rehash() == blockhash wait_until(test_function, timeout=timeout, lock=mininode_lock) + def wait_for_header(self, blockhash, timeout=60): + def test_function(): + last_headers = self.last_message.get('headers') + if not last_headers: + return False + return last_headers.headers[0].rehash() == blockhash + + wait_until(test_function, timeout=timeout, lock=mininode_lock) + def wait_for_getdata(self, timeout=60): """Waits for a getdata message. diff --git a/test/functional/test_framework/netutil.py b/test/functional/test_framework/netutil.py index 36d1a2f856..45c182f630 100644 --- a/test/functional/test_framework/netutil.py +++ b/test/functional/test_framework/netutil.py @@ -1,5 +1,5 @@ #!/usr/bin/env python3 -# Copyright (c) 2014-2017 The Bitcoin Core developers +# Copyright (c) 2014-2018 The Bitcoin Core developers # Distributed under the MIT software license, see the accompanying # file COPYING or http://www.opensource.org/licenses/mit-license.php. """Linux network utilities. @@ -107,7 +107,7 @@ def all_interfaces(): max_possible *= 2 else: break - namestr = names.tostring() + namestr = names.tobytes() return [(namestr[i:i+16].split(b'\0', 1)[0], socket.inet_ntoa(namestr[i+20:i+24])) for i in range(0, outbytes, struct_size)] diff --git a/test/functional/test_framework/script.py b/test/functional/test_framework/script.py index 44650d7584..375d6334f7 100644 --- a/test/functional/test_framework/script.py +++ b/test/functional/test_framework/script.py @@ -1,5 +1,5 @@ #!/usr/bin/env python3 -# Copyright (c) 2015-2017 The Bitcoin Core developers +# Copyright (c) 2015-2018 The Bitcoin Core developers # Distributed under the MIT software license, see the accompanying # file COPYING or http://www.opensource.org/licenses/mit-license.php. """Functionality to build scripts, as well as SignatureHash(). @@ -7,7 +7,8 @@ This file is modified from python-bitcoinlib. """ -from .mininode import CTransaction, CTxOut, sha256, hash256, uint256_from_str, ser_uint256, ser_string +from .messages import CTransaction, CTxOut, sha256, hash256, uint256_from_str, ser_uint256, ser_string + from binascii import hexlify import hashlib import struct diff --git a/test/functional/test_framework/siphash.py b/test/functional/test_framework/siphash.py index 6ffc982cea..85836845d4 100644 --- a/test/functional/test_framework/siphash.py +++ b/test/functional/test_framework/siphash.py @@ -1,5 +1,5 @@ #!/usr/bin/env python3 -# Copyright (c) 2016-2017 The Bitcoin Core developers +# Copyright (c) 2016-2018 The Bitcoin Core developers # Distributed under the MIT software license, see the accompanying # file COPYING or http://www.opensource.org/licenses/mit-license.php. """Specialized SipHash-2-4 implementations. diff --git a/test/functional/test_framework/socks5.py b/test/functional/test_framework/socks5.py index 581de0ed5d..dd0f209268 100644 --- a/test/functional/test_framework/socks5.py +++ b/test/functional/test_framework/socks5.py @@ -1,5 +1,5 @@ #!/usr/bin/env python3 -# Copyright (c) 2015-2017 The Bitcoin Core developers +# Copyright (c) 2015-2018 The Bitcoin Core developers # Distributed under the MIT software license, see the accompanying # file COPYING or http://www.opensource.org/licenses/mit-license.php. """Dummy Socks5 server for testing.""" diff --git a/test/functional/test_framework/test_framework.py b/test/functional/test_framework/test_framework.py index c2fb2077ac..b876d9bd76 100755 --- a/test/functional/test_framework/test_framework.py +++ b/test/functional/test_framework/test_framework.py @@ -1,5 +1,5 @@ #!/usr/bin/env python3 -# Copyright (c) 2014-2017 The Bitcoin Core developers +# Copyright (c) 2014-2018 The Bitcoin Core developers # Distributed under the MIT software license, see the accompanying # file COPYING or http://www.opensource.org/licenses/mit-license.php. """Base class for RPC testing.""" @@ -7,7 +7,7 @@ import configparser from enum import Enum import logging -import optparse +import argparse import os import pdb import shutil @@ -86,6 +86,7 @@ class BitcoinTestFramework(metaclass=BitcoinTestMetaClass): self.nodes = [] self.network_thread = None self.mocktime = 0 + self.rpc_timewait = 60 # Wait for up to 60 seconds for the RPC server to respond self.supports_cli = False self.bind_to_localhost_only = True self.set_test_params() @@ -95,31 +96,31 @@ class BitcoinTestFramework(metaclass=BitcoinTestMetaClass): def main(self): """Main function. This should not be overridden by the subclass test scripts.""" - parser = optparse.OptionParser(usage="%prog [options]") - parser.add_option("--nocleanup", dest="nocleanup", default=False, action="store_true", - help="Leave bitcoinds and test.* datadir on exit or error") - parser.add_option("--noshutdown", dest="noshutdown", default=False, action="store_true", - help="Don't stop bitcoinds after the test execution") - parser.add_option("--cachedir", dest="cachedir", default=os.path.abspath(os.path.dirname(os.path.realpath(__file__)) + "/../../cache"), - help="Directory for caching pregenerated datadirs (default: %default)") - parser.add_option("--tmpdir", dest="tmpdir", help="Root directory for datadirs") - parser.add_option("-l", "--loglevel", dest="loglevel", default="INFO", - help="log events at this level and higher to the console. Can be set to DEBUG, INFO, WARNING, ERROR or CRITICAL. Passing --loglevel DEBUG will output all logs to console. Note that logs at all levels are always written to the test_framework.log file in the temporary test directory.") - parser.add_option("--tracerpc", dest="trace_rpc", default=False, action="store_true", - help="Print out all RPC calls as they are made") - parser.add_option("--portseed", dest="port_seed", default=os.getpid(), type='int', - help="The seed to use for assigning port numbers (default: current process id)") - parser.add_option("--coveragedir", dest="coveragedir", - help="Write tested RPC commands into this directory") - parser.add_option("--configfile", dest="configfile", - default=os.path.abspath(os.path.dirname(os.path.realpath(__file__)) + "/../../config.ini"), - help="Location of the test framework config file (default: %default)") - parser.add_option("--pdbonfailure", dest="pdbonfailure", default=False, action="store_true", - help="Attach a python debugger if test fails") - parser.add_option("--usecli", dest="usecli", default=False, action="store_true", - help="use bitcoin-cli instead of RPC for all commands") + parser = argparse.ArgumentParser(usage="%(prog)s [options]") + parser.add_argument("--nocleanup", dest="nocleanup", default=False, action="store_true", + help="Leave bitcoinds and test.* datadir on exit or error") + parser.add_argument("--noshutdown", dest="noshutdown", default=False, action="store_true", + help="Don't stop bitcoinds after the test execution") + parser.add_argument("--cachedir", dest="cachedir", default=os.path.abspath(os.path.dirname(os.path.realpath(__file__)) + "/../../cache"), + help="Directory for caching pregenerated datadirs (default: %(default)s)") + parser.add_argument("--tmpdir", dest="tmpdir", help="Root directory for datadirs") + parser.add_argument("-l", "--loglevel", dest="loglevel", default="INFO", + help="log events at this level and higher to the console. Can be set to DEBUG, INFO, WARNING, ERROR or CRITICAL. Passing --loglevel DEBUG will output all logs to console. Note that logs at all levels are always written to the test_framework.log file in the temporary test directory.") + parser.add_argument("--tracerpc", dest="trace_rpc", default=False, action="store_true", + help="Print out all RPC calls as they are made") + parser.add_argument("--portseed", dest="port_seed", default=os.getpid(), type=int, + help="The seed to use for assigning port numbers (default: current process id)") + parser.add_argument("--coveragedir", dest="coveragedir", + help="Write tested RPC commands into this directory") + parser.add_argument("--configfile", dest="configfile", + default=os.path.abspath(os.path.dirname(os.path.realpath(__file__)) + "/../../config.ini"), + help="Location of the test framework config file (default: %(default)s)") + parser.add_argument("--pdbonfailure", dest="pdbonfailure", default=False, action="store_true", + help="Attach a python debugger if test fails") + parser.add_argument("--usecli", dest="usecli", default=False, action="store_true", + help="use bitcoin-cli instead of RPC for all commands") self.add_options(parser) - (self.options, self.args) = parser.parse_args() + self.options = parser.parse_args() PortSeed.n = self.options.port_seed @@ -252,7 +253,7 @@ class BitcoinTestFramework(metaclass=BitcoinTestMetaClass): # Public helper methods. These can be accessed by the subclass test scripts. - def add_nodes(self, num_nodes, extra_args=None, rpchost=None, timewait=None, binary=None): + def add_nodes(self, num_nodes, extra_args=None, *, rpchost=None, binary=None): """Instantiate TestNode objects""" if self.bind_to_localhost_only: extra_confs = [["bind=127.0.0.1"]] * num_nodes @@ -266,7 +267,7 @@ class BitcoinTestFramework(metaclass=BitcoinTestMetaClass): assert_equal(len(extra_args), num_nodes) assert_equal(len(binary), num_nodes) for i in range(num_nodes): - self.nodes.append(TestNode(i, get_datadir_path(self.options.tmpdir, i), rpchost=rpchost, timewait=timewait, bitcoind=binary[i], bitcoin_cli=self.options.bitcoincli, mocktime=self.mocktime, coverage_dir=self.options.coveragedir, extra_conf=extra_confs[i], extra_args=extra_args[i], use_cli=self.options.usecli)) + self.nodes.append(TestNode(i, get_datadir_path(self.options.tmpdir, i), rpchost=rpchost, timewait=self.rpc_timewait, bitcoind=binary[i], bitcoin_cli=self.options.bitcoincli, mocktime=self.mocktime, coverage_dir=self.options.coveragedir, extra_conf=extra_confs[i], extra_args=extra_args[i], use_cli=self.options.usecli)) def start_node(self, i, *args, **kwargs): """Start a bitcoind""" @@ -417,7 +418,7 @@ class BitcoinTestFramework(metaclass=BitcoinTestMetaClass): args = [self.options.bitcoind, "-datadir=" + datadir] if i > 0: args.append("-connect=127.0.0.1:" + str(p2p_port(0))) - self.nodes.append(TestNode(i, get_datadir_path(self.options.cachedir, i), extra_conf=["bind=127.0.0.1"], extra_args=[], rpchost=None, timewait=None, bitcoind=self.options.bitcoind, bitcoin_cli=self.options.bitcoincli, mocktime=self.mocktime, coverage_dir=None)) + self.nodes.append(TestNode(i, get_datadir_path(self.options.cachedir, i), extra_conf=["bind=127.0.0.1"], extra_args=[], rpchost=None, timewait=self.rpc_timewait, bitcoind=self.options.bitcoind, bitcoin_cli=self.options.bitcoincli, mocktime=self.mocktime, coverage_dir=None)) self.nodes[i].args = args self.start_node(i) diff --git a/test/functional/test_framework/test_node.py b/test/functional/test_framework/test_node.py index 50942aec40..0d00cc2082 100755 --- a/test/functional/test_framework/test_node.py +++ b/test/functional/test_framework/test_node.py @@ -1,5 +1,5 @@ #!/usr/bin/env python3 -# Copyright (c) 2017 The Bitcoin Core developers +# Copyright (c) 2017-2018 The Bitcoin Core developers # Distributed under the MIT software license, see the accompanying # file COPYING or http://www.opensource.org/licenses/mit-license.php. """Class for bitcoind node under test""" @@ -15,6 +15,7 @@ import re import subprocess import tempfile import time +import urllib.parse from .authproxy import JSONRPCException from .util import ( @@ -56,17 +57,13 @@ class TestNode(): To make things easier for the test writer, any unrecognised messages will be dispatched to the RPC connection.""" - def __init__(self, i, datadir, rpchost, timewait, bitcoind, bitcoin_cli, mocktime, coverage_dir, extra_conf=None, extra_args=None, use_cli=False): + def __init__(self, i, datadir, *, rpchost, timewait, bitcoind, bitcoin_cli, mocktime, coverage_dir, extra_conf=None, extra_args=None, use_cli=False): self.index = i self.datadir = datadir self.stdout_dir = os.path.join(self.datadir, "stdout") self.stderr_dir = os.path.join(self.datadir, "stderr") self.rpchost = rpchost - if timewait: - self.rpc_timeout = timewait - else: - # Wait for up to 60 seconds for the RPC server to respond - self.rpc_timeout = 60 + self.rpc_timeout = timewait self.binary = bitcoind self.coverage_dir = coverage_dir if extra_conf != None: @@ -125,7 +122,7 @@ class TestNode(): assert self.rpc_connected and self.rpc is not None, self._node_msg("Error: no RPC connection") return getattr(self.rpc, name) - def start(self, extra_args=None, stdout=None, stderr=None, *args, **kwargs): + def start(self, extra_args=None, *, stdout=None, stderr=None, **kwargs): """Start the node.""" if extra_args is None: extra_args = self.extra_args @@ -146,7 +143,7 @@ class TestNode(): # add environment variable LIBC_FATAL_STDERR_=1 so that libc errors are written to stderr and not the terminal subp_env = dict(os.environ, LIBC_FATAL_STDERR_="1") - self.process = subprocess.Popen(self.args + extra_args, env=subp_env, stdout=stdout, stderr=stderr, *args, **kwargs) + self.process = subprocess.Popen(self.args + extra_args, env=subp_env, stdout=stdout, stderr=stderr, **kwargs) self.running = True self.log.debug("bitcoind started, waiting for RPC to come up") @@ -184,7 +181,7 @@ class TestNode(): return self.cli("-rpcwallet={}".format(wallet_name)) else: assert self.rpc_connected and self.rpc, self._node_msg("RPC not connected") - wallet_path = "wallet/%s" % wallet_name + wallet_path = "wallet/{}".format(urllib.parse.quote(wallet_name)) return self.rpc / wallet_path def stop_node(self, expected_stderr=''): @@ -203,6 +200,9 @@ class TestNode(): if stderr != expected_stderr: raise AssertionError("Unexpected stderr {} != {}".format(stderr, expected_stderr)) + self.stdout.close() + self.stderr.close() + del self.p2ps[:] def is_node_stopped(self): @@ -279,7 +279,7 @@ class TestNode(): self.encryptwallet(passphrase) self.wait_until_stopped() - def add_p2p_connection(self, p2p_conn, *args, **kwargs): + def add_p2p_connection(self, p2p_conn, *, wait_for_verack=True, **kwargs): """Add a p2p connection to the node. This method adds the p2p connection to the self.p2ps list and also @@ -289,8 +289,10 @@ class TestNode(): if 'dstaddr' not in kwargs: kwargs['dstaddr'] = '127.0.0.1' - p2p_conn.peer_connect(*args, **kwargs)() + p2p_conn.peer_connect(**kwargs)() self.p2ps.append(p2p_conn) + if wait_for_verack: + p2p_conn.wait_for_verack() return p2p_conn diff --git a/test/functional/test_framework/util.py b/test/functional/test_framework/util.py index 5e0b61b5e7..b355816d8b 100644 --- a/test/functional/test_framework/util.py +++ b/test/functional/test_framework/util.py @@ -1,5 +1,5 @@ #!/usr/bin/env python3 -# Copyright (c) 2014-2017 The Bitcoin Core developers +# Copyright (c) 2014-2018 The Bitcoin Core developers # Distributed under the MIT software license, see the accompanying # file COPYING or http://www.opensource.org/licenses/mit-license.php. """Helpful routines for regression testing.""" @@ -526,14 +526,6 @@ def gen_return_txouts(): txouts = txouts + script_pubkey return txouts -def create_tx(node, coinbase, to_address, amount): - inputs = [{"txid": coinbase, "vout": 0}] - outputs = {to_address: amount} - rawtx = node.createrawtransaction(inputs, outputs) - signresult = node.signrawtransactionwithwallet(rawtx) - assert_equal(signresult["complete"], True) - return signresult["hex"] - # Create a spend of each passed-in utxo, splicing in "txouts" to each raw # transaction to make it large. See gen_return_txouts() above. def create_lots_of_big_transactions(node, txouts, utxos, num, fee): diff --git a/test/functional/test_runner.py b/test/functional/test_runner.py index d324cd9bba..feea2a327a 100755 --- a/test/functional/test_runner.py +++ b/test/functional/test_runner.py @@ -1,5 +1,5 @@ #!/usr/bin/env python3 -# Copyright (c) 2014-2017 The Bitcoin Core developers +# Copyright (c) 2014-2018 The Bitcoin Core developers # Distributed under the MIT software license, see the accompanying # file COPYING or http://www.opensource.org/licenses/mit-license.php. """Run regression test suite. @@ -115,6 +115,7 @@ BASE_SCRIPTS = [ 'wallet_keypool.py', 'p2p_mempool.py', 'mining_prioritisetransaction.py', + 'p2p_invalid_locator.py', 'p2p_invalid_block.py', 'p2p_invalid_tx.py', 'rpc_createmultisig.py', @@ -229,7 +230,7 @@ def main(): logging.basicConfig(format='%(message)s', level=logging_level) # Create base test directory - tmpdir = "%s/bitcoin_test_runner_%s" % (args.tmpdirprefix, datetime.datetime.now().strftime("%Y%m%d_%H%M%S")) + tmpdir = "%s/test_runner_₿_🏃_%s" % (args.tmpdirprefix, datetime.datetime.now().strftime("%Y%m%d_%H%M%S")) os.makedirs(tmpdir) logging.debug("Temporary test directory at %s" % tmpdir) diff --git a/test/functional/wallet_abandonconflict.py b/test/functional/wallet_abandonconflict.py index cf2120d4eb..8a57b55ca9 100755 --- a/test/functional/wallet_abandonconflict.py +++ b/test/functional/wallet_abandonconflict.py @@ -1,5 +1,5 @@ #!/usr/bin/env python3 -# Copyright (c) 2014-2017 The Bitcoin Core developers +# Copyright (c) 2014-2018 The Bitcoin Core developers # Distributed under the MIT software license, see the accompanying # file COPYING or http://www.opensource.org/licenses/mit-license.php. """Test the abandontransaction RPC. @@ -10,9 +10,10 @@ which are not included in a block and are not currently in the mempool. It has no effect on transactions which are already abandoned. """ -from test_framework.test_framework import BitcoinTestFramework -from test_framework.util import * +from decimal import Decimal +from test_framework.test_framework import BitcoinTestFramework +from test_framework.util import assert_equal, assert_raises_rpc_error, connect_nodes, disconnect_nodes, sync_blocks, sync_mempools class AbandonConflictTest(BitcoinTestFramework): def set_test_params(self): diff --git a/test/functional/wallet_address_types.py b/test/functional/wallet_address_types.py index 7658d78383..01c7b6366a 100755 --- a/test/functional/wallet_address_types.py +++ b/test/functional/wallet_address_types.py @@ -1,5 +1,5 @@ #!/usr/bin/env python3 -# Copyright (c) 2017 The Bitcoin Core developers +# Copyright (c) 2017-2018 The Bitcoin Core developers # Distributed under the MIT software license, see the accompanying # file COPYING or http://www.opensource.org/licenses/mit-license.php. """Test that the wallet can send and receive using all combinations of address types. diff --git a/test/functional/wallet_backup.py b/test/functional/wallet_backup.py index 46a72d7e28..4ef8f4776b 100755 --- a/test/functional/wallet_backup.py +++ b/test/functional/wallet_backup.py @@ -1,5 +1,5 @@ #!/usr/bin/env python3 -# Copyright (c) 2014-2017 The Bitcoin Core developers +# Copyright (c) 2014-2018 The Bitcoin Core developers # Distributed under the MIT software license, see the accompanying # file COPYING or http://www.opensource.org/licenses/mit-license.php. """Test the wallet backup features. @@ -30,11 +30,13 @@ confirm 1/2/3/4 balances are same as before. Shutdown again, restore using importwallet, and confirm again balances are correct. """ +from decimal import Decimal +import os from random import randint import shutil from test_framework.test_framework import BitcoinTestFramework -from test_framework.util import * +from test_framework.util import assert_equal, assert_raises_rpc_error, connect_nodes, sync_blocks, sync_mempools class WalletBackupTest(BitcoinTestFramework): def set_test_params(self): diff --git a/test/functional/wallet_basic.py b/test/functional/wallet_basic.py index 431fec3738..ea0346543a 100755 --- a/test/functional/wallet_basic.py +++ b/test/functional/wallet_basic.py @@ -1,5 +1,5 @@ #!/usr/bin/env python3 -# Copyright (c) 2014-2017 The Bitcoin Core developers +# Copyright (c) 2014-2018 The Bitcoin Core developers # Distributed under the MIT software license, see the accompanying # file COPYING or http://www.opensource.org/licenses/mit-license.php. """Test the wallet.""" diff --git a/test/functional/wallet_bumpfee.py b/test/functional/wallet_bumpfee.py index f07041706a..dd95bb5e22 100755 --- a/test/functional/wallet_bumpfee.py +++ b/test/functional/wallet_bumpfee.py @@ -1,5 +1,5 @@ #!/usr/bin/env python3 -# Copyright (c) 2016-2017 The Bitcoin Core developers +# Copyright (c) 2016-2018 The Bitcoin Core developers # Distributed under the MIT software license, see the accompanying # file COPYING or http://www.opensource.org/licenses/mit-license.php. """Test the bumpfee RPC. @@ -14,12 +14,12 @@ added in the future, they should try to follow the same convention and not make assumptions about execution order. """ -from test_framework.blocktools import send_to_witness +from decimal import Decimal + +from test_framework.blocktools import add_witness_commitment, create_block, create_coinbase, send_to_witness +from test_framework.messages import BIP125_SEQUENCE_NUMBER, CTransaction from test_framework.test_framework import BitcoinTestFramework -from test_framework import blocktools -from test_framework.messages import BIP125_SEQUENCE_NUMBER -from test_framework.mininode import CTransaction -from test_framework.util import * +from test_framework.util import assert_equal, assert_greater_than, assert_raises_rpc_error, bytes_to_hex_str, connect_nodes_bi, hex_str_to_bytes, sync_mempools import io @@ -290,11 +290,11 @@ def submit_block_with_tx(node, tx): tip = node.getbestblockhash() height = node.getblockcount() + 1 block_time = node.getblockheader(tip)["mediantime"] + 1 - block = blocktools.create_block(int(tip, 16), blocktools.create_coinbase(height), block_time) + block = create_block(int(tip, 16), create_coinbase(height), block_time) block.vtx.append(ctx) block.rehash() block.hashMerkleRoot = block.calc_merkle_root() - blocktools.add_witness_commitment(block) + add_witness_commitment(block) block.solve() node.submitblock(bytes_to_hex_str(block.serialize(True))) return block diff --git a/test/functional/wallet_disable.py b/test/functional/wallet_disable.py index b0627d88ac..6530c58c78 100755 --- a/test/functional/wallet_disable.py +++ b/test/functional/wallet_disable.py @@ -1,5 +1,5 @@ #!/usr/bin/env python3 -# Copyright (c) 2015-2017 The Bitcoin Core developers +# Copyright (c) 2015-2018 The Bitcoin Core developers # Distributed under the MIT software license, see the accompanying # file COPYING or http://www.opensource.org/licenses/mit-license.php. """Test a node with the -disablewallet option. @@ -9,7 +9,7 @@ """ from test_framework.test_framework import BitcoinTestFramework -from test_framework.util import * +from test_framework.util import assert_raises_rpc_error class DisableWalletTest (BitcoinTestFramework): def set_test_params(self): diff --git a/test/functional/wallet_dump.py b/test/functional/wallet_dump.py index ba420ab2a6..63316d9644 100755 --- a/test/functional/wallet_dump.py +++ b/test/functional/wallet_dump.py @@ -1,5 +1,5 @@ #!/usr/bin/env python3 -# Copyright (c) 2016-2017 The Bitcoin Core developers +# Copyright (c) 2016-2018 The Bitcoin Core developers # Distributed under the MIT software license, see the accompanying # file COPYING or http://www.opensource.org/licenses/mit-license.php. """Test the dumpwallet RPC.""" @@ -81,16 +81,13 @@ class WalletDumpTest(BitcoinTestFramework): def set_test_params(self): self.num_nodes = 1 self.extra_args = [["-keypool=90", "-addresstype=legacy", "-deprecatedrpc=addwitnessaddress"]] + self.rpc_timeout = 120 def setup_network(self, split=False): - # Use 1 minute timeout because the initial getnewaddress RPC can take - # longer than the default 30 seconds due to an expensive - # CWallet::TopUpKeyPool call, and the encryptwallet RPC made later in - # the test often takes even longer. - self.add_nodes(self.num_nodes, extra_args=self.extra_args, timewait=60) + self.add_nodes(self.num_nodes, extra_args=self.extra_args) self.start_nodes() - def run_test (self): + def run_test(self): wallet_unenc_dump = os.path.join(self.nodes[0].datadir, "wallet.unencrypted.dump") wallet_enc_dump = os.path.join(self.nodes[0].datadir, "wallet.encrypted.dump") diff --git a/test/functional/wallet_encryption.py b/test/functional/wallet_encryption.py index 64ee678744..cec9660259 100755 --- a/test/functional/wallet_encryption.py +++ b/test/functional/wallet_encryption.py @@ -1,5 +1,5 @@ #!/usr/bin/env python3 -# Copyright (c) 2016-2017 The Bitcoin Core developers +# Copyright (c) 2016-2018 The Bitcoin Core developers # Distributed under the MIT software license, see the accompanying # file COPYING or http://www.opensource.org/licenses/mit-license.php. """Test Wallet encryption""" diff --git a/test/functional/wallet_fallbackfee.py b/test/functional/wallet_fallbackfee.py index cc0a5175d5..91dbae8939 100755 --- a/test/functional/wallet_fallbackfee.py +++ b/test/functional/wallet_fallbackfee.py @@ -1,10 +1,10 @@ #!/usr/bin/env python3 -# Copyright (c) 2017 The Bitcoin Core developers +# Copyright (c) 2017-2018 The Bitcoin Core developers # Distributed under the MIT software license, see the accompanying # file COPYING or http://www.opensource.org/licenses/mit-license.php. """Test wallet replace-by-fee capabilities in conjunction with the fallbackfee.""" from test_framework.test_framework import BitcoinTestFramework -from test_framework.util import * +from test_framework.util import assert_raises_rpc_error class WalletRBFTest(BitcoinTestFramework): def set_test_params(self): diff --git a/test/functional/wallet_groups.py b/test/functional/wallet_groups.py index 408e9dfef0..12dac145bd 100755 --- a/test/functional/wallet_groups.py +++ b/test/functional/wallet_groups.py @@ -5,8 +5,7 @@ """Test wallet group functionality.""" from test_framework.test_framework import BitcoinTestFramework -from test_framework.mininode import FromHex, ToHex -from test_framework.messages import CTransaction +from test_framework.messages import CTransaction, FromHex, ToHex from test_framework.util import ( assert_equal, ) @@ -22,6 +21,7 @@ class WalletGroupTest(BitcoinTestFramework): self.setup_clean_chain = True self.num_nodes = 3 self.extra_args = [[], [], ['-avoidpartialspends']] + self.rpc_timewait = 120 def run_test (self): # Mine some coins diff --git a/test/functional/wallet_hd.py b/test/functional/wallet_hd.py index 86abe0ca99..2a5f1934b7 100755 --- a/test/functional/wallet_hd.py +++ b/test/functional/wallet_hd.py @@ -1,5 +1,5 @@ #!/usr/bin/env python3 -# Copyright (c) 2016-2017 The Bitcoin Core developers +# Copyright (c) 2016-2018 The Bitcoin Core developers # Distributed under the MIT software license, see the accompanying # file COPYING or http://www.opensource.org/licenses/mit-license.php. """Test Hierarchical Deterministic wallet function.""" diff --git a/test/functional/wallet_import_rescan.py b/test/functional/wallet_import_rescan.py index 4c0ffb938b..0c6359976a 100755 --- a/test/functional/wallet_import_rescan.py +++ b/test/functional/wallet_import_rescan.py @@ -1,5 +1,5 @@ #!/usr/bin/env python3 -# Copyright (c) 2014-2017 The Bitcoin Core developers +# Copyright (c) 2014-2018 The Bitcoin Core developers # Distributed under the MIT software license, see the accompanying # file COPYING or http://www.opensource.org/licenses/mit-license.php. """Test wallet import RPCs. diff --git a/test/functional/wallet_importmulti.py b/test/functional/wallet_importmulti.py index 91acdb01d0..5f19e1e2c6 100755 --- a/test/functional/wallet_importmulti.py +++ b/test/functional/wallet_importmulti.py @@ -1,10 +1,10 @@ #!/usr/bin/env python3 -# Copyright (c) 2014-2017 The Bitcoin Core developers +# Copyright (c) 2014-2018 The Bitcoin Core developers # Distributed under the MIT software license, see the accompanying # file COPYING or http://www.opensource.org/licenses/mit-license.php. """Test the importmulti RPC.""" from test_framework.test_framework import BitcoinTestFramework -from test_framework.util import * +from test_framework.util import assert_equal, assert_greater_than, assert_raises_rpc_error class ImportMultiTest (BitcoinTestFramework): def set_test_params(self): diff --git a/test/functional/wallet_importprunedfunds.py b/test/functional/wallet_importprunedfunds.py index 256901884b..57fc754d35 100755 --- a/test/functional/wallet_importprunedfunds.py +++ b/test/functional/wallet_importprunedfunds.py @@ -1,5 +1,5 @@ #!/usr/bin/env python3 -# Copyright (c) 2014-2017 The Bitcoin Core developers +# Copyright (c) 2014-2018 The Bitcoin Core developers # Distributed under the MIT software license, see the accompanying # file COPYING or http://www.opensource.org/licenses/mit-license.php. """Test the importprunedfunds and removeprunedfunds RPCs.""" diff --git a/test/functional/wallet_keypool.py b/test/functional/wallet_keypool.py index 1285515dfc..f52dce04dd 100755 --- a/test/functional/wallet_keypool.py +++ b/test/functional/wallet_keypool.py @@ -1,11 +1,13 @@ #!/usr/bin/env python3 -# Copyright (c) 2014-2017 The Bitcoin Core developers +# Copyright (c) 2014-2018 The Bitcoin Core developers # Distributed under the MIT software license, see the accompanying # file COPYING or http://www.opensource.org/licenses/mit-license.php. """Test the wallet keypool and interaction with wallet encryption/locking.""" +import time + from test_framework.test_framework import BitcoinTestFramework -from test_framework.util import * +from test_framework.util import assert_equal, assert_raises_rpc_error class KeyPoolTest(BitcoinTestFramework): def set_test_params(self): diff --git a/test/functional/wallet_keypool_topup.py b/test/functional/wallet_keypool_topup.py index d657dc30c4..f6b88e6225 100755 --- a/test/functional/wallet_keypool_topup.py +++ b/test/functional/wallet_keypool_topup.py @@ -1,5 +1,5 @@ #!/usr/bin/env python3 -# Copyright (c) 2017 The Bitcoin Core developers +# Copyright (c) 2017-2018 The Bitcoin Core developers # Distributed under the MIT software license, see the accompanying # file COPYING or http://www.opensource.org/licenses/mit-license.php. """Test HD Wallet keypool restore function. diff --git a/test/functional/wallet_labels.py b/test/functional/wallet_labels.py index 8d961fb34a..0817054149 100755 --- a/test/functional/wallet_labels.py +++ b/test/functional/wallet_labels.py @@ -1,5 +1,5 @@ #!/usr/bin/env python3 -# Copyright (c) 2016-2017 The Bitcoin Core developers +# Copyright (c) 2016-2018 The Bitcoin Core developers # Distributed under the MIT software license, see the accompanying # file COPYING or http://www.opensource.org/licenses/mit-license.php. """Test label RPCs. diff --git a/test/functional/wallet_listreceivedby.py b/test/functional/wallet_listreceivedby.py index e9912f994e..09a7c72347 100755 --- a/test/functional/wallet_listreceivedby.py +++ b/test/functional/wallet_listreceivedby.py @@ -1,5 +1,5 @@ #!/usr/bin/env python3 -# Copyright (c) 2014-2017 The Bitcoin Core developers +# Copyright (c) 2014-2018 The Bitcoin Core developers # Distributed under the MIT software license, see the accompanying # file COPYING or http://www.opensource.org/licenses/mit-license.php. """Test the listreceivedbyaddress RPC.""" diff --git a/test/functional/wallet_listsinceblock.py b/test/functional/wallet_listsinceblock.py index 63c179411c..847b48aa89 100755 --- a/test/functional/wallet_listsinceblock.py +++ b/test/functional/wallet_listsinceblock.py @@ -1,5 +1,5 @@ #!/usr/bin/env python3 -# Copyright (c) 2017 The Bitcoin Core developers +# Copyright (c) 2017-2018 The Bitcoin Core developers # Distributed under the MIT software license, see the accompanying # file COPYING or http://www.opensource.org/licenses/mit-license.php. """Test the listsincelast RPC.""" diff --git a/test/functional/wallet_listtransactions.py b/test/functional/wallet_listtransactions.py index 7cf2e456cf..4dc3ff4b26 100755 --- a/test/functional/wallet_listtransactions.py +++ b/test/functional/wallet_listtransactions.py @@ -1,12 +1,12 @@ #!/usr/bin/env python3 -# Copyright (c) 2014-2017 The Bitcoin Core developers +# Copyright (c) 2014-2018 The Bitcoin Core developers # Distributed under the MIT software license, see the accompanying # file COPYING or http://www.opensource.org/licenses/mit-license.php. """Test the listtransactions API.""" from decimal import Decimal from io import BytesIO -from test_framework.mininode import CTransaction, COIN +from test_framework.messages import COIN, CTransaction from test_framework.test_framework import BitcoinTestFramework from test_framework.util import ( assert_array_result, diff --git a/test/functional/wallet_multiwallet.py b/test/functional/wallet_multiwallet.py index fa5a2154a4..0690dcf92d 100755 --- a/test/functional/wallet_multiwallet.py +++ b/test/functional/wallet_multiwallet.py @@ -1,5 +1,5 @@ #!/usr/bin/env python3 -# Copyright (c) 2017 The Bitcoin Core developers +# Copyright (c) 2017-2018 The Bitcoin Core developers # Distributed under the MIT software license, see the accompanying # file COPYING or http://www.opensource.org/licenses/mit-license.php. """Test multiwallet. @@ -30,6 +30,11 @@ class MultiWalletTest(BitcoinTestFramework): wallet_dir = lambda *p: data_dir('wallets', *p) wallet = lambda name: node.get_wallet_rpc(name) + def wallet_file(name): + if os.path.isdir(wallet_dir(name)): + return wallet_dir(name, "wallet.dat") + return wallet_dir(name) + # check wallet.dat is created self.stop_nodes() assert_equal(os.path.isfile(wallet_dir('wallet.dat')), True) @@ -43,6 +48,12 @@ class MultiWalletTest(BitcoinTestFramework): # directory paths) can be loaded os.rename(wallet_dir("wallet.dat"), wallet_dir("w8")) + # create another dummy wallet for use in testing backups later + self.start_node(0, []) + self.stop_nodes() + empty_wallet = os.path.join(self.options.tmpdir, 'empty.dat') + os.rename(wallet_dir("wallet.dat"), empty_wallet) + # restart node with a mix of wallet names: # w1, w2, w3 - to verify new wallets created when non-existing paths specified # w - to verify wallet name matching works when one wallet path is prefix of another @@ -59,10 +70,7 @@ class MultiWalletTest(BitcoinTestFramework): # check that all requested wallets were created self.stop_node(0) for wallet_name in wallet_names: - if os.path.isdir(wallet_dir(wallet_name)): - assert_equal(os.path.isfile(wallet_dir(wallet_name, "wallet.dat")), True) - else: - assert_equal(os.path.isfile(wallet_dir(wallet_name)), True) + assert_equal(os.path.isfile(wallet_file(wallet_name)), True) # should not initialize if wallet path can't be created exp_stderr = "boost::filesystem::create_directory: (The system cannot find the path specified|Not a directory):" @@ -265,5 +273,25 @@ class MultiWalletTest(BitcoinTestFramework): assert_equal(self.nodes[0].listwallets(), ['w1']) assert_equal(w1.getwalletinfo()['walletname'], 'w1') + # Test backing up and restoring wallets + self.log.info("Test wallet backup") + self.restart_node(0, ['-nowallet']) + for wallet_name in wallet_names: + self.nodes[0].loadwallet(wallet_name) + for wallet_name in wallet_names: + rpc = self.nodes[0].get_wallet_rpc(wallet_name) + addr = rpc.getnewaddress() + backup = os.path.join(self.options.tmpdir, 'backup.dat') + rpc.backupwallet(backup) + self.nodes[0].unloadwallet(wallet_name) + shutil.copyfile(empty_wallet, wallet_file(wallet_name)) + self.nodes[0].loadwallet(wallet_name) + assert_equal(rpc.getaddressinfo(addr)['ismine'], False) + self.nodes[0].unloadwallet(wallet_name) + shutil.copyfile(backup, wallet_file(wallet_name)) + self.nodes[0].loadwallet(wallet_name) + assert_equal(rpc.getaddressinfo(addr)['ismine'], True) + + if __name__ == '__main__': MultiWalletTest().main() diff --git a/test/functional/wallet_resendwallettransactions.py b/test/functional/wallet_resendwallettransactions.py index d959bb4c38..8995aa743f 100755 --- a/test/functional/wallet_resendwallettransactions.py +++ b/test/functional/wallet_resendwallettransactions.py @@ -1,5 +1,5 @@ #!/usr/bin/env python3 -# Copyright (c) 2017 The Bitcoin Core developers +# Copyright (c) 2017-2018 The Bitcoin Core developers # Distributed under the MIT software license, see the accompanying # file COPYING or http://www.opensource.org/licenses/mit-license.php. """Test resendwallettransactions RPC.""" diff --git a/test/functional/wallet_txn_clone.py b/test/functional/wallet_txn_clone.py index 72ae2d5db7..4ca4ee14e9 100755 --- a/test/functional/wallet_txn_clone.py +++ b/test/functional/wallet_txn_clone.py @@ -1,5 +1,5 @@ #!/usr/bin/env python3 -# Copyright (c) 2014-2017 The Bitcoin Core developers +# Copyright (c) 2014-2018 The Bitcoin Core developers # Distributed under the MIT software license, see the accompanying # file COPYING or http://www.opensource.org/licenses/mit-license.php. """Test the wallet accounts properly when there are cloned transactions with malleated scriptsigs.""" @@ -17,10 +17,10 @@ class TxnMallTest(BitcoinTestFramework): self.num_nodes = 4 def add_options(self, parser): - parser.add_option("--mineblock", dest="mine_block", default=False, action="store_true", - help="Test double-spend of 1-confirmed transaction") - parser.add_option("--segwit", dest="segwit", default=False, action="store_true", - help="Test behaviour with SegWit txn (which should fail") + parser.add_argument("--mineblock", dest="mine_block", default=False, action="store_true", + help="Test double-spend of 1-confirmed transaction") + parser.add_argument("--segwit", dest="segwit", default=False, action="store_true", + help="Test behaviour with SegWit txn (which should fail") def setup_network(self): # Start with split network: diff --git a/test/functional/wallet_txn_doublespend.py b/test/functional/wallet_txn_doublespend.py index 7ee60d5611..6811f6ab73 100755 --- a/test/functional/wallet_txn_doublespend.py +++ b/test/functional/wallet_txn_doublespend.py @@ -1,5 +1,5 @@ #!/usr/bin/env python3 -# Copyright (c) 2014-2017 The Bitcoin Core developers +# Copyright (c) 2014-2018 The Bitcoin Core developers # Distributed under the MIT software license, see the accompanying # file COPYING or http://www.opensource.org/licenses/mit-license.php. """Test the wallet accounts properly when there is a double-spend conflict.""" @@ -19,8 +19,8 @@ class TxnMallTest(BitcoinTestFramework): self.num_nodes = 4 def add_options(self, parser): - parser.add_option("--mineblock", dest="mine_block", default=False, action="store_true", - help="Test double-spend of 1-confirmed transaction") + parser.add_argument("--mineblock", dest="mine_block", default=False, action="store_true", + help="Test double-spend of 1-confirmed transaction") def setup_network(self): # Start with split network: diff --git a/test/functional/wallet_zapwallettxes.py b/test/functional/wallet_zapwallettxes.py index 87f44b2737..cbd142d1ee 100755 --- a/test/functional/wallet_zapwallettxes.py +++ b/test/functional/wallet_zapwallettxes.py @@ -1,5 +1,5 @@ #!/usr/bin/env python3 -# Copyright (c) 2014-2017 The Bitcoin Core developers +# Copyright (c) 2014-2018 The Bitcoin Core developers # Distributed under the MIT software license, see the accompanying # file COPYING or http://www.opensource.org/licenses/mit-license.php. """Test the zapwallettxes functionality. diff --git a/test/lint/check-doc.py b/test/lint/check-doc.py index 89776b2a6b..ab8e0e57d1 100755 --- a/test/lint/check-doc.py +++ b/test/lint/check-doc.py @@ -1,5 +1,5 @@ #!/usr/bin/env python3 -# Copyright (c) 2015-2017 The Bitcoin Core developers +# Copyright (c) 2015-2018 The Bitcoin Core developers # Distributed under the MIT software license, see the accompanying # file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/test/lint/check-rpc-mappings.py b/test/lint/check-rpc-mappings.py index c3cdeef580..33e49bac13 100755 --- a/test/lint/check-rpc-mappings.py +++ b/test/lint/check-rpc-mappings.py @@ -1,5 +1,5 @@ #!/usr/bin/env python3 -# Copyright (c) 2017 The Bitcoin Core developers +# Copyright (c) 2017-2018 The Bitcoin Core developers # Distributed under the MIT software license, see the accompanying # file COPYING or http://www.opensource.org/licenses/mit-license.php. """Check RPC argument consistency.""" diff --git a/test/lint/lint-format-strings.py b/test/lint/lint-format-strings.py new file mode 100755 index 0000000000..60389176c9 --- /dev/null +++ b/test/lint/lint-format-strings.py @@ -0,0 +1,290 @@ +#!/usr/bin/env python3 +# +# Copyright (c) 2018 The Bitcoin Core developers +# Distributed under the MIT software license, see the accompanying +# file COPYING or http://www.opensource.org/licenses/mit-license.php. +# +# Lint format strings: This program checks that the number of arguments passed +# to a variadic format string function matches the number of format specifiers +# in the format string. + +import argparse +import re +import sys + +FALSE_POSITIVES = [ + ("src/dbwrapper.cpp", "vsnprintf(p, limit - p, format, backup_ap)"), + ("src/index/base.cpp", "FatalError(const char* fmt, const Args&... args)"), + ("src/netbase.cpp", "LogConnectFailure(bool manual_connection, const char* fmt, const Args&... args)"), + ("src/util.cpp", "strprintf(_(COPYRIGHT_HOLDERS), _(COPYRIGHT_HOLDERS_SUBSTITUTION))"), + ("src/util.cpp", "strprintf(COPYRIGHT_HOLDERS, COPYRIGHT_HOLDERS_SUBSTITUTION)"), + ("src/wallet/wallet.h", "WalletLogPrintf(std::string fmt, Params... parameters)"), + ("src/wallet/wallet.h", "LogPrintf((\"%s \" + fmt).c_str(), GetDisplayName(), parameters...)"), +] + + +def parse_function_calls(function_name, source_code): + """Return an array with all calls to function function_name in string source_code. + Preprocessor directives and C++ style comments ("//") in source_code are removed. + + >>> len(parse_function_calls("foo", "foo();bar();foo();bar();")) + 2 + >>> parse_function_calls("foo", "foo(1);bar(1);foo(2);bar(2);")[0].startswith("foo(1);") + True + >>> parse_function_calls("foo", "foo(1);bar(1);foo(2);bar(2);")[1].startswith("foo(2);") + True + >>> len(parse_function_calls("foo", "foo();bar();// foo();bar();")) + 1 + >>> len(parse_function_calls("foo", "#define FOO foo();")) + 0 + """ + assert(type(function_name) is str and type(source_code) is str and function_name) + lines = [re.sub("// .*", " ", line).strip() + for line in source_code.split("\n") + if not line.strip().startswith("#")] + return re.findall(r"[^a-zA-Z_](?=({}\(.*).*)".format(function_name), " " + " ".join(lines)) + + +def normalize(s): + """Return a normalized version of string s with newlines, tabs and C style comments ("/* ... */") + replaced with spaces. Multiple spaces are replaced with a single space. + + >>> normalize(" /* nothing */ foo\tfoo /* bar */ foo ") + 'foo foo foo' + """ + assert(type(s) is str) + s = s.replace("\n", " ") + s = s.replace("\t", " ") + s = re.sub("/\*.*?\*/", " ", s) + s = re.sub(" {2,}", " ", s) + return s.strip() + + +ESCAPE_MAP = { + r"\n": "[escaped-newline]", + r"\t": "[escaped-tab]", + r'\"': "[escaped-quote]", +} + + +def escape(s): + """Return the escaped version of string s with "\\\"", "\\n" and "\\t" escaped as + "[escaped-backslash]", "[escaped-newline]" and "[escaped-tab]". + + >>> unescape(escape("foo")) == "foo" + True + >>> escape(r'foo \\t foo \\n foo \\\\ foo \\ foo \\"bar\\"') + 'foo [escaped-tab] foo [escaped-newline] foo \\\\\\\\ foo \\\\ foo [escaped-quote]bar[escaped-quote]' + """ + assert(type(s) is str) + for raw_value, escaped_value in ESCAPE_MAP.items(): + s = s.replace(raw_value, escaped_value) + return s + + +def unescape(s): + """Return the unescaped version of escaped string s. + Reverses the replacements made in function escape(s). + + >>> unescape(escape("bar")) + 'bar' + >>> unescape("foo [escaped-tab] foo [escaped-newline] foo \\\\\\\\ foo \\\\ foo [escaped-quote]bar[escaped-quote]") + 'foo \\\\t foo \\\\n foo \\\\\\\\ foo \\\\ foo \\\\"bar\\\\"' + """ + assert(type(s) is str) + for raw_value, escaped_value in ESCAPE_MAP.items(): + s = s.replace(escaped_value, raw_value) + return s + + +def parse_function_call_and_arguments(function_name, function_call): + """Split string function_call into an array of strings consisting of: + * the string function_call followed by "(" + * the function call argument #1 + * ... + * the function call argument #n + * a trailing ");" + + The strings returned are in escaped form. See escape(...). + + >>> parse_function_call_and_arguments("foo", 'foo("%s", "foo");') + ['foo(', '"%s",', ' "foo"', ')'] + >>> parse_function_call_and_arguments("foo", 'foo("%s", "foo");') + ['foo(', '"%s",', ' "foo"', ')'] + >>> parse_function_call_and_arguments("foo", 'foo("%s %s", "foo", "bar");') + ['foo(', '"%s %s",', ' "foo",', ' "bar"', ')'] + >>> parse_function_call_and_arguments("fooprintf", 'fooprintf("%050d", i);') + ['fooprintf(', '"%050d",', ' i', ')'] + >>> parse_function_call_and_arguments("foo", 'foo(bar(foobar(barfoo("foo"))), foobar); barfoo') + ['foo(', 'bar(foobar(barfoo("foo"))),', ' foobar', ')'] + >>> parse_function_call_and_arguments("foo", "foo()") + ['foo(', '', ')'] + >>> parse_function_call_and_arguments("foo", "foo(123)") + ['foo(', '123', ')'] + >>> parse_function_call_and_arguments("foo", 'foo("foo")') + ['foo(', '"foo"', ')'] + >>> parse_function_call_and_arguments("strprintf", 'strprintf("%s (%d)", std::wstring_convert<std::codecvt_utf8_utf16<wchar_t>,wchar_t>().to_bytes(buf), err);') + ['strprintf(', '"%s (%d)",', ' std::wstring_convert<std::codecvt_utf8_utf16<wchar_t>,wchar_t>().to_bytes(buf),', ' err', ')'] + >>> parse_function_call_and_arguments("strprintf", 'strprintf("%s (%d)", foo<wchar_t>().to_bytes(buf), err);') + ['strprintf(', '"%s (%d)",', ' foo<wchar_t>().to_bytes(buf),', ' err', ')'] + >>> parse_function_call_and_arguments("strprintf", 'strprintf("%s (%d)", foo().to_bytes(buf), err);') + ['strprintf(', '"%s (%d)",', ' foo().to_bytes(buf),', ' err', ')'] + >>> parse_function_call_and_arguments("strprintf", 'strprintf("%s (%d)", foo << 1, err);') + ['strprintf(', '"%s (%d)",', ' foo << 1,', ' err', ')'] + >>> parse_function_call_and_arguments("strprintf", 'strprintf("%s (%d)", foo<bar>() >> 1, err);') + ['strprintf(', '"%s (%d)",', ' foo<bar>() >> 1,', ' err', ')'] + >>> parse_function_call_and_arguments("strprintf", 'strprintf("%s (%d)", foo < 1 ? bar : foobar, err);') + ['strprintf(', '"%s (%d)",', ' foo < 1 ? bar : foobar,', ' err', ')'] + >>> parse_function_call_and_arguments("strprintf", 'strprintf("%s (%d)", foo < 1, err);') + ['strprintf(', '"%s (%d)",', ' foo < 1,', ' err', ')'] + >>> parse_function_call_and_arguments("strprintf", 'strprintf("%s (%d)", foo > 1 ? bar : foobar, err);') + ['strprintf(', '"%s (%d)",', ' foo > 1 ? bar : foobar,', ' err', ')'] + >>> parse_function_call_and_arguments("strprintf", 'strprintf("%s (%d)", foo > 1, err);') + ['strprintf(', '"%s (%d)",', ' foo > 1,', ' err', ')'] + >>> parse_function_call_and_arguments("strprintf", 'strprintf("%s (%d)", foo <= 1, err);') + ['strprintf(', '"%s (%d)",', ' foo <= 1,', ' err', ')'] + >>> parse_function_call_and_arguments("strprintf", 'strprintf("%s (%d)", foo <= bar<1, 2>(1, 2), err);') + ['strprintf(', '"%s (%d)",', ' foo <= bar<1, 2>(1, 2),', ' err', ')'] + >>> parse_function_call_and_arguments("strprintf", 'strprintf("%s (%d)", foo>foo<1,2>(1,2)?bar:foobar,err)'); + ['strprintf(', '"%s (%d)",', ' foo>foo<1,2>(1,2)?bar:foobar,', 'err', ')'] + >>> parse_function_call_and_arguments("strprintf", 'strprintf("%s (%d)", foo>foo<1,2>(1,2),err)'); + ['strprintf(', '"%s (%d)",', ' foo>foo<1,2>(1,2),', 'err', ')'] + """ + assert(type(function_name) is str and type(function_call) is str and function_name) + remaining = normalize(escape(function_call)) + expected_function_call = "{}(".format(function_name) + assert(remaining.startswith(expected_function_call)) + parts = [expected_function_call] + remaining = remaining[len(expected_function_call):] + open_parentheses = 1 + open_template_arguments = 0 + in_string = False + parts.append("") + for i, char in enumerate(remaining): + parts.append(parts.pop() + char) + if char == "\"": + in_string = not in_string + continue + if in_string: + continue + if char == "(": + open_parentheses += 1 + continue + if char == ")": + open_parentheses -= 1 + if open_parentheses > 1: + continue + if open_parentheses == 0: + parts.append(parts.pop()[:-1]) + parts.append(char) + break + prev_char = remaining[i - 1] if i - 1 >= 0 else None + next_char = remaining[i + 1] if i + 1 <= len(remaining) - 1 else None + if char == "<" and next_char not in [" ", "<", "="] and prev_char not in [" ", "<"]: + open_template_arguments += 1 + continue + if char == ">" and next_char not in [" ", ">", "="] and prev_char not in [" ", ">"] and open_template_arguments > 0: + open_template_arguments -= 1 + if open_template_arguments > 0: + continue + if char == ",": + parts.append("") + return parts + + +def parse_string_content(argument): + """Return the text within quotes in string argument. + + >>> parse_string_content('1 "foo %d bar" 2') + 'foo %d bar' + >>> parse_string_content('1 foobar 2') + '' + >>> parse_string_content('1 "bar" 2') + 'bar' + >>> parse_string_content('1 "foo" 2 "bar" 3') + 'foobar' + >>> parse_string_content('1 "foo" 2 " " "bar" 3') + 'foo bar' + >>> parse_string_content('""') + '' + >>> parse_string_content('') + '' + >>> parse_string_content('1 2 3') + '' + """ + assert(type(argument) is str) + string_content = "" + in_string = False + for char in normalize(escape(argument)): + if char == "\"": + in_string = not in_string + elif in_string: + string_content += char + return string_content + + +def count_format_specifiers(format_string): + """Return the number of format specifiers in string format_string. + + >>> count_format_specifiers("foo bar foo") + 0 + >>> count_format_specifiers("foo %d bar foo") + 1 + >>> count_format_specifiers("foo %d bar %i foo") + 2 + >>> count_format_specifiers("foo %d bar %i foo %% foo") + 2 + >>> count_format_specifiers("foo %d bar %i foo %% foo %d foo") + 3 + >>> count_format_specifiers("foo %d bar %i foo %% foo %*d foo") + 4 + """ + assert(type(format_string) is str) + n = 0 + in_specifier = False + for i, char in enumerate(format_string): + if format_string[i - 1:i + 1] == "%%" or format_string[i:i + 2] == "%%": + pass + elif char == "%": + in_specifier = True + n += 1 + elif char in "aAcdeEfFgGinopsuxX": + in_specifier = False + elif in_specifier and char == "*": + n += 1 + return n + + +def main(): + parser = argparse.ArgumentParser(description="This program checks that the number of arguments passed " + "to a variadic format string function matches the number of format " + "specifiers in the format string.") + parser.add_argument("--skip-arguments", type=int, help="number of arguments before the format string " + "argument (e.g. 1 in the case of fprintf)", default=0) + parser.add_argument("function_name", help="function name (e.g. fprintf)", default=None) + parser.add_argument("file", type=argparse.FileType("r", encoding="utf-8"), nargs="*", help="C++ source code file (e.g. foo.cpp)") + args = parser.parse_args() + + exit_code = 0 + for f in args.file: + for function_call_str in parse_function_calls(args.function_name, f.read()): + parts = parse_function_call_and_arguments(args.function_name, function_call_str) + relevant_function_call_str = unescape("".join(parts))[:512] + if (f.name, relevant_function_call_str) in FALSE_POSITIVES: + continue + if len(parts) < 3 + args.skip_arguments: + exit_code = 1 + print("{}: Could not parse function call string \"{}(...)\": {}".format(f.name, args.function_name, relevant_function_call_str)) + continue + argument_count = len(parts) - 3 - args.skip_arguments + format_str = parse_string_content(parts[1 + args.skip_arguments]) + format_specifier_count = count_format_specifiers(format_str) + if format_specifier_count != argument_count: + exit_code = 1 + print("{}: Expected {} argument(s) after format string but found {} argument(s): {}".format(f.name, format_specifier_count, argument_count, relevant_function_call_str)) + continue + sys.exit(exit_code) + + +if __name__ == "__main__": + main() diff --git a/test/lint/lint-format-strings.sh b/test/lint/lint-format-strings.sh new file mode 100755 index 0000000000..17f846d29b --- /dev/null +++ b/test/lint/lint-format-strings.sh @@ -0,0 +1,41 @@ +#!/usr/bin/env bash +# +# Copyright (c) 2018 The Bitcoin Core developers +# Distributed under the MIT software license, see the accompanying +# file COPYING or http://www.opensource.org/licenses/mit-license.php. +# +# Lint format strings: This program checks that the number of arguments passed +# to a variadic format string function matches the number of format specifiers +# in the format string. + +export LC_ALL=C + +FUNCTION_NAMES_AND_NUMBER_OF_LEADING_ARGUMENTS=( + FatalError,0 + fprintf,1 + LogConnectFailure,1 + LogPrint,1 + LogPrintf,0 + printf,0 + snprintf,2 + sprintf,1 + strprintf,0 + vfprintf,1 + vprintf,1 + vsnprintf,1 + vsprintf,1 + WalletLogPrintf,0 +) + +EXIT_CODE=0 +if ! python3 -m doctest test/lint/lint-format-strings.py; then + EXIT_CODE=1 +fi +for S in "${FUNCTION_NAMES_AND_NUMBER_OF_LEADING_ARGUMENTS[@]}"; do + IFS="," read -r FUNCTION_NAME SKIP_ARGUMENTS <<< "${S}" + mapfile -t MATCHING_FILES < <(git grep --full-name -l "${FUNCTION_NAME}" -- "*.c" "*.cpp" "*.h" | sort | grep -vE "^src/(leveldb|secp256k1|tinyformat|univalue)") + if ! test/lint/lint-format-strings.py --skip-arguments "${SKIP_ARGUMENTS}" "${FUNCTION_NAME}" "${MATCHING_FILES[@]}"; then + EXIT_CODE=1 + fi +done +exit ${EXIT_CODE} diff --git a/test/lint/lint-python.sh b/test/lint/lint-python.sh index d9d46d86d5..7e73790517 100755 --- a/test/lint/lint-python.sh +++ b/test/lint/lint-python.sh @@ -30,6 +30,8 @@ export LC_ALL=C # E306 expected 1 blank line before a nested definition # E401 multiple imports on one line # E402 module level import not at top of file +# F403 'from foo_module import *' used; unable to detect undefined names +# F405 foo_function may be undefined, or defined from star imports: bar_module # E502 the backslash is redundant between brackets # E701 multiple statements on one line (colon) # E702 multiple statements on one line (semicolon) @@ -77,4 +79,4 @@ export LC_ALL=C # W605 invalid escape sequence "x" # W606 'async' and 'await' are reserved keywords starting with Python 3.7 -flake8 --ignore=B,C,E,F,I,N,W --select=E101,E112,E113,E115,E116,E125,E129,E131,E133,E223,E224,E242,E266,E271,E272,E273,E274,E275,E304,E306,E401,E402,E502,E701,E702,E703,E714,E721,E741,E742,E743,F401,E901,E902,F402,F404,F406,F407,F601,F602,F621,F622,F631,F701,F702,F703,F704,F705,F706,F707,F811,F812,F821,F822,F823,F831,F841,W191,W291,W292,W293,W504,W601,W602,W603,W604,W605,W606 . +flake8 --ignore=B,C,E,F,I,N,W --select=E101,E112,E113,E115,E116,E125,E129,E131,E133,E223,E224,E242,E266,E271,E272,E273,E274,E275,E304,E306,E401,E402,E502,E701,E702,E703,E714,E721,E741,E742,E743,E901,E902,F401,F402,F403,F404,F405,F406,F407,F601,F602,F621,F622,F631,F701,F702,F703,F704,F705,F706,F707,F811,F812,F821,F822,F823,F831,F841,W191,W291,W292,W293,W504,W601,W602,W603,W604,W605,W606 . diff --git a/test/lint/lint-shell.sh b/test/lint/lint-shell.sh index e2ccdb5165..5e1e136e7d 100755 --- a/test/lint/lint-shell.sh +++ b/test/lint/lint-shell.sh @@ -6,9 +6,15 @@ # # Check for shellcheck warnings in shell scripts. -# This script is intentionally locale dependent by not setting "export LC_ALL=C" -# to allow running certain versions of shellcheck that core dump when LC_ALL=C -# is set. +export LC_ALL=C + +# The shellcheck binary segfault/coredumps in Travis with LC_ALL=C +# It does not do so in Ubuntu 14.04, 16.04, 18.04 in versions 0.3.3, 0.3.7, 0.4.6 +# respectively. So export LC_ALL=C is set as required by lint-shell-locale.sh +# but unset here in case of running in Travis. +if [ "$TRAVIS" = "true" ]; then + unset LC_ALL +fi # Disabled warnings: # SC2001: See if you can use ${variable//search/replace} instead. diff --git a/test/util/bitcoin-util-test.py b/test/util/bitcoin-util-test.py index 16371a6234..92fef30e13 100755 --- a/test/util/bitcoin-util-test.py +++ b/test/util/bitcoin-util-test.py @@ -28,7 +28,7 @@ import sys def main(): config = configparser.ConfigParser() config.optionxform = str - config.readfp(open(os.path.join(os.path.dirname(__file__), "../config.ini"), encoding="utf8")) + config.read_file(open(os.path.join(os.path.dirname(__file__), "../config.ini"), encoding="utf8")) env_conf = dict(config.items('environment')) parser = argparse.ArgumentParser(description=__doc__) diff --git a/test/util/data/txcreatesignv1.hex b/test/util/data/txcreatesignv1.hex index a46fcc88cb..40039319bd 100644 --- a/test/util/data/txcreatesignv1.hex +++ b/test/util/data/txcreatesignv1.hex @@ -1 +1 @@ -01000000018594c5bdcaec8f06b78b596f31cd292a294fd031e24eec716f43dac91ea7494d000000008b48304502210096a75056c9e2cc62b7214777b3d2a592cfda7092520126d4ebfcd6d590c99bd8022051bb746359cf98c0603f3004477eac68701132380db8facba19c89dc5ab5c5e201410479be667ef9dcbbac55a06295ce870b07029bfcdb2dce28d959f2815b16f81798483ada7726a3c4655da4fbfc0e1108a8fd17b448a68554199c47d08ffb10d4b8ffffffff01a0860100000000001976a9145834479edbbe0539b31ffd3a8f8ebadc2165ed0188ac00000000 +01000000018594c5bdcaec8f06b78b596f31cd292a294fd031e24eec716f43dac91ea7494d000000008a4730440220131432090a6af42da3e8335ff110831b41a44f4e9d18d88f5d50278380696c7202200fc2e48938f323ad13625890c0ea926c8a189c08b8efc38376b20c8a2188e96e01410479be667ef9dcbbac55a06295ce870b07029bfcdb2dce28d959f2815b16f81798483ada7726a3c4655da4fbfc0e1108a8fd17b448a68554199c47d08ffb10d4b8ffffffff01a0860100000000001976a9145834479edbbe0539b31ffd3a8f8ebadc2165ed0188ac00000000 diff --git a/test/util/data/txcreatesignv1.json b/test/util/data/txcreatesignv1.json index 64e5137f4b..7a06aa9ffe 100644 --- a/test/util/data/txcreatesignv1.json +++ b/test/util/data/txcreatesignv1.json @@ -1,18 +1,18 @@ { - "txid": "977e7cd286cb72cd470d539ba6cb48400f8f387d97451d45cdb8819437a303af", - "hash": "977e7cd286cb72cd470d539ba6cb48400f8f387d97451d45cdb8819437a303af", + "txid": "ffc7e509ec3fd60a182eb712621d41a47dc7d4ff310a70826c2fb0e9afb3fa02", + "hash": "ffc7e509ec3fd60a182eb712621d41a47dc7d4ff310a70826c2fb0e9afb3fa02", "version": 1, - "size": 224, - "vsize": 224, - "weight": 896, + "size": 223, + "vsize": 223, + "weight": 892, "locktime": 0, "vin": [ { "txid": "4d49a71ec9da436f71ec4ee231d04f292a29cd316f598bb7068feccabdc59485", "vout": 0, "scriptSig": { - "asm": "304502210096a75056c9e2cc62b7214777b3d2a592cfda7092520126d4ebfcd6d590c99bd8022051bb746359cf98c0603f3004477eac68701132380db8facba19c89dc5ab5c5e2[ALL] 0479be667ef9dcbbac55a06295ce870b07029bfcdb2dce28d959f2815b16f81798483ada7726a3c4655da4fbfc0e1108a8fd17b448a68554199c47d08ffb10d4b8", - "hex": "48304502210096a75056c9e2cc62b7214777b3d2a592cfda7092520126d4ebfcd6d590c99bd8022051bb746359cf98c0603f3004477eac68701132380db8facba19c89dc5ab5c5e201410479be667ef9dcbbac55a06295ce870b07029bfcdb2dce28d959f2815b16f81798483ada7726a3c4655da4fbfc0e1108a8fd17b448a68554199c47d08ffb10d4b8" + "asm": "30440220131432090a6af42da3e8335ff110831b41a44f4e9d18d88f5d50278380696c7202200fc2e48938f323ad13625890c0ea926c8a189c08b8efc38376b20c8a2188e96e[ALL] 0479be667ef9dcbbac55a06295ce870b07029bfcdb2dce28d959f2815b16f81798483ada7726a3c4655da4fbfc0e1108a8fd17b448a68554199c47d08ffb10d4b8", + "hex": "4730440220131432090a6af42da3e8335ff110831b41a44f4e9d18d88f5d50278380696c7202200fc2e48938f323ad13625890c0ea926c8a189c08b8efc38376b20c8a2188e96e01410479be667ef9dcbbac55a06295ce870b07029bfcdb2dce28d959f2815b16f81798483ada7726a3c4655da4fbfc0e1108a8fd17b448a68554199c47d08ffb10d4b8" }, "sequence": 4294967295 } @@ -32,5 +32,5 @@ } } ], - "hex": "01000000018594c5bdcaec8f06b78b596f31cd292a294fd031e24eec716f43dac91ea7494d000000008b48304502210096a75056c9e2cc62b7214777b3d2a592cfda7092520126d4ebfcd6d590c99bd8022051bb746359cf98c0603f3004477eac68701132380db8facba19c89dc5ab5c5e201410479be667ef9dcbbac55a06295ce870b07029bfcdb2dce28d959f2815b16f81798483ada7726a3c4655da4fbfc0e1108a8fd17b448a68554199c47d08ffb10d4b8ffffffff01a0860100000000001976a9145834479edbbe0539b31ffd3a8f8ebadc2165ed0188ac00000000" + "hex": "01000000018594c5bdcaec8f06b78b596f31cd292a294fd031e24eec716f43dac91ea7494d000000008a4730440220131432090a6af42da3e8335ff110831b41a44f4e9d18d88f5d50278380696c7202200fc2e48938f323ad13625890c0ea926c8a189c08b8efc38376b20c8a2188e96e01410479be667ef9dcbbac55a06295ce870b07029bfcdb2dce28d959f2815b16f81798483ada7726a3c4655da4fbfc0e1108a8fd17b448a68554199c47d08ffb10d4b8ffffffff01a0860100000000001976a9145834479edbbe0539b31ffd3a8f8ebadc2165ed0188ac00000000" } |